From c7082f9c389230a989b1fa63862f6aa6e720990c Mon Sep 17 00:00:00 2001
From: wankeda <Administrator@DESKTOP-HAU3ST3>
Date: 星期五, 28 二月 2025 10:41:13 +0800
Subject: [PATCH] PP仓出库MES,AGV对接流程

---
 代码管理/WMS/WIDESEA_WMSClient/src/views/check/checkOrder.vue |   48 ++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 38 insertions(+), 10 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 09f6687..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"
@@ -31,11 +31,28 @@
             });
             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'},
+            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'},
@@ -53,11 +70,22 @@
                        {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:'缂洪櫡浠g爜',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