projects/mesxc-zjl #210

Sloučený
juzi sloučil 2 commity z větve projects/mesxc-zjl do větve projects/mesxc-test před 2024-02-27 09:14:50 +08:00
3 změnil soubory, kde provedl 12 přidání a 12 odebrání

Zobrazit soubor

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

Zobrazit soubor

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

Zobrazit soubor

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