xiaohaizhao 9 månader sedan
förälder
incheckning
118e35ec7f
21 ändrade filer med 705 tillägg och 535 borttagningar
  1. 1 1
      src/HDrpManagement/ProductGroupMag/modules/addGroupDetail.vue
  2. 1 1
      src/HDrpManagement/productMoneyOdd/components/selectClass/Select.vue
  3. 2 2
      src/HDrpManagement/productMoneyOdd/components/selectClass/classTree.vue
  4. 1 1
      src/HDrpManagement/projectChange/modules/modules/contacts/components/add.vue
  5. 69 69
      src/HDrpManagement/projectChange/modules/modules/contract/components/add.vue
  6. 3 3
      src/HDrpManagement/projectChange/modules/modules/productSet/Select.vue
  7. 1 1
      src/HDrpManagement/projectChange/modules/modules/productSet/classTree.vue
  8. 490 320
      src/HDrpManagement/projectChange/modules/modules/productSet/index.vue
  9. 11 11
      src/HDrpManagement/projectChange/modules/modules/quotation/modules/add.vue
  10. 6 6
      src/HDrpManagement/projectData/index.vue
  11. 2 2
      src/HDrpManagement/projectPortrait/index.vue
  12. 1 1
      src/HDrpManagement/promotion/modules/productModel/add.vue
  13. 1 1
      src/HDrpManagement/promotion/modules/productModel/addProduct.vue
  14. 4 4
      src/HDrpManagement/publicCustomer/modules/detail/addressManage/modules/add.vue
  15. 40 40
      src/HManagement/addressList/mycontact/modules/addContact.vue
  16. 15 15
      src/HManagement/roleManage/modules/roleContent copy.vue
  17. 1 1
      src/SDrpManagement/Products/modules/Select2.vue
  18. 52 52
      src/SManagement/orderclue_detail/components/customerAudit.vue
  19. 1 1
      src/SManagement/orderclue_detail/components/projectAudit.vue
  20. 1 1
      src/components/selectTemp/index.vue
  21. 2 2
      src/template/addProduct/index.vue

+ 1 - 1
src/HDrpManagement/ProductGroupMag/modules/addGroupDetail.vue

@@ -65,7 +65,7 @@
         <div v-if="scope.column.columnname === 'itemclass'">
          <span v-for="(item,index) in scope.column.data[scope.column.columnname]">
            <span v-if="index === scope.column.data[scope.column.columnname].length -1">
-             {{item.itemclassname}}
+             {{$t(item.itemclassname)}}
            </span>
            <span v-else>
              {{item.itemclassname + ','}}

+ 1 - 1
src/HDrpManagement/productMoneyOdd/components/selectClass/Select.vue

@@ -11,7 +11,7 @@
       </ul>
       <ul class="flex-align-center normal-margin-new">
         <li  :class="class_act === ''?'act':''" class="brand-item border-all" @click="clickClass('')">{{$t(`全部分类`)}}</li>
-        <li  :class="class_act === item.itemclassnum?'act':''" class="brand-item margin-notAll" v-for="item in itemclass" :key="item.itemclassnum" @click="clickClass(item)">{{item.itemclassname}}</li>
+        <li  :class="class_act === item.itemclassnum?'act':''" class="brand-item margin-notAll" v-for="item in itemclass" :key="item.itemclassnum" @click="clickClass(item)">{{$t(item.itemclassname)}}</li>
       </ul>
       <classTree style="padding-left:80px" :data="activeClass.subdep" @onClassChange="change"></classTree>
     </div>

+ 2 - 2
src/HDrpManagement/productMoneyOdd/components/selectClass/classTree.vue

@@ -2,8 +2,8 @@
   <div>
     <div class="flex-start">
       <div v-for="item in data" :key="item.index" @click.stop="classClick(item)">
-        <p class="classItem" v-if="item.index === 1"  :class="class_act === item.itemclassnum?'act':''">{{item.itemclassname}}</p>
-        <p class="classItem"  v-else   :class="class_act === item.itemclassnum?'act':''">{{item.itemclassname}}</p>
+        <p class="classItem" v-if="item.index === 1"  :class="class_act === item.itemclassnum?'act':''">{{$t(item.itemclassname)}}</p>
+        <p class="classItem"  v-else   :class="class_act === item.itemclassnum?'act':''">{{$t(item.itemclassname)}}</p>
         <Tree v-if="item.subdep && class_act === item.itemclassnum" :data="item.subdep"></Tree>
       </div>
     </div>

+ 1 - 1
src/HDrpManagement/projectChange/modules/modules/contacts/components/add.vue

@@ -87,7 +87,7 @@
                             <span >{{ scope.row.address?scope.row.address:'--' }}</span>
                           </template>
                         </el-table-column>
-                        <el-table-column  label="负责人">
+                        <el-table-column  :label="$t(`负责人`)">
                           <template slot-scope="scope">
                             <span >{{ scope.row.leader?scope.row.leader:'--' }}</span>
                           </template>

+ 69 - 69
src/HDrpManagement/projectChange/modules/modules/contract/components/add.vue

@@ -11,7 +11,7 @@
       </el-dropdown-menu>
     </el-dropdown>
     <el-drawer
-      :title="`新建${contractType}协议`"
+      :title="$t('新建')+contractType + $t('协议')"
       :visible.sync="drawer"
       :show-close="false"
       direction="rtl"
@@ -23,12 +23,12 @@
         <el-row v-if="contractType == '经销项目'">
           <el-form :model="form" :rules="rules" ref="form" label-position="right" :label-width="tool.onlyZh('140px')" size="small">
             <el-col :span="24">
-              <el-form-item label="合同标题:" prop="title">
+              <el-form-item :label="$t(`合同标题`)+':'" prop="title">
                 <el-input type="text" size="small" v-model="form.title"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="经销商:" prop="enterprisename">
+              <el-form-item :label="$t(`经销商`)+':'" prop="enterprisename">
                 <el-popover
                     placement="bottom"
                     trigger="manual"
@@ -40,7 +40,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="项目名称:" prop="projectname">
+              <el-form-item :label="$t(`项目名称`)+':'" prop="projectname">
                 <el-popover
                     placement="bottom"
                     trigger="manual"
@@ -52,22 +52,22 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="项目编号:" prop="">
+              <el-form-item :label="$t(`项目编号`)+':'" prop="">
                 <el-input disabled type="text" size="small" v-model="form.projectnum" ></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="业务员:" prop="">
+              <el-form-item :label="$t(`业务员`)+':'" prop="">
                 <el-input disabled type="text" size="small" v-model="form.salername"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="折扣(%):" prop="discountrate"  >
-                <el-input type="number" size="small" v-model="form.discountrate" placeholder="请输入0-100%" @change="discountrateChange"></el-input>
+              <el-form-item :label="$t(`折扣(%)`)+':'" prop="discountrate"  >
+                <el-input type="number" size="small" v-model="form.discountrate" :placeholder="$t(`请输入0-100%`)" @change="discountrateChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="付款条件:" prop="paytype">
+              <el-form-item :label="$t(`付款条件`)+':'" prop="paytype">
                 <el-select v-model="form.paytype" :placeholder="$t('请选择')" style="width: 100%;">
                   <el-option
                       v-for="item in payTypeData"
@@ -79,39 +79,39 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="发货日期提醒(天):" prop="reminddays"  >
-                <el-input type="text" size="small" v-model="form.reminddays" placeholder="请输入发货日期提醒天数"></el-input>
+              <el-form-item :label="$t(`发货日期提醒(天)`)+':'" prop="reminddays"  >
+                <el-input type="text" size="small" v-model="form.reminddays" :placeholder="$t(`请输入发货日期提醒天数`)"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="合同有效期:" prop="begdate">
+              <el-form-item :label="$t(`合同有效期`)+':'" prop="begdate">
                 <input type="text" style="display:none" v-model="form.begdate">
                 <time-select ref="timeSelect" class="inline-16" @clearSelect="clearTime" @timeChange="timeChange" style="width: 100%"></time-select>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="签约日期:" prop="signdate">
+              <el-form-item :label="$t(`签约日期`)+':'" prop="signdate">
                 <el-date-picker
                     v-model="form.signdate"
                     style="width: 100%"
                     type="date"
                     value-format="yyyy-MM-dd"
-                    placeholder="选择日期">
+                    :placeholder="$t(`选择日期`)">
                 </el-date-picker>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="签约金额(元):" prop="signamount">
-                <el-input type="text" size="small" placeholder="系统自动计算" disabled v-model="form.signamount"></el-input>
+              <el-form-item :label="$t(`签约金额(元)`)+':'" prop="signamount">
+                <el-input type="text" size="small" :placeholder="$t(`系统自动计算`)" disabled v-model="form.signamount"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="合同模板:" prop="">
+              <el-form-item :label="$t(`合同模板`)+':'" prop="">
                 <el-input disabled type="text" size="small" :value="$route.query.type == '框架' ? '经销合作' : $route.query.type"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="合同描述:" prop="hrid">
+              <el-form-item :label="$t(`合同描述`)+':'" prop="hrid">
                 <el-input type="textarea" size="small" v-model="form.remarks"></el-input>
               </el-form-item>
             </el-col>
@@ -121,12 +121,12 @@
         <el-row v-if="contractType == '直销项目'">
           <el-form :model="form" :rules="rules" ref="form" label-position="right" :label-width="tool.onlyZh('140px')" size="small">
             <el-col :span="24">
-              <el-form-item label="合同标题:" prop="title">
+              <el-form-item :label="$t(`合同标题`)+':'" prop="title">
                 <el-input type="text" size="small" v-model="form.title"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="客户" prop="sys_enterpriseid">
+              <el-form-item :label="$t(`客户`)" prop="sys_enterpriseid">
                 <el-popover
                     placement="bottom"
                     trigger="manual"
@@ -138,7 +138,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="项目名称:" prop="projectname">
+              <el-form-item :label="$t(`项目名称`)+':'" prop="projectname">
                 <el-popover
                     placement="bottom"
                     trigger="manual"
@@ -150,22 +150,22 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="项目编号:" prop="">
-                <el-input disabled type="text" size="small" v-model="form.projectnum" placeholder="请选择项目"></el-input>
+              <el-form-item :label="$t(`项目编号`)+':'" prop="">
+                <el-input disabled type="text" size="small" v-model="form.projectnum" :placeholder="$t(`请选择项目`)"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="业务员:" prop="">
+              <el-form-item :label="$t(`业务员`)+':'" prop="">
                 <el-input disabled type="text" size="small" v-model="form.salername"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="折扣(%):" prop="discountrate"  >
-                <el-input type="number" size="small" v-model="form.discountrate" placeholder="请输入0-100%" @change="discountrateChange"></el-input>
+              <el-form-item :label="$t(`折扣(%)`)+':'" prop="discountrate"  >
+                <el-input type="number" size="small" v-model="form.discountrate" :placeholder="$t(`请输入0-100%`)" @change="discountrateChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="付款条件:" prop="paytype">
+              <el-form-item :label="$t(`付款条件`)+':'" prop="paytype">
                 <el-select v-model="form.paytype" :placeholder="$t('请选择')" style="width: 100%;">
                   <el-option
                       v-for="item in payTypeData"
@@ -177,39 +177,39 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="发货日期提醒(天):" prop="reminddays"  >
-                <el-input type="text" size="small" v-model="form.reminddays" placeholder="请输入发货日期提醒天数"></el-input>
+              <el-form-item :label="$t(`发货日期提醒(天)`)+':'" prop="reminddays"  >
+                <el-input type="text" size="small" v-model="form.reminddays" :placeholder="$t(`请输入发货日期提醒天数`)"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="合同有效期:" prop="begdate">
+              <el-form-item :label="$t(`合同有效期`)+':'" prop="begdate">
                 <input type="text" style="display:none" v-model="form.begdate">
                 <time-select ref="timeSelect" class="inline-16" @clearSelect="clearTime" @timeChange="timeChange" style="width: 100%"></time-select>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="签约日期:" prop="signdate">
