Merge remote-tracking branch 'origin/dev' into dev

src/views/bpm/task/done.vue

@@ -33,7 +33,7 @@
 
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
-      <el-table-column :label="$t('流程编号')" align="center" prop="id" width="320" fixed/>
+      <el-table-column :label="$t('流程编号')" align="center" prop="processInstance.id" width="320" fixed/>
       <el-table-column :label="$t('流程名称')" align="center" prop="processInstance.name" width="200"/>
       <el-table-column :label="$t('业务编号')" align="center" prop="businessNo"/>
       <el-table-column :label="$t('流程分类')" align="center" prop="category" width="200">

src/views/bpm/task/todo.vue

@@ -33,7 +33,7 @@
 
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
-      <el-table-column :label="$t('流程编号')" align="center" prop="id" width="320"/>
+      <el-table-column :label="$t('流程编号')" align="center" prop="processInstance.id" width="320"/>
       <el-table-column :label="$t('流程名称')" align="center" prop="processInstance.name" width="320"/>
       
       <el-table-column :label="$t('流程分类')" align="center" prop="category">

src/views/ecw/customer/edit.vue

@@ -168,7 +168,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item :label="$t('到仓确认')" prop="arrivalConfirm">
-                <el-switch v-model="form.arrivalConfirm" :active-value="0" :inactive-value="1" />
+                <el-switch v-model="form.arrivalConfirm" :active-value="1" :inactive-value="0" />
               </el-form-item>
             </el-col>
             <el-col :span="13">

src/views/ecw/financial/printVoucher.vue

@@ -64,7 +64,7 @@
             <p style="margin: 0;word-break: break-all;">A/C NO：{{bankTiem.platformAccountNo}}</p>
           </div>
           <div style="padding:6px 0;width: 87.5%;text-align: center;">
-            <p style="margin: 0;">应收<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="bankTiem.currencyId" />：¥{{bankTiem.receivableAmount}}</p>
+            <p style="margin: 0;">应收<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="bankTiem.currencyId" />：{{bankTiem.receivableAmount}}¥</p>
             <!-- <p style="margin: 0;">未收：¥{{bankTiem.noReceipt}}</p> -->
           </div>
         </div>
@@ -241,7 +241,7 @@
         getOrder(orderId).then(response => {
           this.orderData = response.data
         });
