From 9decfcb729ad7ddfd9525812f355a70b69817581 Mon Sep 17 00:00:00 2001 From: z9130 <984661593@qq.com> Date: Thu, 12 Sep 2024 16:40:37 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AD=BE=E7=BA=A6=E4=BE=9D=E6=8D=AE=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-office/src/api/index.ts | 9 +- apps/web-office/src/common/unit.ts | 2 + apps/web-office/src/layouts/basic.vue | 1 + .../src/views/canteen/collect/index.vue | 16 +- .../canteen/orderfood/orderfood/orderfood.vue | 91 ++++---- .../src/views/contract/approval/edit/curd.tsx | 1 - .../src/views/contract/approval/list/crud.tsx | 44 +++- .../views/contract/approval/list/index.vue | 18 +- .../contract/approval/signing-basis/crud.tsx | 115 ++++------ .../contract/approval/signing-basis/index.vue | 200 +++++------------- .../signing-basis-edit-modal.vue | 169 ++++++++++++++- .../business/edit/basic-info-curd.tsx | 134 ++++++------ .../src/views/contract/business/edit/curd.tsx | 110 ++++------ .../views/contract/business/edit/index.vue | 87 +++++++- .../src/views/contract/business/list/crud.tsx | 11 +- .../src/views/duty/list/duty-edit-modal.vue | 14 +- apps/web-office/vite.config.mts | 18 +- 17 files changed, 602 insertions(+), 438 deletions(-) diff --git a/apps/web-office/src/api/index.ts b/apps/web-office/src/api/index.ts index 1db74cce..8338cf2d 100644 --- a/apps/web-office/src/api/index.ts +++ b/apps/web-office/src/api/index.ts @@ -505,5 +505,12 @@ export default { /** 协同办公/督查督办/反馈记录 删除反馈记录 */ post_deletes: (data?: BodyOptions) => http.post("/app/superviseFeedbackRecord/deletes", data), }, - + lxBasisSale: { + /** 合同系统/签约依据 分页保存/修改 */ + post_save: (data?: BodyOptions) => http.post("/app/lxBasisSale/save", data), + /** 合同系统/签约依据 查询 */ + get_page: (data?: QueryOptions) => http.get("/app/lxBasisSale/page", data), + /** 合同系统/签约依据 删除测试 */ + post_deletes: (data?: BodyOptions) => http.post("/app/lxBasisSale/deletes", data), + }, } diff --git a/apps/web-office/src/common/unit.ts b/apps/web-office/src/common/unit.ts index a2be8f14..3e55527e 100644 --- a/apps/web-office/src/common/unit.ts +++ b/apps/web-office/src/common/unit.ts @@ -7,6 +7,8 @@ export const unitComponentProps = { allowClear: true, class: 'min-w-[180px]', showCheckedStrategy: "SHOW_CHILD", + showSearch: true, + "tree-node-filter-prop": "label", dict: dict({ isTree: true, async getData(dict, context) { diff --git a/apps/web-office/src/layouts/basic.vue b/apps/web-office/src/layouts/basic.vue index f5c35393..566ed063 100644 --- a/apps/web-office/src/layouts/basic.vue +++ b/apps/web-office/src/layouts/basic.vue @@ -134,6 +134,7 @@ function handleMenuClick(e) { czg zp zzz + xmh {{ value ? "代理" + value : "代理切换" }} diff --git a/apps/web-office/src/views/canteen/collect/index.vue b/apps/web-office/src/views/canteen/collect/index.vue index 2bf1fee0..50502da0 100644 --- a/apps/web-office/src/views/canteen/collect/index.vue +++ b/apps/web-office/src/views/canteen/collect/index.vue @@ -1,17 +1,9 @@ @@ -172,7 +195,7 @@ const orderTimeArr = ref([]); const showHelpMessageCount = ref(0); -const debuggerLocation = ref("basic"); // basic government +const debuggerLocation = ref("government"); // basic government let location = ref(""); const isOpening = computed(() => { @@ -218,7 +241,7 @@ const todayOrderInfo = ref({}) const autoPeopleInfo = ref({}); let isLoading = ref(false) -function loadTodayOrderInfo() { +async function loadTodayOrderInfo() { isLoading.value = true; const userStore = useUserStore(); Apis.orderfood.get_getOne({ @@ -352,12 +375,7 @@ function handleOrder(type: "confirm" | "cancel") { message.error("请选择就餐方式"); return; } - if (!form.stapleFood) { - message.error("请选择派送地址"); - return; - } - // if ( location.value && form.diningMode == "delivery" && @@ -367,32 +385,27 @@ function handleOrder(type: "confirm" | "cancel") { return; } - if (form.diningMode != "delivery") { + if (form.diningMode === "eat-in") { delete form.addressId; delete form.address; - } else { - // for (const item of addressData) { - // if (item.id == submitForm.value.address) { - // submitForm.value.address = item.label - // } - // } + delete form.stapleFood } console.log(submitForm.value) - - console.log("提交表单", form); isLoading.value = true + form.guid = todayOrderInfo.value.guid + Apis.orderfood.post_save({ - data: { guid: todayOrderInfo.value.guid } + data: form }).then(() => { message.success("订餐成功") loadTodayOrderInfo(); }).finally(() => { - isLoading.value = false + // isLoading.value = false }) } @@ -404,7 +417,7 @@ function handleOrder(type: "confirm" | "cancel") { message.success("订餐取消成功") loadTodayOrderInfo(); }).finally(() => { - isLoading.value = false + // isLoading.value = false }) } } diff --git a/apps/web-office/src/views/contract/approval/edit/curd.tsx b/apps/web-office/src/views/contract/approval/edit/curd.tsx index 45e5c731..6eb1d98d 100644 --- a/apps/web-office/src/views/contract/approval/edit/curd.tsx +++ b/apps/web-office/src/views/contract/approval/edit/curd.tsx @@ -141,7 +141,6 @@ export function getFormSchema(params: any = {}) { min: 0, max: 9999, }, - }, priceType: { title: '', diff --git a/apps/web-office/src/views/contract/approval/list/crud.tsx b/apps/web-office/src/views/contract/approval/list/crud.tsx index 790faa0f..5f37c779 100644 --- a/apps/web-office/src/views/contract/approval/list/crud.tsx +++ b/apps/web-office/src/views/contract/approval/list/crud.tsx @@ -3,9 +3,30 @@ import { useRender } from '#/hooks/useRender'; import dayjs from 'dayjs'; import { DICT_TYPE, getDictOptions } from '#/utils/dict'; import { dict } from '@fast-crud/fast-crud'; +import Apis from '#/api' export const PrimaryKey = 'guid'; +/** + * 筛选合同列表数据 + * + */ +async function filterContractTypes(parentId: string) { + try { + let contractReferTypeData = await Apis.contractReferType.get_list({ params: {} }) + return contractReferTypeData.rows.map((item) => { + item.label = item.contrLevelName; + item.value = item.contrLevelId; + return item; + }).filter((item) => item.parentId === parentId); + } catch (error) { + console.log(error) + return [] + } + +} + + export function getColumns(params: any = {}): VxeGridPropTypes.Columns { return [ { type: 'radio', width: 40, slots: { radio: 'radio_cell' }, align: 'center', fixed: 'left' }, @@ -42,6 +63,7 @@ export function getColumns(params: any = {}): VxeGridPropTypes.Columns { } } }, + { field: 'createTime', title: '申报时间', width: 130 }, { field: 'inputPerson', title: '承办人', width: 100 }, { field: 'inputDepartName', title: '承办部门', width: 100 }, { field: 'inputDate', title: '承办时间', width: 130 }, @@ -56,6 +78,7 @@ export function getColumns(params: any = {}): VxeGridPropTypes.Columns { } export function getFormSchema(_params: any = {}) { + return { initialForm: { }, @@ -116,16 +139,31 @@ export function getFormSchema(_params: any = {}) { return (
- + 至 - +
); } - } + }, + ctrType: { + title: "合同类别", + key: "ctrType", + show: true, + component: { + name: "fs-dict-select", + vModel: "value", + class: 'min-w-[200px]', + dict: dict({ + async getData({ form = {} }) { + return await filterContractTypes("-1"); + }, + }), + } + }, }, }; } diff --git a/apps/web-office/src/views/contract/approval/list/index.vue b/apps/web-office/src/views/contract/approval/list/index.vue index 617e64d6..a8b94ad6 100644 --- a/apps/web-office/src/views/contract/approval/list/index.vue +++ b/apps/web-office/src/views/contract/approval/list/index.vue @@ -55,6 +55,13 @@ const [_Modal, modalApi] = useVbenModal({ }, }); +const searchFormBinding = ref({ + ...getFormSchema(), + onSearch(context: any) { + triggerProxy('reload') + } +}); + const { xGridRef, triggerProxy, gridProps } = useVxeTable({ ref: 'xGridRef' }); @@ -132,16 +139,11 @@ function handleCellClick({ row }) { setSelectRow(row); } -onMounted(() => { + +onMounted(async () => { triggerProxy('reload') }) -const searchForm = ref({ - ...getFormSchema(), - onSearch(context: any) { - triggerProxy('reload') - } -}); function toPage() { window.open("/iframe/meeting/standing-book", "_blank"); @@ -156,7 +158,7 @@ function toDetail(row) {