From 663995bb11e71fa2960cc388d9e0bad6b9257439 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 23 五月 2024 19:27:10 +0800
Subject: [PATCH] 优化前端页面
---
代码管理/WMS/WMS_Client/src/views/Task/widesea_wms/taskinfo/dt_agvtask.vue | 4 ++--
代码管理/PCS/WCS_Client/src/views/widesea_wcs/tomes/VV_Workinfo.vue | 2 +-
代码管理/WMS/WMS_Client/src/views/Task/widesea_wms/taskinfo/dt_agvtask_hty.vue | 9 +++++----
代码管理/WMS/WMS_Client/src/api/http.js | 2 +-
4 files changed, 9 insertions(+), 8 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/widesea_wcs/tomes/VV_Workinfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/widesea_wcs/tomes/VV_Workinfo.vue"
index d8d6836..f387f15 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/widesea_wcs/tomes/VV_Workinfo.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/widesea_wcs/tomes/VV_Workinfo.vue"
@@ -33,7 +33,7 @@
const editFormOptions = ref([[{"title":"鎵撳寘鏁伴噺","field":"stackNoRange","type":"number"}]]);
const searchFormFields = ref({"workOrder":"","jobID":"","drawingNo":"","productName":"","productDesc":"","processCode":"","heatID":"","billetID":"","SN":""});
const searchFormOptions = ref([[{"title":"鍥惧彿","field":"drawingNo","type":"like"},{"title":"宸ヤ綔浠ゅ彿","field":"workOrder","type":"like"},{"title":"宸ュ崟缂栧彿","field":"jobID","type":"like"}],[{"title":"浜у搧鍚嶇О","field":"productName","type":"like"},{"title":"鐐変唬鍙�","field":"heatID","type":"like"},{"title":"閽㈠澂鍙�","field":"billetID","type":"like"}],[{"title":"杞﹁疆SN鍙�","field":"SN","type":"like"},{"dataKey":"WorkTypes","data":[],"title":"宸ュ崟绫诲瀷","field":"processCode","type":"select"},{"title":"鍒涘缓鏃堕棿","field":"CreateTime","type":"date"}]]);
- const columns = ref([{field:'workOrder',title:'宸ヤ綔浠ゅ彿',type:'string',sort:true,width:120,align:'left',sort:true},
+ const columns = ref([{field:'workOrder',title:'宸ヤ綔浠ゅ彿',type:'string',sort:true,width:120,align:'left'},
{field:'jobID',title:'宸ュ崟缂栧彿',type:'string',sort:true,width:120,align:'left'},
{field:'materialCode',title:'鐗╂枡缂栫爜',hidden:true,type:'string',width:110,align:'left'},
{field:'drawingNo',title:'鍥惧彿',type:'string',sort:true,width:110,align:'left'},
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/api/http.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/api/http.js"
index 0af90a4..eb0a016 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/api/http.js"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/api/http.js"
@@ -12,7 +12,7 @@
let loadingInstance;
let loadingStatus = false;
if (process.env.NODE_ENV == 'development') {
- axios.defaults.baseURL = 'http://127.0.0.1:8098/';
+ axios.defaults.baseURL = 'http://192.168.12.101:8098/';
}
else if (process.env.NODE_ENV == 'debug') {
axios.defaults.baseURL = 'http://192.168.12.101:8098/';
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/Task/widesea_wms/taskinfo/dt_agvtask.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/Task/widesea_wms/taskinfo/dt_agvtask.vue"
index 7f4b64e..49cd0dd 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/Task/widesea_wms/taskinfo/dt_agvtask.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/Task/widesea_wms/taskinfo/dt_agvtask.vue"
@@ -53,8 +53,8 @@
const searchFormFields = ref({"agv_tasknum":"","agv_fromaddress":"","agv_toaddress":"","agv_tasktype":[],"agv_taskstate":[],"agv_materielid":"","agv_createtime":"","agv_barcode":"","agv_materbarcode":""});
const searchFormOptions = ref([
[{"title":"浠诲姟缂栧彿","field":"agv_tasknum","type":"like"},{"title":"璧风偣鍦板潃","field":"agv_fromaddress","type":"like"},{"title":"缁堢偣鍦板潃","field":"agv_toaddress","type":"like"}],
- [{"title":"宸ュ崟鍙�","field":"jobID","type":"like"},{"dataKey":"agv_tasktypes","data":[],"title":"浠诲姟绫诲瀷","field":"agv_tasktype","type":"selectList"},{"title":"鍒涘缓鏃堕棿","field":"agv_createtime","type":"datetime"}],
- // [{"title":"鐗╂枡绫诲瀷","field":"agv_materielid","type":"like"},{"title":"鎵樼洏鐮�","field":"agv_barcode","type":"like"},{"title":"鐗╂枡鐮�","field":"agv_materbarcode","type":"like"}]
+ [{"title":"宸ヤ綔浠ゅ彿","field":"jobID","type":"like"},{"title":"鍥惧彿","field":"agv_materielid","type":"like"},{"title":"杞﹁疆SN鍙�","field":"bindSN","type":"like"}],
+ [{"dataKey":"Taskstates","data":[],"title":"浠诲姟鐘舵��","field":"agv_taskstate","type":"selectList"},{"dataKey":"agv_tasktypes","data":[],"title":"浠诲姟绫诲瀷","field":"agv_tasktype","type":"selectList"},{"title":"鍒涘缓鏃堕棿","field":"agv_createtime","type":"datetime"}]
]);
const columns = ref([{field:'agv_id',title:'浠诲姟Id',type:'guid',width:110,hidden:true,readonly:true,require:true,align:'left'},
{field:'agv_tasknum',title:'浠诲姟缂栧彿',type:'string',sort:true,width:110,require:true,align:'left'},
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/Task/widesea_wms/taskinfo/dt_agvtask_hty.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/Task/widesea_wms/taskinfo/dt_agvtask_hty.vue"
index 513b593..020ebe9 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/Task/widesea_wms/taskinfo/dt_agvtask_hty.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/Task/widesea_wms/taskinfo/dt_agvtask_hty.vue"
@@ -22,20 +22,21 @@
export default defineComponent({
setup() {
const table = ref({
- key: 'ID',
+ key: 'hty_pkid',
footer: "Foots",
cnName: 'AGV鍘嗗彶浠诲姟',
name: 'taskinfo/dt_agvtask_hty',
url: "/dt_agvtask_hty/",
- sortName: "ID"
+ sortName: "agv_completedate"
});
const editFormFields = ref({});
const editFormOptions = ref([]);
const searchFormFields = ref({"agv_tasknum":"","agv_materielid":"","agv_createtime":"","agv_taskstate":"","agv_fromaddress":"","agv_toaddress":"","agv_operatetype":"","agv_barcode":"","agv_materbarcode":""});
const searchFormOptions = ref([
[{"title":"浠诲姟缂栧彿","field":"agv_tasknum","type":"like"},{"title":"璧风偣鍦板潃","field":"agv_fromaddress","type":"like"},{"title":"缁堢偣鍦板潃","field":"agv_toaddress","type":"like"}],
- [{"title":"宸ュ崟鍙�","field":"jobID","type":"like"},{"dataKey":"agv_tasktypes","data":[],"title":"浠诲姟绫诲瀷","field":"agv_tasktype","type":"selectList"},{"title":"鍒涘缓鏃堕棿","field":"agv_createtime","type":"datetime"}],
- [{"title":"鍥惧彿","field":"agv_materielid","type":"like"},{"title":"杞﹁疆SN鍙�","field":"bindSN","type":"like"},{"dataKey":"operatetypes","data":[],"title":"鎿嶄綔绫诲瀷","field":"agv_operatetype","type":"select"}]
+ [{"title":"宸ヤ綔浠ゅ彿","field":"jobID","type":"like"},{"title":"鍥惧彿","field":"agv_materielid","type":"like"},{"title":"杞﹁疆SN鍙�","field":"bindSN","type":"like"}],
+ [{"dataKey":"Taskstates","data":[],"title":"浠诲姟鐘舵��","field":"agv_taskstate","type":"selectList"},{"dataKey":"agv_tasktypes","data":[],"title":"浠诲姟绫诲瀷","field":"agv_tasktype","type":"selectList"},{"dataKey":"operatetypes","data":[],"title":"鎿嶄綔绫诲瀷","field":"agv_operatetype","type":"select"}],
+ [{"title":"鍒涘缓鏃堕棿","field":"agv_createtime","type":"date"},{"title":"瀹屾垚鏃堕棿","field":"agv_finishedtime","type":"date"},{"title":"鎿嶄綔鏃堕棿","field":"agv_completedate","type":"date"}]
]);
const columns = ref([{field:'hty_pkid',title:'鍘嗗彶浠诲姟ID',type:'guid',width:110,hidden:true,readonly:true,require:true,align:'left'},
{field:'agv_id',title:'浠诲姟ID',type:'guid',width:110,hidden:true,require:true,align:'left'},
--
Gitblit v1.9.3