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

src/pages/config/pages/mechanismManage/pages/workgroup.vue

@@ -483,11 +483,11 @@ export default {
       this.roleModal2 = false
     },
     pageChange(page) {
-      this.page = page;
+      this.workSearch.page = page
       this.getWorkData()
     },
     pageSizeChange(pageSize) {
-      this.pageSize = pageSize;
+      this.workSearch.pageSize = pageSize
       this.getWorkData()
     }
   }

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

@@ -781,10 +781,10 @@ export default {
       },
       roleFormRules: {
         dockUserName: [
-          { required: true, message: "请选择会签责任人", trigger: "change" }
+          {required: true, message: "请选择相关业务单位", trigger: "change"}
         ],
         directorUserName: [
-          { required: true, message: "请选择审批责任人", trigger: "change" }
+          {required: true, message: "请选择标准法规部法规分析业务经理", trigger: "change"}
         ]
       },
       dataList: [],//清单里的标准数据

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

@@ -750,10 +750,10 @@ export default {
       },
       roleFormRules: {
         dockUserName: [
-          {required: true, message: "请选择会签责任人", trigger: "change"}
+          {required: true, message: "请选择相关业务单位", trigger: "change"}
         ],
         directorUserName: [
-          {required: true, message: "请选择审批责任人", trigger: "change"}
+          {required: true, message: "请选择标准法规部法规分析业务经理", trigger: "change"}
         ]
       },
       dataList: [],//清单里的标准数据

src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue

@@ -135,7 +135,6 @@
         prop="actualCloseTime"
         width="130"
         align="center"
-        sortable
         label="实际关闭时间">
         <template slot-scope="scope">{{(scope.row.actualCloseTime ? scope.row.actualCloseTime.substring(0, 11): '')}}</template>
       </el-table-column>

src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue

@@ -185,7 +185,6 @@
             <el-table-column
               prop="planCloseTime"
               width="150"
-              sortable="custom"
               label="计划关闭时间">
               <template slot-scope="scope">
                 {{ (scope.row.planCloseTime ? scope.row.planCloseTime.substring(0, 11) : "") }}