产品名称
@@ -734,33 +733,33 @@ const productList = [
]
const getMarket = async function () {
- try {
- const result = await API({
-
- url: '/market/selectMarket',
- })
- console.log('看看地区树', result)
-
- const transformTree = (nodes) => {
- const allChildren = nodes.flatMap(node => node.children || []);
-
- return allChildren.map(child => {
- const grandchildren = child.children && child.children.length
- ? transformTree([child])
- : null;
+ try {
+ const result = await API({
- return {
- value: child.name,
- label: child.name,
- children: grandchildren
+ url: '/market/selectMarket',
+ })
+ console.log('看看地区树', result)
+
+ const transformTree = (nodes) => {
+ const allChildren = nodes.flatMap(node => node.children || []);
+
+ return allChildren.map(child => {
+ const grandchildren = child.children && child.children.length
+ ? transformTree([child])
+ : null;
+
+ return {
+ value: child.name,
+ label: child.name,
+ children: grandchildren
+ };
+ });
};
- });
- };
- market.value = transformTree(result.data)
- console.log('转换后的地区树==============', market.value)
- } catch (error) {
- console.log('请求失败', error)
- }
+ market.value = transformTree(result.data)
+ console.log('转换后的地区树==============', market.value)
+ } catch (error) {
+ console.log('请求失败', error)
+ }
}
const showStep = function (row) {
if (!hasMenuPermission(menuTree.value, permissionMapping.refundFinanceProgShow)) {
@@ -771,27 +770,27 @@ const showStep = function (row) {
currentStep.value = 1;
if (row.status === 41) {
executor.value = row.executorName
- console.log('执行人',executor.value)
+ console.log('执行人', executor.value)
currentStep.value = 6;
} else {
if (row.areaServise !== null && row.areaServise !== '') {
submitterName.value = row.areaServise
- console.log('提交人',submitterName.value)
+ console.log('提交人', submitterName.value)
currentStep.value = 2;
}
if (row.areaFinance !== null && row.areaFinance !== '') {
areaFinance.value = row.areaFinance
- console.log('地区财务',areaFinance.value)
+ console.log('地区财务', areaFinance.value)
currentStep.value = 3;
}
if (row.areaCharge !== null && row.areaCharge !== '') {
areaCharge.value = row.areaCharge
- console.log('地区负责人',areaCharge.value)
+ console.log('地区负责人', areaCharge.value)
currentStep.value = 4;
}
if (row.headFinance !== null && row.headFinance !== '') {
headFinance.value = row.headFinance
- console.log('总部财务',headFinance.value)
+ console.log('总部财务', headFinance.value)
currentStep.value = 5;
}
}
@@ -816,12 +815,12 @@ const hideReject = function () {
addForm.value.remark = ''
}
const defaultTime = [
- new Date(2000, 1, 1, 0, 0, 0),
- new Date(2000, 2, 1, 23, 59, 59),
+ new Date(2000, 1, 1, 0, 0, 0),
+ new Date(2000, 2, 1, 23, 59, 59),
]
const disabledDate = (time) => {
- const limitDate = new Date(2025, 0, 1);
- return time.getTime() < limitDate.getTime();
+ const limitDate = new Date(2025, 0, 1);
+ return time.getTime() < limitDate.getTime();
}
onMounted(() => {
console.log('???????????????????', adminData.value)
@@ -870,7 +869,7 @@ onMounted(() => {
.top {
width: 30vw;
- height: 17vh;
+ height: 19vh;
.top-item {
display: flex;
diff --git a/src/views/moneyManage/refundDetail/refundHeader.vue b/src/views/moneyManage/refundDetail/refundHeader.vue
index 7269ad4..f64fc0a 100644
--- a/src/views/moneyManage/refundDetail/refundHeader.vue
+++ b/src/views/moneyManage/refundDetail/refundHeader.vue
@@ -104,18 +104,20 @@
退款申请信息
退款类型
-
+
+
+
+
退款金额
+ clearable disabled>
退款备注
+ :rows="3" maxlength="100" show-word-limit type="textarea" disabled />
@@ -843,7 +845,7 @@ onMounted(() => {
.top {
width: 30vw;
- height: 17vh;
+ height: 19vh;
.top-item {
display: flex;
diff --git a/src/views/moneyManage/refundDetail/refundService.vue b/src/views/moneyManage/refundDetail/refundService.vue
index 1ccd383..71e28f5 100644
--- a/src/views/moneyManage/refundDetail/refundService.vue
+++ b/src/views/moneyManage/refundDetail/refundService.vue
@@ -289,12 +289,12 @@ const getRefund = async function () {
payType: searchForm.value.payType,//支付方式
startTime: dateRange.value && dateRange.value[0] ? dayjs(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss') : "",
endTime: dateRange.value && dateRange.value[1] ? dayjs(dateRange.value[1]).format('YYYY-MM-DD HH:mm:ss') : "",
- submitterId: isKF ? adminData.value.id : null
+ submitterId: adminData.value.id
}
}
const result = await API({
- url: '/Money/select',
+ url: '/Money/selecta',
method: 'POST',
data: params
})