需求135 后台-集运-包裹列表-操作-退仓

src/views/ecw/cons/index.vue

@@ -191,7 +191,11 @@
           <dict-tag :type="DICT_TYPE.CONS_STATUS" :value="scope.row.status"/>
         </template>
       </el-table-column>
-      <el-table-column label="关联订单号" align="center" prop="orderNo"/>
+      <el-table-column label="关联订单号" align="center" prop="orderNo">
+        <template slot-scope="scope">
+          <a href="javascript:void(0);"  @click="jumpOrderDetail(scope.row)">{{ scope.row.orderNo }}</a>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('订单状态')" align="center">
         <template slot-scope="scope">
           <dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="scope.row.orderStatus"/>
@@ -338,7 +342,7 @@
                     :consIds="consIds"></batch-sign-off>
     <batch-cons-edit :showConsBatchEdit.sync="showConsBatchEdit" @determine="getList"
                      :consIds="consIds"></batch-cons-edit>
-    <consWithdrawal v-if="show" :dialog-visible="show" :consId="consId"></consWithdrawal>
+    <consWithdrawal v-if="show" :dialog-visible="show"  :consId="consId"></consWithdrawal>
   </div>
 </template>
 
@@ -359,6 +363,8 @@ import ConsFollowupEdit from "@/views/ecw/consFollowup/components/ConsFollowupEd
 import BatchSignOff from "@/views/ecw/cons/batchSignOff.vue";
 import BatchConsEdit from "@/views/ecw/cons/batchConsEdit.vue";
 import consWithdrawal from "@/views/ecw/cons/withdrawal.vue";
+import {DICT_TYPE} from "@/utils/dict";
+import {arrryToKeyedObjectBy} from "@/utils";
 
 export default {
   name: "Cons",
@@ -460,6 +466,10 @@ export default {
     getCurrencyList().then((res) => (this.currencyList = res.data))
   },
   computed: {
+    // 渠道用id做键值
+    keyedChannel(){
+      return arrryToKeyedObjectBy(this.channelList, 'channelId')
+    },
     // 根据渠道id获取渠道名
     channelName() {
       return (id) => {
@@ -489,6 +499,13 @@ export default {
     },
   },
   methods: {
+    /* 跳转订单详情 */
+    jumpOrderDetail(row) {
+      this.$router.push({
+        path: "/order/detail",
+        query: { orderId: row.orderId },
+      });
+    },
     handleSelectionChange(val) {
       this.consIds = val.map((i) => i.id)
       this.consList = val;

src/views/ecw/cons/withdrawal.vue

+<template>
+
+  <el-dialog
+    :visible.sync="dialogVisible"
+    :before-close="()=>{
+      $parent.show = false;
+    }"
+    width="80%">
+    <div style="padding: 0 20px">
+      <h1>{{$t('申请退仓')}}-{{consDetails.expressNo}}</h1>
+      <el-divider></el-divider>
+      <el-form label-width="150px">
+        <el-form-item :label="$t('退仓原因')">
+          <el-input v-model="params.reason" style="width:500px" type="textarea"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('图片')">
+          <image-and-video-upload   :file-type="['png' , 'jpg', 'jpeg']" :fileSize="50" :isShowTip="true" v-model="params.imgUrl" ></image-and-video-upload>
+        </el-form-item>
+      </el-form>
+      <el-divider></el-divider>
+      <h2>{{$t('审批流程')}}</h2>
+      <div style="padding: 20px">
+        <work-flow xmlkey="retired_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" type="primary" style="margin-right: 20px;" @click="cancellationOfOrder">{{$t('取消审核')}}</el-button>
+        <el-button @click="$parent.show = false;">{{$t('不，再考虑考虑')}}</el-button>
+      </div>
+    </div>
+  </el-dialog>
+</template>
+<!--退仓-->
+<script>
+import {cancelAdjust, getOrder} from "@/api/ecw/order";
+import {
+  getRollbackApprovalInfo,
+  orderWarehouseInDelete,
+  warehouseApprovalCancel
+} from "@/api/ecw/batchSingleApplication";
+import workFlow from "@/components/WorkFlow";
+import ImageAndVideoUpload from "@/components/ImageAndVideoUpload/index.vue";
+import {getCons} from "@/api/ecw/cons";
+import {getConsApproval} from "@/api/ecw/consApproval";
+
+export default {
+  name: "withdrawal",
+  props:{
+    consId:Number,
+    dialogVisible:Boolean
+  },
+  components:{
+    ImageAndVideoUpload,
+    workFlow
+  },
+  data(){
+    return {
+      consDetails:{},
+      params:{
+        consId:undefined,
+        expressNo:undefined,
+        reason:'',
+        copyUserId:[],
+        imgUrl:[]
+      },
+      isExamine:true,
+      details:{},
+
+
+    }
+  },
+  created() {
+    getCons(this.consId).then(r => this.consDetails = r.data);
+    getConsApproval({id:this.consId}).then(r => {
+      console.log(r)
+      if(r.data.status === 1){
+          this.details = r.data;
+          this.isExamine = false;
+          this.params.reason = JSON.parse(this.details.details).reason
+      }
+
+    })
+  },
+  methods:{
+    goBpm(){
+      this.$parent.show = false
+      this.$router.push({query:{id:this.details.formId},path:'/bpm/process-instance/detail'})
+    },
+    submit(){
+      this.params.consId =  this.consDetails.consId;
+      this.params.expressNo =this.consDetails.expressNo;
+      this.params.imgUrl =  this.params.imgUrl.join(',')
+      orderWarehouseInDelete(this.params).then(r => {
+       if(r.code === 0){
+         this.$message.success(this.$t('退仓成功'));
+         this.params = {}
+         this.$parent.show = false
+       }
+      })
+    },
+    cancellationOfOrder(){
+      this.$prompt(this.$t('请输入取消审核原因'), this.$t('提示'), {
+        confirmButtonText: this.$t('确定'),
+        cancelButtonText: this.$t('取消'),
+      }).then(({ value }) => {
+        warehouseApprovalCancel(this.details.id,value) .then(r => {
+          if(r.data){
+            this.$message.success(this.$t('取消成功'))
+            this.params = {}
+            this.$parent.show = false
+
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: this.$t('取消成功')
+        });
+      });
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>