Merge pull request 'projects/mes-zjl' (#78) from projects/mes-zjl into projects/mes-test

Reviewed-on: #78
This commit is contained in:
朱菊兰 2023-11-15 10:18:22 +08:00
commit 887390cf91
4 changed files with 21 additions and 22 deletions

View File

@ -67,7 +67,8 @@ const tableProps = [
},
{
prop: 'plcTableCode',
label: '关联表编码'
label: '关联表编码',
showOverflowtooltip: true
},
{
prop: 'cnName',

View File

@ -116,6 +116,7 @@ export default {
getGroupClasses(id).then((res) => {
if (res.code === 0) {
this.form = res.data
this.form.disableTime = res.data.disableTime || ''
}
})
} else {
@ -145,22 +146,10 @@ export default {
submitForm() {
this.$refs['form'].validate((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) {
//
updateGroupClasses({ ...obj }).then((res) => {
updateGroupClasses({ ...this.form }).then((res) => {
if (res.code === 0) {
this.$modal.msgSuccess("操作成功");
this.$emit('successSubmit')

View File

@ -203,6 +203,7 @@ export default {
methods: {
init(data, param) {
this.form.orderId = data.id
this.form.orderName = data.name
this.getList()
if (param === 'add') {
this.isBind = false
@ -253,12 +254,20 @@ export default {
})
} 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) {
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)
})
})
}
})
}

View File

@ -350,12 +350,12 @@ export default {
switch (val.type) {
case 'orderDetail':
this.$router.push({
path: '/base/coreWorkOrder/detail?orderId='+val.data.orderid
path: '/core/core-work-order-detail?woIdString='+val.data.woIdString
})
break
case 'qualityDetail':
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
default: