入仓修改功能完善

src/api/ecw/order.js

@@ -166,7 +166,7 @@ export function orderWarehouseIn(data){
 // 入仓修改
 export function orderWarehouseInUpdateApply(data){
   return request({
-    url: '/order/order-warehouse-in/update-apply',
+    url: '/order/order-warehouse-in/update-or-updateApply',
     method: 'put',
     data
   })

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

@@ -359,7 +359,7 @@
         </el-tab-pane>
       </el-tabs>
 
-      <div v-if="edit">
+      <div v-if="edit && order.status !== 3">
         <h2>{{ $t('审批流程') }}</h2>
         <work-flow xmlkey="free_apply" v-model="selectedUsers"  />
         <!--        <div>选择的用户：{{selectedUsers}}</div>-->
@@ -688,10 +688,10 @@ export default {
                 copyUserId: this.selectedUsers
               }).then(r => {
                 if (r.data) {
-                  this.$message.success('入仓修改发起成功')
+                  this.$message.success(r.msg || '入仓修改发起成功')
                   this.handleClose()
                 } else {
-                  this.$message.success('入仓修改发起失败')
+                  this.$message.success(r.msg || '入仓修改发起失败')
                 }
               })
             } else {

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

@@ -84,6 +84,7 @@
         <template v-slot="{ row, column, $index }">
           <warehouse
             v-if="isEdit"
+            :edit="true"
             :order-item-a="order.orderItemVOList[$index]"
             :order-item-b="orderItemList[$index]"
             :title="$t('修改')"
@@ -101,6 +102,13 @@
               :title="$t('追加')"
               :order="order"
               @close="getList"></warehouse>
+            <warehouse
+              :edit="true"
+              :order-item-a="order.orderItemVOList[$index]"
+              :order-item-b="orderItemList[$index]"
+              :title="$t('修改')"
+              :order="order"
+              @close="getList"></warehouse>
 <!--            <el-button size="mini" type="text" @click="handleWarehousing(row)">{{$t('追加')}}</el-button>-->
               <el-button size="mini" type="text" @click="handleWarehousingReturn(row)">{{$t('退仓')}}</el-button>
 <!--            </template>-->
@@ -168,7 +176,7 @@
           <image-and-video-upload :fileSize="50" :isShowTip="true" v-model="form.urls" ></image-and-video-upload>
         </div>
       </el-card>
-      <div style="text-align: center;margin-top: 15px" v-if="!isEdit">
+      <div style="text-align: center;margin-top: 15px" v-if="order.status === 3">
         <el-button @click="escapeBol = true;" type="primary">{{$t('转异')}}</el-button>
         <el-button type="primary" @click="finishVisible = true">{{$t('完成入仓')}}</el-button>
       </div>
@@ -511,7 +519,8 @@ export default {
       return this.$route.path === "/order/warehousing-add"
     },
     isEdit() {
-      return this.$route.path === "/order/warehousing-update"
+      return this.order.status !== 3
+      // return this.$route.path === "/order/warehousing-update"
     },
     title() {
       return this.$i18n.locale === 'en_US' ? this.$route.meta.titleEn : this.$route.name