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

.gitignore

@@ -10,7 +10,7 @@ tests/**/coverage/
 tests/e2e/reports
 selenium-debug.log
 # 提取的需要翻译的文件列表
-messages.txt
+i18n-messages.txt
 # Editor directories and files
 .idea
 .vscode

collectI18nMessages.js

@@ -2,6 +2,7 @@ const fs = require('fs');
 const root = "./src"
 let allFiles = []
 
+
 function getFiles(dir){
     let files = fs.readdirSync(dir)
     files.forEach(file => {
@@ -16,12 +17,12 @@ getFiles(root)
 let messages = new Set()
 allFiles.forEach(file => {
     let data = fs.readFileSync(file, {encoding: 'utf-8'})
-    let matched = data.matchAll(/\$t\([\'\"]{1}([^\"\']+)[\'\"]{1}\)/g)
+    let matched = data.matchAll(/\$t\([\'\"]{1}([^\"\']+)[\'\"]{1}/g)
     let i = 0
     for(let item of matched){
         i ++
         messages.add(item[1])
     }
 })
-fs.writeFileSync("./messages.txt", Array.from(messages).join("\n"))
+fs.writeFileSync("./i18n-messages.txt", Array.from(messages).join("\n"))
 console.log("done!")
\ No newline at end of file

src/components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue

@@ -478,3 +478,8 @@ export default {
   }
 };
 </script>
+<style scoped>
+.my-process-designer{
+  height: calc(100vh - 84px - 40px);
+}
+</style>

src/views/bpm/task/copy.vue

@@ -11,8 +11,8 @@
                      :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="流程名称" prop="processName">
-        <el-input v-model="queryParams.processName" placeholder="请输入流程名称" clearable/>
+      <el-form-item label="任务名称" prop="processName">
+        <el-input v-model="queryParams.processName" placeholder="请输入任务名称" clearable/>
       </el-form-item>
       <el-form-item :label="$t('创建时间')">
         <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
@@ -32,7 +32,7 @@
           <dict-tag :type="DICT_TYPE.BPM_MODEL_CATEGORY" :value="scope.row.categoryId" />
         </template>
       </el-table-column>
-      <el-table-column label="流程名称" align="center" prop="processName"/>
+      <el-table-column label="任务名称" align="center" prop="processName"/>
       <el-table-column label="流程发起人" align="center" prop="originatorName"/>
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">

src/views/bpm/task/done.vue

@@ -2,8 +2,8 @@
   <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="name">
-        <el-input v-model="queryParams.name" :placeholder="$t('请输入流程名')" clearable @keyup.enter.native="handleQuery"/>
+      <el-form-item :label="$t('任务名称')" prop="name">
+        <el-input v-model="queryParams.name" :placeholder="$t('请输入任务名称')" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item :label="$t('创建时间')">
         <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"

src/views/ecw/financial/creatPayment.vue

@@ -196,7 +196,7 @@
         </el-table-column>
         <el-table-column label="价税合计(RMB)" align="center" prop="total" >
           <template slot-scope="scope">
-           <span>{{ scope.row.total = (scope.row.totalAmount * scope.row.exchangeRate) + (scope.row.totalAmount * scope.row.exchangeRate) * (scope.row.taxRate/100) }}</span>
+           <span>{{ scope.row.total = ((scope.row.totalAmount * scope.row.exchangeRate) + (scope.row.totalAmount * scope.row.exchangeRate) * (scope.row.taxRate/100)).toFixed(6) }}</span>
           </template>
         </el-table-column>
       </el-table>
@@ -247,7 +247,7 @@
     </el-card>
     <div slot="footer" style="margin: 20px 0">
       <!-- <el-button type="primary" @click="submitDraft">保 存</el-button> -->
-      <el-button type="primary" @click="submitForm">新 增</el-button>
+      <el-button type="primary" @click="submitForm">{{id==0?'新 增':'编 辑'}}</el-button>
     </div>
     <el-dialog
       :visible.sync="open"
@@ -542,7 +542,7 @@ export default {
       const index = sums.length - 1
       sums[index - 1] = '价税合计大写'
       const t = data.map(v => v.total).reduce((prev, curr) => {
-        return prev + curr;
+        return parseFloat(prev) + parseFloat(curr);
       }, 0)
       sums[index] = this.convertCurrency(t)
       return sums;

src/views/ecw/financial/paymentVoucher.vue

@@ -98,7 +98,11 @@
           <span>{{ scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="付款单号" align="center" prop="paymentNo" />
+      <el-table-column label="付款单号" align="center" prop="paymentNo" >
+       <template slot-scope="scope">
+            <span style="color: #1890ff;" @click="paymentDetail(scope.row)">{{scope.row.paymentNo}}</span>
+          </template>
+        </el-table-column>
       <el-table-column label="供应商" align="center" prop="supplierName" />
       <el-table-column label="创建时间" align="center" prop="createTime">
         <template slot-scope="scope">
@@ -256,6 +260,10 @@ export default {
         this.loading = false;
       });
     },
+    paymentDetail(row){
+      const id = row.id;
+      return this.$router.push("paymentDetail?id=" + id);
+    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.page = 1;

src/views/ecw/financial/voucher.vue

@@ -120,12 +120,12 @@
         </template>
       </el-table-column>
       <!-- <el-table-column label="自编号" align="center" prop="orderNo" /> -->
-      <el-table-column label="订单号" align="center" prop="orderNo">
-        <template slot-scope="scope">
-            <span style="color: #1890ff;" @click="verificationCancelClick(scope.row)">{{scope.row.orderNo}}</span>
+      <!-- <el-table-column label="订单号" align="center" prop="orderNo"> -->
+        <!-- <template slot-scope="scope"> -->
+            <!-- <span style="color: #1890ff;" @click="verificationCancelClick(scope.row)">{{scope.row.orderNo}}</span> -->
             <!-- <el-button size="mini" type="text" @click="verificationCancelClick(scope.row)">{{ scope.row.receiptNo }}</el-button> -->
-          </template>
-        </el-table-column>
+          <!-- </template> -->
+        <!-- </el-table-column> -->
       <el-table-column label="客户名称" align="center" prop="customerName" />
       <el-table-column label="创建日期" align="center" prop="createTime">
         <template slot-scope="scope">

src/views/ecw/offer/edit.vue

@@ -1021,6 +1021,7 @@ export default {
                 console.log('产品未选择', item)
                 calcable = false
             }
+            item.brandType = item.brand
         })
         if(this.calculating || !calcable) return false
         this.calculating = true

src/views/ecw/order/prepayDeal.vue

@@ -32,12 +32,12 @@
        <div v-if="orderExceptionData.orderExceptionType!='order_doc_exception'&&orderExceptionData.orderExceptionType!='order_consignor_exception'&&orderExceptionData.orderExceptionType!='order_other_exception'">
          <el-row>
             <el-form-item :label="$t('填单参数')+':'">
-               {{(shopData.num||0)+$t('箱 ')+(shopData.volume||0)+'m³ '+(shopData.weight||0)+'kg '+(shopData.quantity||0)+$t('个')}}
+               {{(orderData.costVO.totalNum||0)+$t('箱 ')+(orderData.costVO.totalVolume||0)+'m³ '+(orderData.costVO.totalWeight||0)+'kg '+(orderData.costVO.totalQuantity||0)+$t('个')}}
             </el-form-item>
          </el-row>
          <el-row>
             <el-form-item :label="$t('入仓参数')+':'">
-              <span>{{(shopData.warehouseInInfoVO?shopData.warehouseInInfoVO.cartonsNum:0)+$t('箱')+(shopData.warehouseInInfoVO?shopData.warehouseInInfoVO.volume:0)+'m³ '+(shopData.warehouseInInfoVO?shopData.warehouseInInfoVO.weight:0)+'kg '+(shopData.warehouseInInfoVO?shopData.warehouseInInfoVO.quantityAll:0) +$t('个')}}</span>
+              <span>{{(orderData.sumNum||0)+$t('箱')+(orderData.sumVolume||0)+'m³ '+(orderData.sumWeight||0)+'kg '+(orderData.sumQuantity||0) +$t('个')}}</span>
             </el-form-item>
          </el-row>
          <el-row :span="12">
@@ -48,7 +48,7 @@
          </el-row>
          <el-row v-if="orderExceptionData.orderExceptionType=='order_pay_exception'">
             <el-form-item :label="$t('收费参数')+':'">
-              <span>{{orderData.entryNum||0}}{{$t('箱')}} {{orderData.entryVolume||0}}m³  {{orderData.entryWeight||0}}Kg  {{orderData.entryQuantity||0}}{{$t('个')}}</span>
+              <span>{{orderData.sumNum||0}}{{$t('箱')}} {{orderData.wvolume||0}}m³  {{orderData.vweight||0}}Kg  {{orderData.sumQuantity||0}}{{$t('个')}}</span>
             </el-form-item>
          </el-row>
 <!--         <el-row :span="12">
@@ -78,10 +78,15 @@
               </el-table-column>
             <el-table-column :label="$t('收入类型')">
                <template slot-scope="scope">
-                  <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="scope.row.feeType"></dict-tag>
+                  <dict-tag :type="DICT_TYPE.FEE_TYPE" :value="scope.row.feeType"></dict-tag>
+               </template>
+            </el-table-column>
+            <el-table-column :label="$t('应收金额')" prop="totalAmount" >
+              <template slot-scope="{row}">
+                     {{row.totalAmount}}
+                      {{ currentMap[row.currencyId] }}
                 </template>
               </el-table-column>
-            <el-table-column :label="$t('应收金额')" prop="totalAmount" />
       <!--      <el-table-column label="总金额美元" align="center" prop="totalAmount">
               <template slot-scope="{row}">
                    {{row.totalAmount}}({{row.exchangeRate}})
@@ -123,9 +128,21 @@
                       {{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.cartonsNum:0}}
                     </template>
                   </el-table-column>
-                  <el-table-column :label="$t('方数')" prop="volume" />
-                <el-table-column :label="$t('重量')" prop="weight" />
-                <el-table-column :label="$t('数量')" prop="quantity" />
+                  <el-table-column :label="$t('方数')" prop="volume">
+                    <template slot-scope="scope">
+                        {{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.volume:0}}
+                      </template>
+                    </el-table-column>
+                <el-table-column :label="$t('重量')" prop="weight">
+                  <template slot-scope="scope">
+                      {{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.weight:0}}
+                    </template>
+                  </el-table-column>
+                <el-table-column :label="$t('数量')" prop="quantity">
+                  <template slot-scope="scope">
+                      {{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.quantityAll:0}}
+                    </template>
+                  </el-table-column>
                 <el-table-column :label="$t('货值')" prop="worth" />
               </el-table>
           <el-form :model="handlerParams" ref="queryForms" size="small" :inline="true"  label-width="120px" class="card">
@@ -271,6 +288,7 @@
   import FileUpload from '@/components/FileUpload'
   import {getDictData, getDictDatas} from  '@/utils/dict'
   import {getOrder} from '@/api/ecw/order'
+  import { getCurrencyList } from '@/api/ecw/currency'
   import {getExceptionById,handlerExceptionByExceptionId,getOrderItemById,getOrderFeeById} from "@/api/ecw/orderException"
   import {getFirstReceivableListByOrderId} from '@/api/ecw/financial'
 
@@ -301,7 +319,8 @@
         routerList:[],
         multipleSelection:[],
         preException:[],
-        orderFee:[]
+        orderFee:[],
+        currencyList:[],
       };
     },
     created() {
@@ -311,6 +330,16 @@
         this.getList()
 
       }
+       getCurrencyList().then(res => this.currencyList = res.data)
+    },
+    computed: {
+      currentMap(){
+        let map = {}
+        this.currencyList.forEach(item => {
+          map[item.id] = this.$l(item, 'title')
+        })
+        return map
+      },
     },
     methods: {
       /** 查询列表 */
@@ -325,9 +354,9 @@
           that.loading = false;
           that.orderId = response.data.orderId
           that.getOrderData()
-          if(response.data.hasOwnProperty('orderItemId')){
-            that.getShopData(response.data.orderItemId)
-          }
+          // if(response.data.hasOwnProperty('orderItemId')){
+          //   that.getShopData(response.data.orderItemId)
+          // }
 
           if(that.orderExceptionData.orderExceptionType == 'order_pay_exception'){
             that.getOrderFeeByIdData()

src/views/ecw/order/warehousing/components/editDialog.vue

@@ -3,7 +3,7 @@
     <el-dialog
       :title="title + ' - ' + warehousing.orderNo"
       :visible.sync="opened"
-      width="1080px"
+      width="1280px"
     >
       <el-tabs v-model="activeName" type="card" @tab-click="handleTabs">
         <el-tab-pane :label="edit ? '货物修改' : '货物入仓'" name="first">
@@ -73,6 +73,9 @@
                 :data="tableData"
                 style="width: 100%">
                 <el-table-column label="箱数" width="150px">
+                  <template v-slot:header>
+                    <span style="color: red">*</span> 箱数
+                  </template>
                   <template v-slot="{r,c,$index}">
                     <el-form-item :rules="tableFormRules.cartonsNum" :prop="$index + '.cartonsNum'">
                       <span v-if="tableData[$index].id && !edit">
@@ -86,6 +89,9 @@
                   </template>
                 </el-table-column>
                 <el-table-column label="包装类型" width="100px">
+                  <template v-slot:header>
+                    <span style="color: red">*</span> 包装类型
+                  </template>
                   <template v-slot="{r,c,$index}">
                     <el-form-item>
                       <span v-if="tableData[$index].id && !edit">{{ getDictDataLabel(DICT_TYPE.ECW_PACKAGING_TYPE, tableData[$index].unit) }}</span>
@@ -118,22 +124,31 @@
                   </template>
                 </el-table-column>
                 <el-table-column label="体积(m³)">
+                  <template v-slot:header>
+                    <span style="color: red">*</span> 体积(m³)
+                  </template>
                   <template v-slot="{r,c,$index}">
                     <el-form-item :rules="tableFormRules.volume" :prop="$index + '.volume'">
                       <span v-if="tableData[$index].id && !edit">{{ tableData[$index].volume }}</span>
-                      <el-input v-else v-model.number="tableData[$index].volume" placeholder=""></el-input>
+                      <el-input v-else v-model="tableData[$index].volume" placeholder="" type="number"></el-input>
                     </el-form-item>
                   </template>
                 </el-table-column>
                 <el-table-column label="重量(Kg)">
+                  <template v-slot:header>
+                    <span style="color: red">*</span> 重量(Kg)
+                  </template>
                   <template v-slot="{r,c,$index}">
                     <el-form-item :rules="tableFormRules.weight" :prop="$index + '.weight'">
                       <span v-if="tableData[$index].id && !edit">{{ tableData[$index].weight }}</span>
-                      <el-input v-else v-model.number="tableData[$index].weight" placeholder=""></el-input>
+                      <el-input v-else v-model="tableData[$index].weight" placeholder="" type="number"></el-input>
                     </el-form-item>
                   </template>
                 </el-table-column>
                 <el-table-column label="数量" width="130px">
+                  <template v-slot:header>
+                    <span style="color: red">*</span> 数量
+                  </template>
                   <template v-slot="{r,c,$index}">
                     <el-form-item :rules="tableFormRules.quantityAll" :prop="$index + '.quantityAll'">
                       <span v-if="tableData[$index].id && !edit">{{ tableData[$index].quantityAll }}</span>
@@ -400,13 +415,13 @@ export default {
         recordMode: undefined
       },
       tableFormRules: {
-        cartonsNum: [{required: true, message: this.$t("箱数不能为空"), trigger: "blur"}],
-        boxGauge1: [{required: true, message: this.$t("货物长不能为空"), trigger: "blur"}],
-        boxGauge2: [{required: true, message: this.$t("货物宽不能为空"), trigger: "blur"}],
-        boxGauge3: [{required: true, message: this.$t("货物高不能为空"), trigger: "blur"}],
-        volume: [{required: true, message: this.$t("体积不能为空"), trigger: "blur"}],
-        weight: [{required: true, message: this.$t("重量不能为空"), trigger: "blur"}],
-        quantityAll: [{required: true, message: "数量不能为空", trigger: "blur"}]
+        cartonsNum: [{required: true, message: this.$t("箱数不能为空"), trigger: "change"}],
+        boxGauge1: [{required: true, message: this.$t("货物长不能为空"), trigger: "change"}],
+        boxGauge2: [{required: true, message: this.$t("货物宽不能为空"), trigger: "change"}],
+        boxGauge3: [{required: true, message: this.$t("货物高不能为空"), trigger: "change"}],
+        volume: [{required: true, message: this.$t("体积不能为空"), trigger: "change"}],
+        weight: [{required: true, message: this.$t("重量不能为空"), trigger: "change"}],
+        quantityAll: [{required: true, message: "数量不能为空", trigger: "change"}]
       },
       form1: {
         "brand": "0",

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

@@ -42,7 +42,7 @@
         label="入库货物属性">
         <template v-slot="{row}">
           <template v-if="row.warehouseInInfoVO">
-            品牌：{{ ['无牌', '有牌', '中性'][row.brandType] }}<br>
+            品牌：{{ ['无牌', '有牌', '中性'][row.feeType] }}<br>
             箱数：{{ row.warehouseInInfoVO.cartonsNum }}<br>
             体积：{{ row.warehouseInInfoVO.volume }}m³<br>
             重量：{{ row.warehouseInInfoVO.weight }}Kg
@@ -343,12 +343,14 @@ export default {
         if (r.code === 0) {
           this.escapeBol = false;
           this.finishVisible = false
+          const message = !r.data ? '该订单已成功入仓，是否打印？' : "<h3>货物已入仓，存在异常</h3>该订单已成功入仓，是否打印？"
           this.$confirm(
-            '该订单已成功入仓，是否打印？',
+            message,
             '货物已入仓',
             {
               confirmButtonText: '是',
-              cancelButtonText: '否'
+              cancelButtonText: '否',
+              dangerouslyUseHTMLString: true
             }
           ).then(() => {
             this.isShowPrint = true