修改冲突

qiankun_config/store.js

@@ -19,7 +19,7 @@ export default function (state) {
     store.commit('user/setUserInfo', state.user.info);
   }
   if (state.user?.authorityDept) {
-    store.dispatch('user/getCurrentUserAuthorityDept');
+    // store.dispatch('user/getCurrentUserAuthorityDept');
   }
 }
 

src/views/inspectionWork/components/baseInfo.vue

@@ -241,6 +241,7 @@
               placeholder="请选择"
               style="width: 100%"
               :disabled="showArrange == '0'"
+              @change="selectResult"
             >
               <el-option label="合格" :value="1" />
               <el-option label="不合格" :value="2" />
@@ -485,7 +486,9 @@
           qualityIdList: [
             { required: true, message: '请选择质检人', trigger: 'change' }
           ],
-          qualityResults: [{ required: true, message: '', trigger: 'change' }],
+          qualityResults: [
+            { required: true, message: '请选择质检结果', trigger: 'change' }
+          ],
           inspectionStandards: [
             { required: true, message: '请选择检验标准', trigger: 'change' }
           ]
@@ -677,6 +680,9 @@
         } else {
           this.$emit('table2');
         }
+      },
+      selectResult() {
+        this.$emit('quantityAssignment');
       }
     }
   };

src/views/inspectionWork/edit.vue

@@ -26,6 +26,7 @@
         :qualityType1="qualityType"
         @changeModel="changeModel"
         @changeNumber="changeNumber"
+        @quantityAssignment="quantityAssignment"
         @changeInspectionStandardsModel="changeInspectionStandardsModel"
       ></base-info>
       <header-title title="样品信息"></header-title>
@@ -293,7 +294,6 @@
     methods: {
       //
       calculate(list) {
-        console.log('执行了没');
         if (list.length == 0) {
           this.form.sampleQuantity = 0;
           this.form.sampleWeight = 0;
@@ -339,21 +339,21 @@
           }
         }
 
-        let resultsTotal = this.form.total - sampleQuantity;
-        console.log(resultsTotal, 'resultsTotal 3333');
+        // let resultsTotal = this.form.total - sampleQuantity;
         if (sampleQuantity == sampleQualifiedNumber) {
-          this.$set(this.form, 'qualifiedNumber', resultsTotal);
-          this.$set(this.form, 'noQualifiedNumber', 0);
+          // this.$set(this.form, 'qualifiedNumber', resultsTotal);
+          // this.$set(this.form, 'noQualifiedNumber', 0);
           this.$set(this.form, 'qualificationRate', '100%');
           this.$set(this.form, 'noQualificationRate', '0');
           this.$set(this.form, 'qualityResults', 1);
         } else {
-          this.$set(this.form, 'noQualifiedNumber', resultsTotal);
-          this.$set(this.form, 'qualifiedNumber', 0);
+          // this.$set(this.form, 'noQualifiedNumber', resultsTotal);
+          // this.$set(this.form, 'qualifiedNumber', 0);
           this.$set(this.form, 'qualificationRate', '0');
           this.$set(this.form, 'noQualificationRate', '100%');
           this.$set(this.form, 'qualityResults', 2);
         }
+
         // this.$set(this.form, 'resultsTotal', resultsTotal);
         this.$set(
           this.form,
@@ -373,6 +373,24 @@
           'sampleNoQualifiedNumber',
           sampleNoQualifiedNumber
         );
+        // 数量赋值
+        this.quantityAssignment();
+      },
+      // 计算合格数不合格数
+      quantityAssignment() {
+        let noQualifiedNumber = 0;
+        let qualifiedNumber = 0;
+        let data = this.form;
+        let total = data.total - 0;
+        if (this.form.qualityResults == 2) {
+          noQualifiedNumber = total - (data.sampleQualifiedNumber - 0);
+          qualifiedNumber = total - noQualifiedNumber;
+        } else {
+          qualifiedNumber = total - (data.sampleNoQualifiedNumber - 0);
+          noQualifiedNumber = total - qualifiedNumber;
+        }
+        this.$set(this.form, 'qualifiedNumber', qualifiedNumber);
+        this.$set(this.form, 'noQualifiedNumber', noQualifiedNumber);
       },
       //切换检验方式
       changeModel(val, flag) {
@@ -1803,6 +1821,7 @@
           qualificationRate,
           noQualificationRate
         );
+        this.calculate(this.sampleList);
       },
       closeDispose() {
         this.rowData = null;

src/views/login/index.vue

@@ -191,7 +191,7 @@ export default {
             this.$store.commit('user/setUserInfo', res.data);
             this.loading = false;
             this.$message.success(res.message);
-            this.$store.dispatch('user/getCurrentUserAuthorityDept');
+            // this.$store.dispatch('user/getCurrentUserAuthorityDept');
             this.goHome();
           })
           .catch((e) => {