Merge remote-tracking branch 'origin/master'

src/views/specialApply/TaskUploadData.vue

@@ -173,7 +173,7 @@
             <a-form-model-item label="稽核状态" prop="basicCheckState" v-bind="labelCol1">
               <span
                 :style="{'color':specialResult.basicInfoState == 0 ? 'red' : 'blue'}">{{
-                  specialResult.basicInfoState == '0' ? '未通过' : '通过'
+                   specialResult.basicInfoState == '0' ? '未通过' : '通过'
                 }}</span>
             </a-form-model-item>
             <a-form-model-item label="稽核结果" prop="basicCheckNote" v-bind="labelCol1">
@@ -219,7 +219,7 @@
           <a-form-model-item style="left: 0%;width: 90%;" label="稽核状态" prop="basicCheckState" v-bind="labelCol1Note">
             <span
               :style="{'color':specialResult.nameFindComplianceState == 0 ? 'red' : 'blue'}">{{
-                specialResult.nameFindComplianceState == '0' ? '未通过' : '通过'
+                specialResult.nameFindComplianceState == null ? '未稽核' : specialResult.nameFindComplianceState == '0' ? '未通过' : '通过'
               }}</span>
           </a-form-model-item>
 
@@ -354,7 +354,7 @@
           <a-form-model-item style="left: 0%;width: 90%;" label="稽核状态" prop="basicCheckState" v-bind="labelCol1Note">
             <span
               :style="{'color':specialResult.idCardState == 0 ? 'red' : 'blue'}">{{
-                specialResult.idCardState == '0' ? '未通过' : '通过'
+                specialResult.idCardState == null ? '未稽核' : specialResult.idCardState == '0' ? '未通过' : '通过'
               }}</span>
           </a-form-model-item>
 
@@ -484,7 +484,7 @@
           <a-form-model-item style="left: 0%;width: 90%;" label="稽核状态" prop="basicCheckState" v-bind="labelCol1Note">
             <span
               :style="{'color':specialResult.handCertificateState == 0 ? 'red' : 'blue'}">{{
-                specialResult.handCertificateState == '0' ? '未通过' : '通过'
+                specialResult.handCertificateState == null ? '未稽核' : specialResult.handCertificateState == '0' ? '未通过' : '通过'
               }}</span>
           </a-form-model-item>
 
@@ -616,7 +616,7 @@
           <a-form-model-item style="left: 0%;width: 90%;" label="稽核状态" prop="basicCheckState" v-bind="labelCol1Note">
             <span
               :style="{'color':specialResult.fraudPreventionState == 0 ? 'red' : 'blue'}">{{
-                specialResult.fraudPreventionState == '0' ? '未通过' : '通过'
+                specialResult.fraudPreventionState == null ? '未稽核' : specialResult.fraudPreventionState == '0' ? '未通过' : '通过'
               }}</span>
           </a-form-model-item>
 
@@ -749,7 +749,7 @@
           <a-form-model-item style="left: 0%;width: 90%;" label="稽核状态" prop="basicCheckState" v-bind="labelCol1Note">
             <span
               :style="{'color':specialResult.specialReviewFormState == 0 ? 'red' : 'blue'}">{{
-                specialResult.specialReviewFormState == '0' ? '未通过' : '通过'
+                specialResult.specialReviewFormState == null ? '未稽核' : specialResult.specialReviewFormState == '0' ? '未通过' : '通过'
               }}</span>
           </a-form-model-item>
 
@@ -879,7 +879,7 @@
           <a-form-model-item style="left: 0%;width: 90%;" label="稽核状态" prop="basicCheckState" v-bind="labelCol1Note">
             <span
               :style="{'color':specialResult.userCertificateState == 0 ? 'red' : 'blue'}">{{
-                specialResult.userCertificateState == '0' ? '未通过' : '通过'
+                specialResult.userCertificateState == null ? '未稽核' :  specialResult.userCertificateState == '0' ? '未通过' : '通过'
               }}</span>
           </a-form-model-item>
 
@@ -1009,7 +1009,7 @@
           <a-form-model-item style="left: 0%;width: 90%;" label="稽核状态" prop="basicCheckState" v-bind="labelCol1Note">
             <span
               :style="{'color':specialResult.businessLicenseState == 0 ? 'red' : 'blue'}">{{
-                specialResult.businessLicenseState == '0' ? '未通过' : '通过'
+                specialResult.businessLicenseState == null ? '未稽核' : specialResult.businessLicenseState == '0' ? '未通过' : '通过'
               }}</span>
           </a-form-model-item>
 
