Merge branch 'internationalization' into testBranch

src/SDrpManagement/QuotedPrice/detail/index.vue

@@ -81,7 +81,7 @@
               <span style="color: #8C8C8C;font-size: 14px">{{$t('请选择同步更新经销商/直销客户合作协议产品类别的方式')}}：</span>
               <el-form :model="cooperateForm" style="margin-top: 20px">
                 <el-radio v-model="cooperateForm.isadd" label="1" style="margin-bottom: 20px">
-                  <span style="font-size: 16px;color: #333333">同步添加合作协议产品类别及其折扣</span><br><br>
+                  <span style="font-size: 16px;color: #333333">{{$t('同步添加合作协议产品类别及其折扣')}}</span><br><br>
                   <span style="font-size: 14px;color: #8C8C8C;margin: 20px 0 0 22px;padding-top: 20px">
                     {{$t('将协议中所有产品类别及其折扣添加到表体，若表体已存在产品类别，则协议中相同产品类别的折扣')}}
                   </span><br><br>

src/components/attachment_list/index.vue

@@ -61,7 +61,7 @@
               size="small"
               @click="editAttachment(scope.row)"
             >{{$t(`编 辑`)}}</el-button>
-            <el-popconfirm :title="$t(`确定删除当前附件吗`)+'？'" @confirm="deleteAttachment(scope.row)">
+            <el-popconfirm :title="$t(`确定删除当前附件吗`)+'？'" :confirm-button-text="$t('确定')" :cancel-button-text="$t('取消')" @confirm="deleteAttachment(scope.row)">
               <el-button
                 :disabled="onlyread || status === '已失败' || status === '已结案' || scope.row.usetype === 'undelete' || attachmentDisabled"
                 slot="reference"

src/components/normal-basic-layout-new/details/modules/followUp/followUp.vue

@@ -178,6 +178,7 @@
               <marketingExpenses  v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/phonebookDetail'"  class="inline-16" ownertable="sa_customers" :ownerid="i.sys_datafollowupid" :dataTime="i.createdate" :userid="i.createuserid" @onSuccess="onSuccess"></marketingExpenses>
               <editLog v-if="nowUserid === i.createuserid" :status="status" ref="edits" :data="i" :ownertable="ownertable" @onSuccess="queryLogs"></editLog>
               <el-popconfirm
+                  :confirm-button-text="$t('确定')" :cancel-button-text="$t('取消')"
                   :title="$t('确定删除该跟进动态吗')+'？'"
                   @confirm="deleteLogs(i)"
               >

src/components/normal-basic-layout-new/details/modules/followUp/followUpCopy.vue

@@ -136,6 +136,7 @@
                     </upload>
                     <editLog :status="status" ref="edits" :data="i" :ownertable="ownertableNew" :ownerid="owneridNew" @onSuccess="queryLogs"></editLog>
                     <el-popconfirm
+                        :confirm-button-text="$t('确定')" :cancel-button-text="$t('取消')"
                         :title="$t('确定删除该跟进动态吗')+'？'"
                         @confirm="deleteLogs(i)"
                     >

src/components/normal-basic-layout/details/modules/followUp/followUp.vue

@@ -178,6 +178,7 @@
               <marketingExpenses  v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail'"  class="inline-16" ownertable="sa_customers" :ownerid="i.sys_datafollowupid" :dataTime="i.createdate" :userid="i.createuserid" @onSuccess="onSuccess"></marketingExpenses>
               <editLog v-if="nowUserid === i.createuserid" :status="status" ref="edits" :data="i" :ownertable="ownertable" @onSuccess="queryLogs"></editLog>
               <el-popconfirm
+                  :confirm-button-text="$t('确定')" :cancel-button-text="$t('取消')"
                   :title="$t(`确定删除该跟进动态吗？`)"
                   @confirm="deleteLogs(i)"
               >

src/components/normal-basic-layout/details/modules/followUp/followUpCopy.vue

@@ -133,6 +133,7 @@
                     </upload>
                     <editLog :status="status" ref="edits" :data="i" :ownertable="ownertable" @onSuccess="queryLogs"></editLog>
                     <el-popconfirm
+                        :confirm-button-text="$t('确定')" :cancel-button-text="$t('取消')"
                         :title="$t('确定删除该跟进动态吗')+'？'"
                         @confirm="deleteLogs(i)"
                     >

src/optionSystem/FProductManage/modules/edit.vue

@@ -6,7 +6,7 @@
       @click="onShow"
       :disabled="data.lectotypestatus != '新建'"
     >
-      {{ $t("编辑 ") }}</el-button
+      {{ $t("编辑") }}</el-button
     >
     <el-drawer
       :title="$t(`编辑成品`)"

src/optionSystem/optionOrder/detail/modules/edit.vue

@@ -6,7 +6,7 @@
       @click="onShow"
       :disabled="data.createuserid != userid || data.status == '无需评审'"
     >
-      {{ $t("编辑 ") }}</el-button
+      {{ $t("编辑") }}</el-button
     >
     <el-drawer
       custom-class="custom-select-option_class"

src/optionSystem/optionOrder/modules/edit.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button type="primary" size="mini" @click="onShow">
-      {{ $t("编辑 ") }}</el-button
+      {{ $t("编辑") }}</el-button
     >
     <el-drawer
       :title="$t(`编辑成品`)"

src/optionSystem/selectOption/components/DieFa.vue

@@ -719,7 +719,7 @@
             </td>
           </tr>
           <tr>
-            <td class="title">{{ product.itemno ? "牌价" : "预估价格" }}</td>
+            <td class="title">{{ $t(product.itemno ? "牌价" : "预估价格") }}</td>
             <td class="text2">
               ￥{{
                 Object.keys(product).length
@@ -752,7 +752,7 @@
           @click="onSubmit"
           class="normal-btn-width"
           v-if="active == 4"
-          >{{ position == "单独选型" ? "保存选型单" : "确认添加" }}</el-button
+          >{{ $t(position == "单独选型" ? "保存选型单" : "确认添加") }}</el-button
         >
       </div>
     </div>

src/optionSystem/speedBoxManage/detail/index.vue

@@ -158,7 +158,7 @@ export default {
               value: this.mainData.gearboxlevel,
             },
             {
-              label: "重量（kg",
+              label: "重量(kg)",
               value: this.mainData.weight,
             },
             {

src/optionSystem/speedBoxManage/modules/add copy.vue

@@ -64,7 +64,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item :label="$t(`重量（kg）`)" :label-width="tool.onlyZh('130px')" prop="weight">
+              <el-form-item :label="$t(`重量(kg)`)" :label-width="tool.onlyZh('130px')" prop="weight">
                 <el-input  v-model="form.weight" autocomplete="off" :placeholder="$t(`请输入重量`)"></el-input>
               </el-form-item>
             </el-col>

src/optionSystem/valveOption/DieFa.vue

@@ -9,7 +9,7 @@
       <div class="my-steps">
         <a-steps :current="active - 1" style="margin-bottom: 10px">
           <a-step
-            :title="item.title"
+            :title="$t(item.title)"
             v-for="(item, index) in items"
             :key="index"
           >