huangqizhen
/
gold-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'lihuilin/feature-20250923114949-现金' into milestone-20250913-现金管理

zhangyong/milestone-20250913-现金管理
lihuilin 1 month ago
parent
22fe1c8678 03b0bf78cb
commit
248cca419d
5 changed files with 61 additions and 58 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/views/moneyManage/executor/executor.vue
  2. 14
      src/views/moneyManage/refundDetail/refundCharge.vue
  3. 87
      src/views/moneyManage/refundDetail/refundFinance.vue
  4. 12
      src/views/moneyManage/refundDetail/refundHeader.vue
  5. 4
      src/views/moneyManage/refundDetail/refundService.vue

2
src/views/moneyManage/executor/executor.vue
View File

@ -140,7 +140,7 @@
</div>
<div class="dialog-item">
<el-text style="width:4vw;">所属地区</el-text>
<el-input v-model="editRow.marketName" style="width:10vw;" disabled />
<el-input v-model="editRow.market" style="width:10vw;" disabled />
</div>
<div class="dialog-item">
<el-text style="width:4vw;">产品名称</el-text>

14
src/views/moneyManage/refundDetail/refundCharge.vue
View File

@ -105,18 +105,20 @@
<el-button @click="" class="smallTitle" size="small">退款申请信息</el-button>
<div class="top-item">
<el-text style="width:4vw;" size="small">退款类型</el-text>
<el-input v-model="auditRow.refundModel" placeholder="请输入退款类型" size="small" style="width:10vw;"
clearable></el-input>
<el-select v-model="auditRow.refundModel" size="small" style="width:10vw;" disabled>
<el-option label="全部退款" :value="0"></el-option>
<el-option label="部分退款" :value="1"></el-option>
</el-select>
</div>
<div class="top-item">
<el-text style="width:4vw;" size="small">退款金额</el-text>
<el-input v-model="auditRow.paymentAmount" placeholder="请输入退款金额" size="small" style="width:10vw;"
clearable></el-input>
clearable disabled></el-input>
</div>
<div class="top-item">
<el-text style="width:4vw;" size="small">退款备注</el-text>
<el-input v-model="auditRow.refundReason" placeholder="请输入退款备注" size="small" style="width:10vw;"
:rows="3" maxlength="100" show-word-limit type="textarea" />
:rows="3" maxlength="100" show-word-limit type="textarea" disabled />
</div>
</div>
<el-button @click="" class="smallTitle" size="small">原订单信息</el-button>
@ -128,7 +130,7 @@
</div>
<div class="center-item">
<el-text style="width:4vw;" size="small">所属地区</el-text>
<el-input v-model="auditRow.marketName" size="small" style="width:10vw;" disabled />
<el-input v-model="auditRow.market" size="small" style="width:10vw;" disabled />
</div>
<div class="center-item">
<el-text style="width:4vw;" size="small">产品名称</el-text>
@ -814,7 +816,7 @@ onMounted(() => {
.top {
width: 30vw;
height: 17vh;
height: 19vh;
.top-item {
display: flex;

87
src/views/moneyManage/refundDetail/refundFinance.vue
View File

@ -12,8 +12,8 @@
</div>
<div class="item1">
<el-text size="large" style="width:4vw;">所属地区</el-text>
<el-cascader style="width: 9vw;" v-model="searchForm.markets" :options="market"
placeholder="请选择所属地区" clearable @change="handleMarketChange" />
<el-cascader style="width: 9vw;" v-model="searchForm.markets" :options="market" placeholder="请选择所属地区"
clearable @change="handleMarketChange" />
</div>
<div class="item1">
<el-text size="large" style="width:4vw;">产品名称</el-text>
@ -43,7 +43,7 @@
<div class="item2" style="width: 28.5vw;">
<el-text size="large" style="width:4vw;">付款时间</el-text>
<el-date-picker v-model="dateRange" type="datetimerange" range-separator="至" start-placeholder="起始时间"
end-placeholder="结束时间" style="width:22vw;" @change="handleDatePickerChange" clearable
end-placeholder="结束时间" style="width:22vw;" @change="handleDatePickerChange" clearable
:disabled-date="disabledDate" :default-time="defaultTime" />
</div>
<div>
@ -105,11 +105,10 @@
<el-button @click="" class="smallTitle" size="small">退款申请信息</el-button>
<div class="top-item">
<el-text style="width:4vw;" size="small">退款类型</el-text>
<el-input v-model="auditRow.refundModel" size="small" style="width:10vw;" disabled>
<template #default="scope">
{{ scope.row.refundModel === 0 ? '全部退款' : '部分退款' }}
</template>
</el-input>
<el-select v-model="auditRow.refundModel" size="small" style="width:10vw;" disabled>
<el-option label="全部退款" :value="0"></el-option>
<el-option label="部分退款" :value="1"></el-option>
</el-select>
</div>
<div class="top-item">
<el-text style="width:4vw;" size="small">退款金额</el-text>
@ -130,7 +129,7 @@
</div>
<div class="center-item">
<el-text style="width:4vw;" size="small">所属地区</el-text>
<el-input v-model="auditRow.marketName" size="small" style="width:10vw;" disabled />
<el-input v-model="auditRow.market" size="small" style="width:10vw;" disabled />
</div>
<div class="center-item">
<el-text style="width:4vw;" size="small">产品名称</el-text>
@ -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;

12
src/views/moneyManage/refundDetail/refundHeader.vue
View File

@ -104,18 +104,20 @@
<el-button @click="" class="smallTitle" size="small">退款申请信息</el-button>
<div class="top-item">
<el-text style="width:4vw;" size="small">退款类型</el-text>
<el-input v-model="auditRow.refundModel" placeholder="请输入退款类型" size="small" style="width:10vw;"
clearable></el-input>
<el-select v-model="auditRow.refundModel" size="small" style="width:10vw;" disabled>
<el-option label="全部退款" :value="0"></el-option>
<el-option label="部分退款" :value="1"></el-option>
</el-select>
</div>
<div class="top-item">
<el-text style="width:4vw;" size="small">退款金额</el-text>
<el-input v-model="auditRow.paymentAmount" placeholder="请输入退款金额" size="small" style="width:10vw;"
clearable></el-input>
clearable disabled></el-input>
</div>
<div class="top-item">
<el-text style="width:4vw;" size="small">退款备注</el-text>
<el-input v-model="auditRow.refundReason" placeholder="请输入退款备注" size="small" style="width:10vw;"
:rows="3" maxlength="100" show-word-limit type="textarea" />
:rows="3" maxlength="100" show-word-limit type="textarea" disabled />
</div>
</div>
<el-button @click="" class="smallTitle" size="small">原订单信息</el-button>
@ -843,7 +845,7 @@ onMounted(() => {
.top {
width: 30vw;
height: 17vh;
height: 19vh;
.top-item {
display: flex;

4
src/views/moneyManage/refundDetail/refundService.vue
View File

@ -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
})

Write Preview
Loading…
Cancel
Save