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/VV_Workinfo_hty.vue | 39 ++++++++++++++++++++-------------------
1 files changed, 20 insertions(+), 19 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/widesea_wcs/tomes/VV_Workinfo_hty.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/widesea_wcs/tomes/VV_Workinfo_hty.vue"
index 7aaca6b..2843e41 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/widesea_wcs/tomes/VV_Workinfo_hty.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/widesea_wcs/tomes/VV_Workinfo_hty.vue"
@@ -27,39 +27,40 @@
cnName: '宸ュ崟鍘嗗彶淇℃伅',
name: 'tomes/VV_Workinfo_hty',
url: "/VV_Workinfo_hty/",
- sortName: "FinishTime"
+ sortName: "completedate"
});
const editFormFields = ref({});
const editFormOptions = ref([]);
const searchFormFields = ref({"workOrder":"","jobID":"","drawingNo":"","productName":"","heatID":"","billetID":"","SN":"","processCode":"","CreateTime":"","FinishTime":"","operatetype":"","productDesc":""});
- const searchFormOptions = ref([[{"title":"鍥惧彿","field":"drawingNo","type":"like"},{"title":"宸ヤ綔浠ゅ彿","field":"workOrder","type":"like"},{"title":"宸ュ崟缂栧彿","field":"jobID","type":"like"}],[{"title":"浜у搧鍚嶇О","field":"productName","type":"like"},{"title":"鐐変唬鍙�","field":"heatID","type":"like"},{"title":"閽㈠澂鍙�","field":"billetID","type":"like"}],[{"title":"杞﹁疆SN鍙�","field":"SN","type":"like"},{"dataKey":"WorkTypes","data":[],"title":"宸ュ崟绫诲瀷","field":"processCode","type":"select"},{"dataKey":"WorkOperateTypes","data":[],"title":"鎿嶄綔绫诲瀷","field":"operatetype","type":"select"}],[{"title":"鍒涘缓鏃堕棿","field":"CreateTime","type":"date"},{"title":"瀹屾垚鏃堕棿","field":"FinishTime","type":"date"},{"title":"浜у搧鎻忚堪","field":"productDesc","type":"like"}]]);
- const columns = ref([{field:'mes_id',title:'宸ュ崟澶磋〃ID',type:'guid',width:110,require:true,align:'left',sort:true},
- {field:'workOrder',title:'宸ヤ綔浠ゅ彿',type:'string',width:110,align:'left'},
- {field:'jobID',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'},
+ const searchFormOptions = ref([[{"title":"鍥惧彿","field":"drawingNo","type":"like"},{"title":"宸ヤ綔浠ゅ彿","field":"workOrder","type":"like"},{"title":"宸ュ崟缂栧彿","field":"jobID","type":"like"}],[{"title":"浜у搧鍚嶇О","field":"productName","type":"like"},{"title":"鐐変唬鍙�","field":"heatID","type":"like"},{"title":"閽㈠澂鍙�","field":"billetID","type":"like"}],[{"title":"杞﹁疆SN鍙�","field":"SN","type":"like"},{"dataKey":"WorkTypes","data":[],"title":"宸ュ崟绫诲瀷","field":"processCode","type":"select"},{"dataKey":"WorkOperateTypes","data":[],"title":"鎿嶄綔绫诲瀷","field":"operatetype","type":"select"}],[{"title":"鍒涘缓鏃堕棿","field":"CreateTime","type":"date"},{"title":"鎿嶄綔鏃堕棿","field":"completedate","type":"date"},{"title":"浜у搧鎻忚堪","field":"productDesc","type":"like"}]]);
+ const columns = ref([{field:'mes_id',title:'宸ュ崟澶磋〃ID',hidden:true,type:'guid',width:110,require:true,align:'left',sort:true},
+ {field:'workOrder',title:'宸ヤ綔浠ゅ彿',type:'string',sort:true,width:110,align:'left'},
+ {field:'jobID',title:'宸ュ崟缂栧彿',type:'string',sort:true,width:110,align:'left'},
+ {field:'materialCode',title:'鐗╂枡缂栫爜',hidden:true,type:'string',width:110,align:'left'},
+ {field:'drawingNo',title:'鍥惧彿',type:'string',sort:true,width:110,align:'left'},
{field:'productName',title:'浜у搧鍚嶇О',type:'string',width:110,align:'left'},
- {field:'heatID',title:'鐐変唬鍙�',type:'string',width:110,align:'left'},
- {field:'billetID',title:'閽㈠澂鍙�',type:'int',width:110,align:'left'},
- {field:'SN',title:'杞﹁疆SN鍙�',type:'string',width:110,align:'left'},
+ {field:'heatID',title:'鐐変唬鍙�',type:'string',sort:true,width:110,align:'left'},
+ {field:'billetID',title:'閽㈠澂鍙�',type:'int',sort:true,width:110,align:'left'},
+ {field:'SN',title:'杞﹁疆SN鍙�',type:'string',sort:true,width:110,align:'left'},
{field:'processCode',title:'宸ュ崟绫诲瀷',type:'string',bind:{ key:'WorkTypes',data:[]},width:110,align:'left'},
{field:'area',title:'鎸囧畾搴撳尯',type:'string',width:110,align:'left'},
- {field:'drawingNoVer',title:'鎶�鏈姸鎬�',type:'string',width:110,align:'left'},
- {field:'quantity',title:'璁″垝鏁伴噺',type:'int',width:110,require:true,align:'left'},
- {field:'typeID',title:'杞瀷浠ｇ爜',type:'string',width:110,align:'left'},
- {field:'stackNoRange',title:'鎵撳寘鏁伴噺',type:'int',width:110,align:'left'},
+ {field:'drawingNoVer',title:'鎶�鏈姸鎬�',type:'string',sort:true,width:110,align:'left'},
+ {field:'quantity',title:'璁″垝鏁伴噺',hidden:true,type:'int',width:110,require:true,align:'left'},
+ {field:'typeID',title:'杞瀷浠ｇ爜',hidden:true,type:'string',width:110,align:'left'},
+ {field:'stackNoRange',title:'鎵撳寘鏁伴噺',type:'int',sort:true,width:110,align:'left'},
{field:'skip_op_1',title:'瑙嗚妫�娴�1',type:'bool',bind:{ key:'skip_op_Status',data:[]},width:110,align:'left'},
{field:'skip_op_2',title:'瑙嗚妫�娴�2',type:'bool',bind:{ key:'skip_op_Status',data:[]},width:110,align:'left'},
{field:'skip_op_3',title:'鍠烽槻閿堟恫',type:'bool',bind:{ key:'skip_op_Status',data:[]},width:110,align:'left'},
- {field:'maxDiameterDiff',title:'杞緞鍋忓樊',type:'decimal',width:110,align:'left'},
+ {field:'maxDiameterDiff',title:'杞緞鍋忓樊',hidden:true,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',sort:true,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:'finishNum',title:'瀹屾垚鏁伴噺',type:'int',width:110,align:'left'},
- {field:'heatBatchID',title:'鐑鐞嗘壒娆�',type:'string',width:110,align:'left'},
+ {field:'finishNum',title:'瀹屾垚鏁伴噺',hidden:true,type:'int',width:110,align:'left'},
+ {field:'heatBatchID',title:'鐑鐞嗘壒娆�',hidden:true,type:'string',width:110,align:'left'},
{field:'Status',title:'宸ュ崟鐘舵��',type:'string',width:110,align:'left'},
- {field:'FinishTime',title:'瀹屾垚鏃堕棿',type:'datetime',sort:true,width:150,align:'left',sort:true},
+ {field:'FinishTime',title:'瀹屾垚鏃堕棿',type:'datetime',width:150,align:'left',sort:true},
+ {field:'completedate',title:'鎿嶄綔鏃堕棿',type:'datetime',width:150,align:'left',sort:true},
{field:'operatetype',title:'鎿嶄綔绫诲瀷',type:'string',bind:{ key:'WorkOperateTypes',data:[]},width:110,align:'left'},
{field:'compeletor',title:'鎿嶄綔鑰�',type:'string',width:110,align:'left'},
{field:'productDesc',title:'浜у搧鎻忚堪',type:'string',width:180,align:'left'}]);
--
Gitblit v1.9.3