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

src/views/ecw/box/cancelClear.vue

@@ -13,13 +13,14 @@
     <el-row class="operate-button">
       <el-button v-if="flag" type="primary" @click="onSubmit">{{$t('确定')}}</el-button>
       <el-button v-if="!flag" type="primary" @click="$router.push({path: '/bpm/process-instance/detail', query: {id: apply.bpmProcessId}})">{{$t('审核中')}}</el-button>
+      <el-button v-if="!flag" plain type="primary" @click="canclAudit">{{$t('取消审核')}}</el-button>
       <el-button @click="cancel">{{$t('取消')}}</el-button>
     </el-row>
   </div>
 </template>
 
 <script>
-import { approvalCreate } from "@/api/ecw/boxSea";
+import { approvalCreate, approvalCancel } from "@/api/ecw/boxSea";
 
 export default {
   name: "updateError",
@@ -68,6 +69,16 @@ export default {
         }
       });
     },
+    /* 取消审核 */
+    canclAudit() {
+      approvalCancel({
+        applyReason: this.$t("取消审核"),
+        id: this.apply.id,
+        shipmentId: this.shipmentObj.id,
+      }).then((res) => {
+        this.$emit("closeDialog");
+      });
+    },
     cancel() {
       this.$emit("closeDialog");
     },

src/views/ecw/box/queryAir.vue

@@ -118,7 +118,7 @@
               <div class="status-line"></div>
               <div class="status-number">{{logList.length - index}}</div>
               <div class="status-info">
-                <div>{{$l(item, 'title')}}</div>
+                <div>{{$l(item, 'title')}} <el-button v-if="item.approvalId>0" type="text" @click="handleApproval(item.bpmProcessId)">{{$t('查看审批')}}</el-button></div>
                 <div>
                   <p>{{formatDate(item.createTime)}}</p>
                   <p>{{item.operator}}</p>
@@ -161,12 +161,12 @@
               <el-table-column type="index" align="center" :label="$t('序号')" width="50" />
               <el-table-column prop="opStep" :label="$t('操作')" align="center">
                 <template slot-scope="scope">
-                  <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PROCESS" :value="scope.row.opStep" />
+                  <dict-tag :type="DICT_TYPE.BOX_AIR_SHIPMENT_PROCESS" :value="scope.row.opStep" />
                 </template>
               </el-table-column>
               <el-table-column prop="billAbnId" :label="$t('异常')" align="center">
                 <template slot-scope="scope">
-                  <dict-tag :type="DICT_TYPE.BOX_SHIPPING_TICKET_EXCEPTION" :value="scope.row.billAbnId" />
+                  <dict-tag :type="DICT_TYPE.BOX_AIR_SHIPMENT_PROCESS" :value="scope.row.billAbnId" />
                 </template>
               </el-table-column>
               <el-table-column prop="abnDetail" :label="$t('异常描述')" align="center" width="300"></el-table-column>
@@ -656,6 +656,9 @@ export default {
         );
       }
     },
+    handleApproval(id) {
+      this.$router.push({path: '/bpm/process-instance/detail', query: {id: id}})
+    }
   },
   computed: {
     visitedViews() {

src/views/ecw/box/shippingAir/nodePage/cusClearance.vue

@@ -15,7 +15,7 @@
         <span v-for="order in cusClearanceObj.clearanceOrderList" :key="order.id">{{ order.orderNo }} </span>
       </el-form-item>
 
-      <div>
+      <div v-if="cusClearanceObj.clearanceType == 1">
         <el-form ref="airArrivalForm" :rules="airArrivalrules" :model="airArrivalInfo" label-width="160px">
           <el-form-item :label="$t('实际二程起飞时间')" prop="actSecondTime">
             <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="airArrivalInfo.actSecondTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
@@ -336,7 +336,7 @@ export default {
     onSubmit(operateType) {
       this.$refs['cusClearanceForm'].validate((valid) => {
         if (valid) {
-          if (this.cusClearanceObj.clearanceType == 1 && this.cusClearanceObj.clearanceOrderIdList.length > 0) {
+          if (this.cusClearanceObj.clearanceType == 1) {
             this.$refs['airArrivalForm'].validate((arrvalid) => {
               if (arrvalid) {
                 updateOrderArrival({

src/views/ecw/box/shippingAir/seaProcess.vue

@@ -186,6 +186,10 @@ export default {
           break;
         // 清关
         case "cusClearance":
+          if(!this.shipmentObj.airArrivalInfo || this.shipmentObj.airArrivalInfo.arriveType == 0){
+            this.$message.error(this.$t("请先完成到港操作"));
+            return;
+          }
           this.$set(this.dialogConfig, "width", "700px");
           break;
         // AGENT
@@ -220,6 +224,10 @@ export default {
           break;
         // 卸柜
         case "unloading":
+          if(!this.shipmentObj.clearanceInfo || this.shipmentObj.clearanceInfo.clearanceType == 0){
+            this.$message.error(this.$t("请先完成清关操作"));
+            return;
+          }
           // 卸柜反审
           const unStatus = this.shipmentObj[node.keyName];
           if ([186].includes(unStatus)) {
@@ -269,6 +277,10 @@ export default {
 
           if (start.includes(val[keyName]) && val[voName]) {
             node.currStatus = "wait";
+            if(type === "arrival" || type === "cusClearance"){
+              ++nodeIndex;
+              continue;
+            }
           }
 
           if (wait.includes(val[keyName])) {

src/views/ecw/financial/creatPayment.vue

@@ -676,10 +676,10 @@ export default {
                 this.$modal.msgError(this.$t('请选择供应商未付款项'));
                 return
               }
-              if(!params.supplierBankAccount){
+              /*if(!params.supplierBankAccount){
                 this.$modal.msgError(this.$t('请选择供应商银行账号'));
                 return
-              }
+              }*/
               if (this.id && this.id !== '0') {
                 updatePayment(params).then(res => {
                   this.$modal.msgSuccess(this.$t('申请成功'));