z9130
/
pansoft-plrl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
491 Commits 1 Branch 0 Tags 17 MiB
Commit Graph

491 Commits

Author SHA1 Message Date
z9130 15595b93b9 发言人顺序 2024-09-29 14:38:52 +08:00
z9130 68432d4d68 合同相关完善 2024-09-28 19:47:43 +08:00
z9130 736de72e9d 会议功能调整 2024-09-28 12:17:08 +08:00
z9130 0ffde22662 暂存 2024-09-27 19:13:17 +08:00
z9130 48fbc140f5 处理一些问题 2024-09-26 20:53:54 +08:00
z9130 d2e2d448ad Merge branch 'develop' of https://git.openserver.cn:8089/XinJiang/TheProjectOfFour/kelamayireligongsi/plrl/vue into develop 2024-09-25 20:19:59 +08:00
z9130 e1a74e81f0 会议和订餐功能调整 2024-09-25 20:19:48 +08:00
chenzhigang@pansoft.com 085e8c6a86 Merge branch 'develop' of https://git.openserver.cn:8089/XinJiang/TheProjectOfFour/kelamayireligongsi/plrl/vue into develop 2024-09-25 19:04:41 +08:00
chenzhigang@pansoft.com 8e5c2aaa6b 值班台账 2024-09-25 19:04:24 +08:00
chenzhigang@pansoft.com 8156e92453 1、值班台账增加说明 
2、备注有值列整行高亮显示
 2024-09-25 18:51:02 +08:00
