From f51582d5b4b498f28513f215f91828ef181df4a1 Mon Sep 17 00:00:00 2001 From: Huangxiaoqiang-03 <1247017146@qq.com> Date: 星期三, 06 十一月 2024 17:16:09 +0800 Subject: [PATCH] 1 --- 代码管理/WMS/WIDESEA_WMSClient/src/views/record/locationStatusChangeRecord.vue | 90 +++++++++++++++------------------------------ 1 files changed, 30 insertions(+), 60 deletions(-) diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/record/locationStatusChangeRecord.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/record/locationStatusChangeRecord.vue" index b2d59d8..fdda8c0 100644 --- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/record/locationStatusChangeRecord.vue" +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/record/locationStatusChangeRecord.vue" @@ -24,7 +24,7 @@ cnName: "璐т綅鐘舵�佸彉鍔ㄨ褰�", name: "locationStatusChangeRecord", url: "/LocationStatusChangeRecord/", - sortName: "id", + sortName: "CreateDate", }); const editFormFields = ref({ deviceCode: "", @@ -37,63 +37,23 @@ deviceRemark: "", }); const editFormOptions = ref([ - [ - { - title: "璁惧缂栧彿", - required: true, - field: "deviceCode", - type: "string", - }, - { - title: "璁惧鍚嶇О", - required: true, - field: "deviceName", - type: "string", - }, - { - title: "璁惧绫诲瀷", - required: true, - field: "deviceType", - type: "string", - }, - { - title: "璁惧鐘舵��", - required: true, - field: "deviceStatus", - type: "string", - }, - ], - [ - { title: "璁惧IP", required: true, field: "deviceIp", type: "string" }, - { - title: "璁惧绔彛", - required: true, - field: "devicePort", - type: "string", - }, - { - title: "PLC绫诲瀷", - required: true, - field: "devicePlcType", - type: "string", - }, - { - title: "澶囨敞", - field: "deviceRemark", - type: "string", - }, - ], + ]); const searchFormFields = ref({ - deviceCode: "", - deviceType: "", - deviceStatus: "", + locationCode: "", + orderNo: "", + taskNum: "", }); const searchFormOptions = ref([ [ - { title: "璁惧缂栧彿", field: "deviceCode" }, - { title: "璁惧绫诲瀷", field: "deviceType" }, - { title: "璁惧鐘舵��", field: "deviceStatus" }, + { title: "璐т綅鍙�", field: "locationCode" }, + { title: "鍗曟嵁缂栧彿", field: "orderNo" }, + { title: "浠诲姟鍙�", field: "taskNum" }, + ], + [ + { title: "鍙樺姩鍓嶇姸鎬�", field: "beforeStatus" ,type: "selectList",dataKey: "locationStatusEnum",data: [],}, + { title: "鍙樺姩鍚庣姸鎬�", field: "afterStatus" ,type: "selectList",dataKey: "locationStatusEnum",data: [],}, + { title: "鍙樺姩绫诲瀷", field: "changeType" ,type: "selectList",dataKey: "stockChangeType",data: [],}, ], ]); const columns = ref([ @@ -115,6 +75,13 @@ align: "left", }, { + field: "taskNum", + title: "浠诲姟鍙�", + type: "string", + width: 90, + align: "left", + }, + { field: "locationCode", title: "璐т綅缂栧彿", type: "string", @@ -127,13 +94,23 @@ type: "string", width: 150, align: "left", + bind: { key: "locationStatusEnum", data: [] }, }, { field: "afterStatus", title: "鍙樺姩鍚庤揣浣嶇姸鎬�", type: "decimal", + width: 150, + align: "left", + bind: { key: "locationStatusEnum", data: [] }, + }, + { + field: "changeType", + title: "鍙樺姩绫诲瀷", + type: "string", width: 90, align: "left", + bind: { key: "stockChangeType", data: [] }, }, { field: "orderId", @@ -154,13 +131,6 @@ title: "鍗曟嵁鏄庣粏涓婚敭", type: "string", width: 200, - align: "left", - }, - { - field: "taskNum", - title: "浠诲姟鍙�", - type: "string", - width: 180, align: "left", }, { -- Gitblit v1.9.3