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

src/pages/config/pages/roleManage/index.vue

@@ -183,7 +183,7 @@
       <div slot="footer">
         <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="closeDialogData">取消
         </el-button>
-        <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="confirmDialogData">
+        <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" :loading="btnLoading" @click="confirmDialogData">
           确定
         </el-button>
       </div>
@@ -214,7 +214,7 @@
       <div slot="footer">
         <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="closeDialogData2">取消
         </el-button>
-        <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="confirmDialogData2">
+        <el-button class="common-button-primary" size="mini" icon="el-icon-check" :loading="btnLoading" type="primary" @click="confirmDialogData2">
           确定
         </el-button>
       </div>
@@ -438,6 +438,7 @@ export default {
         label: 'menuName'
       },
       nodeList2: [],
+      btnLoading: false,
       nodeList4: [],
       modalflag: false,
       modalflag2: false,
@@ -683,6 +684,7 @@ export default {
       })
     },
     confirmDialogData() {
+      this.btnLoading = true
       this.$http.postData('sarRole/role/resource', {
         resourceIds: this.$refs.tree3.getCheckedKeys().concat(this.$refs.tree3.getHalfCheckedKeys()),
         roleId: this.id
@@ -691,10 +693,12 @@ export default {
           this.$message.success('设置权限成功')
           this.modalflag = false
         }
+        this.btnLoading = false
       })
     },
     //配置数据确定按钮
     confirmDialogData2(){
+      this.btnLoading = true
       let menuIds = this.$refs.tree4.getCheckedKeys().join(',')
       this.$http.postData('tsRoleMeunData/ts-role-menu-data/saveBatch', {
         menuIds: menuIds,
@@ -706,6 +710,7 @@ export default {
         }else{
           this.$message.warning(res.message)
         }
+        this.btnLoading = false
       })
     },
     closeDialogData() {

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

@@ -428,6 +428,7 @@
             <div v-if="itermsConditions" v-html="itermsConditions" class="itemsTextBox" style="margin: 5px; padding: 5px; width: 100%; overflow: auto;"></div>
             <div v-else style="margin: 5px; padding: 5px; width: 100%; overflow: auto;">无内容</div>
           </div>
+          <div style="width: 80%">
             <el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150 :style="PLmodalType === 2 ? 'width: 100%;' : ''">
               <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">
                 <el-input
@@ -483,6 +484,7 @@
             </el-form>
           </div>
         </div>
+      </div>
       <div id="roleFormButton2" class="demo-drawer-footer">
         <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo2">确定</el-button>
         <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo2">取消</el-button>

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

@@ -80,6 +80,7 @@
                 </el-form-item>
                 <el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
                   <el-date-picker
+                    :picker-options="pickerOptions"
                     v-model="listForm.endTime"
                     type="date"
                     placeholder="请选择截止日期"
@@ -508,6 +509,11 @@ export default {
   },
   data() {
     return {
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() < Date.now() - 8.64e7;
+        },
+      },
       submitFlag: '',
       managementHostName: [], //管理主体名称下拉框
       developmentHostName: [], //开发主体名称下拉框

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

@@ -2456,6 +2456,7 @@ export default {
       if (this.form.standType === '') {
         this.$message.warning('请选择标准来源')
       } else {
+        this.standardSearchForm.page = 1
         this.standardDrawer = true
         this.$nextTick(() => {
           // 动态设置表格高度

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

@@ -46,6 +46,7 @@
                 </el-form-item>
                 <el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
                   <el-date-picker
+                    :picker-options="pickerOptions"
                     v-model="listForm.endTime"
                     type="date"
                     placeholder="请选择截止日期"
@@ -454,6 +455,11 @@ export default {
   },
   data() {
     return {
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() < Date.now() - 8.64e7;
+        },
+      },
       managementHostName: [], //管理主体名称下拉框
       developmentHostName: [], //开发主体名称下拉框
       categoryName: [], //项目细分类下拉框