Merge branch 'release' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into release

src/i18n/languages/en_US.json

@@ -1142,7 +1142,7 @@
     "手续费（RMB）": "Handling fee (RMB)",
     "需要": "need",
     "不需要": "unnecessary",
-    "美元": "Dollar",
+    "元": "RMB",
     "银行收款明细": "Bank Receipt Details",
     "批量核销": "Batch write-off",
     "添加收款明细": "Add Receipt Details",

src/views/bpm/task/copy.vue

@@ -2,13 +2,13 @@
   <div class="app-container">
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item :label="$t('流程编号')" prop="processId">
+      <el-form-item :label="$t('流程编号')" prop="instanceId">
         <el-input v-model="queryParams.instanceId" :placeholder="$t('请输入流程编号')" clearable/>
       </el-form-item>
       <el-form-item :label="$t('流程名称')" prop="processName">
         <el-input v-model="queryParams.processName" :placeholder="$t('请输入任务名称')" clearable/>
       </el-form-item>
-      <el-form-item :label="$t('流程分类')" prop="processName">
+      <el-form-item :label="$t('流程分类')" prop="categoryId">
         <el-select v-model="queryParams.categoryId" :placeholder="$t('请选择流程分类')" clearable>
           <el-option v-for="dict in this.getDictDatas(DICT_TYPE.BPM_MODEL_CATEGORY)"
                      :key="dict.value" :label="$l(dict, 'label')" :value="dict.value"/>

src/views/ecw/box/shippingSea/nodePage/cabinet/splitOrder.vue

@@ -170,7 +170,7 @@
           <el-table-column :label="$t('货值')" align="center">
             <template slot-scope="scope">
               <el-input v-model="scope.row.worth" @change="updateField(scope.row, 'worth')" size="mini">
-                <span slot="append">{{ $t('美元') }}</span>
+                <span slot="append">{{ $t('元') }}</span>
               </el-input>
             </template>
           </el-table-column>
@@ -235,7 +235,7 @@
             </div>
             <div>
               {{ $t('数量(个)') }}：{{ mainOrderItem.quantity || 0 }}
-              {{ $t('剩余货值') }}：{{ mainOrderItem.worth || 0 }}{{ $t('美元') }}
+              {{ $t('剩余货值') }}：{{ mainOrderItem.worth || 0 }}{{ $t('元') }}
             </div>
           </el-form-item>
           <el-card class="box-card" v-if="shopForm.specsRecordVOList">

src/views/ecw/customer/edit.vue

