入仓名称 及按钮显示

src/views/ecw/order/index.vue

@@ -254,13 +254,13 @@
                 include(scope.row.inWarehouseState, [201,202, 208, 202, 210, 202, 211, 202, 213, 214, 215, 216]) ||
                 include(scope.row.abnormalState, [99 ,2 ,3 ,4 ,9 ,10 ,11 ,12 ,14])
                 ">
-                <el-dropdown-item @click.native="$router.push('/order/warehousing?id=' + scope.row.orderId)" v-hasPermi="['ecw:order:update']">{{$t('入仓补充')}}</el-dropdown-item>
+                <el-dropdown-item @click.native="$router.push('/order/warehousing-add?id=' + scope.row.orderId)" v-hasPermi="['ecw:order:update']">{{$t('入仓补充')}}</el-dropdown-item>
               </template>
               <!-- 入仓修改 -->
               <template v-if="
                   include(scope.row.inWarehouseState, [202, 207, 208, 202, 209, 210, 202, 211, 212, 202, 213, 214, 215, 216, 204, 205, 206])
                 ">
-                <el-dropdown-item @click.native="$router.push('/order/warehousing?id=' + scope.row.orderId)"  v-hasPermi="['ecw:order:update']">{{$t('入仓修改')}}</el-dropdown-item>
+                <el-dropdown-item @click.native="$router.push('/order/warehousing-update?id=' + scope.row.orderId)"  v-hasPermi="['ecw:order:update']">{{$t('入仓修改')}}</el-dropdown-item>
               </template>
 
               <!-- 退仓 -->

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

 <template>
   <div>
     <el-dialog
-      :title="(edit ? '入仓修改' : (warehousing.orderWarehouseInBackItemDoList.length > 0 ? '入仓补充' : '入仓操作')) + ' - ' + warehousing.orderNo"
+      :title="title + ' - ' + warehousing.orderNo"
       :visible.sync="opened"
       width="1080px"
     >
@@ -442,8 +442,10 @@ export default {
         this.form.orderWarehouseInItemDoList = []
         this.form1.orderWarehouseInItemDoList = []
         this.activeName = 'first'
-        this.handleAdd()
-        this.handleAdd(1)
+        if (!this.edit){
+          this.handleAdd()
+          this.handleAdd(1)
+        }
       }
     }
   },
@@ -587,6 +589,9 @@ export default {
   },
 
   computed: {
+    title() {
+      return this.$route.name
+    },
     brandObject(){
       return this.brandList.find(e => e.id === this.form.brand) || ''
     },

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

 <template>
   <div class="app-container">
-    <h2>入仓操作-{{ order.orderNo }}</h2>
+    <h2>{{ title }}-{{ order.orderNo }}</h2>
 
     <order-base-info :order="order"></order-base-info>
 
@@ -74,14 +74,12 @@
         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>
-            <template v-if="orderItemList[$index] && orderItemList[$index].orderWarehouseInBackItemDoList && orderItemList[$index].orderWarehouseInBackItemDoList.length > 0">
-              <el-button size="mini" type="text" @click="handleWarehousing($index)">追加</el-button>
-              <el-button size="mini" type="text" @click="handleWarehousingReturn(row)">退仓</el-button>
-            </template>
-            <el-button v-else size="mini" type="text" @click="handleWarehousing($index)">入仓</el-button>
+          <el-button v-if="isEdit" size="mini" type="text" @click="handleWarehousing($index)">修改</el-button>
+          <template v-else-if="orderItemList[$index] && orderItemList[$index].orderWarehouseInBackItemDoList && orderItemList[$index].orderWarehouseInBackItemDoList.length > 0">
+            <el-button size="mini" type="text" @click="handleWarehousing($index)">追加</el-button>
+            <el-button size="mini" type="text" @click="handleWarehousingReturn(row)">退仓</el-button>
           </template>
+          <el-button v-else size="mini" type="text" @click="handleWarehousing($index)">入仓</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -145,7 +143,7 @@
     <warehouse-area-dialog ref="area" :visible.sync="areaVisible" v-model="form.orderLocationCreateReqVOList"
                            :order-id="orderId" :city-id="cityId"></warehouse-area-dialog>
 
-    <edit-dialog :customer-id="order.customerId" :visible.sync="warehousingVisible" :warehousing="warehousing" :edit="order.status === 5"></edit-dialog>
+    <edit-dialog :title="title" :customer-id="order.customerId" :visible.sync="warehousingVisible" :warehousing="warehousing" :edit="isEdit"></edit-dialog>
 
 <!--  完成入仓  -->
     <el-dialog
@@ -267,6 +265,16 @@ export default {
   },
 
   methods: {
+    include(){
+      return (state, arr) => {
+        return arr.indexOf(state) > -1
+      }
+    },
+    exclude(){
+      return (state, arr) => {
+        return arr.indexOf(state) == -1
+      }
+    },
     handleLabelSubmit(){
       orderWarehouseInUpdateLabel({
         ...this.label,
@@ -374,7 +382,11 @@ export default {
           this.getOrder()
         })
 
-      }).catch(() => {
+      }).catch(e => {
+        this.$message({
+          type: 'success',
+          message: e.msg || '退仓失败!'
+        });
       });
     }
   },
@@ -398,6 +410,15 @@ export default {
   },
 
   computed: {
+    // isAdd() {
+    //   return this.$route.path === "/order/warehousing-add"
+    // },
+    isEdit() {
+      return this.$route.path === "/order/warehousing-update"
+    },
+    title() {
+      return this.$route.name
+    },
     orderSpecialNeedsDict() {
       return this.$store.state.dict.dictDatas.order_special_needs
     },