+              <el-form-item :label="$t(`签约日期`)+':'" prop="signdate">
                 <el-date-picker
                     v-model="form.signdate"
                     style="width: 100%"
                     value-format="yyyy-MM-dd"
                     type="date"
-                    placeholder="选择日期">
+                    :placeholder="$t(`选择日期`)">
                 </el-date-picker>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="签约金额(元):" prop="signamount">
-                <el-input type="text" placeholder="系统自动计算" disabled size="small" v-model="form.signamount"></el-input>
+              <el-form-item :label="$t(`签约金额(元)`)+':'" prop="signamount">
+                <el-input type="text" :placeholder="$t(`系统自动计算`)" disabled size="small" v-model="form.signamount"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="合同模板:" prop="">
+              <el-form-item :label="$t(`合同模板`)+':'" prop="">
                 <el-input disabled type="text" size="small" :value="$route.query.type == '框架' ? '经销合作' : $route.query.type"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="合同描述:" prop="hrid">
+              <el-form-item :label="$t(`合同描述`)+':'" prop="hrid">
                 <el-input type="textarea" size="small" v-model="form.remarks"></el-input>
               </el-form-item>
             </el-col>
@@ -219,12 +219,12 @@
         <el-row v-if="contractType == '居间'">
           <el-form :model="form" :rules="rules" ref="form" label-position="right" :label-width="tool.onlyZh('135px')" size="small">
             <el-col :span="24">
-              <el-form-item label="合同标题:" prop="title">
+              <el-form-item :label="$t(`合同标题`)+':'" prop="title">
                 <el-input type="text" size="small" v-model="form.title"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="居间商:" :rules="{ required: false, message: '请选择居间商', trigger: 'change' }">
+              <el-form-item :label="$t(`居间商`)+':'" :rules="{ required: false, message: $t('请选择居间商'), trigger: 'change' }">
                 <el-popover
                     placement="bottom"
                     trigger="manual"
@@ -240,7 +240,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="合同:" prop="ascription_title">
+              <el-form-item :label="$t(`合同`)+':'" prop="ascription_title">
                 <el-popover
                     placement="bottom"
                     trigger="manual"
@@ -252,63 +252,63 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="项目名称:" prop="projectnum">
+              <el-form-item :label="$t(`项目名称`)+':'" prop="projectnum">
                 <el-input disabled type="text" size="small" v-model="form.projectname"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="项目编号:" prop="projectnum">
+              <el-form-item :label="$t(`项目编号`)+':'" prop="projectnum">
                 <el-input disabled type="text" size="small" v-model="form.projectnum"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="业务员:" prop="">
+              <el-form-item :label="$t(`业务员`)+':'" prop="">
                 <el-input disabled type="text" size="small" v-model="form.salername"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="签约日期:" prop="signdate">
+              <el-form-item :label="$t(`签约日期`)+':'" prop="signdate">
                 <el-date-picker
                     v-model="form.signdate"
                     style="width: 100%"
                     value-format="yyyy-MM-dd"
                     type="date"
-                    placeholder="选择日期">
+                    :placeholder="$t(`选择日期`)">
                 </el-date-picker>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="计算方式" prop="">
+              <el-form-item :label="$t(`计算方式`)" prop="">
                 <el-radio-group v-model="form.calculatemodel">
-                  <el-radio label="1">按订单金额比例计算</el-radio>
-                  <el-radio label="2">按居间产品折扣计算</el-radio>
+                  <el-radio label="1">{{$t('按订单金额比例计算')}}</el-radio>
+                  <el-radio label="2">{{$t('按居间产品折扣计算')}}</el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>
             <el-col :span="24" v-if="form.calculatemodel==1">
-              <el-form-item label="订单金额比例(%):" prop="orderratio" >
-                <el-input type="number" size="small" v-model.number="form.orderratio" placeholder="请输入0-100%" @change="orderratioChange"></el-input>
+              <el-form-item :label="$t(`订单金额比例(%)`)+':'" prop="orderratio" >
+                <el-input type="number" size="small" v-model.number="form.orderratio" :placeholder="$t(`请输入0-100%`)" @change="orderratioChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24" v-if="form.calculatemodel==2">
-              <el-form-item label="居间产品折扣(%):" prop="productdiscount">
-                <el-input type="number" size="small" v-model.number="form.productdiscount" placeholder="请输入0-100%" @change="productdiscountChange"></el-input>
+              <el-form-item :label="$t(`居间产品折扣(%)`)+':'" prop="productdiscount">
+                <el-input type="number" size="small" v-model.number="form.productdiscount" :placeholder="$t(`请输入0-100%`)" @change="productdiscountChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="合同有效期:" prop="begdate">
+              <el-form-item :label="$t(`合同有效期`)+':'" prop="begdate">
                 <input type="text" style="display:none" v-model="form.begdate">
                 <time-select ref="timeSelect" class="inline-16" @clearSelect="clearTime" @timeChange="timeChange" style="width: 100%"></time-select>
               </el-form-item>
             </el-col>
 
             <el-col :span="24">
-              <el-form-item label="合同模板:" prop="">
+              <el-form-item :label="$t(`合同模板`)+':'" prop="">
                 <el-input disabled type="text" size="small" :value="$route.query.type == '框架' ? '经销合作' : $route.query.type"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="合同描述:" prop="hrid">
+              <el-form-item :label="$t(`合同描述`)+':'" prop="hrid">
                 <el-input type="textarea" size="small" v-model="form.remarks"></el-input>
               </el-form-item>
             </el-col>
