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

milestone-20251215-多语言二期2
ZhangYong 1 month ago
parent
f67d9e33f8 2e4ed04c65
commit
8b42202b23
4 changed files with 162 additions and 116 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. 22
      src/views/moneyManage/executor/executor.vue
  2. 41
      src/views/moneyManage/refundDetail/refundCharge.vue
  3. 39
      src/views/moneyManage/refundDetail/refundFinance.vue
  4. 40
      src/views/moneyManage/refundDetail/refundHeader.vue

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

@ -2,25 +2,25 @@
<el-card style="margin-bottom: 0.5vh;background-color: rgb(243,250,254);">
<div class="condition1">
<div class="search">
<el-text size="large" style="width:4vw;">{{ t('common.name') }}</el-text>
<el-text size="large" style="width:7vw;">{{ t('common.name') }}</el-text>
<el-input v-model="searchForm.name" :placeholder="t('common.pleaseInputName')" style="width:9vw;" clearable />
</div>
<div class="search">
<el-text size="large" style="width:4vw;">{{ t('common.jwcode') }}</el-text>
<el-text size="large" style="width:7vw;">{{ t('common.jwcode') }}</el-text>
<el-input v-model="searchForm.jwcode" :placeholder="t('common.jwcodePlaceholder')" style="width:9vw;"
clearable />
</div>
<div class="search">
<el-text size="large" style="width:4vw;">{{ t('common.productName') }}</el-text>
<el-text size="large" style="width:7vw;">{{ t('common.productName') }}</el-text>
<el-cascader v-model="searchForm.goodsName" :props="{ multiple: false, emitPath: false }" :show-all-levels="false" collapse-tags collapse-tags-tooltip :options="productList" style="width: 10vw;" :placeholder="t('common.productNamePlaceholder')" clearable />
</div>
<div class="search" v-if="adminData.markets === t('common.markets.headquarter')">
<el-text size="large" style="width:4vw;">{{ t('common.market') }}</el-text>
<el-text size="large" style="width:7vw;">{{ t('common.market') }}</el-text>
<el-cascader style="width: 9vw;" v-model="searchForm.markets" :options="market"
:placeholder="t('common.marketPlaceholder')" clearable />
</div>
<div class="search">
<el-text size="large" style="width:4vw;">{{ t('common.refundCurrency') }}</el-text>
<el-text size="large" style="width:9vw;">{{ t('common.refundCurrency') }}</el-text>
<el-select v-model="searchForm.refundCurrency" style="width:9vw;" clearable>
<el-option v-for="item in currencies" :key="item" :label="item" :value="item" />
</el-select>
@ -28,19 +28,19 @@
</div>
<div class="condition1">
<div class="search2">
<el-text size="large" style="width:4vw;">{{ t('common.refundMethod') }}</el-text>
<el-text size="large" style="width:7vw;">{{ t('common.refundMethod') }}</el-text>
<el-select v-model="searchForm.refundChannels" style="width:9vw;" clearable>
<el-option v-for="item in channelOptions" :key="item" :label="item" :value="item" />
</el-select>
</div>
<div class="search2">
<el-text size="large" style="width:4vw;">{{ t('common.orderStatus') }}</el-text>
<el-text size="large" style="width:7vw;">{{ t('common.orderStatus') }}</el-text>
<el-select v-model="searchForm.statuses" style="width:9vw;" clearable>
<el-option v-for="item in statusList" :label="item" :value="item" :key="item" />
</el-select>
</div>
<div class="search2" style="width: 25.5vw;">
<el-text size="large" style="width:4vw;">{{ t('common.refundTime') }}</el-text>
<div class="search2" style="width: 27.5vw;">
<el-text size="large" style="width:6.5vw;">{{ t('common.refundTime') }}</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:18vw;"
clearable :disabled-date="disabledDate" :default-time="defaultTime" />
@ -600,7 +600,7 @@ onMounted(() => {
height: 4vh;
.search {
width: 18%;
width: 19%;
display: flex;
align-items: center;
margin-bottom: 1vh;
@ -608,7 +608,7 @@ onMounted(() => {
}
.search2 {
width: 18%;
width: 19%;
display: flex;
align-items: center;
margin-right: 0.5vw;

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

@ -2,41 +2,44 @@
<template>
<el-card style="margin-bottom: 0.5vh;background-color: rgb(243,250,254);">
<div class="condition">
<div class="condition-row">
<div class="item1">
<el-text size="large" style="width:4vw;">{{ t('common.jwcode') }}</el-text>
<el-text size="large" style="width:6vw;">{{ t('common.jwcode') }}</el-text>
<el-input v-model="searchForm.jwcode" :placeholder="t('common.jwcodePlaceholder')" style="width:9vw;"
clearable />
</div>
<div class="item1">
<el-text size="large" style="width:4vw;">{{ t('common.customerName') }}</el-text>
<el-text size="large" style="width:6vw;">{{ t('common.customerName') }}</el-text>
<el-input v-model="searchForm.name" :placeholder="t('common.customerNamePlaceholder')"
style="width:9vw;" clearable />
</div>
<div class="item1">
<el-text size="large" style="width:4vw;">{{ t('common.productName') }}</el-text>
<el-text size="large" style="width:6vw;">{{ t('common.productName') }}</el-text>
<el-cascader v-model="searchForm.goodsName" :options="productList" style="width: 10vw;"
:placeholder="t('common.productNamePlaceholder')" clearable />
</div>
</div>
<div class="condition-row">
<div class="item1" v-if="isHeadquarters">
<el-text size="large" style="width:4vw;">{{ t('common.market') }}</el-text>
<el-text size="large" style="width:6vw;">{{ t('common.market') }}</el-text>
<el-cascader style="width: 9vw;" v-model="searchForm.markets" :options="market"
:placeholder="t('common.marketPlaceholder')" clearable @change="handleMarketChange" />
</div>
<div class="item1">
<el-text size="large" style="width:4vw;">{{ t('common.orderStatus') }}</el-text>
<el-text size="large" style="width:6vw;">{{ t('common.orderStatus') }}</el-text>
<el-select v-model="searchForm.statuses" style="width:9vw;"
:placeholder="t('common.orderStatusPlaceholder')" clearable>
<el-option v-for="item in statusList" :label="item" :value="item" :key="item" />
</el-select>
</div>
<div style="margin-left: 2vw;">
<div class="condition-actions">
<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>
</div>
</el-card>
@ -803,16 +806,17 @@ onMounted(() => {
}
.condition {
width: 82vw;
width: 90vw;
display: flex;
align-items: center;
height: 4vh;
flex-direction: column;
align-items: flex-start;
gap: 0.8vh;
.item1 {
width: 15%;
width: 16%;
display: flex;
align-items: center;
margin-right: 0.5vw;
margin-right: 1vw;
}
.item2 {
@ -821,6 +825,19 @@ onMounted(() => {
align-items: center;
margin-right: 0.5vw;
}
.condition-row {
display: flex;
align-items: center;
width: 100%;
}
.condition-actions {
margin-left: 2vw;
display: flex;
align-items: center;
gap: 0.5vw;
}
}
.audit1 {

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

@ -2,37 +2,41 @@
<template>
<el-card style="margin-bottom: 0.5vh;background-color: rgb(243,250,254);">
<div class="condition">
<div class="condition-row">
<div class="item1">
<el-text size="large" style="width:4vw;">{{ t('common.jwcode') }}</el-text>
<el-text size="large" style="width:6vw;">{{ t('common.jwcode') }}</el-text>
<el-input v-model="searchForm.jwcode" :placeholder="t('common.jwcodePlaceholder')" style="width:9vw;" clearable />
</div>
<div class="item1">
<el-text size="large" style="width:4vw;">{{ t('common.customerName') }}</el-text>
<el-text size="large" style="width:6vw;">{{ t('common.customerName') }}</el-text>
<el-input v-model="searchForm.name" :placeholder="t('common.customerNamePlaceholder')" style="width:9vw;" clearable />
</div>
<div class="item1">
<el-text size="large" style="width:4vw;">{{ t('common.productName') }}</el-text>
<el-text size="large" style="width:6vw;">{{ t('common.productName') }}</el-text>
<el-cascader v-model="searchForm.goodsName" :options="productList" style="width: 10vw;" clearable />
</div>
</div>
<div class="condition-row">
<div class="item1" v-if="isHeadquarters">
<el-text size="large" style="width:4vw;">{{ t('common.market') }}</el-text>
<el-text size="large" style="width:6vw;">{{ t('common.market') }}</el-text>
<el-cascader style="width: 9vw;" v-model="searchForm.markets" :options="market" :placeholder="t('common.marketPlaceholder')"
clearable @change="handleMarketChange" />
</div>
<div class="item1">
<el-text size="large" style="width:4vw;">{{ t('common.orderStatus') }}</el-text>
<el-text size="large" style="width:6vw;">{{ t('common.orderStatus') }}</el-text>
<el-select v-model="searchForm.statuses" style="width:9vw;" clearable>
<el-option v-for="item in statusList" :label="item" :value="item" :key="item" />
</el-select>
</div>
<div class="btns" style="margin-left: 2vw;">
<div class="condition-actions">
<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>
</div>
</el-card>
@ -775,16 +779,17 @@ onMounted(() => {
}
.condition {
width: 82vw;
width: 90vw;
display: flex;
align-items: center;
height: 4vh;
flex-direction: column;
align-items: flex-start;
gap: 0.8vh;
.item1 {
width: 15%;
width: 16%;
display: flex;
align-items: center;
margin-right: 0.5vw;
margin-right: 1vw;
}
.item2 {
@ -794,11 +799,17 @@ onMounted(() => {
margin-right: 0.5vw;
}
.btns {
.condition-row {
display: flex;
align-items: center;
margin-right: 0.5vw;
margin-right: 60px;
width: 100%;
}
.condition-actions {
margin-left: 2vw;
display: flex;
align-items: center;
gap: 0.5vw;
}
}

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

@ -2,37 +2,41 @@
<template>
<el-card style="margin-bottom: 0.5vh;background-color: rgb(243,250,254);">
<div class="condition">
<div class="condition-row">
<div class="item1">
<el-text size="large" style="width:4vw;">{{ t('common.jwcode') }}</el-text>
<el-text size="large" style="width:6vw;">{{ t('common.jwcode') }}</el-text>
<el-input v-model="searchForm.jwcode" :placeholder="t('common.jwcodePlaceholder')" style="width:9vw;" clearable />
</div>
<div class="item1">
<el-text size="large" style="width:4vw;">{{ t('common.customerName') }}</el-text>
<el-text size="large" style="width:6vw;">{{ t('common.customerName') }}</el-text>
<el-input v-model="searchForm.name" :placeholder="t('common.customerNamePlaceholder')" style="width:9vw;" clearable />
</div>
<div class="item1">
<el-text size="large" style="width:4vw;">{{ t('common.productName') }}</el-text>
<el-text size="large" style="width:6vw;">{{ t('common.productName') }}</el-text>
<el-cascader v-model="searchForm.goodsName" :options="productList" style="width: 10vw;"
:placeholder="t('common.productNamePlaceholder')" clearable />
</div>
</div>
<div class="condition-row">
<div class="item1" v-if="isHeadquarters">
<el-text size="large" style="width:4vw;">{{ t('common.market') }}</el-text>
<el-text size="large" style="width:6vw;">{{ t('common.market') }}</el-text>
<el-cascader style="width: 9vw;" v-model="searchForm.markets" :options="market" :placeholder="t('common.marketPlaceholder')"
clearable @change="handleMarketChange" />
</div>
<div class="item1">
<el-text size="large" style="width:4vw;">{{ t('common.orderStatus') }}</el-text>
<el-text size="large" style="width:6vw;">{{ t('common.orderStatus') }}</el-text>
<el-select v-model="searchForm.statuses" style="width:9vw;" :placeholder="t('common.orderStatusPlaceholder')" clearable>
<el-option v-for="item in statusList" :label="item" :value="item" :key="item" />
</el-select>
</div>
<div style="margin-left: 2vw;">
<div class="condition-actions">
<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>
</div>
</el-card>
@ -843,16 +847,17 @@ onMounted(() => {
}
.condition {
width: 82vw;
width: 90vw;
display: flex;
align-items: center;
height: 4vh;
flex-direction: column;
align-items: flex-start;
gap: 0.8vh;
.item1 {
width: 15%;
width: 16%;
display: flex;
align-items: center;
margin-right: 0.5vw;
margin-right: 1vw;
}
.item2 {
@ -861,6 +866,19 @@ onMounted(() => {
align-items: center;
margin-right: 0.5vw;
}
.condition-row {
display: flex;
align-items: center;
width: 100%;
}
.condition-actions {
margin-left: 2vw;
display: flex;
align-items: center;
gap: 0.5vw;
}
}
.audit1 {

Write Preview
Loading…
Cancel
Save