From 8d54774396eae70168328f9a025d27684dc2f63b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9A=B4=E7=82=B3=E6=9E=97?= <15237758276@163.com>
Date: Wed, 15 Jan 2025 15:07:08 +0800
Subject: [PATCH] no message

---
 src/views/base-data/item/index.vue              |  4 ++--
 src/views/base-data/point/index.vue             | 17 ++++++++++++++---
 .../business-data/businessTask/agvTask.vue      |  3 ++-
 .../business-data/businessTask/asnTask.vue      | 10 +++++-----
 src/views/business-data/inventory/index.vue     | 12 ++++++++++--
 5 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/src/views/base-data/item/index.vue b/src/views/base-data/item/index.vue
index 309ac6b..e6c77ef 100644
--- a/src/views/base-data/item/index.vue
+++ b/src/views/base-data/item/index.vue
@@ -57,7 +57,7 @@
           <el-form-item label="名称" prop="name">
             <el-input v-model="form.name" style="width: 180px;"/>
           </el-form-item>
-          <el-form-item label="预期占用数">
+          <el-form-item label="整托数">
             <el-input v-model="form.extendD1" style="width: 180px;"/>
           </el-form-item>
           <el-form-item label="存储库区" prop="goodType">
@@ -129,7 +129,7 @@
         <el-table-column prop="name" label="名称" width="150"/>
         <el-table-column prop="goodType" label="存储库区" width="150">
         </el-table-column>
-        <el-table-column prop="extendD1" label="预期占用数"/>
+        <el-table-column prop="extendD1" label="整托数"/>
         <el-table-column prop="unit" label="单位">
           <template slot-scope="scope">
             {{ dict.label.item_unit[scope.row.unit] }}
diff --git a/src/views/base-data/point/index.vue b/src/views/base-data/point/index.vue
index 256f425..6ab61b6 100644
--- a/src/views/base-data/point/index.vue
+++ b/src/views/base-data/point/index.vue
@@ -258,7 +258,15 @@
           <el-form-item label="描述">
             <el-input type="textarea" v-model="form.description" style="width: 370px;"/>
           </el-form-item>
-
+          <el-form-item label="坐标X">
+            <el-input type="beatCode" v-model="form.posX" style="width: 100px;"/>
+          </el-form-item>
+          <el-form-item label="坐标Y">
+            <el-input type="beatCode" v-model="form.posY" style="width: 100px;"/>
+          </el-form-item>
+          <el-form-item label="坐标Z">
+            <el-input type="beatCode" v-model="form.posZ" style="width: 100px;"/>
+          </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button @click="crud.cancelCU">取消</el-button>
@@ -317,6 +325,9 @@
             />
           </template>
         </el-table-column>
+        <el-table-column prop="posX" label="坐标X" />
+        <el-table-column prop="posY" label="坐标Y" />
+        <el-table-column prop="posZ" label="坐标Z" />
         <el-table-column fixed="right"
                          v-if="checkPer(['admin','item:edit'])" label="操作" width="60px" align="center">
           <template slot-scope="scope">
@@ -356,7 +367,7 @@ import pointUrl from '@/api/point'
 import multiAdjust from "@/views/base-data/point/multiAdjust.vue";
 import {getStockTypes} from "@/api/stockType";
 