-        },
+      },
       print(){
           lodop().then(LODOP => {
               LODOP.PRINT_INIT();

src/views/ecw/financial/receiptDetail.vue

@@ -192,7 +192,8 @@
         </el-table-column>
         <el-table-column :label="$t('期望收款币种')" align="center">
           <template slot-scope="scope">
-            <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.collectionCurrencyId" />
+            <!-- <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.collectionCurrencyId" /> -->
+            {{getCurrencyLabel(scope.row.collectionCurrencyId)}}
           </template>
         </el-table-column>
         <el-table-column :label="$t('期望收款汇率')" align="center">
@@ -324,9 +325,22 @@
               prop="currencyId"
               :rules="{ required: true, trigger: ['blur', 'change'], message: $t('币种不能为空') }"
             >
-              <dict-selector v-if="!isView" :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" v-model="addForm.currencyId" @change="val => currencyIdChange(val)"/>
+            <el-select
+              v-model="addForm.currencyId"
+              :placeholder="$t('请选择')"
+              :disabled="isView"
+              @change="val => currencyIdChange(val)"
+            >
+              <el-option
+                v-for="item in currencyList"
+                :key="item.id"
+                :label="item.titleZh"
+                :value="item.id"
+              />
+            </el-select>
+              <!-- <dict-selector v-if="!isView" :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" v-model="addForm.currencyId" @change="val => currencyIdChange(val)"/> -->
               <!-- <span v-else>{{ addForm.currencyId }}</span> -->
-              <dict-tag v-else :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="addForm.currencyId" />
+              <!-- <dict-tag v-else :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="addForm.currencyId" /> -->
             </el-form-item>
           </div>
           <el-form-item
@@ -533,10 +547,10 @@ export default {
         const dollarList = res.data.filter(v => v.collectionCurrencyId == 1)
         const dollar = dollarList.reduce((total, currentValue) => NP.plus(total, currentValue.collectionAmount || 0), 0)
 
-        const rmbList = res.data.filter(v => v.collectionCurrencyId == 2)
+        const rmbList = res.data.filter(v => v.collectionCurrencyId == 3)
         const rmb = rmbList.reduce((total, currentValue) => NP.plus(total, currentValue.collectionAmount || 0), 0)
 
-        const nairaList = res.data.filter(v => v.collectionCurrencyId == 3)
+        const nairaList = res.data.filter(v => v.collectionCurrencyId == 2)
         const naira = nairaList.reduce((total, currentValue) => NP.plus(total, currentValue.collectionAmount || 0), 0)
 
         res.data[res.data.length -1].collectionAmount = [dollar, rmb, naira]
@@ -547,14 +561,14 @@ export default {
         const d = res.data.find(v => v.currencyId == 1)
         d && (d.discountTotal = discountDollar)
 
-        const rmbListByList = this.list.filter(v => v.currencyId === 2)
+        const rmbListByList = this.list.filter(v => v.currencyId === 3)
         const discountRmb = rmbListByList.reduce((total, currentValue) => NP.plus(total, currentValue.discountTotal || 0), 0)
-        const r = res.data.find(v => v.currencyId == 2)
+        const r = res.data.find(v => v.currencyId == 3)
         r && (r.discountTotal = discountRmb)
 
-        const nairaListByList = this.list.filter(v => v.currencyId === 3)
+        const nairaListByList = this.list.filter(v => v.currencyId === 2)
         const discountNaira = nairaListByList.reduce((total, currentValue) => NP.plus(total, currentValue.discountTotal || 0), 0)
-        const n = res.data.find(v => v.currencyId == 3)
+        const n = res.data.find(v => v.currencyId == 2)
         n && (n.discountTotal = discountNaira)
 
 
@@ -573,13 +587,18 @@ export default {
     setWriteOffAmount() {
       this.$set(this.addForm, 'writeOffAmount', NP.times(this.addForm.rate || 0, this.addForm.amount || 0))
     },
+    getCurrencyLabel(id){
+      var label = this.currencyList.filter(item=>item.id == id)
+      if(label.length>0) return label[0].titleZh
+      return ''
+    },
     calculation() {
       const verificationList = this.detailed.filter(v => v.status === 1)
       const dollarList = verificationList.filter(v => v.currencyId === 1)
       const dollar = dollarList.length > 0 ? dollarList.reduce((total, currentValue) => NP.plus(total, currentValue.amount || 0), 0) : 0
-      const rmbList = verificationList.filter(v => v.currencyId === 2)
+      const rmbList = verificationList.filter(v => v.currencyId === 3)
       const rmb = rmbList.length > 0 ? rmbList.reduce((total, currentValue) => NP.plus(total, currentValue.amount || 0), 0) : 0
-      const nairaList = verificationList.filter(v => v.currencyId === 3)
+      const nairaList = verificationList.filter(v => v.currencyId === 2)
       const naira = nairaList.length > 0 ? nairaList.reduce((total, currentValue) => NP.plus(total, currentValue.amount || 0), 0) : 0
 
       // const usCount = NP.plus(dollar, NP.times(this.RMBtoUS(), rmb),  NP.times(this.NANtoUS(), naira))
@@ -653,12 +672,12 @@ export default {
       if(val === this.showCurrencyId) {
         rate = 1
       } else {
-        if (this.showCurrencyId === 1 && val === 2) rate = this.RMBtoUS()
-        else if (this.showCurrencyId === 1 && val === 3) rate = this.NANtoUS()
-        else if (this.showCurrencyId === 2 && val === 1) rate = this.UStoRMB()
-        else if (this.showCurrencyId === 2 && val === 3) rate = this.NANtoRMB()
-        else if (this.showCurrencyId === 3 && val === 1) rate = this.UStoNAN()
-        else if (this.showCurrencyId === 3 && val === 2) rate = this.RMBtoNAN()
+        if (this.showCurrencyId === 1 && val === 3) rate = this.RMBtoUS()
+        else if (this.showCurrencyId === 1 && val === 2) rate = this.NANtoUS()
+        else if (this.showCurrencyId === 3 && val === 1) rate = this.UStoRMB()
+        else if (this.showCurrencyId === 3 && val === 2) rate = this.NANtoRMB()
+        else if (this.showCurrencyId === 2 && val === 1) rate = this.UStoNAN()
+        else if (this.showCurrencyId === 2 && val === 3) rate = this.RMBtoNAN()
       }
       this.$set(this.addForm, 'rate', rate)
     },
@@ -787,7 +806,7 @@ export default {
         })
         .then(() => {
           this.$modal.msgSuccess(this.$t('核销成功'));
-          this.$router.back();
+          this.$store.dispatch('tagsView/delCurrentView');
         })
         .catch(() => {});
     },