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

2025-06-07 

基本信息中的审批人员改名TP工程师
数量可以为0 - 管控去掉
报废金额可以为0 - 管控去掉
取消勾选后，需要清空
master
fengyuan_yang 7 months ago
parent
7cf610d502
commit
729f41ea31
2 changed files with 70 additions and 95 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. 84
      src/views/modules/changeManagement/changeRecord.vue
  2. 81
      src/views/modules/changeManagement/changeRequest.vue

84
src/views/modules/changeManagement/changeRecord.vue
View File

@ -141,8 +141,8 @@
<el-button :disabled="changeRequestFlag('ecnType') === 'N'" type="primary" @click="chooseEcnTypeModal" style="width: 84px">ECN种类</el-button>
</el-form-item>
<el-form-item prop="tpEngineerId" :rules="rules.tpEngineerId">
<span v-if="changeRequestFlag('tpEngineerId') === 'N'" slot="label">审批人员</span>
<span v-else style="cursor: pointer" slot="label" @click="getBaseList(2005)"><a herf="#">审批人员</a></span>
<span v-if="changeRequestFlag('tpEngineerId') === 'N'" slot="label">TP工程师</span>
<span v-else style="cursor: pointer" slot="label" @click="getBaseList(2005)"><a herf="#">TP工程师</a></span>
<el-input v-model="modalData.tpEngineerId" @blur="tpEngineerBlur(2005)" :disabled="changeRequestFlag('tpEngineerId') === 'N'" style="width: 120px"></el-input>
<el-input v-model="modalData.tpEngineerName" disabled style="width: 293px"></el-input>
</el-form-item>
@ -1448,11 +1448,45 @@
}
}
},
uploadDialog (newValue,oldValue) {
if (newValue === false) {
this.getChangeFileList()
}
},
'costImpactData.productionProductFlag': function(newVal) {
if (newVal !== 'Y') {
this.costImpactData.productionProductNumber = ''
this.costImpactData.productionProductOpinions = ''
this.costImpactData.productionProductScrapAmount = 0
this.costImpactData.productionProductExecutor = ''
this.costImpactData.productionProductExecutorName = ''
}
},
'costImpactData.inventoryProductFlag': function(newVal) {
if (newVal !== 'Y') {
this.costImpactData.inventoryProductNumber = ''
this.costImpactData.inventoryProductOpinions = ''
this.costImpactData.inventoryProductScrapAmount = 0
this.costImpactData.inventoryProductExecutor = ''
this.costImpactData.inventoryProductExecutorName = ''
}
},
'costImpactData.newOrderFlag': function(newVal) {
if (newVal !== 'Y') {
this.costImpactData.newOrderNumber = ''
}
},
'costImpactData.affectedFlag': function(newVal) {
if (newVal !== 'Y') {
this.costImpactData.affectedNumber = ''
this.costImpactData.affectedOpinions = ''
this.costImpactData.affectedScrapAmount = 0
this.costImpactData.affectedExecutor = ''
this.costImpactData.affectedExecutorName = ''
}
},
},
data () {
@ -4007,76 +4041,30 @@
// }
if (this.costImpactData.productionProductFlag === 'Y') { // 在生产品
if (this.costImpactData.productionProductNumber == null || this.costImpactData.productionProductNumber === '') {
this.$message.warning('请填写在生产品数量！')
return
}
if (this.costImpactData.productionProductNumber <= 0) {
this.$message.warning('在生产品数量不能小于等于0！')
return
}
if (this.costImpactData.productionProductOpinions == null || this.costImpactData.productionProductOpinions === '') {
this.$message.warning('请填写在生产品处理意见！')
return
}
if (this.costImpactData.productionProductScrapAmount === 0) {
this.$message.warning('请填写在生产品报废金额！')
return
}
if (this.costImpactData.productionProductExecutor == null || this.costImpactData.productionProductExecutor === '') {
this.$message.warning('请填写在生产品执行人！')
return
}
}
if (this.costImpactData.inventoryProductFlag === 'Y') { // 成品库存
if (this.costImpactData.inventoryProductNumber == null || this.costImpactData.inventoryProductNumber === '') {
this.$message.warning('请填写成品库存数量！')
return
}
if (this.costImpactData.inventoryProductNumber <= 0) {
this.$message.warning('成品库存数量不能小于等于0！')
return
}
if (this.costImpactData.inventoryProductOpinions == null || this.costImpactData.inventoryProductOpinions === '') {
this.$message.warning('请填写成品库存处理意见！')
return
}
if (this.costImpactData.inventoryProductScrapAmount === 0) {
this.$message.warning('请填写成品库存报废金额！')
return
}
if (this.costImpactData.inventoryProductExecutor == null || this.costImpactData.inventoryProductExecutor === '') {
this.$message.warning('请填写成品库存执行人！')
return
}
}
if (this.costImpactData.newOrderFlag === 'Y') { // 新订单
if (this.costImpactData.newOrderNumber == null || this.costImpactData.newOrderNumber === '') {
this.$message.warning('请填写新订单数量！')
return
}
if (this.costImpactData.newOrderNumber <= 0) {
this.$message.warning('新订单数量不能小于等于0！')
return
}
}
if (this.costImpactData.affectedFlag === 'Y') { // 影响的原材料及其库存量
if (this.costImpactData.affectedNumber == null || this.costImpactData.affectedNumber === '') {
this.$message.warning('请填写影响的原材料及其库存量数量！')
return
}
if (this.costImpactData.affectedNumber <= 0) {
this.$message.warning('影响的原材料及其库存量数量不能小于等于0！')
return
}
if (this.costImpactData.affectedOpinions == null || this.costImpactData.affectedOpinions === '') {
this.$message.warning('请填写影响的原材料及其库存量处理意见！')
return
}
if (this.costImpactData.affectedScrapAmount === 0) {
this.$message.warning('请填写影响的原材料及其库存量报废金额！')
return
}
if (this.costImpactData.affectedExecutor == null || this.costImpactData.affectedExecutor === '') {
this.$message.warning('请填写影响的原材料及其库存量执行人！')
return

81
src/views/modules/changeManagement/changeRequest.vue
View File

@ -149,7 +149,7 @@
<el-button type="primary" @click="chooseEcnTypeModal" style="width: 84px">ECN种类</el-button>
</el-form-item>
<el-form-item prop="tpEngineerId" :rules="rules.tpEngineerId">
<span style="cursor: pointer" slot="label" @click="getBaseList(2005)"><a herf="#">审批人员</a></span>
<span style="cursor: pointer" slot="label" @click="getBaseList(2005)"><a herf="#">TP工程师</a></span>
<el-input v-model="modalData.tpEngineerId" @blur="tpEngineerBlur(2005)" style="width: 120px"></el-input>
<el-input v-model="modalData.tpEngineerName" disabled style="width: 293px"></el-input>
</el-form-item>
@ -939,6 +939,39 @@
}
}
},
'costImpactData.productionProductFlag': function(newVal) {
if (newVal !== 'Y') {
this.costImpactData.productionProductNumber = ''
this.costImpactData.productionProductOpinions = ''
this.costImpactData.productionProductScrapAmount = 0
this.costImpactData.productionProductExecutor = ''
this.costImpactData.productionProductExecutorName = ''
}
},
'costImpactData.inventoryProductFlag': function(newVal) {
if (newVal !== 'Y') {
this.costImpactData.inventoryProductNumber = ''
this.costImpactData.inventoryProductOpinions = ''
this.costImpactData.inventoryProductScrapAmount = 0
this.costImpactData.inventoryProductExecutor = ''
this.costImpactData.inventoryProductExecutorName = ''
}
},
'costImpactData.newOrderFlag': function(newVal) {
if (newVal !== 'Y') {
this.costImpactData.newOrderNumber = ''
}
},
'costImpactData.affectedFlag': function(newVal) {
if (newVal !== 'Y') {
this.costImpactData.affectedNumber = ''
this.costImpactData.affectedOpinions = ''
this.costImpactData.affectedScrapAmount = 0
this.costImpactData.affectedExecutor = ''
this.costImpactData.affectedExecutorName = ''
}
},
},
data() {
return {
@ -2460,76 +2493,30 @@
}
// 库存成本影响校验
if (this.costImpactData.productionProductFlag === 'Y') { // 在生产品
if (this.costImpactData.productionProductNumber == null || this.costImpactData.productionProductNumber === '') {
this.$message.warning('请填写在生产品数量！')
return
}
if (this.costImpactData.productionProductNumber <= 0) {
this.$message.warning('在生产品数量不能小于等于0！')
return
}
if (this.costImpactData.productionProductOpinions == null || this.costImpactData.productionProductOpinions === '') {
this.$message.warning('请填写在生产品处理意见！')
return
}
if (this.costImpactData.productionProductScrapAmount === 0) {
this.$message.warning('请填写在生产品报废金额！')
return
}
if (this.costImpactData.productionProductExecutor == null || this.costImpactData.productionProductExecutor === '') {
this.$message.warning('请填写在生产品执行人！')
return
}
}
if (this.costImpactData.inventoryProductFlag === 'Y') { // 成品库存
if (this.costImpactData.inventoryProductNumber == null || this.costImpactData.inventoryProductNumber === '') {
this.$message.warning('请填写成品库存数量！')
return
}
if (this.costImpactData.inventoryProductNumber <= 0) {
this.$message.warning('成品库存数量不能小于等于0！')
return
}
if (this.costImpactData.inventoryProductOpinions == null || this.costImpactData.inventoryProductOpinions === '') {
this.$message.warning('请填写成品库存处理意见！')
return
}
if (this.costImpactData.inventoryProductScrapAmount === 0) {
this.$message.warning('请填写成品库存报废金额！')
return
}
if (this.costImpactData.inventoryProductExecutor == null || this.costImpactData.inventoryProductExecutor === '') {
this.$message.warning('请填写成品库存执行人！')
return
}
}
if (this.costImpactData.newOrderFlag === 'Y') { // 新订单
if (this.costImpactData.newOrderNumber == null || this.costImpactData.newOrderNumber === '') {
this.$message.warning('请填写新订单数量！')
return
}
if (this.costImpactData.newOrderNumber <= 0) {
this.$message.warning('新订单数量不能小于等于0！')
return
}
}
if (this.costImpactData.affectedFlag === 'Y') { // 影响的原材料及其库存量
if (this.costImpactData.affectedNumber == null || this.costImpactData.affectedNumber === '') {
this.$message.warning('请填写影响的原材料及其库存量数量！')
return
}
if (this.costImpactData.affectedNumber <= 0) {
this.$message.warning('影响的原材料及其库存量数量不能小于等于0！')
return
}
if (this.costImpactData.affectedOpinions == null || this.costImpactData.affectedOpinions === '') {
this.$message.warning('请填写影响的原材料及其库存量处理意见！')
return
}
if (this.costImpactData.affectedScrapAmount === 0) {
this.$message.warning('请填写影响的原材料及其库存量报废金额！')
return
}
if (this.costImpactData.affectedExecutor == null || this.costImpactData.affectedExecutor === '') {
this.$message.warning('请填写影响的原材料及其库存量执行人！')
return

Write Preview
Loading…
Cancel
Save