物联网。添加其他材料。不必输 进入 默认正式卡。是

中继线增加 是否突破价格管控。  添加联动。是 否

src/views/lotCheck/TaskUploadData.vue

@@ -1020,10 +1020,10 @@
         </div>
       </div>
     </a-card>
-    <!--    省/集团价格审批表-->
+    <!--    价格审批表-->
     <a-card v-if="steps.currentId === 'priceTable'" style="margin-bottom:10px; float: left;width: 83%;left: 2%; ">
       <div slot="title">
-        <span style="float: left;position: relative;top: 4px">省/集团价格审批表</span>
+        <span style="float: left;position: relative;top: 4px">价格审批表</span>
         <!--        操作按钮-->
 
       </div>
@@ -1552,8 +1552,8 @@ export default {
         staffName: "",
         businessLicenseDateIs: "",
         contractDateIs: '',
-        blockType: "",
-        control: "",
+        blockType: "model",
+        control: "controlN",
         //合同文件
         isAll: "",
         contractDate: "",
@@ -1644,7 +1644,7 @@ export default {
             id: 'riskTable'
           },
           {
-            title: '省/集团价格审批表',
+            title: '价格审批表',
             content: 'First-content',
             status: "wait",
             id: 'priceTable'
@@ -1775,7 +1775,7 @@ export default {
         customerIdNote: null,
         //风险评估表稽核结果
         riskNote: null,
-        //省/集团价格审批表
+        //价格审批表
         priceApprovalNote: null,
         //其他材料
         commitmentNote: null,
@@ -1794,7 +1794,7 @@ export default {
         customerIdState: null,
         //风险评估表稽核结果
         riskState: null,
-        //省/集团价格审批表
+        //价格审批表
         priceApprovalState: null,
         //其他材料
         commitmentState: null,
@@ -1836,12 +1836,21 @@ export default {
   },
   created() {
     let control = this.lotData.control;
+    let blockType = this.infoModel.blockType;
     this.infoModel.infoId = this.$route.query.id;
     //是否突破价格管控
-    if (control == "controlN") {
+    // if (control == "controlN") {
+    //   this.steps.stepsNow = this.steps.stepsControlN;
+    // } else {
+    //   this.steps.stepsNow = this.steps.stepsControlY;
+    // }
+    //是否突破价格管控
+    if (control == "controlN" && blockType == "model") {
       this.steps.stepsNow = this.steps.stepsControlN;
-    } else {
+    } else if (control == "controlY" && blockType == "model") {
       this.steps.stepsNow = this.steps.stepsControlY;
+    } else if (blockType == "test") {
+      this.steps.stepsNow = this.steps.stepsTest;
     }
     this.steps.currentId = this.steps.stepsNow[0].id;
     this.infoId = this.$route.query.id;
@@ -1979,7 +1988,7 @@ export default {
       )
       var text = "";
       for (var i in this.steps.stepsNow) {
-        if (this.steps.stepsNow[i].status !== "finish") {
+        if (this.steps.stepsNow[i].status !== "finish" &&  this.steps.stepsNow[i].id !=='commitment') {
           // text+= '111<br/> ';
           var str = this.steps.stepsNow[i].title;
           text += str + "资料或备注都未上传!!!" + '<br/><br/>';

src/views/lotCheck/modules/TaskCheckAudit.vue

@@ -1448,10 +1448,10 @@
 
 
       </a-card>
-      <!--    省/集团价格审批表-->
+      <!--    价格审批表-->
       <a-card v-if="steps.currentId === 'priceTable'" style="margin-bottom:10px; float: left;width: 83%;left: 2%; ">
         <div slot="title">
-          <span style="float: left;position: relative;top: 4px">省/集团价格审批表</span>
+          <span style="float: left;position: relative;top: 4px">价格审批表</span>
           <!--        操作按钮-->
 
         </div>
@@ -2091,7 +2091,7 @@ export default {
             id: 'riskTable'
           },
           {
-            title: '省/集团价格审批表',
+            title: '价格审批表',
             content: 'First-content',
             status: "wait",
             id: 'priceTable'
@@ -2222,7 +2222,7 @@ export default {
         customerIdNote: null,
         //风险评估表稽核结果
         riskNote: null,
-        //省/集团价格审批表
+        //价格审批表
         priceApprovalNote: null,
         //其他材料
         commitmentNote: null,
@@ -2241,7 +2241,7 @@ export default {
         customerIdState: null,
         //风险评估表稽核结果
         riskState: null,
-        //省/集团价格审批表
+        //价格审批表
         priceApprovalState: null,
         //其他材料
         commitmentState: null,
@@ -2282,16 +2282,8 @@ export default {
     };
   },
   created() {
-    let control = this.lotData.control;
     this.infoModel.infoId = this.$route.query.id;
     //是否突破价格管控
-    if (control == "controlN") {
-      this.steps.stepsNow = this.steps.stepsControlN;
-    } else {
-      this.steps.stepsNow = this.steps.stepsControlY;
-    }
-    this.steps.currentId = this.steps.stepsNow[0].id;
-
     this.infoId = this.$route.query.id;
     this.getTask(this.infoId);
     //是否需要整改
@@ -2445,6 +2437,12 @@ export default {
             info = "no";
           }
           if (this.steps.stepsNow[i].status === "wait") {
+            // debugger
+            // if (this.steps.stepsNow[i].id ==='commitment' &&  (this.infoModel.commitmentRemark !=='' || this.infoModel.commitmentRemark !==null)&&
+            //   (this.infoModel.commitment !=='' || this.infoModel.commitment  !==null || this.infoModel.commitment  !=='[{}]')){
+            //   this.$message.warn(this.steps.stepsNow[i].title + "未进行稽核...");
+            //   info = "no";
+            // }
             if (this.steps.stepsNow[i].type !== 'solution') {
               this.$message.warn(this.steps.stepsNow[i].title + "未进行稽核...");
               info = "no";
@@ -2452,7 +2450,7 @@ export default {
           }
         }
         if (this.checkState === 4) {
-          if (this.steps.stepsNow[i].status !== "finish" && this.steps.stepsNow[i].type !== 'solution') {
+          if (this.steps.stepsNow[i].status !== "finish" && this.steps.stepsNow[i].type !== 'solution' &&  this.steps.stepsNow[i].id !=='commitment') {
             this.$message.warn(this.steps.stepsNow[i].title + "资料或备注都未整改!!!");
             info = "no";
           }
@@ -2708,6 +2706,15 @@ export default {
         this.steps.stepsNow = this.steps.stepsControlN;
       }
 
+      if ((this.infoModel.commitmentRemark ==='' || this.infoModel.commitmentRemark ===null)&&
+        (this.infoModel.commitment  ==='' || this.infoModel.commitment  ===null || this.infoModel.commitment  ==='[{}]' &&  this.checkState !== 4 )){
+        for (var i = 0; i <this.steps.stepsNow.length; i++) {
+          if (this.steps.stepsNow[i].id==='commitment'){
+            this.steps.stepsNow.splice(i, 1);
+          }
+        }
+      }
+      this.steps.currentId = this.steps.stepsNow[0].id;
       //稽核结果
       //that.lotCheckById(that.infoId);
     },

src/views/lotCheck/modules/TaskCheckDetails.vue

@@ -573,7 +573,7 @@
 
 
       </a-card>
-      <!--    省/集团价格审批表-->
+      <!--    价格审批表-->
       <a-card v-if="current == 5"
               style="margin-bottom:10px;
               float: left;width: 83%;left: 2%">
@@ -882,7 +882,7 @@ export default {
         customerId: [],
         //风险评估表
         risk: [],
-        //省/集团价格审批表
+        //价格审批表
         priceApproval: [],
         //测试卡申请单
         testCardApplication: [],
@@ -920,7 +920,7 @@ export default {
           status: "wait"
         },
         {
-          title: '省/集团价格审批表',
+          title: '价格审批表',
           content: 'First-content',
           status: "wait"
         },

src/views/truckCheck/TaskUploadData.vue

@@ -34,9 +34,9 @@
             <div>
               <span style="display: block">3.是否突破价格管控</span>
               <a-radio-group style="position: relative;left: 30px;"
-                               v-model:value="infoModel.control"  prop='scene'>
-                <a-radio :value="'0'">未突破</a-radio>
-                <a-radio :value="'1'">已突破</a-radio>
+                             @change="controlChange" v-model:value="infoModel.control"  prop='scene'>
+                <a-radio :value="'0'">否</a-radio>
+                <a-radio :value="'1'">是</a-radio>
               </a-radio-group>
             </div>
         </a-card>
@@ -169,7 +169,7 @@
                                    showTime valueFormat="YYYY-MM-DD"/>
               </a-form-model-item>
             </a-col>
-            <a-col :span="11">
+            <a-col :span="11" v-if='infoModel.scene==="2" ||infoModel.scene==="3" '>
               <a-form-model-item label="经营型呼叫中心增值许可证到期日 " prop="zZBusinessLicenseDate" v-bind="labelCol4">
                 <a-date-picker     style="width: 210px" v-model="infoModel.zZBusinessLicenseDate"
                                    format="YYYY-MM-DD"
@@ -617,10 +617,10 @@
 
 
     </a-card>
-    <!--    突破客户经理管控价是否有固网价格审批-->
+    <!--    价格审批表-->
     <a-card v-if="steps.currentId === 'isPriceApproval'" style="margin-bottom:10px; float: left;width: 83%;left: 2%; ">
       <div slot="title">
-        <span style="float: left;position: relative;top: 4px">突破客户经理管控价是否有固网价格审批</span>
+        <span style="float: left;position: relative;top: 4px">价格审批表</span>
       </div>
       <div class="a-card-25">
         <a-alert
@@ -2581,9 +2581,9 @@ export default {
             content: 'First-content',
             id: "commitmentBook",
           },
-          //不分类型与场景  突破客户经理管控价是否有固网价格审批
+          //不分类型与场景  价格审批表
           {
-            title: '突破客户经理管控价是否有固网价格审批',
+            title: '价格审批表',
             content: 'First-content',
             id: "isPriceApproval",
           },
@@ -2650,9 +2650,9 @@ export default {
             content: 'First-content',
             id: "commitmentBook",
           },
-          //不分类型与场景  突破客户经理管控价是否有固网价格审批
+          //不分类型与场景  价格审批表
           {
-            title: '突破客户经理管控价是否有固网价格审批',
+            title: '价格审批表',
             content: 'First-content',
             id: "isPriceApproval",
           },
@@ -2731,9 +2731,9 @@ export default {
             content: 'First-content',
             id: "commitmentBook",
           },
-          //不分类型与场景  突破客户经理管控价是否有固网价格审批
+          //不分类型与场景  价格审批表
           {
-            title: '突破客户经理管控价是否有固网价格审批',
+            title: '价格审批表',
             content: 'First-content',
             id: "isPriceApproval",
           },
@@ -2812,9 +2812,9 @@ export default {
             content: 'First-content',
             id: "commitmentBook",
           },
-          //不分类型与场景  突破客户经理管控价是否有固网价格审批
+          //不分类型与场景  价格审批表
           {
-            title: '突破客户经理管控价是否有固网价格审批',
+            title: '价格审批表',
             content: 'First-content',
             id: "isPriceApproval",
           },
@@ -2893,9 +2893,9 @@ export default {
             content: 'First-content',
             id: "commitmentBook",
           },
-          //不分类型与场景  突破客户经理管控价是否有固网价格审批
+          //不分类型与场景  价格审批表
           {
-            title: '突破客户经理管控价是否有固网价格审批',
+            title: '价格审批表',
             content: 'First-content',
             id: "isPriceApproval",
           },
@@ -2985,9 +2985,9 @@ export default {
             content: 'First-content',
             id: "commitmentBook",
           },
-          //不分类型与场景  突破客户经理管控价是否有固网价格审批
+          //不分类型与场景  价格审批表
           {
-            title: '突破客户经理管控价是否有固网价格审批',
+            title: '价格审批表',
             content: 'First-content',
             id: "isPriceApproval",
           },
@@ -3168,7 +3168,7 @@ export default {
         //DID(含中继线)业务的责任承诺函
         commitmentBook:[{}],
         commitmentBookRemark:"",
-        //突破客户经理管控价是否有固网价格审批
+        //价格审批表
         isPriceApproval:[{}],
         isPriceApprovalRemark:"",
         //法人身份证
@@ -3321,7 +3321,8 @@ export default {
   },
   created() {
     this.infoId = this.$route.query.id;
-    this.steps.stepsNow = this.steps.steps00;
+    this.controlChange();
+    //this.steps.stepsNow = this.steps.steps00;
     this.steps.currentId = this.steps.stepsNow[0].id;
 
     this.infoModel.infoId = this.$route.query.id;
@@ -3676,7 +3677,28 @@ export default {
           this.steps.stepsNow = this.steps.steps12
         }
       }
-
+      if (this.infoModel.control==='0'){
+        for (var i = 0; i <this.steps.stepsNow.length; i++) {
+          if (this.steps.stepsNow[i].id==='isPriceApproval'){
+            this.steps.stepsNow.splice(i, 1);
+          }
+        }
+      }
+      if (this.infoModel.control==='1'){
+        var info ='';
+        for (var i = 0; i <this.steps.stepsNow.length; i++) {
+          if (this.steps.stepsNow[i].id==='isPriceApproval'){
+            info ='yes';
+          }
+        }
+        if (info!=='yes'){
+            this.steps.stepsNow.push({
+              title: '价格审批表',
+              content: 'First-content',
+              id: "isPriceApproval",
+            });
+          }
+      }
       for (var i in this.steps.stepsNow) {
         for (var j in this.infoModel[this.steps.stepsNow[i].id]){
           if (this.infoModel[this.steps.stepsNow[i].id][0].urlBase!==undefined){

src/views/truckCheck/modules/TaskCheckAudit.vue

@@ -37,8 +37,8 @@
             </a-col>
             <a-col :span="6">
               <a-form-model-item label="是否突破价格管控：" v-bind="labelCol4">
-                <span  v-if='infoModel.control==="0"' class="cornflowerblue">未突破</span>
-                <span  v-if='infoModel.control==="1"' class="cornflowerblue">已突破</span>
+                <span  v-if='infoModel.control==="0"' class="cornflowerblue">否</span>
+                <span  v-if='infoModel.control==="1"' class="cornflowerblue">是</span>
               </a-form-model-item>
             </a-col>
           </a-row>
@@ -123,8 +123,8 @@
                 <span class="cornflowerblue">{{ infoModel.installationAddress }}</span>
               </a-form-model-item>
             </a-col>
-            <a-col :span="6">
-              <a-form-model-item label="呼叫中心增值许可证到期日：" v-bind="labelCol9">
+            <a-col :span="6" v-if='infoModel.scene==="2" ||infoModel.scene==="3" '>
+              <a-form-model-item label="经营型呼叫中心增值许可证到期日 ：" v-bind="labelCol9">
                 <span class="cornflowerblue">{{ infoModel.zZBusinessLicenseDate }}</span>
               </a-form-model-item>
             </a-col>
@@ -194,9 +194,9 @@
         <div>
           <span style="display: block">3.是否突破价格管控</span>
           <a-radio-group style="position: relative;left: 30px;" :disabled="infoModel.infoResult==='1'?true:false"
-                         v-model:value="infoModel.control"  prop='scene'>
-            <a-radio :value="'0'">未突破</a-radio>
-            <a-radio :value="'1'">已突破</a-radio>
+                         @change="controlChange"  v-model:value="infoModel.control"  prop='scene'>
+            <a-radio :value="'0'">否</a-radio>
+            <a-radio :value="'1'">是</a-radio>
           </a-radio-group>
         </div>
       </a-card>
@@ -327,7 +327,7 @@
                              showTime valueFormat="YYYY-MM-DD"/>
             </a-form-model-item>
           </a-col>
-          <a-col :span="12">
+          <a-col :span="12"  v-if='infoModel.scene==="2" ||infoModel.scene==="3" '>
             <a-form-model-item label="经营型呼叫中心增值许可证到期日 " prop="zZBusinessLicenseDate" v-bind="labelCol4">
               <a-date-picker  :disabled="infoModel.infoResult==='1'?true:false"   style="width: 210px"   v-model="infoModel.zZBusinessLicenseDate"
                               format="YYYY-MM-DD"
@@ -974,10 +974,10 @@
 
 
       </a-card>
-      <!--    突破客户经理管控价是否有固网价格审批-->
+      <!--    价格审批表-->
       <a-card v-if="steps.currentId === 'isPriceApproval'" style="margin-bottom:10px; float: left;width: 83%;;left: 2%;  ">
         <div slot="title">
-          <span style="float: left;position: relative;top: 4px">突破客户经理管控价是否有固网价格审批</span>
+          <span style="float: left;position: relative;top: 4px">价格审批表</span>
         </div>
         <div class="a-card-25">
           <a-alert
@@ -2061,6 +2061,7 @@
             <div slot="description" class="markdown" style="position: relative;top:30px">
               <ul>
                 <li>1）二类客户需具备</li>
+                <li>2)房屋租赁合同或房屋产权证明（加盖公章）</li>
               </ul>
             </div>
           </a-alert>
@@ -3519,7 +3520,7 @@ export default {
          //DID(含中继线)业务的责任承诺函
         commitmentBookResult:"",
         commitmentBookResultRemark:"",
-         //突破客户经理管控价是否有固网价格审批
+         //价格审批表
         isPriceApprovalResult:"",
         isPriceApprovalResultRemark:"",
          //法人身份证
@@ -3600,7 +3601,7 @@ export default {
         //DID(含中继线)业务的责任承诺函
         commitmentBook:[{}],
         commitmentBookRemark:"",
-        //突破客户经理管控价是否有固网价格审批
+        //价格审批表
         isPriceApproval:[{}],
         isPriceApprovalRemark:"",
         //法人身份证
@@ -3732,9 +3733,9 @@ export default {
             content: 'First-content',
             id: "commitmentBook",
           },
-          //不分类型与场景  突破客户经理管控价是否有固网价格审批
+          //不分类型与场景  价格审批表
           {
-            title: '突破客户经理管控价是否有固网价格审批',
+            title: '价格审批表',
             content: 'First-content',
             id: "isPriceApproval",
           },
@@ -3801,9 +3802,9 @@ export default {
             content: 'First-content',
             id: "commitmentBook",
           },
-          //不分类型与场景  突破客户经理管控价是否有固网价格审批
+          //不分类型与场景  价格审批表
           {
-            title: '突破客户经理管控价是否有固网价格审批',
+            title: '价格审批表',
             content: 'First-content',
             id: "isPriceApproval",
           },
@@ -3882,9 +3883,9 @@ export default {
             content: 'First-content',
             id: "commitmentBook",
           },
-          //不分类型与场景  突破客户经理管控价是否有固网价格审批
+          //不分类型与场景  价格审批表
           {
-            title: '突破客户经理管控价是否有固网价格审批',
+            title: '价格审批表',
             content: 'First-content',
             id: "isPriceApproval",
           },
@@ -3963,9 +3964,9 @@ export default {
             content: 'First-content',
             id: "commitmentBook",
           },
-          //不分类型与场景  突破客户经理管控价是否有固网价格审批
+          //不分类型与场景  价格审批表
           {
-            title: '突破客户经理管控价是否有固网价格审批',
+            title: '价格审批表',
             content: 'First-content',
             id: "isPriceApproval",
           },
@@ -4044,9 +4045,9 @@ export default {
             content: 'First-content',
             id: "commitmentBook",
           },
-          //不分类型与场景  突破客户经理管控价是否有固网价格审批
+          //不分类型与场景  价格审批表
           {
-            title: '突破客户经理管控价是否有固网价格审批',
+            title: '价格审批表',
             content: 'First-content',
             id: "isPriceApproval",
           },
@@ -4137,9 +4138,9 @@ export default {
             content: 'First-content',
             id: "commitmentBook",
           },
-          //不分类型与场景  突破客户经理管控价是否有固网价格审批
+          //不分类型与场景  价格审批表
           {
-            title: '突破客户经理管控价是否有固网价格审批',
+            title: '价格审批表',
             content: 'First-content',
             id: "isPriceApproval",
           },
@@ -4273,7 +4274,28 @@ export default {
           this.steps.stepsNow = this.steps.steps12
         }
       }
-
+      if (this.infoModel.control==='0'){
+        for (var i = 0; i <this.steps.stepsNow.length; i++) {
+          if (this.steps.stepsNow[i].id==='isPriceApproval'){
+            this.steps.stepsNow.splice(i, 1);
+          }
+        }
+      }
+      if (this.infoModel.control==='1'){
+        var info ='';
+        for (var i = 0; i <this.steps.stepsNow.length; i++) {
+          if (this.steps.stepsNow[i].id==='isPriceApproval'){
+            info ='yes';
+          }
+        }
+        if (info!=='yes'){
+          this.steps.stepsNow.push({
+            title: '价格审批表',
+            content: 'First-content',
+            id: "isPriceApproval",
+          });
+        }
+      }
       for (var i in this.steps.stepsNow) {
         for (var j in this.infoModel[this.steps.stepsNow[i].id]){
           if (this.infoModel[this.steps.stepsNow[i].id][0].urlBase!==undefined){
@@ -4532,6 +4554,28 @@ export default {
                 that.steps.stepsNow = that.steps.steps12
               }
             }
+            if (this.infoModel.control==='0'){
+              for (var i = 0; i <that.steps.stepsNow.length; i++) {
+                if (that.steps.stepsNow[i].id==='isPriceApproval'){
+                  that.steps.stepsNow.splice(i, 1);
+                }
+              }
+            }
+            if (that.infoModel.control==='1'){
+              var info ='';
+              for (var i = 0; i <that.steps.stepsNow.length; i++) {
+                if (that.steps.stepsNow[i].id==='isPriceApproval'){
+                  info ='yes';
+                }
+              }
+              if (info!=='yes'){
+                that.steps.stepsNow.push({
+                  title: '价格审批表',
+                  content: 'First-content',
+                  id: "isPriceApproval",
+                });
+              }
+            }
             that.checkState=result.checkState;
             //待稽核
             if (that.checkState===2 || that.checkState===5 ){

src/views/truckCheck/modules/TaskCheckDetails.vue

@@ -573,7 +573,7 @@
 
 
       </a-card>
-      <!--    省/集团价格审批表-->
+      <!--    价格审批表-->
       <a-card v-if="current == 5"
               style="margin-bottom:10px;
               float: left;width: 83%;left: 2%">
@@ -792,7 +792,7 @@ export default {
         customerId: [],
         //风险评估表
         risk: [],
-        //省/集团价格审批表
+        //价格审批表
         priceApproval: [],
         //测试卡申请单
         testCardApplication: []
@@ -828,7 +828,7 @@ export default {
           status: "wait"
         },
         {
-          title: '省/集团价格审批表',
+          title: '价格审批表',
           content: 'First-content',
           status: "wait"
         }