diff --git a/.vscode/settings.json b/.vscode/settings.json index 571f5982..040f8ba2 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -143,7 +143,7 @@ }, "debug.onTaskErrors": "debugAnyway", - "diffEditor.ignoreTrimWhitespace": false, + "diffEditor.ignoreTrimWhitespace": true, "npm.packageManager": "pnpm", "css.validate": false, diff --git a/apps/web-contract/src/views/contract/approval/signing-basis/index.vue b/apps/web-contract/src/views/contract/approval/signing-basis/index.vue index 8e933260..1f636006 100644 --- a/apps/web-contract/src/views/contract/approval/signing-basis/index.vue +++ b/apps/web-contract/src/views/contract/approval/signing-basis/index.vue @@ -27,8 +27,6 @@ const searchRef = ref(); const { xGridRef, triggerProxy, gridProps } = useVxeTable({ ref: 'xGridRef' }); -const treeData = ref([]); - /** Hooks - 表格 */ const gridOptions = reactive( gridProps({ @@ -74,9 +72,6 @@ function handleDelete(row) { message.success('删除成功'); triggerProxy('reload'); }, - onCancel() { - console.log('Cancel'); - }, }); } @@ -115,8 +110,7 @@ onMounted(() => { const searchForm = ref({ ...getFormSchema(), - onSearch(context: any) { - console.log(searchRef.value); + onSearch(_context: any) { triggerProxy('reload'); }, }); diff --git a/apps/web-contract/src/views/contract/declaration/edit/basic-info-curd.tsx b/apps/web-contract/src/views/contract/declaration/edit/basic-info-curd.tsx index fcc724b7..69c3202e 100644 --- a/apps/web-contract/src/views/contract/declaration/edit/basic-info-curd.tsx +++ b/apps/web-contract/src/views/contract/declaration/edit/basic-info-curd.tsx @@ -28,14 +28,7 @@ export function getFormSchema(params: any = {}) { name: 'a-input', vModel: 'value', allowClear: false, - }, - conditionalRender: { - match({ form }) { - return true; - }, - render({ form }) { - return {form.contractName}; - }, + disabled: true, }, }, reportNo: { @@ -46,14 +39,7 @@ export function getFormSchema(params: any = {}) { name: 'a-input', vModel: 'value', allowClear: false, - }, - conditionalRender: { - match({ form }) { - return true; - }, - render({ form }) { - return {form.reportNo}; - }, + disabled: true, }, }, ctrType: { @@ -63,26 +49,13 @@ export function getFormSchema(params: any = {}) { component: { name: 'fs-dict-select', vModel: 'value', - class: 'min-w-[200px]', + class: 'min-w-[180px]', dict: dict({ async getData({ form = {}, getComponentRef }) { return filterContractTypes(contractTypeData, '-1'); }, }), - }, - conditionalRender: { - match({ form }) { - return true; - }, - render({ form }) { - const data = filterContractTypes(contractTypeData, '-1'); - for (const item of data) { - if (item.value === form.ctrType) { - return {item.label}; - } - } - return ; - }, + disabled: true, }, }, ctrTwoType: { @@ -92,7 +65,7 @@ export function getFormSchema(params: any = {}) { component: { name: 'fs-dict-select', vModel: 'value', - class: 'min-w-[200px]', + class: 'min-w-[180px]', dict: dict({ async getData({ form = {} }) { if (form.ctrType) { @@ -101,28 +74,18 @@ export function getFormSchema(params: any = {}) { return contractTypeData; }, }), - }, - conditionalRender: { - match({ form }) { - return true; - }, - render({ form }) { - const data = filterContractTypes(contractTypeData, form.ctrType); - for (const item of data) { - if (item.value === form.ctrTwoType) { - return {item.label}; - } - } - return ; - }, + disabled: true, }, }, ctrThreeType: { title: '三级类别', key: 'ctrTwoType', col: { span: 8 }, - render({ form }) { - return ; + component: { + name: 'a-input', + vModel: 'value', + class: 'min-w-[180px]', + disabled: true, }, }, budgetSum: { @@ -136,14 +99,7 @@ export function getFormSchema(params: any = {}) { class: 'w-full', min: 0, max: 9999, - }, - conditionalRender: { - match({ form }) { - return true; - }, - render({ form }) { - return {form.budgetSum}; - }, + disabled: true, }, }, priceType: { @@ -158,21 +114,7 @@ export function getFormSchema(params: any = {}) { dict: dict({ data: getDictOptions(DICT_TYPE.contract_currency_unit), }), - }, - conditionalRender: { - match({ form }) { - return true; - }, - render({ form }) { - return ( - - { - getDictObj(DICT_TYPE.contract_currency_unit, form.priceType) - ?.label - } - - ); - }, + disabled: true, }, }, fundAllocation: { @@ -183,25 +125,11 @@ export function getFormSchema(params: any = {}) { name: 'fs-dict-select', vModel: 'value', allowClear: false, - class: 'min-w-[200px]', + class: 'min-w-[180px]', dict: dict({ data: getDictOptions(DICT_TYPE.contract_fund_flow), }), - }, - conditionalRender: { - match({ form }) { - return true; - }, - render({ form }) { - return ( - - { - getDictObj(DICT_TYPE.contract_fund_flow, form.fundAllocation) - ?.label - } - - ); - }, + disabled: true, }, }, fundDitch: { @@ -212,28 +140,13 @@ export function getFormSchema(params: any = {}) { name: 'fs-dict-select', vModel: 'value', allowClear: false, - class: 'min-w-[200px]', + class: 'min-w-[180px]', dict: dict({ data: getDictOptions(DICT_TYPE.contract_funding_source), }), - }, - conditionalRender: { - match({ form }) { - return true; - }, - render({ form }) { - return ( - - { - getDictObj(DICT_TYPE.contract_funding_source, form.fundDitch) - ?.label - } - - ); - }, + disabled: true, }, }, - frameProtocol: { title: '框架协议', key: 'frameProtocol', @@ -244,18 +157,7 @@ export function getFormSchema(params: any = {}) { dict: dict({ data: getDictOptions(DICT_TYPE.common_whether), }), - }, - conditionalRender: { - match({ form }) { - return true; - }, - render({ form }) { - return ( - - {getDictObj(DICT_TYPE.common_whether, form.frameProtocol)?.label} - - ); - }, + disabled: true, }, }, frameProtocolCtr: { @@ -269,21 +171,7 @@ export function getFormSchema(params: any = {}) { dict: dict({ data: getDictOptions(DICT_TYPE.common_whether), }), - }, - conditionalRender: { - match({ form }) { - return true; - }, - render({ form }) { - return ( - - { - getDictObj(DICT_TYPE.common_whether, form.frameProtocolCtr) - ?.label - } - - ); - }, + disabled: true, }, }, organiza: { @@ -294,7 +182,7 @@ export function getFormSchema(params: any = {}) { name: 'fs-dict-radio', vModel: 'value', allowClear: false, - class: 'min-w-[200px]', + class: 'min-w-[180px]', dict: dict({ data: getDictOptions(DICT_TYPE.contract_organization_form), }), diff --git a/apps/web-contract/src/views/contract/declaration/list/index.vue b/apps/web-contract/src/views/contract/declaration/list/index.vue index 59b8f736..ccbbd73f 100644 --- a/apps/web-contract/src/views/contract/declaration/list/index.vue +++ b/apps/web-contract/src/views/contract/declaration/list/index.vue @@ -162,6 +162,16 @@ const searchForm = ref({ {{ row.ctrName }} + + diff --git a/apps/web-contract/src/views/contract/schema.ts b/apps/web-contract/src/views/contract/schema.ts index 366daee5..47434a1b 100644 --- a/apps/web-contract/src/views/contract/schema.ts +++ b/apps/web-contract/src/views/contract/schema.ts @@ -34,7 +34,7 @@ export function getTodoColumns(_params: any = {}): VxeGridPropTypes.Columns { { field: 'taskName', title: '任务', width: 200 }, { field: 'createTime', title: '分配时间', width: 150 }, { field: 'inputDepartName', title: '承办单位/部门', width: 150 }, - { field: 'assignee', title: '承办人', width: 100 }, + { field: 'assigneeName', title: '承办人', width: 100 }, { field: 'operate', title: '操作', diff --git a/apps/web-contract/src/views/contract/sign-authorization/edit/curd.tsx b/apps/web-contract/src/views/contract/sign-authorization/edit/curd.tsx index c278d5fb..2bca092b 100644 --- a/apps/web-contract/src/views/contract/sign-authorization/edit/curd.tsx +++ b/apps/web-contract/src/views/contract/sign-authorization/edit/curd.tsx @@ -31,7 +31,7 @@ export function getUserColumns(_params?: any): VxeGridPropTypes.Columns { } export function getFormSchema(params?: any): any { - const { formRef } = params || {}; + const { formRef, dictMap } = params || {}; const xGridRef = ref(); /** Hooks - 表格 */ @@ -66,8 +66,6 @@ export function getFormSchema(params?: any): any { } }; - const dictMap: any = {}; - return { col: { span: 24 }, initialForm: { @@ -195,10 +193,7 @@ export function getFormSchema(params?: any): any { col: { span: 24 }, render({ form }) { // 注意此处的v-model写法 - const options1 = getDictOptions( - DICT_TYPE.contract_authorization_period, - 'string', - ); + const options1 = dictMap[DICT_TYPE.contract_authorization_period]; return (
diff --git a/apps/web-contract/src/views/contract/sign-authorization/edit/index.vue b/apps/web-contract/src/views/contract/sign-authorization/edit/index.vue index 9da1ba2d..3e1c3401 100644 --- a/apps/web-contract/src/views/contract/sign-authorization/edit/index.vue +++ b/apps/web-contract/src/views/contract/sign-authorization/edit/index.vue @@ -13,7 +13,7 @@ import { } from 'ant-design-vue'; import Apis from '#/api'; -import { DICT_TYPE, getDictObj } from '#/utils/dict'; +import { DICT_TYPE, getDictDatasAsync, getDictObj } from '#/utils/dict'; import { FileUploader } from '#/utils/file'; import { logger } from '#/utils/logger'; import chooseUserModal from '#/views/system/user/choose-user-modal.vue'; @@ -45,6 +45,7 @@ const formBinding = ref({ ...(({ columns: _, ...rest }) => rest)( getFormSchema({ formRef, + dictMap: {}, }), ), }); @@ -258,8 +259,14 @@ async function handleSubmit(type) { } onMounted(async () => { + const data = await getDictDatasAsync([ + DICT_TYPE.contract_authorization_period, + ]); + + console.log(data); formBinding.value.columns = getFormSchema({ formRef, + dictMap: data, }).columns; const contractReferTypeData: any = await Apis.contractReferType.get_list({ diff --git a/apps/web-office/src/api/index.ts b/apps/web-office/src/api/index.ts index aa460ec7..696164fc 100644 --- a/apps/web-office/src/api/index.ts +++ b/apps/web-office/src/api/index.ts @@ -786,15 +786,40 @@ export default { http.post('/app/biddingResult/save', data), }, home: { - /** 合同系统/首页待办/已办 待办 */ + /** 合同系统/首页待办/已办 首页待办 */ get_todo: (data?: QueryOptions) => http.get('/app/home/todo', data), + /** 合同系统/首页待办/已办 首页已办 */ + get_done: (data?: QueryOptions) => http.get('/app/home/done', data), }, sqConsignPt: { /** 合同系统/签约授权 签约授权保存 */ post_saveSignMultiEntity: (data?: BodyOptions) => http.post('/app/sqConsignPt/saveSignMultiEntity', data), - /** 合同系统/签约授权 签约依据查询 */ + /** 合同系统/签约授权 签约授权查询 */ get_SigningaAuthorizationSerch: (data?: QueryOptions) => http.get('/app/sqConsignPt/SigningaAuthorizationSerch', data), + /** 合同系统/签约授权 查询单条签约授权数据 */ + get_getOne: (data?: QueryOptions) => + http.get('/app/sqConsignPt/getOne', data), + /** 合同系统/签约授权 签约授权提交 */ + post_flowStart: (data?: BodyOptions) => + http.post('/app/sqConsignPt/flowStart', data), + /** 合同系统/签约授权 删除 */ + post_deletes: (data?: BodyOptions) => + http.post('/app/sqConsignPt/deletes', data), + }, + addressorsort: { + /** 协同办公/会议管理/发言人顺序配置 发言人顺序查询 */ + get_page: (data?: QueryOptions) => + http.get('/app/addressorsort/page', data), + /** 协同办公/会议管理/发言人顺序配置 发言人排序保存 */ + post_save: (data?: BodyOptions) => + http.post('/app/addressorsort/save', data), + /** 协同办公/会议管理/发言人顺序配置 批量保存 */ + post_saveBatch: (data?: BodyOptions) => + http.post('/app/addressorsort/saveBatch', data), + /** 协同办公/会议管理/发言人顺序配置 删除 */ + post_deletes: (data?: BodyOptions) => + http.post('/app/addressorsort/deletes', data), }, }; diff --git a/apps/web-office/src/router/routes/modules/offfice.ts b/apps/web-office/src/router/routes/modules/offfice.ts index 6457d5e5..d1fc43fa 100644 --- a/apps/web-office/src/router/routes/modules/offfice.ts +++ b/apps/web-office/src/router/routes/modules/offfice.ts @@ -69,6 +69,15 @@ const routes: RouteRecordRaw[] = [ name: 'Meeting', path: '/meeting', children: [ + { + name: 'MeetingConfig', + path: '/meeting/config', + component: () => import('#/views/meeting/config/index.vue'), + meta: { + icon: 'lucide:area-chart', + title: '会议配置', + }, + }, { name: 'MeetingEdit', path: '/meeting/edit/:id?', diff --git a/apps/web-office/src/views/canteen/config/components/duty-people/duty-people.vue b/apps/web-office/src/views/canteen/config/components/duty-people/duty-people.vue index 64a8754c..ecee14bf 100644 --- a/apps/web-office/src/views/canteen/config/components/duty-people/duty-people.vue +++ b/apps/web-office/src/views/canteen/config/components/duty-people/duty-people.vue @@ -1,71 +1,25 @@ - - + + diff --git a/apps/web-office/src/views/canteen/config/index.vue b/apps/web-office/src/views/canteen/config/index.vue index 0997a16a..ae980e5a 100644 --- a/apps/web-office/src/views/canteen/config/index.vue +++ b/apps/web-office/src/views/canteen/config/index.vue @@ -1,61 +1,51 @@