@@ -404,49 +404,49 @@ export default {
       },
       rules: {
         title: [
-          { required: true, message: '请填写标题', trigger: 'blur' },
+          { required: true, message: this.$t('请填写标题'), trigger: 'blur' },
         ],
         sys_enterpriseid: [
-          { required: true, message: '请选择客户', trigger: 'change' },
+          { required: true, message: this.$t('请选择客户'), trigger: 'change' },
         ],
         ascription_title: [
-          { required: true, message: '请选择项目合同', trigger: 'change' },
+          { required: true, message: this.$t('请选择项目合同'), trigger: 'change' },
         ],
         begdate: [
-          { required: true, message: '请选择生效日期', trigger: 'blur' },
+          { required: true, message: this.$t('请选择生效日期'), trigger: 'blur' },
         ],
         projectname: [
-          { required: true, message: '请选择项目', trigger: 'change' },
+          { required: true, message: this.$t('请选择项目'), trigger: 'change' },
         ],
         salername: [
-          { required: true, message: '请选择业务员', trigger: 'change' },
+          { required: true, message: this.$t('请选择业务员'), trigger: 'change' },
         ],
         paytype: [
-          { required: true, message: '请选择付款条件', trigger: 'change' },
+          { required: true, message: this.$t('请选择付款条件'), trigger: 'change' },
         ],
         reminddays: [
-          { required: true, message: '请设置发货日期提醒天数', trigger: 'blur' },
+          { required: true, message: this.$t('请设置发货日期提醒天数'), trigger: 'blur' },
         ],
         enterprisename: [
-          { required: true, message: '请选择', trigger: 'change' },
+          { required: true, message: this.$t('请选择'), trigger: 'change' },
         ],
         signdate: [
-          { required: true, message: '请填写签约时间', trigger: 'change' },
+          { required: true, message: this.$t('请填写签约时间'), trigger: 'change' },
         ],
         productdiscount: [
-          { message: '必须为数字', type:'number', trigger: 'change' },
-          { required: true, message: '请填写折扣', trigger: 'blur' },
+          { message: this.$t('必须为数字'), type:'number', trigger: 'change' },
+          { required: true, message: this.$t('请填写折扣'), trigger: 'blur' },
           { validator: NumberSize, trigger: 'blur'},
 
         ],
         orderratio: [
-          { message: '必须为数字', type:'number', trigger: 'change' },
-          { required: true, message: '请填写折扣', trigger: 'blur' },
+          { message: this.$t('必须为数字'), type:'number', trigger: 'change' },
+          { required: true, message: this.$t('请填写折扣'), trigger: 'blur' },
           { validator: NumberSize, trigger: 'blur'},
 
         ],
         salername: [
-          { required: true, message: '请选择合作伙伴', trigger: 'change' },
+          { required: true, message: this.$t('请选择合作伙伴'), trigger: 'change' },
         ],
         discountrate: [
           { validator: NumberSize, trigger: 'blur'},

+ 3 - 3
src/HDrpManagement/projectChange/modules/modules/productSet/Select.vue

@@ -3,7 +3,7 @@
     <div>
       <ul class="flex-align-center normal-margin-new">
 <!--        <li style="color:#999;font-size: 13px;">{{$t('领域')}}:</li>-->
-        <li :class="field_act === item.value?'act':''" class="brand-item" style="margin-left:0" v-for="item in fields" :key="item.value" @click="clickField(item)">{{item.value}}</li>
+        <li :class="field_act === item.value?'act':''" class="brand-item" style="margin-left:0" v-for="item in fields" :key="item.value" @click="clickField(item)">{{$t(item.value)}}</li>
       </ul>
 <!--      <ul class="flex-align-center normal-margin">
         <li style="color:#999;font-size: 13px;">标准:</li>
@@ -15,8 +15,8 @@
       </ul>
       <ul class="flex-align-center normal-margin-new">
 <!--        <li style="color:#999;font-size: 13px;">分类:</li>-->
-        <li  :class="class_act === ''?'act':''" class="brand-item border-all" @click="clickClass('')">全部分类</li>
-        <li :class="class_act === item.itemclassnum?'act':''" class="brand-item margin-notAll" v-for="item in itemclass" :key="item.itemclassnum" @click="clickClass(item)">{{item.itemclassname}}</li>
+        <li  :class="class_act === ''?'act':''" class="brand-item border-all" @click="clickClass('')">{{$t('全部分类')}}</li>
+        <li :class="class_act === item.itemclassnum?'act':''" class="brand-item margin-notAll" v-for="item in itemclass" :key="item.itemclassnum" @click="clickClass(item)">{{$t(item.itemclassname)}}</li>
       </ul>
       <classTree style="padding-left:80px" :data="activeClass.subdep" @onClassChange="change"></classTree>
     </div>

+ 1 - 1
src/HDrpManagement/projectChange/modules/modules/productSet/classTree.vue

@@ -2,7 +2,7 @@
   <div>
     <div class="flex-align-center">
       <div v-for="item in data" :key="item.index" @click="classClick(item)">
-        <p class="normal-margin class-item"  :class="class_act === item.itemclassnum?'act':''">{{item.itemclassname}}</p>
+        <p class="normal-margin class-item"  :class="class_act === item.itemclassnum?'act':''">{{$t(item.itemclassname)}}</p>
         <Tree v-if="item.subdep" :data="item.subdep" @onClassChange="change"></Tree>
       </div>
     </div>

+ 490 - 320
src/HDrpManagement/projectChange/modules/modules/productSet/index.vue

@@ -2,15 +2,35 @@
 <template>
   <div>
     <div style="margin-bottom: 15px">
-      <addProduct ref="addProduct" @uploadData="uploadData" @closeDrawer="listData"
-                  :tradefield="data.tradefield" v-if="tool.checkAuth($route.name,'productSetManage') && data.disabled && data.status !== '已失败' && data.status !== '已结案'"
-                  class="inline-16" :params="paramsAdd" title="添 加"
-                  @addSuccess="addProducts" :discountrate="discountrate" @addProduct="addProduct" :tablecolsAdd="tablecolsAdd"
+      <addProduct
+        ref="addProduct"
+        @uploadData="uploadData"
+        @closeDrawer="listData"
+        :tradefield="data.tradefield"
+        v-if="
+          tool.checkAuth($route.name, 'productSetManage') &&
+          data.disabled &&
+          data.status !== '已失败' &&
+          data.status !== '已结案'
+        "
+        class="inline-16"
+        :params="paramsAdd"
+        :title="$t(`添 加`)"
+        @addSuccess="addProducts"
+        :discountrate="discountrate"
+        @addProduct="addProduct"
+        :tablecolsAdd="tablecolsAdd"
       >
-      <!--阀门选型-->
-      <selectOption position="项目" slot="optionSystem" style="margin-left: 10px" @handleParam="handleOptionParam"  v-if="tool.checkAuth($route.name,'optionSystem')"></selectOption>
-    </addProduct>
-<!--      <uploadAllData
+        <!--阀门选型-->
+        <selectOption
+          position="项目"
+          slot="optionSystem"
+          style="margin-left: 10px"
+          @handleParam="handleOptionParam"
+          v-if="tool.checkAuth($route.name, 'optionSystem')"
+        ></selectOption>
+      </addProduct>
+      <!--      <uploadAllData
           v-if="tool.checkAuth($route.name,'productSetManage') && data.disabled "
           class="inline-16"
           :total="total"
@@ -20,323 +40,469 @@
           idName="sa_project_itemsid"
           type="del"
       ></uploadAllData>-->
-      <el-button type="primary" size="small" v-if="tool.checkAuth($route.name,'productSetManage') && data.disabled && data.status !== '已失败' && data.status !== '已结案'" @click="onDelAll">一键删除</el-button>
-      <el-button  v-if="tool.checkAuth($route.name,'productSetManage') && data.disabled  && data.status !== '已失败' && data.status !== '已结案'" class="inline-16" size="small" :type="delProductData.length === 0?'':'primary'" @click="onDelProduct" :disabled="delProductData.length === 0">{{$t(`删 除`)}}</el-button>
+      <el-button
+        type="primary"
+        size="small"
+        v-if="
+          tool.checkAuth($route.name, 'productSetManage') &&
+          data.disabled &&
+          data.status !== '已失败' &&
+          data.status !== '已结案'
+        "
+        @click="onDelAll"
+        >{{$t('一键删除')}}</el-button
+      >
+      <el-button
+        v-if="
+          tool.checkAuth($route.name, 'productSetManage') &&
+          data.disabled &&
+          data.status !== '已失败' &&
+          data.status !== '已结案'
+        "
+        class="inline-16"
+        size="small"
+        :type="delProductData.length === 0 ? '' : 'primary'"
+        @click="onDelProduct"
+        :disabled="delProductData.length === 0"
+        >{{ $t(`删 除`) }}</el-button
+      >
       <el-input
-          size="small"
-          style="width: 200px;"
-          :suffix-icon="params.content.where.condition?params.content.where.condition.length > 0?'':'':'el-icon-search'"
-          v-model="params.content.where.condition"
-          placeholder="产品名称,产品编号,品号"
-          @keyup.enter.native="listData(params.content.pageNumber= 1)"
-          @clear="listData(params.content.pageNumber= 1)"
-          clearable class="inline-16"></el-input>&nbsp;
-      <importFile class="inline-16" accept=".xlsx" v-if="tool.checkAuth($route.name,'productSetManage') && data.disabled && data.status !== '已失败' && data.status !== '已结案' " :bindData="{ownertable:'projectSetTable',ownerid:'',usetype:'default'}" paramId="20231121132504" @onSuccess="importSuccess">
-        <a class="error-link" v-if="errorurl" :href="errorurl" slot="errorFile">{{$t('下载错误数据')}}</a>
+        size="small"
+        style="width: 200px"
+        :suffix-icon="
+          params.content.where.condition
+            ? params.content.where.condition.length > 0
+              ? ''
+              : ''
+            : 'el-icon-search'
+        "
+        v-model="params.content.where.condition"
+        :placeholder="$t(`产品名称,产品编号,品号`)"
+        @keyup.enter.native="listData((params.content.pageNumber = 1))"
+        @clear="listData((params.content.pageNumber = 1))"
+        clearable
+        class="inline-16"
+      ></el-input
+      >&nbsp;
+      <importFile
+        class="inline-16"
+        accept=".xlsx"
+        v-if="
+          tool.checkAuth($route.name, 'productSetManage') &&
+          data.disabled &&
+          data.status !== '已失败' &&
+          data.status !== '已结案'
+        "
+        :bindData="{
+          ownertable: 'projectSetTable',
+          ownerid: '',
+          usetype: 'default',
+        }"
+        paramId="20231121132504"
+        @onSuccess="importSuccess"
+      >
+        <a
+          class="error-link"
+          v-if="errorurl"
+          :href="errorurl"
+          slot="errorFile"
+          >{{ $t("下载错误数据") }}</a
+        >
       </importFile>
       <div style="float: right">
-        <label class="search__label">预计折扣(%):</label>
-        <el-input style="width: 100px;" v-model="discountrate" size="small"   label="默认折扣"  :disabled="!tool.checkAuth($route.name,'productSetManage') || !data.disabled || data.status === '已失败' || data.status === '已结案'" @change="discountrateChange(discountrate)"></el-input>
+        <label class="search__label">{{$t('预计折扣')}}(%):</label>
+        <el-input
+          style="width: 100px"
+          v-model="discountrate"
+          size="small"
+          :label="$t(`默认折扣`)"
+          :disabled="
+            !tool.checkAuth($route.name, 'productSetManage') ||
+            !data.disabled ||
+            data.status === '已失败' ||
+            data.status === '已结案'
+          "
+          @change="discountrateChange(discountrate)"
+        ></el-input>
       </div>
     </div>
     <div class="produtMag-panel">
       <SetOrder ref="setOrder"></SetOrder>
-      <tableLayout :layout="tablecols" checkbox="true"  :data="list" :opwidth="200" height="calc(100vh - 550px)" :width="true" :custom="true" fixedName="amount" @selectionChange="selectionChange">
+      <tableLayout
+        :layout="tablecols"
+        checkbox="true"
+        :data="list"
+        :opwidth="200"
+        height="calc(100vh - 550px)"
+        :width="true"
+        :custom="true"
+        fixedName="amount"
+        @selectionChange="selectionChange"
+      >
         <template v-slot:customcol="scope">
           <div v-if="scope.column.columnname == 'qty'">
-            <el-input-number  v-model="scope.column.data.qty" size="mini" :min="scope.column.data.orderminqty" :step="scope.column.data.orderaddqty"  label="描述文字" @change="numChange(scope.column.data.qty,scope.$index,scope.column.data)" :disabled="!disabled || !tool.checkAuth($route.name,'productSetManage') || data.status === '已失败' || data.status === '已结案' "></el-input-number>
+            <el-input-number
+              v-model="scope.column.data.qty"
+              size="mini"
+              :min="scope.column.data.orderminqty"
+              :step="scope.column.data.orderaddqty"
+              :label="$t(`描述文字`)"
+              @change="
+                numChange(
+                  scope.column.data.qty,
+                  scope.$index,
+                  scope.column.data
+                )
+              "
+              :disabled="
+                !disabled ||
+                !tool.checkAuth($route.name, 'productSetManage') ||
+                data.status === '已失败' ||
+                data.status === '已结案'
+              "
+            ></el-input-number>
           </div>
           <div v-else-if="scope.column.columnname == 'itemname'">
             <div v-if="scope.column.data.sa_lectotypecfgid">
-              <el-tooltip class="item" effect="dark" content="点击查看选型配置单" placement="top-start">
-                <el-button size="small" type="text" @click="$refs.setOrder.onShow(scope.column.data.sa_lectotypecfgid)">{{ scope.column.data.itemname }}</el-button>
+              <el-tooltip
+                class="item"
+                effect="dark"
+                content="点击查看选型配置单"
+                placement="top-start"
+              >
+                <el-button
+                  size="small"
+                  type="text"
+                  @click="
+                    $refs.setOrder.onShow(scope.column.data.sa_lectotypecfgid)
+                  "
+                  >{{ scope.column.data.itemname }}</el-button
+                >
               </el-tooltip>
             </div>
             <div v-else>{{ scope.column.data.itemname }}</div>
           </div>
           <div v-else-if="scope.column.columnname == 'price'">
-            <el-input v-model="scope.column.data.price" size="mini"    @change="priceChange(scope.column.data.price,scope.$index,scope.column.data)" :disabled="!disabled || !tool.checkAuth($route.name,'productSetManage') || data.status === '已失败' || data.status === '已结案' "></el-input>
+            <el-input
+              v-model="scope.column.data.price"
+              size="mini"
+              @change="
+                priceChange(
+                  scope.column.data.price,
+                  scope.$index,
+                  scope.column.data
+                )
+              "
+              :disabled="
+                !disabled ||
+                !tool.checkAuth($route.name, 'productSetManage') ||
+                data.status === '已失败' ||
+                data.status === '已结案'
+              "
+            ></el-input>
           </div>
           <div v-else-if="scope.column.columnname == 'itemno'">
-            <span :style="scope.column.data.itemid?'':'color:red'">{{ scope.column.data.itemno }}</span>
+            <span :style="scope.column.data.itemid ? '' : 'color:red'">{{
+              scope.column.data.itemno
+            }}</span>
           </div>
           <div v-else-if="scope.column.columnname == 'marketprice'">
-            <span>{{tool.formatAmount((scope.column.data.marketprice),2)}}</span>
+            <span>{{
+              tool.formatAmount(scope.column.data.marketprice, 2)
+            }}</span>
           </div>
           <div v-else-if="scope.column.columnname == 'amount'">
-            <span>{{tool.formatAmount((scope.column.data.amount),2)}}</span>
+            <span>{{ tool.formatAmount(scope.column.data.amount, 2) }}</span>
           </div>
-          <span v-else>{{$t(scope.column.data[scope.column.columnname])}}</span>
+          <span v-else>{{
+            $t(scope.column.data[scope.column.columnname])
+          }}</span>
         </template>
       </tableLayout>
-      <div style="margin-top:16px;">
+      <div style="margin-top: 16px">
         <div style="float: left">
-          <span>金额(元):{{totalPrice?tool.formatAmount(totalPrice,2):'0.00'}}</span>
+          <span
+            >{{$t('金额(元)')}}:{{
+              totalPrice ? tool.formatAmount(totalPrice, 2) : "0.00"
+            }}</span
+          >
         </div>
         <div style="float: right">
           <el-pagination
-              background
-              @size-change="handleSizeChange"
-              @current-change="handleCurrentChange"
-              :current-page="params.content.pageNumber"
-              :page-sizes="[20, 50, 100, 200]"
-              :page-size="100"
-              layout="total,sizes, prev, pager, next, jumper"
-              :total="total">
+            background
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="params.content.pageNumber"
+            :page-sizes="[20, 50, 100, 200]"
+            :page-size="100"
+            layout="total,sizes, prev, pager, next, jumper"
+            :total="total"
+          >
           </el-pagination>
         </div>
-
       </div>
     </div>
   </div>
 </template>
 
 <script>
-import add from './add'
-import addProduct from '@/template/addProduct'
+import add from "./add";
+import addProduct from "@/template/addProduct";
 import edit from "@/HDrpManagement/projectChange/modules/modules/andEnterprise/components/edit";
 import to_del from "@/HDrpManagement/projectChange/modules/modules/andEnterprise/components/toDel";
 import uploadFile from "@/components/upload/hw_obs_upload";
 import previewImage from "@/components/previewImage";
-import delete_product from './deleteProduct'
-import uploadAllData from '@/components/uploadAllData/index'
-import importFile from '@/template/importFile/index'
-import SelectOption from '@/optionSystem/selectOption/add.vue'
-import SetOrder from '@/optionSystem/selectOption/components/setOrder.vue'
+import delete_product from "./deleteProduct";
+import uploadAllData from "@/components/uploadAllData/index";
+import importFile from "@/template/importFile/index";
+import SelectOption from "@/optionSystem/selectOption/add.vue";
+import SetOrder from "@/optionSystem/selectOption/components/setOrder.vue";
 export default {
-  props:["data","disabled","flagTag","isLeader"],
-  components:{add,uploadAllData,addProduct,uploadFile, previewImage,delete_product,importFile,SelectOption,SetOrder},
-  data () {
+  props: ["data", "disabled", "flagTag", "isLeader"],
+  components: {
+    add,
+    uploadAllData,
+    addProduct,
+    uploadFile,
+    previewImage,
+    delete_product,
+    importFile,
+    SelectOption,
+    SetOrder,
+  },
+  data() {
     return {
-      errorurl:null,
-      folderid:JSON.parse(sessionStorage.getItem('folderid')).appfolderid,
-      tableHieght:"860px",
-      totalPrice:0,
-      tablecols:[],
-      tablecolsAdd:[],
-      list:[],
-      total:0,
-      currentPage:0,
-      search:'',
-      options:[],
-      productList:'',
-      delProductData:[],
-      discountrate:'',
-      paramsAdd:{
-        "id": 20221021171802,
-        "content": {
-          "sa_projectid": this.$route.query.id,
-          "pageNumber": 1,
-          "pageSize": 100,
-          "where": {
-            "condition": "",
-            "tradefield": "",
-            "standards": "",
-            "itemclassid": "",
-            "sa_brandid": "",
-            "model":"",
-            "spec":"",
-            "material":''
-          }
+      errorurl: null,
+      folderid: JSON.parse(sessionStorage.getItem("folderid")).appfolderid,
+      tableHieght: "860px",
+      totalPrice: 0,
+      tablecols: [],
+      tablecolsAdd: [],
+      list: [],
+      total: 0,
+      currentPage: 0,
+      search: "",
+      options: [],
+      productList: "",
+      delProductData: [],
+      discountrate: "",
+      paramsAdd: {
+        id: 20221021171802,
+        content: {
+          sa_projectid: this.$route.query.id,
+          pageNumber: 1,
+          pageSize: 100,
+          where: {
+            condition: "",
+            tradefield: "",
+            standards: "",
+            itemclassid: "",
+            sa_brandid: "",
+            model: "",
+            spec: "",
+            material: "",
+          },
         },
       },
-      params:{
-        "id": 20221021145702,
-        "content": {
-          "sa_projectid": this.$route.query.id,
-          "pageNumber": 1,
-          "pageSize": 100,
-          "where": {
-            "condition": ""
-          }
+      params: {
+        id: 20221021145702,
+        content: {
+          sa_projectid: this.$route.query.id,
+          pageNumber: 1,
+          pageSize: 100,
+          where: {
+            condition: "",
+          },
         },
       },
-      items:[]
-    }
+      items: [],
+    };
   },
-  provide () {
+  provide() {
     return {
-      productList:() => this.productList
-    }
+      productList: () => this.productList,
+    };
   },
-  methods:{
+  methods: {
     /*list (vm) {
       vm.content.sa_projectid = this.$route.query.id
     },*/
     //处理选型请求参数
-    handleOptionParam (param) {
-      param.content.enterprisename = this.data.enterprisename
-      param.content.projectname = this.data.projectname
-      param.content.sourcetable = 'sa_project'
-      param.content.source = `项目配置:${this.data.projectname}`
+    handleOptionParam(param) {
+      param.content.enterprisename = this.data.enterprisename;
+      param.content.projectname = this.data.projectname;
+      param.content.sourcetable = "sa_project";
+      param.content.source = `项目配置:${this.data.projectname}`;
     },
-    async listData(){
-      this.discountrate = Math.round((this.data.discountrate * 100) * 100) / 100
-      this.totalPrice = 0
-      this.params.content.sa_projectid = this.data.sa_projectid
-      const res = await this.$api.requested(this.params)
-      this.list = res.data
-      res.data.forEach((e,index)=>{
-        this.list[index].price = this.list[index].price.toFixed(2)
-      })
-      this.totalPrice = res.tips.amount
-      this.total = res.total
-      this.$emit("delSuccess")
+    async listData() {
+      this.discountrate = Math.round(this.data.discountrate * 100 * 100) / 100;
+      this.totalPrice = 0;
+      this.params.content.sa_projectid = this.data.sa_projectid;
+      const res = await this.$api.requested(this.params);
+      this.list = res.data;
+      res.data.forEach((e, index) => {
+        this.list[index].price = this.list[index].price.toFixed(2);
+      });
+      this.totalPrice = res.tips.amount;
+      this.total = res.total;
+      this.$emit("delSuccess");
     },
-    uploadData (uploadApi,data) {
-      uploadApi.id = 20221021145502
+    uploadData(uploadApi, data) {
+      uploadApi.id = 20221021145502;
       uploadApi.content = {
-        "sa_projectid": this.$route.query.id, //订单ID
-        "items": data.map(e=>{
+        sa_projectid: this.$route.query.id, //订单ID
+        items: data.map((e) => {
           return {
-            sa_project_itemsid:0,
-            itemid:e.itemid,
-            qty:e.orderminqty,
-            remarks:e.remarks,
-            marketprice:e.marketprice,
-            price:(e.marketprice * (this.discountrate / 100)).toFixed(4)
-          }
-        })
-      }
+            sa_project_itemsid: 0,
+            itemid: e.itemid,
+            qty: e.orderminqty,
+            remarks: e.remarks,
+            marketprice: e.marketprice,
+            price: (e.marketprice * (this.discountrate / 100)).toFixed(4),
+          };
+        }),
+      };
     },
     /*一键删除*/
-    handlePullApi (pullApi) {
-      pullApi.content = JSON.parse(JSON.stringify(this.params.content))
-      pullApi.id = 20221021145702
-      pullApi.content.sa_projectid = this.$route.query.id
+    handlePullApi(pullApi) {
+      pullApi.content = JSON.parse(JSON.stringify(this.params.content));
+      pullApi.id = 20221021145702;
+      pullApi.content.sa_projectid = this.$route.query.id;
     },
-    handleDelApi (delApi,data) {
-      delApi.id = 20221021145602
+    handleDelApi(delApi, data) {
+      delApi.id = 20221021145602;
       delApi.content = {
-        "deletereason": "",
-        "sa_projectid":this.$route.query.id,
-        "sa_project_itemsids":data,
-        "pageNumber":0,
-        "pageSize":0
-      }
-      this.listData()
+        deletereason: "",
+        sa_projectid: this.$route.query.id,
+        sa_project_itemsids: data,
+        pageNumber: 0,
+        pageSize: 0,
+      };
+      this.listData();
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
-      this.params.content.pageSize = val
-      this.listData()
+      this.params.content.pageSize = val;
+      this.listData();
     },
     handleCurrentChange(val) {
       // console.log(`当前页: ${val}`);
-      this.params.content.pageNumber = val
-      this.listData()
+      this.params.content.pageNumber = val;
+      this.listData();
     },
     /*批量新增*/
-    async addProducts(items){
-      this.items = []
-      this.items = items.map(e=>{
+    async addProducts(items) {
+      this.items = [];
+      this.items = items.map((e) => {
         return {
-          sa_project_itemsid:0,
-          itemid:e.itemid,
-          qty:e.orderminqty,
-          remarks:e.remarks,
-          marketprice:e.marketprice,
-          price:(e.marketprice * (this.discountrate / 100)).toFixed(4)
-        }
-      })
+          sa_project_itemsid: 0,
+          itemid: e.itemid,
+          qty: e.orderminqty,
+          remarks: e.remarks,
+          marketprice: e.marketprice,
+          price: (e.marketprice * (this.discountrate / 100)).toFixed(4),
+        };
+      });
       const res = await this.$api.requested({
-        "id": 20221021145502,
-        "content": {
-          "sa_projectid": this.$route.query.id,
-          "items": this.items
+        id: 20221021145502,
+        content: {
+          sa_projectid: this.$route.query.id,
+          items: this.items,
         },
-      })
-      this.$refs.addProduct.listData()
-      this.listData()
+      });
+      this.$refs.addProduct.listData();
+      this.listData();
     },
     /*单个新增商品*/
-    async addProduct(items){
+    async addProduct(items) {
       const res = await this.$api.requested({
-        "id": 20221021145502,
-        "content": {
-          "sa_projectid": this.$route.query.id,
-          "items": [
+        id: 20221021145502,
+        content: {
+          sa_projectid: this.$route.query.id,
+          items: [
             {
-              "sa_project_itemsid":0,
-              "itemid": items.itemid,
-              "qty": items.orderminqty,
-              "remarks": "",
-              "marketprice":items.marketprice,
-              "price":(items.marketprice * (this.discountrate / 100)).toFixed(4)
-            }
-          ]
+              sa_project_itemsid: 0,
+              itemid: items.itemid,
+              qty: items.orderminqty,
+              remarks: "",
+              marketprice: items.marketprice,
+              price: (items.marketprice * (this.discountrate / 100)).toFixed(4),
+            },
+          ],
         },
-      })
-      this.$refs.addProduct.listData()
-      this.listData()
+      });
+      this.$refs.addProduct.listData();
+      this.listData();
     },
-    onSuccess(){
-      this.listData()
-      this.$emit("productSetSuccess")
+    onSuccess() {
+      this.listData();
+      this.$emit("productSetSuccess");
     },
-    clearData(){
-      this.search = ""
-      this.params.content.where.condition = this.search
-      this.listData()
+    clearData() {
+      this.search = "";
+      this.params.content.where.condition = this.search;
+      this.listData();
     },
-    queryClick(){
-      this.params.content.where.condition = this.search
-      this.listData()
+    queryClick() {
+      this.params.content.where.condition = this.search;
+      this.listData();
     },
-    selectionChange(val){
-      this.delProductData = []
-      val.forEach((item,index) => {
-        this.delProductData[index] = item.sa_project_itemsid
-      })
+    selectionChange(val) {
+      this.delProductData = [];
+      val.forEach((item, index) => {
+        this.delProductData[index] = item.sa_project_itemsid;
+      });
     },
     /*批量删除判断*/
     onDelProduct() {
-      this.$confirm('此操作将删除这些商品, 是否继续?', this.$t('提示'), {
-        confirmButtonText: this.$t('确定'),
-        cancelButtonText: this.$t('取消'),
-        type: 'warning'
-      }).then(() => {
-        this.delProduct()
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '取消删除'
+      this.$confirm(this.$t('此操作将删除这些商品, 是否继续')+"?", this.$t("提示"), {
+        confirmButtonText: this.$t("确定"),
+        cancelButtonText: this.$t("取消"),
+        type: "warning",
+      })
+        .then(() => {
+          this.delProduct();
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: this.$t("取消删除"),
+          });
         });
-      });
     },
     /*批量删除商品*/
-    async delProduct(){
+    async delProduct() {
       const res = await this.$api.requested({
-        "id": 20221021145602,
-        "content": {
-          "deletereason": "",
-          "sa_projectid":this.data.sa_projectid,
-          "sa_project_itemsids":this.delProductData
+        id: 20221021145602,
+        content: {
+          deletereason: "",
+          sa_projectid: this.data.sa_projectid,
+          sa_project_itemsids: this.delProductData,
         },
-      })
-      this.tool.showMessage(res,()=>{
-        this.listData()
-        this.$emit("delSuccess")
-      })
+      });
+      this.tool.showMessage(res, () => {
+        this.listData();
+        this.$emit("delSuccess");
+      });
     },
     /*修改商品数量*/
-    numChange(val,index,data){
-      if (val < data.orderminqty){
-        data.qty = data.orderminqty.toFixed(2)
-      }else {
-        if ((val - data.orderminqty)/data.orderaddqty > 0){
-          let k = ((val - data.orderminqty)/data.orderaddqty).toFixed(0)
-          data.qty = k * data.orderaddqty + data.orderminqty
-        }else {
-          data.qty = val.toFixed(2)
+    numChange(val, index, data) {
+      if (val < data.orderminqty) {
+        data.qty = data.orderminqty.toFixed(2);
+      } else {
+        if ((val - data.orderminqty) / data.orderaddqty > 0) {
+          let k = ((val - data.orderminqty) / data.orderaddqty).toFixed(0);
+          data.qty = k * data.orderaddqty + data.orderminqty;
+        } else {
+          data.qty = val.toFixed(2);
         }
       }
-      data.amount = (data.price * data.qty).toFixed(2)
-      this.$set(this.list,index,data)
-      this.onChangQty(data,data.qty)
+      data.amount = (data.price * data.qty).toFixed(2);
+      this.$set(this.list, index, data);
+      this.onChangQty(data, data.qty);
     },
     /*修改单价*/
-    priceChange(val,index,data){
+    priceChange(val, index, data) {
       // if (val > data.marketprice){
       //   data.price = this.tool.formatAmount(data.marketprice,2)
       // }else if(val < 0) {
@@ -344,59 +510,59 @@ export default {
       // }else {
       //   data.price = this.tool.formatAmount(val ,2)
       // }
-       if(val < 0) {
-        data.price = 0
-      }else {
-        data.price = this.tool.formatAmount(val ,2)
+      if (val < 0) {
+        data.price = 0;
+      } else {
+        data.price = this.tool.formatAmount(val, 2);
       }
-      data.amount = this.tool.formatAmount(data.price * data.qty,2)
-      this.$set(this.list,index,data)
-      this.onChangePrice(data,data.price)
+      data.amount = this.tool.formatAmount(data.price * data.qty, 2);
+      this.$set(this.list, index, data);
+      this.onChangePrice(data, data.price);
     },
     /*执行修改数量*/
-    async onChangQty(data,val){
+    async onChangQty(data, val) {
       const res = await this.$api.requested({
-        "id": 20221021145502,
-        "content": {
-          "sa_projectid": this.data.sa_projectid,
-          "items": [
+        id: 20221021145502,
+        content: {
+          sa_projectid: this.data.sa_projectid,
+          items: [
             {
-              "sa_project_itemsid":data.sa_project_itemsid,
-              "itemid": data.itemid,
-              "qty": val,
-              "remarks": "",
-              "marketprice": data.marketprice, //市场价
-              "price": data.price //单价
-            }
-          ]
-        }
-      })
-      this.listData()
-      this.$emit("productSetSuccess")
+              sa_project_itemsid: data.sa_project_itemsid,
+              itemid: data.itemid,
+              qty: val,
+              remarks: "",
+              marketprice: data.marketprice, //市场价
+              price: data.price, //单价
+            },
+          ],
+        },
+      });
+      this.listData();
+      this.$emit("productSetSuccess");
     },
     /*执行修改单价*/
-    async onChangePrice(data,val){
+    async onChangePrice(data, val) {
       const res = await this.$api.requested({
-        "id": 20221021145502,
-        "content": {
-          "sa_projectid": this.data.sa_projectid,
-          "items": [
+        id: 20221021145502,
+        content: {
+          sa_projectid: this.data.sa_projectid,
+          items: [
             {
-              "sa_project_itemsid":data.sa_project_itemsid,
-              "itemid": data.itemid,
-              "qty": data.qty,
-              "remarks": "",
-              "marketprice": data.marketprice, //市场价
-              "price": val //单价
-            }
-          ]
-        }
-      })
-      this.listData()
-      this.$emit("productSetSuccess")
+              sa_project_itemsid: data.sa_project_itemsid,
+              itemid: data.itemid,
+              qty: data.qty,
+              remarks: "",
+              marketprice: data.marketprice, //市场价
+              price: val, //单价
+            },
+          ],
+        },
+      });
+      this.listData();
+      this.$emit("productSetSuccess");
     },
     /*修改预计折扣*/
-    async discountrateChange(val){
+    async discountrateChange(val) {
       // if (val > 100){
       //   this.discountrate = 100
       // }else if(val < 0){
@@ -404,85 +570,89 @@ export default {
       // }else {
       //   this.discountrate = Math.round(val * 100)/100
       // }
-      if(val < 0){
-        this.discountrate = 0
-      }else {
-        this.discountrate = Math.round(val * 100)/100
+      if (val < 0) {
+        this.discountrate = 0;
+      } else {
+        this.discountrate = Math.round(val * 100) / 100;
       }
-     /* this.discountrate = (this.discountrate / 100).toFixed(4)*/
+      /* this.discountrate = (this.discountrate / 100).toFixed(4)*/
       const res = await this.$api.requested({
-        "id": 20230207090702,
-        "content": {
-          "sa_projectid": this.$route.query.id,
-          "discountrate": (this.discountrate / 100).toFixed(4)
+        id: 20230207090702,
+        content: {
+          sa_projectid: this.$route.query.id,
+          discountrate: (this.discountrate / 100).toFixed(4),
         },
-      })
-      this.tool.showMessage(res,()=>{
-        this.data.discountrate = this.discountrate / 100
-        this.$emit("productSetSuccess")
-        this.listData()
-      })
+      });
+      this.tool.showMessage(res, () => {
+        this.data.discountrate = this.discountrate / 100;
+        this.$emit("productSetSuccess");
+        this.listData();
+      });
     },
     /*一键删除*/
-    async onDelAll(){
+    async onDelAll() {
       const res = await this.$api.requested({
-        "id": 20230629150902,
-        "content": {
-          "sa_projectid": this.$route.query.id
+        id: 20230629150902,
+        content: {
+          sa_projectid: this.$route.query.id,
         },
-      })
-      this.tool.showMessage(res,()=>{
-        this.$emit("productSetSuccess")
-        this.listData()
-      })
+      });
+      this.tool.showMessage(res, () => {
+        this.$emit("productSetSuccess");
+        this.listData();
+      });
     },
-    async importSuccess(val){
+    async importSuccess(val) {
       const res = await this.$api.requested({
-        "id": "20231121132604",
-        "content": {
-          "sa_projectid": this.$route.query.id,
-          "attachmentid":val
-        }
-      })
-      if (res.data !== '成功'){
-        this.errorurl = res.data
+        id: "20231121132604",
+        content: {
+          sa_projectid: this.$route.query.id,
+          attachmentid: val,
+        },
+      });
+      if (res.data !== "成功") {
+        this.errorurl = res.data;
       }
-      this.onSuccess()
-
-    }
+      this.onSuccess();
+    },
   },
   created() {
     /*this.getProductList()*/
     /*this.tablecols = this.tool.tabelCol(this.$route.name).projectSetTable.tablecols*/
-    this.tablecols = this.tool.tabelCol(this.$route.name).projectSetTable.tablecols
-    this.tablecolsAdd = this.tool.tabelCol(this.$route.name).addProductTable.tablecols
-   /* this.data.discountrate = Math.round((this.data.discountrate * 100) * 100) / 100*/
+    this.tablecols = this.tool.tabelCol(
+      this.$route.name
+    ).projectSetTable.tablecols;
+    this.tablecolsAdd = this.tool.tabelCol(
+      this.$route.name
+    ).addProductTable.tablecols;
+    /* this.data.discountrate = Math.round((this.data.discountrate * 100) * 100) / 100*/
   },
-  mounted () {
-    this.listData()
-  }
-}
-
+  mounted() {
+    this.listData();
+  },
+};
 </script>
 <style scoped>
 /* /deep/.el-table__cell .cell {
   display: flex;
   justify-content: s;
 } */
-.produtMag-panel{
+.produtMag-panel {
   /* margin: 30px; */
-  padding:0 10px 10px 10px;
+  padding: 0 10px 10px 10px;
   background: #fff;
-  border-radius:5px;
+  border-radius: 5px;
   overflow: hidden;
-  border:1px solid rgb(0 0 0 / 5%)
+  border: 1px solid rgb(0 0 0 / 5%);
   /* box-shadow: 0 5px 5px rgb(0 0 0 / 10%);
   transform: translate3d(0,-2px,0); */
 }
-/deep/ .el-input.is-disabled .el-input__inner{
+/deep/ .el-input.is-disabled .el-input__inner {
   color: #666666;
 }
 .image {
-  width:38px;height:38px;margin:0px auto;
+  width: 38px;
+  height: 38px;
+  margin: 0px auto;
 }
 </style>

+ 11 - 11
src/HDrpManagement/projectChange/modules/modules/quotation/modules/add.vue

@@ -163,7 +163,7 @@
                       :value="item.value"
                   >
                     <span style="float: left">{{ $t(item.value) }}</span>
-                    <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:$t('暂无描述') }}</span>
+                    <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?$t(item.remarks):$t('暂无描述') }}</span>
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -318,26 +318,26 @@ export default {
       },
       rules:{
         projectname:[
-          { required: true, message: '请选择项目', trigger: 'change'},
+          { required: true, message: this.$t('请选择项目'), trigger: 'change'},
         ],
         enterprisename:[
-          { required: true, message: '请选择客户', trigger: 'change'},
+          { required: true, message: this.$t('请选择客户'), trigger: 'change'},
         ],
         date:[
-          { required: true, message: '请选择有效期', trigger: 'change'},
+          { required: true, message: this.$t('请选择有效期'), trigger: 'change'},
         ],
         itemtype:[
-          { required: true, message: '请选择产品系列', trigger: 'change'},
+          { required: true, message: this.$t('请选择产品系列'), trigger: 'change'},
         ],
         discountrate:[
           { required: false, validator: discountrate, trigger: 'change'},
         ],
         quotedpriceamount:[
-          { required: true, message: '请填写报价金额', trigger: 'blur'},
-          { pattern:/^[0-9]+\.{0,1}[0-9]{0,4}$/,message: '输入不合法,请输入数值',trigger: 'blur'},
+          { required: true, message: this.$t('请填写报价金额'), trigger: 'blur'},
+          { pattern:/^[0-9]+\.{0,1}[0-9]{0,4}$/,message: this.$t('输入不合法,请输入数值'),trigger: 'blur'},
         ],
         name:[
-          { required: true, message: '请选择联系人', trigger: 'change'},
+          { required: true, message: this.$t('请选择联系人'), trigger: 'change'},
         ]
       },
       itemtype:[],
@@ -370,7 +370,7 @@ export default {
       }else {
         this.form.begdate = this.form.date[0]
         this.form.enddate = this.form.date[1]
-        this.form.quotedpricenotes[1] = "2、报价有限期" + this.form.begdate + "至" + this.form.enddate
+        this.form.quotedpricenotes[1] =this.$t( "2、报价有限期") + this.form.begdate + this.$t("至") + this.form.enddate
       }
 
       console.log(this.form,"form")
@@ -399,7 +399,7 @@ export default {
       }else {
         this.form.begdate = this.form.date[0]
         this.form.enddate = this.form.date[1]
-        this.form.quotedpricenotes[1] = "2、报价有限期" + this.form.begdate + "至" + this.form.enddate
+        this.form.quotedpricenotes[1] = this.$t("2、报价有限期") + this.form.begdate + this.$t("至") + this.form.enddate
       }
       this.$refs.form.validate(async (valid) => {
         if (!valid) return false
@@ -419,7 +419,7 @@ export default {
       }else {
         this.form.begdate = this.form.date[0]
         this.form.enddate = this.form.date[1]
-        this.form.quotedpricenotes[1] = "2、报价有限期" + this.form.begdate + "至" + this.form.enddate
+        this.form.quotedpricenotes[1] = this.$t("2、报价有限期") + this.form.begdate + this.$t("至") + this.form.enddate
       }
       this.$refs.form.validate(async (valid) => {
         if (!valid) return false

+ 6 - 6
src/HDrpManagement/projectData/index.vue

@@ -1426,7 +1426,7 @@
                             :label="$t(item.value)"
                             :value="item.value">
                           <span style="float: left">{{ $t(item.value) }}</span>
-                          <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:$t('暂无描述') }}</span>
+                          <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?$t(item.remarks):$t('暂无描述') }}</span>
                         </el-option>
                       </el-select>
                     </div>
@@ -1577,7 +1577,7 @@
                           :label="$t(item.value)"
                           :value="item.value">
                         <span style="float: left">{{ $t(item.value) }}</span>
-                        <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:$t('暂无描述') }}</span>
+                        <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?$t(item.remarks):$t('暂无描述') }}</span>
                       </el-option>
                     </el-select>
                   </div>
@@ -1590,7 +1590,7 @@
                           :label="$t(item.value)"
                           :value="item.value">
                         <span style="float: left">{{ $t(item.value) }}</span>
-                        <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:$t('暂无描述') }}</span>
+                        <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?$t(item.remarks):$t('暂无描述') }}</span>
                       </el-option>
                     </el-select>
                   </div>
