Merge branch 'develop' into 'FOTON'

Develop

See merge request LAWS/laws-system-front-FOTON!324

src/components/ProjectRelatedPersonnel/index2.vue

@@ -344,7 +344,6 @@ export default {
             const idArr = id ? id.split(',') : []
             const name = item.name
             const nameArr = name ? name.split(',') : []
-            debugger
             const userList = id.map((item, index) => {
                 return {
                     id: item,

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/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.queryUnqualidiedData.current = page
-      this.getTableByPage()
+      this.addList()
     },
     pageSizeChange(pageSize) {
-      this.size = pageSize
+      this.queryUnqualidiedData.size = pageSize
-      this.getTableByPage(pageSize)
+      this.addList()
     },
   }
 }

src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue

@@ -4253,8 +4253,6 @@ export default {
       this.sarBussionessSearch.pageSize = this.$store.getters.userInfo.configContent
       const data = item || this.sarBussionessSearch
       const formData = {...data}
-      console.log(item)
-      debugger
       if (!item) {
         formData.menuId = this.sarBussionessSearch.menuId
         formData.treeType = this.sarBussionessSearch.treeType