1.清理无效依赖项

2.修复阅读计划查询结果错误的bug
3.增加ws本地调试环境
4.修改生产环境ws客户端访问地址
master
董哲奇 8 months ago
parent 67715a9ba0
commit 0fce8cfc3a

@ -708,48 +708,6 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' }
},
{
field: 'hxjhrq',
title: '划线计划日期',
width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' }
},
{
field: 'qgjhrq',
title: '切割计划日期',
width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' }
},
{
field: 'zcljhrq',
title: '再处理计划日期',
width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' }
},
{
field: 'sljhrq',
title: '上料计划日期',
width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' }
},
{
field: 'pwjhrq',
title: '抛丸计划日期',
width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' }
},
{
field: 'lljhrq',
title: '理料计划日期',
width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' }
}
],
}
},

@ -145,6 +145,9 @@ export default {
name: "zrcWH",
data() {
return {
uploadData:{
isupload:null,
},
request: {
date: "",
Zt: "0",
@ -153,6 +156,7 @@ export default {
isupload:'02',
heads: { token: getToken() },
uploadAction: process.env.VUE_APP_BASE_API + '/zrcAndPlb/upload',
tmpUploadAction:null,
list: [],
height: "500px",
tableColumn: [
@ -168,7 +172,7 @@ export default {
field: "dcCh",
title: "船号",
align: "center",
minWidth: "70",
width: "90",
filters: [
{
data: {
@ -852,7 +856,7 @@ export default {
label: "审核",
},
],
fileList: [],
fileList: {},
checkedList: [],
ShipNoList: [], //
projectData:[],
@ -868,6 +872,7 @@ export default {
};
},
created() {
this.tmpUploadAction=this.uploadAction
window.addEventListener("resize", this.getHeight);
this.getHeight();
// this.initList();
@ -917,7 +922,7 @@ export default {
},
keyupEvent4() {
if (this.request.dcCh) {
this.projectData = this.projectData1.filter(row => row.project.indexOf(this.request.dcCh.toUpperCase()) > -1)
this.projectData = this.projectData1.filter(row => row.cbbm.indexOf(this.request.dcCh.toUpperCase()) > -1)
} else {
this.projectData = this.projectData1.slice(0)
}
@ -925,13 +930,11 @@ export default {
},
// excel
beforeAvatarUpload(file) {
if (!this.request.dcCh){
this.$message.error('请选择船号')
return false
}
this.uploadAction+= `?dcCh=${this.request.dcCh}`
//
const isType = file.type === 'application/vnd.ms-excel'
const isTypeComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
@ -945,6 +948,7 @@ export default {
},
handleAvatarSuccess(res, file) {
endLoading()
if (res.success) {
this.$message({ message: '导入成功', type: 'success' })
this.list = res.data;
@ -960,6 +964,7 @@ export default {
},
uploadExcel() {
this.uploadData.isupload = this.isupload
this.uploadAction=`${this.tmpUploadAction}?dcCh=${this.request.dcCh}`
},
//
selectAllEvent() {

Loading…
Cancel
Save