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

src/views/ecw/customer/edit.vue

@@ -581,9 +581,10 @@ export default {
         this.$modal.alert(this.$t('至少添加一位联系人'))
         return
       }
-      this.$refs["contactForm"].validate(valid1 => {
-        this.$refs["form"].validate(valid2 => {
+      this.$refs["contactForm"].validate((valid1,err1) => {
+        this.$refs["form"].validate((valid2,err2) => {
           if (!valid1 || !valid2) {
+            this.$showFormValidateErrors({...err1,...err2})
             return;
           }
           if (this.form.customerContacts.length === 0){

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">
@@ -119,7 +123,7 @@
         <template slot-scope="scope">
           <dict-tag
             :type="DICT_TYPE.ECW_PAYMENT_STATE"
-            :value="scope.row.state"  
+            :value="scope.row.state"
           />
         </template>
       </el-table-column>
@@ -137,7 +141,7 @@
 
           <el-button v-if="scope.row.state == 4" size="mini" type="text" @click="verificationCancelClick(scope.row)">反核销</el-button>
           <!-- <el-button v-if="scope.row.state == 3" size="mini" type="text">开票</el-button> -->
-          
+
           <el-button size="mini" type="text" @click="toprint(scope.row.id)">打印</el-button>
           <el-button v-if="scope.row.state == 1 || scope.row.state == 3" size="mini" type="text" @click="deleteClick(scope.row)">删除</el-button>
           <!-- <el-button size="mini" type="text" @click="open = true">导出订单</el-button> -->
@@ -198,7 +202,7 @@ export default {
   },
   data() {
     return {
-      open: false,  
+      open: false,
       showSearch: true,
       loadings: false,
       form: {},
@@ -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/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" />
+            <el-table-column :label="$t('应收金额')" prop="totalAmount" >
+              <template slot-scope="{row}">
+                     {{row.totalAmount}}
+                      {{ currentMap[row.currencyId] }}
+                </template>
+              </el-table-column>
       <!--      <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()