From 729f41ea31fa3b5f77cab30ce83f5ad96567fc81 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Sat, 7 Jun 2025 16:10:37 +0800
Subject: [PATCH] =?UTF-8?q?2025-06-07=20=E5=9F=BA=E6=9C=AC=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=B8=AD=E7=9A=84=E5=AE=A1=E6=89=B9=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E6=94=B9=E5=90=8DTP=E5=B7=A5=E7=A8=8B=E5=B8=88=20=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E5=8F=AF=E4=BB=A5=E4=B8=BA0=20-=20=E7=AE=A1=E6=8E=A7?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=20=E6=8A=A5=E5=BA=9F=E9=87=91=E9=A2=9D?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E4=B8=BA0=20-=20=E7=AE=A1=E6=8E=A7=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=20=E5=8F=96=E6=B6=88=E5=8B=BE=E9=80=89=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E9=9C=80=E8=A6=81=E6=B8=85=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/changeManagement/changeRecord.vue | 84 ++++++++-----------
 .../changeManagement/changeRequest.vue        | 81 ++++++++----------
 2 files changed, 70 insertions(+), 95 deletions(-)

diff --git a/src/views/modules/changeManagement/changeRecord.vue b/src/views/modules/changeManagement/changeRecord.vue
index c56f6c7..29be6e4 100644
--- a/src/views/modules/changeManagement/changeRecord.vue
+++ b/src/views/modules/changeManagement/changeRecord.vue
@@ -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
diff --git a/src/views/modules/changeManagement/changeRequest.vue b/src/views/modules/changeManagement/changeRequest.vue
index fd31894..67e126c 100644
--- a/src/views/modules/changeManagement/changeRequest.vue
+++ b/src/views/modules/changeManagement/changeRequest.vue
@@ -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