From 5a548d8e38767e27891920fe3e5fb350d422b3de Mon Sep 17 00:00:00 2001 From: lframework Date: Mon, 13 May 2024 18:58:49 +0800 Subject: [PATCH 01/34] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=E5=95=86?= =?UTF-8?q?=E5=93=81=E9=80=89=E6=8B=A9=E9=87=8D=E5=A4=8D=E4=B8=8B=E7=9A=84?= =?UTF-8?q?autocomplete=E5=BC=82=E5=B8=B8=E5=8F=8D=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/sc/stock/adjust/cost/index.ts | 2 +- src/api/sc/stock/adjust/stock/index.ts | 2 +- src/api/sc/stock/take/sheet/index.ts | 2 +- src/views/sc/stock/adjust/cost/add.vue | 21 ++++++++++++++------- src/views/sc/stock/adjust/cost/modify.vue | 10 ++++++++-- src/views/sc/stock/adjust/stock/add.vue | 10 ++++++++-- src/views/sc/stock/adjust/stock/modify.vue | 10 ++++++++-- src/views/sc/stock/take/pre/add.vue | 10 ++++++++-- src/views/sc/stock/take/pre/modify.vue | 10 ++++++++-- src/views/sc/stock/take/sheet/add.vue | 10 ++++++++-- src/views/sc/stock/take/sheet/modify.vue | 10 ++++++++-- src/views/sc/stock/transfer/add.vue | 10 ++++++++-- src/views/sc/stock/transfer/modify.vue | 10 ++++++++-- 13 files changed, 89 insertions(+), 28 deletions(-) diff --git a/src/api/sc/stock/adjust/cost/index.ts b/src/api/sc/stock/adjust/cost/index.ts index 6cb93bf..1bf3aed 100644 --- a/src/api/sc/stock/adjust/cost/index.ts +++ b/src/api/sc/stock/adjust/cost/index.ts @@ -76,7 +76,7 @@ export function searchProducts( ): Promise { return defHttp.get( { - url: baseUrl + '/products/search', + url: baseUrl + '/product/search', params: { scId, condition, diff --git a/src/api/sc/stock/adjust/stock/index.ts b/src/api/sc/stock/adjust/stock/index.ts index 3ea5bf3..5cdd158 100644 --- a/src/api/sc/stock/adjust/stock/index.ts +++ b/src/api/sc/stock/adjust/stock/index.ts @@ -73,7 +73,7 @@ export function getDetail(id: string): Promise { export function searchProducts(scId: string, condition: string): Promise { return defHttp.get( { - url: baseUrl + '/products/search', + url: baseUrl + '/product/search', params: { scId, condition, diff --git a/src/api/sc/stock/take/sheet/index.ts b/src/api/sc/stock/take/sheet/index.ts index 5e7af6b..b286868 100644 --- a/src/api/sc/stock/take/sheet/index.ts +++ b/src/api/sc/stock/take/sheet/index.ts @@ -71,7 +71,7 @@ export function getDetail(id: string): Promise { export function searchProducts(planId: string, condition: string): Promise { return defHttp.get( { - url: baseUrl + '/products/search', + url: baseUrl + '/product/search', params: { planId, condition, diff --git a/src/views/sc/stock/adjust/cost/add.vue b/src/views/sc/stock/adjust/cost/add.vue index 5ddbd33..de9bd82 100644 --- a/src/views/sc/stock/adjust/cost/add.vue +++ b/src/views/sc/stock/adjust/cost/add.vue @@ -120,12 +120,12 @@ diff --git a/src/components/registerGlobComp.ts b/src/components/registerGlobComp.ts index 4343aa3..fcacaa0 100644 --- a/src/components/registerGlobComp.ts +++ b/src/components/registerGlobComp.ts @@ -27,6 +27,7 @@ import CustomList from '@/components/CustomList'; import CustomSelector from '@/components/CustomSelector'; import CustomPage from '@/components/CustomPage'; import OrderTimeLine from '@/components/OrderTimeLine'; +import DataDicPicker from '@/components/DataDicPicker'; export async function registerGlobComp(app: App) { app @@ -47,7 +48,8 @@ export async function registerGlobComp(app: App) { .component('CustomList', CustomList) .component('CustomSelector', CustomSelector) .component('CustomPage', CustomPage) - .component('OrderTimeLine', OrderTimeLine); + .component('OrderTimeLine', OrderTimeLine) + .component('DataDicPicker', DataDicPicker); VXETable.use(VXETablePluginAntd); VXETable.setup(componentSetting.vxeTable); -- Gitee From a6ecdb19795a469738052a5ca48cfb79ac8dc197 Mon Sep 17 00:00:00 2001 From: lframework Date: Mon, 3 Jun 2024 00:58:46 +0800 Subject: [PATCH 03/34] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=86=E8=8A=82?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/base-data/address/index.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api/base-data/address/index.ts b/src/api/base-data/address/index.ts index 732ce35..652e3a7 100644 --- a/src/api/base-data/address/index.ts +++ b/src/api/base-data/address/index.ts @@ -1,7 +1,7 @@ import { defHttp } from '/@/utils/http/axios'; import { PageResult } from '@/api/model/pageResult'; import { ContentTypeEnum, ResponseEnum } from '@/enums/httpEnum'; -import { QueryAddressSelectorVo } from '@/api/base-data/address/model/queryAddressSelectorVo'; +import { AddressSelectorVo } from '@/api/base-data/address/model/addressSelectorVo'; import { AddressSelectorBo } from '@/api/base-data/address/model/addressSelectorBo'; import { UpdateAddressVo } from '@/api/base-data/address/model/updateAddressVo'; import { CreateAddressVo } from '@/api/base-data/address/model/createAddressVo'; @@ -13,7 +13,7 @@ const baseUrl = '/basedata/address'; const selectorBaseUrl = '/selector'; const region = 'cloud-api'; -export function selector(params: QueryAddressSelectorVo): Promise> { +export function selector(params: AddressSelectorVo): Promise> { return defHttp.get>( { url: selectorBaseUrl + '/address', -- Gitee From 6bd3c3920b8b3debf6961c2127e34589491b994d Mon Sep 17 00:00:00 2001 From: lframework Date: Sat, 22 Jun 2024 13:43:50 +0800 Subject: [PATCH 04/34] =?UTF-8?q?vxe-table=204.7=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=BC=95=E5=85=A5=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 17 +++++++++-------- src/components/registerGlobComp.ts | 4 ++++ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index f2a6573..8b425de 100644 --- a/package.json +++ b/package.json @@ -77,22 +77,24 @@ "@vueuse/shared": "^10.2.1", "@zxcvbn-ts/core": "^3.0.2", "ant-design-vue": "^4.0.7", + "async-validator": "^4.0.0", "axios": "^1.4.0", + "clipboard": "^2.0.11", "codemirror": "^5.65.12", "cropperjs": "^1.5.13", "crypto-js": "^4.1.1", - "clipboard": "^2.0.11", - "js-pinyin": "^0.2.5", "dayjs": "^1.11.9", "driver.js": "^1.3.0", "echarts": "^5.4.2", "exceljs": "^4.3.0", + "js-pinyin": "^0.2.5", "lodash-es": "^4.17.21", + "mathjs": "^11.11.2", "mockjs": "^1.1.0", + "moment": "^2.29.4", + "monaco-editor": "^0.34.1", "nprogress": "^0.2.0", "path-to-regexp": "^6.2.1", - "moment": "^2.29.4", - "mathjs": "^11.11.2", "pinia": "2.1.4", "pinia-plugin-persistedstate": "^3.2.0", "print-js": "^1.6.0", @@ -109,13 +111,12 @@ "vue-router": "^4.2.3", "vue-types": "^5.1.0", "vuedraggable": "^4.1.0", - "vxe-table": "^4.4.5", + "vxe-pc-ui": "v4", + "vxe-table": "^4.7.30", "vxe-table-plugin-antd": "^4.0.0", "vxe-table-plugin-export-xlsx": "^4.0.1", "xe-utils": "^3.5.11", - "xlsx": "^0.18.5", - "async-validator": "^4.0.0", - "monaco-editor": "^0.34.1" + "xlsx": "^0.18.5" }, "devDependencies": { "@commitlint/cli": "^17.6.6", diff --git a/src/components/registerGlobComp.ts b/src/components/registerGlobComp.ts index 4343aa3..39a375f 100644 --- a/src/components/registerGlobComp.ts +++ b/src/components/registerGlobComp.ts @@ -2,6 +2,9 @@ import type { App } from 'vue'; import { h } from 'vue'; import Antd, { Empty } from 'ant-design-vue'; import VXETable from 'vxe-table'; +import 'vxe-table/lib/style.css'; +import VxeUI from 'vxe-pc-ui'; +import 'vxe-pc-ui/lib/style.css'; import VXETablePluginAntd from 'vxe-table-plugin-antd'; import JForm from '@/components/JForm'; import JFormItem from '@/components/JFormItem'; @@ -31,6 +34,7 @@ import OrderTimeLine from '@/components/OrderTimeLine'; export async function registerGlobComp(app: App) { app .use(Antd) + .use(VxeUI) .use(VXETable) .component('RelativeTime', RelativeTime) .component('JForm', JForm) -- Gitee From 8b8dfd6168aa2a4e24e70e45a9a10421797dc313 Mon Sep 17 00:00:00 2001 From: lframework Date: Sat, 22 Jun 2024 13:54:47 +0800 Subject: [PATCH 05/34] =?UTF-8?q?vxe-table=204.7=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=BC=95=E5=85=A5=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/VxeTable/src/css/index.scss | 3 ++- src/components/registerGlobComp.ts | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/components/VxeTable/src/css/index.scss b/src/components/VxeTable/src/css/index.scss index 6023205..d9efbd1 100644 --- a/src/components/VxeTable/src/css/index.scss +++ b/src/components/VxeTable/src/css/index.scss @@ -3,4 +3,5 @@ @import './scrollbar'; @import './toolbar'; @import './component'; -@import 'vxe-table/styles/index'; +@import 'vxe-table/lib/style.css'; +@import 'vxe-pc-ui/lib/style.css'; diff --git a/src/components/registerGlobComp.ts b/src/components/registerGlobComp.ts index 39a375f..90cebac 100644 --- a/src/components/registerGlobComp.ts +++ b/src/components/registerGlobComp.ts @@ -2,9 +2,7 @@ import type { App } from 'vue'; import { h } from 'vue'; import Antd, { Empty } from 'ant-design-vue'; import VXETable from 'vxe-table'; -import 'vxe-table/lib/style.css'; import VxeUI from 'vxe-pc-ui'; -import 'vxe-pc-ui/lib/style.css'; import VXETablePluginAntd from 'vxe-table-plugin-antd'; import JForm from '@/components/JForm'; import JFormItem from '@/components/JFormItem'; -- Gitee From d19e238463f42aac62df0d8bb3e97a73e3983d3c Mon Sep 17 00:00:00 2001 From: lframework Date: Sat, 22 Jun 2024 16:14:48 +0800 Subject: [PATCH 06/34] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/notice.png | Bin 0 -> 1873 bytes src/components/DialogTable/src/DialogTable.vue | 2 +- src/components/DialogTree/src/DialogTree.vue | 2 +- src/components/VxeTable/src/css/variable.css | 9 +++++++++ src/components/VxeTable/src/css/variable.scss | 7 ------- .../header/components/notify/NoticeList.vue | 15 +++++++-------- .../default/header/components/notify/index.vue | 1 - src/views/base-data/address/index.vue | 2 +- src/views/base-data/pay-type/index.vue | 2 +- src/views/base-data/shop/index.vue | 2 +- src/views/customer-settle/check-sheet/add.vue | 2 +- .../customer-settle/check-sheet/approve.vue | 2 +- src/views/customer-settle/check-sheet/detail.vue | 2 +- src/views/customer-settle/check-sheet/modify.vue | 2 +- src/views/customer-settle/fee-sheet/add.vue | 2 +- src/views/customer-settle/fee-sheet/approve.vue | 2 +- src/views/customer-settle/fee-sheet/detail.vue | 2 +- src/views/customer-settle/fee-sheet/modify.vue | 2 +- src/views/customer-settle/pre-sheet/add.vue | 2 +- src/views/customer-settle/pre-sheet/approve.vue | 2 +- src/views/customer-settle/pre-sheet/detail.vue | 2 +- src/views/customer-settle/pre-sheet/modify.vue | 2 +- src/views/customer-settle/sheet/add.vue | 2 +- src/views/customer-settle/sheet/approve.vue | 2 +- src/views/customer-settle/sheet/detail.vue | 4 ++-- src/views/customer-settle/sheet/modify.vue | 2 +- src/views/sc/logistics/sheet/detail.vue | 2 +- src/views/sc/purchase/order/approve.vue | 2 +- src/views/sc/purchase/order/detail.vue | 2 +- src/views/sc/purchase/receive/approve.vue | 2 +- src/views/sc/purchase/receive/detail.vue | 2 +- src/views/sc/purchase/return/approve.vue | 2 +- src/views/sc/purchase/return/detail.vue | 2 +- src/views/sc/retail/out/approve.vue | 2 +- src/views/sc/retail/out/detail.vue | 2 +- src/views/sc/retail/return/approve.vue | 2 +- src/views/sc/retail/return/detail.vue | 2 +- src/views/sc/sale/order/approve.vue | 2 +- src/views/sc/sale/order/detail.vue | 2 +- src/views/sc/sale/out/approve.vue | 2 +- src/views/sc/sale/out/detail.vue | 2 +- src/views/sc/sale/return/approve.vue | 2 +- src/views/sc/sale/return/detail.vue | 2 +- src/views/sc/stock/adjust/cost/approve.vue | 2 +- src/views/sc/stock/adjust/cost/detail.vue | 2 +- src/views/sc/stock/adjust/stock/approve.vue | 2 +- src/views/sc/stock/adjust/stock/detail.vue | 2 +- src/views/sc/stock/product-log/index.vue | 2 +- src/views/sc/stock/product/index.vue | 2 +- src/views/sc/stock/take/pre/detail.vue | 2 +- src/views/sc/stock/take/sheet/approve.vue | 2 +- src/views/sc/stock/take/sheet/detail.vue | 2 +- src/views/sc/stock/transfer/approve.vue | 2 +- src/views/sc/stock/transfer/detail-receive.vue | 2 +- src/views/sc/stock/transfer/detail.vue | 2 +- src/views/settle/check-sheet/add.vue | 2 +- src/views/settle/check-sheet/approve.vue | 2 +- src/views/settle/check-sheet/detail.vue | 2 +- src/views/settle/check-sheet/modify.vue | 2 +- src/views/settle/fee-sheet/add.vue | 2 +- src/views/settle/fee-sheet/approve.vue | 2 +- src/views/settle/fee-sheet/detail.vue | 2 +- src/views/settle/fee-sheet/modify.vue | 2 +- src/views/settle/pre-sheet/add.vue | 2 +- src/views/settle/pre-sheet/approve.vue | 2 +- src/views/settle/pre-sheet/detail.vue | 2 +- src/views/settle/pre-sheet/modify.vue | 2 +- src/views/settle/sheet/add.vue | 2 +- src/views/settle/sheet/approve.vue | 2 +- src/views/settle/sheet/detail.vue | 4 ++-- src/views/settle/sheet/modify.vue | 2 +- src/views/smart-work/file-box/search.vue | 2 +- src/views/system/dic/index.vue | 2 +- src/views/system/dic/item/index.vue | 2 +- src/views/system/notice/index.vue | 2 +- src/views/system/notice/publish.vue | 2 +- src/views/system/oplog/index.vue | 2 +- src/views/system/parameter/index.vue | 2 +- 78 files changed, 91 insertions(+), 91 deletions(-) create mode 100644 src/assets/images/notice.png create mode 100644 src/components/VxeTable/src/css/variable.css delete mode 100644 src/components/VxeTable/src/css/variable.scss diff --git a/src/assets/images/notice.png b/src/assets/images/notice.png new file mode 100644 index 0000000000000000000000000000000000000000..b713953e71c2f3990a382da2b3217cb13e60a5e1 GIT binary patch literal 1873 zcmV-X2d?;uP)9(E6h7z8OlgTtG=i@D2@4v<1;&~f5n_xkOvETAgbqyq z)Ea+6Ks1=Bkzh>xSy<3St=dj06v6_HxG=#eQPBmUArX)+OwffQ5P!O$fAfytInycA z>HNL-X4;wQNt!o(_nvdl_q}`XyZ7Aln93~D(Xp7^kyYf#qn9ELJ>1)i9ur&w6CmyFSCTun z2~T<>fL|5drNS0K#NX%-9uqg8;t5dy}Qt01-!s>Y}`B*Kb~}dnQ2I)~_JfJ%H|hjn~G? zSs%mVFLInU+`k886faKkRWT*EuInT>@l~aPR}AKp`ldd5kfM5k?B5@vgP*=7C`f>T|NN5!nDibjWUP|PF)4mV4?Mi45DA5cfIj&u1FsLl ze1`9Z9!lOGpyLTM{l|rjRB}1q5RdY%eZ9GS%t=6Uw$}-d>T)Sp!+ii8BPVoEuD3&0 z0_;66<3}rTw)aE2y&^esd$x7Lj5)woc)G}`u=l(l;3=IX7G1bu^_n3w2+-wirL6EW zd=2!kVbZ00hD>85xv?1;LghJG+h_Pz@_%jb;M6Zo-#|_80oc{mDtKknu<6b=d1Y14d|)t|PNjx^kmiYHv|0SIQ)I(TK;FeU>xM*L+05XqULe$`Zz!Tb$WjSF9GdL~+=vBmFQc2vFNKb;hxeq zw5^iZ#%Yz4JgzE%x%$Ri*`a6gq8-Bo^)g-j;}mZR7uH3v254D7R2r99ShEsfHfSaQUyn=yY$65hxI1E;;TA+gv^ z#1lK=+r2QXrUodqU@IoVKh=&KTZenW1Y{n=TR;ygODFu%-gB_lCLJ3-;6&nG1Hcm} zFf4XZc;WWc5;Rwfwj@tndWB?SBXlEh@+S&~p5eaT-{;cte_s}1A%s)fGKe|6q^TKC z?@5q6jA8K{&JNF@$8E^foRw)ESGK4QJI+(+?#<-^uU>E?OKjaJ`cmMqS851k1BVFH z)kNd3q3m%yRR>S?I|}2e_U=BR^`$+!9E+QGP<9u}T-^GQDDomAI2W}%o0Mb-AY3*p z1f&2YkIh{S3%Ub612KE&eN4iPed-f<2qA#~VY0jbn9|90EfoP_yuXIw0G?3!MbG!~ zl<(w@^=*`p*D-zgkxed;AMr~^wSVP1!%Y6KAn9&o^ z|1~J;y2pGNsah56Gn#c_W&{`su@((z%!|k{4o6P$z}{twJ2eFKcg`dNEvzw_!g`qi zO+VEP%o>-;qp_Y8%qapaP@(CkwJyMz9+a6Pz;J8st)`#Ws3eca>$=n7O(Ve0%{BM7 zRt4A$V;a7xw?OJ1_UlY-E#D$&u_AS^7Or^uN2q`A%FKAfv>u>9lNFG7thu)}B1tU3 zlqJ|Qg8(Bzv#vGqSX0cZTnvL^$&pE(l>j3_v#wbqx>YW~kSj+}k>w;n3pK;i5|8zt zDirlSUzVss%1eM@)~styJgzb^pW%BUw+j+r+18qMttseLBIaumnc@m(#%nMiM*A2+ z=)F=Lq~vSIZ<$SaI_C2vM`zmhM1U&K>rZBs0Gm-Y@z_38(mQi6=8O8|@p~cl+;a~| z!L=3ReEn=LMS@=E?T3@;Bp4C%_0!o*B8-gr`0;c$B8-d*|9t*`_bAxG$c=#f00000 LNkvXXu0mjfRjz|) literal 0 HcmV?d00001 diff --git a/src/components/DialogTable/src/DialogTable.vue b/src/components/DialogTable/src/DialogTable.vue index 146a839..8b53c10 100644 --- a/src/components/DialogTable/src/DialogTable.vue +++ b/src/components/DialogTable/src/DialogTable.vue @@ -241,7 +241,7 @@ } }, _sumTableColumn() { - return [{ type: 'seq', width: 45 }, ...this.tableColumn]; + return [{ type: 'seq', width: 50 }, ...this.tableColumn]; }, _radioConfig() { if (!this.multiple) { diff --git a/src/components/DialogTree/src/DialogTree.vue b/src/components/DialogTree/src/DialogTree.vue index cd94d72..63f1171 100644 --- a/src/components/DialogTree/src/DialogTree.vue +++ b/src/components/DialogTree/src/DialogTree.vue @@ -261,7 +261,7 @@ } }, _sumTableColumn() { - return [{ type: 'seq', width: 45 }, ...this.tableColumn]; + return [{ type: 'seq', width: 50 }, ...this.tableColumn]; }, _radioConfig() { let config = {}; diff --git a/src/components/VxeTable/src/css/variable.css b/src/components/VxeTable/src/css/variable.css new file mode 100644 index 0000000..8c4d425 --- /dev/null +++ b/src/components/VxeTable/src/css/variable.css @@ -0,0 +1,9 @@ +[data-vxe-ui-theme=light]{ + --vxe-ui-table-row-current-background-color: rgb(9 96 189 / 30%) !important; + --vxe-ui-table-row-hover-current-background-color: rgb(9 96 189 / 20%) !important; + --vxe-ui-table-column-hover-background-color: rgb(9 96 189 / 30%) !important; + --vxe-ui-table-column-current-background-color: rgb(9 96 189 / 20%) !important; + --vxe-ui-table-validate-error-color: #FF4D4F !important; + --vxe-ui-font-color: rgba(0, 0, 0, 0.88) !important; +} + diff --git a/src/components/VxeTable/src/css/variable.scss b/src/components/VxeTable/src/css/variable.scss deleted file mode 100644 index 8e1ada1..0000000 --- a/src/components/VxeTable/src/css/variable.scss +++ /dev/null @@ -1,7 +0,0 @@ -$vxe-primary-color: rgb(9 96 189) !default; -$vxe-table-row-current-background-color: rgb(9 96 189 / 30%); -$vxe-table-row-hover-current-background-color: rgb(9 96 189 / 20%); -$vxe-table-column-hover-background-color: rgb(9 96 189 / 30%); -$vxe-table-column-current-background-color: rgb(9 96 189 / 20%); -$vxe-table-validate-error-color: #FF4D4F; -$vxe-font-color: rgba(0, 0, 0, 0.88); diff --git a/src/layouts/default/header/components/notify/NoticeList.vue b/src/layouts/default/header/components/notify/NoticeList.vue index 0d23b44..a1975c9 100644 --- a/src/layouts/default/header/components/notify/NoticeList.vue +++ b/src/layouts/default/header/components/notify/NoticeList.vue @@ -1,12 +1,11 @@ -- Gitee From 6da53b3fea6f7ec3ae758bf7885c79c85335fe25 Mon Sep 17 00:00:00 2001 From: lframework Date: Sat, 2 Nov 2024 18:58:10 +0800 Subject: [PATCH 19/34] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customer/model/createCustomerVo.ts | 2 +- .../base-data/customer/model/getCustomerBo.ts | 2 +- .../product/info/model/createProductVo.ts | 2 +- .../product/info/model/getProductBo.ts | 4 +- .../product/info/model/productSelectorBo.ts | 4 +- .../product/info/model/queryProductBo.ts | 2 +- .../info/model/queryProductSelectorVo.ts | 2 +- .../product/info/model/queryProductVo.ts | 2 +- .../product/info/model/updateProductVo.ts | 2 +- .../property/model/createProductPropertyVo.ts | 2 +- .../property/model/getProductPropertyBo.ts | 2 +- .../property/model/updateProductPropertyVo.ts | 2 +- .../supplier/model/createSupplierVo.ts | 2 +- .../base-data/supplier/model/getSupplierBo.ts | 2 +- .../order/model/getPurchaseOrderBo.ts | 2 +- .../order/model/purchaseOrderWithReceiveBo.ts | 2 +- .../purchase/order/model/purchaseProductBo.ts | 2 +- .../order/model/queryPurchaseProductVo.ts | 2 +- .../receive/model/getReceiveSheetBo.ts | 2 +- .../receive/model/receiveSheetWithReturnBo.ts | 2 +- .../return/model/getPurchaseReturnBo.ts | 2 +- .../retail/out/model/getRetailOutSheetBo.ts | 2 +- .../retail/out/model/queryRetailProductVo.ts | 2 +- .../out/model/retailOutSheetWithReturnBo.ts | 2 +- .../sc/retail/out/model/retailProductBo.ts | 2 +- .../retail/return/model/getRetailReturnBo.ts | 2 +- src/api/sc/sale/order/model/getSaleOrderBo.ts | 2 +- .../sc/sale/order/model/querySaleProductVo.ts | 2 +- .../sc/sale/order/model/saleOrderWithOutBo.ts | 2 +- src/api/sc/sale/order/model/saleProductBo.ts | 2 +- .../sc/sale/out/model/getSaleOutSheetBo.ts | 2 +- .../out/model/saleOutSheetWithReturnBo.ts | 2 +- .../sc/sale/return/model/getSaleReturnBo.ts | 2 +- src/api/sc/stock/adjust/cost/index.ts | 252 --------- .../approveRefuseStockCostAdjustSheetVo.ts | 11 - .../batchApprovePassStockCostAdjustSheetVo.ts | 6 - ...atchApproveRefuseStockCostAdjustSheetVo.ts | 11 - .../model/createStockCostAdjustSheetVo.ts | 18 - .../model/queryStockCostAdjustProductVo.ts | 23 - .../cost/model/queryStockCostAdjustSheetBo.ts | 61 --- .../cost/model/queryStockCostAdjustSheetVo.ts | 48 -- .../cost/model/stockCostAdjustProductBo.ts | 61 --- .../cost/model/stockCostAdjustProductVo.ts | 16 - .../cost/model/stockCostAdjustSheetFullBo.ts | 163 ------ .../model/updateStockCostAdjustSheetVo.ts | 8 - .../reason/model/getStockAdjustReasonBo.ts | 4 +- .../model/stockAdjustReasonSelectorBo.ts | 4 +- .../stock/model/queryStockAdjustProductVo.ts | 2 +- .../stock/model/stockAdjustProductBo.ts | 2 +- .../stock/model/stockAdjustSheetFullBo.ts | 2 +- .../model/queryProductStockLogBo.ts | 2 +- .../model/queryProductStockLogVo.ts | 2 +- .../model/queryProductStockBo.ts | 2 +- .../model/queryProductStockVo.ts | 2 +- .../plan/model/queryTakeStockPlanProductBo.ts | 2 +- .../take/plan/model/takeStockPlanFullBo.ts | 2 +- .../take/pre/model/getPreTakeStockSheetBo.ts | 2 +- .../take/pre/model/preTakeStockProductBo.ts | 2 +- .../pre/model/queryPreTakeStockProductVo.ts | 2 +- .../model/queryPreTakeStockSheetProductBo.ts | 2 +- .../model/queryTakeStockSheetProductVo.ts | 2 +- .../take/sheet/model/takeStockSheetFullBo.ts | 2 +- .../sheet/model/takeStockSheetProductBo.ts | 2 +- .../model/queryScTransferProductVo.ts | 2 +- .../model/scTransferOrderFullBo.ts | 2 +- .../transfer-sc/model/scTransferProductBo.ts | 2 +- .../settle/in-item/model/getSettleInItemBo.ts | 4 +- .../in-item/model/settleInItemSelectorBo.ts | 4 +- .../out-item/model/getSettleOutItemBo.ts | 4 +- .../{position => generate-code}/index.ts | 111 ++-- .../model/createSysGenerateCodeVo.ts} | 11 +- .../model/getSysGenerateCodeBo.ts} | 12 +- .../model/previewSysGenerateCodeVo.ts | 6 + .../model/querySysGenerateCodeBo.ts | 11 + .../model/querySysGenerateCodeVo.ts} | 11 +- .../model/settingSysGenerateCodeVo.ts} | 6 +- .../model/updateSysGenerateCodeVo.ts | 16 + src/api/system/op-log/index.ts | 6 +- .../system/position/model/getSysPositionBo.ts | 26 - .../position/model/querySysPositionBo.ts | 46 -- .../position/model/sysPositionSelectorVo.ts | 18 - .../position/model/updateSysPositionVo.ts | 26 - src/api/system/role/model/getSysRoleBo.ts | 4 +- src/api/system/user/model/createSysUserVo.ts | 5 - src/api/system/user/model/getSysUserBo.ts | 10 - src/api/system/user/model/querySysUserBo.ts | 5 - src/api/system/user/model/querySysUserVo.ts | 5 - src/api/system/user/model/updateSysUserVo.ts | 5 - src/components/Button/src/props.ts | 9 +- .../DataPermissionDragger/index.vue | 4 +- .../DataPermissionDragger/nested.vue | 4 +- src/components/Icon/src/IconPicker.vue | 2 +- .../Importor/src/CustomerImporter.vue | 2 +- .../Importor/src/ProductCategoryImporter.vue | 2 +- .../Importor/src/ProductImporter.vue | 2 +- .../Importor/src/SupplierImporter.vue | 2 +- src/components/JForm/src/JForm.vue | 12 +- .../Selector/src/ProductSelector.vue | 4 +- .../Selector/src/SysMenuSelector.vue | 2 +- .../Selector/src/SysPositionSelector.vue | 94 ---- src/enums/biz/productStockBizType.ts | 4 - src/enums/biz/propertyType.ts | 2 +- src/enums/biz/stockCostAdjustSheetStatus.ts | 11 - src/enums/biz/takeStockPlanType.ts | 2 +- src/router/routes/index.ts | 24 - src/views/base-data/customer/add.vue | 6 +- src/views/base-data/customer/detail.vue | 2 +- src/views/base-data/customer/modify.vue | 4 +- .../product/category/add-children.vue | 4 +- .../base-data/product/category/index.vue | 12 +- .../base-data/product/category/modify.vue | 6 +- src/views/base-data/product/info/add.vue | 4 +- src/views/base-data/product/info/detail.vue | 2 +- src/views/base-data/product/info/index.vue | 4 +- src/views/base-data/product/info/modify.vue | 4 +- src/views/base-data/product/property/add.vue | 4 +- .../base-data/product/property/modify.vue | 4 +- src/views/base-data/supplier/add.vue | 6 +- src/views/base-data/supplier/detail.vue | 2 +- src/views/base-data/supplier/modify.vue | 2 +- .../customer-settle/check-sheet/index.vue | 2 +- src/views/customer-settle/fee-sheet/index.vue | 2 +- src/views/customer-settle/pre-sheet/index.vue | 2 +- src/views/customer-settle/sheet/index.vue | 2 +- src/views/development/custom/list/index.vue | 2 +- src/views/development/custom/page/index.vue | 2 +- .../development/custom/selector/index.vue | 2 +- src/views/development/data/entity/index.vue | 2 +- src/views/development/data/obj/index.vue | 2 +- src/views/development/qrtz/index.vue | 4 +- src/views/sc/logistics/sheet/index.vue | 2 +- src/views/sc/purchase/batch-add-product.vue | 4 +- src/views/sc/purchase/order/add.vue | 2 +- src/views/sc/purchase/order/approve.vue | 2 +- src/views/sc/purchase/order/detail.vue | 2 +- src/views/sc/purchase/order/index.vue | 2 +- src/views/sc/purchase/order/modify.vue | 2 +- src/views/sc/purchase/receive/add-require.vue | 2 +- .../sc/purchase/receive/add-un-require.vue | 2 +- src/views/sc/purchase/receive/approve.vue | 2 +- src/views/sc/purchase/receive/detail.vue | 2 +- src/views/sc/purchase/receive/index.vue | 2 +- .../sc/purchase/receive/modify-require.vue | 2 +- .../sc/purchase/receive/modify-un-require.vue | 2 +- src/views/sc/purchase/return/add-require.vue | 2 +- .../sc/purchase/return/add-un-require.vue | 2 +- src/views/sc/purchase/return/approve.vue | 2 +- src/views/sc/purchase/return/detail.vue | 2 +- src/views/sc/purchase/return/index.vue | 2 +- .../sc/purchase/return/modify-require.vue | 2 +- .../sc/purchase/return/modify-un-require.vue | 2 +- src/views/sc/retail/batch-add-product.vue | 4 +- src/views/sc/retail/out/add.vue | 2 +- src/views/sc/retail/out/approve.vue | 2 +- src/views/sc/retail/out/detail.vue | 2 +- src/views/sc/retail/out/index.vue | 2 +- src/views/sc/retail/out/modify.vue | 2 +- src/views/sc/retail/return/add-require.vue | 2 +- src/views/sc/retail/return/add-un-require.vue | 2 +- src/views/sc/retail/return/approve.vue | 2 +- src/views/sc/retail/return/detail.vue | 2 +- src/views/sc/retail/return/index.vue | 2 +- src/views/sc/retail/return/modify-require.vue | 2 +- .../sc/retail/return/modify-un-require.vue | 2 +- src/views/sc/sale/batch-add-product.vue | 4 +- src/views/sc/sale/order/add.vue | 2 +- src/views/sc/sale/order/approve.vue | 2 +- src/views/sc/sale/order/detail.vue | 2 +- src/views/sc/sale/order/index.vue | 2 +- src/views/sc/sale/order/modify.vue | 2 +- src/views/sc/sale/out/add-require.vue | 2 +- src/views/sc/sale/out/add-un-require.vue | 2 +- src/views/sc/sale/out/approve.vue | 2 +- src/views/sc/sale/out/detail.vue | 2 +- src/views/sc/sale/out/index.vue | 2 +- src/views/sc/sale/out/modify-require.vue | 2 +- src/views/sc/sale/out/modify-un-require.vue | 2 +- src/views/sc/sale/return/add-require.vue | 2 +- src/views/sc/sale/return/add-un-require.vue | 2 +- src/views/sc/sale/return/approve.vue | 2 +- src/views/sc/sale/return/detail.vue | 2 +- src/views/sc/sale/return/index.vue | 2 +- src/views/sc/sale/return/modify-require.vue | 2 +- .../sc/sale/return/modify-un-require.vue | 2 +- src/views/sc/stock/adjust/cost/add.vue | 481 ---------------- src/views/sc/stock/adjust/cost/approve.vue | 278 ---------- .../stock/adjust/cost/batch-add-product.vue | 196 ------- src/views/sc/stock/adjust/cost/detail.vue | 229 -------- src/views/sc/stock/adjust/cost/index.vue | 441 --------------- src/views/sc/stock/adjust/cost/modify.vue | 517 ------------------ src/views/sc/stock/adjust/stock/add.vue | 67 ++- src/views/sc/stock/adjust/stock/approve.vue | 2 +- .../stock/adjust/stock/batch-add-product.vue | 4 +- src/views/sc/stock/adjust/stock/detail.vue | 2 +- src/views/sc/stock/adjust/stock/index.vue | 2 +- src/views/sc/stock/adjust/stock/modify.vue | 2 +- src/views/sc/stock/product-log/index.vue | 20 +- src/views/sc/stock/product/index.vue | 4 +- src/views/sc/stock/take/plan/add.vue | 4 +- src/views/sc/stock/take/plan/detail.vue | 2 +- src/views/sc/stock/take/plan/diff.vue | 2 +- src/views/sc/stock/take/plan/handle.vue | 2 +- src/views/sc/stock/take/plan/index.vue | 4 +- src/views/sc/stock/take/pre/add.vue | 2 +- .../sc/stock/take/pre/batch-add-product.vue | 4 +- src/views/sc/stock/take/pre/detail.vue | 2 +- src/views/sc/stock/take/pre/index.vue | 2 +- src/views/sc/stock/take/pre/modify.vue | 2 +- src/views/sc/stock/take/sheet/add.vue | 4 +- src/views/sc/stock/take/sheet/approve.vue | 4 +- .../sc/stock/take/sheet/batch-add-product.vue | 4 +- src/views/sc/stock/take/sheet/detail.vue | 4 +- src/views/sc/stock/take/sheet/index.vue | 2 +- src/views/sc/stock/take/sheet/modify.vue | 4 +- src/views/sc/stock/transfer/add.vue | 2 +- src/views/sc/stock/transfer/approve.vue | 2 +- .../sc/stock/transfer/batch-add-product.vue | 4 +- src/views/sc/stock/transfer/detail.vue | 2 +- src/views/sc/stock/transfer/index.vue | 2 +- src/views/sc/stock/transfer/modify.vue | 2 +- src/views/sc/stock/transfer/receive.vue | 2 +- src/views/settle/check-sheet/index.vue | 2 +- src/views/settle/fee-sheet/index.vue | 2 +- src/views/settle/pre-sheet/index.vue | 2 +- src/views/settle/sheet/index.vue | 2 +- src/views/system/dic/index.vue | 2 +- src/views/system/dic/item/index.vue | 2 +- src/views/system/dic/modify.vue | 2 +- .../{position => generate-code}/add.vue | 69 +-- src/views/system/generate-code/constants.js | 30 + src/views/system/generate-code/index.vue | 188 +++++++ .../{position => generate-code}/modify.vue | 80 ++- src/views/system/generate-code/setting.vue | 400 ++++++++++++++ src/views/system/menu/index.vue | 2 +- src/views/system/notice/add.vue | 2 +- src/views/system/notice/modify.vue | 2 +- src/views/system/parameter/index.vue | 8 +- src/views/system/position/detail.vue | 99 ---- src/views/system/position/index.vue | 255 --------- src/views/system/user/add.vue | 6 - src/views/system/user/detail.vue | 3 - src/views/system/user/index.vue | 5 - src/views/system/user/modify.vue | 6 - 243 files changed, 1061 insertions(+), 3947 deletions(-) delete mode 100644 src/api/sc/stock/adjust/cost/index.ts delete mode 100644 src/api/sc/stock/adjust/cost/model/approveRefuseStockCostAdjustSheetVo.ts delete mode 100644 src/api/sc/stock/adjust/cost/model/batchApprovePassStockCostAdjustSheetVo.ts delete mode 100644 src/api/sc/stock/adjust/cost/model/batchApproveRefuseStockCostAdjustSheetVo.ts delete mode 100644 src/api/sc/stock/adjust/cost/model/createStockCostAdjustSheetVo.ts delete mode 100644 src/api/sc/stock/adjust/cost/model/queryStockCostAdjustProductVo.ts delete mode 100644 src/api/sc/stock/adjust/cost/model/queryStockCostAdjustSheetBo.ts delete mode 100644 src/api/sc/stock/adjust/cost/model/queryStockCostAdjustSheetVo.ts delete mode 100644 src/api/sc/stock/adjust/cost/model/stockCostAdjustProductBo.ts delete mode 100644 src/api/sc/stock/adjust/cost/model/stockCostAdjustProductVo.ts delete mode 100644 src/api/sc/stock/adjust/cost/model/stockCostAdjustSheetFullBo.ts delete mode 100644 src/api/sc/stock/adjust/cost/model/updateStockCostAdjustSheetVo.ts rename src/api/system/{position => generate-code}/index.ts (33%) rename src/api/system/{position/model/sysPositionSelectorBo.ts => generate-code/model/createSysGenerateCodeVo.ts} (43%) rename src/api/system/{position/model/createSysPositionVo.ts => generate-code/model/getSysGenerateCodeBo.ts} (30%) create mode 100644 src/api/system/generate-code/model/previewSysGenerateCodeVo.ts create mode 100644 src/api/system/generate-code/model/querySysGenerateCodeBo.ts rename src/api/system/{position/model/querySysPositionVo.ts => generate-code/model/querySysGenerateCodeVo.ts} (45%) rename src/api/{sc/stock/adjust/cost/model/approvePassStockCostAdjustSheetVo.ts => system/generate-code/model/settingSysGenerateCodeVo.ts} (35%) create mode 100644 src/api/system/generate-code/model/updateSysGenerateCodeVo.ts delete mode 100644 src/api/system/position/model/getSysPositionBo.ts delete mode 100644 src/api/system/position/model/querySysPositionBo.ts delete mode 100644 src/api/system/position/model/sysPositionSelectorVo.ts delete mode 100644 src/api/system/position/model/updateSysPositionVo.ts delete mode 100644 src/components/Selector/src/SysPositionSelector.vue delete mode 100644 src/enums/biz/stockCostAdjustSheetStatus.ts delete mode 100644 src/views/sc/stock/adjust/cost/add.vue delete mode 100644 src/views/sc/stock/adjust/cost/approve.vue delete mode 100644 src/views/sc/stock/adjust/cost/batch-add-product.vue delete mode 100644 src/views/sc/stock/adjust/cost/detail.vue delete mode 100644 src/views/sc/stock/adjust/cost/index.vue delete mode 100644 src/views/sc/stock/adjust/cost/modify.vue rename src/views/system/{position => generate-code}/add.vue (59%) create mode 100644 src/views/system/generate-code/constants.js create mode 100644 src/views/system/generate-code/index.vue rename src/views/system/{position => generate-code}/modify.vue (57%) create mode 100644 src/views/system/generate-code/setting.vue delete mode 100644 src/views/system/position/detail.vue delete mode 100644 src/views/system/position/index.vue diff --git a/src/api/base-data/customer/model/createCustomerVo.ts b/src/api/base-data/customer/model/createCustomerVo.ts index dc91975..e657f07 100644 --- a/src/api/base-data/customer/model/createCustomerVo.ts +++ b/src/api/base-data/customer/model/createCustomerVo.ts @@ -50,7 +50,7 @@ export interface CreateCustomerVo { address: string; /** - * 结账方式 + * 结算方式 */ settleType: number; diff --git a/src/api/base-data/customer/model/getCustomerBo.ts b/src/api/base-data/customer/model/getCustomerBo.ts index 7492a67..12ee27c 100644 --- a/src/api/base-data/customer/model/getCustomerBo.ts +++ b/src/api/base-data/customer/model/getCustomerBo.ts @@ -60,7 +60,7 @@ export interface GetCustomerBo { address: string; /** - * 结账方式 + * 结算方式 */ settleType: number; diff --git a/src/api/base-data/product/info/model/createProductVo.ts b/src/api/base-data/product/info/model/createProductVo.ts index dc9722d..f240e97 100644 --- a/src/api/base-data/product/info/model/createProductVo.ts +++ b/src/api/base-data/product/info/model/createProductVo.ts @@ -28,7 +28,7 @@ export interface CreateProductVo { externalCode: string; /** - * 类目ID + * 分类ID */ categoryId: string; diff --git a/src/api/base-data/product/info/model/getProductBo.ts b/src/api/base-data/product/info/model/getProductBo.ts index a0feed5..fccc058 100644 --- a/src/api/base-data/product/info/model/getProductBo.ts +++ b/src/api/base-data/product/info/model/getProductBo.ts @@ -32,12 +32,12 @@ export interface GetProductBo { externalCode: string; /** - * 类目ID + * 分类ID */ categoryId: string; /** - * 类目名称 + * 分类名称 */ categoryName: string; diff --git a/src/api/base-data/product/info/model/productSelectorBo.ts b/src/api/base-data/product/info/model/productSelectorBo.ts index 9d29dda..435bea1 100644 --- a/src/api/base-data/product/info/model/productSelectorBo.ts +++ b/src/api/base-data/product/info/model/productSelectorBo.ts @@ -25,12 +25,12 @@ export interface ProductSelectorBo { externalCode: string; /** - * 类目ID + * 分类ID */ categoryId: string; /** - * 类目名称 + * 分类名称 */ categoryName: string; diff --git a/src/api/base-data/product/info/model/queryProductBo.ts b/src/api/base-data/product/info/model/queryProductBo.ts index f9158c7..bf17526 100644 --- a/src/api/base-data/product/info/model/queryProductBo.ts +++ b/src/api/base-data/product/info/model/queryProductBo.ts @@ -25,7 +25,7 @@ export interface QueryProductBo { skuCode: string; /** - * 类目名称 + * 分类名称 */ categoryName: string; diff --git a/src/api/base-data/product/info/model/queryProductSelectorVo.ts b/src/api/base-data/product/info/model/queryProductSelectorVo.ts index f6b86d7..b2db3c9 100644 --- a/src/api/base-data/product/info/model/queryProductSelectorVo.ts +++ b/src/api/base-data/product/info/model/queryProductSelectorVo.ts @@ -27,7 +27,7 @@ export interface QueryProductSelectorVo extends PageVo { brandId: string; /** - * 类目ID + * 分类ID */ categoryId: string; diff --git a/src/api/base-data/product/info/model/queryProductVo.ts b/src/api/base-data/product/info/model/queryProductVo.ts index 29fc7b3..35b27ac 100644 --- a/src/api/base-data/product/info/model/queryProductVo.ts +++ b/src/api/base-data/product/info/model/queryProductVo.ts @@ -27,7 +27,7 @@ export interface QueryProductVo extends SortPageVo { brandId: string; /** - * 类目ID + * 分类ID */ categoryId: string; diff --git a/src/api/base-data/product/info/model/updateProductVo.ts b/src/api/base-data/product/info/model/updateProductVo.ts index c391fbf..c222e6a 100644 --- a/src/api/base-data/product/info/model/updateProductVo.ts +++ b/src/api/base-data/product/info/model/updateProductVo.ts @@ -33,7 +33,7 @@ export interface UpdateProductVo { externalCode: string; /** - * 类目ID + * 分类ID */ categoryId: string; diff --git a/src/api/base-data/product/property/model/createProductPropertyVo.ts b/src/api/base-data/product/property/model/createProductPropertyVo.ts index 64ba2dd..ad79acb 100644 --- a/src/api/base-data/product/property/model/createProductPropertyVo.ts +++ b/src/api/base-data/product/property/model/createProductPropertyVo.ts @@ -30,7 +30,7 @@ export interface CreateProductPropertyVo { propertyType: number; /** - * 类目ID + * 分类ID */ categoryIds: string[]; diff --git a/src/api/base-data/product/property/model/getProductPropertyBo.ts b/src/api/base-data/product/property/model/getProductPropertyBo.ts index a767a19..a401982 100644 --- a/src/api/base-data/product/property/model/getProductPropertyBo.ts +++ b/src/api/base-data/product/property/model/getProductPropertyBo.ts @@ -35,7 +35,7 @@ export interface GetProductPropertyBo { propertyType: number; /** - * 类目 + * 分类 */ categories: string[]; diff --git a/src/api/base-data/product/property/model/updateProductPropertyVo.ts b/src/api/base-data/product/property/model/updateProductPropertyVo.ts index 009161b..82674cb 100644 --- a/src/api/base-data/product/property/model/updateProductPropertyVo.ts +++ b/src/api/base-data/product/property/model/updateProductPropertyVo.ts @@ -35,7 +35,7 @@ export interface UpdateProductPropertyVo { propertyType: number; /** - * 类目ID + * 分类ID */ categoryIds: string[]; diff --git a/src/api/base-data/supplier/model/createSupplierVo.ts b/src/api/base-data/supplier/model/createSupplierVo.ts index cb3b6ab..1c4b730 100644 --- a/src/api/base-data/supplier/model/createSupplierVo.ts +++ b/src/api/base-data/supplier/model/createSupplierVo.ts @@ -60,7 +60,7 @@ export interface CreateSupplierVo { manageType: number; /** - * 结账方式 + * 结算方式 */ settleType: number; diff --git a/src/api/base-data/supplier/model/getSupplierBo.ts b/src/api/base-data/supplier/model/getSupplierBo.ts index 12c6c70..3389feb 100644 --- a/src/api/base-data/supplier/model/getSupplierBo.ts +++ b/src/api/base-data/supplier/model/getSupplierBo.ts @@ -70,7 +70,7 @@ export interface GetSupplierBo { manageType: number; /** - * 结账方式 + * 结算方式 */ settleType: number; diff --git a/src/api/sc/purchase/order/model/getPurchaseOrderBo.ts b/src/api/sc/purchase/order/model/getPurchaseOrderBo.ts index f833ca5..b41912c 100644 --- a/src/api/sc/purchase/order/model/getPurchaseOrderBo.ts +++ b/src/api/sc/purchase/order/model/getPurchaseOrderBo.ts @@ -149,7 +149,7 @@ export interface OrderDetailBo { spec: string; /** - * 类目名称 + * 分类名称 */ categoryName: string; diff --git a/src/api/sc/purchase/order/model/purchaseOrderWithReceiveBo.ts b/src/api/sc/purchase/order/model/purchaseOrderWithReceiveBo.ts index ff953c0..0d0a040 100644 --- a/src/api/sc/purchase/order/model/purchaseOrderWithReceiveBo.ts +++ b/src/api/sc/purchase/order/model/purchaseOrderWithReceiveBo.ts @@ -82,7 +82,7 @@ export interface DetailBo { spec: string; /** - * 类目名称 + * 分类名称 */ categoryName: string; diff --git a/src/api/sc/purchase/order/model/purchaseProductBo.ts b/src/api/sc/purchase/order/model/purchaseProductBo.ts index b4884ef..f81bdee 100644 --- a/src/api/sc/purchase/order/model/purchaseProductBo.ts +++ b/src/api/sc/purchase/order/model/purchaseProductBo.ts @@ -15,7 +15,7 @@ export interface PurchaseProductBo { productName: string; /** - * 类目名称 + * 分类名称 */ categoryName: string; diff --git a/src/api/sc/purchase/order/model/queryPurchaseProductVo.ts b/src/api/sc/purchase/order/model/queryPurchaseProductVo.ts index 5ac2276..f8f1911 100644 --- a/src/api/sc/purchase/order/model/queryPurchaseProductVo.ts +++ b/src/api/sc/purchase/order/model/queryPurchaseProductVo.ts @@ -12,7 +12,7 @@ export interface QueryPurchaseProductVo extends PageVo { condition: string; /** - * 类目ID + * 分类ID */ categoryId: string; diff --git a/src/api/sc/purchase/receive/model/getReceiveSheetBo.ts b/src/api/sc/purchase/receive/model/getReceiveSheetBo.ts index 2570c20..686a646 100644 --- a/src/api/sc/purchase/receive/model/getReceiveSheetBo.ts +++ b/src/api/sc/purchase/receive/model/getReceiveSheetBo.ts @@ -169,7 +169,7 @@ export interface OrderDetailBo { spec: string; /** - * 类目名称 + * 分类名称 */ categoryName: string; diff --git a/src/api/sc/purchase/receive/model/receiveSheetWithReturnBo.ts b/src/api/sc/purchase/receive/model/receiveSheetWithReturnBo.ts index 8891e8f..86c2688 100644 --- a/src/api/sc/purchase/receive/model/receiveSheetWithReturnBo.ts +++ b/src/api/sc/purchase/receive/model/receiveSheetWithReturnBo.ts @@ -82,7 +82,7 @@ export interface DetailBo { spec: string; /** - * 类目名称 + * 分类名称 */ categoryName: string; diff --git a/src/api/sc/purchase/return/model/getPurchaseReturnBo.ts b/src/api/sc/purchase/return/model/getPurchaseReturnBo.ts index cafdc4b..a5e83dd 100644 --- a/src/api/sc/purchase/return/model/getPurchaseReturnBo.ts +++ b/src/api/sc/purchase/return/model/getPurchaseReturnBo.ts @@ -162,7 +162,7 @@ export interface ReturnDetailBo { spec: string; /** - * 类目名称 + * 分类名称 */ categoryName: string; diff --git a/src/api/sc/retail/out/model/getRetailOutSheetBo.ts b/src/api/sc/retail/out/model/getRetailOutSheetBo.ts index acfdddd..b38eb3c 100644 --- a/src/api/sc/retail/out/model/getRetailOutSheetBo.ts +++ b/src/api/sc/retail/out/model/getRetailOutSheetBo.ts @@ -164,7 +164,7 @@ export interface OrderDetailBo { spec: string; /** - * 类目名称 + * 分类名称 */ categoryName: string; diff --git a/src/api/sc/retail/out/model/queryRetailProductVo.ts b/src/api/sc/retail/out/model/queryRetailProductVo.ts index 4f8a674..88717d7 100644 --- a/src/api/sc/retail/out/model/queryRetailProductVo.ts +++ b/src/api/sc/retail/out/model/queryRetailProductVo.ts @@ -12,7 +12,7 @@ export interface QueryRetailProductVo extends PageVo { condition: string; /** - * 类目ID + * 分类ID */ categoryId: string; diff --git a/src/api/sc/retail/out/model/retailOutSheetWithReturnBo.ts b/src/api/sc/retail/out/model/retailOutSheetWithReturnBo.ts index b49bdd1..3c66e09 100644 --- a/src/api/sc/retail/out/model/retailOutSheetWithReturnBo.ts +++ b/src/api/sc/retail/out/model/retailOutSheetWithReturnBo.ts @@ -82,7 +82,7 @@ export interface DetailBo { spec: string; /** - * 类目名称 + * 分类名称 */ categoryName: string; diff --git a/src/api/sc/retail/out/model/retailProductBo.ts b/src/api/sc/retail/out/model/retailProductBo.ts index 8c307bb..ac23ffe 100644 --- a/src/api/sc/retail/out/model/retailProductBo.ts +++ b/src/api/sc/retail/out/model/retailProductBo.ts @@ -15,7 +15,7 @@ export interface RetailProductBo { productName: string; /** - * 类目名称 + * 分类名称 */ categoryName: string; diff --git a/src/api/sc/retail/return/model/getRetailReturnBo.ts b/src/api/sc/retail/return/model/getRetailReturnBo.ts index aaee04f..650f65d 100644 --- a/src/api/sc/retail/return/model/getRetailReturnBo.ts +++ b/src/api/sc/retail/return/model/getRetailReturnBo.ts @@ -164,7 +164,7 @@ export interface ReturnDetailBo { spec: string; /** - * 类目名称 + * 分类名称 */ categoryName: string; diff --git a/src/api/sc/sale/order/model/getSaleOrderBo.ts b/src/api/sc/sale/order/model/getSaleOrderBo.ts index acc6405..8f31726 100644 --- a/src/api/sc/sale/order/model/getSaleOrderBo.ts +++ b/src/api/sc/sale/order/model/getSaleOrderBo.ts @@ -154,7 +154,7 @@ export interface OrderDetailBo { spec: string; /** - * 类目名称 + * 分类名称 */ categoryName: string; diff --git a/src/api/sc/sale/order/model/querySaleProductVo.ts b/src/api/sc/sale/order/model/querySaleProductVo.ts index 1eafecb..a0ce2f0 100644 --- a/src/api/sc/sale/order/model/querySaleProductVo.ts +++ b/src/api/sc/sale/order/model/querySaleProductVo.ts @@ -12,7 +12,7 @@ export interface QuerySaleProductVo extends PageVo { condition: string; /** - * 类目ID + * 分类ID */ categoryId: string; diff --git a/src/api/sc/sale/order/model/saleOrderWithOutBo.ts b/src/api/sc/sale/order/model/saleOrderWithOutBo.ts index 0ea3830..d0e9824 100644 --- a/src/api/sc/sale/order/model/saleOrderWithOutBo.ts +++ b/src/api/sc/sale/order/model/saleOrderWithOutBo.ts @@ -92,7 +92,7 @@ export interface DetailBo { spec: string; /** - * 类目名称 + * 分类名称 */ categoryName: string; diff --git a/src/api/sc/sale/order/model/saleProductBo.ts b/src/api/sc/sale/order/model/saleProductBo.ts index eae1ed4..8802f62 100644 --- a/src/api/sc/sale/order/model/saleProductBo.ts +++ b/src/api/sc/sale/order/model/saleProductBo.ts @@ -15,7 +15,7 @@ export interface SaleProductBo { productName: string; /** - * 类目名称 + * 分类名称 */ categoryName: string; diff --git a/src/api/sc/sale/out/model/getSaleOutSheetBo.ts b/src/api/sc/sale/out/model/getSaleOutSheetBo.ts index 9cc2a75..0953bac 100644 --- a/src/api/sc/sale/out/model/getSaleOutSheetBo.ts +++ b/src/api/sc/sale/out/model/getSaleOutSheetBo.ts @@ -175,7 +175,7 @@ export interface OrderDetailBo { spec: string; /** - * 类目名称 + * 分类名称 */ categoryName: string; diff --git a/src/api/sc/sale/out/model/saleOutSheetWithReturnBo.ts b/src/api/sc/sale/out/model/saleOutSheetWithReturnBo.ts index e45a6fe..de60ad1 100644 --- a/src/api/sc/sale/out/model/saleOutSheetWithReturnBo.ts +++ b/src/api/sc/sale/out/model/saleOutSheetWithReturnBo.ts @@ -82,7 +82,7 @@ export interface DetailBo { spec: string; /** - * 类目名称 + * 分类名称 */ categoryName: string; diff --git a/src/api/sc/sale/return/model/getSaleReturnBo.ts b/src/api/sc/sale/return/model/getSaleReturnBo.ts index 892d5b2..36393e5 100644 --- a/src/api/sc/sale/return/model/getSaleReturnBo.ts +++ b/src/api/sc/sale/return/model/getSaleReturnBo.ts @@ -162,7 +162,7 @@ export interface ReturnDetailBo { spec: string; /** - * 类目名称 + * 分类名称 */ categoryName: string; diff --git a/src/api/sc/stock/adjust/cost/index.ts b/src/api/sc/stock/adjust/cost/index.ts deleted file mode 100644 index 1bf3aed..0000000 --- a/src/api/sc/stock/adjust/cost/index.ts +++ /dev/null @@ -1,252 +0,0 @@ -import { defHttp } from '/@/utils/http/axios'; -import { ContentTypeEnum, ResponseEnum } from '@/enums/httpEnum'; -import { PageResult } from '@/api/model/pageResult'; -import { QueryStockCostAdjustSheetVo } from '@/api/sc/stock/adjust/cost/model/queryStockCostAdjustSheetVo'; -import { QueryStockCostAdjustSheetBo } from '@/api/sc/stock/adjust/cost/model/queryStockCostAdjustSheetBo'; -import { StockCostAdjustSheetFullBo } from '@/api/sc/stock/adjust/cost/model/stockCostAdjustSheetFullBo'; -import { StockCostAdjustProductBo } from '@/api/sc/stock/adjust/cost/model/stockCostAdjustProductBo'; -import { QueryStockCostAdjustProductVo } from '@/api/sc/stock/adjust/cost/model/queryStockCostAdjustProductVo'; -import { CreateStockCostAdjustSheetVo } from '@/api/sc/stock/adjust/cost/model/createStockCostAdjustSheetVo'; -import { UpdateStockCostAdjustSheetVo } from '@/api/sc/stock/adjust/cost/model/updateStockCostAdjustSheetVo'; -import { ApprovePassStockCostAdjustSheetVo } from '@/api/sc/stock/adjust/cost/model/approvePassStockCostAdjustSheetVo'; -import { BatchApprovePassStockCostAdjustSheetVo } from '@/api/sc/stock/adjust/cost/model/batchApprovePassStockCostAdjustSheetVo'; -import { ApproveRefuseStockCostAdjustSheetVo } from '@/api/sc/stock/adjust/cost/model/approveRefuseStockCostAdjustSheetVo'; -import { BatchApproveRefuseStockCostAdjustSheetVo } from '@/api/sc/stock/adjust/cost/model/batchApproveRefuseStockCostAdjustSheetVo'; - -const baseUrl = '/stock/adjust/cost'; -const region = 'cloud-api'; - -/** - * 查询列表 - */ -export function query( - params: QueryStockCostAdjustSheetVo, -): Promise> { - return defHttp.get>( - { - url: baseUrl + '/query', - params, - }, - { - region, - }, - ); -} - -/** - * 导出 - */ -export function exportList(data: QueryStockCostAdjustSheetVo): Promise { - return defHttp.post( - { - url: baseUrl + '/export', - data, - }, - { - region, - responseType: ResponseEnum.BLOB, - contentType: ContentTypeEnum.FORM_URLENCODED, - }, - ); -} - -/** - * 查询详情 - */ -export function getDetail(id: string): Promise { - return defHttp.get( - { - url: baseUrl + '/detail', - params: { - id, - }, - }, - { - region, - }, - ); -} - -/** - * 根据关键字查询商品列表 - */ -export function searchProducts( - scId: string, - condition: string, -): Promise { - return defHttp.get( - { - url: baseUrl + '/product/search', - params: { - scId, - condition, - }, - }, - { - region, - }, - ); -} - -/** - * 根据关键字查询商品列表 - */ -export function queryProductList( - params: QueryStockCostAdjustProductVo, -): Promise> { - return defHttp.get>( - { - url: baseUrl + '/product/list', - params, - }, - { - region, - }, - ); -} - -/** - * 新增 - */ -export function create(data: CreateStockCostAdjustSheetVo): Promise { - return defHttp.post( - { - url: baseUrl, - data, - }, - { - region, - contentType: ContentTypeEnum.JSON, - }, - ); -} - -/** - * 修改 - */ -export function update(data: UpdateStockCostAdjustSheetVo): Promise { - return defHttp.put( - { - url: baseUrl, - data, - }, - { - region, - contentType: ContentTypeEnum.JSON, - }, - ); -} - -/** - * 审核通过 - */ -export function approvePass(data: ApprovePassStockCostAdjustSheetVo): Promise { - return defHttp.patch( - { - url: baseUrl + '/approve/pass', - data, - }, - { - region, - contentType: ContentTypeEnum.JSON, - }, - ); -} - -/** - * 批量审核通过 - */ -export function batchApprovePass(data: BatchApprovePassStockCostAdjustSheetVo): Promise { - return defHttp.patch( - { - url: baseUrl + '/approve/pass/batch', - data, - }, - { - region, - contentType: ContentTypeEnum.JSON, - }, - ); -} - -/** - * 直接审核通过 - */ -export function directApprovePass(data: CreateStockCostAdjustSheetVo): Promise { - return defHttp.post( - { - url: baseUrl + '/approve/pass/direct', - data, - }, - { - region, - contentType: ContentTypeEnum.JSON, - }, - ); -} - -/** - * 审核拒绝 - */ -export function approveRefuse(data: ApproveRefuseStockCostAdjustSheetVo): Promise { - return defHttp.patch( - { - url: baseUrl + '/approve/refuse', - data, - }, - { - region, - contentType: ContentTypeEnum.JSON, - }, - ); -} - -/** - * 批量审核拒绝 - */ -export function batchApproveRefuse(data: BatchApproveRefuseStockCostAdjustSheetVo): Promise { - return defHttp.patch( - { - url: baseUrl + '/approve/refuse/batch', - data, - }, - { - region, - contentType: ContentTypeEnum.JSON, - }, - ); -} - -/** - * 删除 - */ -export function deleteById(id: string): Promise { - return defHttp.delete( - { - url: baseUrl, - data: { - id, - }, - }, - { - region, - contentType: ContentTypeEnum.FORM_URLENCODED, - }, - ); -} - -/** - * 批量删除 - */ -export function deleteByIds(ids: string[]): Promise { - return defHttp.delete( - { - url: baseUrl + '/batch', - data: ids, - }, - { - region, - contentType: ContentTypeEnum.JSON, - }, - ); -} diff --git a/src/api/sc/stock/adjust/cost/model/approveRefuseStockCostAdjustSheetVo.ts b/src/api/sc/stock/adjust/cost/model/approveRefuseStockCostAdjustSheetVo.ts deleted file mode 100644 index ff505f0..0000000 --- a/src/api/sc/stock/adjust/cost/model/approveRefuseStockCostAdjustSheetVo.ts +++ /dev/null @@ -1,11 +0,0 @@ -export interface ApproveRefuseStockCostAdjustSheetVo { - /** - * ID - */ - id: string; - - /** - * 拒绝理由 - */ - refuseReason: string; -} diff --git a/src/api/sc/stock/adjust/cost/model/batchApprovePassStockCostAdjustSheetVo.ts b/src/api/sc/stock/adjust/cost/model/batchApprovePassStockCostAdjustSheetVo.ts deleted file mode 100644 index bfd7434..0000000 --- a/src/api/sc/stock/adjust/cost/model/batchApprovePassStockCostAdjustSheetVo.ts +++ /dev/null @@ -1,6 +0,0 @@ -export interface BatchApprovePassStockCostAdjustSheetVo { - /** - * 库存成本调整单ID - */ - ids: string[]; -} diff --git a/src/api/sc/stock/adjust/cost/model/batchApproveRefuseStockCostAdjustSheetVo.ts b/src/api/sc/stock/adjust/cost/model/batchApproveRefuseStockCostAdjustSheetVo.ts deleted file mode 100644 index 3f63db6..0000000 --- a/src/api/sc/stock/adjust/cost/model/batchApproveRefuseStockCostAdjustSheetVo.ts +++ /dev/null @@ -1,11 +0,0 @@ -export interface BatchApproveRefuseStockCostAdjustSheetVo { - /** - * 库存成本调整单ID - */ - ids: string[]; - - /** - * 拒绝理由 - */ - refuseReason: string; -} diff --git a/src/api/sc/stock/adjust/cost/model/createStockCostAdjustSheetVo.ts b/src/api/sc/stock/adjust/cost/model/createStockCostAdjustSheetVo.ts deleted file mode 100644 index 772d15f..0000000 --- a/src/api/sc/stock/adjust/cost/model/createStockCostAdjustSheetVo.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { StockCostAdjustProductVo } from '@/api/sc/stock/adjust/cost/model/stockCostAdjustProductVo'; - -export interface CreateStockCostAdjustSheetVo { - /** - * 仓库ID - */ - scId: string; - - /** - * 备注 - */ - description: string; - - /** - * 商品信息 - */ - products: StockCostAdjustProductVo[]; -} diff --git a/src/api/sc/stock/adjust/cost/model/queryStockCostAdjustProductVo.ts b/src/api/sc/stock/adjust/cost/model/queryStockCostAdjustProductVo.ts deleted file mode 100644 index 6070fc2..0000000 --- a/src/api/sc/stock/adjust/cost/model/queryStockCostAdjustProductVo.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { PageVo } from '@/api/model/pageVo'; - -export interface QueryStockCostAdjustProductVo extends PageVo { - /** - * 仓库ID - */ - scId: string; - - /** - * 检索关键字 - */ - condition: string; - - /** - * 类目ID - */ - categoryId: string; - - /** - * 品牌ID - */ - brandId: string; -} diff --git a/src/api/sc/stock/adjust/cost/model/queryStockCostAdjustSheetBo.ts b/src/api/sc/stock/adjust/cost/model/queryStockCostAdjustSheetBo.ts deleted file mode 100644 index 899d33c..0000000 --- a/src/api/sc/stock/adjust/cost/model/queryStockCostAdjustSheetBo.ts +++ /dev/null @@ -1,61 +0,0 @@ -export interface QueryStockCostAdjustSheetBo { - /** - * ID - */ - id: string; - - /** - * 业务单据号 - */ - code: string; - - /** - * 仓库编号 - */ - scCode: string; - - /** - * 仓库名称 - */ - scName: string; - - /** - * 调价品种数 - */ - productNum: number; - - /** - * 库存调价差额 - */ - diffAmount: number; - - /** - * 状态 - */ - status: number; - - /** - * 备注 - */ - description: string; - - /** - * 修改人 - */ - updateBy: string; - - /** - * 修改时间 - */ - updateTime: string; - - /** - * 审核人 - */ - approveBy: string; - - /** - * 审核时间 - */ - approveTime: string; -} diff --git a/src/api/sc/stock/adjust/cost/model/queryStockCostAdjustSheetVo.ts b/src/api/sc/stock/adjust/cost/model/queryStockCostAdjustSheetVo.ts deleted file mode 100644 index b8cb38f..0000000 --- a/src/api/sc/stock/adjust/cost/model/queryStockCostAdjustSheetVo.ts +++ /dev/null @@ -1,48 +0,0 @@ -import { SortPageVo } from '@/api/model/sortPageVo'; - -export interface QueryStockCostAdjustSheetVo extends SortPageVo { - /** - * 业务单据号 - */ - code: string; - - /** - * 仓库ID - */ - scId: string; - - /** - * 状态 - */ - status: number; - - /** - * 修改人 - */ - updateBy: string; - - /** - * 修改时间 起始时间 - */ - updateTimeStart: string; - - /** - * 修改时间 截止时间 - */ - updateTimeEnd: string; - - /** - * 审核人 - */ - approveBy: string; - - /** - * 审核时间 起始时间 - */ - approveTimeStart: string; - - /** - * 审核时间 截止时间 - */ - approveTimeEnd: string; -} diff --git a/src/api/sc/stock/adjust/cost/model/stockCostAdjustProductBo.ts b/src/api/sc/stock/adjust/cost/model/stockCostAdjustProductBo.ts deleted file mode 100644 index dfbd4c6..0000000 --- a/src/api/sc/stock/adjust/cost/model/stockCostAdjustProductBo.ts +++ /dev/null @@ -1,61 +0,0 @@ -export interface StockCostAdjustProductBo { - /** - * ID - */ - productId: string; - - /** - * 编号 - */ - productCode: string; - - /** - * 名称 - */ - productName: string; - - /** - * 类目名称 - */ - categoryName: string; - - /** - * 品牌名称 - */ - brandName: string; - - /** - * SKU - */ - skuCode: string; - - /** - * 外部编号 - */ - externalCode: string; - - /** - * 规格 - */ - spec: string; - - /** - * 单位 - */ - unit: string; - - /** - * 档案采购价 - */ - purchasePrice: number; - - /** - * 库存数量 - */ - stockNum: number; - - /** - * 调价前成本价 - */ - oriPrice: number; -} diff --git a/src/api/sc/stock/adjust/cost/model/stockCostAdjustProductVo.ts b/src/api/sc/stock/adjust/cost/model/stockCostAdjustProductVo.ts deleted file mode 100644 index b359f84..0000000 --- a/src/api/sc/stock/adjust/cost/model/stockCostAdjustProductVo.ts +++ /dev/null @@ -1,16 +0,0 @@ -export interface StockCostAdjustProductVo { - /** - * 商品ID - */ - productId: string; - - /** - * 调整后成本价 - */ - price: number; - - /** - * 备注 - */ - description: string; -} diff --git a/src/api/sc/stock/adjust/cost/model/stockCostAdjustSheetFullBo.ts b/src/api/sc/stock/adjust/cost/model/stockCostAdjustSheetFullBo.ts deleted file mode 100644 index c163d3d..0000000 --- a/src/api/sc/stock/adjust/cost/model/stockCostAdjustSheetFullBo.ts +++ /dev/null @@ -1,163 +0,0 @@ -export interface StockCostAdjustSheetFullBo { - /** - * ID - */ - id: string; - - /** - * 业务单据号 - */ - code: string; - - /** - * 仓库ID - */ - scId: string; - - /** - * 仓库名称 - */ - scName: string; - - /** - * 调价品种数 - */ - productNum: number; - - /** - * 库存调价差额 - */ - diffAmount: number; - - /** - * 状态 - */ - status: number; - - /** - * 备注 - */ - description: string; - - /** - * 修改人 - */ - updateBy: string; - - /** - * 修改时间 - */ - updateTime: string; - - /** - * 审核人 - */ - approveBy: string; - - /** - * 审核时间 - */ - approveTime: string; - - /** - * 拒绝原因 - */ - refuseReason: string; - - /** - * 明细 - */ - details: DetailBo[]; -} - -export interface DetailBo { - /** - * ID - */ - id: string; - - /** - * 商品ID - */ - productId: string; - - /** - * 编号 - */ - productCode: string; - - /** - * 名称 - */ - productName: string; - - /** - * 类目名称 - */ - categoryName: string; - - /** - * 品牌名称 - */ - brandName: string; - - /** - * SKU - */ - skuCode: string; - - /** - * 外部编号 - */ - externalCode: string; - - /** - * 规格 - */ - spec: string; - - /** - * 单位 - */ - unit: string; - - /** - * 档案采购价 - */ - purchasePrice: number; - - /** - * 库存数量 - */ - stockNum: number; - - /** - * 调整前成本价 - */ - oriPrice: number; - - /** - * 调整后成本价 - */ - price: number; - - /** - * 库存调价差额 - */ - diffAmount: number; - - /** - * 备注 - */ - description: string; - - /** - * - */ - scId: string; - - /** - * - */ - status: number; -} diff --git a/src/api/sc/stock/adjust/cost/model/updateStockCostAdjustSheetVo.ts b/src/api/sc/stock/adjust/cost/model/updateStockCostAdjustSheetVo.ts deleted file mode 100644 index d917d01..0000000 --- a/src/api/sc/stock/adjust/cost/model/updateStockCostAdjustSheetVo.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { CreateStockCostAdjustSheetVo } from '@/api/sc/stock/adjust/cost/model/createStockCostAdjustSheetVo'; - -export interface UpdateStockCostAdjustSheetVo extends CreateStockCostAdjustSheetVo { - /** - * ID - */ - id: string; -} diff --git a/src/api/sc/stock/adjust/reason/model/getStockAdjustReasonBo.ts b/src/api/sc/stock/adjust/reason/model/getStockAdjustReasonBo.ts index cfa1a3b..b7d188f 100644 --- a/src/api/sc/stock/adjust/reason/model/getStockAdjustReasonBo.ts +++ b/src/api/sc/stock/adjust/reason/model/getStockAdjustReasonBo.ts @@ -5,12 +5,12 @@ export interface GetStockAdjustReasonBo { id: string; /** - * 岗位编号 + * 编号 */ code: string; /** - * 岗位名称 + * 名称 */ name: string; diff --git a/src/api/sc/stock/adjust/reason/model/stockAdjustReasonSelectorBo.ts b/src/api/sc/stock/adjust/reason/model/stockAdjustReasonSelectorBo.ts index bde494f..b55fc26 100644 --- a/src/api/sc/stock/adjust/reason/model/stockAdjustReasonSelectorBo.ts +++ b/src/api/sc/stock/adjust/reason/model/stockAdjustReasonSelectorBo.ts @@ -5,12 +5,12 @@ export interface StockAdjustReasonSelectorBo { id: string; /** - * 岗位编号 + * 编号 */ code: string; /** - * 岗位名称 + * 名称 */ name: string; diff --git a/src/api/sc/stock/adjust/stock/model/queryStockAdjustProductVo.ts b/src/api/sc/stock/adjust/stock/model/queryStockAdjustProductVo.ts index c188165..c02e48d 100644 --- a/src/api/sc/stock/adjust/stock/model/queryStockAdjustProductVo.ts +++ b/src/api/sc/stock/adjust/stock/model/queryStockAdjustProductVo.ts @@ -12,7 +12,7 @@ export interface QueryStockAdjustProductVo extends PageVo { condition: string; /** - * 类目ID + * 分类ID */ categoryId: string; diff --git a/src/api/sc/stock/adjust/stock/model/stockAdjustProductBo.ts b/src/api/sc/stock/adjust/stock/model/stockAdjustProductBo.ts index 8a25e57..68061f1 100644 --- a/src/api/sc/stock/adjust/stock/model/stockAdjustProductBo.ts +++ b/src/api/sc/stock/adjust/stock/model/stockAdjustProductBo.ts @@ -15,7 +15,7 @@ export interface StockAdjustProductBo { productName: string; /** - * 类目名称 + * 分类名称 */ categoryName: string; diff --git a/src/api/sc/stock/adjust/stock/model/stockAdjustSheetFullBo.ts b/src/api/sc/stock/adjust/stock/model/stockAdjustSheetFullBo.ts index 8739363..214264c 100644 --- a/src/api/sc/stock/adjust/stock/model/stockAdjustSheetFullBo.ts +++ b/src/api/sc/stock/adjust/stock/model/stockAdjustSheetFullBo.ts @@ -97,7 +97,7 @@ export interface DetailBo { productName: string; /** - * 类目名称 + * 分类名称 */ categoryName: string; diff --git a/src/api/sc/stock/product-stock-log/model/queryProductStockLogBo.ts b/src/api/sc/stock/product-stock-log/model/queryProductStockLogBo.ts index 4bf7dcc..19f892d 100644 --- a/src/api/sc/stock/product-stock-log/model/queryProductStockLogBo.ts +++ b/src/api/sc/stock/product-stock-log/model/queryProductStockLogBo.ts @@ -35,7 +35,7 @@ export interface QueryProductStockLogBo { productName: string; /** - * 商品类目 + * 商品分类 */ categoryName: string; diff --git a/src/api/sc/stock/product-stock-log/model/queryProductStockLogVo.ts b/src/api/sc/stock/product-stock-log/model/queryProductStockLogVo.ts index 572f70d..5e0edd3 100644 --- a/src/api/sc/stock/product-stock-log/model/queryProductStockLogVo.ts +++ b/src/api/sc/stock/product-stock-log/model/queryProductStockLogVo.ts @@ -17,7 +17,7 @@ export interface QueryProductStockLogVo extends SortPageVo { productName: string; /** - * 商品类目ID + * 商品分类ID */ categoryId: string; diff --git a/src/api/sc/stock/product-stock/model/queryProductStockBo.ts b/src/api/sc/stock/product-stock/model/queryProductStockBo.ts index e7a8130..9b19a91 100644 --- a/src/api/sc/stock/product-stock/model/queryProductStockBo.ts +++ b/src/api/sc/stock/product-stock/model/queryProductStockBo.ts @@ -35,7 +35,7 @@ export interface QueryProductStockBo { productName: string; /** - * 商品类目 + * 商品分类 */ categoryName: string; diff --git a/src/api/sc/stock/product-stock/model/queryProductStockVo.ts b/src/api/sc/stock/product-stock/model/queryProductStockVo.ts index 505c65f..3826719 100644 --- a/src/api/sc/stock/product-stock/model/queryProductStockVo.ts +++ b/src/api/sc/stock/product-stock/model/queryProductStockVo.ts @@ -17,7 +17,7 @@ export interface QueryProductStockVo extends SortPageVo { productName: string; /** - * 商品类目ID + * 商品分类ID */ categoryId: string; diff --git a/src/api/sc/stock/take/plan/model/queryTakeStockPlanProductBo.ts b/src/api/sc/stock/take/plan/model/queryTakeStockPlanProductBo.ts index a8827ac..08e7b22 100644 --- a/src/api/sc/stock/take/plan/model/queryTakeStockPlanProductBo.ts +++ b/src/api/sc/stock/take/plan/model/queryTakeStockPlanProductBo.ts @@ -15,7 +15,7 @@ export interface QueryTakeStockPlanProductBo { productName: string; /** - * 类目名称 + * 分类名称 */ categoryName: string; diff --git a/src/api/sc/stock/take/plan/model/takeStockPlanFullBo.ts b/src/api/sc/stock/take/plan/model/takeStockPlanFullBo.ts index e1ab80c..70897b0 100644 --- a/src/api/sc/stock/take/plan/model/takeStockPlanFullBo.ts +++ b/src/api/sc/stock/take/plan/model/takeStockPlanFullBo.ts @@ -77,7 +77,7 @@ export interface DetailBo { productName: string; /** - * 类目名称 + * 分类名称 */ categoryName: string; diff --git a/src/api/sc/stock/take/pre/model/getPreTakeStockSheetBo.ts b/src/api/sc/stock/take/pre/model/getPreTakeStockSheetBo.ts index b9a8f3a..ea05b63 100644 --- a/src/api/sc/stock/take/pre/model/getPreTakeStockSheetBo.ts +++ b/src/api/sc/stock/take/pre/model/getPreTakeStockSheetBo.ts @@ -67,7 +67,7 @@ export interface SheetDetailBo { productName: string; /** - * 类目名称 + * 分类名称 */ categoryName: string; diff --git a/src/api/sc/stock/take/pre/model/preTakeStockProductBo.ts b/src/api/sc/stock/take/pre/model/preTakeStockProductBo.ts index d4c4386..cd00db9 100644 --- a/src/api/sc/stock/take/pre/model/preTakeStockProductBo.ts +++ b/src/api/sc/stock/take/pre/model/preTakeStockProductBo.ts @@ -15,7 +15,7 @@ export interface PreTakeStockProductBo { productName: string; /** - * 类目名称 + * 分类名称 */ categoryName: string; diff --git a/src/api/sc/stock/take/pre/model/queryPreTakeStockProductVo.ts b/src/api/sc/stock/take/pre/model/queryPreTakeStockProductVo.ts index 6a94429..58d8fe5 100644 --- a/src/api/sc/stock/take/pre/model/queryPreTakeStockProductVo.ts +++ b/src/api/sc/stock/take/pre/model/queryPreTakeStockProductVo.ts @@ -7,7 +7,7 @@ export interface QueryPreTakeStockProductVo extends PageVo { condition: string; /** - * 类目ID + * 分类ID */ categoryId: string; diff --git a/src/api/sc/stock/take/pre/model/queryPreTakeStockSheetProductBo.ts b/src/api/sc/stock/take/pre/model/queryPreTakeStockSheetProductBo.ts index 2414d9e..844a5d4 100644 --- a/src/api/sc/stock/take/pre/model/queryPreTakeStockSheetProductBo.ts +++ b/src/api/sc/stock/take/pre/model/queryPreTakeStockSheetProductBo.ts @@ -20,7 +20,7 @@ export interface QueryPreTakeStockSheetProductBo { productName: string; /** - * 类目名称 + * 分类名称 */ categoryName: string; diff --git a/src/api/sc/stock/take/sheet/model/queryTakeStockSheetProductVo.ts b/src/api/sc/stock/take/sheet/model/queryTakeStockSheetProductVo.ts index c4cf6dd..778d43f 100644 --- a/src/api/sc/stock/take/sheet/model/queryTakeStockSheetProductVo.ts +++ b/src/api/sc/stock/take/sheet/model/queryTakeStockSheetProductVo.ts @@ -7,7 +7,7 @@ export interface QueryTakeStockSheetProductVo extends PageVo { condition: string; /** - * 类目ID + * 分类ID */ categoryId: string; diff --git a/src/api/sc/stock/take/sheet/model/takeStockSheetFullBo.ts b/src/api/sc/stock/take/sheet/model/takeStockSheetFullBo.ts index 1a6e332..f8e58a1 100644 --- a/src/api/sc/stock/take/sheet/model/takeStockSheetFullBo.ts +++ b/src/api/sc/stock/take/sheet/model/takeStockSheetFullBo.ts @@ -107,7 +107,7 @@ export interface SheetDetailBo { productName: string; /** - * 类目名称 + * 分类名称 */ categoryName: string; diff --git a/src/api/sc/stock/take/sheet/model/takeStockSheetProductBo.ts b/src/api/sc/stock/take/sheet/model/takeStockSheetProductBo.ts index 667d3ba..8b3cf65 100644 --- a/src/api/sc/stock/take/sheet/model/takeStockSheetProductBo.ts +++ b/src/api/sc/stock/take/sheet/model/takeStockSheetProductBo.ts @@ -15,7 +15,7 @@ export interface TakeStockSheetProductBo { productName: string; /** - * 类目名称 + * 分类名称 */ categoryName: string; diff --git a/src/api/sc/stock/transfer-sc/model/queryScTransferProductVo.ts b/src/api/sc/stock/transfer-sc/model/queryScTransferProductVo.ts index 1ff4ee7..aed7c08 100644 --- a/src/api/sc/stock/transfer-sc/model/queryScTransferProductVo.ts +++ b/src/api/sc/stock/transfer-sc/model/queryScTransferProductVo.ts @@ -12,7 +12,7 @@ export interface QueryScTransferProductVo extends PageVo { condition: string; /** - * 类目ID + * 分类ID */ categoryId: string; diff --git a/src/api/sc/stock/transfer-sc/model/scTransferOrderFullBo.ts b/src/api/sc/stock/transfer-sc/model/scTransferOrderFullBo.ts index c5572db..cdac5c9 100644 --- a/src/api/sc/stock/transfer-sc/model/scTransferOrderFullBo.ts +++ b/src/api/sc/stock/transfer-sc/model/scTransferOrderFullBo.ts @@ -101,7 +101,7 @@ export interface DetailBo { productName: string; /** - * 类目名称 + * 分类名称 */ categoryName: string; diff --git a/src/api/sc/stock/transfer-sc/model/scTransferProductBo.ts b/src/api/sc/stock/transfer-sc/model/scTransferProductBo.ts index b774cd8..a545931 100644 --- a/src/api/sc/stock/transfer-sc/model/scTransferProductBo.ts +++ b/src/api/sc/stock/transfer-sc/model/scTransferProductBo.ts @@ -15,7 +15,7 @@ export interface ScTransferProductBo { productName: string; /** - * 类目名称 + * 分类名称 */ categoryName: string; diff --git a/src/api/settle/in-item/model/getSettleInItemBo.ts b/src/api/settle/in-item/model/getSettleInItemBo.ts index 0daec8b..cf2a2ad 100644 --- a/src/api/settle/in-item/model/getSettleInItemBo.ts +++ b/src/api/settle/in-item/model/getSettleInItemBo.ts @@ -5,12 +5,12 @@ export interface GetSettleInItemBo { id: string; /** - * 岗位编号 + * 编号 */ code: string; /** - * 岗位名称 + * 名称 */ name: string; diff --git a/src/api/settle/in-item/model/settleInItemSelectorBo.ts b/src/api/settle/in-item/model/settleInItemSelectorBo.ts index 612fac6..913f4db 100644 --- a/src/api/settle/in-item/model/settleInItemSelectorBo.ts +++ b/src/api/settle/in-item/model/settleInItemSelectorBo.ts @@ -5,12 +5,12 @@ export interface SettleInItemSelectorBo { id: string; /** - * 岗位编号 + * 编号 */ code: string; /** - * 岗位名称 + * 名称 */ name: string; diff --git a/src/api/settle/out-item/model/getSettleOutItemBo.ts b/src/api/settle/out-item/model/getSettleOutItemBo.ts index 445b5ff..5b3a126 100644 --- a/src/api/settle/out-item/model/getSettleOutItemBo.ts +++ b/src/api/settle/out-item/model/getSettleOutItemBo.ts @@ -5,12 +5,12 @@ export interface GetSettleOutItemBo { id: string; /** - * 岗位编号 + * 编号 */ code: string; /** - * 岗位名称 + * 名称 */ name: string; diff --git a/src/api/system/position/index.ts b/src/api/system/generate-code/index.ts similarity index 33% rename from src/api/system/position/index.ts rename to src/api/system/generate-code/index.ts index 8c591c2..9512029 100644 --- a/src/api/system/position/index.ts +++ b/src/api/system/generate-code/index.ts @@ -1,24 +1,24 @@ import { defHttp } from '/@/utils/http/axios'; import { PageResult } from '@/api/model/pageResult'; import { ContentTypeEnum } from '@/enums/httpEnum'; -import { SysPositionSelectorBo } from '@/api/system/position/model/sysPositionSelectorBo'; -import { SysPositionSelectorVo } from '@/api/system/position/model/sysPositionSelectorVo'; -import { QuerySysPositionBo } from '@/api/system/position/model/querySysPositionBo'; -import { QuerySysPositionVo } from '@/api/system/position/model/querySysPositionVo'; -import { GetSysPositionBo } from '@/api/system/position/model/getSysPositionBo'; -import { CreateSysPositionVo } from '@/api/system/position/model/createSysPositionVo'; -import { UpdateSysPositionVo } from '@/api/system/position/model/updateSysPositionVo'; +import { UpdateSysGenerateCodeVo } from '@/api/system/generate-code/model/updateSysGenerateCodeVo'; +import { CreateSysGenerateCodeVo } from '@/api/system/generate-code/model/createSysGenerateCodeVo'; +import { GetSysGenerateCodeBo } from '@/api/system/generate-code/model/getSysGenerateCodeBo'; +import { QuerySysGenerateCodeVo } from '@/api/system/generate-code/model/querySysGenerateCodeVo'; +import { QuerySysGenerateCodeBo } from '@/api/system/generate-code/model/querySysGenerateCodeBo'; +import { SettingSysGenerateCodeVo } from '@/api/system/generate-code/model/settingSysGenerateCodeVo'; +import { PreviewSysGenerateCodeVo } from '@/api/system/generate-code/model/previewSysGenerateCodeVo'; -const baseUrl = '/system/position'; -const selectorBaseUrl = '/selector'; +const baseUrl = '/system/generate/code'; const region = 'cloud-api'; -export function selector( - params: SysPositionSelectorVo, -): Promise> { - return defHttp.get>( +/** + * 查询列表 + */ +export function query(params: QuerySysGenerateCodeVo): Promise> { + return defHttp.get>( { - url: selectorBaseUrl + '/position', + url: baseUrl + '/query', params, }, { @@ -27,27 +27,17 @@ export function selector( ); } -export function loadPosition(ids: string[]): Promise { - return defHttp.post( - { - url: selectorBaseUrl + '/position/load', - data: ids, - }, - { - contentType: ContentTypeEnum.JSON, - region, - }, - ); -} - /** - * 岗位列表 + * 根据ID查询 + * @param id */ -export function query(params: QuerySysPositionVo): Promise> { - return defHttp.get>( +export function get(id: string): Promise { + return defHttp.get( { - url: baseUrl + '/query', - params, + url: baseUrl, + params: { + id: id, + }, }, { region, @@ -56,63 +46,64 @@ export function query(params: QuerySysPositionVo): Promise { - return defHttp.get( +export function create(data: CreateSysGenerateCodeVo): Promise { + return defHttp.post( { url: baseUrl, - params: { - id: id, - }, + data, }, { + contentType: ContentTypeEnum.FORM_URLENCODED, region, }, ); } /** - * 批量停用岗位 - * @param ids + * 修改 + * @param data */ -export function batchUnable(ids: string[]): Promise { - return defHttp.patch( +export function update(data: UpdateSysGenerateCodeVo): Promise { + return defHttp.put( { - url: baseUrl + '/unable/batch', - data: ids, + url: baseUrl, + data, }, { - contentType: ContentTypeEnum.JSON, + contentType: ContentTypeEnum.FORM_URLENCODED, region, }, ); } /** - * 批量启用岗位 - * @param ids + * 根据ID删除 + * @param id */ -export function batchEnable(ids: string[]): Promise { - return defHttp.patch( +export function deleteById(id: string): Promise { + return defHttp.delete( { - url: baseUrl + '/enable/batch', - data: ids, + url: baseUrl, + data: { + id, + }, }, { - contentType: ContentTypeEnum.JSON, + contentType: ContentTypeEnum.FORM_URLENCODED, region, }, ); } /** - * 新增 + * 设置 * @param data */ -export function create(data: CreateSysPositionVo): Promise { - return defHttp.post( +export function setting(data: SettingSysGenerateCodeVo): Promise { + return defHttp.patch( { url: baseUrl, data, @@ -125,13 +116,13 @@ export function create(data: CreateSysPositionVo): Promise { } /** - * 修改 + * 预览 * @param data */ -export function update(data: UpdateSysPositionVo): Promise { - return defHttp.put( +export function preview(data: PreviewSysGenerateCodeVo): Promise { + return defHttp.post( { - url: baseUrl, + url: baseUrl + '/preview', data, }, { diff --git a/src/api/system/position/model/sysPositionSelectorBo.ts b/src/api/system/generate-code/model/createSysGenerateCodeVo.ts similarity index 43% rename from src/api/system/position/model/sysPositionSelectorBo.ts rename to src/api/system/generate-code/model/createSysGenerateCodeVo.ts index b6ef525..5834459 100644 --- a/src/api/system/position/model/sysPositionSelectorBo.ts +++ b/src/api/system/generate-code/model/createSysGenerateCodeVo.ts @@ -1,21 +1,16 @@ -export interface SysPositionSelectorBo { +export interface CreateSysGenerateCodeVo { /** * ID */ id: string; - /** - * 编号 - */ - code: string; - /** * 名称 */ name: string; /** - * 状态 + * 配置规则 */ - available: boolean; + configStr: string; } diff --git a/src/api/system/position/model/createSysPositionVo.ts b/src/api/system/generate-code/model/getSysGenerateCodeBo.ts similarity index 30% rename from src/api/system/position/model/createSysPositionVo.ts rename to src/api/system/generate-code/model/getSysGenerateCodeBo.ts index 5616cc8..72df2c1 100644 --- a/src/api/system/position/model/createSysPositionVo.ts +++ b/src/api/system/generate-code/model/getSysGenerateCodeBo.ts @@ -1,16 +1,16 @@ -export interface CreateSysPositionVo { +export interface GetSysGenerateCodeBo { /** - * 岗位编号 + * ID */ - code: string; + id: number; /** - * 岗位名称 + * 名称 */ name: string; /** - * 备注 + * 配置规则 */ - description: string; + configStr: string; } diff --git a/src/api/system/generate-code/model/previewSysGenerateCodeVo.ts b/src/api/system/generate-code/model/previewSysGenerateCodeVo.ts new file mode 100644 index 0000000..46d55a7 --- /dev/null +++ b/src/api/system/generate-code/model/previewSysGenerateCodeVo.ts @@ -0,0 +1,6 @@ +export interface PreviewSysGenerateCodeVo { + /** + * 配置规则 + */ + configStr: string; +} diff --git a/src/api/system/generate-code/model/querySysGenerateCodeBo.ts b/src/api/system/generate-code/model/querySysGenerateCodeBo.ts new file mode 100644 index 0000000..ad26c7f --- /dev/null +++ b/src/api/system/generate-code/model/querySysGenerateCodeBo.ts @@ -0,0 +1,11 @@ +export interface QuerySysGenerateCodeBo { + /** + * ID + */ + id: number; + + /** + * 名称 + */ + name: string; +} diff --git a/src/api/system/position/model/querySysPositionVo.ts b/src/api/system/generate-code/model/querySysGenerateCodeVo.ts similarity index 45% rename from src/api/system/position/model/querySysPositionVo.ts rename to src/api/system/generate-code/model/querySysGenerateCodeVo.ts index 81bc7cb..a7feb32 100644 --- a/src/api/system/position/model/querySysPositionVo.ts +++ b/src/api/system/generate-code/model/querySysGenerateCodeVo.ts @@ -1,18 +1,13 @@ import { SortPageVo } from '@/api/model/sortPageVo'; -export interface QuerySysPositionVo extends SortPageVo { +export interface QuerySysGenerateCodeVo extends SortPageVo { /** - * 编号 + * ID */ - code: string; + id: string; /** * 名称 */ name: string; - - /** - * 状态 - */ - available: boolean; } diff --git a/src/api/sc/stock/adjust/cost/model/approvePassStockCostAdjustSheetVo.ts b/src/api/system/generate-code/model/settingSysGenerateCodeVo.ts similarity index 35% rename from src/api/sc/stock/adjust/cost/model/approvePassStockCostAdjustSheetVo.ts rename to src/api/system/generate-code/model/settingSysGenerateCodeVo.ts index 9b27a6e..af9772b 100644 --- a/src/api/sc/stock/adjust/cost/model/approvePassStockCostAdjustSheetVo.ts +++ b/src/api/system/generate-code/model/settingSysGenerateCodeVo.ts @@ -1,11 +1,11 @@ -export interface ApprovePassStockCostAdjustSheetVo { +export interface SettingSysGenerateCodeVo { /** * ID */ id: string; /** - * 备注 + * 配置规则 */ - description: string; + configStr: string; } diff --git a/src/api/system/generate-code/model/updateSysGenerateCodeVo.ts b/src/api/system/generate-code/model/updateSysGenerateCodeVo.ts new file mode 100644 index 0000000..0f4d794 --- /dev/null +++ b/src/api/system/generate-code/model/updateSysGenerateCodeVo.ts @@ -0,0 +1,16 @@ +export interface UpdateSysGenerateCodeVo { + /** + * ID + */ + id: string; + + /** + * 名称 + */ + name: string; + + /** + * 配置规则 + */ + configStr: string; +} diff --git a/src/api/system/op-log/index.ts b/src/api/system/op-log/index.ts index c259dc1..c4e36c3 100644 --- a/src/api/system/op-log/index.ts +++ b/src/api/system/op-log/index.ts @@ -1,6 +1,6 @@ import { defHttp } from '/@/utils/http/axios'; import { PageResult } from '@/api/model/pageResult'; -import { GetSysPositionBo } from '@/api/system/position/model/getSysPositionBo'; +import { GetOpLogBo } from '@/api/system/op-log/model/getOpLogBo'; import { QueryOpLogsVo } from '@/api/system/op-log/model/queryOpLogsVo'; import { QueryOpLogBo } from '@/api/system/op-log/model/queryOpLogBo'; @@ -26,8 +26,8 @@ export function query(params: QueryOpLogsVo): Promise> * 根据ID查询 * @param id */ -export function get(id: string): Promise { - return defHttp.get( +export function get(id: string): Promise { + return defHttp.get( { url: baseUrl, params: { diff --git a/src/api/system/position/model/getSysPositionBo.ts b/src/api/system/position/model/getSysPositionBo.ts deleted file mode 100644 index c9db39a..0000000 --- a/src/api/system/position/model/getSysPositionBo.ts +++ /dev/null @@ -1,26 +0,0 @@ -export interface GetSysPositionBo { - /** - * ID - */ - id: string; - - /** - * 岗位编号 - */ - code: string; - - /** - * 岗位名称 - */ - name: string; - - /** - * 状态 - */ - available: boolean; - - /** - * 备注 - */ - description: string; -} diff --git a/src/api/system/position/model/querySysPositionBo.ts b/src/api/system/position/model/querySysPositionBo.ts deleted file mode 100644 index e59249b..0000000 --- a/src/api/system/position/model/querySysPositionBo.ts +++ /dev/null @@ -1,46 +0,0 @@ -export interface QuerySysPositionBo { - /** - * ID - */ - id: string; - - /** - * 岗位编号 - */ - code: string; - - /** - * 岗位名称 - */ - name: string; - - /** - * 状态 - */ - available: boolean; - - /** - * 备注 - */ - description: string; - - /** - * 创建人 - */ - createBy: string; - - /** - * 创建时间 - */ - createTime: string; - - /** - * 修改人 - */ - updateBy: string; - - /** - * 修改时间 - */ - updateTime: string; -} diff --git a/src/api/system/position/model/sysPositionSelectorVo.ts b/src/api/system/position/model/sysPositionSelectorVo.ts deleted file mode 100644 index b189eca..0000000 --- a/src/api/system/position/model/sysPositionSelectorVo.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { PageVo } from '@/api/model/pageVo'; - -export interface SysPositionSelectorVo extends PageVo { - /** - * 编号 - */ - code: string; - - /** - * 名称 - */ - name: string; - - /** - * 状态 - */ - available: boolean; -} diff --git a/src/api/system/position/model/updateSysPositionVo.ts b/src/api/system/position/model/updateSysPositionVo.ts deleted file mode 100644 index b6795a9..0000000 --- a/src/api/system/position/model/updateSysPositionVo.ts +++ /dev/null @@ -1,26 +0,0 @@ -export interface UpdateSysPositionVo { - /** - * ID - */ - id: string; - - /** - * 岗位编号 - */ - code: string; - - /** - * 岗位名称 - */ - name: string; - - /** - * 状态 - */ - available: boolean; - - /** - * 备注 - */ - description: string; -} diff --git a/src/api/system/role/model/getSysRoleBo.ts b/src/api/system/role/model/getSysRoleBo.ts index 90c258d..1940483 100644 --- a/src/api/system/role/model/getSysRoleBo.ts +++ b/src/api/system/role/model/getSysRoleBo.ts @@ -5,12 +5,12 @@ export interface GetSysRoleBo { id: string; /** - * 岗位编号 + * 编号 */ code: string; /** - * 岗位名称 + * 名称 */ name: string; diff --git a/src/api/system/user/model/createSysUserVo.ts b/src/api/system/user/model/createSysUserVo.ts index aea1e27..74866b7 100644 --- a/src/api/system/user/model/createSysUserVo.ts +++ b/src/api/system/user/model/createSysUserVo.ts @@ -44,11 +44,6 @@ export interface CreateSysUserVo { */ roleIds: string[]; - /** - * 岗位ID - */ - positionIds: string[]; - /** * 备注 */ diff --git a/src/api/system/user/model/getSysUserBo.ts b/src/api/system/user/model/getSysUserBo.ts index 2f913f9..6d59c0e 100644 --- a/src/api/system/user/model/getSysUserBo.ts +++ b/src/api/system/user/model/getSysUserBo.ts @@ -34,16 +34,6 @@ export interface GetSysUserBo { */ gender: number; - /** - * 岗位 - */ - positions: string[]; - - /** - * 岗位名称 - */ - positionName: string; - /** * 部门 */ diff --git a/src/api/system/user/model/querySysUserBo.ts b/src/api/system/user/model/querySysUserBo.ts index 6534f7d..24529ac 100644 --- a/src/api/system/user/model/querySysUserBo.ts +++ b/src/api/system/user/model/querySysUserBo.ts @@ -14,11 +14,6 @@ export interface QuerySysUserBo { */ name: string; - /** - * 岗位名称 - */ - positionName: string; - /** * 部门名称 */ diff --git a/src/api/system/user/model/querySysUserVo.ts b/src/api/system/user/model/querySysUserVo.ts index cd71067..9807a36 100644 --- a/src/api/system/user/model/querySysUserVo.ts +++ b/src/api/system/user/model/querySysUserVo.ts @@ -16,11 +16,6 @@ export interface QuerySysUserVo extends PageVo { */ name: string; - /** - * 岗位ID - */ - positionId: string; - /** * 部门ID */ diff --git a/src/api/system/user/model/updateSysUserVo.ts b/src/api/system/user/model/updateSysUserVo.ts index b2448e6..a055ed2 100644 --- a/src/api/system/user/model/updateSysUserVo.ts +++ b/src/api/system/user/model/updateSysUserVo.ts @@ -39,11 +39,6 @@ export interface UpdateSysUserVo { */ gender: number; - /** - * 岗位ID - */ - positionIds: string[]; - /** * 角色ID */ diff --git a/src/components/Button/src/props.ts b/src/components/Button/src/props.ts index fd5fa52..e54bba0 100644 --- a/src/components/Button/src/props.ts +++ b/src/components/Button/src/props.ts @@ -1,14 +1,7 @@ -const validColors = ['primary', 'error', 'warning', 'success', ''] as const; -type ButtonColorType = (typeof validColors)[number]; - export const buttonProps = { - color: { - type: String as PropType, - validator: (v) => validColors.includes(v), - default: '', - }, loading: { type: Boolean }, disabled: { type: Boolean }, + danger: { type: Boolean }, /** * Text before icon. */ diff --git a/src/components/DataPermissionDragger/index.vue b/src/components/DataPermissionDragger/index.vue index 1137542..ed4ffbc 100644 --- a/src/components/DataPermissionDragger/index.vue +++ b/src/components/DataPermissionDragger/index.vue @@ -38,9 +38,7 @@ diff --git a/src/components/DataPermissionDragger/nested.vue b/src/components/DataPermissionDragger/nested.vue index d37b502..408f29b 100644 --- a/src/components/DataPermissionDragger/nested.vue +++ b/src/components/DataPermissionDragger/nested.vue @@ -1,6 +1,6 @@ + diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue index aa2bd65..a45746c 100644 --- a/src/views/system/menu/index.vue +++ b/src/views/system/menu/index.vue @@ -323,7 +323,7 @@ }, { label: '删除', - color: 'error', + danger: true, onClick: () => { this.deleteRow(row); }, diff --git a/src/views/system/notice/add.vue b/src/views/system/notice/add.vue index 3f9567d..cabf112 100644 --- a/src/views/system/notice/add.vue +++ b/src/views/system/notice/add.vue @@ -20,7 +20,7 @@ - + @@ -248,6 +286,8 @@ }, }, }, + batchHandleDatas: [], + batchRefuseReason: '', }; }, created() {}, @@ -293,6 +333,9 @@ }); }); }, + doBatchDelete(row) { + return api.batchDelete(row.id); + }, // 批量删除 batchDelete() { const records = this.$refs.grid.getCheckboxRecords(); @@ -310,19 +353,13 @@ } } - this.$msg.createConfirm('对选中的预付款单执行批量删除操作?').then((valid) => { - if (valid) { - this.loading = true; - api - .deleteByIds(records.map((item) => item.id)) - .then(() => { - this.$msg.createSuccess('删除成功!'); - this.search(); - }) - .finally(() => { - this.loading = false; - }); - } + this.batchHandleDatas = records; + + this.$refs.batchDeleteHandlerDialog.openDialog(); + }, + doBatchApprovePass(row) { + return api.batchApprovePass({ + id: row.id, }); }, // 批量审核通过 @@ -342,22 +379,9 @@ } } - this.$msg.createConfirm('对选中的预付款单执行审核通过操作?').then((valid) => { - if (valid) { - this.loading = true; - api - .batchApprovePass({ - ids: records.map((item) => item.id), - }) - .then(() => { - this.$msg.createSuccess('审核通过!'); - this.search(); - }) - .finally(() => { - this.loading = false; - }); - } - }); + this.batchHandleDatas = records; + + this.$refs.batchApprovePassHandlerDialog.openDialog(); }, // 批量审核拒绝 batchApproveRefuse() { @@ -387,22 +411,18 @@ this.$refs.approveRefuseDialog.openDialog(); }, + doBatchApproveRefuse(row) { + return api.batchApproveRefuse({ + id: row.id, + refuseReason: this.batchRefuseReason, + }); + }, doApproveRefuse(reason) { - const records = this.$refs.grid.getCheckboxRecords(); + this.batchHandleDatas = this.$refs.grid.getCheckboxRecords(); - this.loading = true; - api - .batchApproveRefuse({ - ids: records.map((item) => item.id), - refuseReason: reason, - }) - .then(() => { - this.$msg.createSuccess('审核拒绝!'); - this.search(); - }) - .finally(() => { - this.loading = false; - }); + this.batchRefuseReason = reason; + + this.$refs.batchApproveRefuseHandlerDialog.openDialog(); }, exportList() { this.loading = true; diff --git a/src/views/customer-settle/sheet/index.vue b/src/views/customer-settle/sheet/index.vue index be1902a..c75d521 100644 --- a/src/views/customer-settle/sheet/index.vue +++ b/src/views/customer-settle/sheet/index.vue @@ -127,6 +127,44 @@ + + + + + @@ -227,6 +265,8 @@ }, }, }, + batchHandleDatas: [], + batchRefuseReason: '', }; }, created() {}, @@ -271,6 +311,9 @@ }); }); }, + doBatchDelete(row) { + return api.batchDelete(row.id); + }, // 批量删除 batchDelete() { const records = this.$refs.grid.getCheckboxRecords(); @@ -286,17 +329,13 @@ } } - this.$msg.createConfirm('对选中的结算单执行批量删除操作?').then(() => { - this.loading = true; - api - .deleteByIds(records.map((item) => item.id)) - .then(() => { - this.$msg.createSuccess('删除成功!'); - this.search(); - }) - .finally(() => { - this.loading = false; - }); + this.batchHandleDatas = records; + + this.$refs.batchDeleteHandlerDialog.openDialog(); + }, + doBatchApprovePass(row) { + return api.batchApprovePass({ + id: row.id, }); }, // 批量审核通过 @@ -314,20 +353,9 @@ } } - this.$msg.createConfirm('对选中的结算单执行审核通过操作?').then(() => { - this.loading = true; - api - .batchApprovePass({ - ids: records.map((item) => item.id), - }) - .then(() => { - this.$msg.createSuccess('审核通过!'); - this.search(); - }) - .finally(() => { - this.loading = false; - }); - }); + this.batchHandleDatas = records; + + this.$refs.batchApprovePassHandlerDialog.openDialog(); }, // 批量审核拒绝 batchApproveRefuse() { @@ -353,22 +381,18 @@ this.$refs.approveRefuseDialog.openDialog(); }, + doBatchApproveRefuse(row) { + return api.batchApproveRefuse({ + id: row.id, + refuseReason: this.batchRefuseReason, + }); + }, doApproveRefuse(reason) { - const records = this.$refs.grid.getCheckboxRecords(); + this.batchHandleDatas = this.$refs.grid.getCheckboxRecords(); - this.loading = true; - api - .batchApproveRefuse({ - ids: records.map((item) => item.id), - refuseReason: reason, - }) - .then(() => { - this.$msg.createSuccess('审核拒绝!'); - this.search(); - }) - .finally(() => { - this.loading = false; - }); + this.batchRefuseReason = reason; + + this.$refs.batchApproveRefuseHandlerDialog.openDialog(); }, exportList() { this.loading = true; diff --git a/src/views/development/custom/list/index.vue b/src/views/development/custom/list/index.vue index 8e89102..2abb51f 100644 --- a/src/views/development/custom/list/index.vue +++ b/src/views/development/custom/list/index.vue @@ -100,6 +100,32 @@ + + + + + @@ -179,11 +205,12 @@ }, ajax: { // 查询接口 - query: ({ page, sorts, filters }) => { + query: ({ page }) => { return api.query(this.buildQueryParams(page)); }, }, }, + batchHandleDatas: [], }; }, created() {}, @@ -226,6 +253,9 @@ this.batchUnable(); } }, + doBatchUnable(row) { + return api.unable(row.id); + }, // 批量停用 batchUnable() { const records = this.$refs.grid.getCheckboxRecords(); @@ -235,19 +265,12 @@ return; } - this.$msg.createConfirm('是否确定停用选择的自定义列表?').then(() => { - this.loading = true; - const ids = records.map((t) => t.id); - api - .batchUnable(ids) - .then((data) => { - this.$msg.createSuccess('停用成功!'); - this.search(); - }) - .finally(() => { - this.loading = false; - }); - }); + this.batchHandleDatas = records; + + this.$refs.batchUnableHandlerDialog.openDialog(); + }, + doBatchEnable(row) { + return api.enable(row.id); }, // 批量启用 batchEnable() { @@ -258,19 +281,9 @@ return; } - this.$msg.createConfirm('是否确定启用选择的自定义列表?').then(() => { - this.loading = true; - const ids = records.map((t) => t.id); - api - .batchEnable(ids) - .then((data) => { - this.$msg.createSuccess('启用成功!'); - this.search(); - }) - .finally(() => { - this.loading = false; - }); - }); + this.batchHandleDatas = records; + + this.$refs.batchEnableHandlerDialog.openDialog(); }, // 删除 deleteRow(row) { @@ -287,6 +300,9 @@ }); }); }, + doBatchDelete(row) { + return api.batchDelete(row.id); + }, // 批量删除 batchDelete() { const records = this.$refs.grid.getCheckboxRecords(); @@ -296,19 +312,9 @@ return; } - this.$msg.createConfirm('是否确定删除选择的自定义列表?').then(() => { - this.loading = true; - const ids = records.map((t) => t.id); - api - .batchDelete(ids) - .then((data) => { - this.$msg.createSuccess('删除成功!'); - this.search(); - }) - .finally(() => { - this.loading = false; - }); - }); + this.batchHandleDatas = records; + + this.$refs.batchDeleteHandlerDialog.openDialog(); }, createActions(row) { return [ diff --git a/src/views/development/custom/page/index.vue b/src/views/development/custom/page/index.vue index a72b121..06ff3f1 100644 --- a/src/views/development/custom/page/index.vue +++ b/src/views/development/custom/page/index.vue @@ -71,6 +71,19 @@ + + + @@ -138,11 +151,12 @@ }, ajax: { // 查询接口 - query: ({ page, sorts, filters }) => { + query: ({ page }) => { return api.query(this.buildQueryParams(page)); }, }, }, + batchHandleDatas: [], }; }, created() {}, @@ -193,6 +207,9 @@ }); }); }, + doBatchDelete(row) { + return api.batchDelete(row.id); + }, // 批量删除 batchDelete() { const records = this.$refs.grid.getCheckboxRecords(); @@ -202,19 +219,9 @@ return; } - this.$msg.createConfirm('是否确定删除选择的自定义页面?').then(() => { - this.loading = true; - const ids = records.map((t) => t.id); - api - .batchDelete(ids) - .then((data) => { - this.$msg.createSuccess('删除成功!'); - this.search(); - }) - .finally(() => { - this.loading = false; - }); - }); + this.batchHandleDatas = records; + + this.$refs.batchDeleteHandlerDialog.openDialog(); }, createActions(row) { return [ diff --git a/src/views/development/custom/selector/index.vue b/src/views/development/custom/selector/index.vue index 4e11551..f129616 100644 --- a/src/views/development/custom/selector/index.vue +++ b/src/views/development/custom/selector/index.vue @@ -100,6 +100,32 @@ + + + + + @@ -179,11 +205,12 @@ }, ajax: { // 查询接口 - query: ({ page, sorts, filters }) => { + query: ({ page }) => { return api.query(this.buildQueryParams(page)); }, }, }, + batchHandleDatas: [], }; }, created() {}, @@ -226,6 +253,9 @@ this.batchUnable(); } }, + doBatchUnable(row) { + return api.unable(row.id); + }, // 批量停用 batchUnable() { const records = this.$refs.grid.getCheckboxRecords(); @@ -235,19 +265,12 @@ return; } - this.$msg.createConfirm('是否确定停用选择的自定义选择器?').then(() => { - this.loading = true; - const ids = records.map((t) => t.id); - api - .batchUnable(ids) - .then((data) => { - this.$msg.createSuccess('停用成功!'); - this.search(); - }) - .finally(() => { - this.loading = false; - }); - }); + this.batchHandleDatas = records; + + this.$refs.batchUnableHandlerDialog.openDialog(); + }, + doBatchEnable(row) { + return api.enable(row.id); }, // 批量启用 batchEnable() { @@ -258,19 +281,9 @@ return; } - this.$msg.createConfirm('是否确定启用选择的自定义选择器?').then(() => { - this.loading = true; - const ids = records.map((t) => t.id); - api - .batchEnable(ids) - .then((data) => { - this.$msg.createSuccess('启用成功!'); - this.search(); - }) - .finally(() => { - this.loading = false; - }); - }); + this.batchHandleDatas = records; + + this.$refs.batchEnableHandlerDialog.openDialog(); }, // 删除 deleteRow(row) { @@ -287,6 +300,9 @@ }); }); }, + doBatchDelete(row) { + return api.batchDelete(row.id); + }, // 批量删除 batchDelete() { const records = this.$refs.grid.getCheckboxRecords(); @@ -296,19 +312,9 @@ return; } - this.$msg.createConfirm('是否确定删除选择的自定义选择器?').then(() => { - this.loading = true; - const ids = records.map((t) => t.id); - api - .batchDelete(ids) - .then((data) => { - this.$msg.createSuccess('删除成功!'); - this.search(); - }) - .finally(() => { - this.loading = false; - }); - }); + this.batchHandleDatas = records; + + this.$refs.batchDeleteHandlerDialog.openDialog(); }, createActions(row) { return [ diff --git a/src/views/development/data/entity/index.vue b/src/views/development/data/entity/index.vue index 388650f..437c8da 100644 --- a/src/views/development/data/entity/index.vue +++ b/src/views/development/data/entity/index.vue @@ -103,6 +103,32 @@ + + + + + @@ -185,11 +211,12 @@ }, ajax: { // 查询接口 - query: ({ page, sorts, filters }) => { + query: ({ page }) => { return api.query(this.buildQueryParams(page)); }, }, }, + batchHandleDatas: [], }; }, created() {}, @@ -232,6 +259,9 @@ this.batchUnable(); } }, + doBatchUnable(row) { + return api.unable(row.id); + }, // 批量停用 batchUnable() { const records = this.$refs.grid.getCheckboxRecords(); @@ -241,19 +271,12 @@ return; } - this.$msg.createConfirm('是否确定停用选择的数据实体?').then(() => { - this.loading = true; - const ids = records.map((t) => t.id); - api - .batchUnable(ids) - .then((data) => { - this.$msg.createSuccess('停用成功!'); - this.search(); - }) - .finally(() => { - this.loading = false; - }); - }); + this.batchHandleDatas = records; + + this.$refs.batchUnableHandlerDialog.openDialog(); + }, + doBatchEnable(row) { + return api.enable(row.id); }, // 批量启用 batchEnable() { @@ -264,19 +287,9 @@ return; } - this.$msg.createConfirm('是否确定启用选择的数据实体?').then(() => { - this.loading = true; - const ids = records.map((t) => t.id); - api - .batchEnable(ids) - .then((data) => { - this.$msg.createSuccess('启用成功!'); - this.search(); - }) - .finally(() => { - this.loading = false; - }); - }); + this.batchHandleDatas = records; + + this.$refs.batchEnableHandlerDialog.openDialog(); }, // 删除 deleteRow(row) { @@ -293,6 +306,9 @@ }); }); }, + doBatchDelete(row) { + return api.batchDelete(row.id); + }, // 批量删除 batchDelete() { const records = this.$refs.grid.getCheckboxRecords(); @@ -302,19 +318,9 @@ return; } - this.$msg.createConfirm('是否确定删除选择的数据实体?').then(() => { - this.loading = true; - const ids = records.map((t) => t.id); - api - .batchDelete(ids) - .then((data) => { - this.$msg.createSuccess('删除成功!'); - this.search(); - }) - .finally(() => { - this.loading = false; - }); - }); + this.batchHandleDatas = records; + + this.$refs.batchDeleteHandlerDialog.openDialog(); }, download(id) { this.loading = true; diff --git a/src/views/development/data/obj/index.vue b/src/views/development/data/obj/index.vue index 9868e41..f62cbb6 100644 --- a/src/views/development/data/obj/index.vue +++ b/src/views/development/data/obj/index.vue @@ -100,6 +100,32 @@ + + + + + @@ -179,11 +205,12 @@ }, ajax: { // 查询接口 - query: ({ page, sorts, filters }) => { + query: ({ page }) => { return api.query(this.buildQueryParams(page)); }, }, }, + batchHandleDatas: [], }; }, created() {}, @@ -226,6 +253,9 @@ this.batchUnable(); } }, + doBatchUnable(row) { + return api.unable(row.id); + }, // 批量停用 batchUnable() { const records = this.$refs.grid.getCheckboxRecords(); @@ -235,19 +265,12 @@ return; } - this.$msg.createConfirm('是否确定停用选择的数据对象?').then(() => { - this.loading = true; - const ids = records.map((t) => t.id); - api - .batchUnable(ids) - .then((data) => { - this.$msg.createSuccess('停用成功!'); - this.search(); - }) - .finally(() => { - this.loading = false; - }); - }); + this.batchHandleDatas = records; + + this.$refs.batchUnableHandlerDialog.openDialog(); + }, + doBatchEnable(row) { + return api.enable(row.id); }, // 批量启用 batchEnable() { @@ -258,19 +281,9 @@ return; } - this.$msg.createConfirm('是否确定启用选择的数据对象?').then(() => { - this.loading = true; - const ids = records.map((t) => t.id); - api - .batchEnable(ids) - .then((data) => { - this.$msg.createSuccess('启用成功!'); - this.search(); - }) - .finally(() => { - this.loading = false; - }); - }); + this.batchHandleDatas = records; + + this.$refs.batchEnableHandlerDialog.openDialog(); }, // 删除 deleteRow(row) { @@ -287,6 +300,9 @@ }); }); }, + doBatchDelete(row) { + return api.batchDelete(row.id); + }, // 批量删除 batchDelete() { const records = this.$refs.grid.getCheckboxRecords(); @@ -296,19 +312,9 @@ return; } - this.$msg.createConfirm('是否确定删除选择的数据对象?').then(() => { - this.loading = true; - const ids = records.map((t) => t.id); - api - .batchDelete(ids) - .then((data) => { - this.$msg.createSuccess('删除成功!'); - this.search(); - }) - .finally(() => { - this.loading = false; - }); - }); + this.batchHandleDatas = records; + + this.$refs.batchDeleteHandlerDialog.openDialog(); }, createActions(row) { return [ diff --git a/src/views/sc/logistics/sheet/index.vue b/src/views/sc/logistics/sheet/index.vue index 11e62e6..3bc3fa5 100644 --- a/src/views/sc/logistics/sheet/index.vue +++ b/src/views/sc/logistics/sheet/index.vue @@ -136,6 +136,20 @@ + + + @@ -239,6 +253,7 @@ }, }, }, + batchHandleDatas: [], }; }, created() {}, @@ -281,6 +296,9 @@ }); }); }, + doBatchDelete(row) { + return api.batchDelete(row.id); + }, // 批量删除 batchDelete() { const records = this.$refs.grid.getCheckboxRecords(); @@ -296,18 +314,9 @@ } } - this.$msg.createConfirm('对选中的物流单执行批量删除操作?').then(() => { - this.loading = true; - api - .deleteByIds(records.map((item) => item.id)) - .then(() => { - this.$msg.createSuccess('删除成功!'); - this.search(); - }) - .finally(() => { - this.loading = false; - }); - }); + this.batchHandleDatas = records; + + this.$refs.batchDeleteHandlerDialog.openDialog(); }, exportList() { this.loading = true; diff --git a/src/views/sc/purchase/order/index.vue b/src/views/sc/purchase/order/index.vue index 5f86070..e16e944 100644 --- a/src/views/sc/purchase/order/index.vue +++ b/src/views/sc/purchase/order/index.vue @@ -149,22 +149,69 @@ + + + + +