Merge remote-tracking branch 'origin/dev1.6' into dev1.6

src/api/ecw/boxSea.js

@@ -150,6 +150,7 @@ export function getBoxLadingBillPdf(params) {
   return request({
     url: "/ecw/box-lading-bill/getBoxLadingBillPdf",
     method: "get",
+    responseType: 'arraybuffer',
     params,
   });
 }

src/views/ecw/box/shippingSea/nodePage/subMaterial.vue

@@ -167,7 +167,7 @@ export default {
             operateType,
           }).then((res) => {
             serviceMsg(res, this).then(() => {
-              this.download()
+              if(operateType == 2) this.download()
               this.cancel("submit");
             });
           });

src/views/ecw/customer/customerLog.vue

@@ -81,14 +81,16 @@
      </el-table-column>
      <el-table-column label="新的预计入公海时间">
        <template v-slot="{row}">
-         {{parseTime(row.newEstimateEnterOpenSeaTime)}}
+         {{parseTime(row.newEstimateEnterOpenSeaTime) || '/'}}
        </template>
      </el-table-column>
      <el-table-column label="老的预计入公海时间" >
        <template v-slot="{row}">
-         {{parseTime(row.oldEstimateEnterOpenSeaTime)}}
+         {{parseTime(row.oldEstimateEnterOpenSeaTime || '/')}}
        </template>
      </el-table-column>
+     <el-table-column label="备注" prop="remark" >
+     </el-table-column>
      <el-table-column  label="操作">
        <template v-slot="{row}">
          <el-button type="text" @click="getCustomerLog(row.id)">
@@ -102,7 +104,7 @@
    <el-dialog title="客户日志" :visible.sync="show">
      <el-form>
        <el-form-item label="订单编号:">
-         {{dataLog.dataLog ? dataLog.dataLog :'/'}}
+         {{dataLog.orderNo ? dataLog.orderNo :'/'}}
        </el-form-item>
        <el-form-item label="客户编号:">
          {{dataLog.number}}
@@ -111,10 +113,10 @@
          {{dataLog.name}}
        </el-form-item>
        <el-form-item label="新客户经理:">
-         {{dataLog.newEstimateEnterOpenSeaTime ? dataLog.newEstimateEnterOpenSeaTime : '/'}}
+         {{dataLog.newCustomerService ? operatorFn(dataLog.newCustomerService) : '/'}}
        </el-form-item>
        <el-form-item label="老客户经理:">
-         {{dataLog.oldEstimateEnterOpenSeaTime ? dataLog.oldEstimateEnterOpenSeaTime : '/'}}
+         {{dataLog.oldCustomerService ? operatorFn(dataLog.oldCustomerService) : '/'}}
        </el-form-item>
        <el-form-item label="操作类型:">
          <dict-tag :type="DICT_TYPE.CUSTOMER_OPERATE_TYPE" :value="dataLog.operateType"></dict-tag>
@@ -123,17 +125,14 @@
          {{operatorFn(dataLog.operator)}}
        </el-form-item>
        <el-form-item label="新预计进入公海时间:">
-         {{parseTime(dataLog.newEstimateEnterOpenSeaTime)}}
+         {{parseTime(dataLog.newEstimateEnterOpenSeaTime) || '/'}}
        </el-form-item>
        <el-form-item label="老的预计进入公海时间:">
-         {{parseTime(dataLog.oldEstimateEnterOpenSeaTime)}}
+         {{parseTime(dataLog.oldEstimateEnterOpenSeaTime) || '/'}}
        </el-form-item>
        <el-form-item label="备注:">
          {{dataLog.remark}}
        </el-form-item>
-       <el-form-item label="更新json:">
-         {{dataLog.updateBody}}
-       </el-form-item>
      </el-form>
    </el-dialog>
  </div>
@@ -160,7 +159,7 @@ export default {
     },
     operatorFn(){
       return (val)=>{
-        return this.allSimplList.find(item => item.id == val)?.nickname
+        return this.allSimplList.find(item => item.id == val)?.nickname || '/'
       }
     }
   },

src/views/ecw/customer/query.vue

@@ -428,7 +428,7 @@
            </el-table>
             <pagination @pagination="getCustomerGrade" :page.sync="getCustomerGradeFrom.pageNo" :limit.sync="getCustomerGradeFrom.pageSize"  :total="getCustomerGradeFrom.total" ></pagination>
           </el-tab-pane>
-          <el-tab-pane name="operationLog" v-if="permissions.includes('ecw:customer:operation-log')" :label="$t('操作日志')" >
+          <el-tab-pane name="operationLog" v-show="checkPermi('ecw:customer:operation-log')" :label="$t('操作日志')" >
             <customer-log  :customerId="id" v-if="'operationLog' === activeName"></customer-log>
           </el-tab-pane>
         </el-tabs>
