Merge branch 'develop' into 'test'

Develop

See merge request !97

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

@@ -261,6 +261,7 @@ export default {
       total: 0,
       pageSize: this.$store.getters.userInfo.configContent,
       listForm: {
+        fileIds: '',
         listType: "", //区分是哪个清单
         listName: "", //清单名称
         descriptionList: "", //清单说明
@@ -358,6 +359,11 @@ export default {
         this.listForm.applyUpdUserId = item.applyUpdUserId;
         this.listForm.jlUserId = item.jlUserId;
         this.listForm.zrUserId = item.zrUserId;
+        let filesId = []
+        item.fileName.forEach(itemIds =>{
+          filesId.push(itemIds.id)
+        })
+        this.listForm.fileId = filesId.join(',')
         item.fileName.forEach(itemId => {
           this.fileIds = itemId.id
           this.getFileInfo();

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

@@ -543,8 +543,8 @@
                                         })
                                     } else {
                                         this.$message.warning('流程启动失败')
+                                      this.isSubmit = false
                                     }
-                                    this.isSubmit = false
                                 })
                             } else {
                                 return this.$message.warning('请完善人员信息')

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

@@ -204,7 +204,7 @@
           tooltip-effect="dark"
           style="width: 100%"
           border
-          height="100%"
+          height="150%"
           :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
           @selection-change="selectedChange"
@@ -233,7 +233,7 @@
       </el-table>
       <pagination
         style="position: relative;"
-        :page="pageNo"
+        :page="queryUnqualidiedData.pageNo"
         :total="total"
         @pageChange="pageChange"
         @pageSizeChange="pageSizeChange"/>
@@ -283,13 +283,10 @@ export default {
       standModel: false,
       // 总数
       total: 0,
-      // 当前页数
-      pageNo: 1,
       // 查询未符合项整改数据库数据
       queryUnqualidiedData: {
-        pageNo: 1,
+        current: 1,
-        pageSize: 10,
+        size: this.$store.getters.userInfo.configContent,
-        total: 0,
         closeState: '1',
         standId: '',
         standSerialNumber: '', // 标准号/名称
@@ -344,6 +341,12 @@ export default {
     //点击新增事件
     addList() {
       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
@@ -553,8 +556,9 @@ export default {
       this.pageNo = page
       this.getTableByPage()
     },
-    pageSizeChange () {
+    pageSizeChange (pageSize) {
-      this.getTableByPage()
+      this.size = pageSize
+      this.getTableByPage(pageSize)
     },
   }
 }

src/pages/regulatoryRepository/partCodeApply/index.vue

@@ -42,8 +42,8 @@
       </el-button>
       <el-button type="primary" size="mini" v-btn-permission="'9caea8a46be62a0ae0600de35bad6539'"
                  class="common-button-primary" @click="deletePartCode('demore',null)">
-        <i class="iconfont">&#xe611;</i>
+        <i class="iconfont">&#xe61b;</i>
-        删除
+        批量删除
       </el-button>
     </div>
     <!--表格区域-->