@@ -1603,7 +1603,7 @@
                           :label="$t(item.value)"
                           :value="item.value">
                         <span style="float: left">{{ $t(item.value) }}</span>
-                        <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:$t('暂无描述') }}</span>
+                        <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?$t(item.remarks):$t('暂无描述') }}</span>
                       </el-option>
                     </el-select>
                   </div>
@@ -1678,7 +1678,7 @@
                     :label="$t(item.value)"
                     :value="item.value">
                   <span style="float: left">{{ $t(item.value) }}</span>
-                  <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:$t('暂无描述') }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?$t(item.remarks):$t('暂无描述') }}</span>
                 </el-option>
               </el-select>
             </div>
@@ -1691,7 +1691,7 @@
                     :label="$t(item.value)"
                     :value="item.value">
                   <span style="float: left">{{ $t(item.value) }}</span>
-                  <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:$t('暂无描述') }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?$t(item.remarks):$t('暂无描述') }}</span>
                 </el-option>
               </el-select>
             </div>

+ 2 - 2
src/HDrpManagement/projectPortrait/index.vue

@@ -52,7 +52,7 @@
                 :label="$t(item.value)"
                 :value="item.value">
               <span style="float: left">{{ $t(item.value) }}</span>
-              <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:$t('暂无描述') }}</span>
+              <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?$t(item.remarks):$t('暂无描述') }}</span>
             </el-option>
           </el-select>
         </div>
