From 35b899a2fa4f918f51dcaf084866a60a8fcfbaee Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 4 Mar 2025 17:55:35 +0800
Subject: [PATCH 1/2] =?UTF-8?q?2025-03-04=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/changeManagement/changeRecord.vue  | 1 +
 src/views/modules/changeManagement/changeRequest.vue | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/views/modules/changeManagement/changeRecord.vue b/src/views/modules/changeManagement/changeRecord.vue
index 0463493..ad285bf 100644
--- a/src/views/modules/changeManagement/changeRecord.vue
+++ b/src/views/modules/changeManagement/changeRecord.vue
@@ -4193,6 +4193,7 @@
             } else if (type === 7) {
               strVal = this.tempExecutorRow.executor
             }
+            conSql = " and b.site = '" + this.$store.state.user.site + "'"
           }
           if (val === 133) {
             strVal = this.tempPartRow.newPartNo
diff --git a/src/views/modules/changeManagement/changeRequest.vue b/src/views/modules/changeManagement/changeRequest.vue
index 4024c7b..d10a3fb 100644
--- a/src/views/modules/changeManagement/changeRequest.vue
+++ b/src/views/modules/changeManagement/changeRequest.vue
@@ -3149,6 +3149,7 @@
             } else if (type === 7) {
               strVal = this.tempExecutorRow.executor
             }
+            conSql = " and b.site = '" + this.$store.state.user.site + "'"
           }
           if (val === 133) {
             strVal = this.tempPartRow.newPartNo

From ba01a2ea654a1a389fba75f2ac2732de78d9d5e2 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Wed, 5 Mar 2025 10:19:06 +0800
Subject: [PATCH 2/2] =?UTF-8?q?2025-03-05=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/changeManagement/changeRecord.vue | 40 +++++++++++++++----
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/src/views/modules/changeManagement/changeRecord.vue b/src/views/modules/changeManagement/changeRecord.vue
index ad285bf..42cb688 100644
--- a/src/views/modules/changeManagement/changeRecord.vue
+++ b/src/views/modules/changeManagement/changeRecord.vue
@@ -287,8 +287,14 @@
           <el-footer style="height:25px;text-align:center">
             <el-button type="primary" :loading="saveLoading" @click="saveData">保存</el-button>
             <el-button type="primary" @click="modalFlag = false">关闭</el-button>
-            <el-button v-if="authSubmit && modalData.changeStatus === '审批中' && modalData.createBy2 === createBy2" type="primary" :loading="submitLoading" @click="agreeSubmit">同意</el-button>
-            <el-button v-if="authReject && modalData.changeStatus === '审批中' && modalData.isReject === 'Y' && modalData.createBy2 === createBy2" type="primary" :loading="submitLoading" @click="submitDataModal">驳回</el-button>
+            <template v-if="modalData.createBy2 && modalData.createBy2.split(';').includes(createBy2)">
+              <template v-if="authSubmit">
+                <el-button v-if="modalData.changeStatus === '审批中'" type="primary" :loading="submitLoading" @click="agreeSubmit">同意</el-button>
+              </template>
+              <template v-if="authReject">
+                <el-button v-if="modalData.changeStatus === '审批中' && modalData.isReject === 'Y'" type="primary" :loading="submitLoading" @click="submitDataModal">驳回</el-button>
+              </template>
+            </template>
           </el-footer>
         </el-tab-pane>
 
@@ -386,8 +392,14 @@
           <el-footer style="height:25px;text-align:center">
             <el-button type="primary" :loading="saveLoading" @click="saveData">保存</el-button>
             <el-button type="primary" @click="modalFlag = false">关闭</el-button>
-            <el-button v-if="authSubmit && modalData.changeStatus === '审批中' && modalData.createBy2 === createBy2" type="primary" :loading="submitLoading" @click="agreeSubmit">同意</el-button>
-            <el-button v-if="authReject && modalData.changeStatus === '审批中' && modalData.isReject === 'Y' && modalData.createBy2 === createBy2" type="primary" :loading="submitLoading" @click="submitDataModal">驳回</el-button>
+            <template v-if="modalData.createBy2 && modalData.createBy2.split(';').includes(createBy2)">
+              <template v-if="authSubmit">
+                <el-button v-if="modalData.changeStatus === '审批中'" type="primary" :loading="submitLoading" @click="agreeSubmit">同意</el-button>
+              </template>
+              <template v-if="authReject">
+                <el-button v-if="modalData.changeStatus === '审批中' && modalData.isReject === 'Y'" type="primary" :loading="submitLoading" @click="submitDataModal">驳回</el-button>
+              </template>
+            </template>
           </el-footer>
         </el-tab-pane>
 
@@ -536,8 +548,14 @@
           <el-footer style="height:25px;text-align:center">
             <el-button type="primary" :loading="saveLoading" @click="saveData">保存</el-button>
             <el-button type="primary" @click="modalFlag = false">关闭</el-button>
-            <el-button v-if="authSubmit && modalData.changeStatus === '审批中' && modalData.createBy2 === createBy2" type="primary" :loading="submitLoading" @click="agreeSubmit">同意</el-button>
-            <el-button v-if="authReject && modalData.changeStatus === '审批中' && modalData.isReject === 'Y' && modalData.createBy2 === createBy2" type="primary" :loading="submitLoading" @click="submitDataModal">驳回</el-button>
+            <template v-if="modalData.createBy2 && modalData.createBy2.split(';').includes(createBy2)">
+              <template v-if="authSubmit">
+                <el-button v-if="modalData.changeStatus === '审批中'" type="primary" :loading="submitLoading" @click="agreeSubmit">同意</el-button>
+              </template>
+              <template v-if="authReject">
+                <el-button v-if="modalData.changeStatus === '审批中' && modalData.isReject === 'Y'" type="primary" :loading="submitLoading" @click="submitDataModal">驳回</el-button>
+              </template>
+            </template>
           </el-footer>
         </el-tab-pane>
 
@@ -590,8 +608,14 @@
           <el-footer style="height:25px;text-align:center">
             <el-button type="primary" :loading="saveLoading" @click="saveData">保存</el-button>
             <el-button type="primary" @click="modalFlag = false">关闭</el-button>
-            <el-button v-if="authSubmit && modalData.changeStatus === '审批中' && modalData.createBy2 === createBy2" type="primary" :loading="submitLoading" @click="agreeSubmit">同意</el-button>
-            <el-button v-if="authReject && modalData.changeStatus === '审批中' && modalData.isReject === 'Y' && modalData.createBy2 === createBy2" type="primary" :loading="submitLoading" @click="submitDataModal">驳回</el-button>
+            <template v-if="modalData.createBy2 && modalData.createBy2.split(';').includes(createBy2)">
+              <template v-if="authSubmit">
+                <el-button v-if="modalData.changeStatus === '审批中'" type="primary" :loading="submitLoading" @click="agreeSubmit">同意</el-button>
+              </template>
+              <template v-if="authReject">
+                <el-button v-if="modalData.changeStatus === '审批中' && modalData.isReject === 'Y'" type="primary" :loading="submitLoading" @click="submitDataModal">驳回</el-button>
+              </template>
+            </template>
           </el-footer>
         </el-tab-pane>
       </el-tabs>