From cea7eb24501484f9a9e54ecbd882e9a3a6250d1f Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期五, 28 六月 2024 07:21:33 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/SuZhouGuanHong/TaiYuanTaiZhong
---
代码管理/PCS/WCS_Client/src/views/widesea_wcs/tomes/dt_mes_head.vue | 36 ++++++++++++++++++++++++------------
1 files changed, 24 insertions(+), 12 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.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.vue"
index c410b72..698401c 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.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.vue"
@@ -27,38 +27,50 @@
cnName: '宸ュ崟澶磋〃',
name: 'tomes/dt_mes_head',
url: "/dt_mes_head/",
- sortName: "ID"
+ sortName: "CreateTime"
});
- const editFormFields = ref({"skip_op_1":"","skip_op_2":"","skip_op_3":""});
+ const editFormFields = ref({"stackNoRange":"","skip_op_1":"","skip_op_2":"","skip_op_3":""});
const editFormOptions = ref([
+ [{"title":"鎵撳寘鏁伴噺","field":"stackNoRange","type":"number"}],
[{ "dataKey": "skip_op_Status", "data": [], "title": "瑙嗚妫�娴�1", "required": true, "field": "skip_op_1", "type": "select" }],
[{ "dataKey": "skip_op_Status", "data": [], "title": "瑙嗚妫�娴�2", "required": true, "field": "skip_op_2", "type": "select" }],
- [{ "dataKey": "skip_op_Status", "data": [], "title": "鍠烽槻閿堟恫", "required": true, "field": "skip_op_3", "type": "select" }]
+ [{ "dataKey": "skip_op_Status", "data": [], "title": "鍠烽槻閿堟恫", "required": true, "field": "skip_op_3", "type": "select" }],
+ // [{
+ // title: "鎸囧畾搴撳尯", field: "area",
+ // data: [
+ // { key: 9, value: "澶栧崗鍖�" },
+ // { key: 2, value: "搴撳尯2" },
+ // { key: 3, value: "搴撳尯3" },
+ // { key: 4, value: "搴撳尯4" },
+ // //{ key: 3, value: "涓嶅厑璁�" },
+ // ]
+ // , type: "radio"//type: "select"
+ // }],
]);
const searchFormFields = ref({"jobID":"","processCode":"","CreateTime":""});
const searchFormOptions = ref([
- [{"title":"宸ュ崟缂栧彿","field":"jobID","type":"like"},{"dataKey":"WorkTypes","data":[],"title":"宸ュ崟绫诲瀷","field":"processCode","type":"select"}],
+ [{"title":"宸ヤ綔浠ゅ彿","field":"workOrder","type":"like"},{"title":"宸ュ崟缂栧彿","field":"jobID","type":"like"},{"dataKey":"WorkTypes","data":[],"title":"宸ュ崟绫诲瀷","field":"processCode","type":"select"}],
[{"title":"鍥惧彿","field":"drawingNo","type":"like"},{"title":"鍒涘缓鏃堕棿","field":"CreateTime","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'},
- {field:'reqID',title:'闇�姹傚崟鍙�',type:'string',width:110,align:'left'},
- {field:'reqIDLineNo',title:'闇�姹傚崟鍙疯鍙�',type:'string',width:110,align:'left'},
- {field:'materialCode',title:'鐗╂枡缂栫爜',type:'string',width:110,align:'left'},
+ // {field:'reqID',title:'闇�姹傚崟鍙�',type:'string',width:110,align:'left'},
+ // {field:'reqIDLineNo',title:'闇�姹傚崟鍙疯鍙�',type:'string',width:110,align:'left'},
+ // {field:'materialCode',title:'鐗╂枡缂栫爜',type:'string',width:110,align:'left'},
{field:'drawingNo',title:'鍥惧彿',type:'string',width:110,align:'left'},
{field:'drawingNoVer',title:'鎶�鏈姸鎬�',type:'string',width:110,align:'left'},
- {field:'productName',title:'浜у搧鍚嶇О',type:'string',width:110,align:'left'},
+ // {field:'productName',title:'浜у搧鍚嶇О',type:'string',width:110,align:'left'},
{field:'processCode',title:'宸ュ崟绫诲瀷',bind: { key: 'WorkTypes' },type:'string',width:110,align:'left'},
{field:'quantity',title:'璁″垝鏁伴噺',type:'int',width:110,align:'left'},
{field:'finishNum',title:'瀹屾垚鏁伴噺',type:'int',width:110,align:'left'},
+ {field:'area',title:'鎸囧畾搴撳尯',type:'string',width:110,align:'left'},
+ // {field:'typeID',title:'杞瀷浠ｇ爜',type:'string',width:110,align:'left'},
+ {field:'stackNoRange',title:'鎵撳寘鏁伴噺',type:'int',width:110,align:'left',sort:true},
{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:'area',title:'鍏ュ簱搴撳尯',type:'string',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'},
+ // {field:'maxDiameterDiff',title:'杞緞鍋忓樊',type:'decimal',width:110,align:'left'},
{field:'expectedStartTime',title:'璁″垝寮�濮嬫椂闂�',type:'datetime',width:150,align:'left',sort:true},
{field:'expectedFinishTime',title:'璁″垝瀹屾垚鏃堕棿',type:'datetime',width:150,align:'left',sort:true},
{field:'CreateTime',title:'鍒涘缓鏃堕棿',type:'datetime',width:150,align:'left',sort:true},
--
Gitblit v1.9.3