From aa22a7db016c46a1c6d451812c101133cb80baff Mon Sep 17 00:00:00 2001
From: "HUOJIN\\92525" <925258474@qq.com>
Date: Wed, 31 Jul 2024 17:21:40 +0800
Subject: [PATCH] no message

---
 src/views/base-data/point/index.vue           | 113 ++++++++++++------
 .../business-data/businessTask/asnTask.vue    |   1 +
 2 files changed, 76 insertions(+), 38 deletions(-)

diff --git a/src/views/base-data/point/index.vue b/src/views/base-data/point/index.vue
index a936bbc..5138be5 100644
--- a/src/views/base-data/point/index.vue
+++ b/src/views/base-data/point/index.vue
@@ -99,6 +99,18 @@
       <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0"
                  :title="crud.status.title" width="500px">
         <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+          <el-form-item label="库区" prop="area">
+            <el-select @change="getArea" v-model="form.area"
+                       value-key="id" filterable
+                       placeholder="请选择" style="width: 370px;">
+              <el-option
+                v-for="item in areas"
+                :key="item.id"
+                :label="item.name"
+                :value="item"
+              />
+            </el-select>
+          </el-form-item>
 
           <el-form-item label="代码" prop="code">
             <el-input v-model="form.code" style="width: 370px;"/>
@@ -120,37 +132,20 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="库区" prop="area">
-            <el-select v-model="form.area"
-                       value-key="id" filterable
-                       placeholder="请选择" style="width: 370px;">
-              <el-option
-                v-for="item in areas"
-                :key="item.id"
-                :label="item.name"
-                :value="item"
-              />
-            </el-select>
+
+          <el-form-item label="排" prop="posX" v-if="showPaiLieCeng">
+            <el-input v-model="form.posX" value="1" style="width: 370px;"/>
           </el-form-item>
 
-          <el-form-item label="高度" prop="itemHeight" v-if="showItemHeight">
-            <el-select
-              v-model="form.itemHeight"
-              clearable
-              size="small"
-              placeholder="高度"
-              class="filter-item"
-              style="width: 370px"
-            >
-              <el-option
-                v-for="item in dict.item_height"
-                :key="item.id"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
+          <el-form-item label="列" prop="posY" v-if="showPaiLieCeng">
+            <el-input v-model="form.posY" style="width: 370px;"/>
           </el-form-item>
 
+          <el-form-item label="层" prop="posZ" v-if="showPaiLieCeng">
+            <el-input v-model="form.posZ" style="width: 370px;"/>
+          </el-form-item>
+
+
           <el-form-item label="状态">
             <el-select
               v-model="form.status"
@@ -185,11 +180,6 @@
         <el-table-column type="selection" width="55"/>
         <el-table-column prop="code" label="代码"/>
         <el-table-column prop="name" label="名称"/>
-        <el-table-column prop="itemHeight" label="高度">
-          <template slot-scope="scope">
-            {{ dict.label.item_height[scope.row.itemHeight] }}
-          </template>
-        </el-table-column>
         <el-table-column prop="type" label="类型">
           <template slot-scope="scope">
             {{ dict.label.point_type[scope.row.type] }}
@@ -258,7 +248,9 @@ const defaultForm = {
   dept: null,
   description: null,
   area: null,
-  itemHeight: null
+  posX: null,
+  posY: null,
+  posZ: null
 }
 export default {
   name: 'Point',
@@ -285,12 +277,35 @@ export default {
     ...mapGetters([
       'baseApi'
     ]),
-    showItemHeight() {
+    showPaiLieCeng() {
       // 通过库区控制高度显示隐藏
-      return this.form.area && this.form.area.name === '小件存储区';
+
+      return this.form.area && (this.form.area.code === 'DJQ' || this.form.area.code === 'XJQ');
     }
   },
   data() {
+    var validateCode = (rule, value, callback) => {
+      if (value === '' || value === null) {
+        callback(new Error('请输入代码'));
+      } else if (value.length > 0 && this.form.area && this.form.area.code == 'DJQ' || this.form.area.code == 'XJQ') {
+        const parts = value.split('-');
+        if (parts.length === 4) {
+          this.form.posX = parts[1];
+          this.form.posY = parts[2];
+          this.form.posZ = parts[3];
+          callback();
+        } else {
+          this.form.posX = null;
+          this.form.posY = null;
+          this.form.posZ = null;
+          callback(new Error('格式错误,格式为(DJ-01-01-001): 编码-xx-xx-xxx'));
+        }
+
+      } else {
+        callback();
+      }
+    };
+
     return {
       //地标点数据
       fileList: [],
@@ -322,7 +337,7 @@ export default {
       },
       rules: {
         code: [
-          {required: true, message: '代码不能为空', trigger: 'blur'}
+          {validator: validateCode, required: true, trigger: 'blur'}
         ],
         type: [
           {required: true, message: '类型不能为空', trigger: 'blur'}
@@ -330,8 +345,14 @@ export default {
         area: [
           {required: true, message: '库区不能为空', trigger: 'blur'}
         ],
-        itemHeight: [
-          {required: true, message: '高度不能为空', trigger: 'blur'}
+        posX: [
+          {required: true, message: '排不能为空', trigger: 'blur'}
+        ],
+        posY: [
+          {required: true, message: '列不能为空', trigger: 'blur'}
+        ],
+        posZ: [
+          {required: true, message: '层不能为空', trigger: 'blur'}
         ]
       },
       //呼叫空车的弹出按钮
@@ -385,7 +406,10 @@ export default {
           }
           return obj
         })
+
       })
+
+
     },
     //呼叫空车
     callEmpty() {
@@ -444,6 +468,19 @@ export default {
     //批量调整
     MultiAdjust() {
       this.$refs.multiAdjust.dialog = true;
+    },
+    inputValue() {
+      /*if (this.form.code) {
+        if (this.form.area && this.form.area.code == 'DJQ' || this.form.area.code == 'XJQ') {
+          const parts = this.form.code.split('-');
+          if (parts.length === 4) {
+            // 批量更新 form 的 posX, posY 和 posZ
+            this.form.posX = parts[1];
+            this.form.posY = parts[2];
+            this.form.posZ = parts[3];
+          }
+        }
+      }*/
     }
   }
 }
diff --git a/src/views/business-data/businessTask/asnTask.vue b/src/views/business-data/businessTask/asnTask.vue
index f4d79c7..75b9b53 100644
--- a/src/views/business-data/businessTask/asnTask.vue
+++ b/src/views/business-data/businessTask/asnTask.vue
@@ -70,6 +70,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="srcStockCode" label="容器编码"/>
+        <el-table-column prop="itemKey.orderNumber" label="箱号"/>
         <el-table-column prop="srcPointCode" label="原点位"/>
         <el-table-column prop="dstPointCode" label="目标点位"/>
         <el-table-column prop="taskStatus" label="任务状态">