From b4ee3cf38da847fd558ef801be246a14d5038bdc Mon Sep 17 00:00:00 2001
From: long <18782126717@163.com>
Date: Wed, 23 Nov 2022 11:29:00 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=8C=82=E8=B5=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/activiti/processInsManage.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/activiti/processInsManage.vue b/src/views/activiti/processInsManage.vue
index ca3a4d6..a660cf1 100644
--- a/src/views/activiti/processInsManage.vue
+++ b/src/views/activiti/processInsManage.vue
@@ -95,10 +95,10 @@
                 <a href="javascript:void(0);" style="color: green;" @click="editStatus(1,r)" >激活</a>
                 <a-divider type="vertical" />
               </template>
-              <template v-else>
+          <!--    <template v-else>
                 <a href="javascript:void(0);" style="color: orange;" @click="editStatus(0,r)" >挂起</a>
                 <a-divider type="vertical" />
-              </template>
+              </template>-->
               <!--<a href="javascript:void(0);" style="color: blue;" @click="history(r)" >审批详情</a>
               <a-divider type="vertical" />-->
               <a href="javascript:void(0);" style="color: #999;" @click="detail(r)" >流程数据</a>

From d3c949e00cfbfbdc43e80acc4a7be834e901fe15 Mon Sep 17 00:00:00 2001
From: long <18782126717@163.com>
Date: Wed, 23 Nov 2022 11:36:38 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B0=83=E6=8B=A8?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E9=83=A8=E9=97=A8=E9=80=89=E6=8B=A9=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/activiti/form/ProcessMaterialsAllotForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/activiti/form/ProcessMaterialsAllotForm.vue b/src/views/activiti/form/ProcessMaterialsAllotForm.vue
index 3afe154..13d8666 100644
--- a/src/views/activiti/form/ProcessMaterialsAllotForm.vue
+++ b/src/views/activiti/form/ProcessMaterialsAllotForm.vue
@@ -937,7 +937,7 @@
               this.heid = false
               this.descriptionFetchData(this.materialTypeRecord,value);
             }else {
-              this.$message.error("请选择正确的部门！")
+              this.$message.error("请选择正确项目部！")
               this.heid = true;
               return
             }

From a5738e82d32ab30323f84ee2fd1555a521c8017d Mon Sep 17 00:00:00 2001
From: long <18782126717@163.com>
Date: Wed, 23 Nov 2022 11:48:43 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=A9=E8=B5=84?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E4=BF=A1=E6=81=AF=20=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dictionaries/ProcessMerchandiseNewsList.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/dictionaries/ProcessMerchandiseNewsList.vue b/src/views/dictionaries/ProcessMerchandiseNewsList.vue
index 927ad14..7041aa6 100644
--- a/src/views/dictionaries/ProcessMerchandiseNewsList.vue
+++ b/src/views/dictionaries/ProcessMerchandiseNewsList.vue
@@ -255,7 +255,6 @@ export default {
           title: '操作',
           dataIndex: 'action',
           align:"center",
-          fixed:"right",
           width:147,
           scopedSlots: { customRender: 'action' }
         }