工艺问题修改

dev-scheduling
zhangdi 3 weeks ago
parent 55a6fab221
commit 6e0d29e59e
  1. 13
      src/views/processManagement/components/processMainte/dsPartBasicInfo.vue
  2. 2
      src/views/productionManagement/workReportingManagement/workRecord.vue
  3. 1
      src/views/system/menu.vue
  4. 2
      src/views/workRate/index.vue

@ -794,11 +794,10 @@ export default {
}, },
// //
getPartDetails() { getPartDetails() {
let query_ = {} let query_ = {};
if (!this.updateRow.partVersion) { if (!this.updateRow.partVersion) {
query_ = { taskId: this.updateRow.id, version: this.updateRow.version }; query_ = { taskId: this.updateRow.id, version: this.updateRow.version };
} } else {
else{
query_ = { version: this.updateRow.partVersion, partCode: this.updateRow.partCode }; query_ = { version: this.updateRow.partVersion, partCode: this.updateRow.partCode };
} }
getPartDetail(query_).then(res => { getPartDetail(query_).then(res => {
@ -933,20 +932,22 @@ export default {
if (this.formData.plateCode || this.formData.plateThickness) { if (this.formData.plateCode || this.formData.plateThickness) {
if (!this.formData.plateGoodsCode) { if (!this.formData.plateGoodsCode) {
isReturn = true; isReturn = true;
this.submitLoading = false this.submitLoading = false;
} }
} }
if (this.partType == '烧结') {
if (isReturn && this.notSinTer) { if (isReturn && this.notSinTer) {
this.submitLoading = false; this.submitLoading = false;
return this.$message.warning('请选择镀层物料'); return this.$message.warning('请选择物料编码');
} }
}
if (this.formData.craftWay.indexOf('涂色') != -1) { if (this.formData.craftWay.indexOf('涂色') != -1) {
if ( if (
this.formData.tsdNum === null && this.formData.tsdNum === null &&
this.formData.tsbNum === null && this.formData.tsbNum === null &&
this.formData.tjtNum === null this.formData.tjtNum === null
) { ) {
this.submitLoading = false; this.submitLoading = false;
return this.$message.warning('一级路线包含涂色,请填写涂色数据'); return this.$message.warning('一级路线包含涂色,请填写涂色数据');
} }

@ -228,7 +228,7 @@ export default {
width:150, width:150,
}, },
{ {
label: '调整人', label: '报工人',
prop: 'workerName', prop: 'workerName',
search: false, search: false,
sortable: true, sortable: true,

@ -81,6 +81,7 @@ export default {
searchShow: true, searchShow: true,
searchMenuSpan: 6, searchMenuSpan: 6,
dialogWidth: '60%', dialogWidth: '60%',
height:'auto',
tree: true, tree: true,
border: true, border: true,
index: true, index: true,

@ -7,7 +7,7 @@
@close="closeDialog" @close="closeDialog"
fullscreen fullscreen
> >
<el-collapse v-model="activeName" accordion> <el-collapse v-model="activeName" >
<el-collapse-item title="订单信息" name="1"> <el-collapse-item title="订单信息" name="1">
<template #title="{ isActive }"> 订单信息 </template> <template #title="{ isActive }"> 订单信息 </template>
<div class="order-box"> <div class="order-box">

Loading…
Cancel
Save