|
@@ -136,13 +136,16 @@
|
|
|
</a-select>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
- <!-- <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
|
|
|
- <a-form-item label="客服">
|
|
|
- <customerService ref="customerName" v-model="queryParam.bizUserSn"></customerService>
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
+ <a-form-item label="含促销销售">
|
|
|
+ <a-select style="width: 100%;" v-model="queryParam.hasSalesPromo" placeholder="请选择">
|
|
|
+ <a-select-option value="1">包含</a-select-option>
|
|
|
+ <a-select-option value="0">不包含</a-select-option>
|
|
|
+ </a-select>
|
|
|
</a-form-item>
|
|
|
- </a-col> -->
|
|
|
+ </a-col>
|
|
|
</template>
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
+ <a-col :md="24" :sm="24" style="text-align: center;">
|
|
|
<div class="table-page-search-submitButtons">
|
|
|
<a-button id="expenseReimbursementDetailList-search" type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
|
|
|
<a-button id="expenseReimbursementDetailList-reset" style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
|
|
@@ -183,7 +186,7 @@
|
|
|
:columns="columns"
|
|
|
:data="loadData"
|
|
|
:pageSize="30"
|
|
|
- :scroll="{ y: tableHeight,x:2750 }"
|
|
|
+ :scroll="{ y: tableHeight,x:2990 }"
|
|
|
:defaultLoadData="false"
|
|
|
bordered>
|
|
|
</s-table>
|
|
@@ -206,7 +209,6 @@ import employee from '../expenseReimbursement/employee.js'
|
|
|
import custList from '@/views/common/custList.vue'
|
|
|
import supplier from '@/views/common/supplier.js'
|
|
|
import expenseType from '@/views/common/expenseType.js'
|
|
|
-import customerService from '@/views/common/customerService'
|
|
|
import { expenseAccountDetailList, expenseAcctDetailReport, expenseAccountDetailCount } from '@/api/expenseManagement'
|
|
|
import otherTransactions from '@/views/common/otherTransactions.js'
|
|
|
import { hdExportExcel } from '@/libs/exportExcel'
|
|
@@ -214,7 +216,7 @@ moment.locale('zh-cn')
|
|
|
export default {
|
|
|
name: 'ExpenseReimbursementDetailList',
|
|
|
mixins: [commonMixin],
|
|
|
- components: { STable, VSelect, department, employee, subarea, rangeDate, Area, custList, supplier, expenseType, otherTransactions, customerService },
|
|
|
+ components: { STable, VSelect, department, employee, subarea, rangeDate, Area, custList, supplier, expenseType, otherTransactions },
|
|
|
data () {
|
|
|
const _this = this
|
|
|
return {
|
|
@@ -254,7 +256,8 @@ export default {
|
|
|
provinceSn: undefined,
|
|
|
cityName: '', // 市
|
|
|
citySn: undefined,
|
|
|
- bizUserSn: undefined // 客服
|
|
|
+ bizUserSn: undefined, // 客服
|
|
|
+ hasSalesPromo: '1'
|
|
|
},
|
|
|
addrProvinceList: [], // 省列表
|
|
|
addrCityList: [], // 城市列表数据
|
|
@@ -287,6 +290,7 @@ export default {
|
|
|
columns: [{ title: '序号', dataIndex: 'no', width: 60, align: 'center' },
|
|
|
{ title: '审核时间', dataIndex: 'finishDate', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '费用单号', dataIndex: 'expenseAccountNo', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '销售单号', dataIndex: 'salesBillNo', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '申请人', dataIndex: 'applyPersonName', width: 90, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '申请部门', dataIndex: 'applyDepartmentName', width: 90, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '费用类型(一级)', dataIndex: 'expenseTypeName', width: 90, align: 'center', customRender: function (text) { return text || '--' } },
|
|
@@ -296,6 +300,7 @@ export default {
|
|
|
{ title: '详细说明', dataIndex: 'content', align: 'center', width: 150, customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
{ title: '记账类型', dataIndex: 'accountTypeDictValue', width: 90, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '记账名称', dataIndex: 'accountName', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
+ { title: '原记账名称', dataIndex: 'origAccountName', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
{ title: '财务编码', dataIndex: 'accountNameFnumber', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '所属区域', dataIndex: 'subareaArea.subareaName', width: 60, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '所属分区', dataIndex: 'subareaArea.subareaAreaName', width: 60, align: 'center', customRender: function (text) { return text || '--' } },
|
|
@@ -408,7 +413,8 @@ export default {
|
|
|
cityName: '',
|
|
|
provinceSn: undefined,
|
|
|
citySn: undefined,
|
|
|
- bizUserSn: undefined
|
|
|
+ bizUserSn: undefined,
|
|
|
+ hasSalesPromo: '1'
|
|
|
}
|
|
|
this.expenseTypes = []
|
|
|
this.$refs.table.refresh(true)
|