From d20a0bf191b78b59d18af198b7816a273e1cc283 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期二, 10 三月 2026 09:38:57 +0800
Subject: [PATCH] 前端表格与查询条件优化，修正后端排序逻辑
---
项目代码/WCS/WCSClient/src/extension/taskinfo/task.js | 1
项目代码/WMS/WMSClient/src/views/widesea_wms/stock/Dt_CarBodyInfo.vue | 42 ++++--
项目代码/WCS/WCSServer/WIDESEAWCS_Core/BaseServices/ServiceBase.cs | 2
项目代码/WMS/WMSClient/src/extension/widesea_wms/taskinfo/Dt_Task.jsx | 2
项目代码/WMS/WMSClient/src/views/widesea_wms/stock/VV_StockInfo.vue | 21 ++
项目代码/WMS/WMSClient/src/views/widesea_wms/taskinfo/Dt_Task.vue | 22 +--
项目代码/WMS/WMSClient/src/views/widesea_wms/OrderInfo/Dt_AssemblyOrderInfo.vue | 16 ++
项目代码/WMS/WMSClient/src/views/widesea_wms/OrderInfo/Dt_PaintingOrderInfo.vue | 157 +++++++++++++------------
项目代码/WCS/WCSClient/src/views/taskinfo/task.vue | 58 ++++-----
9 files changed, 174 insertions(+), 147 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSClient/src/extension/taskinfo/task.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSClient/src/extension/taskinfo/task.js"
index 8a02afb..420c853 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSClient/src/extension/taskinfo/task.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSClient/src/extension/taskinfo/task.js"
@@ -51,6 +51,7 @@
searchBefore(param) {
//鐣岄潰鏌ヨ鍓�,鍙互缁檖aram.wheres娣诲姞鏌ヨ鍙傛暟
//杩斿洖false锛屽垯涓嶄細鎵ц鏌ヨ
+ param.order = "Asc";
return true;
},
searchAfter(result) {
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSClient/src/views/taskinfo/task.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSClient/src/views/taskinfo/task.vue"
index 8f4c81b..4a5b91b 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSClient/src/views/taskinfo/task.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSClient/src/views/taskinfo/task.vue"
@@ -1,19 +1,11 @@
<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>
+<script>
import extend from "@/extension/taskinfo/task.js";
import { ref, defineComponent } from "vue";
export default defineComponent({
@@ -24,15 +16,15 @@
cnName: "浠诲姟淇℃伅",
name: "task",
url: "/Task/",
- sortName: "CreateDate",
+ sortName: "createDate",
});
const editFormFields = ref({
- taskNum:"",
+ taskNum: "",
palletCode: "",
roadway: "",
- taskType:"",
- taskState:"",
- wMSId:"",
+ taskType: "",
+ taskState: "",
+ wMSId: "",
sourceAddress: "",
targetAddress: "",
currentAddress: "",
@@ -40,7 +32,7 @@
creater: "",
createDate: "",
grade: "",
- productionLine:""
+ productionLine: ""
});
const editFormOptions = ref([[{ title: "浼樺厛绾�", field: "grade", type: "int" },]]);
const searchFormFields = ref({
@@ -106,9 +98,9 @@
},
{
field: "palletCode",
- title: "鎵樼洏缂栧彿",
+ title: "婊戞﹪鍙�",
type: "string",
- width: 160,
+ width: 100,
align: "left",
},
{
@@ -162,27 +154,27 @@
width: 110,
align: "left",
},
- {
- field: "productionLine",
- title: "浜х嚎",
- type: "string",
- width: 70,
- align: "left",
- bind: { key: "ProductionLine", data: [] }
- },
+ // {
+ // field: "productionLine",
+ // title: "浜х嚎",
+ // type: "string",
+ // width: 70,
+ // align: "left",
+ // bind: { key: "ProductionLine", data: [] }
+ // },
{
field: "exceptionMessage",
title: "寮傚父淇℃伅",
type: "string",
- width: 90,
+ width: 150,
align: "left",
-
+
},
{
field: "grade",
title: "浼樺厛绾�",
type: "int",
- width: 60,
+ width: 90,
align: "left",
},
{
@@ -200,7 +192,7 @@
align: "left",
hidden: true,
},
-
+
{
field: "createDate",
title: "鍒涘缓鏃堕棿",
@@ -208,7 +200,7 @@
width: 150,
align: "left",
},
-
+
{
field: "modifyDate",
title: "淇敼鏃堕棿",
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_Core/BaseServices/ServiceBase.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_Core/BaseServices/ServiceBase.cs"
index 7b5b5b2..11b441e 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_Core/BaseServices/ServiceBase.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_Core/BaseServices/ServiceBase.cs"
@@ -151,7 +151,7 @@
{
return new Dictionary<string, OrderByType> {
{
- pageData.Sort,pageData.Order?.ToLower() == OrderByType.Asc.ToString() ? OrderByType.Asc : OrderByType.Desc
+ pageData.Sort,pageData.Order?.ToLower() == OrderByType.Asc.ToString().ToLower() ? OrderByType.Asc : OrderByType.Desc
} };
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/widesea_wms/taskinfo/Dt_Task.jsx" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/widesea_wms/taskinfo/Dt_Task.jsx"
index 822489d..791132c 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/widesea_wms/taskinfo/Dt_Task.jsx"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/widesea_wms/taskinfo/Dt_Task.jsx"
@@ -103,6 +103,7 @@
col.showOverflowTooltip = true
})
+
//绀轰緥锛氳嚜瀹氫箟琛ㄦ牸鍒�
//琛ㄦ牸涓婃坊鍔犺嚜瀹氫箟鎸夐挳
// this.columns.push({
@@ -142,6 +143,7 @@
searchBefore(param) {
//鐣岄潰鏌ヨ鍓�,鍙互缁檖aram.wheres娣诲姞鏌ヨ鍙傛暟
//杩斿洖false锛屽垯涓嶄細鎵ц鏌ヨ
+ param.order = "asc";
return true
},
searchAfter(result) {
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/widesea_wms/OrderInfo/Dt_AssemblyOrderInfo.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/widesea_wms/OrderInfo/Dt_AssemblyOrderInfo.vue"
index 69b8f1a..b327f44 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/widesea_wms/OrderInfo/Dt_AssemblyOrderInfo.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/widesea_wms/OrderInfo/Dt_AssemblyOrderInfo.vue"
@@ -40,6 +40,16 @@
{ "title": "宸ュ崟鍙�", "field": "workOrderNo", "type": "text" },
{ "title": "璁㈠崟鍙�", "field": "vehicleOrderNo", "type": "text" },
{ "title": "pvi", "field": "pvi", "type": "text" },
+ { "title": "杞﹀瀷鐗瑰緛鍊�", "field": "vehicleCharacteristic", "type": "text" },
+ ],
+ [
+ { "title": "宸ュ巶", "field": "plantCode", "type": "text" },
+ { "title": "璁㈠崟绫诲瀷", "field": "orderType", "type": "select", dataKey: "OrderType", data: [] },
+ { "title": "宸ュ崟椤哄簭鍙�", "field": "sequenceNo", "type": "text" },
+ { "title": "鏁磋溅鐗╂枡鍙�", "field": "vehicleCode", "type": "text" },
+ ], [
+ { "title": "鐧借溅韬墿鏂欏彿", "field": "biwMaterial", "type": "text" },
+ { "title": "褰╄溅韬墿鏂欏彿", "field": "pbMaterial", "type": "string" },
],
]);
const columns = ref([{ field: 'Id', title: '涓婚敭', type: 'int', width: 110, hidden: true, readonly: true, require: true, align: 'left' },
@@ -47,7 +57,7 @@
//{ field: 'splitStrategy', title: '鐢熶骇妯″紡', type: 'string', width: 110, require: true, align: 'left' },
{ field: 'vehicleOrderNo', title: '璁㈠崟鍙�', type: 'string', width: 90, require: true, align: 'left' },
{ field: 'orderType', title: '璁㈠崟绫诲瀷', type: 'string', width: 110, require: true, align: 'left', bind: { key: "OrderType", data: [] } },
- { field: 'workOrderNo', title: '宸ュ崟鍙�', type: 'string', width: 90, require: true, align: 'left' },
+ { field: 'workOrderNo', title: '宸ュ崟鍙�', type: 'string', width: 150, require: true, align: 'left' },
{ field: 'pvi', title: 'pvi', type: 'string', width: 100, require: true, align: 'left' },
{ field: 'sequenceNo', title: '宸ュ崟椤哄簭鍙�', type: 'string', width: 120, require: true, align: 'left', sort: true },
{ field: 'vehicleCharacteristic', title: '杞﹀瀷鐗瑰緛鍊�', type: 'string', width: 90, require: true, align: 'left' },
@@ -60,8 +70,8 @@
//{ field: 'spare3', title: '澶囩敤3', type: 'string', width: 110, require: true, align: 'left' },
{ field: 'creater', title: '鍒涘缓浜�', type: 'string', width: 90, align: 'left' },
{ field: 'createDate', title: '鍒涘缓鏃堕棿', type: 'datetime', sort: true, width: 150, align: 'left', sort: true },
- //{ field: 'modifier', title: '淇敼浜�', type: 'string', sort: true, width: 100, align: 'left' },
- //{ field: 'modifyDate', title: '淇敼鏃堕棿', type: 'datetime', sort: true, width: 150, align: 'left', sort: true },
+ //{ field: 'modifier', title: '淇敼浜�', type: 'string', sort: true, width: 100, align: 'left' },
+ //{ field: 'modifyDate', title: '淇敼鏃堕棿', type: 'datetime', sort: true, width: 150, align: 'left', sort: true },
]);
const detail = ref({
cnName: "鍑哄簱鏄庣粏璁㈠崟",
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/widesea_wms/OrderInfo/Dt_PaintingOrderInfo.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/widesea_wms/OrderInfo/Dt_PaintingOrderInfo.vue"
index dd6b227..6ef6c8b 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/widesea_wms/OrderInfo/Dt_PaintingOrderInfo.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/widesea_wms/OrderInfo/Dt_PaintingOrderInfo.vue"
@@ -5,89 +5,94 @@
*涓氬姟璇峰湪@/extension/widesea_wms/invoices/Dt_OutOrder.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/widesea_wms/OrderInfo/Dt_PaintingOrderInfo.js";
- import { ref, defineComponent } from "vue";
- export default defineComponent({
- setup() {
- const table = ref({
- key: 'id',
- footer: "Foots",
- cnName: '娑傝宸ュ崟',
- name: 'Orderinfo/Dt_PaintingOrderInfo',
- url: "/Dt_PaintingOrderInfo/",
- sortName: "Id"
- });
- const editFormFields = ref({
- "orderNumber":"",
- "status":"",
- "orderDate":"",
- "warehouseId":"",
- "upperOutOrderId":"",
- "remarks":"",
+import extend from "@/extension/widesea_wms/OrderInfo/Dt_PaintingOrderInfo.js";
+import { ref, defineComponent } from "vue";
+export default defineComponent({
+ setup() {
+ const table = ref({
+ key: 'id',
+ footer: "Foots",
+ cnName: '娑傝宸ュ崟',
+ name: 'Orderinfo/Dt_PaintingOrderInfo',
+ url: "/Dt_PaintingOrderInfo/",
+ sortName: "Id"
+ });
+ const editFormFields = ref({
+ "orderNumber": "",
+ "status": "",
+ "orderDate": "",
+ "warehouseId": "",
+ "upperOutOrderId": "",
+ "remarks": "",
- });
- const editFormOptions = ref([
- ]);
- const searchFormFields = ref({});
- const searchFormOptions = ref([
+ });
+ const editFormOptions = ref([
+ ]);
+ const searchFormFields = ref({});
+ const searchFormOptions = ref([
[
{ "title": "宸ュ崟鍙�", "field": "workOrderNo", "type": "text" },
{ "title": "pvi", "field": "pvi", "type": "text" },
+ { "title": "宸ュ崟绫诲瀷", "field": "workOrderType", "type": "select", dataKey: "OrderType", data: [] },
{ "title": "鍑哄簱鏃ユ湡", "field": "orderDate", "type": "datetime" },
+ ], [
+ { "title": "鐧借溅韬墿鏂欏彿", "field": "biwMaterial", "type": "text" },
+ { "title": "褰╄溅韬墿鏂欏彿", "field": "pbMaterial", "type": "text" },
+ { "title": "杞﹀瀷鐗瑰緛鍊�", "field": "vehicleCharacteristic", "type": "string" },
+ { "title": "澶╃獥鐗瑰緛鍊�", "field": "skylightCharacteristic", "type": "string" },
+ ], [
+ { "title": "杞﹁韩棰滆壊", "field": "carBodyCharacteristic", "type": "text" },
+ { "title": "鍙岃壊杞﹁韩", "field": "twoToneCharacteristic", "type": "text" },
+ { "title": "宸ュ崟椤哄簭鍙�", "field": "sequenceNo", "type": "string" },
+ { "title": "CTC閰嶇疆", "field": "config1", "type": "string" },
],
- ]);
- const columns = ref([{field:'Id',title:'涓婚敭',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
- {field:'plantCode',title:'宸ュ巶',type:'string',width:100,require:true,align:'left'},
- //{field:'workshopCode',title:'杞﹂棿',type:'string',width:70,require:true,align:'left'},
- //{field:'splitStrategy',title:'鐢熶骇妯″紡',type:'string',width:110,require:true,align:'left'},
- {field:'workOrderNo',title:'宸ュ崟鍙�',type:'string',width:220,require:true,align:'left'},
- {field:'workOrderType',title:'宸ュ崟绫诲瀷',type:'string',width:110,require:true,align:'left',bind: { key: "OrderType", data: []}},
- {field:'pvi',title:'pvi',type:'string',width:100,require:true,align:'left'},
- {field:'biwMaterial',title:'鐧借溅韬墿鏂欏彿',type:'string',width:120,require:true,align:'left'},
- {field:'vehicleCharacteristic',title:'杞﹀瀷鐗瑰緛鍊�',type:'string',width:100,require:true,align:'left'},
- {field:'skylightCharacteristic',title:'澶╃獥鐗瑰緛鍊�',type:'string',width:100,require:true,align:'left'},
- {field:'carBodyCharacteristic',title:'杞﹁韩棰滆壊',type:'string',width:100,require:true,align:'left'},
- {field:'twoToneCharacteristic',title:'鍙岃壊杞﹁韩',type:'string',width:100,require:true,align:'left'},
- {field:'sequenceNo',title:'宸ュ崟椤哄簭鍙�',type:'string',width:90,require:true,align:'left'},
- {field:'config1',title:'CTC閰嶇疆',type:'string',width:110,require:true,align:'left'},
- {field:'pbMaterial',title:'褰╄溅韬墿鏂欏彿',type:'string',width:220,require:true,align:'left'},
- //{field:'config3',title:'澶囩敤3',type:'string',width:110,require:true,align:'left'},
- {field:'workOrderSendStatus',title:'宸ュ崟涓嬪彂鐘舵��',type:'string',width:220,require:true,align:'left'},
- {field:'creater',title:'鍒涘缓浜�',type:'string',sort:true,width:110,align:'left'},
- {field:'createDate',title:'鍒涘缓鏃堕棿',type:'datetime',sort:true,width:150,align:'left',sort:true},
- {field:'modifier',title:'淇敼浜�',type:'string',sort:true,width:100,align:'left'},
- {field:'modifyDate',title:'淇敼鏃堕棿',type:'datetime',sort:true,width:150,align:'left',sort:true},
- ]);
- const detail = ref({
- cnName: "鍑哄簱鏄庣粏璁㈠崟",
- table: "#detailTable",
- columns: [
- ],
- sortName: "id",
- key: "iD"
- });
- return {
- table,
- extend,
- editFormFields,
- editFormOptions,
- searchFormFields,
- searchFormOptions,
- columns,
- detail,
- };
- },
- });
+ ]);
+ const columns = ref([{ field: 'Id', title: '涓婚敭', type: 'int', width: 110, hidden: true, readonly: true, require: true, align: 'left' },
+ { field: 'plantCode', title: '宸ュ巶', type: 'string', width: 100, require: true, align: 'left' },
+ //{field:'workshopCode',title:'杞﹂棿',type:'string',width:70,require:true,align:'left'},
+ //{field:'splitStrategy',title:'鐢熶骇妯″紡',type:'string',width:110,require:true,align:'left'},
+ { field: 'workOrderNo', title: '宸ュ崟鍙�', type: 'string', width: 200, require: true, align: 'left' },
+ { field: 'workOrderType', title: '宸ュ崟绫诲瀷', type: 'string', width: 110, require: true, align: 'left', bind: { key: "OrderType", data: [] } },
+ { field: 'pvi', title: 'pvi', type: 'string', width: 100, require: true, align: 'left' },
+ { field: 'biwMaterial', title: '鐧借溅韬墿鏂欏彿', type: 'string', width: 120, require: true, align: 'left' },
+ { field: 'vehicleCharacteristic', title: '杞﹀瀷鐗瑰緛鍊�', type: 'string', width: 100, require: true, align: 'left' },
+ { field: 'skylightCharacteristic', title: '澶╃獥鐗瑰緛鍊�', type: 'string', width: 100, require: true, align: 'left' },
+ { field: 'carBodyCharacteristic', title: '杞﹁韩棰滆壊', type: 'string', width: 100, require: true, align: 'left' },
+ { field: 'twoToneCharacteristic', title: '鍙岃壊杞﹁韩', type: 'string', width: 100, require: true, align: 'left' },
+ { field: 'sequenceNo', title: '宸ュ崟椤哄簭鍙�', type: 'string', width: 150, require: true, align: 'left' },
+ { field: 'config1', title: 'CTC閰嶇疆', type: 'string', width: 110, require: true, align: 'left' },
+ { field: 'pbMaterial', title: '褰╄溅韬墿鏂欏彿', type: 'string', width: 220, require: true, align: 'left' },
+ //{field:'config3',title:'澶囩敤3',type:'string',width:110,require:true,align:'left'},
+ { field: 'workOrderSendStatus', title: '宸ュ崟涓嬪彂鐘舵��', type: 'string', width: 120, require: true, align: 'left' },
+ { field: 'creater', title: '鍒涘缓浜�', type: 'string', sort: true, width: 110, align: 'left' },
+ { field: 'createDate', title: '鍒涘缓鏃堕棿', type: 'datetime', sort: true, width: 150, align: 'left', sort: true },
+ { field: 'modifier', title: '淇敼浜�', type: 'string', sort: true, width: 100, align: 'left' },
+ { field: 'modifyDate', title: '淇敼鏃堕棿', type: 'datetime', sort: true, width: 150, align: 'left', sort: true },
+ ]);
+ const detail = ref({
+ cnName: "鍑哄簱鏄庣粏璁㈠崟",
+ table: "#detailTable",
+ columns: [
+ ],
+ sortName: "id",
+ key: "iD"
+ });
+ return {
+ table,
+ extend,
+ editFormFields,
+ editFormOptions,
+ searchFormFields,
+ searchFormOptions,
+ columns,
+ detail,
+ };
+ },
+});
</script>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/widesea_wms/stock/Dt_CarBodyInfo.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/widesea_wms/stock/Dt_CarBodyInfo.vue"
index d9e4411..0e7cb11 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/widesea_wms/stock/Dt_CarBodyInfo.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/widesea_wms/stock/Dt_CarBodyInfo.vue"
@@ -30,37 +30,45 @@
]);
const searchFormFields = ref({
- palletCode:""
+ palletCode: ""
});
const searchFormOptions = ref([
[
{ "title": "婊戞﹪鍙�", "field": "palletCode", type: "text" },
- //{ "title": "鐗╂枡缂栧彿", "field": "materielCode", type: "text" },
- { "title": "PVI", "field": "pvi", type: "text" },
+ { "title": "PVI", "field": "pvi", type: "text" },
{ "title": "杞﹁韩绫诲瀷", "field": "carType", type: "select", dataKey: "BodyType", data: [] },
- //{ "title": "缁勭洏绫诲瀷", "field": "groupType", type: "select", dataKey: "GroupType", data: [] },
+ { "title": "鎬昏宸ュ崟鍙�", "field": "assemblyWorrkNo", type: "string" },
],
[
- { "title": "宸ュ崟绫诲瀷", "field": "workOrderType", type: "select", dataKey: "OrderType", data: [] },
+ { "title": "鐒婅宸ュ崟鍙�", "field": "workOrderNo", type: "string" },
+ { "title": "娑傝宸ュ崟鍙�", "field": "plantingWorkNo", type: "string" },
+ { "title": "褰╄溅韬墿鏂欏彿", "field": "pbMaterial", type: "string" },
+ { "title": "鐧借溅韬墿鏂欏彿", "field": "biwMaterialCode", type: "string" },
+ ],
+ [
+ { "title": "杞﹀瀷鐗瑰緛", "field": "vehicleCharacteristic", type: "string" },
+ { "title": "澶╃獥鐗瑰緛", "field": "skylightCharacteristic", type: "string" },
+ { "title": "杞﹁韩棰滆壊", "field": "carBodyCharacteristic", type: "string" },
+ { "title": "VIN", "field": "vin", type: "string" },
]
]);
const columns = ref([
{ field: 'id', title: 'ID', type: 'int', width: 110, readonly: true, hidden: true, require: true, align: 'left' },
{ field: 'palletCode', title: '婊戞﹪鍙�', type: 'string', width: 110, align: 'left', sort: true },
- { field: 'workOrderNo', title: '鐒婅宸ュ崟鍙�', type: 'string', width: 110, align: 'left' },
- { field: 'plantingWorkNo', title: '娑傝宸ュ崟鍙�', type: 'string', width: 110, align: 'left' },
- { field: 'assemblyWorrkNo', title: '鎬昏宸ュ崟鍙�', type: 'string', width: 110, align: 'left' },
+ { field: 'workOrderNo', title: '鐒婅宸ュ崟鍙�', type: 'string', width: 180, align: 'left' },
+ { field: 'plantingWorkNo', title: '娑傝宸ュ崟鍙�', type: 'string', width: 180, align: 'left' },
+ { field: 'assemblyWorrkNo', title: '鎬昏宸ュ崟鍙�', type: 'string', width: 110, align: 'left' },
{ field: 'pvi', title: 'PVI鐮�', type: 'string', width: 110, align: 'left' },
- { field: 'carType', title: '杞﹁韩绫诲瀷', type: 'int', width: 110, align: 'left',bind: { key: "BodyType", data: [] } },
- { field: 'workOrderType', title: '宸ュ崟绫诲瀷', type: 'string', width: 110, align: 'left', bind: { key: "OrderType", data: [] } },
- { field: 'biwMaterialCode', title: '鐧借溅韬墿鏂欏彿', type: 'string', width: 110, align: 'left' },
- { field: 'pbMaterial', title: '褰╄溅韬墿鏂欏彿', type: 'string', width: 110, align: 'left' },
- { field: 'vehicleCharacteristic', title: '杞﹀瀷鐗瑰緛', type: 'string', width: 110, align: 'left' },
- { field: 'skylightCharacteristic', title: '澶╃獥鐗瑰緛', type: 'string', width: 110, align: 'left' },
- { field: 'carBodyCharacteristic', title: '杞﹁韩棰滆壊', type: 'string', width: 110, align: 'left' },
+ { field: 'carType', title: '杞﹁韩绫诲瀷', type: 'int', width: 110, align: 'left', bind: { key: "BodyType", data: [] } },
+ { field: 'workOrderType', title: '宸ュ崟绫诲瀷', type: 'string', width: 110, align: 'left', bind: { key: "OrderType", data: [] } },
+ { field: 'biwMaterialCode', title: '鐧借溅韬墿鏂欏彿', type: 'string', width: 150, align: 'left' },
+ { field: 'pbMaterial', title: '褰╄溅韬墿鏂欏彿', type: 'string', width: 150, align: 'left' },
+ { field: 'vehicleCharacteristic', title: '杞﹀瀷鐗瑰緛', type: 'string', width: 90, align: 'left' },
+ { field: 'skylightCharacteristic', title: '澶╃獥鐗瑰緛', type: 'string', width: 90, align: 'left' },
+ { field: 'carBodyCharacteristic', title: '杞﹁韩棰滆壊', type: 'string', width: 90, align: 'left' },
//{ field: 'bodyStatus', title: '褰撳墠鐘舵��', type: 'int', width: 110, align: 'left', bind: { key: "BodyStatus", data: [] } },
- { field: 'vin', title: 'VIN', type: 'string', width: 110, align: 'left', sort: true,},
- { field: 'biwInPassTime', title: '鐒婅涓婄嚎鏃堕棿', type: 'datetime', width: 110, align: 'left' },
+ { field: 'vin', title: 'VIN', type: 'string', width: 110, align: 'left', sort: true, },
+ { field: 'biwInPassTime', title: '鐒婅涓婄嚎鏃堕棿', type: 'datetime', width: 150, align: 'left' },
{ field: 'description', title: '澶囨敞', type: 'string', width: 120, align: 'left' },
{ field: 'creater', title: '鍒涘缓浜�', type: 'string', width: 100, align: 'left' },
{ field: 'createDate', title: '鍒涘缓鏃堕棿', type: 'datetime', sort: true, width: 100, align: 'left' },
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/widesea_wms/stock/VV_StockInfo.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/widesea_wms/stock/VV_StockInfo.vue"
index 50cf1e1..52ebba8 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/widesea_wms/stock/VV_StockInfo.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/widesea_wms/stock/VV_StockInfo.vue"
@@ -33,14 +33,27 @@
});
const searchFormOptions = ref([
[
- { "title": "鏉＄爜", "field": "palletCode", type: "text" },
+ { "title": "婊戞﹪鍙�", "field": "palletCode", type: "text" },
{ "title": "搴撲綅鍙�", "field": "locationCode", type: "text" },
- { "title": "搴撳瓨鐘舵��", "field": "stockStatus", type: "select", dataKey: "CurrentStatue", data: [] },
+ { "title": "閿佸畾鐘舵��", "field": "stockStatus", type: "select", dataKey: "BodyStatus", data: [] },
+ { "title": "鎷夊姩閿佸畾", "field": "lockOrder", type: "select", dataKey: "LockStatus", data: [] },
],
[
{ "title": "杞﹁韩ID", "field": "carBodyID", type: "int" },
{ "title": "PVI", "field": "pvi", type: "string" },
{ "title": "宸烽亾鍙�", "field": "roadwayNo", type: "int" },
+ { "title": "浠诲姟鐘舵��", "field": "taskStatus", type: "select", dataKey: "TaskInfoStatus", data: [] },
+ ],
+ [
+ { "title": "杞﹁韩绫诲瀷", "field": "carType", type: "select", dataKey: "BodyType", data: [] },
+ { "title": "宸ュ崟绫诲瀷", "field": "workOrderType", type: "select", dataKey: "OrderType", data: [] },
+ { "title": "鐧借溅韬墿鏂欏彿", "field": "biwMaterialCode", type: "int" },
+ { "title": "褰╄溅韬墿鏂欏彿", "field": "pbMaterial", type: "string" },
+ ],
+ [
+ { "title": "杞﹁韩棰滆壊", "field": "carBodyCharacteristic", type: "string" },
+ { "title": "澶╃獥鐗瑰緛", "field": "skylightCharacteristic", type: "string" },
+ { "title": "杞﹀瀷", "field": "vehicleCharacteristic", type: "string" },
]
]);
const columns = ref([
@@ -52,14 +65,14 @@
{ field: 'palletCode', title: '婊戞﹪鍙�', type: 'string', width: 75, align: 'left' },
{ field: 'vehicleCharacteristic', title: '杞﹀瀷', type: 'string', width: 75, align: 'left' },
{ field: 'carType', title: '杞﹁韩绫诲瀷', type: 'int', width: 80, align: 'left', bind: { key: "BodyType", data: [] } },
- { field: 'workOrderType', title: '宸ュ崟绫诲瀷', type: 'string', width: 75, align: 'left', bind: { key: "OrderType", data: [] } },
+ { field: 'workOrderType', title: '宸ュ崟绫诲瀷', type: 'string', width: 100, align: 'left', bind: { key: "OrderType", data: [] } },
{ field: 'skylightCharacteristic', title: '澶╃獥鐗瑰緛', type: 'string', width: 75, align: 'left' },
{ field: 'carBodyCharacteristic', title: '杞﹁韩棰滆壊', type: 'string', width: 75, align: 'left' },
{ field: 'biwMaterialCode', title: '鐧借溅韬墿鏂欏彿', type: 'string', width: 110, align: 'left' },
{ field: 'pbMaterial', title: '褰╄溅韬墿鏂欏彿', type: 'string', width: 110, align: 'left' },
{ field: 'biwInPassTime', title: '鐒婅涓婄嚎鏃堕棿', type: 'datetime', width: 130, align: 'left' },
{ field: 'stockStatus', title: '閿佸畾鐘舵��', type: 'string', width: 80, align: 'left', bind: { key: "BodyStatus", data: [] } },
- { field: 'lockOrder', title: '鎷夊姩閿佸畾', type: 'int', width: 75, align: 'left', bind: { key: "LockStatus", data: [] } },
+ { field: 'lockOrder', title: '鎷夊姩閿佸畾', type: 'int', width: 75, align: 'left', bind: { key: "LockStatus", data: [] } },
{ field: 'taskStatus', title: '浠诲姟鐘舵��', type: 'string', width: 80, align: 'left', bind: { key: "TaskInfoStatus", data: [] } },
//{ field: 'stayStatus', title: '淇濈暀鐘舵��', type: 'string', width: 80, align: 'left', bind: { key: "StayStatus", data: [] } },
//{ field: 'creater', title: '鍒涘缓浜�', type: 'string', width: 100, align: 'left' },
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/widesea_wms/taskinfo/Dt_Task.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/widesea_wms/taskinfo/Dt_Task.vue"
index 41c8778..14ded55 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/widesea_wms/taskinfo/Dt_Task.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/widesea_wms/taskinfo/Dt_Task.vue"
@@ -20,7 +20,7 @@
cnName: '浠诲姟淇℃伅',
name: 'taskinfo/Dt_Task',
url: "/Task/",
- sortName: "TaskId"
+ sortName: "createDate"
});
const editFormFields = ref({
});
@@ -33,14 +33,12 @@
{ "title": "浠诲姟鍙�", "field": "taskNum", "type": "text" },
{ "title": "婊戞﹪鍙�", "field": "palletCode", "type": "text" },
{ "title": "浠诲姟绫诲瀷", "field": "taskType", "type": "select", dataKey: "TaskType", data: [] },
- { "title": "浠诲姟鐘舵��", "field": "taskState", "type": "select", dataKey: "TaskStatus", data: [] },
-
],
[
{ "title": "璧峰浣嶇疆", "field": "sourceAddress", type: "text" },
- //{ "title": "褰撳墠浣嶇疆", "field": "currentAddress", type: "text" },
- //{ "title": "涓嬩竴浣嶇疆", "field": "nextAddress", type: "text" },
{ "title": "鐩爣浣嶇疆", "field": "targetAddress", type: "text" },
+ { "title": "浠诲姟鐘舵��", "field": "taskState", "type": "select", dataKey: "TaskStatus", data: [] },
+
],
[
{ "title": "宸烽亾", "field": "roadway", type: "text" },
@@ -50,21 +48,19 @@
]);
const columns = ref([{ field: 'TaskId', title: '涓婚敭', type: 'string', width: 110, hidden: true, readonly: true, require: true, align: 'left' },
{ field: 'taskNum', title: '浠诲姟鍙�', type: 'int', width: 110, align: 'left', sort: true },
- { field: 'pvi', title: 'pvi', type: 'int', width: 110, align: 'left',},
- { field: 'palletCode', title: '婊戞﹪鍙�', type: 'string', width: 180, align: 'left' },
- { field: 'pnboundNo', title: '鍗曟嵁鍙�', type: 'string', width: 110, align: 'left',hidden:true },
+ { field: 'pvi', title: 'pvi', type: 'int', width: 150, align: 'left', },
+ { field: 'palletCode', title: '婊戞﹪鍙�', type: 'string', width: 120, align: 'left' },
+ { field: 'pnboundNo', title: '鍗曟嵁鍙�', type: 'string', width: 110, align: 'left', hidden: true },
{ field: 'groupID', title: '搴撳瓨ID', type: 'int', width: 110, hidden: true, align: 'left' },
{ field: 'groupDetailId', title: '缁勭洏鏄庣粏ID', type: 'int', width: 110, hidden: true, align: 'left' },
{ field: 'roadway', title: '宸烽亾', type: 'string', width: 110, align: 'left' },
{ field: 'taskType', title: '浠诲姟绫诲瀷', type: 'int', width: 110, align: 'left', bind: { key: "TaskType", data: [] } },
- { field: 'taskState', title: '浠诲姟鐘舵��', type: 'int', width: 110, align: 'left', bind: { key: "TaskStatus", data: [] } },
+ { field: 'taskState', title: '浠诲姟鐘舵��', type: 'int', width: 150, align: 'left', bind: { key: "TaskStatus", data: [] } },
{ field: 'sourceAddress', title: '璧峰浣嶇疆', type: 'string', width: 110, align: 'left' },
- ///{ field: 'currentAddress', title: '褰撳墠浣嶇疆', type: 'string', width: 110, align: 'left' },
- //{ field: 'nextAddress', title: '涓嬩竴浣嶇疆', type: 'string', width: 110, align: 'left' },
{ field: 'targetAddress', title: '鐩爣浣嶇疆', type: 'string', width: 110, align: 'left' },
{ field: 'grade', title: '浼樺厛绾�', type: 'int', width: 60, align: 'left' },
{ field: 'dispatchertime', title: '浠诲姟涓嬪彂鏃堕棿', type: 'datetime', width: 150, align: 'left', sort: true },
- { field: 'remark', title: '澶囨敞', type: 'string', width: 110, align: 'left',hidden: true, },
+ { field: 'remark', title: '澶囨敞', type: 'string', width: 110, align: 'left', hidden: true, },
{ field: 'creater', title: '鍒涘缓浜�', type: 'string', sort: true, width: 110, align: 'left' },
{ field: 'createDate', title: '鍒涘缓鏃堕棿', type: 'datetime', sort: true, width: 150, align: 'left', sort: true },
{ field: 'modifyDate', title: '淇敼鏃堕棿', type: 'datetime', sort: true, width: 150, align: 'left', sort: true },
@@ -75,7 +71,7 @@
{ field: 'createID', title: '鍒涘缓ID', type: 'int', sort: true, width: 100, hidden: true, align: 'left' },
{ field: 'modifyID', title: '淇敼浜篒D', type: 'int', sort: true, width: 100, hidden: true, align: 'left' },]);
const detail = ref({
- cnName: "#detailCnName",
+ cnName: "#detailCnName",
table: "#detailTable",
columns: [],
sortName: "",
--
Gitblit v1.9.3