From c397c5582f8c4a2bc00ed78a9e5ddba1d3024316 Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期六, 29 十一月 2025 17:51:48 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu
---
项目代码/WIDESEA_WMSClient/src/views/check/checkOrder.vue | 176 ++++++++++++++++++++++++++++------------------------------
1 files changed, 85 insertions(+), 91 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/check/checkOrder.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/check/checkOrder.vue"
index 41ee0fc..d84f1b9 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/check/checkOrder.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/check/checkOrder.vue"
@@ -5,98 +5,92 @@
*涓氬姟璇峰湪@/extension/widesea_wcs/order/Dt_CheckOrder.js姝ゅ缂栧啓
-->
<template>
- <view-grid ref="grid"
- :columns="columns"
- :detail="detail"
- :editFormFields="editFormFields"
- :editFormOptions="editFormOptions"
- :searchFormFields="searchFormFields"
- :searchFormOptions="searchFormOptions"
- :table="table"
- :extend="extend">
+ <view-grid ref="grid" :columns="columns" :detail="detail" :editFormFields="editFormFields"
+ :editFormOptions="editFormOptions" :searchFormFields="searchFormFields" :searchFormOptions="searchFormOptions"
+ :table="table" :extend="extend">
</view-grid>
</template>
<script>
- import extend from "@/extension/check/checkOrder.js";
- import { ref, defineComponent } from "vue";
- export default defineComponent({
- setup() {
- const table = ref({
- key: 'checkOrderId',
- footer: "Foots",
- cnName: '妫�楠屽崟',
- name: 'checkOrder',
- url: "/CheckOrder/",
- sortName: "checkOrderId"
- });
- const editFormFields = ref({});
- const editFormOptions = ref([]);
- 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: "妫�楠岀粨鏋�",
- 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,
- extend,
- editFormFields,
- editFormOptions,
- searchFormFields,
- searchFormOptions,
- columns,
- detail,
- };
- },
- });
+import extend from "@/extension/check/checkOrder.js";
+import { ref, defineComponent } from "vue";
+export default defineComponent({
+ setup() {
+ const table = ref({
+ key: 'checkOrderId',
+ footer: "Foots",
+ cnName: '妫�楠屽崟',
+ name: 'checkOrder',
+ url: "/CheckOrder/",
+ sortName: "checkOrderId"
+ });
+ const editFormFields = ref({});
+ const editFormOptions = ref([]);
+ 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: "妫�楠岀粨鏋�",
+ 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,
+ extend,
+ editFormFields,
+ editFormOptions,
+ searchFormFields,
+ searchFormOptions,
+ columns,
+ detail,
+ };
+ },
+});
</script>
--
Gitblit v1.9.3