wilson
/
ha-mes-vue
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

代码优化

master
ZuoWen 4 years ago
parent
b0c99b1859
commit
42221fb40e
1 changed files with 127 additions and 118 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 107
      src/views/modules/production/generateReport.vue

107
src/views/modules/production/generateReport.vue
View File

@ -267,7 +267,7 @@
import {
getGenerateReportList
, saveGenerateReport
} from "@/api/production/generateReport.js"
} from '@/api/production/generateReport.js'
import Chooselist from '@/views/modules/common/Chooselist'
export default {
@ -281,7 +281,7 @@
reviewFlag: false,
saveButton: false,
readonlyFlag: false,
disabled : false,
disabled: false
},
saveHeaderData: {
site: '',
@ -306,27 +306,27 @@
manufacturingTime: 0,
cleaningTime: 0,
shutdownReason: '',
remark : '',
remark: ''
},
site: this.$store.state.user.site,
operatorType: 0,
// 导出 start
exportData: [],
exportDataStandard: {
"日计划单号": "orderNo",
"计划日期": "orderDate",
"订单号": "orderRef1",
"物料编码": "partNo",
"物料名称": "partDescription",
"计划数量": "orderQty",
"已完工数": "qtyfinished",
"录入人": "userName",
"录入时间": "enterDate"
'日计划单号': 'orderNo',
'计划日期': 'orderDate',
'订单号': 'orderRef1',
'物料编码': 'partNo',
'物料名称': 'partDescription',
'计划数量': 'orderQty',
'已完工数': 'qtyfinished',
'录入人': 'userName',
'录入时间': 'enterDate'
},
exportName: "日计划列表"+this.getStrDate(),
exportHeader: ["日计划列表"],
exportName: '日计划列表' + this.getStrDate(),
exportHeader: ['日计划列表'],
exportFooter: [],
exportDefaultValue: "这一行这一列没有数据",
exportDefaultValue: '这一行这一列没有数据',
// 导出 end
height: 200,
tableData: [],
@ -335,55 +335,67 @@
orderNo: '',
workCenterNo: '',
partNo: '',
site:this.$store.state.user.site,
},
site: this.$store.state.user.site
}
}
},
mounted () {
this.$nextTick(() => {
this.height = window.innerHeight - 210;
this.height = window.innerHeight - 210
})
},
methods: {
saveReport () {
if (this.saveHeaderData.qtyReported == null || this.saveHeaderData.qtyReported <= 0) {
this.$alert("报告数量错误！", '错误信息', {
this.$alert('报告数量错误！', '错误信息', {
confirmButtonText: '确定'
})
return
}
if (this.saveHeaderData.qtyApprove == null || this.saveHeaderData.qtyApprove <= 0) {
this.$alert("合格数量错误！", '错误信息', {
this.$alert('合格数量错误！', '错误信息', {
confirmButtonText: '确定'
})
return
}
if (this.saveHeaderData.qtyRework == null || this.saveHeaderData.qtyRework <= 0) {
this.$alert("返工数量错误！", '错误信息', {
this.$alert('返工数量错误！', '错误信息', {
confirmButtonText: '确定'
})
return
}
if (this.saveHeaderData.preparationTime == null || this.saveHeaderData.preparationTime <= 0) {
this.$alert("准备时间错误！", '错误信息', {
this.$alert('准备时间错误！', '错误信息', {
confirmButtonText: '确定'
})
return
}
if (this.saveHeaderData.manufacturingTime == null || this.saveHeaderData.manufacturingTime <= 0) {
this.$alert("制造时间错误！", '错误信息', {
this.$alert('制造时间错误！', '错误信息', {
confirmButtonText: '确定'
})
return
}
if (this.saveHeaderData.cleaningTime == null || this.saveHeaderData.cleaningTime <= 0) {
this.$alert("清理时间错误！", '错误信息', {
this.$alert('清理时间错误！', '错误信息', {
confirmButtonText: '确定'
})
return
}
if (parseFloat(this.saveHeaderData.qtyApprove) > parseFloat(this.saveHeaderData.qtyReported)) {
this.$alert('合格数量大于报告数量！', '错误信息', {
confirmButtonText: '确定'
})
return
}
if(this.saveHeaderData.qtyApprove > this.saveHeaderData.qtyReported){
this.$alert("合格数量大于报告数量！", '错误信息', {
if (this.saveHeaderData.planStartTime == null || this.saveHeaderData.planStartTime === '') {
this.$alert('请选择生产日期！', '错误信息', {
confirmButtonText: '确定'
})
return
}
if (this.saveHeaderData.planFinishTime == null || this.saveHeaderData.planFinishTime === '') {
this.$alert('请选择报告日期！', '错误信息', {
confirmButtonText: '确定'
})
return
@ -404,7 +416,7 @@
getBaseList (val, type) {
this.tagNo = val
this.$nextTick(() => {
let strVal = "";
let strVal = ''
if (val === 24) {
strVal = this.searchData.workCenterNo
} else if (val === 26) {
@ -422,45 +434,44 @@
getBaseData (val) {
console.log(val)
if (this.tagNo === 24) {
this.searchData.workCenterNo = val.WorkCenterNo;
this.searchData.workCenterNo = val.WorkCenterNo
} else if (this.tagNo === 26) {
if (this.operatorType === 1) {
this.saveHeaderData.operatorId = val.OperatorID;
this.saveHeaderData.operatorName = val.OperatorName;
this.saveHeaderData.operatorId = val.OperatorID
this.saveHeaderData.operatorName = val.OperatorName
} else if (this.operatorType === 2) {
this.saveHeaderData.operatorId2 = val.OperatorID;
this.saveHeaderData.operatorIdName2 = val.OperatorName;
this.saveHeaderData.operatorId2 = val.OperatorID
this.saveHeaderData.operatorIdName2 = val.OperatorName
}
} else if (this.tagNo === 5) {
this.searchData.partNo = val.PartNo;
this.searchData.partNo = val.PartNo
}
},
initReportModal (row) {
this.setUp.reviewFlag = true
this.setUp.disabled = true
let currentData = JSON.parse(JSON.stringify(row));
let currentData = JSON.parse(JSON.stringify(row))
this.saveHeaderData.site = currentData.site
this.saveHeaderData.orderNo = currentData.orderNo
this.saveHeaderData.itemNo = currentData.itemNo
this.saveHeaderData.operationDesc = currentData.operationDesc
this.saveHeaderData.partNo = currentData.partNo
this.saveHeaderData.partDescription = currentData.partDescription + "/" + currentData.spec
this.saveHeaderData.partDescription = currentData.partDescription + '/' + currentData.spec
this.saveHeaderData.workCenterNo = currentData.workCenterNo
this.saveHeaderData.workCenterDesc = currentData.workCenterDesc
this.saveHeaderData.planFinishTime = this.dayjs(new Date()).format('YYYY-MM-DD 00:00:00')
this.saveHeaderData.planStartTime = this.dayjs(new Date()).format('YYYY-MM-DD 00:00:00')
},
closeDialog () {
Object.assign(this.$data.saveHeaderData, this.$options.data.call(this).saveHeaderData);
Object.assign(this.$data.saveHeaderData, this.$options.data.call(this).saveHeaderData)
},
search () {
getGenerateReportList(this.searchData).then(({data}) => {
this.tableData = data.rows;
this.tableData = data.rows
})
},
createExportData () {
return this.tableData;
return this.tableData
},
startDownload () {
// this.exportData = this.dataList
@ -470,18 +481,16 @@
},
getStrDate () {
let dd = new Date();
let Y = dd.getFullYear();
let M = (dd.getMonth() + 1) < 10 ? "0" + (dd.getMonth() + 1) : (dd.getMonth() + 1);//获取当前月份的日期，不足10补0
let D = dd.getDate() < 10 ? "0" + dd.getDate() : dd.getDate();//获取当前几号，不足10补0
let H = dd.getHours() < 10 ? "0" + dd.getHours() : dd.getHours();
let MM = dd.getMinutes() < 10 ? "0" + dd.getMinutes() : dd.getMinutes();
let S = dd.getSeconds() < 10 ? "0" + dd.getSeconds() : dd.getSeconds();
return Y + M + D + H + MM + S;
let dd = new Date()
let Y = dd.getFullYear()
let M = (dd.getMonth() + 1) < 10 ? '0' + (dd.getMonth() + 1) : (dd.getMonth() + 1)// 获取当前月份的日期，不足10补0
let D = dd.getDate() < 10 ? '0' + dd.getDate() : dd.getDate()// 获取当前几号，不足10补0
let H = dd.getHours() < 10 ? '0' + dd.getHours() : dd.getHours()
let MM = dd.getMinutes() < 10 ? '0' + dd.getMinutes() : dd.getMinutes()
let S = dd.getSeconds() < 10 ? '0' + dd.getSeconds() : dd.getSeconds()
return Y + M + D + H + MM + S
}
},
created () {
}

Write Preview
Loading…
Cancel
Save