From 6695afe1e1c478dbb599a1d382d8d6628b456d03 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期六, 18 一月 2025 17:30:49 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSClient/src/views/check/checkOrder.vue | 84 ++++++++++++++++++++++++++++--------------
1 files changed, 56 insertions(+), 28 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/check/checkOrder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/check/checkOrder.vue"
index be0928f..41ee0fc 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/check/checkOrder.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/check/checkOrder.vue"
@@ -22,42 +22,70 @@
export default defineComponent({
setup() {
const table = ref({
- key: 'CheckOrderId',
+ key: 'checkOrderId',
footer: "Foots",
cnName: '妫�楠屽崟',
name: 'checkOrder',
url: "/CheckOrder/",
- sortName: "CheckOrderId"
+ sortName: "checkOrderId"
});
const editFormFields = ref({});
const editFormOptions = ref([]);
- const searchFormFields = ref({});
- const searchFormOptions = ref([]);
- const columns = ref([{field:'CheckOrderId',title:'涓婚敭',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
- {field:'CheckOrderNo',title:'妫�楠屽崟鍙�',type:'string',width:110,require:true,align:'left',sort:true},
- {field:'ReceiveOrderNo',title:'鏀惰揣鍗曞彿',type:'string',width:110,require:true,align:'left'},
- {field:'CheckOrderStatus',title:'璐ㄦ鍗曠姸鎬�',type:'int',width:110,require:true,align:'left'},
- {field:'AuditStatus',title:'瀹℃壒鐘舵��',type:'int',width:110,require:true,align:'left'},
- {field:'ReceiveDetailRowNo',title:'鏀惰揣鍗曟槑缁嗚鍙�',type:'int',width:110,require:true,align:'left'},
- {field:'MaterielCode',title:'鐗╂枡缂栧彿',type:'string',width:110,require:true,align:'left'},
- {field:'QualifiedQuantity',title:'鍚堟牸鏁伴噺',type:'float',width:110,align:'left'},
- {field:'DefectedQuantity',title:'鐗归噰鏁伴噺',type:'float',width:110,align:'left'},
- {field:'ReturnQuantity',title:'閫�璐ф暟閲�',type:'float',width:110,align:'left'},
- {field:'ScrappedQuantity',title:'鎶ュ簾鏁伴噺',type:'float',width:110,align:'left'},
- {field:'ReceivedQuantity',title:'妫�楠屾�绘暟',type:'float',width:110,require:true,align:'left'},
- {field:'Result',title:'妫�楠岀粨鏋�',type:'string',width:110,align:'left'},
- {field:'DefectedNote',title:'鐗归噰璇存槑',type:'string',width:110,align:'left'},
- {field:'CheckUserName',title:'妫�楠屼汉',type:'string',width:110,align:'left'},
- {field:'Creater',title:'鍒涘缓鑰�',type:'string',width:110,require:true,align:'left'},
- {field:'CreateDate',title:'鍒涘缓鏃堕棿',type:'datetime',width:150,require:true,align:'left',sort:true},
- {field:'Modifier',title:'淇敼浜�',type:'string',width:100,align:'left'},
- {field:'ModifyDate',title:'淇敼鏃ユ湡',type:'datetime',width:150,align:'left',sort:true}]);
+ const searchFormFields = ref({
+ checkOrderNo:"",
+ receiveOrderNo:"",
+ checkOrderStatus:"",
+ auditStatus:""
+ });
+ const searchFormOptions = ref([
+ [
+ {title:"妫�楠屽崟鍙�", field:"checkOrderNo",type:"like"},
+ {title:"鏀惰揣鍗曞彿", field:"receiveOrderNo",type:"like"},
+ {title:"璐ㄦ鍗曠姸鎬�", field:"checkOrderStatus",type:"select",dataKey:"",data:[]},
+ {title:"瀹℃壒鐘舵��", field:"auditStatus",type:"select",dataKey:"",data:[]},
+ ],
+ [
+ {title:"鏀惰揣鍗曟槑缁嗚鍙�", field:"receiveDetailRowNo",type:"like"},
+ {title:"鐗╂枡缂栧彿", field:"materielCode",type:"like"},
+ {title:"妫�楠岀粨鏋�", field:"result",type:"like"},
+ ]
+ ]);
+ const columns = ref([{field:'checkOrderId',title:'涓婚敭',type:'int',width:150,hidden:true,readonly:true,require:true,align:'left'},
+ {field:'checkOrderNo',title:'妫�楠屽崟鍙�',type:'string',width:160,require:true,align:'left',sort:true},
+ {field:'receiveOrderNo',title:'鏀惰揣鍗曞彿',type:'string',width:160,require:true,align:'left'},
+ {field:'checkOrderStatus',title:'璐ㄦ鍗曠姸鎬�',type:'int',width:110,require:true,align:'left'},
+ {field:'auditStatus',title:'瀹℃壒鐘舵��',type:'int',width:110,require:true,align:'left'},
+ {field:'receiveDetailRowNo',title:'鏀惰揣鍗曟槑缁嗚鍙�',type:'int',width:110,require:true,align:'left'},
+ {field:'materielCode',title:'鐗╂枡缂栧彿',type:'string',width:110,require:true,align:'left'},
+ {field:'qualifiedQuantity',title:'鍚堟牸鏁伴噺',type:'float',width:110,align:'left'},
+ {field:'defectedQuantity',title:'鐗归噰鏁伴噺',type:'float',width:110,align:'left'},
+ {field:'returnQuantity',title:'閫�璐ф暟閲�',type:'float',width:110,align:'left'},
+ {field:'scrappedQuantity',title:'鎶ュ簾鏁伴噺',type:'float',width:110,align:'left'},
+ {field:'receivedQuantity',title:'妫�楠屾�绘暟',type:'float',width:110,require:true,align:'left'},
+ {field:'result',title:'妫�楠岀粨鏋�',type:'string',width:110,align:'left'},
+ {field:'defectedNote',title:'鐗归噰璇存槑',type:'string',width:110,align:'left'},
+ {field:'checkUserName',title:'妫�楠屼汉',type:'string',width:110,align:'left'},
+ {field:'creater',title:'鍒涘缓鑰�',type:'string',width:110,require:true,align:'left'},
+ {field:'createDate',title:'鍒涘缓鏃堕棿',type:'datetime',width:150,require:true,align:'left',sort:true},
+ {field:'modifier',title:'淇敼浜�',type:'string',width:100,align:'left'},
+ {field:'modifyDate',title:'淇敼鏃ユ湡',type:'datetime',width:150,align:'left',sort:true}]);
const detail = ref({
- cnName: "#detailCnName",
- table: "#detailTable",
- columns: [],
- sortName: "",
- key: ""
+ cnName: "妫�楠岀粨鏋�",
+ table: "CheckOrderResult",
+ columns: [
+ {field:'id',title:'涓婚敭',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
+ {field:'checkOrderId',title:'妫�楠屽崟涓婚敭',type:'int',width:110,require:true,align:'left',sort:true},
+ {field:'defectCode',title:'缂洪櫡浠ｇ爜',type:'string',width:110,require:true,align:'left'},
+ {field:'result',title:'妫�楠岀粨鏋�',type:'string',width:110,require:true,align:'left'},
+ {field:'quantity',title:'鏁伴噺',type:'float',width:110,require:true,align:'left'},
+ {field:'note',title:'澶囨敞',type:'string',width:220,align:'left'},
+ {field:'creater',title:'鍒涘缓鑰�',type:'string',width:110,require:true,align:'left'},
+ {field:'createDate',title:'鍒涘缓鏃堕棿',type:'datetime',width:150,require:true,align:'left',sort:true},
+ {field:'modifier',title:'淇敼浜�',type:'string',width:100,align:'left'},
+ {field:'modifyDate',title:'淇敼鏃ユ湡',type:'datetime',width:150,align:'left',sort:true}
+ ],
+ sortName: "id",
+ key: "id"
});
return {
table,
--
Gitblit v1.9.3