diff --git a/src/views/services/serviceDirective/ConfigServiceDirective.data.ts b/src/views/services/serviceDirective/ConfigServiceDirective.data.ts
index 496fe7d..9ed44ab 100644
--- a/src/views/services/serviceDirective/ConfigServiceDirective.data.ts
+++ b/src/views/services/serviceDirective/ConfigServiceDirective.data.ts
@@ -100,12 +100,12 @@ export const columns: BasicColumn[] = [
dataIndex: 'serviceDuration',
width: 135,
},
- {
- title: '指令状态',
- align: 'center',
- dataIndex: 'status_dictText',
- width: 100,
- },
+ // {
+ // title: '指令状态',
+ // align: 'center',
+ // dataIndex: 'status_dictText',
+ // width: 100,
+ // },
{
title: '是否启用',
align: 'center',
@@ -252,12 +252,12 @@ export const auditColumns: BasicColumn[] = [
dataIndex: 'serviceDuration',
width: 135,
},
- {
- title: '指令状态',
- align: 'center',
- dataIndex: 'status_dictText',
- width: 100,
- },
+ // {
+ // title: '指令状态',
+ // align: 'center',
+ // dataIndex: 'status_dictText',
+ // width: 100,
+ // },
{
title: '是否启用',
align: 'center',
diff --git a/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue b/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue
index d26067d..4d91efe 100644
--- a/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue
+++ b/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue
@@ -132,7 +132,8 @@
-
+
diff --git a/src/views/synchronization/directive/canadddirective/CanAddDirective.data.ts b/src/views/synchronization/directive/canadddirective/CanAddDirective.data.ts
index fda5e4b..319d5f1 100644
--- a/src/views/synchronization/directive/canadddirective/CanAddDirective.data.ts
+++ b/src/views/synchronization/directive/canadddirective/CanAddDirective.data.ts
@@ -1,54 +1,54 @@
-import {BasicColumn} from '/@/components/Table';
-import {FormSchema} from '/@/components/Table';
-import { rules} from '/@/utils/helper/validator';
+import { BasicColumn } from '/@/components/Table';
+import { FormSchema } from '/@/components/Table';
+import { rules } from '/@/utils/helper/validator';
import { render } from '/@/utils/common/renderUtils';
import { getWeekMonthQuarterYear } from '/@/utils';
//列表数据
export const columns: BasicColumn[] = [
+ {
+ title: '所属机构',
+ align: 'center',
+ dataIndex: 'orgCode_dictText',
+ },
{
title: '分类标签',
- align: "center",
- dataIndex: 'instructionTag'
+ align: 'center',
+ dataIndex: 'instructionTag',
},
{
title: '服务类别',
- align: "center",
- dataIndex: 'category'
+ align: 'center',
+ dataIndex: 'category',
},
{
title: '服务类型',
- align: "center",
- dataIndex: 'type'
+ align: 'center',
+ dataIndex: 'type',
},
{
title: '服务指令',
- align: "center",
- dataIndex: 'directiveName'
+ align: 'center',
+ dataIndex: 'directiveName',
},
{
title: '周期类型',
- align: "center",
- dataIndex: 'cycleType'
+ align: 'center',
+ dataIndex: 'cycleType',
},
{
title: '创建日期',
- align: "center",
- dataIndex: 'createTime'
- },
- {
- title: '所属部门',
- align: "center",
- dataIndex: 'orgCode_dictText'
+ align: 'center',
+ dataIndex: 'createTime',
},
];
// 高级查询数据
export const superQuerySchema = {
- instructionTag: {title: '分类标签',order: 0,view: 'text', type: 'string',},
- category: {title: '服务类别',order: 1,view: 'text', type: 'string',},
- type: {title: '服务类型',order: 2,view: 'text', type: 'string',},
- directiveName: {title: '服务指令',order: 3,view: 'text', type: 'string',},
- cycleType: {title: '周期类型',order: 4,view: 'text', type: 'string',},
- createTime: {title: '创建日期',order: 5,view: 'datetime', type: 'string',},
- orgCode: {title: '所属部门',order: 6,view: 'list', type: 'string',dictTable: "sys_depart", dictCode: 'org_code', dictText: 'depart_name',},
+ instructionTag: { title: '分类标签', order: 0, view: 'text', type: 'string' },
+ category: { title: '服务类别', order: 1, view: 'text', type: 'string' },
+ type: { title: '服务类型', order: 2, view: 'text', type: 'string' },
+ directiveName: { title: '服务指令', order: 3, view: 'text', type: 'string' },
+ cycleType: { title: '周期类型', order: 4, view: 'text', type: 'string' },
+ createTime: { title: '创建日期', order: 5, view: 'datetime', type: 'string' },
+ orgCode: { title: '所属部门', order: 6, view: 'list', type: 'string', dictTable: 'sys_depart', dictCode: 'org_code', dictText: 'depart_name' },
};
diff --git a/src/views/synchronization/directive/canadddirective/CanAddDirectiveList.vue b/src/views/synchronization/directive/canadddirective/CanAddDirectiveList.vue
index 09c79aa..9c8bd17 100644
--- a/src/views/synchronization/directive/canadddirective/CanAddDirectiveList.vue
+++ b/src/views/synchronization/directive/canadddirective/CanAddDirectiveList.vue
@@ -7,8 +7,8 @@
- 所属部门
- 所属机构
+
@@ -94,12 +94,12 @@ const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDat
const labelCol = reactive({
xs: 24,
sm: 4,
- xl: 6,
- xxl: 4
+ xl: 5,
+ xxl: 5
});
const wrapperCol = reactive({
xs: 24,
- sm: 20,
+ sm: 19,
});
/**
diff --git a/src/views/synchronization/directive/canadddirective/components/CanAddDirectiveForm.vue b/src/views/synchronization/directive/canadddirective/components/CanAddDirectiveForm.vue
index 2d1ec7b..79976ff 100644
--- a/src/views/synchronization/directive/canadddirective/components/CanAddDirectiveForm.vue
+++ b/src/views/synchronization/directive/canadddirective/components/CanAddDirectiveForm.vue
@@ -45,8 +45,9 @@
-
+
@@ -86,8 +87,8 @@
-
+
@@ -132,7 +133,7 @@
-
+
diff --git a/src/views/synchronization/directive/canadddirective/components/CanAddDirectiveModal.vue b/src/views/synchronization/directive/canadddirective/components/CanAddDirectiveModal.vue
index 692cc73..47dd7e9 100644
--- a/src/views/synchronization/directive/canadddirective/components/CanAddDirectiveModal.vue
+++ b/src/views/synchronization/directive/canadddirective/components/CanAddDirectiveModal.vue
@@ -1,13 +1,12 @@
-
+
关闭
-
+