From b207f4763900c9ed9198b45e5316341ff3034507 Mon Sep 17 00:00:00 2001
From: ye1023 <12588209+ye1023@user.noreply.gitee.com>
Date: Fri, 8 May 2026 10:18:56 +0800
Subject: [PATCH] =?UTF-8?q?yxk-20260507-=E5=85=9A=E5=A7=94=E4=BC=9A?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=AD=97=E5=85=B8=E6=B7=BB=E5=8A=A0=EF=BC=9A?=
 =?UTF-8?q?=E5=B9=B4=E4=BB=BD=E3=80=81=E5=AF=86=E7=BA=A7=E3=80=81=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E7=8A=B6=E6=80=81=E3=80=81=E7=B4=A7=E6=80=A5=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bg/bgpartymatter/BgPartymatter.data.ts    | 77 ++++++++---------
 .../components/BgPartymatterForm.vue          | 82 ++++++++++---------
 2 files changed, 81 insertions(+), 78 deletions(-)

diff --git a/src/views/bg/bgpartymatter/BgPartymatter.data.ts b/src/views/bg/bgpartymatter/BgPartymatter.data.ts
index 9ef2e50..06e1049 100644
--- a/src/views/bg/bgpartymatter/BgPartymatter.data.ts
+++ b/src/views/bg/bgpartymatter/BgPartymatter.data.ts
@@ -8,17 +8,18 @@ export const columns: BasicColumn[] = [
   {
     title: '督办次数',
     align:"center",
-    dataIndex: 'superviseCount'
+    dataIndex: 'superviseCount',
+    width: '100px',
+  },
+  {
+    title: '事项名称',
+    align:"center",
+    dataIndex: 'title'
   },
   {
     title: '年份',
     align:"center",
-    dataIndex: 'year',
-  },
-  {
-    title: '密级',
-    align:"center",
-    dataIndex: 'secretLevel_dictText',
+    dataIndex: 'year_dictText',
   },
   {
     title: '序号',
@@ -34,11 +35,6 @@ export const columns: BasicColumn[] = [
       return text;
     },
   },
-  {
-    title: '事项名称',
-    align:"center",
-    dataIndex: 'title'
-  },
   {
     title: '会议决议',
     align:"center",
@@ -59,11 +55,6 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'actualExect'
   },
-  {
-    title: '完成状态',
-    align:"center",
-    dataIndex: 'bpmStatus'
-  },
   {
     title: '要求完成日期',
     align:"center",
@@ -76,34 +67,44 @@ export const columns: BasicColumn[] = [
   {
     title: '紧急程度',
     align:"center",
-    dataIndex: 'urgencyLevel',
+    dataIndex: 'urgencyLevel_dictText',
   },
   {
-    title: '是否需要所办领导审批',
+    title: '密级',
     align:"center",
-    dataIndex: 'isNeedAppro',
-    customRender:({text}) => {
-      return render.renderSwitch(text, [{text:'是',value:'1'},{text:'否',value:'0'}])
-    },
+    dataIndex: 'secretLevel_dictText',
   },
   {
-    title: '所办领导',
+    title: '完成状态',
     align:"center",
-    dataIndex: 'supDeptleaderid_dictText'
-  },
-  {
-    title: '是否抄送所领导',
-    align:"center",
-    dataIndex: 'isNeedSuoleader',
-    customRender:({text}) => {
-      return render.renderSwitch(text, [{text:'是',value:'1'},{text:'否',value:'0'}])
-    },
-  },
-  {
-    title: '抄送所领导',
-    align:"center",
-    dataIndex: 'suoleaderid_dictText'
+    dataIndex: 'bpmStatus_dictText'
   },
+  // {
+  //   title: '是否需要所办领导审批',
+  //   align:"center",
+  //   dataIndex: 'isNeedAppro',
+  //   customRender:({text}) => {
+  //     return render.renderSwitch(text, [{text:'是',value:'1'},{text:'否',value:'0'}])
+  //   },
+  // },
+  // {
+  //   title: '所办领导',
+  //   align:"center",
+  //   dataIndex: 'supDeptleaderid_dictText'
+  // },
+  // {
+  //   title: '是否抄送所领导',
+  //   align:"center",
+  //   dataIndex: 'isNeedSuoleader',
+  //   customRender:({text}) => {
+  //     return render.renderSwitch(text, [{text:'是',value:'1'},{text:'否',value:'0'}])
+  //   },
+  // },
+  // {
+  //   title: '抄送所领导',
+  //   align:"center",
+  //   dataIndex: 'suoleaderid_dictText'
+  // },
 ];
 
 //子表列表数据
diff --git a/src/views/bg/bgpartymatter/components/BgPartymatterForm.vue b/src/views/bg/bgpartymatter/components/BgPartymatterForm.vue
index 13d67ba..91db137 100644
--- a/src/views/bg/bgpartymatter/components/BgPartymatterForm.vue
+++ b/src/views/bg/bgpartymatter/components/BgPartymatterForm.vue
@@ -6,12 +6,12 @@
           <a-row>
 						<a-col :span="12">
 							<a-form-item label="年份" v-bind="validateInfos.year" id="BgPartymatterForm-year" name="year">
-								<a-input v-model:value="formData.year" placeholder="请输入年份"  allow-clear ></a-input>
+                <j-dict-select-tag v-model:value="formData.year" dictCode="super_year" placeholder="请选择年份" allow-clear />
 							</a-form-item>
 						</a-col>
             <a-col :span="12">
               <a-form-item label="密级" v-bind="validateInfos.secretLevel" id="BgPartymatterForm-secretLevel" name="secretLevel">
-                <a-input v-model:value="formData.secretLevel" placeholder="请输入密级"  allow-clear ></a-input>
+                <j-dict-select-tag v-model:value="formData.secretLevel" dictCode="secret_level" placeholder="请选择密级" allow-clear />
               </a-form-item>
             </a-col>
 						<a-col :span="12">
@@ -51,7 +51,7 @@
 						</a-col>
 						<a-col :span="12">
 							<a-form-item label="完成状态" v-bind="validateInfos.bpmStatus" id="BgPartymatterForm-bpmStatus" name="bpmStatus">
-								<a-input v-model:value="formData.bpmStatus" placeholder="请输入完成状态"  allow-clear ></a-input>
+                <j-dict-select-tag v-model:value="formData.bpmStatus" dictCode="super_status" placeholder="请选择完成状态" allow-clear />
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
@@ -66,7 +66,7 @@
 						</a-col>
 						<a-col :span="12">
 							<a-form-item label="紧急程度" v-bind="validateInfos.urgencyLevel" id="BgPartymatterForm-urgencyLevel" name="urgencyLevel">
-								<a-input v-model:value="formData.urgencyLevel" placeholder="请输入紧急程度"  allow-clear ></a-input>
+                <j-dict-select-tag v-model:value="formData.urgencyLevel" dictCode="urgency_level" placeholder="请选择紧急程度" allow-clear />
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
@@ -89,26 +89,26 @@
 						<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>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="重复类型" v-bind="validateInfos.intervalType" id="BgPartymatterForm-intervalType" name="intervalType">
-                <a-input v-model:value="formData.intervalType" placeholder="请输入重复类型"  allow-clear ></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="重复次数" v-bind="validateInfos.startCount" id="BgPartymatterForm-startCount" name="startCount">
-                <a-input v-model:value="formData.startCount" placeholder="请输入重复次数"  allow-clear ></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="重复开始时间" v-bind="validateInfos.intervalStartTime" id="BgPartymatterForm-intervalStartTime" name="intervalStartTime">
-                <a-date-picker placeholder="请选择重复开始时间"  v-model:value="formData.intervalStartTime" value-format="YYYY-MM-DD"  style="width: 100%"  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>-->
+<!--              </a-form-item>-->
+<!--            </a-col>-->
+<!--            <a-col :span="12">-->
+<!--              <a-form-item label="重复类型" v-bind="validateInfos.intervalType" id="BgPartymatterForm-intervalType" name="intervalType">-->
+<!--                <a-input v-model:value="formData.intervalType" placeholder="请输入重复类型"  allow-clear ></a-input>-->
+<!--              </a-form-item>-->
+<!--            </a-col>-->
+<!--            <a-col :span="12">-->
+<!--              <a-form-item label="重复次数" v-bind="validateInfos.startCount" id="BgPartymatterForm-startCount" name="startCount">-->
+<!--                <a-input v-model:value="formData.startCount" placeholder="请输入重复次数"  allow-clear ></a-input>-->
+<!--              </a-form-item>-->
+<!--            </a-col>-->
+<!--            <a-col :span="12">-->
+<!--              <a-form-item label="重复开始时间" v-bind="validateInfos.intervalStartTime" id="BgPartymatterForm-intervalStartTime" name="intervalStartTime">-->
+<!--                <a-date-picker placeholder="请选择重复开始时间"  v-model:value="formData.intervalStartTime" value-format="YYYY-MM-DD"  style="width: 100%"  allow-clear />-->
+<!--              </a-form-item>-->
+<!--            </a-col>-->
             <a-col v-if="showFlowSubmitButton" :span="24" style="width: 100%;text-align: center;">
               <a-button preIcon="ant-design:check-outlined" style="width: 126px" type="primary" @click="submitForm">提 交</a-button>
             </a-col>
@@ -126,6 +126,7 @@
   import JSwitch from '/@/components/Form/src/jeecg/components/JSwitch.vue';
   import JSelectDept from '/@/components/Form/src/jeecg/components/JSelectDept.vue';
   import JSelectUser from '/@/components/Form/src/jeecg/components/JSelectUser.vue';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
   import { getValueType } from '/@/utils';
   import { saveOrUpdate } from '../BgPartymatter.api';
   import { Form } from 'ant-design-vue';
@@ -140,22 +141,23 @@
   const emit = defineEmits(['register', 'ok']);
   const formData = reactive<Record<string, any>>({
     id: '',
-        year: '',
-        number: '',
-        matterTime: '',
-        title: '',
-        content: '',
-        matterCode: '',
-        responDeptid: '',
-        actualExect: '',
-        bpmStatus: '',
-        superviseCount: '',
-        deadline: '',
-        urgencyLevel: '',
-        isNeedAppro: '',
-        isNeedSuoleader: '',
-        suoleaderid: '',
-        delFlag: '',
+    year: '',
+    secretLevel: '',
+    number: '',
+    matterTime: '',
+    title: '',
+    content: '',
+    matterCode: '',
+    responDeptid: '',
+    actualExect: '',
+    bpmStatus: '1',
+    superviseCount: '',
+    deadline: '',
+    urgencyLevel: '1',
+    isNeedAppro: '',
+    isNeedSuoleader: '',
+    suoleaderid: '',
+    delFlag: '',
     isNeedInterval:'',
     startCount:'',
     intervalType:'',