From 8f4783a867a33dc573ebd59c1505bd8e39f63bb6 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Mon, 4 Jul 2022 10:26:38 +0800
Subject: [PATCH 1/3] bug  55871

---
 .../processCenter/pages/creatProcess/xmpg/step5.vue      | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
index 0c4b4a652..a5d1b92c9 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
+++ b/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>

From b3806a638802ef08dcc792778387d8f9301b065f Mon Sep 17 00:00:00 2001
From: hanshaozhuang <hanshaozhuang>
Date: Mon, 4 Jul 2022 13:20:39 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2056231=20=E4=BC=81?=
 =?UTF-8?q?=E6=A0=87=E5=BA=93=20=E7=BC=96=E8=BE=91=E6=95=B0=E6=8D=AE=20?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=88=B7=E6=96=B0=20=E7=8E=B0=E5=9C=A8?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E6=89=8B=E5=8A=A8=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/EnterpriseStandardDatabase.vue                    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index ee5d345af..b40c6297f 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -3957,6 +3957,7 @@ export default {
 
                     // this.pageChange(1)
                     this.resetForm()
+                    this.getBussionStandTableBtn(this.sarBussionessSearch)
                   }
                 }, e => {
                 })

From 4d862ed690beeed841430bd71d276b6a75e6fa01 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Mon, 4 Jul 2022 16:17:01 +0800
Subject: [PATCH 3/3] =?UTF-8?q?bug=20=2056217=20=E6=9C=BA=E6=9E=84?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86-=E5=B7=A5=E4=BD=9C=E7=BB=84=EF=BC=8C?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=95=B0=E6=8D=AE=20=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E7=BB=84=E6=88=90=E5=91=98=E9=80=89=E6=8B=A9=E5=A4=9A=E4=B8=AA?=
 =?UTF-8?q?=20TIPS=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/axios/index.js                                  | 2 +-
 src/pages/config/pages/mechanismManage/pages/workgroup.vue | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/common/axios/index.js b/src/common/axios/index.js
index 3df69f477..a2f783880 100644
--- a/src/common/axios/index.js
+++ b/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)
           }
         }
diff --git a/src/pages/config/pages/mechanismManage/pages/workgroup.vue b/src/pages/config/pages/mechanismManage/pages/workgroup.vue
index 6d3b26aad..387968311 100644
--- a/src/pages/config/pages/mechanismManage/pages/workgroup.vue
+++ b/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 => {
               });