qymljy 1 سال پیش
والد
کامیت
bfc9f7d60b

+ 16 - 16
src/HDrpManagement/marketingExpenseMag/components/expenseDetail.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
-    <label class="search__label">费用类型:</label>
-    <el-select v-model="param.content.where.feestype" placeholder="请选择费用类型" class="inline-16" size="small" filterable clearable @change="listData(param.content.phonenumber = 1)">
+    <label class="search__label">{{$t(`费用类型`)}}:</label>
+    <el-select v-model="param.content.where.feestype" :placeholder="$t(`请选择费用类型`)" class="inline-16" size="small" filterable clearable @change="listData(param.content.phonenumber = 1)">
       <el-option
           v-for="item in feestypeList"
           :key="item.index"
@@ -9,8 +9,8 @@
           :value="item.value">
       </el-option>
     </el-select>
-    <label class="search__label">归属应用:</label>
-    <el-select v-model="param.content.where.ownertable" placeholder="请选择归属应用" class="inline-16" size="small" clearable @change="listData(param.content.phonenumber = 1)">
+    <label class="search__label">{{$t(`归属应用`)}}:</label>
+    <el-select v-model="param.content.where.ownertable" :placeholder="$t(`请选择归属应用`)" class="inline-16" size="small" clearable @change="listData(param.content.phonenumber = 1)">
       <el-option
           v-for="item in applicationList"
           :key="item.value"
@@ -28,7 +28,7 @@
       <table-new-layout :layout="tablecols" :data="list"  :opwidth="200" :custom="true" :width="true" :customHeader="true"  fixedName="operation" :checkbox="true" @selectionChange="selectionChange" height="calc(100vh - 340px)">
         <template v-slot:header="data">
 <!--          <div v-if="data.data.property == 'feestypefullname'">
-            <el-select v-model="feestype" placeholder="请选择费用类型" class="inline-16" size="small"  @change="feesTypeAllChange">
+            <el-select v-model="feestype" :placeholder="$t(`请选择费用类型`)" class="inline-16" size="small"  @change="feesTypeAllChange">
               <el-option
                   v-for="item in feestypeList"
                   :key="item.index1"
@@ -43,10 +43,10 @@
         </template>
         <template v-slot:customcol="scope">
           <div v-if="scope.column.columnname === 'amount'">
-            <el-input v-model="scope.column.data[scope.column.columnname]" placeholder="填写金额" type="number" :step="0.000001" @change="amountChange(scope.column.data)" size="small"></el-input>
+            <el-input v-model="scope.column.data[scope.column.columnname]" :placeholder="$t(`填写金额`)" type="number" :step="0.000001" @change="amountChange(scope.column.data)" size="small"></el-input>
           </div>
           <div v-else-if="scope.column.columnname === 'feestypefullname'">
-            <el-select v-model="scope.column.data.feestypefullname" placeholder="请选择费用类型" class="inline-16" size="small" filterable  @change="feesTypeChange(scope.column.data)">
+            <el-select v-model="scope.column.data.feestypefullname" :placeholder="$t(`请选择费用类型`)" class="inline-16" size="small" filterable  @change="feesTypeChange(scope.column.data)">
               <el-option
                   v-for="item in feestypeList"
                   :key="item.value"
@@ -74,7 +74,7 @@
         </el-pagination>
     </div>
     <el-drawer
-        title="添加营销费用明细"
+        :title="$t(`添加营销费用明细`)"
         :visible.sync="drawerShow"
         direction="rtl"
         size="70%"
@@ -86,8 +86,8 @@
         <addTemplate ref="addRef" :param="followParam" :tablecols="tablecolsAdd" height="calc(100vh - 180px)" :hrid="data.hrid" @addSuccess="addSuccess">
           <template v-slot:operation="scope">
             <div class="mt-10 inline-16">
-              <label class="search__label">归属应用:</label>
-              <el-select v-model="followParam.content.where.ownertable" placeholder="请选择归属应用" class="inline-16" size="small" @change="$refs.addRef.listData($refs.addRef.param.content.pageNumber = 1)" clearable >
+              <label class="search__label">{{$t(`归属应用`)}}:</label>
+              <el-select v-model="followParam.content.where.ownertable" :placeholder="$t(`请选择归属应用`)" class="inline-16" size="small" @change="$refs.addRef.listData($refs.addRef.param.content.pageNumber = 1)" clearable >
                 <el-option
                     v-for="item in applicationList"
                     :key="item.value"
@@ -97,7 +97,7 @@
               </el-select>
             </div>
             <div class="mt-10 inline-16">
-              <label class="search__label">跟进时间:</label>
+              <label class="search__label">{{$t(`跟进时间`)}}:</label>
               <el-date-picker
                   style="margin-right: 10px"
                   size="small"
@@ -106,9 +106,9 @@
                   format="yyyy-MM-dd"
                   value-format="yyyy-MM-dd"
                   type="daterange"
-                  range-separator="至"
-                  start-placeholder="开始日期"
-                  end-placeholder="结束日期">
+                  :range-separator="$t(``)"
+                  :start-placeholder="$t(`开始日期`)"
+                  :end-placeholder="$t(`结束日期`)">
               </el-date-picker>
             </div>
 
