Merge remote-tracking branch 'origin/develop' into develop

src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue

@@ -1031,6 +1031,7 @@ export default {
     //保存事件
     handleSave() {
       this.saveLoading = true;
+      this.listForm.dataList = this.dataList
       this.listForm.fileName = this.fileInfoList
       let _formData = new FormData();
       _formData.append("id", this.bpnId || "");

src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue

@@ -368,6 +368,7 @@ export default {
       }, e => {
       });
     },
+    //预览
     clickButtonToUpload2(file) {
       const attId = file
       this.$preview(attId)

src/pages/processCenter/pages/creatProcess/bzrk/step1.vue

@@ -3145,7 +3145,6 @@ export default {
 
     },
     handleSubmit() {
-
       // this.form.country=this.countryArr;
       this.$refs['form'].validate((valid) => {
         if (valid) {

src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue

@@ -121,7 +121,6 @@
                     <el-table-column
                             prop="chapterNumber"
                             align="center"
-                            sortable
                             label="章条编号"
                             width="101px">
 <!--                        <template slot-scope="scope">-->

src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue

@@ -110,7 +110,6 @@
                     <el-table-column
                             prop="chapterNumber"
                             align="center"
-                            sortable
                             label="章条编号"
                             width="101px">
                     </el-table-column>

src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue

@@ -102,7 +102,6 @@
                     <el-table-column
                             prop="chapterNumber"
                             align="center"
-                            sortable
                             label="章条编号"
                             width="101px">
                     </el-table-column>

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

@@ -130,7 +130,6 @@
           <el-table-column
             prop="chapterNumber"
             align="center"
-            sortable
             label="章条编号"
             width="101px">
           </el-table-column>

src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue

@@ -102,7 +102,6 @@
           <el-table-column
                   prop="chapterNumber"
                   align="center"
-                  sortable
                   label="章条编号"
                   width="101px">
           </el-table-column>

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

@@ -122,7 +122,6 @@
           <el-table-column
                   prop="chapterNumber"
                   align="center"
-                  sortable
                   label="章条编号"
                   width="101px">
           </el-table-column>

src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue

@@ -115,7 +115,6 @@
             prop="chapterNumber"
             align="center"
             label="章条编号"
-            sortable
             width="101px">
           </el-table-column>
           <el-table-column

src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue

@@ -113,7 +113,6 @@
           </el-table-column>
           <el-table-column
             prop="chapterNumber"
-            sortable
             align="center"
             label="章条编号"
             width="101px">

src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue

@@ -114,7 +114,6 @@
           <el-table-column
             prop="chapterNumber"
             align="center"
-            sortable
             label="章条编号"
             width="101px">
           </el-table-column>

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue

@@ -559,9 +559,14 @@ export default {
      }, res => {
        this.cbcdOptions = res.data.DEGREESTANDARD  //采标程度
        this.BZList = res.data.ENERGYTYPES //适用车型
-       this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
+       // this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
        this.standSystemOptions = res.data.TXLBBUSS // 体系结构
        this.qcdwOptions = res.data.QCDW // 起草单位
+       res.data.BUSSSTANDCLASS.forEach(item => {
+         if(item.label){
+           this.standSortOptions.push(item)   //企标类别
+         }
+       })
      })
     if(this.$route.query.bpnId === undefined && this.$route.query.taskIds === undefined){
       this.$http.get('/lawss/activiti/saveEditFile', {

src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue

@@ -404,12 +404,6 @@ export default {
     addList() {
       this.loading = true
       dicTypeData().then(res => {
-        if (this.pageNo !== undefined) {
-          this.queryUnqualidiedData.current = this.pageNo
-        }
-        if (this.size !== undefined) {
-          this.queryUnqualidiedData.size = this.size
-        }
         this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
         standUnqualified(this.queryUnqualidiedData).then(res => {
           this.unqualidiedData = res.data.records
@@ -631,6 +625,7 @@ export default {
     },
     //未整改项抽屉中的查询按钮
     getTableByPage() {
+      this.queryUnqualidiedData.current = 1
       this.addList()
     },
     // 清空 查询条件
@@ -642,12 +637,12 @@ export default {
     },
     // 分页事件
     pageChange(page) {
-      this.pageNo = page
-      this.getTableByPage()
+      this.queryUnqualidiedData.current = page
+      this.addList()
     },
     pageSizeChange(pageSize) {
-      this.size = pageSize
-      this.getTableByPage(pageSize)
+      this.queryUnqualidiedData.size = pageSize
+      this.addList()
     },
   }
 }