projects/mes-zjl
en projects/mes-test
hace 10 meses
@@ -67,7 +67,8 @@ const tableProps = [ | |||||
}, | }, | ||||
{ | { | ||||
prop: 'plcTableCode', | prop: 'plcTableCode', | ||||
label: '关联表编码' | |||||
label: '关联表编码', | |||||
showOverflowtooltip: true | |||||
}, | }, | ||||
{ | { | ||||
prop: 'cnName', | prop: 'cnName', | ||||
@@ -116,6 +116,7 @@ export default { | |||||
getGroupClasses(id).then((res) => { | getGroupClasses(id).then((res) => { | ||||
if (res.code === 0) { | if (res.code === 0) { | ||||
this.form = res.data | this.form = res.data | ||||
this.form.disableTime = res.data.disableTime || '' | |||||
} | } | ||||
}) | }) | ||||
} else { | } else { | ||||
@@ -145,22 +146,10 @@ export default { | |||||
submitForm() { | submitForm() { | ||||
this.$refs['form'].validate((valid) => { | this.$refs['form'].validate((valid) => { | ||||
if (valid) { | if (valid) { | ||||
let obj = {} | |||||
if (this.form.disableTime) { | |||||
obj = this.form | |||||
} else { | |||||
obj.id = this.form.id | |||||
obj.name = this.form.name | |||||
obj.code = this.form.code | |||||
obj.enableTime = this.form.enableTime | |||||
obj.startTime = this.form.startTime | |||||
obj.endTime = this.form.endTime | |||||
obj.daySpan = this.form.daySpan | |||||
obj.remark = this.form.remark | |||||
} | |||||
this.form.disableTime = this.form.disableTime || '' | |||||
if (this.isEdit) { | if (this.isEdit) { | ||||
//编辑 | //编辑 | ||||
updateGroupClasses({ ...obj }).then((res) => { | |||||
updateGroupClasses({ ...this.form }).then((res) => { | |||||
if (res.code === 0) { | if (res.code === 0) { | ||||
this.$modal.msgSuccess("操作成功"); | this.$modal.msgSuccess("操作成功"); | ||||
this.$emit('successSubmit') | this.$emit('successSubmit') | ||||
@@ -203,6 +203,7 @@ export default { | |||||
methods: { | methods: { | ||||
init(data, param) { | init(data, param) { | ||||
this.form.orderId = data.id | this.form.orderId = data.id | ||||
this.form.orderName = data.name | |||||
this.getList() | this.getList() | ||||
if (param === 'add') { | if (param === 'add') { | ||||
this.isBind = false | this.isBind = false | ||||
@@ -253,12 +254,20 @@ export default { | |||||
}) | }) | ||||
} else { | } else { | ||||
// 新增工单 | // 新增工单 | ||||
this.form.planStartTime = this.planStartTime ? new Date(this.planStartTime).valueOf() : '' | |||||
this.form.planFinishTime = this.planFinishTime ? new Date(this.planFinishTime).valueOf() : '' | |||||
orderIssue({ ...this.form }).then(res => { | |||||
let _this = this | |||||
_this.form.planStartTime = _this.planStartTime ? new Date(_this.planStartTime).valueOf() : '' | |||||
_this.form.planFinishTime = _this.planFinishTime ? new Date(_this.planFinishTime).valueOf() : '' | |||||
orderIssue({ ..._this.form }).then(res => { | |||||
if (res.code === 0) { | if (res.code === 0) { | ||||
this.$modal.msgSuccess("操作成功") | |||||
this.$emit('addWorkOrderSubmit') | |||||
_this.$modal.msgSuccess("操作成功") | |||||
let name = this.form.orderName | |||||
_this.$emit('addWorkOrderSubmit') | |||||
// 询问是否添加预使用主原料 | |||||
_this.$modal.confirm('是否添加预使用主原料信息?').then(function() { | |||||
_this.$router.push({ | |||||
path: '/core/core-work-order?orderName='+encodeURI(name) | |||||
}) | |||||
}) | |||||
} | } | ||||
}) | }) | ||||
} | } | ||||
@@ -350,12 +350,12 @@ export default { | |||||
switch (val.type) { | switch (val.type) { | ||||
case 'orderDetail': | case 'orderDetail': | ||||
this.$router.push({ | this.$router.push({ | ||||
path: '/base/coreWorkOrder/detail?orderId='+val.data.orderid | |||||
path: '/core/core-work-order-detail?woIdString='+val.data.woIdString | |||||
}) | }) | ||||
break | break | ||||
case 'qualityDetail': | case 'qualityDetail': | ||||
this.$router.push({ | this.$router.push({ | ||||
path: '/quality/base/quality-inspection-data/detection-information/statistical-data?woIdString='+val.data.woIdString, | |||||
path: '/quality/base/quality-inspection-data/detection-information/statistical-data?woIdString='+val.data.woIdString | |||||
}) | }) | ||||
break | break | ||||
default: | default: | ||||