xiaohaizhao 1 년 전
부모
커밋
811fd01fed

+ 2 - 2
src/HDrpManagement/ProductMag/modules/add.vue

@@ -16,8 +16,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item :label="$t(`ERP品号`)" prop="erpitemno">
-                <el-input v-model="form.erpitemno" :placeholder="$t(`输入ERP品号`)" @change="erpitemnoChange"></el-input>
+              <el-form-item :label="$t(`erp品号`)" prop="erpitemno">
+                <el-input v-model="form.erpitemno" :placeholder="$t(`输入erp品号`)" @change="erpitemnoChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">

+ 2 - 2
src/HDrpManagement/ProductMag/modules/edit.vue

@@ -16,8 +16,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item :label="$t(`ERP品号`)" prop="erpitemno">
-                <el-input v-model="form.erpitemno" :placeholder="$t(`输入ERP品号`)" @change="erpitemnoChange"></el-input>
+              <el-form-item :label="$t(`erp品号`)" prop="erpitemno">
+                <el-input v-model="form.erpitemno" :placeholder="$t(`输入erp品号`)" @change="erpitemnoChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">

+ 3 - 3
src/HDrpManagement/contractManage/components/addContract.vue

@@ -8,10 +8,10 @@
         {{ $t(`新建`)
         }}{{
           $route.query.type == "框架"
-            ? "经销商合作"
+            ? $t("经销商合作")
             : $route.query.type == "直销"
-            ? "直销客户合作"
-            : $route.query.type
+            ? $t("直销客户合作")
+            : $t($route.query.type)
         }}{{ $t(`合同`) }}
       </p>
       <div class="container normal-panel" style="padding-bottom: 0">

+ 1 - 1
src/HDrpManagement/dispatch/details/index.vue