-const defaultForm = {id: null,agvStatus: null, status: 'FREE', enabled: 1, code: null, name: null, description: null, area: null, storageType: null,beatCode: null,heat: null}
+const defaultForm = {id: null,agvStatus: null, status: 'FREE', enabled: 1, code: null, name: null, description: null, area: null, storageType: null,beatCode: null,heat: null,posX:null,posY:null,posZ:null}
 export default {
   name: 'Point',
   components: {
@@ -367,7 +378,7 @@ export default {
   dicts: ['base_staus', 'use_status', 'point_type', 'agv_on_off', 'smallArea'],
   cruds() {
     return CRUD({
-      title: '点位', url: 'api/point', idField: 'id', sort: 'id,desc', crudMethod: {...crudPoint},
+      title: '点位', url: 'api/point', idField: 'id', sort: 'enabled,code,desc', crudMethod: {...crudPoint},
       optShow: {
         add: true,
         edit: true,
diff --git a/src/views/business-data/businessTask/agvTask.vue b/src/views/business-data/businessTask/agvTask.vue
index 9a9f6d6..ca8909f 100644
--- a/src/views/business-data/businessTask/agvTask.vue
+++ b/src/views/business-data/businessTask/agvTask.vue
@@ -35,7 +35,8 @@
               :value="taskType.value"
           />
         </el-select>
-
+        <el-input v-model="query.jobPriorityType" clearable placeholder="执行时长/分钟" style="width: 220px;"
+                  class="filter-item" @keyup.enter.native="crud.toQuery"/>
         <rrOperation :crud="crud"/>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
diff --git a/src/views/business-data/businessTask/asnTask.vue b/src/views/business-data/businessTask/asnTask.vue
index 657b787..5a59667 100644
--- a/src/views/business-data/businessTask/asnTask.vue
+++ b/src/views/business-data/businessTask/asnTask.vue
@@ -25,7 +25,7 @@
         @change="crud.toQuery"
       >
         <el-option
-          v-for="item in dict.asn_task_status"
+          v-for="item in dict.asn_status"
           :key="item.id"
           :label="item.label"
           :value="item.value"
@@ -57,7 +57,7 @@
             size="mini"
             icon="el-icon-document-add"
             v-show="true"
-            @click="ManualReceivingFlag=true;AsnType='BOX';agvFlag=1"
+            @click="ManualReceivingFlag=true;fromManualReceiving.RFID='' ;AsnType='BOX';agvFlag=1"
         >
           AGV入库
         </el-button>
@@ -200,8 +200,8 @@
         </el-table-column>
         <el-table-column prop="agvStatus" label="任务状态">
           <template slot-scope="scope">
-            <span v-if="dict.label.asn_task_status[scope.row.taskStatus] ==null">{{ scope.row.taskStatus }}</span>
-            <span v-if="scope.row.taskStatus !=null">{{ dict.label.asn_task_status[scope.row.taskStatus] }}</span>
+            <span v-if="dict.label.asn_status[scope.row.taskStatus] ==null">{{ scope.row.taskStatus }}</span>
+            <span v-if="scope.row.taskStatus !=null">{{ dict.label.asn_status[scope.row.taskStatus] }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="srcPointCode" label="原点位">
@@ -259,7 +259,7 @@ export default {
   name: 'Task',
   components: {DateRangePicker, pagination, crudOperation, rrOperation, udOperation},
   mixins: [presenter(), header(), form(defaultForm), crud()],
-  dicts: ['asn_task_status'],
+  dicts: ['asn_status'],
   cruds() {
     return CRUD({
       query: {taskType: ['FC_RK','SM_RK','RM_RK']},
diff --git a/src/views/business-data/inventory/index.vue b/src/views/business-data/inventory/index.vue
index fab2ff3..c1bd6e0 100644
--- a/src/views/business-data/inventory/index.vue
+++ b/src/views/business-data/inventory/index.vue
@@ -53,6 +53,14 @@
           class="filter-item"
           @keyup.enter.native="crud.toQuery"
       />
+      <el-input
+          v-model="query.itemKeyPropC7"
+          clearable
+          placeholder="标签码"
+          style="width: 300px;"
+          class="filter-item"
+          @keyup.enter.native="crud.toQuery"
+      />
       <rrOperation :crud="crud" />
 
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
@@ -90,13 +98,13 @@
             </el-select>
           </el-form-item>
           <el-form-item label="数量">
-            <el-input v-model="form.quantity" :disabled="true" style="width: 100px;" />
+            <el-input v-model="form.quantity" :disabled="false" style="width: 100px;" />
           </el-form-item>
           <el-form-item label="分配数">
             <el-input v-model="form.queuedQty" :disabled="true" style="width: 100px;" />
           </el-form-item>
           <el-form-item label="RFID">
-            <el-input v-model="form.itemKey.propC7" :rows="3" type="textarea" style="width: 370px;" />
+            <el-input v-model="form.itemKey.propC7" :disabled="false" :rows="3" type="textarea" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="描述">
             <el-input v-model="form.description" :rows="3" type="textarea" style="width: 370px;" />