@@ -332,8 +332,8 @@ export default {
       })
     },
     clickDel(){
-      this.$confirm('确定删除已选营销明细吗?', this.$t('提示'), {
-        confirmButtonText: '确定删除',
+      this.$confirm(this.$t('确定删除已选营销明细吗')+'?', this.$t('提示'), {
+        confirmButtonText: this.$t('确定删除'),
         cancelButtonText: this.$t('取消'),
         type: 'warning'
       }).then(async() => {

+ 8 - 8
src/HDrpManagement/marketingExpenseMag/index.vue

@@ -14,21 +14,21 @@
     >
       <template #titleRight>
         <div class="inline-16">
-          <el-button type="primary" size="small" @click="portraitShowFun">营销费用统计</el-button>
+          <el-button type="primary" size="small" @click="portraitShowFun">{{$t(`营销费用统计`)}}</el-button>
         </div>
         <div class="inline-16">
           <importFile accept=".xlsx" :folderid="folderid" :bindData="{ownertable:'sa_salesfees',ownerid:'',usetype:'default'}" @onSuccess="uploadByExcel" @cancel="onCancel">
-            <a class="error-link" v-if="errorurl" :href="errorurl" slot="errorFile" style="color: red">下载错误数据</a>
+            <a class="error-link" v-if="errorurl" :href="errorurl" slot="errorFile" style="color: red">{{$t(`下载错误数据`)}}</a>
           </importFile>
         </div>
       </template>
       <template #custom >
         <div class="mt-10 inline-16" >
-          <label  class="search__label" >部门:</label>
+          <label  class="search__label" >{{$t(`部门`)}}:</label>
           <el-cascader ref="selectdep" size="small" v-model="depment" :options="deplist" :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  @change="selectDep"  clearable></el-cascader>
         </div>
         <div class="mt-10 inline-16">
-          <label class="search__label" >创建时间:</label>
+          <label class="search__label" >{{$t(`创建时间`)}}:</label>
           <el-date-picker
               style="margin-right: 24px !important;"
               size="small"
@@ -36,9 +36,9 @@
               value-format="yyyy-MM-dd"
               v-model="dateSelect"
               type="daterange"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
+              :range-separator="$t(``)"
+              :start-placeholder="$t(`开始日期`)"
+              :end-placeholder="$t(`结束日期`)"
               clearable>
           </el-date-picker>
         </div>
@@ -53,7 +53,7 @@
       </template>
     </basicLayout>
     <el-drawer
-        title="我是标题"
+        :title="$t(`我是标题`)"
         :visible.sync="drawer"
         size="80%"
         direction="rtl"

+ 10 - 10
src/HDrpManagement/numberManage/components/add.vue

@@ -1,38 +1,38 @@
 <template>
   <div>
     <el-button size="mini" type="primary" @click="dialogFormVisible = true">{{$t('新 建')}}</el-button>
-    <el-drawer title="新建序列号" append-to-body :visible.sync="dialogFormVisible" size="40%" :show-close="false">
+    <el-drawer :title="$t(`新建序列号`)" append-to-body :visible.sync="dialogFormVisible" size="40%" :show-close="false">
       <div class="drawer__panel">
         <el-row :gutter="20">
           <el-form :model="form" :rules="rules" ref="form" label-width="100px" label-position="right" size="mini">
             <el-col :span="24">
-              <el-form-item label="所在企业:" prop="enterprisename">
+              <el-form-item :label="$t(`所在企业`)+':'" prop="enterprisename">
                   <selectAgent ref="agent" @selectRow="agentChange">
                     <el-input readonly type="text" slot="input" size="small" @focus="$refs.agent.visible=true" v-model="form.enterprisename"></el-input>
                   </selectAgent>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="产品:" prop="itemname">
+              <el-form-item :label="$t(`产品`)+':'" prop="itemname">
                 <selectProduct ref="product" @selectRow="productChange">
                   <el-input readonly type="text" slot="input" size="small" @focus="$refs.product.listData(),$refs.product.visible=true" v-model="form.itemname"></el-input>
                 </selectProduct>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="所在仓库:" prop="stockname">
+              <el-form-item :label="$t(`所在仓库`)+':'" prop="stockname">
                 <selectStore ref="store" @selectRow="storeChange">
                   <el-input readonly type="text" slot="input" size="small" @focus="$refs.store.listData(),$refs.store.visible=true" v-model="form.stockname"></el-input>
                 </selectStore>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="序列号:" prop="sku">
+              <el-form-item :label="$t(`序列号`)+':'" prop="sku">
                 <el-input type="text" size="small" v-model="form.sku"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="限制使用" prop="islimit">
+              <el-form-item :label="$t(`限制使用`)" prop="islimit">
                 <el-checkbox :true-label="1" :false-label="0" v-model="form.islimit"></el-checkbox>
               </el-form-item>
             </el-col>
@@ -71,16 +71,16 @@ export default {
       },
       rules:{
         enterprisename:[
-          { required: true, message: '请选择经企业', trigger: 'change'},
+          { required: true, message: this.$t('请选择经企业'), trigger: 'change'},
         ],
         itemname:[
-          { required: true, message: '请选择商品', trigger: 'change'}
+          { required: true, message: this.$t('请选择商品'), trigger: 'change'}
         ],
         sku:[
-          { required: true, message: '请填写序列号', trigger: 'blur'}
+          { required: true, message: this.$t('请填写序列号'), trigger: 'blur'}
         ],
         islimit:[
-          { required: true, message: '请选择', trigger: 'blur'}
+          { required: true, message: this.$t('请选择'), trigger: 'blur'}
         ],
       }
     }

+ 10 - 10
src/HDrpManagement/numberManage/components/edit.vue

@@ -1,38 +1,38 @@
 <template>
   <div>
     <el-button size="mini" type="primary" @click="editBtn">{{$t('编 辑')}}</el-button>
-    <el-drawer title="编辑序列号" append-to-body :visible.sync="dialogFormVisible" size="40%" :show-close="false">
+    <el-drawer :title="$t(`编辑序列号`)" append-to-body :visible.sync="dialogFormVisible" size="40%" :show-close="false">
       <div class="drawer__panel">
         <el-row :gutter="20">
           <el-form :model="form" :rules="rules" ref="form" label-width="100px" label-position="right" size="mini">
             <el-col :span="24">
-              <el-form-item label="所在企业:" prop="enterprisename">
+              <el-form-item :label="$t(`所在企业`) + ':'" prop="enterprisename">
                   <selectAgent ref="agent" @selectRow="agentChange">
                     <el-input readonly type="text" slot="input" size="small" @focus="$refs.agent.visible=true" v-model="form.enterprisename"></el-input>
                   </selectAgent>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="产品:" prop="itemname">
+              <el-form-item :label="$t(`产品`)+ ':'" prop="itemname">
                 <selectProduct ref="product" @selectRow="productChange">
                   <el-input readonly type="text" slot="input" size="small" @focus="$refs.product.listData(),$refs.product.visible=true" v-model="form.itemname"></el-input>
                 </selectProduct>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="所在仓库:" prop="stockname">
+              <el-form-item :label="$t(`所在仓库`)+ ':'" prop="stockname">
                 <selectStore ref="store" @selectRow="storeChange">
                   <el-input readonly type="text" slot="input" size="small" @focus="$refs.store.listData(),$refs.store.visible=true" v-model="form.stockname"></el-input>
                 </selectStore>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="序列号:" prop="sku">
+              <el-form-item :label="$t(`序列号`)+ ':'" prop="sku">
                 <el-input type="text" size="small" v-model="form.sku"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="限制使用" prop="islimit">
+              <el-form-item :label="$t(`限制使用`)" prop="islimit">
                 <el-checkbox :true-label="1" :false-label="0" v-model="form.islimit"></el-checkbox>
               </el-form-item>
             </el-col>
@@ -72,16 +72,16 @@ export default {
       },
       rules:{
         enterprisename:[
-          { required: true, message: '请选择经企业', trigger: 'change'},
+          { required: true, message: this.$t('请选择经企业'), trigger: 'change'},
         ],
         itemname:[
-          { required: true, message: '请选择商品', trigger: 'change'}
+          { required: true, message: this.$t('请选择商品'), trigger: 'change'}
         ],
         sku:[
-          { required: true, message: '请填写序列号', trigger: 'blur'}
+          { required: true, message: this.$t('请填写序列号'), trigger: 'blur'}
         ],
         islimit:[
-          { required: true, message: '请选择', trigger: 'blur'}
+          { required: true, message: this.$t('请选择'), trigger: 'blur'}
         ],
       }
     }

+ 2 - 2
src/HDrpManagement/numberManage/components/importFile.vue

@@ -7,7 +7,7 @@
       <div style="background:#f1f2f3" class="my-tabs" >
         <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
           <!-- <el-tab-pane :label="$t('导入经销商线索')" name="first"></el-tab-pane> -->
-          <el-tab-pane label="导入序列号模板" name="second"></el-tab-pane>
+          <el-tab-pane :label="$t(`导入序列号模板`)" name="second"></el-tab-pane>
         </el-tabs>
       </div>
       <div style="padding:20px">
@@ -45,7 +45,7 @@
           </div>
         </div>
         <slot name="errorFile"></slot>
-        <p class="tips">• + {{$t('为保证数据导入顺利,推荐您下载并使用' + ' ')}}<a :href="modelurl">《Excel序列号标准模板》</a></p>
+        <p class="tips">• + {{$t('为保证数据导入顺利,推荐您下载并使用' + ' ')}}<a :href="modelurl">{{`${$t(`Excel序列号标准模板`)}`}}</a></p>
         <p class="tips">• {{$t('文件中数据不能超过5000行')}}</p>
         <div class="dialog-footer">
           <el-button size="small" @click="cancel" class="normal-btn-width">{{$t('取 消')}}</el-button>

+ 1 - 1
src/HDrpManagement/numberManage/components/importNumber.vue

@@ -2,7 +2,7 @@
   <div>
     <!-- <el-button type="success" size="small">{{$t('导 入')}}</el-button> -->
     <importFile ref="file" accept=".xlsx" :folderid="folderid" :bindData="{ownertable:'sat_orderclueuploadbill',ownerid:'',usetype:'default'}" @onSuccess="uploadOrderclueuploadbillByExcel">
-      <a class="error-link" v-if="errorurl" :href="errorurl" slot="errorFile">下载错误数据</a>
+      <a class="error-link" v-if="errorurl" :href="errorurl" slot="errorFile">{{$t(`下载错误数据`)}}</a>
     </importFile>
   </div>
 </template>

+ 23 - 23
src/HDrpManagement/numberManage/index.vue

@@ -1,13 +1,13 @@
 
 <template>
   <div>
-    <basicLayout 
-      ref="list" 
+    <basicLayout
+      ref="list"
       :oldFormPath="{
         add:'HDrpManagement/numberManage/components'
       }"
-      tableName="numberTable" 
-      idName="sa_itemskuid" 
+      tableName="numberTable"
+      idName="sa_itemskuid"
       :apiId="{query:20221215101003,del:20221215101103}"
       :options="options"
       :detailPath="{
@@ -20,34 +20,34 @@
       </div>
       <div slot="custom" style="display:flex">
         <div class="label_center">
-          <p class="search__label">状态:</p>
-          <el-select clearable @clear="$refs.list.param.content.pageNumber = 1 ;$refs.list.param.content.where.status = '';$refs.list.listData()" v-model="status" style="margin-right:10px" size="small" placeholder="请选择状态" @change="$refs.list.param.content.pageNumber = 1 ;$refs.list.param.content.where.status = status;$refs.list.listData()">
-            <el-option label="在库" value="在库" />
-            <el-option label="借出" value="借出" />
-            <el-option label="售出" value="售出" />
-            <el-option label="报废" value="报废" />
+          <p class="search__label">{{$t(`状态`)}}:</p>
+          <el-select clearable @clear="$refs.list.param.content.pageNumber = 1 ;$refs.list.param.content.where.status = '';$refs.list.listData()" v-model="status" style="margin-right:10px" size="small" :placeholder="$t(`请选择状态`)" @change="$refs.list.param.content.pageNumber = 1 ;$refs.list.param.content.where.status = status;$refs.list.listData()">
+            <el-option :label="$t(`在库`)" value="在库" />
+            <el-option :label="$t(`借出`)" value="借出" />
+            <el-option :label="$t(`售出`)" value="售出" />
+            <el-option :label="$t(`报废`)" value="报废" />
           </el-select>
         </div>
         <div class="label_center">
-          <p class="search__label">是否已使用:</p>
-          <el-select clearable @clear="$refs.list.param.content.pageNumber = 1 ;$refs.list.param.content.where.isused = '';$refs.list.listData()" v-model="isused" style="margin-right:10px" size="small" placeholder="请选择状态" @change="$refs.list.param.content.pageNumber = 1 ;$refs.list.param.content.where.isused = isused;$refs.list.listData()">
-            <el-option label="已使用" value="已使用" />
-            <el-option label="未使用" value="未使用" />
+          <p class="search__label">{{$t(`是否已使用`)}}:</p>
+          <el-select clearable @clear="$refs.list.param.content.pageNumber = 1 ;$refs.list.param.content.where.isused = '';$refs.list.listData()" v-model="isused" style="margin-right:10px" size="small" :placeholder="$t(`请选择状态`)" @change="$refs.list.param.content.pageNumber = 1 ;$refs.list.param.content.where.isused = isused;$refs.list.listData()">
+            <el-option :label="$t(`已使用`)" value="已使用" />
+            <el-option :label="$t(`未使用`)" value="未使用" />
           </el-select>
         </div>
       </div>
       <template v-slot:tbList="scope">
         <span v-if="scope.data.column.columnname == 'status'">
-          <span style="color:#000000" v-if="scope.data.column.data[[scope.data.column.columnname]] == '在库'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
-          <span style="color:#d90a0a" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '借出'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
-          <span style="color:#52C41A" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '售出'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
-          <span style="color:#b2c0ea" v-else>{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#000000" v-if="scope.data.column.data[[scope.data.column.columnname]] == '在库'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span style="color:#d90a0a" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '借出'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span style="color:#52C41A" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '售出'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span style="color:#b2c0ea" v-else>{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
         </span>
         <div v-else-if="scope.data.column.columnname == 'islimit'">
-          <span>{{scope.data.column.data[[scope.data.column.columnname]] ? '是' : '否'}}</span>
+          <span>{{scope.data.column.data[[scope.data.column.columnname]] ? $t('是') : $t('否')}}</span>
         </div>
         <div v-else-if="scope.data.column.columnname == 'isused'">
-          <span>{{scope.data.column.data[[scope.data.column.columnname]] ? '是' : '否'}}</span>
+          <span>{{scope.data.column.data[[scope.data.column.columnname]] ? $t('是') : $t('否')}}</span>
         </div>
         <span v-else>
           {{scope.data.column.data[[scope.data.column.columnname]]}}
@@ -68,14 +68,14 @@ export default {
       options:[],
       status:'',
       isused:''
-      
+
     }
   },
   components:{ImportNumber},
   methods:{
     list (data) {
       console.log(data);
-      
+
     },
     listCreate (param) {
     }
@@ -84,4 +84,4 @@ export default {
 
 </script>
 <style>
-</style>
+</style>

+ 5 - 5
src/HDrpManagement/orderManage/details/tabs/addProduct.vue

@@ -2,9 +2,9 @@
 <div>
   <div class="flex-align-center flex-between mt-10">
     <div>
-      <el-input class="inline-16" style="width:200px" size="small"  suffix-icon="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></el-input>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 -->
+      <el-input class="inline-16" style="width:200px" size="small"  suffix-icon="el-icon-search" v-model="params.content.where.condition" :placeholder="`${$t(`产品名称`)},${$t(`编号`)}`" @keyup.enter.native="listData(params.content.pageNumber = 1)" @clear="listData(params.content.pageNumber = 1)" clearable></el-input>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 -->
     </div>
-    <el-button type="primary" size="small" :disabled="tableSelectData.length === 0" @click="onConfirm">添加选中商品</el-button>
+    <el-button type="primary" size="small" :disabled="tableSelectData.length === 0" @click="onConfirm">{{$t(`添加选中商品`)}}</el-button>
   </div>
   <div>
     <el-table
@@ -24,17 +24,17 @@
       </el-table-column>
       <el-table-column
         prop="itemname"
-        label="商品名称"
+        :label="$t(`商品名称`)"
         width="180">
       </el-table-column>
       <el-table-column
         prop="itemno"
-        label="编码"
+        :label="$t(`编码`)"
         width="180">
       </el-table-column>
       <el-table-column
         prop="erpitemname"
-        label="品名"
+        :label="$t(`品名`)"
         width="180">
         <template slot-scope="scope">
           {{ scope.row.erpitemname ? scope.row.erpitemname : '--' }}

+ 8 - 8
src/HDrpManagement/orderManage/details/tabs/changeHistory.vue

@@ -7,17 +7,17 @@
       border>
       <el-table-column
         prop="createby"
-        label="变更人"
+        :label="$t(`变更人`)"
         width="80">
       </el-table-column>
       <el-table-column
         prop="createdate"
-        label="变更时间"
+        :label="$t(`变更时间`)"
         width="150">
       </el-table-column>
       <el-table-column
         prop="itemno"
-        label="产品编码">
+        :label="$t(`产品编码`)">
       </el-table-column>
       <el-table-column
         prop="itemname"
@@ -29,25 +29,25 @@
       </el-table-column>
       <el-table-column
         prop="oldvalue"
-        label="原数量">
+        :label="$t(`原数量`)">
       </el-table-column>
       <el-table-column
         prop="newvalue"
-        label="变更后数量">
+        :label="$t(`变更后数量`)">
       </el-table-column>
       <el-table-column
           v-if="siteid === 'HY'"
           prop="olddeliverydate"
-          label="原交期">
+          :label="$t(`原交期`)">
       </el-table-column>
       <el-table-column
           v-if="siteid === 'HY'"
           prop="newdeliverydate"
-          label="变更后交期">
+          :label="$t(`变更后交期`)">
       </el-table-column>
       <el-table-column
         prop="remarks"
-        label="变更备注">
+        :label="$t(`变更备注`)">
       </el-table-column>
     </el-table>
     <div class="container normal-panel" style="text-align:right">

+ 12 - 12
src/HDrpManagement/orderManage/details/tabs/changeOrderMx.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
-    <el-button type="primary" size="small" :disabled="tableData.length === 0" @click="onShow">明细变更</el-button>
-    <el-dialog title="明细变更" append-to-body :visible.sync="dialogVisible" width="900px">
+    <el-button type="primary" size="small" :disabled="tableData.length === 0" @click="onShow">{{$t(`明细变更`)}}</el-button>
+    <el-dialog :title="$t(`明细变更`)" append-to-body :visible.sync="dialogVisible" width="900px">
       <el-table
         class="normal-margin"
         :data="listData"
@@ -21,7 +21,7 @@
         </el-table-column>
         <el-table-column
           prop="erpitemno"
-          label="erp编号"
+          :label="$t(`erp编号`)"
           width="180">
         </el-table-column>
         <el-table-column
@@ -43,7 +43,7 @@
         </el-table-column>
          <el-table-column
           prop="qty"
-          label="原数量"
+          :label="$t(`原数量`)"
           width="180">
           <template slot-scope="scope">
             <span>{{scope.row.qty}}</span>
@@ -51,7 +51,7 @@
         </el-table-column>
         <el-table-column
           prop="deliedqty"
-          label="已发数量"
+          :label="$t(`已发数量`)"
           width="180">
           <template slot-scope="scope">
             <span>{{scope.row.deliedqty}}</span>
@@ -59,7 +59,7 @@
         </el-table-column>
         <el-table-column
           prop="undeliqty"
-          label="未发数量"
+          :label="$t(`未发数量`)"
           width="180">
           <template slot-scope="scope">
             <span>{{scope.row.undeliqty}}</span>
@@ -68,7 +68,7 @@
         <el-table-column
             v-if="siteid === 'HY'"
             prop="newdeliverydate"
-            label="变更交期"
+            :label="$t(`变更交期`)"
             width="175"
             fixed="right">
           <template slot-scope="scope">
@@ -87,7 +87,7 @@
         </el-table-column>
         <el-table-column
           prop="newvalue"
-          label="变更数量"
+          :label="$t(`变更数量`)"
           width="180"
           fixed="right">
           <template slot-scope="scope">
@@ -96,8 +96,8 @@
         </el-table-column>
       </el-table>
       <el-form :model="form" label-position="top" size="small">
-        <el-form-item label="变更备注" :label-width="formLabelWidth">
-          <el-input v-model="form.remarks" type="textarea" :autosize="{minRows:5}" placeholder="输入变更备注" autocomplete="off"></el-input>
+        <el-form-item :label="$t(`变更备注`)" :label-width="formLabelWidth">
+          <el-input v-model="form.remarks" type="textarea" :autosize="{minRows:5}" :placeholder="$t(`输入变更备注`)" autocomplete="off"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -166,14 +166,14 @@ export default {
       let arr = this.listData.filter((row,index)=>{
         if (row.newvalue > row.qty) {
           this.$message({
-            message:row.itemname+"变更数量不能大于原数量",
+            message:row.itemname+this.$t("变更数量不能大于原数量"),
             type:"error",
             offset:index * 60
           })
           return row
         } else if (row.newvalue  < row.deliedqty) {
           this.$message({
-            message:row.itemname+"变更数量不能小于已发货数量",
+            message:row.itemname+this.$t("变更数量不能小于已发货数量"),
             type:"error",
             offset:index * 60
           })

+ 11 - 11
src/HDrpManagement/orderManage/details/tabs/defaultInfo.vue

@@ -2,10 +2,10 @@
   <div>
     <el-descriptions class="normal-margin" :column="2"  border labelClassName="my-label" contentClassName="my-content">
       <div slot="title" class="my-label__title">账户信息</div>
-      <el-descriptions-item label="账户名称">{{ mainData.accountclass?mainData.accountclass.accountname:"--" }}</el-descriptions-item>
-      <el-descriptions-item label="使用金额">{{ mainData.accountclass?tool.formatAmount(mainData.accountclass.amount,2):"--" }}</el-descriptions-item>
-      <el-descriptions-item label="是否使用返利金">{{ mainData.accountclass?mainData.accountclass.rebate_used ? '是' : '否' : '--' }}</el-descriptions-item>
-      <el-descriptions-item label="返利金使用金额">{{ mainData.rebateamount?tool.formatAmount(mainData.rebateamount,2):"--" }}</el-descriptions-item>
+      <el-descriptions-item :label="$t(`账户名称`)">{{ mainData.accountclass?mainData.accountclass.accountname:"--" }}</el-descriptions-item>
+      <el-descriptions-item :label="$t(`使用金额`)">{{ mainData.accountclass?tool.formatAmount(mainData.accountclass.amount,2):"--" }}</el-descriptions-item>
+      <el-descriptions-item :label="$t(`是否使用返利金`)">{{ mainData.accountclass?mainData.accountclass.rebate_used ? '是' : '否' : '--' }}</el-descriptions-item>
+      <el-descriptions-item :label="$t(`返利金使用金额`)">{{ mainData.rebateamount?tool.formatAmount(mainData.rebateamount,2):"--" }}</el-descriptions-item>
     </el-descriptions>
     <el-descriptions  class="normal-margin" border :column="2" labelClassName="my-label" contentClassName="my-content">
       <div slot="title" class="my-label__title">开票信息</div>
@@ -13,7 +13,7 @@
       <el-descriptions-item :label="$t('税号')">{{ mainData.finance?mainData.finance.taxno:"--" }}</el-descriptions-item>
       <el-descriptions-item :label="$t('开户行')">{{ mainData.finance?mainData.finance.bank:"--" }}</el-descriptions-item>
       <el-descriptions-item :label="$t('开户账号')">{{ mainData.finance?mainData.finance.bankcardno:"--" }}</el-descriptions-item>
-      <el-descriptions-item label="开户地址">{{ mainData.finance?mainData.finance.address:"--" }}</el-descriptions-item>
+      <el-descriptions-item :label="$t(`开户地址`)">{{ mainData.finance?mainData.finance.address:"--" }}</el-descriptions-item>
     </el-descriptions>
     <el-descriptions class="normal-margin"  border :column="2" labelClassName="my-label" contentClassName="my-content">
       <div slot="title" class="my-label__title">收货信息</div>
@@ -27,16 +27,16 @@
       <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="提交人">{{ mainData.submitby?mainData.submitby:"--" }}</el-descriptions-item>
-      <el-descriptions-item label="提交时间">{{ mainData.submitdate?mainData.submitdate:"--" }}</el-descriptions-item>
-      <el-descriptions-item label="审核人">{{ mainData.checkby?mainData.checkby:"--" }}</el-descriptions-item>
-      <el-descriptions-item label="审核时间">{{ mainData.checkdate?mainData.checkdate:"--" }}</el-descriptions-item>
+      <el-descriptions-item :label="$t(`提交人`)">{{ mainData.submitby?mainData.submitby:"--" }}</el-descriptions-item>
+      <el-descriptions-item :label="$t(`提交时间`)">{{ mainData.submitdate?mainData.submitdate:"--" }}</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>
 <!--    <el-descriptions  border :column="2" labelClassName="my-label" contentClassName="my-content">
       <div slot="title" class="my-label__title">物流信息</div>
 
-      <el-descriptions-item label="物流公司">{{ mainData.logiscomp?mainData.logiscomp.enterprisename:"&#45;&#45;" }}</el-descriptions-item>
-      <el-descriptions-item label="快递100ID">{{ mainData.logiscomp?mainData.logiscomp.kd100id:"&#45;&#45;" }}</el-descriptions-item>
+      <el-descriptions-item :label="$t(`物流公司`)">{{ mainData.logiscomp?mainData.logiscomp.enterprisename:"&#45;&#45;" }}</el-descriptions-item>
+      <el-descriptions-item :label="$t(`快递100ID`)">{{ mainData.logiscomp?mainData.logiscomp.kd100id:"&#45;&#45;" }}</el-descriptions-item>
     </el-descriptions>-->
   </div>
 </template>

+ 4 - 4
src/HDrpManagement/orderManage/details/tabs/dispatch.vue

@@ -7,7 +7,7 @@
       border>
       <el-table-column
         prop="billno"
-        label="发货单号"
+        :label="$t(`发货单号`)"
         width="180">
         <template slot-scope="scope">
           <a class="table_row_link" @click="linkDetail(scope.row)">{{scope.row.billno}}</a>
@@ -20,17 +20,17 @@
       </el-table-column>
       <el-table-column
         prop="sumqty"
-        label="发货数量"
+        :label="$t(`发货数量`)"
         width="90">
       </el-table-column>
       <el-table-column
         prop="sumamount"
-        label="发货金额"
+        :label="$t(`发货金额`)"
         width="90">
       </el-table-column>
       <el-table-column
         prop="billdate"
-        label="发货日期"
+        :label="$t(`发货日期`)"
         width="160px">
       </el-table-column>
       <el-table-column

+ 6 - 6
src/HDrpManagement/orderManage/details/tabs/erpHistory.vue

@@ -7,29 +7,29 @@
       border>
       <el-table-column
         prop="request"
-        label="推送人"
+        :label="$t(`推送人`)"
         width="180">
       </el-table-column>
       <el-table-column
         prop="createdate"
-        label="推送时间"
+        :label="$t(`推送时间`)"
         width="90">
       </el-table-column>
       <el-table-column
         prop="status"
-        label="返回状态">
+        :label="$t(`返回状态`)">
       </el-table-column>
       <el-table-column
         prop="erpbillno"
-        label="erp单据号">
+        :label="$t(`erp单据号`)">
       </el-table-column>
       <el-table-column
         prop="errmsg"
-        label="错误信息">
+        :label="$t(`错误信息`)">
       </el-table-column>
       <el-table-column
         prop="type"
-        label="类型">
+        :label="$t(`类型`)">
       </el-table-column>
     </el-table>
     <div class="container normal-panel" style="text-align:right">

+ 7 - 7
src/HDrpManagement/orderManage/details/tabs/invoiceTable.vue

@@ -15,25 +15,25 @@
       </el-table-column>
       <el-table-column
         prop="sa_invoicebillid"
-        label="发票ID"
+        :label="$t(`发票ID`)"
         width="180">
       </el-table-column>
       <el-table-column
         prop="sumtaxincludedamount"
-        label="发票金额"
+        :label="$t(`发票金额`)"
         width="180">
       </el-table-column>
       <el-table-column
         prop="invoiceserialnum"
-        label="发票流水号">
+        :label="$t(`发票流水号`)">
       </el-table-column>
       <el-table-column
         prop="status"
-        label="发票状态">
+        :label="$t(`发票状态`)">
       </el-table-column>
       <el-table-column
         prop="rb"
-        label="红蓝字">
+        :label="$t(`红蓝字`)">
         <template slot-scope="scope">
           <span :style="{color:scope.row.rb == 1?'blue':'red'}">{{scope.row.rb == 1?'蓝字':'红字'}}</span>
         </template>
@@ -60,10 +60,10 @@
         :total="total">
       </el-pagination>
     </div>
-    <el-dialog title="编辑发票" :visible.sync="dialogFormVisible" width="500px" append-to-body>
+    <el-dialog :title="$t(`编辑发票`)" :visible.sync="dialogFormVisible" width="500px" append-to-body>
       <el-form :model="form" size="small" label-position="right" label-width="100px">
         <el-form-item :label="$t('备注')">
-          <el-input v-model="form.remarks" autocomplete="off" type="textarea" :autosize="{minRows:3}" placeholder="请输入备注"></el-input>
+          <el-input v-model="form.remarks" autocomplete="off" type="textarea" :autosize="{minRows:3}" :placeholder="$t(`请输入备注`)"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">

+ 7 - 7
src/HDrpManagement/orderManage/details/tabs/logistics.vue

@@ -7,7 +7,7 @@
       border>
       <el-table-column
         prop="billno"
-        label="物流单号"
+        :label="$t(`物流单号`)"
         width="180">
         <template slot-scope="scope">
           <a class="table_row_link" @click="linkDetail(scope.row)">{{scope.row.billno}}</a>
@@ -20,27 +20,27 @@
       </el-table-column>
       <el-table-column
         prop="createdate"
-        label="单据日期">
+        :label="$t(`单据日期`)">
       </el-table-column>
       <el-table-column
           prop="carnum"
-          label="车牌号">
+          :label="$t(`车牌号`)">
       </el-table-column>
       <el-table-column
           prop="logiscontact"
-          label="物流联系人">
+          :label="$t(`物流联系人`)">
       </el-table-column>
       <el-table-column
           prop="logisphone"
-          label="物流电话">
+          :label="$t(`物流电话`)">
       </el-table-column>
       <el-table-column
           prop="name"
-          label="收货人">
+          :label="$t(`收货人`)">
       </el-table-column>
       <el-table-column
           prop="paytype"
-          label="寄件方式">
+          :label="$t(`寄件方式`)">
       </el-table-column>
       <el-table-column
         prop="address"

+ 11 - 11
src/HDrpManagement/orderManage/details/tabs/productlist.vue

@@ -4,7 +4,7 @@
       <div class="flex-align-center">
         <slot name="operation"></slot>
         <addProduct style="margin:0 0 10px 10px" v-if="type !== 'confirmdate' && data.status === '新建' " :drawer="drawer" :data="data"  ref="addProduct"
-                    :params="paramsAdd" :tablecolsAdd="tablecolsAdd" title="添 加" :tradefield="data.tradefield" :querySa_brandid="data.sa_brandid"
+                    :params="paramsAdd" :tablecolsAdd="tablecolsAdd" :title="$t(`添 加`)" :tradefield="data.tradefield" :querySa_brandid="data.sa_brandid"
                     @addSuccess="addProducts" @addProduct="addProduct" @uploadData="uploadData" @closeDrawer="listData();$emit('onSuccess')"
         ></addProduct>
          <uploadAllData
@@ -38,7 +38,7 @@
               align="right"
               type="date"
               size="mini"
-              placeholder="一键填写需求日期"
+              :placeholder="$t(`一键填写需求日期`)"
               :picker-options="pickerOptions1"
               @change="dateChangeNeed">
             </el-date-picker>
@@ -58,7 +58,7 @@
                     align="right"
                     type="date"
                     size="mini"
-                    placeholder="一键回复交期"
+                    :placeholder="$t(`一键回复交期`)"
                     :picker-options="pickerOptions"
                     @change="dateChange">
                 </el-date-picker>
@@ -73,7 +73,7 @@
                     align="right"
                     type="date"
                     size="mini"
-                    placeholder="一键回复交期"
+                    :placeholder="$t(`一键回复交期`)"
                     :picker-options="pickerOptions"
                     @change="dateChange">
                 </el-date-picker>
@@ -85,8 +85,8 @@
         </template>
         <template v-slot:customcol="scope">
           <div v-if="scope.column.columnname === 'qty'">
-            <el-input-number :controls="true" controls-position='right'  v-if="data.status === '新建' && data.type !=='特殊订单'" size="mini" v-model="scope.column.data.qty" :min="scope.column.data.orderminqty" :step="scope.column.data.orderaddqty" label="输入数量" @change="rowChange(scope.column.data,scope.$index)"></el-input-number>
-            <el-input-number  controls-position='right'  v-else-if="data.status === '新建' && data.type ==='特殊订单'" size="mini" :min="1" v-model="scope.column.data.qty" label="输入数量" @change="rowChange(scope.column.data,scope.$index)"></el-input-number>
+            <el-input-number :controls="true" controls-position='right'  v-if="data.status === '新建' && data.type !=='特殊订单'" size="mini" v-model="scope.column.data.qty" :min="scope.column.data.orderminqty" :step="scope.column.data.orderaddqty" :label="$t(`输入数量`)" @change="rowChange(scope.column.data,scope.$index)"></el-input-number>
+            <el-input-number  controls-position='right'  v-else-if="data.status === '新建' && data.type ==='特殊订单'" size="mini" :min="1" v-model="scope.column.data.qty" :label="$t(`输入数量`)" @change="rowChange(scope.column.data,scope.$index)"></el-input-number>
             <span v-else>{{scope.column.data.qty}}</span>
           </div>
           <div v-else-if="scope.column.columnname === 'needdate'">
@@ -174,7 +174,7 @@
             <p>¥&nbsp;{{tool.formatAmount(scope.column.data.marketprice,2)}}</p>
           </div>
           <div v-else-if="scope.column.columnname === 'defaultprice'">
-            <el-input v-if="data.status === '新建' && data.type === '特殊订单'" v-model="scope.column.data.defaultprice"  placeholder="输入订单备注" size="mini" @change="rowChange(scope.column.data,scope.$index)"></el-input>
+            <el-input v-if="data.status === '新建' && data.type === '特殊订单'" v-model="scope.column.data.defaultprice"  :placeholder="$t(`输入订单备注`)" size="mini" @change="rowChange(scope.column.data,scope.$index)"></el-input>
             <p v-else>¥&nbsp;{{tool.formatAmount(scope.column.data.defaultprice,2)}}</p>
           </div>
           <div v-else-if="scope.column.columnname === 'defaultamount'">
@@ -215,13 +215,13 @@
             </el-select>
           </div>
           <div v-else-if="scope.column.columnname === 'position'">
-            <el-input size="mini" readonly v-model="scope.column.data.position" @input="rowChange(scope.column.data,scope.$index)" placeholder="输入仓位"></el-input>
+            <el-input size="mini" readonly v-model="scope.column.data.position" @input="rowChange(scope.column.data,scope.$index)" :placeholder="$t(`输入仓位`)"></el-input>
           </div>
           <div v-else-if="scope.column.columnname === 'batchno'">
-            <el-input size="mini" readonly v-model="scope.column.data.batchno" @input="rowChange(scope.column.data,scope.$index)" placeholder="输入批号"></el-input>
+            <el-input size="mini" readonly v-model="scope.column.data.batchno" @input="rowChange(scope.column.data,scope.$index)" :placeholder="$t(`输入批号`)"></el-input>
           </div>
           <div v-else-if="scope.column.columnname === 'remarks'">
-            <el-input v-model="scope.column.data.remarks" placeholder="输入订单备注" size="mini" @change="rowChange(scope.column.data,scope.$index)"></el-input>
+            <el-input v-model="scope.column.data.remarks" :placeholder="$t(`输入订单备注`)" size="mini" @change="rowChange(scope.column.data,scope.$index)"></el-input>
           </div>
           <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
         </template>
@@ -244,7 +244,7 @@
     </el-col>
     <el-col :span="24 - setcol">
       <el-drawer
-        title="添加商品"
+        :title="$t(`添加商品`)"
         :visible.sync="drawer"
         append-to-body
         size="80%"

+ 5 - 5
src/HDrpManagement/orderManage/details/tabs/rebatesettlement.vue

@@ -2,12 +2,12 @@
   <div>
     <el-tabs v-if="rebHeadData.length > 0" v-model="activeName" type="border-card" @tab-click="handleClick">
       <el-tab-pane v-for="item in rebHeadData" :key="item.index" :label="item.title" :name="item.title">
-        <el-descriptions class="margin-top mt-10" title="居间明细" :column="2" size="small" border>
-          <el-descriptions-item :labelStyle="{width:'120px'}" label="订单金额比例">{{item.orderratio}}</el-descriptions-item>
+        <el-descriptions class="margin-top mt-10" :title="$t(`居间明细`)" :column="2" size="small" border>
+          <el-descriptions-item :labelStyle="{width:'120px'}" :label="$t(`订单金额比例`)">{{item.orderratio}}</el-descriptions-item>
           <el-descriptions-item :labelStyle="{width:'120px'}" :label="$t('订单金额')">{{item.amount?tool.formatAmount(item.amount,2):''}}</el-descriptions-item>
-          <el-descriptions-item :labelStyle="{width:'120px'}" label="居间产品折扣">{{Math.round((item.productdiscount * 100)*100)/100 + '%'}}</el-descriptions-item>
-          <el-descriptions-item :labelStyle="{width:'120px'}" label="居间费">{{item.rebate}}</el-descriptions-item>
-          <el-descriptions-item :labelStyle="{width:'120px'}" label="结算经销商">{{item.enterprisename?item.enterprisename:'--'}}</el-descriptions-item>
+          <el-descriptions-item :labelStyle="{width:'120px'}" :label="$t(`居间产品折扣`)">{{Math.round((item.productdiscount * 100)*100)/100 + '%'}}</el-descriptions-item>
+          <el-descriptions-item :labelStyle="{width:'120px'}" :label="$t(`居间费`)">{{item.rebate}}</el-descriptions-item>
+          <el-descriptions-item :labelStyle="{width:'120px'}" :label="$t(`结算经销商`)">{{item.enterprisename?item.enterprisename:'--'}}</el-descriptions-item>
         </el-descriptions>
         <table-new-layout :layout="tablecols" :data="tableData" :custom="true" :width="true" height="calc(100vh - 750px)" minHeight="400px">
           <template v-slot:customcol="scope">

+ 3 - 3
src/HDrpManagement/orderManage/details/tabs/revenueAndExp.vue

@@ -7,17 +7,17 @@
       border>
       <el-table-column
         prop="billno"
-        label="单据编号"
+        :label="$t(`单据编号`)"
         width="180">
       </el-table-column>
       <el-table-column
         prop="source"
-        label="来源"
+        :label="$t(`来源`)"
         width="180">
       </el-table-column>
       <el-table-column
           prop="createdate"
-          label="凭证时间"
+          :label="$t(`凭证时间`)"
           width="180">
       </el-table-column>
       <el-table-column

+ 7 - 7
src/HDrpManagement/orderManage/details/tabs/writeoff.vue

@@ -7,29 +7,29 @@
       border>
       <el-table-column
         prop="billno"
-        label="核销单号"
+        :label="$t(`核销单号`)"
         width="180">
       </el-table-column>
       <el-table-column
         prop="billnodate"
-        label="核销日期"
+        :label="$t(`核销日期`)"
         width="160">
       </el-table-column>
       <el-table-column
         prop="cashbillbillno"
-        label="收入凭证号">
+        :label="$t(`收入凭证号`)">
       </el-table-column>
       <el-table-column
         prop="writeoffamount"
-        label="核销单总金额">
+        :label="$t(`核销单总金额`)">
       </el-table-column>
       <el-table-column
         prop="rowno"
-        label="订单行号">
+        :label="$t(`订单行号`)">
       </el-table-column>
       <el-table-column
         prop="itemno"
-        label="产品编码">
+        :label="$t(`产品编码`)">
       </el-table-column>
       <el-table-column
         prop="itemname"
@@ -37,7 +37,7 @@
       </el-table-column>
       <el-table-column
         prop="ordetitemwriteoffamount"
-        label="本次核销金额">
+        :label="$t(`本次核销金额`)">
       </el-table-column>
     </el-table>
     <div class="container normal-panel" style="text-align:right">