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

src/api/ecw/financial.js

@@ -559,6 +559,7 @@ export function cancelFinancePaymentWriteOff(data){
     data
   })
 }
+// 取消付款单反核销
 export function cancelFinancePaymentWriteOffNo(data){
  return request({
    url:'/ecw/payment/cancelFinancePaymentWriteOffNo',

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

@@ -515,7 +515,7 @@ export default {
           }
 
           let params = {
-            num: this.shopForm.num,
+            num: this.shopForm.putNum,
             quantity: this.shopForm.putQuantity,
             orderItemId: this.shopForm.orderItemId,
             orderSplitId: this.splitData.id,

src/views/ecw/box/shippingSea/nodePage/tally/index.vue

@@ -171,16 +171,16 @@ export default {
             });
           });
         });
-        let relist = []
-        list.forEach(l=>{
-          let index = relist.findIndex(i=>i.orderId == l.orderId && i.positionNo == l.positionNo)
-          if(index == -1){
-            relist.push(l)
-          }else{
-            relist[index].warehouseInInfo.cartonsNum = parseInt(relist[index].warehouseInInfo.cartonsNum)+parseInt(l.warehouseInInfo.cartonsNum)
-          }
-        })
-        this.tallyList = relist;
+        // let relist = []
+        // list.forEach(l=>{
+        //   let index = relist.findIndex(i=>i.orderId == l.orderId && i.positionNo == l.positionNo)
+        //   if(index == -1){
+        //     relist.push(l)
+        //   }else{
+        //     relist[index].warehouseInInfo.cartonsNum = parseInt(relist[index].warehouseInInfo.cartonsNum)+parseInt(l.warehouseInInfo.cartonsNum)
+        //   }
+        // })
+        this.tallyList = list;
       });
     },
     // 选中

src/views/ecw/financial/commission-Payment.vue

@@ -245,6 +245,7 @@ export default {
         "paymentId": this.paymentRow.id,
         "paymentNo": this.paymentRow.paymentNo,
         "remark":this.paymentValue,
+         "reason":this.paymentValue
       }
       switch (this.paymentIndex){
         case 1:

src/views/ecw/financial/components/PaymentApproval.vue

@@ -9,6 +9,7 @@
           </template></el-descriptions-item>
         <el-descriptions-item :label="$t('业务员')">{{ form.salesmanName }}</el-descriptions-item>
         <el-descriptions-item :label="$t('付款金额')">{{paymentMoney}}{{$t('人民币')}}</el-descriptions-item>
+        <el-descriptions-item v-if="reason" :label="$t('申请理由')">{{reason}}</el-descriptions-item>
       </el-descriptions>
     <div class="btn">
       <el-button
@@ -37,7 +38,8 @@ export default {
       form: {},
       list:[],
       paymentId:0,
-      paymentMoney:0
+      paymentMoney:0,
+      reason:''
     }
   },
   watch:{
@@ -58,7 +60,8 @@ export default {
    getData(){
      getPaymentApprove(this.id).then(res => {
          if(res.data.paymentId){
-           this.paymentId = res.data.paymentId
+           this.paymentId = res.data.paymentId;
+           this.reason = res.data.reason;
             this.getPayableInfo()
          }
      })

src/views/ecw/financial/components/commissionPaymentDetails.vue

@@ -6,7 +6,7 @@
     <el-descriptions-item label="创建时间">{{parseTime(record.createTime)}}</el-descriptions-item>
     <el-descriptions-item label="业务员">{{record.salesmanName}}</el-descriptions-item>
     <el-descriptions-item label="付款金额">{{record.totalAmount}}rmb</el-descriptions-item>
-    <el-descriptions-item v-if="record.bmpStatus === 3" label="驳回原因">{{record.comment}}</el-descriptions-item>
+    <el-descriptions-item v-if="record.reason" label="申请理由">{{record.reason}}</el-descriptions-item>
   </el-descriptions>
   <router-link :to="{path:'/financial/commission-requestFunds',query:{lookId: this.record.id}}">
     <el-button type="primary">查看详情</el-button>
@@ -39,6 +39,7 @@ export default {
         commissionPaymentGetPaymentApprove({id:newVal}).then(r => {
           getCommissionPayment({id:r.data.paymentId}).then(res => {
             this.record = res.data;
+            this.record.reason = r.data.reason //申请理由
           })
         })
       },

src/views/ecw/financial/paymentVoucher.vue

@@ -426,14 +426,14 @@ export default {
           // 取消审核
           cancelFinancePaymentApproval(p).then(()=>resolve(this.$t('取消付款单审核成功！')),reject)
           break
+        // 取消付款单反审核
         case 2:
-          // 取消付款单反审核
           cancelFinancePaymentApprovalNo(p).then(()=>resolve(this.$t('取消付款单反审核成功！')),reject)
-          break
+          break;
         case 3:
           //取消付款单核销
           cancelFinancePaymentWriteOffNo(p).then(()=>resolve(this.$t('取消付款单核销成功！')),reject)
-          break;
+          break
         case 4:
       // 反审核
           paymentVerifyCancel(p).then(()=>resolve(this.$t('提交付款单反审核成功，请耐心等待审核结果!')),reject)

src/views/ecw/messageLeave/index.vue

@@ -20,8 +20,8 @@
       </el-form-item>
 
       <el-form-item :label="$t('创建时间')">
-        <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
-                        type="daterange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
+        <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
+                        type="datetimerange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
@@ -232,7 +232,7 @@ export default {
       this.loading = true;
       // 处理查询参数
       let params = {...this.queryParams};
-      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
+      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime',false);
       // 执行查询
       getMessageLeavePage(params).then(response => {
         this.list = response.data.list;