3
0
Fork 0

Compare commits

..

No commits in common. "d70ade7c1b7494fc7f349b870a25d5731b7b68ba" and "b644d9fd354f21a693cfa08850457406c65ba2ab" have entirely different histories.

4 changed files with 35 additions and 8 deletions

View File

@ -340,6 +340,13 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
v-if="showData.exchangeRate"
align="center"
prop="exchangeRate"
:label="'汇率'"
/>
<!-- lll --> <!-- lll -->
<el-table-column <el-table-column
v-if="showData.creationTime" v-if="showData.creationTime"
@ -374,7 +381,18 @@
prop="accountName" prop="accountName"
:label="'开户姓名'" :label="'开户姓名'"
/> />
<el-table-column
align="center"
prop="accountProvince"
:label="$t('开户支行省')"
width="130"
/>
<el-table-column
align="center"
prop="accountCity"
:label="$t('开户支行市')"
width="130"
/>
<el-table-column <el-table-column
v-if="showData.phone" v-if="showData.phone"
align="center" align="center"
@ -389,7 +407,18 @@
:label="'身份证号码'" :label="'身份证号码'"
width="180" width="180"
/> />
<el-table-column
align="center"
prop="validStartDate"
:label="$t('有效期起始日期')"
width="130"
/>
<el-table-column
align="center"
prop="validEndDate"
:label="$t('有效期截止日期')"
width="130"
/>
<el-table-column <el-table-column
v-if="showData.remarks" v-if="showData.remarks"
align="center" align="center"

View File

@ -470,7 +470,6 @@
<el-date-picker <el-date-picker
v-model="form.putOnTime" v-model="form.putOnTime"
:disabled="methods == 0" :disabled="methods == 0"
clearable
type="datetime" type="datetime"
:placeholder="'请选择'" :placeholder="'请选择'"
/> />
@ -481,7 +480,6 @@
<el-date-picker <el-date-picker
v-model="form.putOffTime" v-model="form.putOffTime"
:disabled="methods == 0" :disabled="methods == 0"
clearable
type="datetime" type="datetime"
:placeholder="'请选择'" :placeholder="'请选择'"
/> />
@ -492,7 +490,6 @@
<el-date-picker <el-date-picker
v-model="form.arrivalTime" v-model="form.arrivalTime"
:disabled="methods == 0" :disabled="methods == 0"
clearable
type="datetime" type="datetime"
:placeholder="'请选择'" :placeholder="'请选择'"
/> />

View File

@ -410,7 +410,6 @@
<el-form-item :label="'上架日期'"> <el-form-item :label="'上架日期'">
<el-date-picker <el-date-picker
v-model="form.putOnTime" v-model="form.putOnTime"
clearable
type="datetime" type="datetime"
:placeholder="'请选择'" :placeholder="'请选择'"
/> />
@ -420,7 +419,6 @@
<el-form-item :label="'下架日期'"> <el-form-item :label="'下架日期'">
<el-date-picker <el-date-picker
v-model="form.putOffTime" v-model="form.putOffTime"
clearable
type="datetime" type="datetime"
:placeholder="'请选择'" :placeholder="'请选择'"
/> />
@ -430,7 +428,6 @@
<el-form-item :label="'预计发货时间'"> <el-form-item :label="'预计发货时间'">
<el-date-picker <el-date-picker
v-model="form.arrivalTime" v-model="form.arrivalTime"
clearable
type="datetime" type="datetime"
:placeholder="'请选择'" :placeholder="'请选择'"
/> />

View File

@ -179,22 +179,26 @@
prop="retailRangeIncome" prop="retailRangeIncome"
width="130" width="130"
:label="$t('直推级差收益')" :label="$t('直推级差收益')"
:formatter="stateFormat"
/> />
<el-table-column <el-table-column
align="center" align="center"
prop="repurRangeIncome" prop="repurRangeIncome"
width="130" width="130"
:label="$t('复购级差收益')" :label="$t('复购级差收益')"
:formatter="stateFormat"
/> />
<el-table-column <el-table-column
align="center" align="center"
prop="retailAreaIncome" prop="retailAreaIncome"
width="130" width="130"
:label="$t('复购配送收益')" :label="$t('复购配送收益')"
:formatter="stateFormat"
/> />
<el-table-column <el-table-column
align="center" align="center"
prop="realIncomeTotal" prop="realIncomeTotal"
:formatter="stateFormat"
:label="'实发收益总计'" :label="'实发收益总计'"
/> />
</el-table> </el-table>