@@ -612,15 +612,17 @@ export default {
           if(this.form.lightUnit){
             this.showPao = true
           }
-        // 获取重泡货路线
-        getCustomerLines(customerId).then(res => {
-          this.zhongLines = res.data.filter(item => item.zhongPaoType == 1)
-          this.paoLines = res.data.filter(item => item.zhongPaoType == 2)
-          if(this.zhongLines.length)this.showZhong1 = true
-          if(this.paoLines.length) this.showPao1 = true
-          // /admin-api/customer-line/get-by-customer
-          // /admin-api/customer-line/get-by-customer?customerId=29564
-        })
+          if(customerId){
+            // 获取重泡货路线
+            getCustomerLines(customerId).then(res => {
+              this.zhongLines = res.data.filter(item => item.zhongPaoType == 1)
+              this.paoLines = res.data.filter(item => item.zhongPaoType == 2)
+              if(this.zhongLines.length)this.showZhong1 = true
+              if(this.paoLines.length) this.showPao1 = true
+              // /admin-api/customer-line/get-by-customer
+              // /admin-api/customer-line/get-by-customer?customerId=29564
+            })
+          }
       })
     } else {
       this.getZhongPao()

src/views/ecw/customer/editIndirect.vue

@@ -432,7 +432,7 @@ import MemberSelector from '@/components/MemberSelector'
 export default {
   name: "editIndirect",
   props: {
-    customerId: String,
+    // customerId: String,
   },
   components: {
     Template,
@@ -445,27 +445,28 @@ export default {
     this.getCustomerSelect()
     this.reset()
     // this.getUserMemberUserFn()
-    if(this.$route.query.id) {
+    if(this.$route.query && this.$route.query.id) {
       // 编辑客户
       this.customerId = this.$route.query.id
-      this.getCustomer(this.customerId).then(() => {
-        getCustomerContactsListByCustomer({customerId: this.customerId}).then(r => {
-           if(r.data&&r.data.length>0){
-          this.form.customerContacts = r.data
-          let list = this.form.customerContacts.map(item => item.userid);
-          if(list.length >0){
-            memberUserList({ids:list.join(',')}).then(r=>{
-              this.selectMemberList = r.data
-            })
-          }
-          }
-          if(this.form.promoter){
-           getCustomerList({ids:this.form.promoter}).then(r => {
-             this.recommended = r.data;
-           })
-         }
-        })
-
+      this.getCustomer( this.$route.query.id).then(() => {
+        if(this.$route.query && this.$route.query.id){
+          getCustomerContactsListByCustomer({customerId: this.$route.query.id}).then(r => {
+            if(r.data&&r.data.length>0){
+              this.form.customerContacts = r.data
+              let list = this.form.customerContacts.map(item => item.userid);
+              if(list.length >0){
+                memberUserList({ids:list.join(',')}).then(r=>{
+                  this.selectMemberList = r.data
+                })
+              }
+            }
+            if(this.form.promoter){
+              getCustomerList({ids:this.form.promoter}).then(r => {
+                this.recommended = r.data;
+              })
+            }
+          })
+        }
         // 打开重泡货开关
         if(this.form.weightUnit){
           this.showZhong = true
@@ -473,17 +474,18 @@ export default {
         if(this.form.lightUnit){
           this.showPao = true
         }
-
-        // 获取重泡货路线
-        getCustomerLines(this.customerId).then(res => {
-          console.log({getCustomerLines: res})
-          this.zhongLines = res.data.filter(item => item.zhongPaoType == 1)
-          this.paoLines = res.data.filter(item => item.zhongPaoType == 2)
-          if(this.zhongLines.length)this.showZhong1 = true
-          if(this.paoLines.length) this.showPao1 = true
-          // /admin-api/customer-line/get-by-customer
-          // /admin-api/customer-line/get-by-customer?customerId=29564
-        })
+        if(this.$route.query && this.$route.query.id){
+          // 获取重泡货路线
+          getCustomerLines(this.$route.query.id).then(res => {
+            console.log({getCustomerLines: res})
+            this.zhongLines = res.data.filter(item => item.zhongPaoType == 1)
+            this.paoLines = res.data.filter(item => item.zhongPaoType == 2)
+            if(this.zhongLines.length)this.showZhong1 = true
+            if(this.paoLines.length) this.showPao1 = true
+            // /admin-api/customer-line/get-by-customer
+            // /admin-api/customer-line/get-by-customer?customerId=29564
+          })
+        }
       })
     } else {
       // 新建客户
@@ -519,6 +521,7 @@ export default {
   },
   data(){
     return {
+      customerId:'',
       isCustomerServiceConfirmed:false,
       getDictDatas,
       DICT_TYPE,

src/views/ecw/customer/indirectInfo.vue

@@ -429,7 +429,7 @@ export default {
   },
   created() {
     //获取信用类型
-    if(this.$route.query.id){
+    if(this.$route.query && this.$route.query.id){
       this.id = this.$route.query.id
     }
     getCreditRulePage({page:1,rows:999,type:2}).then(r => {
@@ -438,24 +438,27 @@ export default {
     getNodeList().then(r => {
       this.nodeList = r.data
     })
-    getCustomer(this.id).then(response => {
-      this.customer = { ...this.customer, ...response.data }
-      console.log(this.id)
-      getCustomerContactsListByCustomer({customerId: this.id}).then(r => {
-        if(r.data&&r.data.length>0){
-          this.customerContacts = r.data
-          let list =  this.customerContacts.map(r => r.userid)
-          memberUserList({ids:list.join(',')}).then(r => {
-            this.memberList = r.data
-          })
-        }
+    if(this.$route.query && this.id){
+      getCustomer(this.id).then(response => {
+        this.customer = { ...this.customer, ...response.data }
+      if(this.$route.query && this.$route.query.id){
+        getCustomerContactsListByCustomer({customerId: this.$route.query.id}).then(r => {
+          if(r.data&&r.data.length>0){
+            this.customerContacts = r.data
+            let list =  this.customerContacts.map(r => r.userid)
+            memberUserList({ids:list.join(',')}).then(r => {
+              this.memberList = r.data
+            })
+          }
 
-      })
+        })
+      }
 
-      getCountry(this.customer.country ? this.customer.country : 0 ).then(r => {
-        this.country = r.data?r.data.nameZh:''
+        getCountry(this.customer.country ? this.customer.country : 0 ).then(r => {
+          this.country = r.data?r.data.nameZh:''
+        })
       })
-    })
+    }
     getProductTypeList().then(r => {
       this.productTypeList = r.data
     })
@@ -479,6 +482,7 @@ export default {
   },
   data() {
     return {
+      customerId:'',
       STATUS:{
         0:this.$t('取消报价'),
         1:this.$t('特价审批中'),
@@ -597,9 +601,9 @@ export default {
     customerService() {
       return this.serviceUserList.find(e => e.id === this.customer.customerService)?.nickname || ''
     },
-    id() {
-      return this.customerId ? parseInt(this.customerId) : undefined
-    },
+    // id() {
+    //     return this.customerId ? parseInt(this.customerId) : undefined
+    // },
     creditScoreCalculation(){
       return (val)=>{
         if(val === 'all'){

src/views/ecw/order/splitApply/index.vue

@@ -194,7 +194,7 @@
           <el-table-column :label="$t('货值')" align="center">
             <template slot-scope="scope">
               <el-input v-model="scope.row.worth" @change="updateField(scope.row, 'worth')" size="mini" :disabled="index === 0">
-                <span slot="append">{{ $t('美元') }}</span>
+                <span slot="append">{{ $t('元') }}</span>
               </el-input>
             </template>
           </el-table-column>
@@ -269,7 +269,7 @@
         </div>
         <div>
           {{ $t('数量(个)') }}：{{ mainOrderItem.quantity || 0 }}
-          {{ $t('剩余货值') }}：{{ mainOrderItem.worth || 0 }}{{ $t('美元') }}
+          {{ $t('剩余货值') }}：{{ mainOrderItem.worth || 0 }}{{ $t('元') }}
         </div>
       </el-form-item>
        <el-card class="box-card" v-if="shopForm.specsRecordVOList">