@@ -78,7 +78,7 @@
                 :label="$t(item.value)"
                 :value="item.value">
               <span style="float: left">{{ $t(item.value) }}</span>
-              <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:$t('暂无描述') }}</span>
+              <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?$t(item.remarks):$t('暂无描述') }}</span>
             </el-option>
           </el-select>
         </div>

+ 1 - 1
src/HDrpManagement/promotion/modules/productModel/add.vue

@@ -38,7 +38,7 @@
                         <span v-for="(item,index) in scope.column.data[scope.column.columnname]" :key="index">
                           {{item?item.itemclassname+',':'--'}}
                         </span>
-                        <!-- <el-tag v-if="item" style="margin-bottom:10px">{{item.itemclassname}}</el-tag> -->
+                        <!-- <el-tag v-if="item" style="margin-bottom:10px">{{$t(item.itemclassname)}}</el-tag> -->
                     </div>
                     <div v-else-if="scope.column.columnname == 'spec'">
                       {{scope.column.data.model}}/{{scope.column.data.spec}}

+ 1 - 1
src/HDrpManagement/promotion/modules/productModel/addProduct.vue

@@ -33,7 +33,7 @@
                   <span v-for="(item,index) in scope.column.data[scope.column.columnname]" :key="index">
                     {{item?item.itemclassname+',':'--'}}
                   </span>
