From c3f9133f259abacf02ae5acb2e5b4352f40d9b22 Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期一, 26 五月 2025 15:49:06 +0800
Subject: [PATCH] 刀具刃磨/ 工具盘点、 库存预警界面修改

---
 src/views/tms/stocktakingBound/modules/ToolsStocktakingBoundModal.vue |  111 +++++++++++++++++++++++++++++--------------------------
 1 files changed, 58 insertions(+), 53 deletions(-)

diff --git a/src/views/tms/stocktakingBound/modules/ToolsStocktakingBoundModal.vue b/src/views/tms/stocktakingBound/modules/ToolsStocktakingBoundModal.vue
index 81fe76b..d0d4230 100644
--- a/src/views/tms/stocktakingBound/modules/ToolsStocktakingBoundModal.vue
+++ b/src/views/tms/stocktakingBound/modules/ToolsStocktakingBoundModal.vue
@@ -17,11 +17,11 @@
                                  :disabled="disableSubmit"></j-dict-select-tag>
             </a-form-model-item>
           </a-col>
+
+
           <a-col :span="12">
-            <a-form-model-item v-show="addShow" label="缁忔墜浜�" :labelCol="labelCol" :wrapperCol="wrapperCol"
-                               prop="handler">
-              <j-dict-select-tag dictCode="sys_user,realname,id" placeholder="璇烽�夋嫨缁忔墜浜�" v-model="model.handler"
-                                 :disabled="disableSubmit" />
+            <a-form-model-item label="鐩樼偣鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="stocktakingName">
+              <a-input v-model="model.stocktakingName" placeholder="璇疯緭鍏ョ洏鐐瑰悕绉�"></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="12">
@@ -31,8 +31,17 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="12">
-            <a-form-model-item label="鐩樼偣鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="stocktakingName">
-              <a-input v-model="model.stocktakingName" placeholder="璇疯緭鍏ョ洏鐐瑰悕绉�"></a-input>
+            <a-form-model-item label="鐩樼偣鏃堕棿" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="inventoryTime">
+              <j-date placeholder="璇烽�夋嫨鐩樼偣鏃堕棿" date-format="YYYY-MM-DD HH:mm:ss" v-model="model.inventoryTime"
+                      style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+
+          <a-col :span="12">
+            <a-form-model-item v-show="addShow" label="缁忔墜浜�" :labelCol="labelCol" :wrapperCol="wrapperCol"
+                               prop="handler">
+              <j-dict-select-tag dictCode="sys_user,realname,id" placeholder="璇烽�夋嫨缁忔墜浜�" v-model="model.handler"
+                                 :disabled="disableSubmit" />
             </a-form-model-item>
           </a-col>
 
@@ -56,12 +65,7 @@
                       style="width: 100%" />
             </a-form-model-item>
           </a-col>
-          <a-col :span="12">
-            <a-form-model-item label="鐩樼偣鏃堕棿" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="inventoryTime">
-              <j-date placeholder="璇烽�夋嫨鐩樼偣鏃堕棿" date-format="YYYY-MM-DD HH:mm:ss" v-model="model.inventoryTime"
-                      style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
+
           <a-col :span="12">
             <a-form-model-item label="澶囨敞" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark">
               <a-input v-model="model.remark" placeholder="璇疯緭鍏ュ娉�" type="textarea"></a-input>
@@ -176,47 +180,6 @@
           align: 'center',
           width: 150
         },
-
-        {
-          title: '涓枃鍚嶇О',
-          dataIndex: 'chineseName',
-          width: 150,
-          align: 'center'
-        },
-
-        {
-          title: '鍨嬪彿/鍥惧彿',
-          dataIndex: 'toolModel',
-          width: 150,
-          align: 'center'
-        },
-
-        {
-          title: '鍒�鍏锋潗鏂�',
-          width: 150,
-          dataIndex: 'toolMaterial',
-          align: 'center'
-        },
-        {
-          title: '闆朵欢鏉愭枡',
-          width: 150,
-          dataIndex: 'partMaterial',
-          align: 'center'
-        },
-        {
-          title: '鍘傚',
-          width: 150,
-          dataIndex: 'supplierId',
-          align: 'center'
-
-        },
-        {
-          title: '瀛樺偍浣嶇疆',
-          width: 150,
-          dataIndex: 'goodsShelvesId',
-          align: 'center'
-
-        },
         {
           title: '璐﹂潰搴撳瓨',
           width: 150,
@@ -269,6 +232,48 @@
           scopedSlots: { customRender: 'remark' }
         },
         {
+          title: '涓枃鍚嶇О',
+          dataIndex: 'chineseName',
+          width: 150,
+          align: 'center'
+        },
+
+        {
+          title: '鍨嬪彿/鍥惧彿',
+          dataIndex: 'toolModel',
+          width: 150,
+          align: 'center'
+        },
+
+        {
+          title: '鍒�鍏锋潗鏂�',
+          width: 150,
+          dataIndex: 'toolMaterial',
+          align: 'center'
+        },
+        {
+          title: '闆朵欢鏉愭枡',
+          width: 150,
+          dataIndex: 'partMaterial',
+          align: 'center'
+        },
+        {
+          title: '鍘傚',
+          width: 150,
+          dataIndex: 'supplierId',
+          align: 'center'
+
+        },
+        {
+          title: '瀛樺偍浣嶇疆',
+          width: 150,
+          dataIndex: 'goodsShelvesId',
+          align: 'center'
+
+        },
+
+
+        {
           title: '鎿嶄綔',
           width: 150,
           dataIndex: 'action',

--
Gitblit v1.9.3