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

src/api/ecw/boxSea.js

@@ -610,6 +610,20 @@ export function boxUpdate(data) {
   });
 }
 
+/**
+ * 拆单审核
+ *
+ * @param {*} params
+ * @returns
+ */
+export function createApproval(data) {
+  return request({
+    url: "/ecw/box-approval/create",
+    method: "post",
+    data,
+  });
+}
+
 /*****************************  装柜 end **********************************/
 
 /*****************************  卸柜 start **********************************/

src/views/ecw/box/ladingBill/index.vue

@@ -175,7 +175,11 @@ export default {
       this.$set(this.dialogCfg, "visible", true);
     },
     makeBill(row) {
-      makeBillService({ orderId: row.orderId }).then((res) => {
+      const { bookSeaInfo } = this.shipmentObj;
+      makeBillService({
+        orderId: row.orderId,
+        zgDate: bookSeaInfo.sailTime,
+      }).then((res) => {
         const { data } = res;
         const { titleZh = "", contentZh = "" } = data?.ladingTemplate ?? {};
         let billContent = `${titleZh}${contentZh}`,

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

@@ -80,7 +80,7 @@
               <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                 <template slot-scope="scope">
                   <el-button type="text" size="small" @click="moveOut(scope.row)" v-if="!isUnderReview && scope.row.installNum === 0">移出</el-button>
-                  <!-- <el-button type="text" size="small" v-if="isShowSplitOrder(scope.row)" @click="handlerSplitOrder(scope.row, 'splitOrder','拆单')">拆单</el-button> -->
+                  <el-button type="text" size="small" v-if="isShowSplitOrder(scope.row)" @click="handlerSplitOrder(scope.row, 'splitOrder','拆单')">拆单</el-button>
                 </template>
               </el-table-column>
             </el-table>
@@ -194,7 +194,7 @@
         </el-row>
       </template>
       <!-- 拆单 -->
-      <splitOrder v-if="dialogConfig.type === 'splitOrder' && dialogConfig.dialogVisible" :currRow="currRow" @closeDialog="closeDialog" />
+      <splitOrder v-bind="$attrs" :shipmentObj="shipmentObj" v-if="dialogConfig.type === 'splitOrder' && dialogConfig.dialogVisible" :currRow="currRow" @closeDialog="closeDialog" />
     </el-dialog>
   </div>
 </template>

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

@@ -2,11 +2,12 @@
   <div>
     <el-form ref="reviewForm" :model="reviewObj" label-width="120px">
       <el-form-item label="申请理由">
-        <el-input v-model="reviewObj.applyReason" type="textarea" rows="2" placeholder="请输入申请理由"></el-input>
+        <el-input v-model="reviewObj.applyReason" type="textarea" rows="2" placeholder="请输入申请理由" :disabled="isReview"></el-input>
       </el-form-item>
     </el-form>
     <el-row class="operate-button">
-      <el-button type="success" @click="onSubmit">发起申请</el-button>
+      <el-button type="success" @click="onSubmit" :disabled="isReview">发起申请</el-button>
+      <el-button type="primary" @click="jumpReviewDetail" :disabled="!isReview">审核中</el-button>
       <el-button @click="cancel">关闭</el-button>
     </el-row>
   </div>
@@ -14,7 +15,7 @@
 
 <script>
 import { approvalCreate } from "@/api/ecw/boxSea";
-import { serviceMsg } from "../utils";
+import { serviceMsg, toReviewDetail } from "../utils";
 
 /**
  * 反审
@@ -26,9 +27,29 @@ export default {
     return {
       // 反审对象
       reviewObj: {},
+      isReview: false,
+      bpmProcessId: "",
     };
   },
+  created() {
+    const { currNode, shipmentObj } = this.$attrs;
+    if (currNode.type === "preinstall") {
+      this.isReview = shipmentObj["preInstallBackInfo"] ? true : false;
+      this.bpmProcessId = shipmentObj["preInstallBackInfo"]?.bpmProcessId;
+    }
+    if (currNode.type === "unloading") {
+      this.isReview = shipmentObj["cabinetUnloadBackApprovalInfo"]
+        ? true
+        : false;
+      this.bpmProcessId =
+        shipmentObj["cabinetUnloadBackApprovalInfo"]?.bpmProcessId;
+    }
+  },
   methods: {
+    jumpReviewDetail() {
+      toReviewDetail.apply(this, [this.bpmProcessId]);
+      this.$emit("closeDialog");
+    },
     /** 提交 */
     onSubmit() {
       this.$refs["reviewForm"].validate((valid) => {

src/views/ecw/customer/index.vue

@@ -10,7 +10,7 @@
         <el-input v-model="queryParams.name" placeholder="请输入客户名称" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item label="客户等级" prop="level">
-        <el-select v-model="queryParams.level" placeholder="请选择客户等级" clearable size="small">
+        <el-select clearable  v-model="queryParams.level" placeholder="请选择客户等级" clearable size="small">
           <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_LEVEL)"
                        :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
@@ -22,35 +22,35 @@
         <dict-selector :type="DICT_TYPE.CUSTOMER_TYPE"  multiple v-model="queryParams.type"></dict-selector>
       </el-form-item>
       <el-form-item label="客户经理" prop="customerService">
-        <el-select v-model="queryParams.customerService" placeholder="请选择客户经理" clearable size="small">
+        <el-select clearable  v-model="queryParams.customerService" placeholder="请选择客户经理" clearable size="small">
           <el-option v-for="dict in customerServiceList"
                      :key="dict.id" :label="dict.nickname" :value="dict.id"/>
         </el-select>
       </el-form-item>
       <el-form-item label="客户来源" prop="source">
-        <el-select v-model="queryParams.source" placeholder="请选择客户来源" clearable size="small">
+        <el-select clearable  v-model="queryParams.source" placeholder="请选择客户来源" clearable size="small">
           <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_SOURCE)"
                        :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
       <el-form-item label="国家" prop="source">
-        <el-select v-model="form.country" placeholder="请选择国家">
+        <el-select clearable  v-model="form.country" placeholder="请选择国家">
           <el-option v-for="dict in countryList"
                      :key="dict.id" :label="dict.nameZh" :value="parseInt(dict.id)" />
         </el-select>
       </el-form-item>
       <el-form-item label="客户状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择客户状态" clearable size="small">
+        <el-select clearable  v-model="queryParams.status" placeholder="请选择客户状态" clearable size="small">
           <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_STATUS)"
                        :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
       <el-form-item label="创建时间">
-        <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
+        <el-date-picker clearable  v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
                         type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
       </el-form-item>
       <el-form-item label="信用等级" prop="department">
-        <el-select v-model="form.ww" >
+        <el-select clearable  v-model="form.level" >
           <el-option  v-for="(item,index) in creditList" :label="item.nameZh" :key="index" :value="item.id" ></el-option>
         </el-select>
       </el-form-item>