需求 136后台-集运-包裹列表-操作-撤出包裹

src/views/bpm/processInstance/detail.vue

@@ -130,6 +130,7 @@ import CargoControlDetail from "@/views/ecw/order/components/CargoControlDetail"
 import BoxSplitDetail from "@/views/ecw/order/components/BoxSplitDetail"
 import UpdateFeeApproval from "@/views/ecw/cons/components/UpdateFeeApproval"
 import retiredWarehouseApproval from "@/views/ecw/cons/retiredWarehouseApproval"
+import consExitApproval from "@/views/ecw/cons/consExitApproval"
 
 // 流程实例的详情页，可用于审批
 export default {
@@ -144,6 +145,7 @@ export default {
     CargoControlDetail,
     UpdateFeeApproval,
     retiredWarehouseApproval,
+    consExitApproval,
     BoxSplitDetail
   },
   computed: {
@@ -501,6 +503,10 @@ export default {
           component: "retiredWarehouseApproval",
           id: this.processInstance.id
         },
+        ecw_cons_exit_warehouse:  {
+          component: "consExitApproval",
+          id: this.processInstance.id
+        },
       }
       console.log("formCustomViewPath", this.processInstance.processDefinition.formCustomViewPath.trim())
       return map[this.processInstance.processDefinition.formCustomViewPath.trim()]

src/views/ecw/cons/consExitApproval.vue

+<template xmlns="http://www.w3.org/1999/html">
+  <div>
+    <div class="title-font">
+      <label>{{ $t("申请信息") }}【{{form.expressNo}}】</label>
+    </div>
+    <el-descriptions :column="6" :colon="false"  :border="true" :contentStyle="{'color': '#000000'}" :labelStyle="{'color': '#000000'}">
+      <el-descriptions-item :label="$t('包裹号')+'：'">{{ form.consNum }}</el-descriptions-item>
+      <el-descriptions-item :label="$t('包裹状态')+'：'">
+        <dict-tag :type="DICT_TYPE.CONS_STATUS" :value="form.status"/>
+      </el-descriptions-item>
+      <el-descriptions-item :label="$t('客户')+'：'">{{ form.customerName }}({{form.customerNumber}})</el-descriptions-item>
+      <el-descriptions-item :label="$t('订单编号')+'：'">{{ form.orderNo }}</el-descriptions-item>
+      <el-descriptions-item :label="$t('运输方式')+'：'">
+        <dict-tag class="mr-10" :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="form.transportId" />
+      </el-descriptions-item>
+      <el-descriptions-item :label="$t('订单状态')+'：'">
+        <dict-tag class="mr-10" :type="DICT_TYPE.ORDER_STATUS" :value="form.orderStatus" />
+      </el-descriptions-item>
+      <el-descriptions-item :label="$t('始发仓')+'：'">{{ warehouseList.filter(a => a.id == form.wareId)[0]!=undefined?warehouseList.filter(a => a.id == form.wareId)[0].titleZh:'' }}</el-descriptions-item>
+      <el-descriptions-item :label="$t('目的仓')+'：'">{{ warehouseList.filter(a => a.id == form.consigneeWarehouseId)[0]!=undefined?warehouseList.filter(a => a.id == form.consigneeWarehouseId)[0].titleZh:'' }}</el-descriptions-item>
+      <el-descriptions-item :label="$t('快递单号')+'：'">{{ form.expressNo }}</el-descriptions-item>
+    </el-descriptions>
+    <div class="title-font">
+      <label>【{{ $t("申请理由") }}】</label>
+      <span>{{ $t("退仓原因") }}:{{ $t("包裹编号") }}{{ form.consNum }}{{ $t("要从集运订单") }}{{form.orderNo}}{{ $t("中撤出") }}</span>
+    </div>
+  </div>
+</template>
+<script>
+import { getConsApprovalList } from "@/api/ecw/consApproval"
+import { getCurrencyList } from "@/api/ecw/currency"
+import { getCons } from "@/api/ecw/cons"
+import { getWarehouseList } from "@/api/ecw/warehouse"
+import Template from "@/views/cms/template/index.vue";
+import ImageAndVideoUpload from "@/components/ImageAndVideoUpload/index.vue";
+
+export default {
+  name: "consExitApproval",
+  components: {ImageAndVideoUpload, Template},
+  props: {
+    id: [String]
+  },
+  data() {
+    return {
+      approvalDetail: [],
+      currencyList: [],
+      form: {
+        consigneeWarehouseId: null,
+        wareId: null
+      },
+      warehouseList:[],
+    }
+  },
+  created() {
+    getWarehouseList().then((r) => {
+      this.warehouseList = r.data;
+    });
+    getCurrencyList().then((res) => (this.currencyList = res.data))
+    if (this.id) {
+      getConsApprovalList({ formId: this.id }).then((res) => {
+        if (res.data.length != 0) {
+          this.approvalDetail = JSON.parse(res.data[0].approvalDetail)
+          getCons(res.data[0].consId).then(res => {
+            this.form = res.data
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+<style scoped lang="scss">
+.title {
+  padding: 10px 0;
+
+  span {
+    font-size: 14px;
+    font-weight: bold;
+  }
+}
+
+.bold {
+  font-weight: bold;
+}
+
+.title-font {
+  font-size: 16px;
+  font-weight: 600;
+  margin-top: 10px;
+  margin-bottom: 10px;
+}
+
+</style>

src/views/ecw/cons/consWithdrawalExit.vue

@@ -8,19 +8,27 @@
     width="80%">
     <div style="padding: 0 20px">
       <h1>{{consDetails.expressNo}}-{{$t('撤销包裹订单申请')}}</h1>
-      <h3>{{$t('包裹编号')}}-{{consDetails.consNum}}</h3>
-      <h3>{{$t('订单编号')}}-{{consDetails.orderNo}}</h3>
+      <h3>{{$t('包裹编号')}}-
+        <router-link :to="{path: '/cons/detail',query: {consId: this.consDetails.id}}" class="link-type">
+          <span>{{ consDetails.consNum }}</span>
+        </router-link>
+      </h3>
+      <h3>{{$t('订单编号')}}-
+          <router-link :to="{path: '/order/detail',query: {orderId: this.consDetails.orderId}}" class="link-type">
+            <span>{{ consDetails.orderNo }}</span>
+          </router-link>
+      </h3>
       <h3>{{$t('订单状态')}}-<dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="consDetails.orderStatus"/></h3>
       <el-divider></el-divider>
       <h2>{{$t('审批流程')}}</h2>
       <div style="padding: 20px">
-        <work-flow xmlkey="ecw_cons_retired_warehouse" v-model="params.copyUserId"  />
+        <work-flow xmlkey="ecw_cons_exit_warehouse" v-model="params.copyUserId"  />
       </div>
       <div>
-        <el-button v-if="isExamine" @click="submit" type="primary" style="margin-right: 20px;">{{$t('确定退仓')}}</el-button>
-        <el-button v-if="!isExamine" @click="goBpm" type="primary" style="margin-right: 20px;">{{$t('审核中')}}</el-button>
+        <el-button v-if="isExamine" @click="submit" type="primary" style="margin-right: 20px;">{{$t('提交订单撤销申请')}}</el-button>
+        <el-button v-if="!isExamine" @click="goBpm" type="primary" style="margin-right: 20px;">{{$t('包裹撤销订单审核中')}}</el-button>
         <el-button  v-if="!isExamine" type="primary" style="margin-right: 20px;" @click="cancellationOfCons">{{$t('取消审核')}}</el-button>
-        <el-button @click="$parent.showExit = false;">{{$t('不，再考虑考虑')}}</el-button>
+        <el-button @click="$parent.showExit = false;">{{$t('返回')}}</el-button>
       </div>
     </div>
   </el-dialog>
@@ -29,7 +37,12 @@
 <script>
 import workFlow from "@/components/WorkFlow";
 import ImageAndVideoUpload from "@/components/ImageAndVideoUpload/index.vue";
-import {cancelApplyAndUpdate, createConsRetiredWarehouseApplication, getCons} from "@/api/ecw/cons";
+import {
+  cancelApplyAndUpdate,
+  createConsExitApplication,
+  createConsRetiredWarehouseApplication,
+  getCons
+} from "@/api/ecw/cons";
 import {getConsApprovalList} from "@/api/ecw/consApproval";
 import {DICT_TYPE} from "@/utils/dict";
 
@@ -72,16 +85,11 @@ export default {
     getCons(this.consId).then(r =>{
       this.consDetails = r.data
     });
-    getConsApprovalList({consId:this.consId,approvalType:0,status: 1}).then(r => {
+    getConsApprovalList({consId:this.consId,approvalType:4,status: 1}).then(r => {
       if(r.data.length!=0){
           this.details = r.data[0];
           this.isExamine = false;
           this.approvalDetail = JSON.parse(r.data[0].approvalDetail)
-          this.params.reason = this.approvalDetail.reason
-          this.params.imgUrl = this.approvalDetail.imgUrl
-          this.params.name = this.approvalDetail.name
-          this.params.phone = this.approvalDetail.phone
-          this.params.address = this.approvalDetail.address
       }
 
     })
@@ -95,9 +103,9 @@ export default {
       this.params.consId =  this.consDetails.id;
       this.params.imgUrl =  this.params.imgUrl.join(',')
       this.params.consNum =  this.consDetails.consNum
-      createConsRetiredWarehouseApplication(this.params).then(r => {
+      createConsExitApplication(this.params).then(r => {
        if(r.code === 0){
-         this.$message.success(this.$t('退仓成功'));
+         this.$message.success(this.$t('撤出成功'));
          this.params = {}
          this.$parent.showExit = false
        }

src/views/ecw/order/withdrawal.vue

@@ -7,7 +7,13 @@
     }"
     width="80%">
     <div style="padding: 0 20px">
-      <h1>{{$t('申请退仓')}}-{{orderDetails.orderNo}}</h1>
+      <h1>{{$t('申请退仓')}}-
+        <template slot-scope="scope">
+          <router-link :to="{path: '/order/detail',query: {orderId: this.orderDetails.orderId}}" class="link-type">
+            <span>{{ orderDetails.orderNo }}</span>
+          </router-link>
+        </template>
+      </h1>
       <el-divider></el-divider>
       <el-form label-width="150px">
         <el-form-item :label="$t('退仓原因')">