分支自 SuZhouGuanHong/TaiYuanTaiZhong
上一版本: 29691ff2 | 补丁 | 提交 | 忽略空白
dengjunjie
2024-05-23 663995bb11e71fa2960cc388d9e0bad6b9257439 
优化前端页面
已修改4个文件
17 ■■■■■ 文件已修改
代码管理/PCS/WCS_Client/src/views/widesea_wcs/tomes/VV_Workinfo.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WMS/WMS_Client/src/api/http.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WMS/WMS_Client/src/views/Task/widesea_wms/taskinfo/dt_agvtask.vue 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WMS/WMS_Client/src/views/Task/widesea_wms/taskinfo/dt_agvtask_hty.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 ´úÂë¹ÜÀí/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'},




 ´úÂë¹ÜÀí/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/';




 ´úÂë¹ÜÀí/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'},




 ´úÂë¹ÜÀí/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'},