wilson
/
ccl_plm-vue
0
1
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

2026-07-14 

RoHS优化
master
fengyuan_yang 2 weeks ago
parent
c91e107f2b
commit
3d4a4b069d
1 changed files with 45 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 64
      src/views/modules/rohs/rohsRecord.vue

64
src/views/modules/rohs/rohsRecord.vue
View File

@ -764,8 +764,8 @@
</el-form>
<el-form :inline="true" label-position="top" :model="rohsCreatePartData">
<el-form-item>
<span slot="label">商品组1 / Comm Group 1</span>
<el-input v-model="rohsCreatePartData.productGroupId1" readonly style="width: 128px"></el-input>
<span style="cursor: pointer" slot="label" @click="openRohsCreatePartBaseList(110)"><a herf="#">商品组1 / Comm Group 1</a></span>
<el-input v-model="rohsCreatePartData.productGroupId1" clearable @blur="rohsCreateProductGroupId1Blur(110)" style="width: 128px"></el-input>
<el-input v-model="rohsCreatePartData.productGroupName1" disabled style="width: 327px"></el-input>
</el-form-item>
<el-form-item>
@ -776,8 +776,8 @@
</el-form>
<el-form :inline="true" label-position="top" :model="rohsCreatePartData">
<el-form-item>
<span slot="label">商品组2 / Comm Group 2</span>
<el-input v-model="rohsCreatePartData.productGroupId2" readonly style="width: 128px"></el-input>
<span style="cursor: pointer" slot="label" @click="openRohsCreatePartBaseList(111)"><a herf="#">商品组2 / Comm Group 2</a></span>
<el-input v-model="rohsCreatePartData.productGroupId2" clearable @blur="rohsCreateProductGroupId2Blur(111)" style="width: 128px"></el-input>
<el-input v-model="rohsCreatePartData.productGroupName2" disabled style="width: 327px"></el-input>
</el-form-item>
<el-form-item label="类型指定 / Type Designation">
@ -785,8 +785,9 @@
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="rohsCreatePartData">
<el-form-item label="商品组3 / Comm Group 3">
<el-input v-model="rohsCreatePartData.commGroup3" readonly style="width: 128px"></el-input>
<el-form-item>
<span style="cursor: pointer" slot="label" @click="openRohsCreatePartBaseList(130)"><a herf="#">商品组3 / Comm Group 3</a></span>
<el-input v-model="rohsCreatePartData.commGroup3" clearable @blur="rohsCreateCommGroup3Blur(130)" style="width: 128px"></el-input>
<el-input v-model="rohsCreatePartData.commGroup3Desc" disabled style="width: 327px"></el-input>
</el-form-item>
</el-form>
@ -2357,9 +2358,6 @@ export default {
return this.rohsFieldFlag(fieldId) === 'N'
},
isProcessFieldDisabled () {
if (this.isEditMode) {
return true
}
return this.isRohsFieldDisabled('process')
},
handleProcessChange (value) {
@ -3741,9 +3739,9 @@ export default {
this.syncHsfApproverFields()
this.fillDisplayFields(this.modalData, row || {})
this.applyHsfStandardDefaultByCustomer(this.modalData)
// 编辑时不允许修改最终客户和项目编码
this.$set(this.modalData, 'endCustomerFlag', true)
this.$set(this.modalData, 'projectIdFlag', true)
// 编辑时默认可修改工艺、最终客户和项目编码（若流程管控不可编辑则以流程为准）
this.$set(this.modalData, 'endCustomerFlag', false)
this.$set(this.modalData, 'projectIdFlag', false)
this.$set(this.modalData, 'createBy2', '')
this.$set(this.modalData, 'isReject', 'Y')
this.$set(this.modalData, 'tpProcessControl', 'N')
@ -3853,6 +3851,10 @@ export default {
this.$message.warning('当前状态不允许保存')
return
}
if (!String(this.modalData.process || '').trim()) {
this.$message.warning('工艺不能为空')
return
}
const isAddMode = this.modalTitle === 'RoHS 新增'
if (isAddMode && !String(this.modalData.endCustomer || '').trim()) {
this.$message.warning('最终客户不能为空')
@ -4245,6 +4247,10 @@ export default {
strVal = this.rohsCreatePartData.familyId
} else if (tagNo === 109) {
strVal = this.rohsCreatePartData.groupId
} else if (tagNo === 110) {
strVal = this.rohsCreatePartData.productGroupId1
} else if (tagNo === 111) {
strVal = this.rohsCreatePartData.productGroupId2
} else if (tagNo === 112) {
strVal = this.rohsCreatePartData.productGroupId3
} else if (tagNo === 113) {
@ -4263,6 +4269,8 @@ export default {
strVal = this.rohsCreatePartData.regionOfOrigin
} else if (tagNo === 129) {
strVal = this.rohsCreatePartData.customsStatNo
} else if (tagNo === 130) {
strVal = this.rohsCreatePartData.commGroup3
} else if (tagNo === 131) {
strVal = this.rohsCreatePartData.partCostGroupId
} else if (tagNo === 20) {
@ -4283,6 +4291,12 @@ export default {
} else if (this.rohsCreatePartTagNo === 109) {
this.rohsCreatePartData.groupId = val.group_id
this.rohsCreatePartData.groupName = val.group_name
} else if (this.rohsCreatePartTagNo === 110) {
this.rohsCreatePartData.productGroupId1 = val.product_group_id
this.rohsCreatePartData.productGroupName1 = val.product_group_name
} else if (this.rohsCreatePartTagNo === 111) {
this.rohsCreatePartData.productGroupId2 = val.product_group_id
this.rohsCreatePartData.productGroupName2 = val.product_group_name
} else if (this.rohsCreatePartTagNo === 112) {
this.rohsCreatePartData.productGroupId3 = val.product_group_id
this.rohsCreatePartData.productGroupName3 = val.product_group_name
@ -4310,6 +4324,9 @@ export default {
} else if (this.rohsCreatePartTagNo === 129) {
this.rohsCreatePartData.customsStatNo = val.customs_stat_no
this.rohsCreatePartData.customsStatDesc = val.customs_stat_desc
} else if (this.rohsCreatePartTagNo === 130) {
this.rohsCreatePartData.commGroup3 = val.product_group_id
this.rohsCreatePartData.commGroup3Desc = val.product_group_name
} else if (this.rohsCreatePartTagNo === 131) {
this.rohsCreatePartData.partCostGroupId = val.part_cost_group_id
this.rohsCreatePartData.partCostGroupDesc = val.part_cost_group_desc
@ -4355,9 +4372,18 @@ export default {
rohsCreateProductGroupId4Blur (tagNo) {
this.rohsCreateBaseFieldBlur(tagNo, 'productGroupId4', 'productGroupName4', 'product_group_id', 'product_group_id', 'product_group_name')
},
rohsCreateProductGroupId1Blur (tagNo) {
this.rohsCreateBaseFieldBlur(tagNo, 'productGroupId1', 'productGroupName1', 'product_group_id', 'product_group_id', 'product_group_name')
},
rohsCreateProductGroupId2Blur (tagNo) {
this.rohsCreateBaseFieldBlur(tagNo, 'productGroupId2', 'productGroupName2', 'product_group_id', 'product_group_id', 'product_group_name')
},
rohsCreateProductGroupId3Blur (tagNo) {
this.rohsCreateBaseFieldBlur(tagNo, 'productGroupId3', 'productGroupName3', 'product_group_id', 'product_group_id', 'product_group_name')
},
rohsCreateCommGroup3Blur (tagNo) {
this.rohsCreateBaseFieldBlur(tagNo, 'commGroup3', 'commGroup3Desc', 'product_group_id', 'product_group_id', 'product_group_name')
},
rohsCreateUmIdBlur (tagNo) {
this.rohsCreateBaseFieldBlur(tagNo, 'umId', 'umName', 'um_id', 'um_id', 'um_name', false)
},
@ -4540,7 +4566,7 @@ export default {
return false
}
if (!this.rohsCreatePartData.productGroupId1 || !this.rohsCreatePartData.productGroupId2) {
this.$message.warning('请先在RoHS单据中维护商品组1/2')
this.$message.warning('请选择商品组1/2')
return false
}
if (!this.rohsCreatePartData.productGroupId3) {
@ -4585,14 +4611,14 @@ export default {
createBy: this.$store.state.user.name || '',
updateBy: this.$store.state.user.name || '',
partDesc: (this.rohsCreatePartData.partDesc || '').trim(),
productGroupId1: this.modalData.commGroup1 || this.rohsCreatePartData.productGroupId1,
productGroupName1: this.modalData.commGroup1Desc || this.rohsCreatePartData.productGroupName1,
productGroupId2: this.modalData.commGroup2 || this.rohsCreatePartData.productGroupId2,
productGroupName2: this.modalData.commGroup2Desc || this.rohsCreatePartData.productGroupName2,
productGroupId1: this.rohsCreatePartData.productGroupId1,
productGroupName1: this.rohsCreatePartData.productGroupName1,
productGroupId2: this.rohsCreatePartData.productGroupId2,
productGroupName2: this.rohsCreatePartData.productGroupName2,
productGroupId3: this.rohsCreatePartData.productGroupId3,
productGroupName3: this.rohsCreatePartData.productGroupName3,
commGroup3: this.modalData.commGroup3 || this.rohsCreatePartData.commGroup3,
commGroup3Desc: this.modalData.commGroup3Desc || this.rohsCreatePartData.commGroup3Desc,
commGroup3: this.rohsCreatePartData.commGroup3,
commGroup3Desc: this.rohsCreatePartData.commGroup3Desc,
status: 'Y',
showInQueryFlag: 'Y',
temporaryPartFlag: 'N',

Write Preview
Loading…
Cancel
Save