@@ -1140,7 +1140,7 @@
           <a-form-model-item style="left: 0%;width: 90%;" label="稽核状态" prop="basicCheckState" v-bind="labelCol1Note">
             <span
               :style="{'color':specialResult.letterIntroductionState == 0 ? 'red' : 'blue'}">{{
-                specialResult.letterIntroductionState == '0' ? '未通过' : '通过'
+                specialResult.letterIntroductionState == null ? '未稽核' :  specialResult.letterIntroductionState == '0' ? '未通过' : '通过'
               }}</span>
           </a-form-model-item>
 
@@ -1270,7 +1270,7 @@
           <a-form-model-item style="left: 0%;width: 90%;" label="稽核状态" prop="basicCheckState" v-bind="labelCol1Note">
             <span
               :style="{'color':specialResult.numberCardState == 0 ? 'red' : 'blue'}">{{
-                specialResult.numberCardState == '0' ? '未通过' : '通过'
+                specialResult.numberCardState == null ? '未稽核' : specialResult.numberCardState == '0' ? '未通过' : '通过'
               }}</span>
           </a-form-model-item>
 
@@ -1398,7 +1398,7 @@
           <a-form-model-item style="left: 0%;width: 90%;" label="稽核状态" prop="basicCheckState" v-bind="labelCol1Note">
             <span
               :style="{'color':specialResult.handNumberCardState == 0 ? 'red' : 'blue'}">{{
-                specialResult.handNumberCardState == '0' ? '未通过' : '通过'
+                specialResult.handNumberCardState == null ? '未稽核' : specialResult.handNumberCardState == '0' ? '未通过' : '通过'
               }}</span>
           </a-form-model-item>
 
@@ -1526,7 +1526,7 @@
           <a-form-model-item style="left: 0%;width: 90%;" label="稽核状态" prop="basicCheckState" v-bind="labelCol1Note">
             <span
               :style="{'color':specialResult.consumptionVoucherState == 0 ? 'red' : 'blue'}">{{
-                specialResult.consumptionVoucherState == '0' ? '未通过' : '通过'
+                specialResult.consumptionVoucherState == null ? '未稽核' :  specialResult.consumptionVoucherState == '0' ? '未通过' : '通过'
               }}</span>
           </a-form-model-item>
 
@@ -1656,7 +1656,7 @@
           <a-form-model-item style="left: 0%;width: 90%;" label="稽核状态" prop="basicCheckState" v-bind="labelCol1Note">
             <span
               :style="{'color':specialResult.commitmentVideoState == 0 ? 'red' : 'blue'}">{{
-                specialResult.commitmentVideoState == '0' ? '未通过' : '通过'
+                specialResult.commitmentVideoState == null ? '未稽核' : specialResult.commitmentVideoState == '0' ? '未通过' : '通过'
               }}</span>
           </a-form-model-item>
 

src/views/specialApply/modules/TaskCheckAudit.vue

@@ -2352,7 +2352,10 @@ export default {
           that.$message.warn("请完成相关稽核");
           return;
         }
+      }else {
+         this.specialResult.specialReviewFormState = null
       }
+
       // 个人户
       if (userLable == '0') {
         if (specialResult.numberCardState == null) {
@@ -2363,20 +2366,32 @@ export default {
           that.$message.warn("请完成相关稽核");
           return;
         }
+      }else {
+        this.specialResult.numberCardState = null;
+        this.specialResult.handNumberCardState = null;
       }
-      //
+
+      // 单位户
       if (userLable == '1') {
         if (specialResult.userCertificateState == null || specialResult.businessLicenseState == null
           || specialResult.letterIntroductionState == null) {
           that.$message.warn("请完成相关稽核");
           return;
         }
+      }else {
+        this.specialResult.userCertificateState = null;
+        this.specialResult.businessLicenseState = null;
+        this.specialResult.letterIntroductionState = null;
       }
+
       // 关停标签 -> 安防停机（高危漫游地）
       if (this.infoModel.shutdownLabel.indexOf('0') > -1 && specialResult.consumptionVoucherState == null ) {
         that.$message.warn("请完成相关稽核");
         return;
       }
+      if (this.infoModel.shutdownLabel.indexOf('0') == -1){
+        that.specialResult.consumptionVoucherState = null
+      }
       let SpecialParams = {}
       SpecialParams = that.specialResult
       SpecialParams['dataId'] = that.query.dataId