From 5d468e5ccd96dc068d91d593c770643ecdc6f1af Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 03 七月 2025 16:34:41 +0800
Subject: [PATCH] 1. 入库历史订单明细数据丢失 2. 库存信息响应问题 3. 出库明细新加客户信息 4. 库存明细增加查询条件 5. 出库修改物料来源

---
 zy-asrs-admin/src/views/loc/locDetl/index.vue |   77 +++++++++++++++++++++-----------------
 1 files changed, 42 insertions(+), 35 deletions(-)

diff --git a/zy-asrs-admin/src/views/loc/locDetl/index.vue b/zy-asrs-admin/src/views/loc/locDetl/index.vue
index 266438f..2b2d2fd 100644
--- a/zy-asrs-admin/src/views/loc/locDetl/index.vue
+++ b/zy-asrs-admin/src/views/loc/locDetl/index.vue
@@ -20,6 +20,7 @@
   matnr: null,
   orderNo: null,
   batch: null,
+  tagId: null,
 })
 const editChild = ref(null)
 
@@ -76,32 +77,39 @@
     ...getColumnSearchProps('matnr'),
   },
   {
-        title: formatMessage('db.man_loc_detl.maktx', '鍟嗗搧鍚嶇О'),
-        dataIndex: 'maktx',
-        width: 140,
-        ellipsis: true,
-        ...getColumnSearchProps('maktx'),
-    },
-   {
-        title: formatMessage('db.man_loc_detl.specs', '瑙勬牸'),
-        dataIndex: 'specs',
-        width: 140,
-        ellipsis: true,
-        ...getColumnSearchProps('specs'),
-    },
-   {
-        title: formatMessage('db.man_loc_detl.model', '鍨嬪彿'),
-        dataIndex: 'model',
-        width: 140,
-        ellipsis: true,
-        ...getColumnSearchProps('model'),
+    title: formatMessage('db.man_loc_detl.maktx', '鍟嗗搧鍚嶇О'),
+    dataIndex: 'maktx',
+    width: 140,
+    ellipsis: true,
+    ...getColumnSearchProps('maktx'),
   },
   {
-        title: formatMessage('db.man_loc_detl.dewell', '鍏ュ簱鏃堕棿'),
-        dataIndex: 'dewell$',
-        width: 140,
-        ellipsis: true,
-        ...getColumnSearchProps('dewell$'),
+    title: formatMessage('db.man_loc_detl.specs', '瑙勬牸'),
+    dataIndex: 'specs',
+    width: 140,
+    ellipsis: true,
+    ...getColumnSearchProps('specs'),
+  },
+  {
+    title: formatMessage('db.man_loc_detl.model', '鍨嬪彿'),
+    dataIndex: 'model',
+    width: 140,
+    ellipsis: true,
+    ...getColumnSearchProps('model'),
+  },
+  {
+    title: formatMessage('db.man_loc_detl.model', '鍝佺被'),
+    dataIndex: 'tagId$',
+    width: 140,
+    ellipsis: true,
+    ...getColumnSearchProps('tagId$'),
+  },
+  {
+    title: formatMessage('db.man_loc_detl.dewell', '鍏ュ簱鏃堕棿'),
+    dataIndex: 'dewell$',
+    width: 140,
+    ellipsis: true,
+    ...getColumnSearchProps('dewell$'),
   },
   {
     title: formatMessage('db.man_loc_detl.order_no', '璁㈠崟鍙�'),
@@ -195,15 +203,6 @@
         width: 140,
       })
     })
-
-    // tmp.push({
-    //   title: formatMessage('common.operation', '鎿嶄綔'),
-    //   name: 'oper',
-    //   dataIndex: 'oper',
-    //   key: 'oper',
-    //   width: 140,
-    // })
-
     state.columns = tmp;
   } else if (result.code === 401) {
     message.error(result.msg);
@@ -310,12 +309,20 @@
           style="width: 140px;margin-right: 10px;" />
         <a-input v-model:value="searchParam.matnr" :placeholder="formatMessage('page.locDetl.matnr.input', '璇疯緭鍏ュ晢鍝佺紪鍙�')"
           style="width: 140px;margin-right: 10px;" />
+        <a-input v-model:value="searchParam.maktx" :placeholder="formatMessage('page.locDetl.maktx.input', '璇疯緭鍏ュ晢鍝佸悕绉�')"
+          style="width: 140px;margin-right: 10px;" />
         <a-input v-model:value="searchParam.orderNo"
           :placeholder="formatMessage('page.locDetl.orderNo.input', '璇疯緭鍏ヨ鍗曞彿')"
           style="width: 140px;margin-right: 10px;" />
         <a-input v-model:value="searchParam.batch" :placeholder="formatMessage('page.locDetl.batch.input', '璇疯緭鍏ユ壒鍙�')"
           style="width: 140px;margin-right: 10px;" />
-
+        <a-select v-model:value="searchParam.tagId" :placeholder="formatMessage('page.locDetl.orderNo.input', '璇烽�夋嫨鍝佺被')" :options="[
+          { label: '榛樿鍒嗙被', value: 10 },{ label: '鏈烘补', value: 11 }, { label: '鍙橀�熺娌�', value: 17 }, { label: '鐏姳濉�', value: 18 },
+          { label: '鍏绘姢鍝�', value: 25 },{ label: '娌规紗鑰楁潗', value: 26 }, { label: '鐞冨ご鎽嗚噦', value: 27 }, { label: '鐮傜焊绫�', value: 31 },
+          { label: '鑿滅摐甯�', value: 32 }, { label: '閬斀绫�', value: 33 }, { label: '鎶涘厜绫�', value: 34 }, { label: '闄ゅ皹绫�', value: 35 },
+          { label: '婕忔枟绫�', value: 36 }, { label: '闃叉姢绫�', value: 37 }, { label: '鐑ゆ埧淇濆吇绫�', value: 38 }, { label: '璋冩紗缃�', value: 39 },
+          { label: '鍠锋灙', value: 40 }, { label: '璐规柉鎵樼郴鍒�', value: 41 },]" style="width: 140px;margin-right: 10px;">
+        </a-select>
         <a-input-search v-model:value="searchInput" :placeholder="formatMessage('page.input', '璇疯緭鍏�')"
           style="width: 200px;" @search="onSearch" />
       </div>
@@ -334,7 +341,7 @@
           <div style="display: flex;justify-content: space-evenly;">
             <a-button type="link" primary @click="handleEdit(record)">{{ formatMessage('page.edit', '缂栬緫') }}</a-button>
             <a-button type="link" danger @click="handleDel([record])">{{ formatMessage('page.delete', '鍒犻櫎')
-              }}</a-button>
+            }}</a-button>
           </div>
         </template>
       </template>

--
Gitblit v1.9.1