From 5b4fae7c436102ccf551267bd5c01d6170e29d14 Mon Sep 17 00:00:00 2001
From: ye1023 <12588209+ye1023@user.noreply.gitee.com>
Date: Wed, 13 May 2026 10:05:24 +0800
Subject: [PATCH] =?UTF-8?q?yxk-20260509-=E5=85=9A=E5=A7=94=E4=BC=9A?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=A1=A8=E5=8D=95=E4=B8=9A=E5=8A=A1=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96=20=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E5=B7=A6=E4=B8=8A=E8=A7=92title=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/BgPartymatterBPMForm.vue       | 24 +++++++++++++------
 .../components/BgPartymatterForm.vue          | 22 ++++++++---------
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue b/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue
index 4d4032e..33f7b92 100644
--- a/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue
+++ b/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue
@@ -126,14 +126,19 @@
         <a-form v-if="showSubApproveUser" class="process-variable-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-row :gutter="16">
             <a-col :span="24">
-              <a-form-item label="子流程经办人" :labelCol="wideLabelCol" :wrapperCol="wideWrapperCol">
+              <a-form-item label="部门经办人" :labelCol="wideLabelCol" :wrapperCol="wideWrapperCol">
                 <a-space class="sub-approve-user-row">
-                  <a-input
+                  <j-select-user
                     v-model:value="subApproveUser"
-                    placeholder="输入username，多个用英文逗号分隔"
-                    allow-clear
                     :disabled="savingSubApproveUser"
+                    allow-clear
                   />
+<!--                  <a-input-->
+<!--                    v-model:value="subApproveUser"-->
+<!--                    placeholder="输入username，多个用英文逗号分隔"-->
+<!--                    allow-clear-->
+<!--                    :disabled="savingSubApproveUser"-->
+<!--                  />-->
                   <a-button type="primary" :loading="savingSubApproveUser" @click="saveSubApproveUserVariable">保存经办人</a-button>
                 </a-space>
               </a-form-item>
@@ -163,6 +168,7 @@
   import JDictSelectTag from "../../../../components/Form/src/jeecg/components/JDictSelectTag.vue";
   import BgPartymatterBPMFeedbackModal from './BgPartymatterBPMFeedbackModal.vue';
   import SUploadFile from '/@/components/semri/fileComponent/SUploadFile.vue';
+  import JSelectUser from "../../../../components/Form/src/jeecg/components/JSelectUser.vue";
   const { isDisabledAuth, hasPermission, initBpmFormData} = usePermission();
 
   const props = defineProps({
@@ -227,8 +233,12 @@
     { title: '附件', dataIndex: 'id', key: 'attachments', align: 'left', width: 340 },
   ];
 
-  const mainDisabled = computed(() => props.formDisabled);
-
+  const mainDisabled = computed(() => {
+    if (props.formBpm) {
+      return props.formData?.disabled !== false;
+    }
+    return props.formDisabled;
+  });
   const showProcessHandle = computed(() => props.formBpm && !!props.formData?.taskId);
   const showAddFeedback = computed(() => String(props.formData?.extendUrlParams?.addfeedback ?? '') === '1');
   const showSubApproveUser = computed(() => String(props.formData?.extendUrlParams?.selectuser ?? '') === '1');
@@ -331,7 +341,7 @@
       return;
     }
     if (!usernameValue) {
-      createMessage.warning('请输入子流程经办人username');
+      createMessage.warning('请选择部门经办人');
       return;
     }
 
diff --git a/src/views/bg/bgpartymatter/components/BgPartymatterForm.vue b/src/views/bg/bgpartymatter/components/BgPartymatterForm.vue
index 94c81c1..a6ad225 100644
--- a/src/views/bg/bgpartymatter/components/BgPartymatterForm.vue
+++ b/src/views/bg/bgpartymatter/components/BgPartymatterForm.vue
@@ -69,7 +69,7 @@
                 <j-dict-select-tag v-model:value="formData.urgencyLevel" dictCode="urgency_level" placeholder="请选择紧急程度" allow-clear />
 							</a-form-item>
 						</a-col>
-						<a-col :span="12">
+						<a-col :span="24">
 							<a-form-item label="是否需要所办领导审批" v-bind="validateInfos.isNeedAppro" id="BgPartymatterForm-isNeedAppro" name="isNeedAppro">
 								<j-switch v-model:value="formData.isNeedAppro"  ></j-switch>
 							</a-form-item>
@@ -79,16 +79,16 @@
                 <j-select-user v-model:value="formData.supDeptleaderid" allow-clear />
               </a-form-item>
             </a-col>
-						<a-col :span="12">
-							<a-form-item label="是否抄送所领导" v-bind="validateInfos.isNeedSuoleader" id="BgPartymatterForm-isNeedSuoleader" name="isNeedSuoleader">
-								<j-switch v-model:value="formData.isNeedSuoleader"  ></j-switch>
-							</a-form-item>
-						</a-col>
-						<a-col :span="12">
-							<a-form-item label="抄送所领导" v-bind="validateInfos.suoleaderid" id="BgPartymatterForm-suoleaderid" name="suoleaderid">
-						<j-select-user v-model:value="formData.suoleaderid"      allow-clear />
-							</a-form-item>
-						</a-col>
+<!--						<a-col :span="12">-->
+<!--							<a-form-item label="是否抄送所领导" v-bind="validateInfos.isNeedSuoleader" id="BgPartymatterForm-isNeedSuoleader" name="isNeedSuoleader">-->
+<!--								<j-switch v-model:value="formData.isNeedSuoleader"  ></j-switch>-->
+<!--							</a-form-item>-->
+<!--						</a-col>-->
+<!--						<a-col :span="12">-->
+<!--							<a-form-item label="抄送所领导" v-bind="validateInfos.suoleaderid" id="BgPartymatterForm-suoleaderid" name="suoleaderid">-->
+<!--						<j-select-user v-model:value="formData.suoleaderid"      allow-clear />-->
+<!--							</a-form-item>-->
+<!--						</a-col>-->
 <!--            <a-col :span="12">-->
 <!--              <a-form-item label="是否需要重复督办" v-bind="validateInfos.isNeedInterval" id="BgPartymatterForm-isNeedInterval" name="isNeedInterval">-->
 <!--                <a-input v-model:value="formData.isNeedInterval" placeholder="请输入是否需要重复督办"  allow-clear ></a-input>-->