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

Merge branch 'milestone-20251215-多语言二期2' of http://39.101.133.168:8807/huangqizhen/gold-vue into milestone-20251215-多语言二期2

zhangrenyuan/feature-20260128093451-日常优化1.0
zhangrenyuan 1 month ago
parent
b0b9cd5d14 813fec6ee5
commit
05d9a5b790
3 changed files with 20 additions and 73 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. 30
      src/views/moneyManage/refundDetail/refundCharge.vue
  2. 34
      src/views/moneyManage/refundDetail/refundFinance.vue
  3. 29
      src/views/moneyManage/refundDetail/refundHeader.vue

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

@ -29,36 +29,15 @@
<el-option v-for="item in statusList" :label="item" :value="item" :key="item" />
</el-select>
</div>
</div>
<div class="condition">
<!-- <div class="item2">
<el-text size="large" style="width:4vw;">{{ t('common.payCurrency') }}</el-text>
<el-select v-model="searchForm.paymentCurrency" style="width:9vw;"
:placeholder="t('common.payCurrencyPlaceholder')" clearable>
<el-option v-for="item in currencies" :key="item" :label="item" :value="item" />
</el-select>
</div> -->
<div class="item2">
<el-text size="large" style="width:4vw;">{{ t('common.payModel') }}</el-text>
<el-select v-model="searchForm.payType" style="width:9vw;"
:placeholder="t('common.payModelPlaceholder')" clearable>
<el-option v-for="item in channelOptions" :key="item" :label="item" :value="item" />
</el-select>
</div>
<!-- <div class="item2" style="width: 29.3vw;">
<el-text size="large" style="width:4vw;">{{ t('common.payTime') }}</el-text>
<el-date-picker v-model="dateRange" type="datetimerange" :range-separator="t('common.to')"
:start-placeholder="t('common.startTime')" :end-placeholder="t('common.endTime')"
style="width:22vw;" @change="handleDatePickerChange" clearable :disabled-date="disabledDate"
:default-time="defaultTime" />
</div> -->
<div>
<div style="margin-left: 2vw;">
<el-button type="primary" @click="getRefund">{{ t('common.search') }}</el-button>
<el-button type="warning" @click="exportExcel()">{{ t('common.exportExcel') }}</el-button>
<el-button type="primary" @click="openExportList">{{ t('common.viewExportList') }}</el-button>
<el-button type="success" @click="reset">{{ t('common.reset') }}</el-button>
</div>
</div>
</el-card>
<el-card style="margin-top: 0.5vh;background-color: rgb(231,244,253);">
@ -830,10 +809,9 @@ onMounted(() => {
height: 4vh;
.item1 {
width: 18%;
width: 15%;
display: flex;
align-items: center;
margin-bottom: 1vh;
margin-right: 0.5vw;
}

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

@ -25,33 +25,15 @@
<el-option v-for="item in statusList" :label="item" :value="item" :key="item" />
</el-select>
</div>
</div>
<div class="condition">
<!-- <div class="item2">
<el-text size="large" style="width:4vw;">{{ t('common.payCurrency') }}</el-text>
<el-select v-model="searchForm.paymentCurrency" style="width:9vw;" clearable>
<el-option v-for="item in currencies" :key="item" :label="item" :value="item" />
</el-select>
</div> -->
<div class="item2">
<el-text size="large" style="width:4vw;">{{ t('common.payModel') }}</el-text>
<el-select v-model="searchForm.payType" style="width:9vw;" clearable>
<el-option v-for="item in channelOptions" :key="item" :label="item" :value="item" />
</el-select>
</div>
<!-- <div class="item2" style="width: 29.3vw;">
<el-text size="large" style="width:4vw;">{{ t('common.payTime') }}</el-text>
<el-date-picker v-model="dateRange" type="datetimerange" :range-separator="t('common.to')" :start-placeholder="t('common.startTime')"
:end-placeholder="t('common.endTime')" style="width:22vw;" @change="handleDatePickerChange" clearable
:disabled-date="disabledDate" :default-time="defaultTime" />
</div> -->
<div>
<div class="btns" style="margin-left: 2vw;">
<el-button type="primary" @click="getRefund">{{ t('common.search') }}</el-button>
<el-button type="warning" @click="exportExcel()">{{ t('common.exportExcel') }}</el-button>
<el-button type="primary" @click="openExportList">{{ t('common.viewExportList') }}</el-button>
<el-button type="success" @click="reset">{{ t('common.reset') }}</el-button>
</div>
</div>
</el-card>
<el-card style="margin-top: 0.5vh;background-color: rgb(231,244,253);">
@ -799,10 +781,9 @@ onMounted(() => {
height: 4vh;
.item1 {
width: 18%;
width: 15%;
display: flex;
align-items: center;
margin-bottom: 1vh;
margin-right: 0.5vw;
}
@ -812,6 +793,13 @@ onMounted(() => {
align-items: center;
margin-right: 0.5vw;
}
.btns {
display: flex;
align-items: center;
margin-right: 0.5vw;
margin-right: 60px;
}
}
.audit {

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

@ -26,33 +26,14 @@
<el-option v-for="item in statusList" :label="item" :value="item" :key="item" />
</el-select>
</div>
</div>
<div class="condition">
<!-- <div class="item2">
<el-text size="large" style="width:4vw;">{{ t('common.payCurrency') }}</el-text>
<el-select v-model="searchForm.paymentCurrency" style="width:9vw;" :placeholder="t('common.payCurrencyPlaceholder')" clearable>
<el-option v-for="item in currencies" :key="item" :label="item" :value="item" />
</el-select>
</div> -->
<div class="item2">
<el-text size="large" style="width:4vw;">{{ t('common.payModel') }}</el-text>
<el-select v-model="searchForm.payType" style="width:9vw;" :placeholder="t('common.payModelPlaceholder')" clearable>
<el-option v-for="item in channelOptions" :key="item" :label="item" :value="item" />
</el-select>
</div>
<!-- <div class="item2" style="width: 29.3vw;">
<el-text size="large" style="width:4vw;">{{ t('common.payTime') }}</el-text>
<el-date-picker v-model="dateRange" type="datetimerange" :range-separator="t('common.to')" :start-placeholder="t('common.startTime')"
:end-placeholder="t('common.endTime')" style="width:22vw;" @change="handleDatePickerChange" clearable
:disabled-date="disabledDate" :default-time="defaultTime" />
</div> -->
<div>
<div style="margin-left: 2vw;">
<el-button type="primary" @click="getRefund">{{ t('common.search') }}</el-button>
<el-button type="warning" @click="exportExcel()">{{ t('common.exportExcel') }}</el-button>
<el-button type="primary" @click="openExportList">{{ t('common.viewExportList') }}</el-button>
<el-button type="success" @click="reset">{{ t('common.reset') }}</el-button>
</div>
</div>
</el-card>
<el-card style="margin-top: 0.5vh;background-color: rgb(231,244,253);">
@ -585,7 +566,8 @@ const handlePass = async function () {
freeGold: auditRow.value.freeGold * 100,
orderCode: auditRow.value.orderCode,
jwcode: auditRow.value.jwcode,
adminId: adminData.value.id
adminId: adminData.value.id,
refundModel:auditRow.value.refundModel
}
const result = await API({
url: '/Money/finalReview',
@ -867,10 +849,9 @@ onMounted(() => {
height: 4vh;
.item1 {
width: 18%;
width: 15%;
display: flex;
align-items: center;
margin-bottom: 1vh;
margin-right: 0.5vw;
}

Write Preview
Loading…
Cancel
Save