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

src/common/axios/index.js

@@ -130,7 +130,7 @@ export default {
       if (res.data.ok !== undefined && showTips) {
         let type = res.data.ok ? 'success' : 'warning'
         if (_this) {
-          if (res.data.message !== '') {
+          if (res.data.message !== '' && res.data.message !== null) {
             _this.$message[type](res.data.message)
           }
         }

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

@@ -387,7 +387,9 @@ export default {
               }, {
                 _this: this
               }, res => {
-                this.$message.warning(res.message);
+                if(!res.ok){
+                  this.$message.warning(res.message);
+                }
                 this.getWorkData();
               }, e => {
               });

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

@@ -36,6 +36,15 @@
                   clearable
                 ></el-input>
               </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="请选择截止日期"
+                        value-format="yyyy-MM-dd">
+                </el-date-picker>
+              </el-form-item>
             </el-col>
           </el-row>
         </el-form>

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

@@ -3957,6 +3957,7 @@ export default {
 
                     // this.pageChange(1)
                     this.resetForm()
+                    this.getBussionStandTableBtn(this.sarBussionessSearch)
                   }
                 }, e => {
                 })