yangjun
/
hldy_vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

服务指令镜像bug

This commit is contained in:
1378012178@qq.com 2025-08-05 15:55:42 +08:00
parent 77313c6659
commit 0fd29bb2a5
10 changed files with 103 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/views/services/serviceDirective/ConfigServiceDirective.data.ts
View File

@ -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',

3
src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue
View File

@ -132,7 +132,8 @@
<a-col :span="12">
<a-form-item label="服务指令描述" v-bind="validateInfos.serviceContent"
id="ConfigServiceDirectiveForm-serviceContent" name="serviceContent">
<a-textarea v-model:value="formData.serviceContent" :rows="2" placeholder="请输入服务指令描述" />
<a-textarea v-model:value="formData.serviceContent" :rows="2" placeholder="请输入服务指令描述"
:autosize="true" />
</a-form-item>
</a-col>
</a-row>

54
src/views/synchronization/directive/canadddirective/CanAddDirective.data.ts
View File

@ -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' },
};

10
src/views/synchronization/directive/canadddirective/CanAddDirectiveList.vue
View File

@ -7,8 +7,8 @@
<a-row :gutter="24">
<a-col :lg="6">
<a-form-item name="orgCode">
<template #label><span title="所属部门">所属部门</span></template>
<j-select-multiple placeholder="请选择所属部门" v-model:value="queryParam.orgCode"
<template #label><span title="所属机构">所属机构</span></template>
<j-select-multiple placeholder="请选择所属机构" v-model:value="queryParam.orgCode"
dictCode="sys_depart,depart_name,org_code" allow-clear />
</a-form-item>
</a-col>
@ -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,
});
/**

11
src/views/synchronization/directive/canadddirective/components/CanAddDirectiveForm.vue
View File

@ -45,8 +45,9 @@
<a-col :span="12">
<a-form-item label="服务类型" v-bind="validateInfos.typeId" id="ConfigServiceDirectiveForm-typeId"
name="typeId">
<j-dict-select-tag type="list" v-model:value="formData.typeId" :dictCode="typeDictCode" :orgCode="formData?.sysOrgCode"
:disabled="!formData.categoryId" placeholder="请选择服务类型" allowClear @upDictCode="upTypeDictCode" />
<j-dict-select-tag type="list" v-model:value="formData.typeId" :dictCode="typeDictCode"
:orgCode="formData?.sysOrgCode" :disabled="!formData.categoryId" placeholder="请选择服务类型" allowClear
@upDictCode="upTypeDictCode" />
</a-form-item>
</a-col>
<a-col :span="12">
@ -86,8 +87,8 @@
<a-col :span="12">
<a-form-item label="周期类型" v-bind="validateInfos.cycleType" id="ConfigServiceDirectiveForm-cycleType"
name="cycleType">
<j-dict-select-tag type="list" v-model:value="formData.cycleType" dictCode="period_type" :orgCode="formData?.sysOrgCode"
placeholder="请选择周期类型" allowClear @upDictCode="upCycleTypeDictCode" />
<j-dict-select-tag type="list" v-model:value="formData.cycleType" dictCode="period_type"
:orgCode="formData?.sysOrgCode" placeholder="请选择周期类型" allowClear @upDictCode="upCycleTypeDictCode" />
</a-form-item>
</a-col>
<a-col :span="12">
@ -132,7 +133,7 @@
<a-col :span="12">
<a-form-item label="服务指令描述" v-bind="validateInfos.serviceContent"
id="ConfigServiceDirectiveForm-serviceContent" name="serviceContent">
<a-textarea v-model:value="formData.serviceContent" :rows="2" placeholder="请输入服务指令描述" />
<a-textarea v-model:value="formData.serviceContent" :rows="2" placeholder="请输入服务指令描述" :autosize="true" />
</a-form-item>
</a-col>
<!-- </a-row> -->

7
src/views/synchronization/directive/canadddirective/components/CanAddDirectiveModal.vue
View File

@ -1,13 +1,12 @@
<template>
<j-modal :title="title" width="70vw" :visible="visible" @ok="handleOk"
:okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭"
:maskClosable="false">
<a-drawer :title="title" width="70vw" v-model:visible="visible" :footer-style="{ textAlign: 'right' }" @cancel="handleCancel"
cancelText="关闭" :maskClosable="true">
<template #footer>
<a-button @click="handleCancel">关闭</a-button>
</template>
<CanAddDirectiveForm ref="registerForm" v-if="visible" @ok="submitCallback" :formDisabled="disableSubmit"
:formBpm="false"></CanAddDirectiveForm>
</j-modal>
</a-drawer>
</template>
<script lang="ts" setup>

2
src/views/synchronization/directive/orgCom/OrgListCom.vue
View File

@ -221,7 +221,7 @@ defineExpose({
.ellipsis-one-lines {
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 1;
-webkit-line-clamp: 2;
overflow: hidden;
text-overflow: ellipsis;
}

11
src/views/synchronization/directive/serviceDirective/ConfigServiceDirectiveListModal.vue
View File

@ -1,7 +1,14 @@
<template>
<j-modal :title="title" width="75vw" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭" :maskClosable="false">
<!-- <j-modal :title="title" width="75vw" :visible="visible" @cancel="handleCancel" cancelText="关闭" :maskClosable="false">
<ConfigServiceDirectiveList ref="registerForm" v-if="visible" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></ConfigServiceDirectiveList>
</j-modal>
</j-modal> -->
<a-drawer :title="title" width="80vw" v-model:visible="visible" :closable="true"
:footer-style="{ textAlign: 'right' }" @close="handleCancel">
<ConfigServiceDirectiveList ref="registerForm" v-if="visible" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></ConfigServiceDirectiveList>
<template #footer>
<a-button type="primary" style="margin-right: 8px" @click="handleCancel">关闭</a-button>
</template>
</a-drawer>
</template>
<script lang="ts" setup>

29
src/views/synchronization/directive/syncList.vue
View File

@ -37,7 +37,7 @@
<ConfigServiceDirectiveListModal ref="configServiceDirectiveListModal" />
<SyncStepListModal ref="syncStepListModal" />
<a-modal v-model:visible="logsVisible" title="日志" width="90vw"
<!-- <a-modal v-model:visible="logsVisible" title="日志" width="90vw"
:bodyStyle="{ padding: '0', height: '70vh', display: 'flex', flexDirection: 'column', overflow: 'hidden' }"
wrapClassName="org-list-modal" @cancel="handleCancelLogs">
<a-row>
@ -51,21 +51,36 @@
<a-button @click="handleCancelLogs" type="primary">关闭</a-button>
</template>
<AsyncListComponent ref="logsRef"></AsyncListComponent>
</a-modal>
</a-modal> -->
<a-drawer title="日志" width="70vw" v-model:visible="logsVisible"
:bodyStyle="{ padding: '0', height: '70vh', display: 'flex', flexDirection: 'column', overflow: 'hidden' }"
wrapClassName="org-list-modal" @cancel="handleCancelLogs">
<a-row>
<a-col :span="2" :push="22" style="margin-top: 15px;margin-left: 30px;">
<a-button type="primary" @click="handleRefreshLogs" title="刷新">
刷新
</a-button>
</a-col>
</a-row>
<AsyncListComponent ref="logsRef"></AsyncListComponent>
<template #footer>
<a-button @click="handleCancelLogs" type="primary" style="float:right;">关闭</a-button>
</template>
</a-drawer>
<!-- 指令库 -->
<a-modal v-model:visible="directiveMainVisible" title="指令库" width="90vw"
<a-drawer v-model:visible="directiveMainVisible" title="指令库" width="80vw" :footer-style="{ textAlign: 'right' }"
:bodyStyle="{ padding: '0', height: '70vh', display: 'flex', flexDirection: 'column', overflow: 'hidden' }"
wrapClassName="org-list-modal" @cancel="handleCanceldirectiveMain">
<template #footer>
<a-button @click="handleCanceldirectiveMain" type="primary">关闭</a-button>
<a-button @click="handleCanceldirectiveMain" type="primary" style="margin-right: 10px;">关闭</a-button>
<a-button @click="handleAsyncdirectiveMain" type="primary">确认</a-button>
</template>
<OrgListCom ref="directiveMainComRef" :showDirectiveMain=true :showDirectiveChoose="true"
@handleOrgDetail="handleDetail" :showDetail=true @handleOrgChoose="directiveMainFunc">
</OrgListCom>
</a-modal>
</a-drawer>
<!-- 新增指令 -->
<a-modal v-model:visible="newDirectiveVisible" title="新增指令" width="90vw"
<a-drawer v-model:visible="newDirectiveVisible" title="新增指令" width="80vw" :footer-style="{ textAlign: 'right' }"
:bodyStyle="{ padding: '0', height: '70vh', display: 'flex', flexDirection: 'column', overflow: 'hidden' }"
wrapClassName="org-list-modal" @cancel="handleCancelNewDirective">
<template #footer>
@ -74,7 +89,7 @@
</template>
<CanAddDirectiveList ref="canAddDirectiveRef" :directiveMainOrgInfo="directiveMainOrgInfo"
:existDirectiveIds="existDirectiveIds"></CanAddDirectiveList>
</a-modal>
</a-drawer>
</div>
</template>

16
src/views/synchronization/directive/syncStep/SyncStepListModal.vue
View File

@ -14,6 +14,22 @@
<SyncStepList ref="registerForm" v-if="visible" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"
:fullscreen="true" style="height:100vh;" @closeModal="closeModal" @changeSyncText="changeSyncText"/>
</j-modal>
<!-- <a-drawer :title="title" width="100vw" v-model:visible="visible" :closable="true" :bodyStyle="{ padding: 0 }" :maskClosable="false" :keyboard="false"
:footer-style="{ textAlign: 'right' }" @close="handleCancel">
<SyncStepList ref="registerForm" v-if="visible" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"
:fullscreen="true" style="height:100vh;" @closeModal="closeModal" @changeSyncText="changeSyncText"/>
<template #footer>
<a-button @click="handleCancel">关闭</a-button>
<a-button @click="handleSyncFunc">{{syncText}}</a-button>
<a-button @click="previousStep"
v-show="!!registerForm && (registerForm?.stepVal == 1 || registerForm?.stepVal == 2 || registerForm?.stepVal == 3)">上一步</a-button>
<a-button @click="nextStep"
v-show="!!registerForm && (registerForm?.stepVal == 0 || registerForm?.stepVal == 1 || registerForm?.stepVal == 2)">下一步</a-button>
<a-button @click="registerForm?.syncFunc" type="primary"
v-show="!!registerForm && registerForm?.stepVal == 3">确认</a-button>
</template>
</a-drawer> -->
</template>
<script lang="ts" setup>