-                  <!-- <el-tag v-if="item" style="margin-bottom:10px">{{item.itemclassname}}</el-tag> -->
+                  <!-- <el-tag v-if="item" style="margin-bottom:10px">{{$t(item.itemclassname)}}</el-tag> -->
               </div>
               <div v-else-if="scope.column.columnname == 'spec'">
                 {{scope.column.data.model}}/{{scope.column.data.spec}}

+ 4 - 4
src/HDrpManagement/publicCustomer/modules/detail/addressManage/modules/add.vue

@@ -113,16 +113,16 @@ export default {
       },
       rules:{
         address: [
-          { required: false, message: '地址不能为空', trigger: 'blur' },
+          { required: false, message: this.$t('地址不能为空'), trigger: 'blur' },
         ],
         name: [
-          { required: true, message: '联系人不能为空', trigger: 'blur' },
+          { required: true, message: this.$t('联系人不能为空'), trigger: 'blur' },
         ],
         phonenumber: [
-          { required: true, message: '联系电话不能为空', trigger: 'blur' },
+          { required: true, message: this.$t('联系电话不能为空'), trigger: 'blur' },
         ],
         province: [
-          { required: true, message: '省市县不能为空', trigger: 'change,blur' },
+          { required: true, message: this.$t('省市县不能为空'), trigger: 'change,blur' },
         ],
       },
       value:'',

+ 40 - 40
src/HManagement/addressList/mycontact/modules/addContact.vue

@@ -1,15 +1,15 @@
 <template>
   <div>
-    <el-button type="primary" size="small" icon="el-icon-plus" @click="onShow">新建联系人</el-button>
-    <el-drawer title="新建联系人" append-to-body :visible.sync="dialogFormVisible" size="664px" @close="onClose">
+    <el-button type="primary" size="small" icon="el-icon-plus" @click="onShow">{{$t('新建联系人')}}</el-button>
+    <el-drawer :title="$t(`新建联系人`)" append-to-body :visible.sync="dialogFormVisible" size="664px" @close="onClose">
       <div class="drawer__panel">
         <el-row :gutter="20">
           <el-form :model="form" ref="form" :rules="rules" label-position="right" :label-width="tool.onlyZh('90px')" size="small">
             <el-col :span="24">
-              <el-form-item label="姓名:" prop="name" :rules="[
-              { required: true, message: '联系人姓名不能为空'},
+              <el-form-item :label="$t(`姓名`)+':'" prop="name" :rules="[
+              { required: true, message: $t('联系人姓名不能为空')},
             ]">
-                <el-input v-model="form.name" autocomplete="on" placeholder="请填写联系人姓名"></el-input>
+                <el-input v-model="form.name" autocomplete="on" :placeholder="$t(`请填写联系人姓名`)"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -19,104 +19,104 @@
               </el-form-item>
             </el-col>
             <el-col :span="24" v-if="form.isTelephone == '1'">
-              <el-form-item label="联系方式:" prop="telephone" >
-                <el-input v-model="form.areaCode" style="width: 25%" autocomplete="on" placeholder="请填写区号"></el-input>
+              <el-form-item :label="$t(`联系方式`)+':'" prop="telephone" >
+                <el-input v-model="form.areaCode" style="width: 25%" autocomplete="on" :placeholder="$t(`请填写区号`)"></el-input>
                 <span style="color: #999999">——</span>
-                <el-input v-model="form.telephone" style="width: 68%" autocomplete="on" placeholder="请填写座机电话"></el-input>
+                <el-input v-model="form.telephone" style="width: 68%" autocomplete="on" :placeholder="$t(`请填写座机电话`)"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24"  >
-              <el-form-item v-if="form.isTelephone == '0'" label="联系方式:" prop="phonenumber" :rules="[
-              { required: true, message: '手机号码不能为空'},
-              { pattern:/^1[3-9][0-9]\d{8}$/, message: '请输入正确手机号码',trigger: 'change' }
+              <el-form-item v-if="form.isTelephone == '0'" :label="$t(`联系方式`)+':'" prop="phonenumber" :rules="[
+              { required: true, message: $t('手机号码不能为空')},
+              { pattern:/^1[3-9][0-9]\d{8}$/, message: $t('请输入正确手机号码'),trigger: 'change' }
             ]">
-                <el-input v-model="form.phonenumber" autocomplete="on" placeholder="请填写手机号码"></el-input>
+                <el-input v-model="form.phonenumber" autocomplete="on" :placeholder="$t(`请填写手机号码`)"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="微信:" prop="wechatnum">
-                <el-input v-model="form.wechatnum" autocomplete="on" placeholder="请填写微信号"></el-input>
+              <el-form-item :label="$t(`微信`)+':'" prop="wechatnum">
+                <el-input v-model="form.wechatnum" autocomplete="on" :placeholder="$t(`请填写微信号`)"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="邮箱:" prop="email" :rules="[
-              { pattern:/^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/, message: '请输入正确邮箱',trigger: 'blur' }
+              <el-form-item :label="$t(`邮箱`)+':'" prop="email" :rules="[
+              { pattern:/^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/, message: $t('请输入正确邮箱'),trigger: 'blur' }
             ]">
-                <el-input v-model="form.email" autocomplete="on" placeholder="请填写邮箱"></el-input>
+                <el-input v-model="form.email" autocomplete="on" :placeholder="$t(`请填写邮箱`)"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="传真:" prop="fax">
-                <el-input v-model="form.fax" autocomplete="on" placeholder="请填写传真"></el-input>
+              <el-form-item :label="$t(`传真`)+':'" prop="fax">
+                <el-input v-model="form.fax" autocomplete="on" :placeholder="$t(`请填写传真`)"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="部门:" prop="depname">
-                <el-input v-model="form.depname" autocomplete="on" placeholder="请填写部门"></el-input>
+              <el-form-item :label="$t(`部门`)+':'" prop="depname">
+                <el-input v-model="form.depname" autocomplete="on" :placeholder="$t(`请填写部门`)"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="职位:" prop="position">
-                <el-input v-model="form.position" autocomplete="on" placeholder="请填写职位"></el-input>
+              <el-form-item :label="$t(`职位`)+':'" prop="position">
+                <el-input v-model="form.position" autocomplete="on" :placeholder="$t(`请填写职位`)"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="性别:" prop="sex">
-                <el-radio v-model="form.sex" label="男">男</el-radio>
-                <el-radio v-model="form.sex" label="女">女</el-radio>
+              <el-form-item :label="$t(`性别`)+':'" prop="sex">
+                <el-radio v-model="form.sex" :label="$t(``)">男</el-radio>
+                <el-radio v-model="form.sex" :label="$t(``)">女</el-radio>
               </el-form-item>
             </el-col>
 
             <el-col :span="24">
-              <el-form-item label="生日" prop="birthday">
+              <el-form-item :label="$t(`生日`)" prop="birthday">
                 <el-date-picker
                     style="width:100%"
                     v-model="form.birthday"
                     value-format="yyyy-MM-dd"
                     type="date"