z9130 9732f3300a 准备替换 时间虚位 2024-09-25 14:57:10 +08:00
z9130 c8b61880b1 协同办公界面优化 2024-09-24 20:04:11 +08:00
z9130 3b1197f9ec 协同办公优化 2024-09-24 17:39:51 +08:00
z9130 0149f4b10b 暂存 2024-09-23 20:27:14 +08:00
z9130 2ae6e8e0f6 common-utils 2024-09-23 15:40:25 +08:00
z9130 ae26298e71 签约授权功能 2024-09-20 20:13:38 +08:00
z9130 bb708ffbc0 Merge branch 'develop' of https://git.openserver.cn:8089/XinJiang/TheProjectOfFour/kelamayireligongsi/plrl/vue into develop 2024-09-20 16:51:17 +08:00
z9130 e2cf9353de 暂存 2024-09-20 16:51:08 +08:00
熊美虹 62b9d60fcd 提交合同查看 2024-09-20 16:43:38 +08:00
z9130 3985bf343f Merge branch 'develop' of https://git.openserver.cn:8089/XinJiang/TheProjectOfFour/kelamayireligongsi/plrl/vue into develop 2024-09-20 11:42:15 +08:00
z9130 c5d05d6038 选商 划分标段 2024-09-20 11:42:05 +08:00
熊美虹 0f72d31e9e 提交合同提示前端界面 2024-09-20 11:07:17 +08:00
熊美虹 3866fb8bc9 提交合同履行前端界面 2024-09-20 09:47:11 +08:00
z9130 06ae572098 优化问题 2024-09-19 16:46:03 +08:00
z9130 0730e89935 合同立项 办公用品结算 2024-09-18 19:44:09 +08:00
z9130 299c4f30cf 更新 .gitea/workflows/build-action.yaml 2024-09-17 13:02:47 +08:00
z9130 996e7a5146 actions test1
Gitea Actions Demo / Explore-Gitea-Actions (push) Has been cancelled Details
2024-09-16 11:40:49 +08:00
z9130 fe588ec25a 自动化字典vite plugins 2024-09-14 19:02:39 +08:00
z9130 c6f85765b6 签约授权功能开发 2024-09-13 19:41:25 +08:00
z9130 68cd4e882e 拆分协同办公和合同模板 2024-09-13 15:07:09 +08:00
z9130 4c326f9b58 合同相对人功能开发 2024-09-13 12:59:28 +08:00
z9130 8aeccb9fbf 自定义变更 2024-09-12 23:37:01 +08:00
z9130 6e1222943e Merge remote-tracking branch 'upstream/main' into develop 2024-09-12 23:36:40 +08:00
z9130 64cbd9e1eb 选择签约依据 2024-09-12 22:17:43 +08:00
Vben 76a879d4d8
fix: fixed some style issues (#4379) 2024-09-12 22:03:58 +08:00
z9130 e22e91e8f1 调整 maxLength 2024-09-12 17:44:03 +08:00
z9130 9decfcb729 签约依据功能完善 2024-09-12 16:40:37 +08:00
dependabot[bot] 537a4b0ecb
chore(deps): bump tailwindcss in the non-breaking-changes group (#4369) 
Bumps the non-breaking-changes group with 1 update: [tailwindcss](https://github.com/tailwindlabs/tailwindcss).


Updates `tailwindcss` from 3.4.10 to 3.4.11
- [Release notes](https://github.com/tailwindlabs/tailwindcss/releases)
- [Changelog](https://github.com/tailwindlabs/tailwindcss/blob/v3.4.11/CHANGELOG.md)
- [Commits](https://github.com/tailwindlabs/tailwindcss/compare/v3.4.10...v3.4.11)

---
updated-dependencies:
- dependency-name: tailwindcss
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: non-breaking-changes
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-09-12 10:07:08 +08:00
z9130 b1707302e9 选商完善 2024-09-12 09:14:15 +08:00
Vben 855ac02622
fix: select components used in modal pop-ups cannot be selected (#4368) 
* fix: select components used in modal pop-ups cannot be selected

* chore: update ci

* chore: update css
 2024-09-11 23:10:35 +08:00
Li Kui 61faa1895a
fix: vue received a Component that was made a reactive object (#4367) 2024-09-11 22:56:01 +08:00
z9130 4d2380c4f8 出差信息栏调整 2024-09-11 19:55:49 +08:00
Li Kui 8f6bf6add3
perf: update menu icons (#4357) 2024-09-11 16:23:24 +08:00
苗大 ceb52aad7f
fix: text overflow when text omission component width is lower than maxWidth (#4364) 2024-09-11 16:21:36 +08:00
dependabot[bot] 66c732fdee
chore(deps): bump the non-breaking-changes group across 1 directory with 2 updates (#4358) 
Bumps the non-breaking-changes group with 2 updates in the / directory: [vue](https://github.com/vuejs/core) and [vue-router](https://github.com/vuejs/router).


Updates `vue` from 3.5.3 to 3.5.4
- [Release notes](https://github.com/vuejs/core/releases)
- [Changelog](https://github.com/vuejs/core/blob/main/CHANGELOG.md)
- [Commits](https://github.com/vuejs/core/compare/v3.5.3...v3.5.4)

Updates `vue-router` from 4.4.3 to 4.4.4
- [Release notes](https://github.com/vuejs/router/releases)
- [Commits](https://github.com/vuejs/router/compare/v4.4.3...v4.4.4)

---
updated-dependencies:
- dependency-name: vue
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: non-breaking-changes
- dependency-name: vue-router
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: non-breaking-changes
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-09-11 15:10:36 +08:00
Li Kui 6e67fb5fe7
fix(@vben/docs): build failed on windows (#4362) 2024-09-11 14:26:42 +08:00
z9130 16e2611a1e 优化一些组件效果 2024-09-10 22:30:01 +08:00
vben 3697f6bc5a chore: release v5.3.0-beta.2 2024-09-10 22:20:51 +08:00
vben 978edb1e02 chore: release v5.3.0-beta.1 [skip ci] 2024-09-10 22:08:26 +08:00
dependabot[bot] b417ac2469
chore(deps): bump the non-breaking-changes group with 14 updates (#4347) 
* chore(deps): bump the non-breaking-changes group with 14 updates

Bumps the non-breaking-changes group with 14 updates:

| Package | From | To |
| --- | --- | --- |
| [typescript](https://github.com/microsoft/TypeScript) | `5.5.4` | `5.6.2` |
| [@iconify/json](https://github.com/iconify/icon-sets) | `2.2.245` | `2.2.246` |
| [postcss-preset-env](https://github.com/csstools/postcss-plugins/tree/HEAD/plugin-packs/postcss-preset-env) | `10.0.2` | `10.0.3` |
| [@jspm/generator](https://github.com/jspm/generator) | `2.2.0` | `2.3.0` |
| [vite-plugin-dts](https://github.com/qmhc/vite-plugin-dts) | `4.1.1` | `4.2.1` |
| [eslint-plugin-command](https://github.com/antfu/eslint-plugin-command) | `0.2.3` | `0.2.4` |
| [@eslint/js](https://github.com/eslint/eslint/tree/HEAD/packages/js) | `9.9.1` | `9.10.0` |
| [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) | `8.4.0` | `8.5.0` |
| [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) | `8.4.0` | `8.5.0` |
| [eslint](https://github.com/eslint/eslint) | `9.9.1` | `9.10.0` |
| [eslint-plugin-perfectionist](https://github.com/azat-io/eslint-plugin-perfectionist) | `3.4.0` | `3.5.0` |
| [watermark-js-plus](https://github.com/zhensherlock/watermark-js-plus) | `1.5.5` | `1.5.6` |
| [circular-dependency-scanner](https://github.com/emosheeep/circular-dependency-scanner) | `2.2.2` | `2.3.0` |
| [@tanstack/vue-query](https://github.com/TanStack/query/tree/HEAD/packages/vue-query) | `5.54.2` | `5.55.4` |


Updates `typescript` from 5.5.4 to 5.6.2
- [Release notes](https://github.com/microsoft/TypeScript/releases)
- [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml)
- [Commits](https://github.com/microsoft/TypeScript/compare/v5.5.4...v5.6.2)

Updates `@iconify/json` from 2.2.245 to 2.2.246
- [Commits](https://github.com/iconify/icon-sets/compare/2.2.245...2.2.246)

Updates `postcss-preset-env` from 10.0.2 to 10.0.3
- [Changelog](https://github.com/csstools/postcss-plugins/blob/main/plugin-packs/postcss-preset-env/CHANGELOG.md)
- [Commits](https://github.com/csstools/postcss-plugins/commits/HEAD/plugin-packs/postcss-preset-env)

Updates `@jspm/generator` from 2.2.0 to 2.3.0
- [Release notes](https://github.com/jspm/generator/releases)
- [Commits](https://github.com/jspm/generator/compare/2.2.0...2.3.0)

Updates `vite-plugin-dts` from 4.1.1 to 4.2.1
- [Release notes](https://github.com/qmhc/vite-plugin-dts/releases)
- [Changelog](https://github.com/qmhc/vite-plugin-dts/blob/main/CHANGELOG.md)
- [Commits](https://github.com/qmhc/vite-plugin-dts/compare/v4.1.1...v4.2.1)

Updates `eslint-plugin-command` from 0.2.3 to 0.2.4
- [Release notes](https://github.com/antfu/eslint-plugin-command/releases)
- [Commits](https://github.com/antfu/eslint-plugin-command/compare/v0.2.3...v0.2.4)

Updates `@eslint/js` from 9.9.1 to 9.10.0
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/commits/v9.10.0/packages/js)

Updates `@typescript-eslint/eslint-plugin` from 8.4.0 to 8.5.0
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.5.0/packages/eslint-plugin)

Updates `@typescript-eslint/parser` from 8.4.0 to 8.5.0
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.5.0/packages/parser)

Updates `eslint` from 9.9.1 to 9.10.0
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v9.9.1...v9.10.0)

Updates `eslint-plugin-perfectionist` from 3.4.0 to 3.5.0
- [Release notes](https://github.com/azat-io/eslint-plugin-perfectionist/releases)
- [Changelog](https://github.com/azat-io/eslint-plugin-perfectionist/blob/main/changelog.md)
- [Commits](https://github.com/azat-io/eslint-plugin-perfectionist/compare/v3.4.0...v3.5.0)

Updates `watermark-js-plus` from 1.5.5 to 1.5.6
- [Release notes](https://github.com/zhensherlock/watermark-js-plus/releases)
- [Changelog](https://github.com/zhensherlock/watermark-js-plus/blob/main/CHANGELOG.md)
- [Commits](https://github.com/zhensherlock/watermark-js-plus/compare/v1.5.5...v1.5.6)

Updates `circular-dependency-scanner` from 2.2.2 to 2.3.0
- [Release notes](https://github.com/emosheeep/circular-dependency-scanner/releases)
- [Changelog](https://github.com/emosheeep/circular-dependency-scanner/blob/master/CHANGELOG.md)
- [Commits](https://github.com/emosheeep/circular-dependency-scanner/compare/v2.2.2...v2.3.0)

Updates `@tanstack/vue-query` from 5.54.2 to 5.55.4
- [Release notes](https://github.com/TanStack/query/releases)
- [Commits](https://github.com/TanStack/query/commits/v5.55.4/packages/vue-query)

---
updated-dependencies:
- dependency-name: typescript
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: non-breaking-changes
- dependency-name: "@iconify/json"
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: non-breaking-changes
- dependency-name: postcss-preset-env
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: non-breaking-changes
- dependency-name: "@jspm/generator"
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: non-breaking-changes
- dependency-name: vite-plugin-dts
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: non-breaking-changes
- dependency-name: eslint-plugin-command
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: non-breaking-changes
- dependency-name: "@eslint/js"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: non-breaking-changes
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: non-breaking-changes
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: non-breaking-changes
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: non-breaking-changes
- dependency-name: eslint-plugin-perfectionist
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: non-breaking-changes
- dependency-name: watermark-js-plus
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: non-breaking-changes
- dependency-name: circular-dependency-scanner
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: non-breaking-changes
- dependency-name: "@tanstack/vue-query"
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: non-breaking-changes
...

Signed-off-by: dependabot[bot] <support@github.com>

* chore: update deps

* chore: typo

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-09-10 22:05:11 +08:00