@@ -490,6 +490,7 @@ import {getCreditRulePage} from "@/api/customer/creditRule";
 import {getCountry} from "@/api/ecw/country"
 import {getCurrencyList} from "@/api/ecw/currency";
 import customerLog from "@/views/ecw/customer/customerLog.vue";
+import {checkPermi} from "@/utils/permission";
 
 export default {
   name: 'query',
@@ -722,6 +723,7 @@ export default {
     }
   },
   methods:{
+    checkPermi,
     userIdFormatter(row, column, cellValue){
       const member = this.memberList.find(e => e.id === cellValue)
       if (member) {

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

@@ -100,7 +100,7 @@
             :type="DICT_TYPE.ECW_PAYMENT_STATE"
             :value="scope.row.state"
           />
-          <span v-if="scope.row.state == 2 " :title="scope.row.remark"><i class="el-icon-question"></i></span>
+          <span v-if="[2,4,6].includes(scope.row.state) && scope.row.comment" :title="scope.row.comment"><i class="el-icon-question"></i></span>
         </template>
       </el-table-column>
       <el-table-column :label="$t('操作')">

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

@@ -188,7 +188,7 @@
           size="mini"
           @click="handleAdd"
           style="padding: 10px; margin-bottom: 10px"
-        >{{ $t('加未付客户款项') }}
+        >{{ $t('添加未付客户款项') }}
         </el-button
         >
       </el-col>

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

@@ -6,6 +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>
   <router-link :to="{path:'/financial/commission-requestFunds',query:{lookId: this.record.id}}">
     <el-button type="primary">查看详情</el-button>

src/views/ecw/financial/paymentVoucher.vue

@@ -134,6 +134,7 @@
             :type="DICT_TYPE.ECW_PAYMENT_STATE"
             :value="scope.row.state"
           />
+          <span v-if="[2,4,6].includes(scope.row.state) && scope.row.comment" :title="scope.row.comment"><i class="el-icon-question"></i></span>
         </template>
       </el-table-column>
       <el-table-column

src/views/ecw/order/components/BatchPickup.vue

 <template>
     <el-dialog :title="$t('批量提货')" visible :before-close="closeDialog" :close-on-click-modal="false">
-        <el-form ref="form" :model="form" :rules="rules">                
+        <el-form ref="form" :model="form" :rules="rules">
             <el-tabs v-model="current" type="card">
                 <el-tab-pane :label="$t('全部提货')" name="createBatch">
                     <el-form-item :label="$t('订单号') + '/' + this.$t('提单号')" prop="orderId">
@@ -8,7 +8,7 @@
                         <div>{{$t('注：单号之间使用逗号或空格隔开')}}</div>
                     </el-form-item>
                     <el-form-item :label="$t('提货时间')" prop="pickTime">
-                        <el-date-picker v-model="form.pickTime" placeholder="" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+                        <el-date-picker type="datetime" v-model="form.pickTime" placeholder="" label-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
                     </el-form-item>
                 </el-tab-pane>
                 <el-tab-pane :label="$t('分批提货')" name="createSplitBatch">
@@ -18,7 +18,7 @@
                         <div>{{$t('注：单号之间使用逗号或空格隔开')}}</div>
                     </el-form-item>
                     <el-form-item :label="$t('提货时间')" prop="pickTime">
-                        <el-date-picker v-model="form.pickTime" placeholder="" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+                        <el-date-picker type="datetime" v-model="form.pickTime" placeholder="" label-format="yyyy-MM-dd HH:mm:ss"  value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
                     </el-form-item>
                     <el-form-item label="">
                         <el-table :data="orderList">
@@ -43,7 +43,7 @@ import {createBatch, createSplitBatch, getPickUpListByOrderNo} from '@/api/ecw/o
 
 export default {
     props:{
-        
+
     },
     data(){
         return {
@@ -62,10 +62,10 @@ export default {
         }
     },
     computed:{
-        
+
     },
     created(){
-        
+
     },
     methods:{
         submit(){
@@ -75,7 +75,7 @@ export default {
                 }
                 let orderIdArr = this.form.orderId.replace(/,/g, ' ').split(' ').filter(item => item !='')
                 let data = []
-                
+
                 // 分批提货
                 if(this.current == 'createSplitBatch'){
                     data = this.orderList.map(item => {
@@ -112,4 +112,4 @@ export default {
         }
     }
 }
-</script>
+</script>
\ No newline at end of file