入仓修改流程

src/views/ecw/order/warehousing/components/editDialog.vue

@@ -105,6 +105,13 @@
         </el-table>
       </el-card>
 
+
+      <div v-if="edit">
+        <h2>审批流程</h2>
+        <work-flow xmlkey="free_apply" v-model="selectedUsers"  />
+        <!--        <div>选择的用户：{{selectedUsers}}</div>-->
+      </div>
+
       <span slot="footer">
         <el-button @click="opened = false">关 闭</el-button>
         <el-button type="primary" @click="handleSubmit()">提 交</el-button>
@@ -116,15 +123,16 @@
 <script>
 import dictSelector from "@/components/DictSelector"
 import {DICT_TYPE, getDictDataLabel} from "@/utils/dict"
-import warehousing from "@/views/ecw/order/warehousing"
 import {orderWarehouseIn} from "@/api/ecw/order"
 import {getProductBrankPage} from "@/api/ecw/productBrank"
+import WorkFlow from "@/components/WorkFlow"
 
 export default {
   name: 'editDialog',
 
   components: {
-    dictSelector
+    dictSelector,
+    WorkFlow
   },
 
   props: {
@@ -132,6 +140,10 @@ export default {
       type: Boolean,
       default: false
     },
+    edit: {
+      type: Boolean,
+      default: false
+    },
     warehousing: {
       type: Object,
       default: () => {
@@ -183,7 +195,9 @@ export default {
         "prodType": 0,
         "type": 0
       },
-      // orderItem: {}
+      // orderItem: {},
+
+      selectedUsers: undefined
     };
   },
 

src/views/ecw/order/warehousing/index.vue

@@ -63,10 +63,13 @@
         prop="address"
         label="操作">
         <template v-slot="{ row, column, $index }">
+          <el-button v-if="order.status === 5" size="mini" type="text" @click="handleWarehousing($index)">修改</el-button>
+          <template v-else>
             <el-button v-if="orderItemList[$index] && orderItemList[$index].orderWarehouseInBackItemDoList && orderItemList[$index].orderWarehouseInBackItemDoList.length > 0" size="mini" type="text" @click="handleWarehousing($index)">追加</el-button>
             <el-button v-else size="mini" type="text" @click="handleWarehousing($index)">入仓</el-button>
             <el-button size="mini" type="text" @click="handleWarehousingReturn(row)">退仓</el-button>
-          <el-button v-if="order.status === 5" size="mini" type="text" @click="handleWarehousing($index)">修改</el-button>
+          </template>
+
         </template>
       </el-table-column>
     </el-table>
@@ -86,7 +89,7 @@
         </el-input>
       </el-form-item>
 
-      <div style="text-align: center;margin-top: 15px">
+      <div style="text-align: center;margin-top: 15px" v-if="order.status !== 5">
         <el-button @click="escapeBol = true;" type="primary">转异</el-button>
         <el-button type="primary" @click="finishVisible = true">完成入仓</el-button>
       </div>
@@ -94,7 +97,7 @@
 
     <warehouse-area-dialog ref="area" :visible.sync="areaVisible" v-model="form.orderLocationCreateReqVOList" :order-id="orderId"></warehouse-area-dialog>
 
-    <edit-dialog :visible.sync="warehousingVisible" :warehousing="warehousing"></edit-dialog>
+    <edit-dialog :visible.sync="warehousingVisible" :warehousing="warehousing" :edit="order.status === 5"></edit-dialog>
 
 <!--  完成入仓  -->
     <el-dialog