|
|
@@ -15,8 +15,8 @@
|
|
|
show-overflow-tooltip :label="item.label" />
|
|
|
</el-table>
|
|
|
</template>
|
|
|
- <template slot-scope="{disabled,size}" slot="billTypeSearch">
|
|
|
- <avue-input-tree :check-strictly="true" :tags="true" tags multiple v-model="query.billType"
|
|
|
+ <template slot-scope="{disabled,size}" slot="businessTypeSearch">
|
|
|
+ <avue-input-tree :check-strictly="true" :tags="true" multiple v-model="query.businessType"
|
|
|
placeholder="请选择业务类型" :dic="billTypeData" :style="{ width: '100%' }">
|
|
|
</avue-input-tree>
|
|
|
</template>
|
|
|
@@ -111,7 +111,7 @@ export default {
|
|
|
total: 0
|
|
|
},
|
|
|
query: {
|
|
|
- billType: 'SE,SI',
|
|
|
+ businessType: 'SE,SI',
|
|
|
costMerge: 1,
|
|
|
statisticsDateStart: defaultDate3()[0],
|
|
|
statisticsDateEnd: defaultDate3()[1],
|
|
|
@@ -220,8 +220,8 @@ export default {
|
|
|
// overHidden: true,
|
|
|
// },
|
|
|
{
|
|
|
- label: "业务类型",
|
|
|
- prop: "billType",
|
|
|
+ label: "单据类型",
|
|
|
+ prop: "businessType",
|
|
|
overHidden: true,
|
|
|
search: true,
|
|
|
searchslot: true,
|
|
|
@@ -234,6 +234,30 @@ export default {
|
|
|
},
|
|
|
},
|
|
|
{
|
|
|
+ label: "业务类型",
|
|
|
+ prop: "billType",
|
|
|
+ overHidden: true,
|
|
|
+ search: false,
|
|
|
+ hide: true,
|
|
|
+ // searchslot: true,
|
|
|
+ searchOrder: 1.2,
|
|
|
+ type: 'select',
|
|
|
+ dicData: [
|
|
|
+ {
|
|
|
+ label: "直单",
|
|
|
+ value: "DD"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "主单",
|
|
|
+ value: "MM"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "分单",
|
|
|
+ value: "MH"
|
|
|
+ }
|
|
|
+ ],
|
|
|
+ },
|
|
|
+ {
|
|
|
label: "箱属",
|
|
|
prop: "boxBelongsTo",
|
|
|
overHidden: true,
|
|
|
@@ -615,9 +639,15 @@ export default {
|
|
|
item.search = true
|
|
|
}
|
|
|
})
|
|
|
+ this.option.column.forEach(item => {
|
|
|
+ if (item.prop == 'billType') {
|
|
|
+ item.search = true
|
|
|
+ item.hide = false
|
|
|
+ }
|
|
|
+ })
|
|
|
}
|
|
|
this.query = {
|
|
|
- billType: 'SE,SI',
|
|
|
+ businessType: 'SE,SI',
|
|
|
costMerge: 1,
|
|
|
statisticsDateStart: defaultDate3()[0],
|
|
|
statisticsDateEnd: defaultDate3()[1],
|
|
|
@@ -643,7 +673,7 @@ export default {
|
|
|
getWorkDictsfun() {
|
|
|
// 获取业务类型
|
|
|
getWorkDicts('profit_business_type_los').then(res => {
|
|
|
- this.findObject(this.option.column, "billType").dicData = res.data.data
|
|
|
+ this.findObject(this.option.column, "businessType").dicData = res.data.data
|
|
|
this.billTypeData = res.data.data.map(item => {
|
|
|
return { label: item.dictValue, value: item.dictKey }
|
|
|
})
|
|
|
@@ -775,7 +805,7 @@ export default {
|
|
|
// 清空搜索回调方法
|
|
|
searchReset() {
|
|
|
this.query = {
|
|
|
- billType: 'SE,SI',
|
|
|
+ businessType: 'SE,SI',
|
|
|
costMerge: 1,
|
|
|
statisticsDateStart: null,
|
|
|
statisticsDateEnd: null,
|
|
|
@@ -803,8 +833,8 @@ export default {
|
|
|
},
|
|
|
onLoad(page, params = {}) {
|
|
|
this.loading = true;
|
|
|
- if (Array.isArray(this.query.billType)) {
|
|
|
- this.query.billType = this.query.billType.join(',')
|
|
|
+ if (Array.isArray(this.query.businessType)) {
|
|
|
+ this.query.businessType = this.query.businessType.join(',')
|
|
|
}
|
|
|
financeStatisticsFinanceProfit(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
|
|
|
const data = res.data.data;
|
|
|
@@ -854,7 +884,7 @@ export default {
|
|
|
this.$message.success("重置成功");
|
|
|
this.$refs[ref].$refs.dialogColumn.columnBox = false;
|
|
|
this.query = {
|
|
|
- billType: 'SE,SI',
|
|
|
+ businessType: 'SE,SI',
|
|
|
costMerge: 1,
|
|
|
statisticsDateStart: defaultDate3()[0],
|
|
|
statisticsDateEnd: defaultDate3()[1],
|