From 19c66ba052a7fb26c4d27deaa75ae46479eee342 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期一, 01 四月 2024 10:36:44 +0800
Subject: [PATCH] 优化堆垛逻辑和入库逻辑
---
代码管理/PCS/WCS_Client/src/views/widesea_wcs/tomes/dt_mes_head_hty.vue | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/widesea_wcs/tomes/dt_mes_head_hty.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/widesea_wcs/tomes/dt_mes_head_hty.vue"
index ace91e9..023212c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/widesea_wcs/tomes/dt_mes_head_hty.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/widesea_wcs/tomes/dt_mes_head_hty.vue"
@@ -31,8 +31,11 @@
});
const editFormFields = ref({});
const editFormOptions = ref([]);
- const searchFormFields = ref({});
- const searchFormOptions = ref([]);
+ const searchFormFields = ref({"jobID":"","processCode":"","CreateTime":""});
+ const searchFormOptions = ref([
+ [{"title":"宸ュ崟缂栧彿","field":"jobID","type":"like"},{"dataKey":"WorkTypes","data":[],"title":"宸ュ崟绫诲瀷","field":"processCode","type":"select"}],
+ [{"title":"鍥惧彿","field":"drawingNo","type":"like"},{"title":"瀹屾垚鏃堕棿","field":"FinishTime","type":"datetime"}]
+ ]);
const columns = ref([{field:'mes_id',title:'mes_id',type:'guid',width:110,hidden:true,readonly:true,require:true,align:'left'},
{field:'workOrder',title:'宸ヤ綔浠ゅ彿',type:'string',width:110,align:'left',sort:true},
{field:'jobID',title:'宸ュ崟缂栧彿',type:'string',width:110,align:'left'},
@@ -44,6 +47,7 @@
{field:'productName',title:'浜у搧鍚嶇О',type:'string',width:110,align:'left'},
{field:'productDesc',title:'浜у搧鎻忚堪',type:'string',width:180,align:'left'},
{field:'quantity',title:'璁″垝鏁伴噺',type:'int',width:110,require:true,align:'left'},
+ {field:'finishNum',title:'瀹屾垚鏁伴噺',type:'int',width:110,align:'left'},
{field:'typeID',title:'杞瀷浠ｇ爜',type:'string',width:110,align:'left'},
{field:'stackNoRange',title:'鎵撳寘鏁伴噺',type:'int',width:110,align:'left'},
{field:'maxDiameterDiff',title:'杞緞鍋忓樊',type:'decimal',width:110,align:'left'},
@@ -51,12 +55,11 @@
{field:'expectedFinishTime',title:'璁″垝瀹屾垚鏃堕棿',type:'datetime',width:150,align:'left',sort:true},
{field:'CreateTime',title:'鍒涘缓鏃堕棿',type:'datetime',width:150,align:'left',sort:true},
{field:'creator',title:'鍒涘缓鑰�',type:'string',width:100,align:'left'},
- {field:'processCode',title:'宸ュ崟绫诲瀷',type:'string',width:110,align:'left'},
- {field:'finishNum',title:'瀹屾垚鏁伴噺',type:'int',width:110,align:'left'},
+ {field:'processCode',title:'宸ュ崟绫诲瀷',bind: { key: 'WorkTypes' },type:'string',width:110,align:'left'},
{field:'area',title:'鍏ュ簱鍖哄煙浠ｇ爜',type:'string',width:110,align:'left'},
- {field:'skip_op_1',title:'瑙嗚妫�娴嬭澶�1',type:'bool',width:110,align:'left'},
- {field:'skip_op_2',title:'瑙嗚妫�娴嬭澶�2',type:'bool',width:110,align:'left'},
- {field:'skip_op_3',title:'閾炬潯鏈�',type:'bool',width:110,align:'left'},
+ {field:'skip_op_1',title:'瑙嗚妫�娴�1',type:'bool',bind:{ key:'skip_op_Status',data:[]},width:110,require:true,align:'left'},
+ {field:'skip_op_2',title:'瑙嗚妫�娴�2',type:'bool',bind:{ key:'skip_op_Status',data:[]},width:110,require:true,align:'left'},
+ {field:'skip_op_3',title:'鍠烽槻閿堟恫',type:'bool',bind:{ key:'skip_op_Status',data:[]},width:110,require:true,align:'left'},
{field:'FinishTime',title:'瀹屾垚鏃堕棿',type:'datetime',width:150,align:'left',sort:true},
{field:'operatetype',title:'鎿嶄綔绫诲瀷',type:'string',width:110,align:'left'},
{field:'compeletor',title:'鎿嶄綔鑰�',type:'string',width:110,align:'left'}]);
--
Gitblit v1.9.3