@@ -134,7 +134,7 @@ import defaultInfo from '../modules/defaultInfo.vue'
           },
           {
             label:'运费状态',
-            value:this.mainData.freightstatus
+            value:this.$t(this.mainData.freightstatus)
           },
           {
             label:'订单类型',

+ 1 - 1
src/HDrpManagement/dispatch/modules/erpInfo.vue

@@ -19,7 +19,7 @@
       </el-table-column> -->
       <el-table-column
         prop="erpbillno"
-        :label="$t(`erp单号`)">
+        :label="$t(`ERP单号`)">
       </el-table-column>
       <el-table-column
         prop="request"

+ 1 - 1
src/HDrpManagement/logistics/details/index.vue

@@ -18,7 +18,7 @@
         <div slot="customOperation" >
           <Edit class="inline-16" v-if="tool.checkAuth($route.name,'update')" :data="mainData" @onSuccess="queryMainData(),$refs.dispatch.listData()"/>
           <el-button type="primary" size="mini"  v-if="tool.checkAuth($route.name,'confirmRec') && mainData.status =='审核'" :disabled="mainData.status == '收货'" @click="onConfimRec">{{$t(`确认收货`)}}</el-button>
-          <el-button class="inline-16" type="primary" size="mini"  v-if="tool.checkAuth($route.name,'check')" @click="onCheck" :disabled="mainData.status == '收货'">{{mainData.status === '审核'?'反审':'审核' }}</el-button>
+          <el-button class="inline-16" type="primary" size="mini"  v-if="tool.checkAuth($route.name,'check')" @click="onCheck" :disabled="mainData.status == '收货'">{{mainData.status === '审核'?$t('反审'):$t('审核') }}</el-button>
         </div>
         <div slot="slot0" >
           <defalutInfo :mainData="mainData" ref="info"></defalutInfo>

+ 1 - 1
src/HDrpManagement/logistics/details/tabs/logisticsBox/logisticsBox.vue

@@ -82,7 +82,7 @@ export default {
       this.tableData = res.data
       this.total = res.total
       this.currentPage = res.pageNumber
-      res.data.length > 0 ? this.rowClick(res.data[0]):""
+      res.data.length > 0 ? this.$t(this.rowClick(res.data[0])):""
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);

+ 14 - 14
src/HDrpManagement/logistics/modules/defaultInfo.vue

@@ -2,29 +2,29 @@
   <div>
     <el-descriptions class="normal-margin" :column="2"  border labelClassName="my-label" contentClassName="my-content">
       <div slot="title" class="my-label__title">{{$t(`收货信息`)}}</div>
-      <el-descriptions-item :label="$t(`收货人`)">{{ mainData.name?mainData.name:"--" }}</el-descriptions-item>
-      <el-descriptions-item :label="$t('联系电话')">{{ mainData.phonenumber?mainData.phonenumber:"--" }}</el-descriptions-item>
+      <el-descriptions-item :label="$t(`收货人`)">{{ mainData.name?$t(mainData.name):"--" }}</el-descriptions-item>
+      <el-descriptions-item :label="$t('联系电话')">{{ mainData.phonenumber?$t(mainData.phonenumber):"--" }}</el-descriptions-item>
       <el-descriptions-item :label="$t('地址')">{{`${mainData.province}${mainData.city}${mainData.county}${mainData.address}`}}</el-descriptions-item>
-      <el-descriptions-item :label="$t(`收货时间`)">{{mainData.receivedate?mainData.receivedate:"--"}}</el-descriptions-item>
+      <el-descriptions-item :label="$t(`收货时间`)">{{mainData.receivedate?$t(mainData.receivedate):"--"}}</el-descriptions-item>
     </el-descriptions>
     <el-descriptions  border :column="2" labelClassName="my-label" contentClassName="my-content">
       <div slot="title" class="my-label__title">{{$t(`物流信息`)}}</div>
-      <el-descriptions-item :label="$t(`快递公司`)">{{ mainData.logiscompname?mainData.logiscompname:"--" }}</el-descriptions-item>
-      <el-descriptions-item :label="$t(`快递单号`)">{{ mainData.logisticno?mainData.logisticno:"--" }}</el-descriptions-item>
+      <el-descriptions-item :label="$t(`快递公司`)">{{ mainData.logiscompname?$t(mainData.logiscompname):"--" }}</el-descriptions-item>
+      <el-descriptions-item :label="$t(`快递单号`)">{{ mainData.logisticno?$t(mainData.logisticno):"--" }}</el-descriptions-item>
       <el-descriptions-item :style="style(mainData.status)" :label="$t(`运费状态`)">
-        {{ mainData.paytype }}
+        {{ $t(mainData.paytype) }}
       </el-descriptions-item>
-      <el-descriptions-item :label="$t(`运费`)">{{ mainData.freightamount?mainData.freightamount:"--" }}</el-descriptions-item>
-      <el-descriptions-item :label="$t('备注')">{{ mainData.remarks?mainData.kd100remarksid:"--" }}</el-descriptions-item>
+      <el-descriptions-item :label="$t(`运费`)">{{ mainData.freightamount?$t(mainData.freightamount):"--" }}</el-descriptions-item>
+      <el-descriptions-item :label="$t('备注')">{{ mainData.remarks?$t(mainData.kd100remarksid):"--" }}</el-descriptions-item>
     </el-descriptions>
     <el-descriptions  border :column="2" labelClassName="my-label" contentClassName="my-content">
       <div slot="title" class="my-label__title">{{$t('系统信息')}}</div>
-      <el-descriptions-item :label="$t('创建人')">{{ mainData.createby?mainData.createby:"--" }}</el-descriptions-item>
-      <el-descriptions-item :label="$t('创建时间')">{{ mainData.createdate?mainData.createdate:"--" }}</el-descriptions-item>
-      <el-descriptions-item :label="$t(`审核人`)">{{ mainData.checkby?mainData.checkby:"--" }}</el-descriptions-item>
-      <el-descriptions-item :label="$t(`审核时间`)">{{ mainData.checkdate?mainData.checkdate:"--" }}</el-descriptions-item>
-      <el-descriptions-item :label="$t(`收货人`)">{{ mainData.name?mainData.name:"--" }}</el-descriptions-item>
-      <el-descriptions-item :label="$t(`收货时间`)">{{ mainData.receivedate?mainData.receivedate:"--" }}</el-descriptions-item>
+      <el-descriptions-item :label="$t('创建人')">{{ mainData.createby?$t(mainData.createby):"--" }}</el-descriptions-item>
+      <el-descriptions-item :label="$t('创建时间')">{{ mainData.createdate?$t(mainData.createdate):"--" }}</el-descriptions-item>
+      <el-descriptions-item :label="$t(`审核人`)">{{ mainData.checkby?$t(mainData.checkby):"--" }}</el-descriptions-item>
+      <el-descriptions-item :label="$t(`审核时间`)">{{ mainData.checkdate?$t(mainData.checkdate):"--" }}</el-descriptions-item>
+      <el-descriptions-item :label="$t(`收货人`)">{{ mainData.name?$t(mainData.name):"--" }}</el-descriptions-item>
+      <el-descriptions-item :label="$t(`收货时间`)">{{ mainData.receivedate?$t(mainData.receivedate):"--" }}</el-descriptions-item>
     </el-descriptions>
   </div>
 </template>

+ 2 - 2
src/HDrpManagement/orderManage/details/index.vue

@@ -333,7 +333,7 @@ export default {
         },
         {
           label:'运费状态',
-          value:this.mainData.freightstatus
+          value:this.$t(this.mainData.freightstatus)
         },
         {
           label:'备注',
@@ -356,7 +356,7 @@ export default {
           value:this.mainData.invoicestatus
         },
         {
-          label:'erp单号',
+          label:'ERP单号',
           value:this.mainData.erpbillno
         },
         {

+ 1 - 1
src/HDrpManagement/prodectFileData/components/add.vue

@@ -77,7 +77,7 @@ export default {
     return {
       drawer:false,
       add:false,
-      placeholder:'商品名称',
+      placeholder:this.$t('商品名称'),
       form:{
         itemid:''
       },

+ 1 - 1
src/HDrpManagement/prodectFileData/components/relationList.vue

@@ -55,7 +55,7 @@ export default {
   props:["id","checkbox"],
   data(){
     return {
-      placeholder:'商品名称',
+      placeholder:this.$t('商品名称'),
       tableHieght:'calc(100vh - 210px)',
       list:[],
       tablecols:[],

+ 1 - 1
src/HManagement/clueManage/clue_public/modules/distribution.vue

@@ -5,7 +5,7 @@
       <div class="container">
         <p class="normal-title" style="margin-bottom:16px">{{ $t('分配经销商') }}</p>
         <p class="normal-margin">{{ $t('总共') }}:&nbsp;{{total}}{{ $t('条') }}</p>
-        <p class="tips normal-margin">{{ $t('注:1-未匹配经销商的线索,分配时,系统将自动跳过,不予以分配;2-所属经销商有且仅有一个匹配结果') }}</p>
+        <p class="tips normal-margin">{{ $t('注:1-未匹配业务员的线索,分配时,系统将自动跳过,不予以分配;2-所属业务员有且仅有一个匹配结果') }}</p>
         <tableLayout :layout="tablecols" :data="list" :custom="true" :height="tableHieght">
           <template v-slot:customcol="scope">
             <div v-if="scope.column.columnname === 'agent'">

+ 1 - 1
src/HManagement/clueManage/clue_rule/modules/setRule.vue

@@ -12,7 +12,7 @@
             </div>
             <div class="normal-margin" style="min-height: 110px;max-height: 110px;">
               <div class="switch" style="display:flex">
-                <p class="font-16" style="font-size:14px">自动分配:&emsp;</p>
+                <p class="font-16" style="font-size:14px">{{$t('自动分配')}}:&emsp;</p>
                 <el-switch
                   v-model="form.autodistribution"
                   :active-value="1"

+ 6 - 6
src/SDrpManagement/ProductGroup/modules/GroupDetail/groupDetail.vue

@@ -11,7 +11,7 @@
       >{{ $t("返回") }}</span
     >
     <el-tag style="margin-left: 15px" size="small">{{
-      selectProduct.brandname
+      $t(selectProduct.brandname)
     }}</el-tag>
     <div
       class="product-detail container flex-align-stretch"
@@ -45,7 +45,7 @@
             :key="index"
             size="small"
             :effect="actTradefield === item.tradefield ? 'dark' : 'plain'"
-            >{{ item.tradefield }}
+            >{{ $t(item.tradefield) }}
           </el-tag>
           {{ selectProduct.itemname }}
         </p>
@@ -61,16 +61,16 @@
         </p>
         <div class="line normal-margin"></div>
         <p class="normal-margin">
-          {{ $t("型号") }}:&emsp;{{ selectProduct.model || "--" }}
+          {{ $t("型号") }}:&emsp;{{ $t(selectProduct.model) || "--" }}
         </p>
         <div>
           <p class="normal-margin">
-            {{ $t("规格") }}:&emsp;{{ selectProduct.spec || "--" }}
+            {{ $t("规格") }}:&emsp;{{ $t(selectProduct.spec) || "--" }}
           </p>
         </div>
         <div>
           <p class="normal-margin">
-            {{ $t("标准") }}:&emsp;{{ selectProduct.standards || "--" }}
+            {{ $t("标准") }}:&emsp;{{ $t(selectProduct.standards) || "--" }}
           </p>
         </div>
         <div v-if="selectProduct.itemextend">
@@ -78,7 +78,7 @@
             {{ $t("材质") }}:&emsp;{{
               selectProduct.itemextend.length
                 ? selectProduct.itemextend[0].material
-                  ? selectProduct.itemextend[0].material
+                  ? $t(selectProduct.itemextend[0].material)
                   : "--"
                 : "--"
             }}

+ 1 - 1
src/SDrpManagement/ProductGroup/modules/Select.vue

@@ -29,7 +29,7 @@
           :key="item.sys_enterprise_tradefieldid"
           @click="clickField(item)"
         >
-          {{ item.tradefield }}
+          {{ $t(item.tradefield) }}
         </li>
       </ul>
       <ul class="flex-align-center normal-margin-new">

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

@@ -34,7 +34,7 @@
           :key="item.sys_enterprise_tradefieldid"
           @click="clickField(item)"
         >
-          {{ item.tradefield }}
+          {{ $t(item.tradefield) }}
         </li>
       </ul>
       <ul class="flex-align-center normal-margin-new">

+ 3 - 3
src/SDrpManagement/Products/modules/ProductDetails.vue

@@ -32,7 +32,7 @@
         <div class="line normal-margin"></div>
         <div>
           <p class="normal-margin">
-            {{ $t("规格") }}:&emsp;{{ selectProduct.spec }}
+            {{ $t("规格") }}:&emsp;{{ $t(selectProduct.spec) }}
           </p>
         </div>
         <div class="flex-align-center" style="margin-bottom: 30px">
@@ -46,7 +46,7 @@
           ></el-input-number>
         </div>
         <p class="normal-margin">
-          {{ $t("当前型号") }}:&emsp;{{ selectProduct.model }}
+          {{ $t("当前型号") }}:&emsp;{{ $t(selectProduct.model) }}
         </p>
         <div class="type">
           <div class="content normal-margin">
@@ -58,7 +58,7 @@
               :key="index"
               size="small"
               :effect="actTradefield === item.tradefield ? 'dark' : 'plain'"
-              >{{ item.tradefield }}
+              >{{ $t(item.tradefield) }}
             </el-tag>
           </div>
         </div>

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

@@ -20,7 +20,7 @@
           :key="item.sys_enterprise_tradefieldid"
           @click="clickField(item)"
         >
-          {{ item.tradefield }}
+          {{ $t(item.tradefield) }}
         </li>
       </ul>
       <ul class="flex-align-center normal-margin-new">

+ 1 - 1
src/SDrpManagement/agentOrder/details/index.vue

@@ -423,7 +423,7 @@ export default {
         },
         {
           label: "运费状态",
-          value: this.mainData.freightstatus,
+          value: this.$t(this.mainData.freightstatus),
         },
         {
           label: "项目名称",

+ 1 - 1
src/SDrpManagement/performanceGoals/index.vue

@@ -49,7 +49,7 @@
             shadow="none"
             :body-style="{ padding: '10px' }"
           >
-            <div slot="header">{{ item.tradefield }}</div>
+            <div slot="header">{{ $t(item.tradefield) }}</div>
             <p class="normal-title mt-10">{{ $t("月度目标") }}</p>
             <el-table
               class="normal-margin"

+ 1 - 1
src/SDrpManagement/salerOrder/details/index.vue

@@ -480,7 +480,7 @@ export default {
         },
         {
           label: "运费状态",
-          value: this.mainData.freightstatus,
+          value: this.$t(this.mainData.freightstatus),
         },
         {
           label: "备注",