From c2545f20d7f89271d7915923e9a903862d9d2c09 Mon Sep 17 00:00:00 2001
From: lyd <1419499670@qq.com>
Date: Fri, 28 Oct 2022 17:52:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/wms/sch/point/index.vue         | 54 ++++++++++---------
 .../src/views/wms/sch/region/index.vue        |  2 +
 2 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/lms/nladmin-ui/src/views/wms/sch/point/index.vue b/lms/nladmin-ui/src/views/wms/sch/point/index.vue
index cfbce62..4faca3d 100644
--- a/lms/nladmin-ui/src/views/wms/sch/point/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/point/index.vue
@@ -27,7 +27,7 @@
               size="mini"
               placeholder="区域类型"
               class="filter-item"
-              @change="getPointStatusAndTypeList"
+              @change="getPointStatusAndTypeList(query.region_id, 1)"
             >
               <el-option
                 v-for="item in regionList"
@@ -69,7 +69,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="块" v-if="(query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624')">
+          <el-form-item v-if="(query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624')" label="块">
             <el-input
               v-model="query.block_num"
               clearable
@@ -78,7 +78,7 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
-          <el-form-item label="排" v-if="(query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624' || query.region_id=='1557538851726168064')">
+          <el-form-item v-if="(query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624' || query.region_id=='1557538851726168064')" label="排">
             <el-input
               v-model="query.row_num"
               clearable
@@ -87,7 +87,7 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
-          <el-form-item label="列" v-if="(query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624' || query.region_id=='1557538851726168064')">
+          <el-form-item v-if="(query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624' || query.region_id=='1557538851726168064')" label="列">
             <el-input
               v-model="query.col_num"
               clearable
@@ -96,7 +96,7 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
-          <el-form-item label="层" v-if="(query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624' || query.region_id=='1557538851726168064')">
+          <el-form-item v-if="(query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624' || query.region_id=='1557538851726168064')" label="层">
             <el-input
               v-model="query.layer_num"
               clearable
@@ -133,48 +133,48 @@
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission">
         <el-button
+          v-if="crud.query.is_used == 0"
           slot="right"
           class="filter-item"
           size="mini"
           type="primary"
           icon="el-icon-circle-check"
-          v-if="crud.query.is_used == 0"
           :disabled="crud.selections.length === 0"
           @click="changeUsed(crud.selections, 1)"
         >
           启用
         </el-button>
         <el-button
+          v-if="crud.query.is_used == 1"
           slot="right"
           class="filter-item"
           size="mini"
           type="primary"
           icon="el-icon-circle-close"
-          v-if="crud.query.is_used == 1"
           :disabled="crud.selections.length === 0"
           @click="changeUsed(crud.selections, 0)"
         >
           禁用
         </el-button>
         <el-button
+          v-if="crud.query.lock_type == 1"
           slot="right"
           class="filter-item"
           size="mini"
           type="danger"
           icon="el-icon-circle-check"
-          v-if="crud.query.lock_type == 1"
           :disabled="crud.selections.length === 0"
           @click="changeLock(crud.selections, 2)"
         >
           锁定
         </el-button>
         <el-button
+          v-if="crud.query.lock_type == 2"
           slot="right"
           class="filter-item"
           size="mini"
           type="danger"
           icon="el-icon-circle-close"
-          v-if="crud.query.lock_type == 2"
           :disabled="crud.selections.length === 0"
           @click="changeLock(crud.selections, 1)"
         >
@@ -198,7 +198,7 @@
               v-model="form.region_id"
               placeholder="请选择"
               style="width: 370px;"
-              @change="getPointStatusAndTypeList"
+              @change="getPointStatusAndTypeList(form.region_id, 2)"
             >
               <el-option
                 v-for="item in regionList"
@@ -208,10 +208,10 @@
             </el-select>
           </el-form-item>
           <el-form-item label="点位编码" prop="point_code">
-            <el-input v-model="form.point_code" style="width: 370px;" :disabled="this.form.point_type==='01'" />
+            <el-input v-model="form.point_code" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="点位名称" prop="point_name">
-            <el-input v-model="form.point_name" style="width: 370px;" :disabled="this.form.point_type==='01'" />
+            <el-input v-model="form.point_name" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="点位状态" prop="point_status">
             <el-select
@@ -223,7 +223,7 @@
               clearable
             >
               <el-option
-                v-for="item in pointStatusList"
+                v-for="item in pointStatusDialogList"
                 :label="item.label"
                 :value="item.value"
               />
@@ -253,7 +253,7 @@
               style="width: 370px;"
             >
               <el-option
-                v-for="item in pointTypesList"
+                v-for="item in pointTypesDialogList"
                 :label="item.label"
                 :value="item.value"
               />
@@ -295,7 +295,7 @@
         </el-table-column>
         <el-table-column prop="vehicle_code" label="载具编码" />
         <el-table-column prop="vehicle_qty" label="载具数量" />
-        <el-table-column prop="remark" label="备注" min-width="100" show-overflow-tooltip/>
+        <el-table-column prop="remark" label="备注" min-width="100" show-overflow-tooltip />
         <el-table-column prop="is_used" label="是否启用">
           <template slot-scope="scope">
             {{ scope.row.is_used=='1' ? '是' : '否' }}
@@ -360,7 +360,9 @@ export default {
       syncLoading: false,
       invtypelist: [],
       pointStatusList: [],
+      pointStatusDialogList: [],
       pointTypesList: [],
+      pointTypesDialogList: [],
       options: [],
       regionList: [],
       permission: {},
@@ -396,7 +398,7 @@ export default {
     },
     [CRUD.HOOK.afterToCU]() {
       if (this.form.region_id) {
-        this.getPointStatusAndTypeList(this.form.region_id)
+        this.getPointStatusAndTypeList(this.form.region_id, 2)
       }
     },
     hand(value) {
@@ -424,21 +426,25 @@ export default {
       }).catch(() => {
       })
     },
-    getPointStatusAndTypeList(id) {
+    getPointStatusAndTypeList(id, flag) {
       if (id) {
-        this.getPointStatusList(id)
-        this.getPointTypeList(id)
-        this.crud.toQuery()
+        this.getPointStatusList(id, flag)
+        this.getPointTypeList(id, flag)
       }
+      if (flag === 1) { this.crud.toQuery() }
     },
-    getPointStatusList(id) {
+    getPointStatusList(id, flag) {
       crudRegion.getPointStatusSelectById(id).then(res => {
-        this.pointStatusList = res
+        if (flag === 1) {
+          this.pointStatusList = res
+        } else {
+          this.pointStatusDialogList = res
+        }
       })
     },
-    getPointTypeList(id) {
+    getPointTypeList(id, flag) {
       crudRegion.getPointTypeSelectById(id).then(res => {
-        this.pointTypesList = res
+        if (flag === 1) { this.pointTypesList = res } else { this.pointTypesDialogList = res }
       })
     },
     changeUsed(data, flag) { // 更改启用状态
diff --git a/lms/nladmin-ui/src/views/wms/sch/region/index.vue b/lms/nladmin-ui/src/views/wms/sch/region/index.vue
index 6ddce55..f98d1a2 100644
--- a/lms/nladmin-ui/src/views/wms/sch/region/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/region/index.vue
@@ -92,6 +92,8 @@ const defaultForm = {
   region_id: null,
   region_code: null,
   region_name: null,
+  point_type_explain: null,
+  point_status_explain: null,
   remark: null,
   create_id: null,
   create_name: null,