物联网稽核

src/views/lotCheck/TaskUploadData.vue

@@ -1870,7 +1870,17 @@ export default {
         this.steps.stepsNow = this.steps.stepsTest;
       }
       this.current = 0;
-      this.currentFileType(this.current);
+      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){
+            this.steps.stepsNow[i].status = "finish"
+          }
+          if (this.infoModel[this.steps.stepsNow[i].id+'Remark'][0]!==undefined){
+            this.steps.stepsNow[i].status = "finish"
+          }
+        }
+      }
+     // this.currentFileType(this.current);
     },
     /**移除文件*/
     /**移除文件*/
@@ -1998,7 +2008,7 @@ export default {
         } else {
           this.lotData.isShow.commitmentShow = false;
         }
-        this.currentFileType(this.current);
+       // this.currentFileType(this.current);
       }
     },
     /**步骤文件类型对应*/

src/views/lotCheck/modules/TaskCheckAudit.vue

@@ -36,14 +36,14 @@
         <div>
           <span>1.请选择所上传资料的卡类型</span>
         </div>
-        <a-radio-group style="position: relative;left: 30px"
+        <a-radio-group style="position: relative;left: 30px"  :disabled="infoModel.infoResult==='1'?true:false"
                        @change="controlChange" v-model:value="infoModel.blockType" >
           <a-radio :value="'model'">正式卡</a-radio>
           <a-radio :value="'test'">测试卡</a-radio>
         </a-radio-group>
         <div v-if="infoModel.blockType != 'test'">
           <span style="display: block">2.是否有集团价格审批</span>
-          <a-radio-group style="position: relative;left: 30px;"
+          <a-radio-group style="position: relative;left: 30px;"  :disabled="infoModel.infoResult==='1'?true:false"
                          @change="controlChange" v-model:value="infoModel.control">
             <a-radio :value="'controlY'">是</a-radio>
             <a-radio :value="'controlN'">否</a-radio>
@@ -204,7 +204,7 @@
           </a-step>
         </a-steps>
 
-        <a-button @click="submitAuditLot"v-if='checkState!==5' style="width: 100%;position: relative;top: 10px" type="primary">提交稽核</a-button>
+        <a-button @click="submitAuditLot"v-if='checkState!==5' style="width: 100%;position: relative;top: 10px" type="primary">提交</a-button>
         <a-button @click="outPage"v-if='checkState===5' style="width: 100%;position: relative;top: 10px" type="primary">退出</a-button>
       </a-card>
 
@@ -1546,6 +1546,7 @@ export default {
       checkState:"",
       loading: false,
       infoModel: {
+        stepsNow:{},
         infoResult:"",
         infoResultRemark:'',
         blockType: "",
@@ -1991,16 +1992,18 @@ export default {
       var info = "yes";
 
       for (var i in this.steps.stepsNow) {
-        if (this.checkState===2){
-          if (this.infoModel.infoResult==="" || this.infoModel.infoResult===null){
-            this.$message.warn( "物联网基本信息未进行稽核...");
-            info="no";
-          }
-          if (this.steps.stepsNow[i].status === "wait"   ) {
-            this.$message.warn( this.steps.stepsNow[i].title +"未进行稽核...");
-            info="no";
+          if (this.checkState===2) {
+            if (this.infoModel.infoResult === "" || this.infoModel.infoResult === null) {
+              this.$message.warn("物联网基本信息未进行稽核...");
+              info = "no";
+            }
+            if (this.steps.stepsNow[i].status === "wait") {
+              if (this.steps.stepsNow[i].type !== 'solution') {
+                this.$message.warn(this.steps.stepsNow[i].title + "未进行稽核...");
+                info = "no";
+              }
+            }
           }
-        }
         if (this.checkState===4){
           if (this.steps.stepsNow[i].status !== "finish" && this.steps.stepsNow[i].type!=='solution') {
             this.$message.warn( this.steps.stepsNow[i].title +"资料或备注都未整改!!!");
@@ -2031,7 +2034,7 @@ export default {
       }
       var that = this;
       var data=that.infoModel ;
-
+      data.stepsNow=that.steps.stepsNow;
       //data =this.dataListToStr(data);
       postAction("/smsLot/customerData/addLog", data).then((res) => {
         if (res.success) {
@@ -2309,7 +2312,7 @@ export default {
         this.steps.stepsNow = this.steps.stepsTest;
       }
       this.current = 0;
-      this.currentFileType(this.current);
+      //this.currentFileType(this.current);
 
       //待整改
       if (this.checkState===4){

src/views/lotCheck/modules/TaskCheckList.vue

@@ -121,7 +121,7 @@
             </span>
 
             <span v-has="'lot:task:check:list:audit:resetting'" v-if="record.checkState === 5">
-              <a @click="showCheckCheck(record)">重新稽核</a>
+              <a @click="showCheckCheck(record)">查看数据</a>
               <a-divider type="vertical"/>
             </span>
 

src/views/truckCheck/modules/TaskCheckAudit.vue

@@ -264,7 +264,7 @@
           </a-step>
         </a-steps>
 
-        <a-button @click="submitAuditLot"v-if='checkState!==5' style="width: 100%;position: relative;top: 10px" type="primary">提交稽核</a-button>
+        <a-button @click="submitAuditLot"v-if='checkState!==5' style="width: 100%;position: relative;top: 10px" type="primary">提交</a-button>
         <a-button @click="outPage"v-if='checkState===5' style="width: 100%;position: relative;top: 10px" type="primary">退出</a-button>
       </a-card>
 
@@ -3946,13 +3946,15 @@ export default {
         for (var i in this.steps.stepsNow) {
           if (this.checkState===2){
             if (this.steps.stepsNow[i].status === "wait"  || this.steps.stepsNow[i].status===undefined  || this.steps.stepsNow[i].status===''|| this.steps.stepsNow[i].status===null ) {
-              this.$message.warn( this.steps.stepsNow[i].title +"未进行稽核...");
+                if (this.steps.stepsNow[i].type!=='solution'){
+                  this.$message.warn( this.steps.stepsNow[i].title +"未进行稽核...");
+                  info="no";
+                }
+            }
+            if (this.infoModel.infoResult==="" || this.infoModel.infoResult===null){
+              this.$message.warn( "中继线基本信息未进行稽核...");
               info="no";
-              }
-              if (this.infoModel.infoResult==="" || this.infoModel.infoResult===null){
-                this.$message.warn( "中继线基本信息未进行稽核...");
-                info="no";
-              }
+            }
           }
           if (this.checkState===4){
             if (this.steps.stepsNow[i].status !== "finish" && this.steps.stepsNow[i].type!=='solution') {