From 8be71600a26073391b75d41b44a9e9c1007633f9 Mon Sep 17 00:00:00 2001 From: jiangpeng Date: Tue, 28 Apr 2026 18:29:50 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BB=98=E6=AC=BE=E5=8D=95?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=AD=97=E6=AE=B5=E6=94=B9=E5=90=8D=EF=BC=8C?= =?UTF-8?q?=E4=BB=A3=E7=90=86=E5=95=86=E2=80=9C=E9=87=91=E7=89=8C=E2=80=9D?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E8=B0=83=E6=95=B4=EF=BC=8C=E7=BB=B4=E4=BF=9D?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A0=87=E7=AD=BE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../finance/payment/components/DetailDrawer.vue | 2 +- oms_web/oms_vue/src/views/finance/payment/index.vue | 12 ++++++------ oms_web/oms_vue/src/views/manage/service/index.vue | 1 + oms_web/oms_vue/src/views/system/partner/index.vue | 4 ++-- .../service/impl/ProjectOrderInfoServiceImpl.java | 5 +++-- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/oms_web/oms_vue/src/views/finance/payment/components/DetailDrawer.vue b/oms_web/oms_vue/src/views/finance/payment/components/DetailDrawer.vue index f4a33544..36281639 100644 --- a/oms_web/oms_vue/src/views/finance/payment/components/DetailDrawer.vue +++ b/oms_web/oms_vue/src/views/finance/payment/components/DetailDrawer.vue @@ -42,7 +42,7 @@ -
备注: +
单据来源:
diff --git a/oms_web/oms_vue/src/views/finance/payment/index.vue b/oms_web/oms_vue/src/views/finance/payment/index.vue index de419787..b2a102f1 100644 --- a/oms_web/oms_vue/src/views/finance/payment/index.vue +++ b/oms_web/oms_vue/src/views/finance/payment/index.vue @@ -41,8 +41,8 @@ @keyup.enter.native="handleQuery" /> - - + + @@ -167,7 +167,7 @@ {{ formatCurrency(scope.row.totalPriceWithTax) }} - + @@ -233,7 +233,7 @@ size="mini" type="text" icon="el-icon-refresh-right" - v-if="canApplyRefund(scope.row)" + v-if="canApplyRefund(scope.row) && false" @click="handleApplyRefund(scope.row)" >申请退款 - - + +
diff --git a/oms_web/oms_vue/src/views/manage/service/index.vue b/oms_web/oms_vue/src/views/manage/service/index.vue index 18686b0d..2eab511d 100644 --- a/oms_web/oms_vue/src/views/manage/service/index.vue +++ b/oms_web/oms_vue/src/views/manage/service/index.vue @@ -357,6 +357,7 @@ export default { } }, created() { + document.title = '紫光汇智售后查询' const sn = (this.$route.query.sn || '').trim() if (sn) { this.queryMode = 'single' diff --git a/oms_web/oms_vue/src/views/system/partner/index.vue b/oms_web/oms_vue/src/views/system/partner/index.vue index cfb2685c..e0bc2779 100644 --- a/oms_web/oms_vue/src/views/system/partner/index.vue +++ b/oms_web/oms_vue/src/views/system/partner/index.vue @@ -339,7 +339,7 @@ export default { systemUserName: [ { validator: (rule, value, callback) => { - if (this.form.level === '04') { + if (this.form.level === '04' || this.form.level === '03') { callback(); } else { if (!value) { @@ -354,7 +354,7 @@ export default { contactEmail: [ { validator: (rule, value, callback) => { - if (this.form.level === '04') { + if (this.form.level === '04' || this.form.level === '03') { callback(); } else { if (!value) { diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java index 029130ff..7da0c734 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java @@ -457,10 +457,11 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To if (ProjectOrderInfo.OrderStatus.WAIT_APPROVE.getCode().equals(projectOrderInfo.getOrderStatus())) { List codeList = getPartnerCodeByProcessTemplate(projectOrderInfo); List partnerInfos = partnerInfoService.selectPartnerInfoByCode(codeList); - //线下合同不走省代审批，非认证渠道跳过 + //线下合同不走省代审批，非认证渠道和金牌跳过 if (ProjectOrderInfo.ProcessTypeEnum.ONLINE.getCode().equals(projectOrderInfo.getProcessType()) && (CollUtil.isEmpty(partnerInfos) || StringUtils.isEmpty(partnerInfos.get(0).getSystemUserId())) - && !ProjectOrderInfo.LevelEnum.NON_CERTIFIED.getCode().equals(projectOrderInfo.getLevel())) { + && !ProjectOrderInfo.LevelEnum.NON_CERTIFIED.getCode().equals(projectOrderInfo.getLevel()) + && !ProjectOrderInfo.LevelEnum.GOLD_MEDAL.getCode().equals(projectOrderInfo.getLevel())) { throw new ServiceException(StrUtil.format("代理商配置[{}]未指定系统用户,无法提交审批", existProjectOrderInfo.getPartnerName())); } List processInstanceList = todoService.listProcessInstance(existProjectOrderInfo.getOrderCode());