- -[](LICENSE) - -
- 
- 
- 
-
](http://godban.github.io/browsers-support-badges/)IE | [](http://godban.github.io/browsers-support-badges/)Edge | [
](http://godban.github.io/browsers-support-badges/)Firefox | [
](http://godban.github.io/browsers-support-badges/)Chrome | [
](http://godban.github.io/browsers-support-badges/)Safari |
-| :-: | :-: | :-: | :-: | :-: |
-| サポートしない | 最新2バージョン | 最新2バージョン | 最新2バージョン | 最新2バージョン |
-
-## メンテナー
-
-[@Vben](https://github.com/anncwb)
-
-## 寄付
-
-このプロジェクトが役に立つと思われた場合、作者にコーヒーを一杯おごってサポートを示すことができます！
-
-
-
-Paypal Me
-
-## 貢献者
-
-
- 
-
-
-## Discord
-
-- [Github Discussions](https://github.com/anncwb/vue-vben-admin/discussions)
-
-## ライセンス
-
-[MIT © Vben-2020](./LICENSE)
diff --git a/README.md b/README.md
index 0f58308c..e69de29b 100644
--- a/README.md
+++ b/README.md
@@ -1,148 +0,0 @@
-
-
-
-
-
](http://godban.github.io/browsers-support-badges/)IE | [](http://godban.github.io/browsers-support-badges/)Edge | [](http://godban.github.io/browsers-support-badges/)Firefox | [](http://godban.github.io/browsers-support-badges/)Chrome | [](http://godban.github.io/browsers-support-badges/)Safari |
-| :-: | :-: | :-: | :-: | :-: |
-| not support | last 2 versions | last 2 versions | last 2 versions | last 2 versions |
-
-## Maintainer
-
-[@Vben](https://github.com/anncwb)
-
-## Donate
-
-If you think this project is helpful to you, you can help the author buy a cup of coffee to show your support!
-
-
-
-Paypal Me
-
-## Contributor
-
-
-
-
-
-## Discord
-
-- [Github Discussions](https://github.com/anncwb/vue-vben-admin/discussions)
-
-## License
-
-[MIT © Vben-2020](./LICENSE)
diff --git a/README.zh-CN.md b/README.zh-CN.md
deleted file mode 100644
index 3c586bd5..00000000
--- a/README.zh-CN.md
+++ /dev/null
@@ -1,148 +0,0 @@
-
-
-
-
-
](http://godban.github.io/browsers-support-badges/)IE | [](http://godban.github.io/browsers-support-badges/)Edge | [](http://godban.github.io/browsers-support-badges/)Firefox | [](http://godban.github.io/browsers-support-badges/)Chrome | [](http://godban.github.io/browsers-support-badges/)Safari |
-| :-: | :-: | :-: | :-: | :-: |
-| not support | last 2 versions | last 2 versions | last 2 versions | last 2 versions |
-
-## 维护者
-
-[@Vben](https://github.com/anncwb)
-
-## 捐赠
-
-如果你觉得这个项目对你有帮助，你可以帮作者买一杯咖啡表示支持!
-
-
-
-Paypal Me
-
-## 更新日志
-
-[CHANGELOG](https://github.com/vbenjs/vue-vben-admin/releases)
-
-## Contributor
-
-
-
-
-
-## Discord
-
-- [Github Discussions](https://github.com/anncwb/vue-vben-admin/discussions)
-
-## License
-
-[MIT © Vben-2020](./LICENSE)
diff --git a/apps/web-office/src/plugins/vxeTable.ts b/apps/web-office/src/plugins/vxeTable.ts
index cc408cce..850334f0 100644
--- a/apps/web-office/src/plugins/vxeTable.ts
+++ b/apps/web-office/src/plugins/vxeTable.ts
@@ -171,7 +171,7 @@ VXETable.use(VXETablePluginExportXLSX, {
})
VXETable.setConfig({
- zIndex: 9999,
+ // zIndex: 9999,
grid: {
size: 'mini',
proxyConfig: {
diff --git a/apps/web-office/src/router/routes/core.ts b/apps/web-office/src/router/routes/core.ts
index e6b2dbe4..8d572c20 100644
--- a/apps/web-office/src/router/routes/core.ts
+++ b/apps/web-office/src/router/routes/core.ts
@@ -31,6 +31,9 @@ const coreRoutes: RouteRecordRaw[] = [
},
{
component: AuthPageLayout,
+ props: {
+ toolbar: false,
+ },
meta: {
title: 'Authentication',
},
diff --git a/apps/web-office/src/router/routes/modules/contract.ts b/apps/web-office/src/router/routes/modules/contract.ts
index e6191055..8f9268dd 100644
--- a/apps/web-office/src/router/routes/modules/contract.ts
+++ b/apps/web-office/src/router/routes/modules/contract.ts
@@ -84,7 +84,7 @@ const routes: RouteRecordRaw[] = [
},
children: [
{
- name: 'ContractBusiness',
+ name: 'ContractBusinessEdit',
path: '/contract/business/edit/:id?',
beforeEnter: (e) => {
if (e.params.id && e.params.id === ':id') {
@@ -129,6 +129,24 @@ const routes: RouteRecordRaw[] = [
title: '合同申报',
},
children: [
+ {
+ name: 'ContractDeclarationEdit',
+ path: '/contract/declaration/edit/:id?',
+ beforeEnter: (e) => {
+ if (e.params.id && e.params.id === ':id') {
+ e.params.id = ''
+ e.fullPath = '/contract/declaration/edit'
+ }
+ },
+ component: () => import('#/views/contract/declaration/edit/index.vue'),
+ meta: {
+ hideInMenu: true,
+ hideInTab: true,
+ icon: 'lucide:area-chart',
+ title: '申报填报',
+ activePath: '/contract/declaration/edit/:id?'
+ },
+ },
{
name: 'ContractDeclarationTodo',
path: '/contract/declaration/todo',
diff --git a/apps/web-office/src/views/_core/authentication/login.vue b/apps/web-office/src/views/_core/authentication/login.vue
index 5ac44b50..252a7b96 100644
--- a/apps/web-office/src/views/_core/authentication/login.vue
+++ b/apps/web-office/src/views/_core/authentication/login.vue
@@ -33,7 +33,7 @@ const formSchema = computed((): VbenFormSchema[] => {
{
component: 'VbenInput',
componentProps: {
- class:"w-full",
+ class: 'w-full',
placeholder: $t('authentication.usernameTip'),
},
dependencies: {
@@ -79,18 +79,23 @@ function mockLogin(username: string, password: string, isSkip: boolean = true) {
- 快速登录
开始时间：{{ row.starttime }}
结束时间：{{ row.endtime }}
-{{ row.name + "-" + row.idNumber }} -
+{{ row.unit }}
diff --git a/apps/web-office/src/views/contract/approval/edit/index.vue b/apps/web-office/src/views/contract/approval/edit/index.vue index 3221001c..486529c5 100644 --- a/apps/web-office/src/views/contract/approval/edit/index.vue +++ b/apps/web-office/src/views/contract/approval/edit/index.vue @@ -15,8 +15,17 @@ import { getFormSchema } from "./curd"; import { FileUploader } from "#/utils/file"; import { DICT_TYPE, getDictObj, getDictOptions } from "#/utils/dict"; import { useVxeTable } from "#/hooks/vxeTable"; +import chooseSigningBasisModal from "../signing-basis/choose-signing-basis-modal.vue"; +import { useRender } from "#/hooks/useRender"; + const { xGridRef, gridProps, triggerProxy } = useVxeTable({ ref: "xGridRef" }); + +const [ChooseSigningBasisModal, chooseSigningBasisModalApi] = useVbenModal({ + connectedComponent: chooseSigningBasisModal, +}); + + const fileUploader = new FileUploader({}) const router = useRouter(); @@ -44,24 +53,49 @@ const formBinding = ref({ columns: {} }); -function getColumns(): any { +function getColumns(params): any { return [ { type: "seq", title: "序号", width: 60 }, - { field: "referenceName", title: "签约依据名称", minWidth: 150 }, - { field: "referenceId", title: "签约依据编号", width: 200 }, - { field: "attachments", title: "附件", width: 120 }, + { field: 'basisId', title: '依据号', width: 130 }, + { + field: 'basisName', + title: '依据名称', + width: 200, + }, + { field: 'basisNum', title: '依据编号', width: 180 }, + { + field: 'basisTypeId', + title: '依据类型', + width: 100, + slots: { + default: ({ row }) => { + return getDictObj(DICT_TYPE.contractBasisType, row.basisTypeId) + ?.label; + }, + }, + }, + { + field: 'endDate', + title: '有效期', + width: 150, + slots: { + default: ({ row }) => { + return useRender.renderDate(row.endDate, 'YYYY-MM-DD'); + }, + }, + }, { title: "操作", width: 120, - slots: { default: "operation" }, + slots: { default: "operate" }, }, ]; } /** Hooks - 表格 */ const gridOptions = reactive(gridProps({ - minHeight: "300px", - columns: getColumns(), + height: "200px", + columns: getColumns({ isMultiple: true }), data: [], toolbarConfig: { enabled: false, @@ -112,8 +146,8 @@ function back() { router.replace('/contract/approval/list') } -function handleOpenSignBasisModal(row) { - +function handleOpenSignBasisChooseModal(row) { + chooseSigningBasisModalApi.open() } const handleChange = (info: UploadChangeParam) => { @@ -156,6 +190,18 @@ function loadDataByContractTypeData() { } +function handleChooseConfirm(rows) { + const $grid = xGridRef.value; + // 判断上一个新增项有无完成，未完成则不允许新增 + if ($grid) { + $grid.remove(); + $grid.insert(rows).then(({ row }) => { }); + } else { + console.error("xGridRef不存在"); + } +} + + async function handleSave() { isLoading.value = true @@ -210,18 +256,30 @@ async function handleSave() { console.log(newForm) - await Apis.contractBaseInfo.post_apply({ data: newForm }).then((data) => { - message.success("保存成功"); - Modal.confirm({ - title: "提示", - content: "保存成功！是否进行提交？", - onOk: () => { - handleSubmit() - }, - onCancel: () => { - back(); - }, - }); + + let result = await Apis.contractBaseInfo.post_apply({ data: newForm }); + + return + // 判断有没有签约依据 + let tableFullData = xGridRef.value?.getTableData().fullData + if (tableFullData && tableFullData.length) { + newForm.guid = result.data.guid + newForm.basisId = tableFullData[0].basisId + await Apis.contractBaseInfo.post_apply({ data: newForm }) + } + + console.log(result) + + message.success("保存成功"); + Modal.confirm({ + title: "提示", + content: "保存成功！是否进行提交？", + onOk: () => { + handleSubmit() + }, + onCancel: () => { + back(); + } }); } catch (error) { message.error("提交失败，请稍候再试"); @@ -255,10 +313,6 @@ onMounted(async () => { isLoading.value = true console.log(id) - // let formSchema = getFormSchema() - - // formBinding.value = formSchema - try { let contractReferTypeData = await Apis.contractReferType.get_list({ params: {} }) @@ -269,7 +323,7 @@ onMounted(async () => { }) if (id) { - let data = await Apis.contractBaseInfo.get_getOne({ params: { guid: id } }) + let data:any = await Apis.contractBaseInfo.get_getOne({ params: { guid: id } }) console.log(data) currData.value = data; @@ -277,6 +331,14 @@ onMounted(async () => { formRef.value.setFormData(data) }) + // 如果有签约依据 + if(data.basisId){ + let basisList = await Apis.lxBasisSale.get_page({params:{basisId:data.basisId}}) + nextTick(() => { + xGridRef.value.insert(basisList.rows) + }) + } + if (data.fileUuid) { let files = await fileUploader.select(data.fileUuid) console.log(files) @@ -311,6 +373,8 @@ onMounted(async () => {- 值班信息栏 -
+值班信息栏
-