From 43024e5b236d5fcc245dfc9ba39dbccd07655008 Mon Sep 17 00:00:00 2001 From: lihuilin Date: Thu, 23 Oct 2025 11:35:44 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E6=9D=A1=E7=BB=93=E6=9D=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/已驳回.png | Bin 0 -> 2901 bytes src/views/moneyManage/executor/executor.vue | 12 +- .../moneyManage/refundDetail/refundCharge.vue | 143 ++++++++++----------- .../moneyManage/refundDetail/refundFinance.vue | 143 ++++++++++----------- .../moneyManage/refundDetail/refundHeader.vue | 142 ++++++++++---------- .../moneyManage/refundDetail/refundService.vue | 8 +- 6 files changed, 222 insertions(+), 226 deletions(-) create mode 100644 src/assets/images/已驳回.png diff --git a/src/assets/images/已驳回.png b/src/assets/images/已驳回.png new file mode 100644 index 0000000000000000000000000000000000000000..4fc70c7943be58253a0aa45d83fb69445db3f13c GIT binary patch literal 2901 zcmV-b3##;qP)g%D0Z0P5ikfQD$fEUh*&^*Ds4y*UkC_dZ5l#^Xo4oD;2RBS0YPXW z0Re%+9~u=g8if{0wJit+OM@^4L+Ly&wX~(f%-rqw+xPC2=|4M3mB@Mc-=f+s-vEQCa{7Bq1EXG*G{+{zSyL$(4{X|D zcO48mgv%7eidgDh8(njvR85J;*L&uw)c2$m9*}g5@&EZn9WB?4{kll-G z?CZH)ztR`QAxttD^4on%_5*su5QV*W2jP`TW29 zV)W)yhmpDPXB&D3Hgx3JnBz77lk7^wJ(81c*u5K(VxU}>hKD62z?PBQSrP|mgB)iP zem1BE+Kuqmyy;L(iMU7d1san^E<{oA=RZmh+#~gDmIeoRVQ6UAU?BSZdgx18Ww)CG&|*F6rtdoZ%Qw{C~bX1+So18-nmm6 z7*HYyK`>yV>rH&ycInxFNW|n={DbzB50E<#03Nw!(zO6lc$u)t^GK%M9CRl6>L;Z8 z@0RYpvjS!sl3?xMr2Fi<$G*GnknXrmy6tA^=RcEfxlwxhDWw7R^-DM3B;9m_wA8oO zjoy79{Yz!gX%N0@kOvGPvx0-4vawWpccB(d{;9amPyH7*C|zO_mVFa~ot|C5Y+0uOO2^?6CXcCl~!00J2;@x==YDPJ2Sox!X$u z2}qEOqf;n&<)P!R6|5`X>P?HdDSozPKe6;7*K^NF+qYH7GxI~9`Lfr(=SMj%5iNh9 z@Kf?VNgwZ&61z7ukrN2p$Lhv z(X}X~Pklx@{KzVqIzq${dzgKfd|BcqZE2AT13S5LUWnFE%|T2CwS2t_%W1~seknQ0 z3=&cBwb!JF?yr!A{HH%B9WmGKJUGYF@314JOD>flOtlC7ee&`~$JtM=G&t+zBtF@k zqh8Xlf@u&3m1eUuo$;llPEI@P$iMr+viz475|IDw`O=X`skXevBK`Y^?XS;el8LZw zNr#loiIAy?b&{h$wa!mXzpvnf{P`D1bNv-Iiu7{n5tF7* z0z|8M$Q6Sty6v;?KcB5rJHr8 zZB5tDwBzt6Qt0F|XnVKVRo=E;jRpPyB;&E$(X}ktSQn6}Lbdc<}9p?A7deRShdECCt zWIaHZ&B8^}amTss*whaR?5EAdr23FX$r8N*J4{?#G}(j1%t|hTJ|1bdJYH3o-Dg zV!s}I_yo62j{Xdy2HR?7>-Cz^O6d2yN_gGcMRh+&6M25>m~jT z&r8o64R+#yNu+^TClT>>F$Sb%2b(;(kCESnoq$XDS?wXwrbtFr;E_h!9MQA zhix2iL(M%(X=i{aWGIG?qzzKrgpiO*Hi*^P@X;s1c4CNqzyB#|DU{yRsTZs>fJ_TL z>S3*3J!ns|-kr|PPISQcLH|ql(RmU($*gv1<}AbCAv28WGbAv>63j%}KC=$9tj}^E z(C+?V56jL@>7ks1M*UIB*xD;H1Ifd!^`?iPReVL`Pnjj+`qk zI7d2rzI58@(#apI6lFje^Gssi$@ZNhonrsTPj&2R(&=YNXPhaWb(ZvrPddlh()2lYPM zfP03VZC*0eV7)_J+Ms7vEml`oS<9C<5{G7J-?vwx#S2r<&~88oN|%h$L!NcWC7tdf zY?BmZwz%BsvR9YTgt`YzOzQ8+ARoD@!5R<6Ms3=>K;OD{OPcK^OTz;nE&OL9b)~p%u z-d^?|U-sJeQ;gCfF&~$>s)wJht3t=#3)Rup>18xmWnF034^ZN~{(v9eS1&pA~WUc5}#UALuy zFf;8ALA$=?{tEyA|Nj#Z^JD-300v1!K~w_(D&5wpgw*?j00000NkvXXu0mjf0FtdD literal 0 HcmV?d00001 diff --git a/src/views/moneyManage/executor/executor.vue b/src/views/moneyManage/executor/executor.vue index 4cb77ec..444ba9c 100644 --- a/src/views/moneyManage/executor/executor.vue +++ b/src/views/moneyManage/executor/executor.vue @@ -11,7 +11,7 @@
所属地区 -
@@ -59,7 +59,7 @@ - + @@ -123,8 +123,7 @@ + layout="total, sizes, prev, pager, next, jumper" :total="pagination.total" style="margin-top: 1vh;" /> @@ -140,7 +139,7 @@
所属地区 - +
产品名称 @@ -262,7 +261,8 @@ const pagination = ref({ const market = ref([]) const uploadRef = ref(null) const searchForm = ref({ - jwcode: '' + jwcode: '', + markets:[] }) const showEdit = ref(false) const editForm = ref({ diff --git a/src/views/moneyManage/refundDetail/refundCharge.vue b/src/views/moneyManage/refundDetail/refundCharge.vue index 1e6225f..a47093f 100644 --- a/src/views/moneyManage/refundDetail/refundCharge.vue +++ b/src/views/moneyManage/refundDetail/refundCharge.vue @@ -61,7 +61,7 @@ - + @@ -125,7 +125,7 @@
所属地区 - +
产品名称 @@ -210,7 +210,7 @@
-
- - + @@ -311,6 +308,7 @@ const searchForm = ref({ jwcode: '', markets: [] }) +const isReject = ref(false)// 进度图有没有驳回状态 const addForm = ref({ remark: '' }) @@ -332,6 +330,16 @@ const areaCharge = ref('')// 地区负责人 const headFinance = ref('')// 总部财务 const executor = ref('')// 指定执行人 const uploadRef = ref(null) +const statusStepMap = { + 10: [2, false], + 12: [12, true], + 20: [3, false], + 22: [22, true], + 30: [4, false], + 32: [32, true], + 40: [5, false], + 41: [6, false] +} const currencies = ref([ { value: '新币', @@ -521,7 +529,8 @@ const handleReject = async function () { status: 22, rejectReason: addForm.value.remark, areaCharge: adminData.value.adminName, - auditId: auditRow.value.auditId + auditId: auditRow.value.auditId, + orderCode:auditRow.value.orderCode } const result = await API({ url: '/Money/review', @@ -531,45 +540,36 @@ const handleReject = async function () { ElMessage.success('审核驳回') showAudit.value = false getRefund() + addForm.value.remark = '' + showReject.value = false } } catch (error) { ElMessage.error(error.message || '审核失败') } } const showStep = function (row) { - if (!hasMenuPermission(menuTree.value, permissionMapping.refundChargeProgShow)) { - ElMessage.error('无此权限'); - return; + if (!hasMenuPermission(menuTree.value, permissionMapping.refundFinanceProgShow)) { + ElMessage.error('无此权限') + return } - console.log("row", row) - currentStep.value = 1; - if (row.status === 41) { - executor.value = row.executorName - currentStep.value = 6; - } else { - if (row.areaServise !== null && row.areaServise !== '') { - submitterName.value = row.areaServise - console.log(submitterName.value) - currentStep.value = 2; - } - if (row.areaFinance !== null && row.areaFinance !== '') { - areaFinance.value = row.areaFinance - console.log(areaFinance.value) - currentStep.value = 3; - } - if (row.areaCharge !== null && row.areaCharge !== '') { - areaCharge.value = row.areaCharge - console.log(areaCharge.value) - currentStep.value = 4; - } - if (row.headFinance !== null && row.headFinance !== '') { - headFinance.value = row.headFinance - console.log(headFinance.value) - currentStep.value = 5; - } + + isReject.value = false + submitterName.value = row.areaServise || '' + areaFinance.value = row.areaFinance || '' + areaCharge.value = row.areaCharge || '' + headFinance.value = row.headFinance || '' + executor.value = row.executorName || '' + currentStep.value = 1 + + const status = row.status + if (statusStepMap[status]) { + const [step, reject] = statusStepMap[status] + currentStep.value = step + isReject.value = reject } - console.log("当前步骤：", currentStep.value); - showSteps.value = true; + + console.log('步骤条状态',currentStep.value) + showSteps.value = true } const productList = [ { @@ -717,7 +717,7 @@ const getMarket = async function () { : null; return { - value: child.name, + value: child.id, label: child.name, children: grandchildren }; @@ -755,7 +755,6 @@ const disabledDate = (time) => { return time.getTime() < limitDate.getTime(); } onMounted(() => { - console.log('???????????????????', adminData.value) getRefund() getMarket() }) diff --git a/src/views/moneyManage/refundDetail/refundFinance.vue b/src/views/moneyManage/refundDetail/refundFinance.vue index 4056cb7..598ee37 100644 --- a/src/views/moneyManage/refundDetail/refundFinance.vue +++ b/src/views/moneyManage/refundDetail/refundFinance.vue @@ -60,7 +60,7 @@ - + @@ -125,7 +125,7 @@
所属地区 - +
产品名称 @@ -210,7 +210,7 @@
-
- - + @@ -319,6 +316,7 @@ const addForm = ref({ const auditForm = ref({ refundType: '' }) +const isReject = ref(false)// 进度图有没有驳回状态 const showReject = ref(false) const pagination = ref({ pageNum: 1, @@ -397,6 +395,16 @@ const payments = ref([{ label: 'Ipay88-Link平台' } ]) +const statusStepMap = { + 10: [2, false], + 12: [12, true], + 20: [3, false], + 22: [22, true], + 30: [4, false], + 32: [32, true], + 40: [5, false], + 41: [6, false] +} const statusList = ref([ { value: 20, @@ -497,7 +505,8 @@ const handleReject = async function () { status: 12, rejectReason: addForm.value.remark, areaFinance: adminData.value.adminName, - auditId: auditRow.value.auditId + auditId: auditRow.value.auditId, + orderCode: auditRow.value.orderCode } const result = await API({ url: '/Money/finalReview', @@ -747,7 +756,7 @@ const getMarket = async function () { : null; return { - value: child.name, + value: child.id, label: child.name, children: grandchildren }; @@ -761,39 +770,27 @@ const getMarket = async function () { } const showStep = function (row) { if (!hasMenuPermission(menuTree.value, permissionMapping.refundFinanceProgShow)) { - ElMessage.error('无此权限'); - return; + ElMessage.error('无此权限') + return } - console.log("row", row) - currentStep.value = 1; - if (row.status === 41) { - executor.value = row.executorName - console.log('执行人', executor.value) - currentStep.value = 6; - } else { - if (row.areaServise !== null && row.areaServise !== '') { - submitterName.value = row.areaServise - console.log('提交人', submitterName.value) - currentStep.value = 2; - } - if (row.areaFinance !== null && row.areaFinance !== '') { - areaFinance.value = row.areaFinance - console.log('地区财务', areaFinance.value) - currentStep.value = 3; - } - if (row.areaCharge !== null && row.areaCharge !== '') { - areaCharge.value = row.areaCharge - console.log('地区负责人', areaCharge.value) - currentStep.value = 4; - } - if (row.headFinance !== null && row.headFinance !== '') { - headFinance.value = row.headFinance - console.log('总部财务', headFinance.value) - currentStep.value = 5; - } + + isReject.value = false + submitterName.value = row.areaServise || '' + areaFinance.value = row.areaFinance || '' + areaCharge.value = row.areaCharge || '' + headFinance.value = row.headFinance || '' + executor.value = row.executorName || '' + currentStep.value = 1 + + const status = row.status + if (statusStepMap[status]) { + const [step, reject] = statusStepMap[status] + currentStep.value = step + isReject.value = reject } - console.log("当前步骤：", currentStep.value); - showSteps.value = true; + + console.log('步骤条状态',currentStep.value) + showSteps.value = true } const showAudit2 = function (row) { auditRow.value = row @@ -802,8 +799,8 @@ const showAudit2 = function (row) { const reset = function () { searchForm.value = { jwcode: '', - market: searchForm.value.market, - statuses: searchForm.value.statuses + market: [], + statuses: [] } dateRange.value = [] getRefund() diff --git a/src/views/moneyManage/refundDetail/refundHeader.vue b/src/views/moneyManage/refundDetail/refundHeader.vue index 239b018..63c7e15 100644 --- a/src/views/moneyManage/refundDetail/refundHeader.vue +++ b/src/views/moneyManage/refundDetail/refundHeader.vue @@ -60,7 +60,7 @@ - + @@ -86,7 +86,7 @@ 审核 - + 查看进度
@@ -219,7 +219,7 @@ -
- - + @@ -321,6 +318,7 @@ const searchForm = ref({ markets: [], statuses: [] }) +const isReject = ref(false)// 进度图有没有驳回状态 const addForm = ref({ remark: '' }) @@ -343,6 +341,16 @@ const areaFinance = ref('')// 地区财务 const areaCharge = ref('')// 地区负责人 const headFinance = ref('')// 总部财务 const executor = ref('')// 指定执行人 +const statusStepMap = { + 10: [2, false], + 12: [12, true], + 20: [3, false], + 22: [22, true], + 30: [4, false], + 32: [32, true], + 40: [5, false], + 41: [6, false] +} const currencies = ref([ { value: '新币', @@ -550,7 +558,8 @@ const handleReject = async function () { status: 32, rejectReason: addForm.value.remark, headFinance: adminData.value.adminName, - auditId: auditRow.value.auditId + auditId: auditRow.value.auditId, + orderCode:auditRow.value.orderCode } const result = await API({ url: '/Money/finalReview', @@ -560,6 +569,8 @@ const handleReject = async function () { ElMessage.success('审核驳回') showAudit2.value = false getRefund() + addForm.value.remark = '' + showReject.value = false } } catch (error) { ElMessage.error(error.message || '审核失败') @@ -582,7 +593,7 @@ const getMarket = async function () { : null; return { - value: child.name, + value: child.id, label: child.name, children: grandchildren }; @@ -608,39 +619,28 @@ const reset = function () { getRefund() } const showStep = function (row) { - if (!hasMenuPermission(menuTree.value, permissionMapping.refundHeaderProgShow)) { - ElMessage.error('无此权限'); - return; + if (!hasMenuPermission(menuTree.value, permissionMapping.refundFinanceProgShow)) { + ElMessage.error('无此权限') + return } - console.log("row", row) - currentStep.value = 1; - if (row.status === 41) { - executor.value = row.executorName - currentStep.value = 6; - } else { - if (row.areaServise !== null && row.areaServise !== '') { - submitterName.value = row.areaServise - console.log(submitterName.value) - currentStep.value = 2; - } - if (row.areaFinance !== null && row.areaFinance !== '') { - areaFinance.value = row.areaFinance - console.log(areaFinance.value) - currentStep.value = 3; - } - if (row.areaCharge !== null && row.areaCharge !== '') { - areaCharge.value = row.areaCharge - console.log(areaCharge.value) - currentStep.value = 4; - } - if (row.headFinance !== null && row.headFinance !== '') { - headFinance.value = row.headFinance - console.log(headFinance.value) - currentStep.value = 5; - } + + isReject.value = false + submitterName.value = row.areaServise || '' + areaFinance.value = row.areaFinance || '' + areaCharge.value = row.areaCharge || '' + headFinance.value = row.headFinance || '' + executor.value = row.executorName || '' + currentStep.value = 1 + + const status = row.status + if (statusStepMap[status]) { + const [step, reject] = statusStepMap[status] + currentStep.value = step + isReject.value = reject } - console.log("当前步骤：", currentStep.value); - showSteps.value = true; + + console.log('步骤条状态',currentStep.value) + showSteps.value = true } const productList = [ { diff --git a/src/views/moneyManage/refundDetail/refundService.vue b/src/views/moneyManage/refundDetail/refundService.vue index c5bb1b9..c7cb42a 100644 --- a/src/views/moneyManage/refundDetail/refundService.vue +++ b/src/views/moneyManage/refundDetail/refundService.vue @@ -291,7 +291,7 @@ const getRefund = async function () { cashRecordDone: { jwcode: searchForm.value.jwcode,//精网号 name: searchForm.value.name,//姓名 - market: searchForm.value.market,//地区 + markets: searchForm.value.market,//地区 goodsNames: searchForm.value.goodsName,//商品名 statuses: searchForm.value.statuses,//10：地区财务待审核；12：地区财务驳回； // 20：地区负责人待审核；22：地区负责人驳回； @@ -394,7 +394,7 @@ const getMarket = async function () { : null; return { - value: child.name, + value: child.id, label: child.name, children: grandchildren }; @@ -657,8 +657,8 @@ const productList = [ const reset = function () { searchForm.value = { jwcode: '', - market: searchForm.value.market, - statuses: searchForm.value.statuses + market: [], + statuses: [] } dateRange.value = [] getRefund()