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

2022-02-22 15:48:57 +08:00
parent 82d7a3aaef 37a3b237ed
commit 01f1402049
8 changed files with 38 additions and 36 deletions
@@ -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 || "");
@@ -368,6 +368,7 @@ export default {
      }, e => {
      });
    },
+    //预览
    clickButtonToUpload2(file) {
      const attId = file
      this.$preview(attId)
@@ -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', {
@@ -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()
    },
  }
 }