commit

src/pages/processCenter/pages/creatProcess/xmpg/step4.vue

@@ -809,20 +809,11 @@ export default {
     },
     handlePrice(){
       for (let i = 0; i < this.dataList.length; i++) {
-        console.log('815',this.dataList[i])
         if (this.dataList[i].complianceReasons !== '' || (this.dataList[i].noCompliance !== '' && this.dataList[i].countermeasures !== '' && this.dataList[i].completionTime !== '') || (this.dataList[i].complianceReasons === '' && this.dataList[i].noCompliance === '' && this.dataList[i].countermeasures === '' && this.dataList[i].completionTime === '')){
-          console.log('目前可以通过')
         }else {
           this.comFlag ++
-          console.log('有没有输全的，不能通过',this.comFlag)
         }
       }
-
-      // if(row.complianceReasons !== '' || (row.noCompliance !== '' && row.countermeasures !== '' && row.completionTime !== '') || (row.complianceReasons === '' && row.noCompliance === '' && row.countermeasures === '' && row.completionTime === '')){
-      //   this.comFlag = 0
-      // }else{
-      //   this.comFlag = this.comFlag + 1
-      // }
     },
     //提交事件
     handleSubmit() {
@@ -831,7 +822,6 @@ export default {
         this.$message.warning('请填写完整的不符合项信息')
         this.comFlag = 0
       }else{
-        this.$message.success('通过')
         // this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
         // this.listForm.commentText = this.commentText;
         // this.listForm.approvalOpinion = "";

src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue

@@ -142,7 +142,6 @@
               >
               </el-input>
               <el-input
-                @click.native="handlePrice(scope.row)"
                 v-else
                 :disabled="acceptShow"
                 v-model="scope.row.complianceReasons"
@@ -172,7 +171,6 @@
                 <el-input
                   v-else
                   :disabled="acceptShow"
-                  @click.native="handlePrice(scope.row)"
                   v-model="scope.row.noCompliance"
                   placeholder="请输入不合规项目"
                 >
@@ -195,7 +193,6 @@
                 <el-input
                   v-else
                   :disabled="acceptShow"
-                  @click.native="handlePrice(scope.row)"
                   v-model="scope.row.countermeasures"
                   placeholder="请输入应对措施"
                 >
@@ -220,7 +217,6 @@
                   :disabled="acceptShow"
                   class="datePickLen"
                   clearable
-                  @click.native="handlePrice(scope.row)"
                   v-model="scope.row.completionTime"
                   type="date"
                   value-format="yyyy-MM-dd HH:mm:ss"
@@ -527,6 +523,7 @@
               clearable
               v-model="batchEditForm.completionTime"
               type="date"
+              value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="请选择日期">
             </el-date-picker>
           </el-form-item>
@@ -561,7 +558,7 @@ export default {
   },
   data() {
     return {
-      comFlag: true,
+      comFlag: 0,
       total: 0,
       currentPage: 1,
       pageSize: 20,
@@ -899,16 +896,19 @@ export default {
       });
     },
     handlePrice(row){
-      if(row.complianceReasons !== '' || (row.noCompliance !== '' && row.countermeasures !== '' && row.completionTime !== '') || (row.complianceReasons === '' && row.noCompliance === '' && row.countermeasures === '' && row.completionTime === '')){
+      for (let i = 0; i < this.dataList.length; i++) {
-        this.comFlag = true
+        if (this.dataList[i].complianceReasons !== '' || (this.dataList[i].noCompliance !== '' && this.dataList[i].countermeasures !== '' && this.dataList[i].completionTime !== '') || (this.dataList[i].complianceReasons === '' && this.dataList[i].noCompliance === '' && this.dataList[i].countermeasures === '' && this.dataList[i].completionTime === '')){
-      }else{
+        }else {
-        this.comFlag = false
+          this.comFlag ++
+        }
       }
     },
     //提交事件
     handleSubmit() {
-      if(!this.comFlag){
+      this.handlePrice()
+      if(this.comFlag > 0) {
         this.$message.warning('请填写完整的不符合项信息')
+        this.comFlag = 0
       }else{
         this.isSubmit = true;
         this.listForm.commentText = this.commentText;