-                    placeholder="选择日期">
+                    :placeholder="$t(`选择日期`)">
                 </el-date-picker>
               </el-form-item>
             </el-col>
 
             <el-col :span="24">
-              <el-form-item label="家庭住址" prop="homeaddress">
-                <el-input v-model="form.homeaddress" autocomplete="on" placeholder="请填写家庭住址"></el-input>
+              <el-form-item :label="$t(`家庭住址`)" prop="homeaddress">
+                <el-input v-model="form.homeaddress" autocomplete="on" :placeholder="$t(`请填写家庭住址`)"></el-input>
               </el-form-item>
             </el-col>
             <!-- <el-col :span="12">
-              <el-form-item label="微信">
-                <el-input v-model="form.wechat" autocomplete="on" placeholder="输入联系人微信"></el-input>
+              <el-form-item :label="$t(`微信`)">
+                <el-input v-model="form.wechat" autocomplete="on" :placeholder="$t(`输入联系人微信`)"></el-input>
               </el-form-item>
             </el-col> -->
 
             <el-col :span="24">
-              <el-form-item label="群组" prop="sys_phonebookgroupid">
+              <el-form-item :label="$t(`群组`)" prop="sys_phonebookgroupid">
                 <el-select v-model="form.sys_phonebookgroupid" style="width:100%" >
                   <el-option v-for="item in groupList" :key="item.index" :value="item.sys_phonebookgroupid" :label="item.groupname"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
 <!--            <el-col :span="24">
-              <el-form-item label="标签" prop="tags">
+              <el-form-item :label="$t(`标签`)" prop="tags">
                 <el-select v-model="tags" style="width:100%" multiple>
                   <el-option v-for="item in tagList" :key="item.index" :value="item.tag" :label="$t(item.tag)" :disabled="hasDisabledTag(item)"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>-->
             <el-col :span="24">
-              <el-form-item label="偏好" prop="preference">
-                <el-input v-model="form.preference" autocomplete="on" placeholder="请填写偏好"></el-input>
+              <el-form-item :label="$t(`偏好`)" prop="preference">
+                <el-input v-model="form.preference" autocomplete="on" :placeholder="$t(`请填写偏好`)"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="爱好" prop="hobby">
-                <el-input v-model="form.hobby" autocomplete="on" placeholder="请填写爱好"></el-input>
+              <el-form-item :label="$t(`爱好`)" prop="hobby">
+                <el-input v-model="form.hobby" autocomplete="on" :placeholder="$t(`请填写爱好`)"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="备注" prop="remarks">
-                <el-input v-model="form.remarks" autocomplete="on" placeholder="输入联系人备注"></el-input>
+              <el-form-item :label="$t(`备注`)" prop="remarks">
+                <el-input v-model="form.remarks" autocomplete="on" :placeholder="$t(`输入联系人备注`)"></el-input>
               </el-form-item>
             </el-col>
           </el-form>

+ 15 - 15
src/HManagement/roleManage/modules/roleContent copy.vue

@@ -1,32 +1,32 @@
 <template>
   <div class="normal-panel drewer__panel">
     <div>
-      <p class="normal-title mb-16">角色信息</p>
+      <p class="normal-title mb-16">{{$t('角色信息')}}</p>
       <el-form :inline="true" :model="form" :rules="rules" ref="form" size="small" :label-width="tool.onlyZh('100px')" label-position="left" class="demo-form-inline">
-        <el-form-item label="角色名称" prop="rolename">
-          <el-input v-model="form.rolename" placeholder="输入角色名称"></el-input>
+        <el-form-item :label="$t(`角色名称`)" prop="rolename">
+          <el-input v-model="form.rolename" :placeholder="$t(`输入角色名称`)"></el-input>
         </el-form-item>
-        <el-form-item label="角色描述" prop="remarks">
-          <el-input v-model="form.remarks" placeholder="输入角色描述"></el-input>
+        <el-form-item :label="$t(`角色描述`)" prop="remarks">
+          <el-input v-model="form.remarks" :placeholder="$t(`输入角色描述`)"></el-input>
         </el-form-item>
-        <el-form-item label="角色类型" prop="usertype">
-          <el-select v-model="form.usertype" placeholder="角色类型">
+        <el-form-item :label="$t(`角色类型`)" prop="usertype">
+          <el-select v-model="form.usertype" :placeholder="$t(`角色类型`)">
             <el-option v-for="item in options" :key="item.index" :label="$t(item.remarks)" :value="Number(item.value)"></el-option>
           </el-select>
         </el-form-item>
       </el-form>
     </div>
     <div>
-      <p class="normal-title mb-16">角色授权</p>
+      <p class="normal-title mb-16">{{$t('角色授权')}}</p>
       <el-row :gutter="20">
         <el-col :span="12">
           <div class="mb-16">
             <auth @onSuccess="roleMain"></auth>
           </div>
           <el-collapse>
-            <el-collapse-item title="筛选" name="1">
+            <el-collapse-item :title="$t(`筛选`)" name="1">
               <el-row class="normal-margin">
-                <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox>
+                <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">{{$t('全选')}}</el-checkbox>
                 <div style="margin: 15px 0;"></div>
                 <el-checkbox-group v-model="checkModuleList"  @change="handleCheckedCitiesChange">
                   <el-col style="margin-bottom:5px" :span="6"  v-for="item in modulesList" :key="item.index">
@@ -51,12 +51,12 @@
                 </el-checkbox-group>
               </el-row>
               <div class="flex-align-center flex-between option-item">
-                <el-checkbox :indeterminate="isIndeterminate2" v-model="checkAll2" @change="handleCheckAllChange2">全选</el-checkbox>
+                <el-checkbox :indeterminate="isIndeterminate2" v-model="checkAll2" @change="handleCheckAllChange2">{{$t('全选')}}</el-checkbox>
                 <cancelAuth v-if="checkedApps.length > 0" :data="{roleid:data.roleid,systemappid:active_systemappid,optionid:checkedApps}" @onSuccess="(roleMain(),$emit('onSuccess'))"></cancelAuth>
               </div>
             </el-col>
             <el-col :span="12">
-              <p class="title">隐藏字段</p>
+              <p class="title">{{$t('隐藏字段')}}</p>
               <div class="flex-align-center flex-between option-item" v-for="item in hiddenfields" :key="item.index">
                 <p>{{item.fieldname}}</p>
                 <cancelFields :data="{roleid:roleid,systemappid:active_systemappid,hiddenfieldid:item.hiddenfieldid}" @onSuccess="(roleMain(),$emit('onSuccess'))"></cancelFields>
@@ -93,13 +93,13 @@ export default {
       checkAll2: false,
       rules:{
         rolename: [
-          { required: true, message: '请输入角色名称', trigger: 'blur' },
+          { required: true, message: this.$t('请输入角色名称'), trigger: 'blur' },
         ],
         remarks: [
-          { required: true, message: '请输入角色描述', trigger: 'blur' },
+          { required: true, message: this.$t('请输入角色描述'), trigger: 'blur' },
         ],
         usertype: [
-          { required: true, message: '请选择角色类型', trigger: 'change' }
+          { required: true, message: this.$t('请选择角色类型'), trigger: 'change' }
         ],
       },
       form:{

+ 1 - 1
src/SDrpManagement/Products/modules/Select2.vue

@@ -11,7 +11,7 @@
       </ul>
       <ul class="flex-align-center normal-margin-new">
         <li  :class="class_act === ''?'act':''" class="brand-item border-all" @click="clickClass('')">{{$t('全部分类')}}</li>
-        <li  :class="class_act === item.itemclassnum?'act':''" class="brand-item margin-notAll" v-for="item in itemclass" :key="item.itemclassnum" @click="clickClass(item)">{{item.itemclassname}}</li>
+        <li  :class="class_act === item.itemclassnum?'act':''" class="brand-item margin-notAll" v-for="item in itemclass" :key="item.itemclassnum" @click="clickClass(item)">{{$t(item.itemclassname)}}</li>
       </ul>
       <classTree v-if="brand_act !== ''" style="padding-left:80px" :data="activeClass.subdep" @onClassChange="change"></classTree>
     </div>

+ 52 - 52
src/SManagement/orderclue_detail/components/customerAudit.vue

@@ -1,8 +1,8 @@
 <template>
   <div>
-    <el-button size="mini" :type="disabled?'':'primary'" @click="onShow" :disabled="disabled" >转化客户审核</el-button>
+    <el-button size="mini" :type="disabled?'':'primary'" @click="onShow" :disabled="disabled" >{{$t('转化客户审核')}}</el-button>
     <el-drawer
-        title="转化为客户"
+        :title="$t(`转化为客户`)"
         :visible.sync="drawer"
         size="600px"
         direction="rtl"
@@ -13,38 +13,38 @@
         <el-row :gutter="20">
           <el-form :model="form" :rules="rules" ref="form" :label-width="tool.onlyZh('100px')" label-position="right" size="mini" disabled>
             <el-col :span="24">
-              <el-form-item label="客户名称:" prop="enterprisename_customer">
-                <el-input v-model="form.enterprisename" placeholder="请输入客户名称" style="width: 100%"></el-input>
+              <el-form-item :label="$t(`客户名称`)+':'" prop="enterprisename_customer">
+                <el-input v-model="form.enterprisename" :placeholder="$t(`请输入客户名称`)" style="width: 100%"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="企业简称:" prop="abbreviation">
-                <el-input v-model="form.abbreviation" placeholder="请输入企业简称" style="width: 100%"></el-input>
+              <el-form-item :label="$t(`企业简称`)+':'" prop="abbreviation">
+                <el-input v-model="form.abbreviation" :placeholder="$t(`请输入企业简称`)" style="width: 100%"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24" >
-              <el-form-item label="客户类型:" prop="type">
-                <el-input v-model="form.type" placeholder="请输入企业简称" style="width: 100%"></el-input>
+              <el-form-item :label="$t(`客户类型`)+':'" prop="type">
+                <el-input v-model="form.type" :placeholder="$t(`请输入企业简称`)" style="width: 100%"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="客户等级:" prop="grade">
-                <el-input v-model="form.grade" placeholder="请输入企业简称" style="width: 100%"></el-input>
+              <el-form-item :label="$t(`客户等级`)+':'" prop="grade">
+                <el-input v-model="form.grade" :placeholder="$t(`请输入企业简称`)" style="width: 100%"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="客户分类:" prop="customergrade">
-                <el-input v-model="form.customergrade" placeholder="请输入企业简称" style="width: 100%"></el-input>
+              <el-form-item :label="$t(`客户分类`)+':'" prop="customergrade">
+                <el-input v-model="form.customergrade" :placeholder="$t(`请输入企业简称`)" style="width: 100%"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="客户行业:" prop="customergrade">
+              <el-form-item :label="$t(`客户行业`)+':'" prop="customergrade">
                 <el-select
                     ref="sle"
                     style="width:100%;"
                     v-model="form.industry"
                     multiple
-                    placeholder="请选择所属行业"
+                    :placeholder="$t(`请选择所属行业`)"
                     size="mini"
                 >
                   <el-option
@@ -54,29 +54,29 @@
                       :value="item.value"
                   >
                     <span style="float: left">{{ $t(item.value) }}</span>
-                    <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:$t('暂无描述') }}</span>
+                    <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?$t(item.remarks):$t('暂无描述') }}</span>
                   </el-option>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="联系人:"  prop="contactsinfo.name">
