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

Merge pull request 'projects/mesxc-zjl' (#210) from projects/mesxc-zjl into projects/mesxc-test

Browse Source 
Reviewed-on: #210
This commit is contained in:
朱菊兰 2024-02-27 09:14:48 +08:00
commit 5c251e6a25
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,7 +70,7 @@
</el-col> </el-col>
<el-col :span='4'> <el-col :span='4'>
<div class="blodTip">废片数量</div> <div class="blodTip">废片数量</div>
<div class="lightTip">该字段未绑定</div> <div class="lightTip">{{orderGroupMsg.nokQuantity}}</div>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
@ -144,7 +144,7 @@
</el-col> </el-col>
<el-col :span='4'> <el-col :span='4'>
<div class="blodTip">废片数量</div> <div class="blodTip">废片数量</div>
<div class="lightTip">该字段未绑定</div> <div class="lightTip">{{item.nokQuantity}}</div>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>

18
src/views/order/base/orderManage/index.vue
View File

@ -401,9 +401,9 @@ export default {
}, },
// 完成,终止，作废 // 完成,终止，作废
handleEditStatus(val, tip, status) { handleEditStatus(val, tip, status) {
console.log(val) let _this = this
if (val.workOrderNum > 0) {//有下级工单 if (val.workOrderNum > 0) {//有下级工单
this.$confirm('是否将"'+tip+'"操作同步至下级工单?','确认信息', { _this.$confirm('是否将"'+tip+'"操作同步至下级工单?','确认信息', {
type: 'warning', type: 'warning',
distinguishCancelAndClose: true, distinguishCancelAndClose: true,
confirmButtonText: '同步', confirmButtonText: '同步',
@ -411,26 +411,26 @@ export default {
}).then(function() { }).then(function() {
console.log('同步') console.log('同步')
orderStatusSet({ id: val.id, status: status, isSync: true}).then(() => { orderStatusSet({ id: val.id, status: status, isSync: true}).then(() => {
this.getList(); _this.getList();
this.$modal.msgSuccess("操作成功"); _this.$modal.msgSuccess("操作成功");
}) })
}).catch(action => { }).catch(action => {
if (action === 'cancel') { if (action === 'cancel') {
console.log('不同步') console.log('不同步')
orderStatusSet({ id: val.id, status: status, isSync: false}).then(() => { orderStatusSet({ id: val.id, status: status, isSync: false}).then(() => {
this.getList(); _this.getList();
this.$modal.msgSuccess("操作成功"); _this.$modal.msgSuccess("操作成功");
}) })
}else { }else {
return console.log('关闭') return console.log('关闭')
} }
}) })
}else{// 无下级工单 }else{// 无下级工单
this.$modal.confirm('是否确认"'+tip+'"厂务订单名称为"' + val.name + '"的数据项?').then(function() { _this.$modal.confirm('是否确认"'+tip+'"厂务订单名称为"' + val.name + '"的数据项?').then(function() {
return orderStatusSet({ id: val.id, status: status}) return orderStatusSet({ id: val.id, status: status})
}).then(() => { }).then(() => {
this.getList(); _this.getList();
this.$modal.msgSuccess("操作成功"); _this.$modal.msgSuccess("操作成功");
}).catch(() => {}); }).catch(() => {});
} }
}, },

2
src/views/order/base/orderManage/orderDetailData.vue
View File

@ -74,7 +74,7 @@
</el-col> </el-col>
<el-col :span='4'> <el-col :span='4'>
<div class="blodTip">废片数量</div> <div class="blodTip">废片数量</div>
<div class="lightTip">该字段未绑定</div> <div class="lightTip">{{orderMsg.nokQuantity}}</div>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>