From bd506fab0d24e565e3893f8ecb1bd089ebb77571 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=A3=E5=8F=A3=E5=8F=A3?= <17975121@qq.com> Date: Wed, 20 Aug 2025 03:32:41 +0000 Subject: [PATCH 01/18] =?UTF-8?q?update=20src/store/modules/tagsView.ts.?= =?UTF-8?q?=20=E5=BD=93=E5=AD=98=E5=9C=A8=E5=A4=9A=E4=B8=AA=E7=9B=B8?= =?UTF-8?q?=E5=90=8C=E5=90=8D=E7=A7=B0=E7=9A=84=E6=A0=87=E7=AD=BE=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E5=88=A0=E9=99=A4=E7=BC=93=E5=AD=98=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=E6=8E=92=E9=99=A4=E6=98=AF=E5=90=A6=E5=AD=98=E5=9C=A8=E7=9B=B8?= =?UTF-8?q?=E5=90=8C=E7=9A=84=E5=90=8D=E7=A7=B0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 口口口 <17975121@qq.com> --- src/store/modules/tagsView.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/store/modules/tagsView.ts b/src/store/modules/tagsView.ts index 2b2d817f1..6dd509358 100644 --- a/src/store/modules/tagsView.ts +++ b/src/store/modules/tagsView.ts @@ -93,6 +93,11 @@ export const useTagsViewStore = defineStore('tagsView', { delCachedView() { const route = router.currentRoute.value const index = findIndex(this.getCachedViews, (v) => v === route.name) + for (const v of this.visitedViews) { + if (v.name === route.name) { + return + } + } if (index > -1) { this.cachedViews.delete(this.getCachedViews[index]) } -- Gitee From 722d6405a172da9fbb493267453354c144e3c0ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=B1=E9=87=8E=E7=BE=A1=E6=B0=91?= Date: Fri, 5 Sep 2025 03:58:12 +0000 Subject: [PATCH 02/18] =?UTF-8?q?=E9=9B=AA=E8=8A=B1=20ID=20=E6=BA=A2?= =?UTF-8?q?=E5=87=BA=E9=97=AE=E9=A2=98=20update=20src/views/mall/promotion?= =?UTF-8?q?/rewardActivity/components/RewardRuleCouponSelect.vue.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 山野羡民 --- .../rewardActivity/components/RewardRuleCouponSelect.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/views/mall/promotion/rewardActivity/components/RewardRuleCouponSelect.vue b/src/views/mall/promotion/rewardActivity/components/RewardRuleCouponSelect.vue index 504e72275..41b1f2bbb 100644 --- a/src/views/mall/promotion/rewardActivity/components/RewardRuleCouponSelect.vue +++ b/src/views/mall/promotion/rewardActivity/components/RewardRuleCouponSelect.vue @@ -89,9 +89,7 @@ const initGiveCouponList = async () => { if (isEmpty(rewardRule.value) || isEmpty(rewardRule.value.giveCouponTemplateCounts)) { return } - const tempLateIds = Object.keys(rewardRule.value.giveCouponTemplateCounts!).map((item) => - parseInt(item) - ) + const tempLateIds = Object.keys(rewardRule.value.giveCouponTemplateCounts!) const data = await CouponTemplateApi.getCouponTemplateList(tempLateIds) if (!data) { return -- Gitee From a126f42c35c9bd6efcde1761e8551708fd99638f Mon Sep 17 00:00:00 2001 From: YunaiV Date: Thu, 2 Oct 2025 09:36:06 +0800 Subject: [PATCH 03/18] =?UTF-8?q?fix=EF=BC=9A=E3=80=90bpm=20=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E6=B5=81=E3=80=91=E5=B7=B2=E5=8A=9E=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=9A=84=E5=AE=A1=E6=89=B9=E7=8A=B6=E6=80=81=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/bpm/task/done/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/bpm/task/done/index.vue b/src/views/bpm/task/done/index.vue index 29c4d7558..202cd0e7d 100644 --- a/src/views/bpm/task/done/index.vue +++ b/src/views/bpm/task/done/index.vue @@ -52,13 +52,13 @@ Date: Thu, 2 Oct 2025 09:41:54 +0800 Subject: [PATCH 04/18] =?UTF-8?q?fix=EF=BC=9A=E5=89=8D=E7=AB=AF=E7=9A=84?= =?UTF-8?q?=E5=AF=86=E7=A0=81=E9=95=BF=E5=BA=A6=E9=99=90=E5=88=B6=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=EF=BC=8Chttps://gitee.com/yudaocode/yudao-ui-admin-vu?= =?UTF-8?q?e3/issues/ICVDAT?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Profile/components/ResetPwd.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/Profile/components/ResetPwd.vue b/src/views/Profile/components/ResetPwd.vue index 477be91f4..d9e0de183 100644 --- a/src/views/Profile/components/ResetPwd.vue +++ b/src/views/Profile/components/ResetPwd.vue @@ -44,11 +44,11 @@ const equalToPassword = (_rule, value, callback) => { const rules = reactive({ oldPassword: [ { required: true, message: t('profile.password.oldPwdMsg'), trigger: 'blur' }, - { min: 6, max: 20, message: t('profile.password.pwdRules'), trigger: 'blur' } + { min: 4, max: 16, message: t('profile.password.pwdRules'), trigger: 'blur' } ], newPassword: [ { required: true, message: t('profile.password.newPwdMsg'), trigger: 'blur' }, - { min: 6, max: 20, message: t('profile.password.pwdRules'), trigger: 'blur' } + { min: 4, max: 16, message: t('profile.password.pwdRules'), trigger: 'blur' } ], confirmPassword: [ { required: true, message: t('profile.password.cfPwdMsg'), trigger: 'blur' }, -- Gitee From 62a9a991469e6db8d61e844f7b895f91c408206b Mon Sep 17 00:00:00 2001 From: YunaiV Date: Thu, 2 Oct 2025 10:24:22 +0800 Subject: [PATCH 05/18] =?UTF-8?q?fix=EF=BC=9A=E3=80=90pay=20=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E3=80=91=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98=20public?= =?UTF-8?q?KeyContent=20=E8=B0=83=E6=95=B4=E4=B8=BA=E9=9D=9E=E5=BF=85?= =?UTF-8?q?=E5=A1=AB=EF=BC=8C=E5=85=BC=E5=AE=B9=20https://t.zsxq.com/ODR5V?= =?UTF-8?q?=E3=80=81https://gitee.com/yudaocode/yudao-ui-admin-vue3/issues?= =?UTF-8?q?/ICUE53?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/channel/WeixinChannelForm.vue | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/views/pay/app/components/channel/WeixinChannelForm.vue b/src/views/pay/app/components/channel/WeixinChannelForm.vue index daebb41e0..fd915548e 100644 --- a/src/views/pay/app/components/channel/WeixinChannelForm.vue +++ b/src/views/pay/app/components/channel/WeixinChannelForm.vue @@ -147,7 +147,11 @@ 前往微信商户平台查看证书序列号 - + - + - + 微信支付公钥产品简介及使用说明 @@ -246,7 +243,6 @@ const formRules = { { required: true, message: '请上传 apiclient_key.pem 证书', trigger: 'blur' } ], 'config.certSerialNo': [{ required: true, message: '请输入证书序列号', trigger: 'blur' }], - 'config.publicKeyContent': [{ required: true, message: '请上传 public_key.pem 证书', trigger: 'blur' }], 'config.publicKeyId': [{ required: true, message: '请输入公钥 ID', trigger: 'blur' }], 'config.apiV3Key': [{ required: true, message: '请上传 api V3 密钥值', trigger: 'blur' }] } -- Gitee From bdb42bb927261410af56c39a75a7821a3e2791ec Mon Sep 17 00:00:00 2001 From: YunaiV Date: Thu, 2 Oct 2025 11:25:34 +0800 Subject: [PATCH 06/18] =?UTF-8?q?fix=EF=BC=9A=E3=80=90=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E3=80=91=E4=BA=A7=E5=93=81=E8=B7=B3=E8=BD=AC=E5=88=B0=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E5=88=97=E8=A1=A8=E6=97=B6=EF=BC=8CproductId=20?= =?UTF-8?q?=E6=9C=AA=E4=BC=A0=E9=80=92=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C?= =?UTF-8?q?=E5=AF=B9=E5=BA=94=20https://t.zsxq.com/jvXyq?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/iot/device/device/index.vue | 10 ++++++++-- .../product/product/detail/ProductDetailsHeader.vue | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/views/iot/device/device/index.vue b/src/views/iot/device/device/index.vue index 56139be9a..67ef01cb7 100644 --- a/src/views/iot/device/device/index.vue +++ b/src/views/iot/device/device/index.vue @@ -384,6 +384,7 @@ defineOptions({ name: 'IoTDevice' }) const message = useMessage() // 消息弹窗 const { t } = useI18n() // 国际化 +const route = useRoute() const loading = ref(true) // 列表加载中 const list = ref([]) // 列表的数据 @@ -392,7 +393,7 @@ const queryParams = reactive({ pageNo: 1, pageSize: 10, deviceName: undefined, - productId: undefined, + productId: undefined as number | undefined, deviceType: undefined, nickname: undefined, status: undefined, @@ -513,7 +514,12 @@ const handleImport = () => { /** 初始化 **/ onMounted(async () => { - getList() + // 处理 productId 参数 + const { productId } = route.query + if (productId) { + queryParams.productId = Number(productId) + } + await getList() // 获取产品列表 products.value = await ProductApi.getSimpleProductList() diff --git a/src/views/iot/product/product/detail/ProductDetailsHeader.vue b/src/views/iot/product/product/detail/ProductDetailsHeader.vue index 919006477..3eb999fa4 100644 --- a/src/views/iot/product/product/detail/ProductDetailsHeader.vue +++ b/src/views/iot/product/product/detail/ProductDetailsHeader.vue @@ -72,7 +72,7 @@ const copyToClipboard = async (text: string) => { /** 路由跳转到设备管理 */ const { push } = useRouter() const goToDeviceList = (productId: number) => { - push({ name: 'IoTDevice', params: { productId } }) + push({ name: 'IoTDevice', query: { productId } }) } /** 修改操作 */ -- Gitee From 9bc289cb2a354b3bca138f7ac7ec2987b503bff6 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Mon, 6 Oct 2025 20:45:35 +0800 Subject: [PATCH 07/18] =?UTF-8?q?fix=EF=BC=9A=E6=9B=B4=E6=96=B0=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E6=96=87=E6=9C=AC=E4=B8=BA=E2=80=9C=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=94=80=E5=94=AE=E4=BA=A7=E5=93=81=E2=80=9D=E5=B9=B6=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E6=94=AF=E4=BB=98=E4=BF=A1=E6=81=AF=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/erp/sale/order/components/SaleOrderItemForm.vue | 2 +- src/views/pay/cashier/index.vue | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/erp/sale/order/components/SaleOrderItemForm.vue b/src/views/erp/sale/order/components/SaleOrderItemForm.vue index 3a579d5b5..817775f56 100644 --- a/src/views/erp/sale/order/components/SaleOrderItemForm.vue +++ b/src/views/erp/sale/order/components/SaleOrderItemForm.vue @@ -132,7 +132,7 @@ - + 添加采购产品 + + 添加销售产品 diff --git a/src/views/mp/freePublish/index.vue b/src/views/mp/freePublish/index.vue index 2ed8ae77e..c5639ec3e 100644 --- a/src/views/mp/freePublish/index.vue +++ b/src/views/mp/freePublish/index.vue @@ -97,7 +97,9 @@ const handleDelete = async (item: any) => { message.success(t('common.delSuccess')) // 刷新列表 await getList() - } catch {} + } catch { + // + } } \ No newline at end of file diff --git a/src/views/submit/companyReport/index.vue b/src/views/submit/companyReport/index.vue new file mode 100644 index 000000000..16899524b --- /dev/null +++ b/src/views/submit/companyReport/index.vue @@ -0,0 +1,512 @@ + + + + + \ No newline at end of file diff --git a/src/views/submit/myApprove/approve.vue b/src/views/submit/myApprove/approve.vue new file mode 100644 index 000000000..762c53d3f --- /dev/null +++ b/src/views/submit/myApprove/approve.vue @@ -0,0 +1,759 @@ + + + + + \ No newline at end of file diff --git a/src/views/submit/myApprove/index.vue b/src/views/submit/myApprove/index.vue new file mode 100644 index 000000000..eaca0f244 --- /dev/null +++ b/src/views/submit/myApprove/index.vue @@ -0,0 +1,560 @@ + + + + + \ No newline at end of file diff --git a/src/views/submit/myReporting/add-report.vue b/src/views/submit/myReporting/add-report.vue new file mode 100644 index 000000000..a3f83dcbf --- /dev/null +++ b/src/views/submit/myReporting/add-report.vue @@ -0,0 +1,478 @@ + + + \ No newline at end of file diff --git a/src/views/submit/myReporting/index.vue b/src/views/submit/myReporting/index.vue new file mode 100644 index 000000000..ebd54f4d4 --- /dev/null +++ b/src/views/submit/myReporting/index.vue @@ -0,0 +1,700 @@ + + + + + \ No newline at end of file diff --git a/src/views/submit/paySlip/import.vue b/src/views/submit/paySlip/import.vue new file mode 100644 index 000000000..300ead96f --- /dev/null +++ b/src/views/submit/paySlip/import.vue @@ -0,0 +1,213 @@ + + + + + \ No newline at end of file diff --git a/src/views/submit/paySlip/index.vue b/src/views/submit/paySlip/index.vue new file mode 100644 index 000000000..13d0973df --- /dev/null +++ b/src/views/submit/paySlip/index.vue @@ -0,0 +1,538 @@ + + + + + \ No newline at end of file diff --git a/src/views/submit/paySlip/paySlipDetail.vue b/src/views/submit/paySlip/paySlipDetail.vue new file mode 100644 index 000000000..cd22df5c3 --- /dev/null +++ b/src/views/submit/paySlip/paySlipDetail.vue @@ -0,0 +1,199 @@ + + + + + \ No newline at end of file diff --git a/src/views/submit/systemConfig/reportManage/index.vue b/src/views/submit/systemConfig/reportManage/index.vue new file mode 100644 index 000000000..fe11469a2 --- /dev/null +++ b/src/views/submit/systemConfig/reportManage/index.vue @@ -0,0 +1,358 @@ + + + + + \ No newline at end of file diff --git a/src/views/submit/systemConfig/ruleManage/addRule.vue b/src/views/submit/systemConfig/ruleManage/addRule.vue new file mode 100644 index 000000000..f2934f603 --- /dev/null +++ b/src/views/submit/systemConfig/ruleManage/addRule.vue @@ -0,0 +1,418 @@ + + + + + \ No newline at end of file diff --git a/src/views/submit/systemConfig/ruleManage/index.vue b/src/views/submit/systemConfig/ruleManage/index.vue new file mode 100644 index 000000000..7ee0f006e --- /dev/null +++ b/src/views/submit/systemConfig/ruleManage/index.vue @@ -0,0 +1,434 @@ + + + + + \ No newline at end of file diff --git a/src/views/submit/userScore/index.vue b/src/views/submit/userScore/index.vue new file mode 100644 index 000000000..f8f182fd3 --- /dev/null +++ b/src/views/submit/userScore/index.vue @@ -0,0 +1,383 @@ + + + + + \ No newline at end of file diff --git a/src/views/submit/userScore/userScoreDetail.vue b/src/views/submit/userScore/userScoreDetail.vue new file mode 100644 index 000000000..0e1f6016c --- /dev/null +++ b/src/views/submit/userScore/userScoreDetail.vue @@ -0,0 +1,306 @@ + + + + + \ No newline at end of file -- Gitee