-                <el-input v-model="form.contactsinfo.name" placeholder="请选择所属行业" style="width: 100%"></el-input>
+              <el-form-item :label="$t(`联系人`)+':'"  prop="contactsinfo.name">
+                <el-input v-model="form.contactsinfo.name" :placeholder="$t(`请选择所属行业`)" style="width: 100%"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24" v-if="isPhone">
-              <el-form-item label="联系方式:" prop="contactsinfo.phonenumber">
+              <el-form-item :label="$t(`联系方式`)+':'" prop="contactsinfo.phonenumber">
                 <el-button-group>
                   <!--                  <el-button type="primary" size="mini" @click="phoneChang('手机')">{{$t('手机号')}}</el-button>
                                     <el-button type="" size="mini" @click="phoneChang('座机')">{{$t('座机电话')}}</el-button>-->
                   <el-radio v-model="isPhone" :label="true" @change="phoneChang('手机')">{{$t('手机号')}}</el-radio>
                   <el-radio v-model="isPhone" :label="false" @change="phoneChang('座机')">{{$t('座机电话')}}</el-radio>
                 </el-button-group>
-                <el-input v-model="form.contactsinfo.phonenumber" placeholder="请输入手机号" style="width: 100%;margin-top: 10px" @input="telephoneChange('手机')"></el-input>
+                <el-input v-model="form.contactsinfo.phonenumber" :placeholder="$t(`请输入手机号`)" style="width: 100%;margin-top: 10px" @input="telephoneChange('手机')"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24" v-if="!isPhone">
-              <el-form-item label="联系方式:" prop="contactsinfo.telephone">
+              <el-form-item :label="$t(`联系方式`)+':'" prop="contactsinfo.telephone">
                 <el-button-group>
                   <!--                  <el-button type="" size="mini" @click="phoneChang('手机')">{{$t('手机号')}}</el-button>
                                     <el-button type="primary" size="mini" @click="phoneChang('座机')">{{$t('座机电话')}}</el-button>-->
@@ -84,29 +84,29 @@
                   <el-radio v-model="isPhone" :label="false" @change="phoneChang('座机')">{{$t('座机电话')}}</el-radio>
                 </el-button-group>
                 <div style="width: 100%">
-                  <el-input v-model="areaCode" placeholder="请输入区号" style="width:25%;margin-top: 10px" @input="telephoneChange('座机')"></el-input>
+                  <el-input v-model="areaCode" :placeholder="$t(`请输入区号`)" style="width:25%;margin-top: 10px" @input="telephoneChange('座机')"></el-input>
                   <span style="color: #999999">——</span>
-                  <el-input v-model="telephone" placeholder="请输入座机电话" style="width:68%;margin-top: 10px" @input="telephoneChange('座机')"></el-input>
+                  <el-input v-model="telephone" :placeholder="$t(`请输入座机电话`)" style="width:68%;margin-top: 10px" @input="telephoneChange('座机')"></el-input>
                 </div>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="税号:" prop="taxno">
-                <el-input v-model="form.taxno" placeholder="请输入企业税号" style="width: 100%"></el-input>
+              <el-form-item :label="$t(`税号`)+':'" prop="taxno">
+                <el-input v-model="form.taxno" :placeholder="$t(`请输入企业税号`)" style="width: 100%"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="法人:" prop="contact">
-                <el-input v-model="form.contact" placeholder="请输入法人信息" style="width: 100%"></el-input>
+              <el-form-item :label="$t(`法人`)+':'" prop="contact">
+                <el-input v-model="form.contact" :placeholder="$t(`请输入法人信息`)" style="width: 100%"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="联系电话:" prop="phonenumber">
-                <el-input v-model="form.phonenumber" placeholder="请输入联系电话" style="width: 100%"></el-input>
+              <el-form-item :label="$t(`联系电话`)+':'" prop="phonenumber">
+                <el-input v-model="form.phonenumber" :placeholder="$t(`请输入联系电话`)" style="width: 100%"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="省市县:" prop="province">
+              <el-form-item :label="$t(`省市县`)+':'" prop="province">
                 <el-cascader
                     style="width: 100%"
                     v-model="value"
@@ -116,23 +116,23 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="详细地址:" prop="address">
-                <el-input v-model="form.address" placeholder="请输入企业地址" style="width: 100%"></el-input>
+              <el-form-item :label="$t(`详细地址`)+':'" prop="address">
+                <el-input v-model="form.address" :placeholder="$t(`请输入企业地址`)" style="width: 100%"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="上级企业:" prop="superiorenterprisename">
-                <el-input v-model="form.parent_enterprisename" placeholder="请输入企业地址" style="width: 100%"></el-input>
+              <el-form-item :label="$t(`上级企业`)+':'" prop="superiorenterprisename">
+                <el-input v-model="form.parent_enterprisename" :placeholder="$t(`请输入企业地址`)" style="width: 100%"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="客户来源:" prop="source">
-                <el-input v-model="form.source" placeholder="请输入客户来源" style="width: 100%"></el-input>
+              <el-form-item :label="$t(`客户来源`)+':'" prop="source">
+                <el-input v-model="form.source" :placeholder="$t(`请输入客户来源`)" style="width: 100%"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="归属经销商:" prop="source">
-                <el-input v-model="form.agents_enterprisename" placeholder="请选择归属经销商" style="width: 100%"></el-input>
+              <el-form-item :label="$t(`归属经销商`)+':'" prop="source">
+                <el-input v-model="form.agents_enterprisename" :placeholder="$t(`请选择归属经销商`)" style="width: 100%"></el-input>
               </el-form-item>
             </el-col>
           </el-form>
@@ -143,7 +143,7 @@
         <el-button size="small" type="success" @click="onAudit('通过')" class="normal-btn-width" v-if="!isrepeat">{{$t('审核通过')}}</el-button>
       </div>
     </el-drawer>
-    <duplicateCheck :data="form" ref="checkRef" @checkSuccess="checkSuccess" @onSuccess="onClose" @isDuplicate="isDuplicate" v-show="false" title="已存在重复客户,当前线索不可转化客户"></duplicateCheck>
+    <duplicateCheck :data="form" ref="checkRef" @checkSuccess="checkSuccess" @onSuccess="onClose" @isDuplicate="isDuplicate" v-show="false" :title="$t(`已存在重复客户,当前线索不可转化客户`)"></duplicateCheck>
   </div>
 </template>
 
@@ -166,38 +166,38 @@ export default {
       checkResults: '',
       rules: {
         phonenumber: [
-          {required: false, message: '请输入手机号码', trigger: 'change'},
+          {required: false, message: this.$t('请输入手机号码'), trigger: 'change'},
           // {pattern: /^1[3-9]\d{9}$/, message: '请输入正确手机号码', trigger: 'change'}
         ],
         enterprisename_customer: [
-          { required: true, message: '请输入客户名称', trigger: 'blur' },
+          { required: true, message: this.$t('请输入客户名称'), trigger: 'blur' },
         ],
         roleids: [
-          { required: true, message: '请选择授权角色', trigger: 'change' }
+          { required: true, message: this.$t('请选择授权角色'), trigger: 'change' }
         ],
         type: [
-          { required: true, message: '请选择客户类型', trigger: 'change' }
+          { required: true, message: this.$t('请选择客户类型'), trigger: 'change' }
         ],
         contact: [
-          { required: false, message: '请输入法人', trigger: 'change,blur' },
+          { required: false, message: this.$t('请输入法人'), trigger: 'change,blur' },
         ],
         telephone: [
-          { required: false, message: '请输入联系电话', trigger: 'change,blur' },
-          { pattern:/^1[3-9]\d{9}$/, message: '请输入正确手机号码',trigger: 'change' }
+          { required: false, message: this.$t('请输入联系电话'), trigger: 'change,blur' },
+          { pattern:/^1[3-9]\d{9}$/, message: this.$t('请输入正确手机号码'),trigger: 'change' }
         ],
         province: [
-          { required: true, message: '请选择省市县', trigger: 'change,blur' },
+          { required: true, message: this.$t('请选择省市县'), trigger: 'change,blur' },
         ],
         'contactsinfo.name':[
-          { required: true, message: '请输入联系人姓名', trigger: 'change,blur' }
+          { required: true, message: this.$t('请输入联系人姓名'), trigger: 'change,blur' }
         ],
         'contactsinfo.phonenumber': [
-          { required: true, message: '请输入联系电话', trigger: 'change' },
-          { pattern:/^1[3-9]\d{9}$/, message: '请输入正确手机号码',trigger: 'change' }
+          { required: true, message: this.$t('请输入联系电话'), trigger: 'change' },
+          { pattern:/^1[3-9]\d{9}$/, message: this.$t('请输入正确手机号码'),trigger: 'change' }
         ],
         'contactsinfo.telephone': [
-          { required: true, message: '请输入座机电话', trigger: 'change' },
-          { pattern:/^0\d{2,3}-\d{7,8}$/, message: '请输入正确座机电话',trigger: 'change' }
+          { required: true, message: this.$t('请输入座机电话'), trigger: 'change' },
+          { pattern:/^0\d{2,3}-\d{7,8}$/, message: this.$t('请输入正确座机电话'),trigger: 'change' }
         ],
       },
       form:{
@@ -341,7 +341,7 @@ export default {
     },
     /*获取工商信息*/
     businessSelect(val, regProvince) {
-      this.$confirm('是否以查询的工商信息更新客户信息?', this.$t('提示'), {
+      this.$confirm(this.$t('是否以查询的工商信息更新客户信息')+'?', this.$t('提示'), {
         confirmButtonText: this.$t('确定'),
         cancelButtonText: this.$t('取消'),
         type: 'warning'

+ 1 - 1
src/SManagement/orderclue_detail/components/projectAudit.vue

@@ -228,7 +228,7 @@
                   :value="item.value"
                 >
                   <!--                    <span style="float: left">{{ $t(item.value) }}</span>-->
-                  <!--                    <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:$t('暂无描述') }}</span>-->
+                  <!--                    <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?$t(item.remarks):$t('暂无描述') }}</span>-->
                 </el-option>
               </el-select>
             </el-col>

+ 1 - 1
src/components/selectTemp/index.vue

@@ -7,7 +7,7 @@
           :label="$t(item.value)"
           :value="item.value">
         <span style="float: left">{{ $t(item.value) }}</span>
-        <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:$t('暂无描述') }}</span>
+        <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?$t(item.remarks):$t('暂无描述') }}</span>
       </el-option>
     </el-select>
   </div>

+ 2 - 2
src/template/addProduct/index.vue

@@ -45,7 +45,7 @@
                 :label="$t(item.value)"
                 :value="item.value">
               <span style="float: left">{{ $t(item.value) }}</span>
-              <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:$t('暂无描述') }}</span>
+              <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?$t(item.remarks):$t('暂无描述') }}</span>
             </el-option>
           </el-select>
           <el-select v-model="itemmaterial" :placeholder="$t(`选择材质`)" size="small" clearable class="inline-24 bottom-margin" @change="queryChange">
@@ -55,7 +55,7 @@
                 :label="$t(item.value)"
                 :value="item.value">
               <span style="float: left">{{ $t(item.value) }}</span>
-              <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:$t('暂无描述') }}</span>
+              <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?$t(item.remarks):$t('暂无描述') }}</span>
             </el-option>
           </el-select>
           <el-input  style="width:200px;" :placeholder="$t(`型号`)" :suffix-icon="params.content.where.model?params.content.where.model.length > 0?'':'':'el-icon-search'" v-model="params.content.where.model" @keyup.native.enter="listData(params.content.pageNumber = 1)" @clear="listData(params.content.pageNumber = 1)" size="small" class="bottom-margin input-with-select inline-24 layout_search__panel" clearable>