mt-fe-group/yudao-dev
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

订单bug

Browse Source
This commit is contained in:
朱菊兰 2024-02-26 13:18:21 +08:00
parent c5925e54cd
commit 3e89f4066f
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/views/order/base/orderGroup/orderGroupDetailData.vue
View File

@ -44,7 +44,7 @@
</el-col>
<el-col :span='4'>
<div class="blodTip">加工平方数(平方米)</div>
<div class="lightTip">{{orderGroupMsg.actualArea}}</div>
<div class="lightTip">{{orderGroupMsg.planArea}}</div>
</el-col>
<el-col :span='4'>
<div class="blodTip">状态</div>
@ -114,7 +114,7 @@
</el-col>
<el-col :span='4'>
<div class="blodTip">加工平方数(平方米)</div>
<div class="lightTip">{{item.actualArea}}</div>
<div class="lightTip">{{item.planArea}}</div>
</el-col>
<el-col :span='4'>
<div class="blodTip">预计用时(时)</div>
@ -247,7 +247,7 @@ export default {
orderGroupId: '',
tableProps,
orderMsg: [],
tableH: this.tableHeight(510) / 2,
tableH: 150,
// 查询参数
queryParams: {
pageNo: 1,
@ -257,9 +257,6 @@ export default {
}
},
mounted() {
window.addEventListener('resize', () => {
this.tableH = this.tableHeight(510) / 2
})
this.orderGroupId = location.href.split('?')[1].split('=')[1]
this.getMsg()
},

16
src/views/order/base/orderManage/components/addWorkOrder.vue
View File

@ -202,8 +202,8 @@ export default {
processFlowList: [],
productLineList: [],
workOrderTypeList: [
{id: 1,name:'标准工单'},
{id: 2, name:'特殊工单'}
{id: 1,name:'普通'},
{id: 2, name:'特殊'}
],
planStartTime: '',
planFinishTime: '',
@ -291,12 +291,12 @@ export default {
_this.$modal.msgSuccess("操作成功")
let name = this.form.name
_this.$emit('addWorkOrderSubmit')
// 询问是否添加预使用主原料
_this.$modal.confirm('是否添加预使用主原料信息?').then(function() {
_this.$router.push({
path: '/core/core-work-order?workOrderName='+encodeURI(name)
})
})
// // 询问是否添加预使用主原料
// _this.$modal.confirm('是否添加预使用主原料信息?').then(function() {
// _this.$router.push({
// path: '/core/core-work-order?workOrderName='+encodeURI(name)
// })
// })
}
})
} else {