This commit is contained in:
linfso 2025-03-11 17:35:35 +08:00
parent 57724413ad
commit fe44bf97de
4 changed files with 26 additions and 14 deletions

View File

@ -9,7 +9,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="运输方式" prop="transTypeIdArr">
<el-select multiple clearable collapse-tags v-model="form.transTypeIdArr" placeholder="运输方式" >
<el-select multiple clearable collapse-tags v-model="form.transTypeIdArr" placeholder="运输方式" style="width: 100%;" >
<el-option
v-for="item in dict.type.emis_biz_shipping_method"
v-bind:key="item.value"
@ -22,7 +22,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="起始时间" prop="startDate">
<el-date-picker clearable
<el-date-picker clearable style="width: 100%;"
v-model="form.startDate"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
@ -32,7 +32,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="结束时间" prop="endDate">
<el-date-picker clearable
<el-date-picker clearable style="width: 100%;"
v-model="form.endDate"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"

View File

@ -110,9 +110,9 @@
</div>
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('月结客户')" align="center" prop="customerName" min-width="100" />
<el-table-column :label="$t('月结客户')" align="center" prop="customerName" min-width="170" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('固定额度')" align="center" prop="creditMoney" min-width="100" />
<el-table-column :label="$t('运输方式')" align="center" prop="transType" min-width="150">
<el-table-column :label="$t('运输方式')" align="center" prop="transType" min-width="150" :show-overflow-tooltip="true">
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_biz_shipping_method" :value="scope.row.transType"/>
</template>
@ -132,7 +132,11 @@
{{ scope.row.creditMoney - scope.row.curMoney }}
</template>
</el-table-column>
<el-table-column :label="$t('剩余比例(%)')" align="center" prop="curMoneyRate" min-width="100" />
<el-table-column :label="$t('剩余比例(%)')" align="center" prop="curMoneyRate" min-width="100" >
<template slot-scope="scope">
{{ (scope.row.curMoney/scope.row.creditMoney)*100 }}
</template>
</el-table-column>
<el-table-column :label="$t('开始日期')" align="center" prop="startDate" min-width="170" />
<el-table-column :label="$t('结束日期')" align="center" prop="endDate" min-width="170" />
<el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />

View File

@ -2,14 +2,16 @@
<div >
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="24">
<el-col :span="12">
<el-form-item label="员工姓名" prop="salesmen">
<SalemanPicker :placeholder="$t('员工姓名')" v-model="form.salesmen" :disabled="form.id!=null" ></SalemanPicker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="运输方式" prop="transTypeIdArr">
<el-select multiple clearable collapse-tags v-model="form.transTypeIdArr" placeholder="运输方式" >
<el-select multiple clearable collapse-tags v-model="form.transTypeIdArr" placeholder="运输方式"
style="width: 100%;"
>
<el-option
v-for="item in dict.type.emis_biz_shipping_method"
v-bind:key="item.value"
@ -22,7 +24,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="起始时间" prop="startDate">
<el-date-picker clearable
<el-date-picker clearable style="width: 100%;"
v-model="form.startDate"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
@ -32,7 +34,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="结束时间" prop="endDate">
<el-date-picker clearable
<el-date-picker clearable style="width: 100%;"
v-model="form.endDate"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"

View File

@ -1,6 +1,6 @@
<template>
<XdPageContainer class="app-container">
<SearchForm :model="queryParams" ref="queryForm" size="small" :maxShow="3" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<SearchForm :model="queryParams" ref="queryForm" size="small" :maxShow="20" label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-form-item :label="$t('员工姓名')" prop="salesmen">
<SalemanPicker :placeholder="$t('员工姓名')" v-model="queryParams.salesmen" ></SalemanPicker>
@ -101,7 +101,7 @@
<el-table-column :label="$t('员工姓名')" align="center" prop="salesmen" min-width="100" />
<el-table-column :label="$t('固定额度')" align="center" prop="creditMoney" min-width="100" />
<el-table-column :label="$t('运输方式')" align="center" prop="transType" min-width="150">
<el-table-column :label="$t('运输方式')" align="center" prop="transType" min-width="150" :show-overflow-tooltip="true">
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_biz_shipping_method" :value="scope.row.transType"/>
</template>
@ -121,7 +121,11 @@
{{ scope.row.creditMoney - scope.row.curMoney }}
</template>
</el-table-column>
<el-table-column :label="$t('剩余比例(%)')" align="center" prop="curMoneyRate" min-width="100" />
<el-table-column :label="$t('剩余比例(%)')" align="center" prop="curMoneyRate" min-width="100" >
<template slot-scope="scope">
{{ (scope.row.curMoney/scope.row.creditMoney)*100 }}
</template>
</el-table-column>
<el-table-column :label="$t('开始日期')" align="center" prop="startDate" min-width="170" />
<el-table-column :label="$t('结束日期')" align="center" prop="endDate" min-width="170" />
<el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
@ -155,10 +159,12 @@ import { listEmisCreditSalesmen, getEmisCreditSalesmen, delEmisCreditSalesmen, a
import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
// import emisCreditSalesmenView from '@/views/emis/emisCreditSalesmen/emisCreditSalesmenView';
import emisCreditSalesmenForm from '@/views/emis/emisCreditSalesmen/emisCreditSalesmenForm';
import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
import NumberRangePicker from '@/components/NumberRange/NumberRangePicker';
export default {
name: "emisCreditSalesmen",
components: { elDateSimplePicker,emisCreditSalesmenForm },
components: { elDateSimplePicker,emisCreditSalesmenForm,SalemanPicker,NumberRangePicker },
dicts: [
],
data() {