|
|
@@ -54,7 +54,23 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="订单日期">
|
|
|
+ <!-- 恒春来企业:年月日范围 -->
|
|
|
<el-date-picker
|
|
|
+ v-if="isHclInfo"
|
|
|
+ v-model="queryDate"
|
|
|
+ type="daterange"
|
|
|
+ align="right"
|
|
|
+ unlink-panels
|
|
|
+ range-separator="至"
|
|
|
+ start-placeholder="开始日期"
|
|
|
+ end-placeholder="结束日期"
|
|
|
+ :picker-options="pickerOptions"
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
+ >
|
|
|
+ </el-date-picker>
|
|
|
+ <!-- 默认企业:月范围 -->
|
|
|
+ <el-date-picker
|
|
|
+ v-else
|
|
|
v-model="queryDate"
|
|
|
type="monthrange"
|
|
|
align="right"
|
|
|
@@ -131,8 +147,7 @@
|
|
|
<el-table-column label="员工账号" align="center" prop="userName"/>
|
|
|
<el-table-column label="员工名称" align="center" prop="nickName"/>
|
|
|
<el-table-column label="总单数" align="center" prop="totalNum"/>
|
|
|
- <el-table-column label="总金额" align="center" prop="totalPrice"/>
|
|
|
- <el-table-column label="实付金额" align="center" prop="actualPaymentAmount"/>
|
|
|
+ <el-table-column v-if="hclInfo !== 'hcl'" label="总金额" align="center" prop="totalPrice"/>
|
|
|
<el-table-column v-if="zdyInfo === 'gzzdy'" label="在途单数" align="center" prop="transitNum"/>
|
|
|
<el-table-column v-if="zdyInfo === 'gzzdy'" label="在途金额" align="center" prop="transitPrice"/>
|
|
|
<el-table-column label="成交单数" align="center" prop="dealNum"/>
|
|
|
@@ -150,6 +165,7 @@
|
|
|
<el-table-column label="签收金额" align="center" prop="signFPrice"/>
|
|
|
<el-table-column label="退单数" align="center" prop="chargebackNum"/>
|
|
|
<el-table-column label="退单金额" align="center" prop="chargebackPrice"/>
|
|
|
+ <el-table-column v-if="hclInfo === 'hcl'" label="实付总金额" align="center" prop="actualPaymentAmount"/>
|
|
|
</el-table>
|
|
|
|
|
|
<pagination
|
|
|
@@ -173,6 +189,7 @@ export default {
|
|
|
data() {
|
|
|
return {
|
|
|
zdyInfo: process.env.VUE_APP_FS_USER_INFO,
|
|
|
+ hclInfo: process.env.VUE_APP_FS_USER_INFO,
|
|
|
activeName: '1',
|
|
|
// 遮罩层
|
|
|
loading: true,
|
|
|
@@ -245,7 +262,13 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
+ computed: {
|
|
|
+ isHclInfo() {
|
|
|
+ return this.hclInfo === 'hcl';
|
|
|
+ }
|
|
|
+ },
|
|
|
created() {
|
|
|
+ console.log('当前环境变量 VUE_APP_FS_USER_INFO:', process.env.VUE_APP_FS_USER_INFO);
|
|
|
/**
|
|
|
* 赋值默认日期
|
|
|
* **/
|
|
|
@@ -366,17 +389,28 @@ export default {
|
|
|
* 赋值时间组件默认日期
|
|
|
* **/
|
|
|
getDefaultDateRange() {
|
|
|
- const end = new Date()
|
|
|
- const start = new Date()
|
|
|
- start.setMonth(start.getMonth() - 2)
|
|
|
+ const end = new Date();
|
|
|
+ const start = new Date();
|
|
|
+ start.setMonth(start.getMonth() - 2); // 最近三个月
|
|
|
|
|
|
- const formatDate = (date) => {
|
|
|
- const year = date.getFullYear()
|
|
|
- const month = String(date.getMonth() + 1).padStart(2, '0')
|
|
|
- return `${year}-${month}-01`
|
|
|
- }
|
|
|
+ const formatDate = (date, toMonthFirst = false) => {
|
|
|
+ const year = date.getFullYear();
|
|
|
+ const month = String(date.getMonth() + 1).padStart(2, '0');
|
|
|
+ if (toMonthFirst) {
|
|
|
+ return `${year}-${month}-01`;
|
|
|
+ } else {
|
|
|
+ const day = String(date.getDate()).padStart(2, '0');
|
|
|
+ return `${year}-${month}-${day}`;
|
|
|
+ }
|
|
|
+ };
|
|
|
|
|
|
- return [formatDate(start), formatDate(end)]
|
|
|
+ if (this.isHclInfo) {
|
|
|
+ // 恒春:返回具体日期范围
|
|
|
+ return [formatDate(start), formatDate(end)];
|
|
|
+ } else {
|
|
|
+ // 默认:返回月份范围(月份首日)
|
|
|
+ return [formatDate(start, true), formatDate(end, true)];
|
|
|
+ }
|
|
|
},
|
|
|
|
|
|
getSpanArr() {
|