报表 与 稽核

src/views/truckCheck/modules/TaskCheckAudit.vue

@@ -4779,7 +4779,7 @@ export default {
               });
             }
             if ((that.infoModel.commitmentRemark ==='' || that.infoModel.commitmentRemark ===null)&&
-              (that.infoModel.commitment  ==='' || that.infoModel.commitment  ===null || that.infoModel.commitment  ==='[{}]' &&  that.checkState !== 4 )){
+              (that.infoModel.commitmentInfo  ==='0'  &&  that.checkState !== 4 )){
               for (var i = 0; i <this.steps.stepsNow.length; i++) {
                 if (that.steps.stepsNow[i].id==='commitment'){
                   that.steps.stepsNow.splice(i, 1);
@@ -4885,7 +4885,7 @@ export default {
 
         for (var i in this.steps.stepsNow) {
           if (this.checkState===2){
-            debugger
+            
             if (this.steps.stepsNow[i].status === "wait"  || this.steps.stepsNow[i].status===undefined  || this.steps.stepsNow[i].status===''|| this.steps.stepsNow[i].status===null ) {
                 if (this.steps.stepsNow[i].type!=='solution'){
                   this.$message.warn( this.steps.stepsNow[i].title +"未进行稽核...");

src/views/warningList/TaskCheckList.vue

@@ -353,7 +353,7 @@ export default {
       dataSource:[],
       url: {
         queryTask: "/smsCheck/task/queryById",
-        lists: "/smsCheck/customerInfo/warningList",
+        list: "/smsCheck/customerInfo/warningList",
         count: "/smsCheck/customerInfo/WarningCount",
         delete: "/smsCheck/customerInfo/delete",
         edit: "/smsCheck/customerInfo/edit",
@@ -367,11 +367,13 @@ export default {
     }
   },
   created() {
-    this.task.id = this.$route.query.id;
+
+    this.loadData(null);
+
     this.queryTaskById(this.task.id);
     this.queryParam.taskId = this.task.id;
 
-    this.selectList();
+   // this.selectList();
     this.loadTabNumber(this.task.id);
   },
   computed: {
@@ -447,7 +449,9 @@ export default {
         userNo: this.queryParam.userNo,
         checkState:this.currentCheckState,
         staffNo: this.queryParam.staffNo,
-        type: this.queryParam.type
+        type: this.queryParam.type,
+        pageNo: this.ipagination.current,
+        pageSize : this.ipagination.pageSize,
       }
       getAction(this.url.lists, params).then((res) => {
         if (res.success) {