费用申请，退仓改为弹窗

src/views/ecw/order/feeApplication.vue

@@ -137,7 +137,7 @@ export default {
         })
       }else {
         if(this.list[this.list.length - 1].status === 0){
-          feeApplicationCreate( {...this.list[this.list.length - 1],status:1,copyUserId:this.selectedUsers.join(',')}).then(r=>{
+          feeApplicationCreate( {...this.list[this.list.length - 1],status:1,copyUserId:this.selectedUsers}).then(r=>{
             if(r.code === 0){
               this.getOrderList();
               this.$message.success('添加成功');

src/views/ecw/order/index.vue

@@ -198,9 +198,10 @@
             <div style=" display:flex; flex-direction:column">
               <el-button size="mini" type="text" icon="el-icon-edit" @click="$router.push('/order/warehousing?id=' + scope.row.orderId)"
                 v-hasPermi="['ecw:order:update']">入仓</el-button>
-              <el-button size="mini" type="text" icon="el-icon-edit" @click= "$router.push(`/order/withdrawal/${scope.row.orderId}`)"
+              <el-button size="mini" type="text" icon="el-icon-edit" @click="show = true;orderId = scope.row.orderId; "
                 v-hasPermi="['ecw:order:update']">退仓</el-button>
               <el-button type="text" v-if="scope.row.status === 5"  size="mini" @click="$router.push({path:'/order/batch-single-application',query:{list:scope.row.orderId}})" >调仓</el-button>
+              <el-button type="text"  size="mini" @click="$router.push({path:'/order/transfer-warehousing/' + scope.row.orderId + '/'  + 1 })" >调拨出仓</el-button>
             </div>
 
           </el-popover>
@@ -235,6 +236,7 @@
     <print-warehouse-receipt v-if="printWarehouseReceiptOrderId !== null" :order-id="printWarehouseReceiptOrderId" @close="printWarehouseReceiptOrderId=null" />
     <print-lading-bill v-if="printLadingBillInfo !== null" v-bind="printLadingBillInfo" @close="printLadingBillInfo=null" />
     <batch-pickup v-if="showBatchPickup" @close="showBatchPickup=false"/>
+    <withdrawal v-if="show" :dialog-visible="show"  :orderId="orderId" ></withdrawal>
   </div>
 </template>
 
@@ -262,10 +264,11 @@ import PrintTag from './components/PrintTag'
 import PrintWarehouseReceipt from './components/PrintWarehouseReceipt'
 import PrintLadingBill from './components/PrintLadingBill'
 import BatchPickup from './components/BatchPickup'
+import withdrawal from "@/views/ecw/order/withdrawal";
 export default {
   name: "Order",
   components: {
-    CustomerSelector, ProductSelector, Selector,specialNeeds,PrintTag, PrintWarehouseReceipt, PrintLadingBill, BatchPickup
+    CustomerSelector, ProductSelector, Selector,specialNeeds,PrintTag, PrintWarehouseReceipt, PrintLadingBill, BatchPickup,withdrawal
   },
   props: {
     mine: Boolean
@@ -344,7 +347,9 @@ export default {
       orderId:undefined,
       /* DICT_TYPE,
       getDictDatas */
-      adjustmentList:[]
+      adjustmentList:[],
+      show:false,
+
     };
   },
   computed: {

src/views/ecw/order/withdrawal.vue

 <template>
-  <div style="padding: 0 20px">
-    <h1>申请退仓-{{orderDetails.orderNo}}</h1>
-    <el-divider></el-divider>
-    <el-form label-width="150px">
-      <el-form-item label="退仓原因">
-         <el-input v-model="params.reason" style="width:500px" type="textarea"></el-input>
-      </el-form-item>
-    </el-form>
-    <el-divider></el-divider>
-    <h2>审批流程</h2>
-    <div style="padding: 20px">
-      <work-flow xmlkey="retired_warehouse" v-model="params.copyUserId"  />
-    </div>
-    <div>
-      <el-button @click="submit" type="primary" style="margin-right: 20px;">确定退仓</el-button>
-      <el-button @click="$router.push('/order/order')">不，再考虑考虑</el-button>
+
+  <el-dialog
+    :visible.sync="dialogVisible"
+    :before-close="()=>{
+      $parent.show = false;
+    }"
+    width="80%">
+    <div style="padding: 0 20px">
+      <h1>申请退仓-{{orderDetails.orderNo}}</h1>
+      <el-divider></el-divider>
+      <el-form label-width="150px">
+        <el-form-item label="退仓原因">
+          <el-input v-model="params.reason" style="width:500px" type="textarea"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-divider></el-divider>
+      <h2>审批流程</h2>
+      <div style="padding: 20px">
+        <work-flow xmlkey="retired_warehouse" v-model="params.copyUserId"  />
+      </div>
+      <div>
+        <el-button @click="submit" type="primary" style="margin-right: 20px;">确定退仓</el-button>
+        <el-button @click="$parent.show = false;">不，再考虑考虑</el-button>
+      </div>
     </div>
-  </div>
+  </el-dialog>
 </template>
 <!--退仓-->
 <script>
 import {getOrder} from "@/api/ecw/order";
 import {orderWarehouseInDelete} from "@/api/ecw/batchSingleApplication";
-import {getProcessDefinitionBpmnXMLByKey} from "@/api/bpm/definition";
 import workFlow from "@/components/WorkFlow";
 
 export default {
   name: "withdrawal",
   props:{
-    orderId:String
+    orderId:Number,
+    dialogVisible:Boolean
   },
   components:{
     workFlow
@@ -36,10 +44,6 @@ export default {
   data(){
     return {
       orderDetails:{},
-      bpmnXML: null,
-      bpmnControlForm: {
-        prefix: "activiti"
-      },
       params:{
         orderId:undefined,
         orderNo:undefined,
@@ -58,6 +62,8 @@ export default {
       orderWarehouseInDelete(this.params).then(r => {
        if(r.code === 0){
          this.$message.success('退仓成功');
+         this.params = {}
+         this.$parent.show = false
        }
       })
     }