From 33b5b3d2fb2b41cdce6e4cb783f27ee70ad3afb8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 07 八月 2025 18:10:16 +0800
Subject: [PATCH] 生成出库单功能优化

---
 zy-asrs-admin/src/views/loc/locDetl/index.vue |   22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/zy-asrs-admin/src/views/loc/locDetl/index.vue b/zy-asrs-admin/src/views/loc/locDetl/index.vue
index 3cd21c5..66a2c7c 100644
--- a/zy-asrs-admin/src/views/loc/locDetl/index.vue
+++ b/zy-asrs-admin/src/views/loc/locDetl/index.vue
@@ -8,7 +8,6 @@
 import { formatMessage } from '@/utils/localeUtils.js';
 import useTableSearch from '@/utils/tableUtils.jsx';
 const context = getCurrentInstance()?.appContext.config.globalProperties;
-
 const router = useRouter();
 
 const TABLE_KEY = 'table-locDetl';
@@ -21,9 +20,9 @@
   orderNo: null,
   batch: null,
   tagId: null,
+  orderType: null,
 })
 const editChild = ref(null)
-
 const state = reactive({
   selectedRowKeys: [],
   loading: false,
@@ -160,13 +159,13 @@
     ellipsis: true,
     ...getColumnSearchProps('anfme'),
   },
-  // {
-  //   title: formatMessage('db.man_loc_detl.freeze', '鏄惁鍐荤粨'),
-  //   dataIndex: 'freeze$',
-  //   width: 140,
-  //   ellipsis: true,
-  //   ...getColumnSearchProps('freeze$'),
-  // },
+  {
+    title: formatMessage('db.man_loc_detl.freeze', '鏄惁鍐荤粨'),
+    dataIndex: 'freeze$',
+    width: 140,
+    ellipsis: true,
+    ...getColumnSearchProps('freeze$'),
+  },
   {
     title: formatMessage('db.man_loc_detl.status', '鐘舵��'),
     dataIndex: 'status$',
@@ -335,6 +334,7 @@
 
 const onSearch = () => {
   // console.log('search');
+  currentPage = 1;
   getPage()
 }
 
@@ -372,6 +372,10 @@
           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.orderType" :placeholder="formatMessage('page.locDetl.orderNo.input', '浠撳簱绫诲瀷')"
+          :options="[
+           { label: '鍏ㄩ儴', value: null },  { label: '绔嬪簱', value: 1 }, { label: '骞冲簱', value: 2 }]" style="width: 140px;margin-right: 10px;">
+        </a-select>
         <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 },

--
Gitblit v1.9.1