From 6543dd21d2317f64ab1bd0f3c5ea917a1cc18c00 Mon Sep 17 00:00:00 2001
From: "HUOJIN\\92525" <925258474@qq.com>
Date: Fri, 28 Jun 2024 13:41:23 +0800
Subject: [PATCH] no message

---
 src/views/base-data/stock/index.vue              | 2 +-
 src/views/business-data/businessTask/asnTask.vue | 5 ++---
 src/views/business-data/gd/index.vue             | 9 ++-------
 src/views/business-data/gdDetail/index.vue       | 9 +++++++++
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/views/base-data/stock/index.vue b/src/views/base-data/stock/index.vue
index 14983c6..0fcf2fa 100644
--- a/src/views/base-data/stock/index.vue
+++ b/src/views/base-data/stock/index.vue
@@ -245,7 +245,7 @@ export default {
   dicts: ['base_staus', 'use_status', 'stock_type'],
   cruds() {
     return CRUD({
-      title: '容器', url: 'api/stock', idField: 'id', sort: 'id,desc', crudMethod: {...crudStock},
+      title: '容器', url: 'api/stock', idField: 'id', sort: 'id,asc', crudMethod: {...crudStock},
       optShow: {
         add: true,
         edit: false,
diff --git a/src/views/business-data/businessTask/asnTask.vue b/src/views/business-data/businessTask/asnTask.vue
index 1ecfd24..e4289d6 100644
--- a/src/views/business-data/businessTask/asnTask.vue
+++ b/src/views/business-data/businessTask/asnTask.vue
@@ -72,14 +72,13 @@
         <el-table-column prop="srcStockCode" label="容器编码"/>
         <el-table-column prop="srcPointCode" label="原点位"/>
         <el-table-column prop="dstPointCode" label="目标点位"/>
-        <el-table-column prop="agvStatus" label="任务状态">
+        <el-table-column prop="taskStatus" label="任务状态">
           <template slot-scope="scope">
-            {{ dict.label.task_status[scope.row.agvTask==null?'FINISH':scope.row.agvTask.status] }}
+            {{ dict.label.task_status[scope.row.taskStatus] }}
           </template>
         </el-table-column>
         <el-table-column prop="planQty" label="计划数量"/>
         <el-table-column prop="moveQty" label="移位数量"/>
-        <el-table-column prop="createBy" label="创建人"/>
         <el-table-column prop="createTime" label="创建时间"/>
       </el-table>
       <!--分页组件-->
diff --git a/src/views/business-data/gd/index.vue b/src/views/business-data/gd/index.vue
index d12a56f..863d621 100644
--- a/src/views/business-data/gd/index.vue
+++ b/src/views/business-data/gd/index.vue
@@ -21,9 +21,6 @@
             :value="item.value"/>
         </el-select>
 
-        <label class="el-form-item-label">需求工位</label>
-        <el-input v-model="query.station" clearable placeholder="需求工位" style="width: 185px;" class="filter-item"
-                  @keyup.enter.native="crud.toQuery"/>
         <rrOperation :crud="crud"/>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
@@ -49,9 +46,7 @@
                 :value="item.value"/>
             </el-select>
           </el-form-item>
-          <el-form-item label="需求工位" prop="station">
-            <el-input v-model="form.station" style="width: 370px;"/>
-          </el-form-item>
+
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="text" @click="crud.cancelCU">取消</el-button>
@@ -70,7 +65,7 @@
             {{ dict.label.gd_status[scope.row.status] }}
           </template>
         </el-table-column>
-        <el-table-column prop="station" label="需求工位"/>
+
 
         <el-table-column prop="createTime" label="创建时间"/>
         <el-table-column v-if="checkPer(['admin','gd:edit','gd:del'])" label="操作" align="center">
diff --git a/src/views/business-data/gdDetail/index.vue b/src/views/business-data/gdDetail/index.vue
index 84744d0..bc12c80 100644
--- a/src/views/business-data/gdDetail/index.vue
+++ b/src/views/business-data/gdDetail/index.vue
@@ -22,6 +22,10 @@
             :value="item.value"/>
         </el-select>
 
+        <label class="el-form-item-label">需求工位</label>
+        <el-input v-model="query.station" clearable placeholder="需求工位" style="width: 185px;" class="filter-item"
+                  @keyup.enter.native="crud.toQuery"/>
+
         <rrOperation :crud="crud"/>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
@@ -89,6 +93,10 @@
             </el-select>
           </el-form-item>
 
+          <el-form-item label="需求工位" prop="station">
+            <el-input v-model="form.station" style="width: 370px;"/>
+          </el-form-item>
+
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="text" @click="crud.cancelCU">取消</el-button>
@@ -106,6 +114,7 @@
         <el-table-column prop="bigItem.code" label="成品物料"/>
         <el-table-column prop="bigItemQty" label="成品需求套数"/>
         <el-table-column prop="orderType" label="单据类型"/>
+        <el-table-column prop="station" label="需求工位"/>
         <el-table-column prop="createTime" label="创建时间"/>
         <el-table-column v-if="checkPer(['admin','gdDetail:edit','gdDetail:del'])" :show-overflow-tooltip="false"
                          fixed="right" label="操作" align="center">