yxk-20260608-我为四所把把脉表单优化

src/views/bg/bqtakepulse/BgTakepulse.data.ts

@@ -6,28 +6,23 @@ import {JVxeTypes,JVxeColumn} from '/@/components/jeecg/JVxeTable/types'
 import { getWeekMonthQuarterYear } from '/@/utils';
 //列表数据
 export const columns: BasicColumn[] = [
-   {
+    {
-    title: '密级',
+      title: '年份',
-    align:"center",
+      align:"center",
-    dataIndex: 'secretLevel_dictText'
+      dataIndex: 'year_dictText'
-   },
+    },
-   {
-    title: '年份',
-    align:"center",
-    dataIndex: 'year_dictText'
-   },
    {
     title: '序号',
     align:"center",
     dataIndex: 'number'
    },
    {
-    title: '会议类型：行政线、技术线',
+    title: '会议类型',
     align:"center",
     dataIndex: 'taskType_dictText'
    },
    {
-    title: '类别：党的建设等其他',
+    title: '类别',
     align:"center",
     dataIndex: 'type'
    },
@@ -71,7 +66,7 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'isAdopt',
     customRender:({text}) => {
-       return  render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}])
+       return  render.renderSwitch(text, [{text:'是',value:'1'},{text:'否',value:'0'}])
      },
    },
    {
@@ -79,6 +74,15 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'measure'
    },
+  {
+    title: '要求完成日期',
+    align:"center",
+    dataIndex: 'deadline',
+    customRender:({text}) =>{
+      text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text);
+      return text;
+    },
+  },
    {
     title: '措施数量',
     align:"center",
@@ -89,25 +93,16 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'achievement'
    },
-   {
-    title: '要求完成日期',
-    align:"center",
-    dataIndex: 'deadline',
-    customRender:({text}) =>{
-      text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text);
-      return text;
-    },
-   },
    {
     title: '备注',
     align:"center",
     dataIndex: 'remark'
    },
-   {
+   // {
-    title: '执行情况',
+   //  title: '执行情况',
-    align:"center",
+   //  align:"center",
-    dataIndex: 'actualExect'
+   //  dataIndex: 'actualExect'
-   },
+   // },
    {
     title: '实际完成时间',
     align:"center",
@@ -123,11 +118,11 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'bpmStatus_dictText'
    },
-   {
+   // {
-    title: '调整落实措施及执行情况',
+   //  title: '调整落实措施及执行情况',
-    align:"center",
+   //  align:"center",
-    dataIndex: 'actSt'
+   //  dataIndex: 'actSt'
-   },
+   // },
    {
     title: '督办次数',
     align:"center",
@@ -136,21 +131,13 @@ export const columns: BasicColumn[] = [
    {
     title: '紧急程度',
     align:"center",
-    dataIndex: 'urgencyLevel'
+    dataIndex: 'urgencyLevel_dictText'
    },
-   {
+  {
-    title: '是否需要所办领导审批',
+    title: '密级',
     align:"center",
-    dataIndex: 'isNeedAppro',
+    dataIndex: 'secretLevel_dictText'
-    customRender:({text}) => {
+  },
-       return  render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}])
-     },
-   },
-   {
-    title: '所办领导',
-    align:"center",
-    dataIndex: 'supDeptleaderid_dictText'
-   },
 ];
 
 //子表表格配置

src/views/bg/bqtakepulse/components/BgTakepulseForm.vue

@@ -125,9 +125,9 @@
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
-							<a-form-item label="紧急程度" v-bind="validateInfos.urgencyLevel" id="BgTakepulseForm-urgencyLevel" name="urgencyLevel">
+              <a-form-item label="是否急件" v-bind="validateInfos.urgencyLevel" id="BgTakepulseForm-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="yn" placeholder="请选择是否急件" allow-clear />
-							</a-form-item>
+              </a-form-item>
 						</a-col>
 						<a-col :span="12">
 							<a-form-item label="是否需要所办领导审批" v-bind="validateInfos.isNeedAppro" id="BgTakepulseForm-isNeedAppro" name="isNeedAppro">