|
@@ -1,32 +1,32 @@
|
|
|
<template>
|
|
|
<div>
|
|
|
- <a-card size="small" :bordered="false" class="searchBoxNormal">
|
|
|
- <!-- 搜索条件 -->
|
|
|
- <div ref="tableSearch" class="table-page-search-wrapper">
|
|
|
- <a-form layout="inline">
|
|
|
- <a-row :gutter="15">
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
- <a-form-item label="费用单号" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
|
|
|
- <a-input id="salesManagementList-expenseAccountNo" v-model.trim="queryParam.expenseAccountNo" allowClear placeholder="请输入销售单号"/>
|
|
|
- </a-form-item>
|
|
|
- </a-col>
|
|
|
- <a-col :md="4" :sm="24">
|
|
|
- <a-form-item label="申请人" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
|
|
|
- <employee style="width: 100%;" id="salesManagementList-Employee" v-model="queryParam.applyPersonSn"></employee>
|
|
|
- </a-form-item>
|
|
|
- </a-col>
|
|
|
- <a-col :md="4" :sm="24">
|
|
|
- <a-form-item label="费用类型">
|
|
|
- <expenseType
|
|
|
- id="salesManagementList-expenseType"
|
|
|
- :changeOnSelect="true"
|
|
|
- v-model="expenseTypes"
|
|
|
- @change="expenseChange"
|
|
|
- placeholder="请选择费用类型"
|
|
|
- ></expenseType>
|
|
|
- </a-form-item>
|
|
|
- </a-col>
|
|
|
- <a-col :md="4" :sm="24">
|
|
|
+ <a-card size="small" :bordered="false" class="searchBoxNormal">
|
|
|
+ <!-- 搜索条件 -->
|
|
|
+ <div ref="tableSearch" class="table-page-search-wrapper">
|
|
|
+ <a-form layout="inline">
|
|
|
+ <a-row :gutter="15">
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
+ <a-form-item label="费用单号" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
|
|
|
+ <a-input id="salesManagementList-expenseAccountNo" v-model.trim="queryParam.expenseAccountNo" allowClear placeholder="请输入销售单号"/>
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :md="4" :sm="24">
|
|
|
+ <a-form-item label="申请人" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
|
|
|
+ <employee style="width: 100%;" id="salesManagementList-Employee" v-model="queryParam.applyPersonSn"></employee>
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :md="4" :sm="24">
|
|
|
+ <a-form-item label="费用类型">
|
|
|
+ <expenseType
|
|
|
+ id="salesManagementList-expenseType"
|
|
|
+ :changeOnSelect="true"
|
|
|
+ v-model="expenseTypes"
|
|
|
+ @change="expenseChange"
|
|
|
+ placeholder="请选择费用类型"
|
|
|
+ ></expenseType>
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :md="4" :sm="24">
|
|
|
<a-form-item label="费用发生月份">
|
|
|
<a-month-picker
|
|
|
placeholder="请选择月份"
|
|
@@ -37,138 +37,149 @@
|
|
|
style="width: 100%;"/>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
- <template v-if="advanced">
|
|
|
+ <template v-if="advanced">
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
+ <a-form-item label="主题">
|
|
|
+ <a-input id="salesManagementList-title" v-model.trim="queryParam.title" allowClear placeholder="请输入主题"/>
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :md="4" :sm="24">
|
|
|
+ <a-form-item label="打印状态">
|
|
|
+ <v-select
|
|
|
+ v-model="queryParam.printStatus"
|
|
|
+ ref="printStatus"
|
|
|
+ id="pushOrder-printStatus"
|
|
|
+ code="EXPENSE_ACCOUNT_PRINT_STATUS"
|
|
|
+ placeholder="请选择打印状态"
|
|
|
+ allowClear></v-select>
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :md="4" :sm="24">
|
|
|
+ <a-form-item label="状态">
|
|
|
+ <v-select
|
|
|
+ v-model="queryParam.state"
|
|
|
+ ref="state"
|
|
|
+ id="salesManagementList-state"
|
|
|
+ code="EXPENSE_STATE"
|
|
|
+ placeholder="请选择状态"
|
|
|
+ allowClear></v-select>
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
+ <a-form-item label="销售单号">
|
|
|
+ <a-input id="salesManagementList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ </template>
|
|
|
<a-col :md="6" :sm="24">
|
|
|
- <a-form-item label="主题">
|
|
|
- <a-input id="salesManagementList-title" v-model.trim="queryParam.title" allowClear placeholder="请输入主题"/>
|
|
|
- </a-form-item>
|
|
|
- </a-col>
|
|
|
- <a-col :md="4" :sm="24">
|
|
|
- <a-form-item label="打印状态">
|
|
|
- <v-select
|
|
|
- v-model="queryParam.printStatus"
|
|
|
- ref="printStatus"
|
|
|
- id="pushOrder-printStatus"
|
|
|
- code="EXPENSE_ACCOUNT_PRINT_STATUS"
|
|
|
- placeholder="请选择打印状态"
|
|
|
- allowClear></v-select>
|
|
|
- </a-form-item>
|
|
|
- </a-col>
|
|
|
- <a-col :md="4" :sm="24">
|
|
|
- <a-form-item label="状态">
|
|
|
- <v-select
|
|
|
- v-model="queryParam.state"
|
|
|
- ref="state"
|
|
|
- id="salesManagementList-state"
|
|
|
- code="EXPENSE_STATE"
|
|
|
- placeholder="请选择状态"
|
|
|
- allowClear></v-select>
|
|
|
- </a-form-item>
|
|
|
+ <span class="table-page-search-submitButtons">
|
|
|
+ <a-button type="primary" :disabled="disabled" @click="searchForm">查询</a-button>
|
|
|
+ <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
|
|
|
+ <a @click="advanced=!advanced" style="margin-left: 8px">
|
|
|
+ {{ advanced ? '收起' : '展开' }}
|
|
|
+ <a-icon :type="advanced ? 'up' : 'down'"/>
|
|
|
+ </a>
|
|
|
+ </span>
|
|
|
</a-col>
|
|
|
- </template>
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
- <span class="table-page-search-submitButtons">
|
|
|
- <a-button type="primary" :disabled="disabled" @click="searchForm">查询</a-button>
|
|
|
- <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
|
|
|
- <a @click="advanced=!advanced" style="margin-left: 8px">
|
|
|
- {{ advanced ? '收起' : '展开' }}
|
|
|
- <a-icon :type="advanced ? 'up' : 'down'"/>
|
|
|
- </a>
|
|
|
- </span>
|
|
|
- </a-col>
|
|
|
- </a-row>
|
|
|
- </a-form>
|
|
|
- </div>
|
|
|
- </a-card>
|
|
|
- <a-card size="small" :bordered="false" class="salesManagementList-wrap">
|
|
|
- <a-spin :spinning="spinning" tip="Loading...">
|
|
|
- <!-- 操作按钮 -->
|
|
|
- <div class="table-operator">
|
|
|
- <a-button type="primary" v-if="$hasPermissions('B_eRNew')" @click="handleEdit()">新增</a-button>
|
|
|
- <a-button type="primary" :loading="spinning" @click="handlePlPrint()" ghost>批量打印</a-button>
|
|
|
- <span style="margin-left: 8px">
|
|
|
- <template v-if="rowSelectionInfo && rowSelectionInfo.selectedRowKeys.length>0">{{ `已选 ${rowSelectionInfo.selectedRowKeys.length} 项` }}</template>
|
|
|
- </span>
|
|
|
+ </a-row>
|
|
|
+ </a-form>
|
|
|
</div>
|
|
|
- <!-- 列表 -->
|
|
|
- <s-table
|
|
|
- class="sTable fixPagination"
|
|
|
- ref="table"
|
|
|
- :row-selection="$hasPermissions('B_eRPrint')?{ columnWidth: '4%', getCheckboxProps: record => ({ props: { disabled: false } })}:null"
|
|
|
- @rowSelection="rowSelectionFun"
|
|
|
- :style="{ height: tableHeight+70+'px' }"
|
|
|
- size="small"
|
|
|
- :rowKey="(record) => record.id"
|
|
|
- :columns="columns"
|
|
|
- :pageSize="30"
|
|
|
- :data="loadData"
|
|
|
- :scroll="{ y: tableHeight }"
|
|
|
- :defaultLoadData="false"
|
|
|
- bordered>
|
|
|
- <!-- 单号 -->
|
|
|
- <template slot="expenseAccountNo" slot-scope="text, record">
|
|
|
- <span v-if="$hasPermissions('B_eRdetail')" class="link-bule" @click="handleDetail(record)">{{ record.expenseAccountNo }}</span>
|
|
|
- <div v-else>{{ record.expenseAccountNo||'--' }}</div>
|
|
|
- </template>
|
|
|
- <!-- 总数量 -->
|
|
|
- <template slot="totalQty" slot-scope="text, record">
|
|
|
- {{ record.totalQty }}
|
|
|
- </template>
|
|
|
- <!-- 费用类型 -->
|
|
|
- <template slot="expenseType" slot-scope="text, record">
|
|
|
- <div>{{ record.expenseTypeName || '--' }}<span v-if="record.expenseType2">/{{ record.expenseTypeName2 || '--' }}</span></div>
|
|
|
- </template>
|
|
|
- <!-- 操作 -->
|
|
|
- <template slot="action" slot-scope="text, record">
|
|
|
- <a-button
|
|
|
- v-if="record.state=='WAIT_SUBMIT'&&$hasPermissions('B_ERtEdit')"
|
|
|
- size="small"
|
|
|
- type="link"
|
|
|
- class="button-info"
|
|
|
- @click="handleEdit(record)"
|
|
|
- >
|
|
|
- 编辑
|
|
|
- </a-button>
|
|
|
- <a-button
|
|
|
- v-if="record.state=='WAIT_SUBMIT'&&$hasPermissions('B_ERDel')"
|
|
|
- size="small"
|
|
|
- type="link"
|
|
|
- class="button-error"
|
|
|
- @click="handleDel(record)"
|
|
|
- >
|
|
|
- 删除
|
|
|
- </a-button>
|
|
|
- <a-button
|
|
|
- v-if="record.state!='WAIT_SUBMIT'&&$hasPermissions('B_ERAudit')"
|
|
|
- size="small"
|
|
|
- type="link"
|
|
|
- class="button-info"
|
|
|
- @click="handleSH(record)"
|
|
|
- >
|
|
|
- 审核进度
|
|
|
- </a-button>
|
|
|
- <a-button
|
|
|
- v-if="record.state=='AUDIT_REJECT'"
|
|
|
- size="small"
|
|
|
- type="link"
|
|
|
- class="button-info"
|
|
|
- @click="againEdit(record)"
|
|
|
- >
|
|
|
- 再次编辑
|
|
|
- </a-button>
|
|
|
+ </a-card>
|
|
|
+ <a-card size="small" :bordered="false" class="salesManagementList-wrap">
|
|
|
+ <a-spin :spinning="spinning" tip="Loading...">
|
|
|
+ <!-- 操作按钮 -->
|
|
|
+ <div class="table-operator">
|
|
|
+ <a-button type="primary" v-if="$hasPermissions('B_eRNew')" @click="handleEdit()">新增</a-button>
|
|
|
+ <a-button type="primary" :loading="spinning" @click="handlePlPrint()" ghost>批量打印</a-button>
|
|
|
+ <span style="margin-left: 8px">
|
|
|
+ <template v-if="rowSelectionInfo && rowSelectionInfo.selectedRowKeys.length>0">{{ `已选 ${rowSelectionInfo.selectedRowKeys.length} 项` }}</template>
|
|
|
+ </span>
|
|
|
+ </div>
|
|
|
+ <!-- 列表 -->
|
|
|
+ <s-table
|
|
|
+ class="sTable fixPagination"
|
|
|
+ ref="table"
|
|
|
+ :row-selection="$hasPermissions('B_eRPrint')?{ columnWidth: '4%', getCheckboxProps: record => ({ props: { disabled: false } })}:null"
|
|
|
+ @rowSelection="rowSelectionFun"
|
|
|
+ :style="{ height: tableHeight+70+'px' }"
|
|
|
+ size="small"
|
|
|
+ :rowKey="(record) => record.id"
|
|
|
+ :columns="columns"
|
|
|
+ :pageSize="30"
|
|
|
+ :data="loadData"
|
|
|
+ :scroll="{ y: tableHeight }"
|
|
|
+ :defaultLoadData="false"
|
|
|
+ bordered>
|
|
|
+ <!-- 单号 -->
|
|
|
+ <template slot="expenseAccountNo" slot-scope="text, record">
|
|
|
+ <span v-if="$hasPermissions('B_eRdetail')" class="link-bule" @click="handleDetail(record)">{{ record.expenseAccountNo }}</span>
|
|
|
+ <div v-else>{{ record.expenseAccountNo||'--' }}</div>
|
|
|
+ </template>
|
|
|
+ <!-- 总数量 -->
|
|
|
+ <template slot="totalQty" slot-scope="text, record">
|
|
|
+ {{ record.totalQty }}
|
|
|
+ </template>
|
|
|
+ <!-- 费用类型 -->
|
|
|
+ <template slot="expenseType" slot-scope="text, record">
|
|
|
+ <div>{{ record.expenseTypeName || '--' }}<span v-if="record.expenseType2">/{{ record.expenseTypeName2 || '--' }}</span></div>
|
|
|
+ </template>
|
|
|
+ <!-- 操作 -->
|
|
|
+ <template slot="action" slot-scope="text, record">
|
|
|
+ <a-button
|
|
|
+ v-if="record.state=='WAIT_SUBMIT'&&$hasPermissions('B_ERtEdit')"
|
|
|
+ size="small"
|
|
|
+ type="link"
|
|
|
+ class="button-info"
|
|
|
+ @click="handleEdit(record)"
|
|
|
+ >
|
|
|
+ 编辑
|
|
|
+ </a-button>
|
|
|
+ <a-button
|
|
|
+ v-if="record.state=='WAIT_SUBMIT'&&$hasPermissions('B_ERDel')"
|
|
|
+ size="small"
|
|
|
+ type="link"
|
|
|
+ class="button-error"
|
|
|
+ @click="handleDel(record)"
|
|
|
+ >
|
|
|
+ 删除
|
|
|
+ </a-button>
|
|
|
+ <a-button
|
|
|
+ v-if="record.state!='WAIT_SUBMIT'&&$hasPermissions('B_ERAudit')"
|
|
|
+ size="small"
|
|
|
+ type="link"
|
|
|
+ class="button-info"
|
|
|
+ @click="handleSH(record)"
|
|
|
+ >
|
|
|
+ 审核进度
|
|
|
+ </a-button>
|
|
|
+ <a-button
|
|
|
+ v-if="record.state=='AUDIT_REJECT'"
|
|
|
+ size="small"
|
|
|
+ type="link"
|
|
|
+ class="button-info"
|
|
|
+ @click="againEdit(record)"
|
|
|
+ >
|
|
|
+ 再次编辑
|
|
|
+ </a-button>
|
|
|
<!-- <span v-if="record.state=='AUDIT_REJECT' || record.state=='AUDIT_PASS'">--</span> -->
|
|
|
- </template>
|
|
|
- </s-table>
|
|
|
- </a-spin>
|
|
|
- <!-- 审核进度 -->
|
|
|
- <verifyModal v-drag :openModal="openModal" :itemSn="itemSn" @close="openModal=false"></verifyModal>
|
|
|
- <!-- 新增 -->
|
|
|
- <baseDataModal :show="openBaseModal" @close="openBaseModal=false"></baseDataModal>
|
|
|
- <!-- 打印预览 -->
|
|
|
- <commonModal modalTit="费用报销单打印预览" width="700pt" okText="立即打印" :openModal="showTipModal" @cancel="showTipModal=false" @ok="$refs.printModal.prints()">
|
|
|
- <previewModal v-if="showTipModal" ref="printModal" @printOk="printOk"></previewModal>
|
|
|
- </commonModal>
|
|
|
- </a-card>
|
|
|
+ </template>
|
|
|
+ </s-table>
|
|
|
+ </a-spin>
|
|
|
+ <!-- 审核进度 -->
|
|
|
+ <verifyModal v-drag :openModal="openModal" :itemSn="itemSn" @close="openModal=false"></verifyModal>
|
|
|
+ <!-- 新增 -->
|
|
|
+ <baseDataModal :show="openBaseModal" @close="openBaseModal=false"></baseDataModal>
|
|
|
+ <!-- 打印预览 -->
|
|
|
+ <commonModal
|
|
|
+ modalTit="费用报销单打印预览"
|
|
|
+ width="700pt"
|
|
|
+ okText="立即打印"
|
|
|
+ :openModal="showTipModal"
|
|
|
+ @cancel="showTipModal=false"
|
|
|
+ @ok="$refs.printModal.prints()">
|
|
|
+ <previewModal v-if="showTipModal" ref="printModal" @printOk="printOk"></previewModal>
|
|
|
+ </commonModal>
|
|
|
+ </a-card>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
@@ -191,7 +202,7 @@ export default {
|
|
|
mixins: [commonMixin],
|
|
|
components: { STable, VSelect, subarea, verifyModal, baseDataModal, employee, expenseType, previewModal, commonModal },
|
|
|
data () {
|
|
|
- let _this=this
|
|
|
+ const _this = this
|
|
|
return {
|
|
|
locale,
|
|
|
spinning: false,
|
|
@@ -211,7 +222,8 @@ export default {
|
|
|
expenseType: undefined, // 费用类型
|
|
|
expenseType2: undefined, // 费用类型2
|
|
|
printStatus: undefined, // 打印状态
|
|
|
- state: undefined // 状态
|
|
|
+ state: undefined, // 状态
|
|
|
+ salesBillNo: ''// 销售单号
|
|
|
},
|
|
|
columns: [
|
|
|
{ title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
|
|
@@ -261,25 +273,25 @@ export default {
|
|
|
rowSelectionFun (obj) {
|
|
|
this.rowSelectionInfo = obj || null
|
|
|
},
|
|
|
- printOk(data){
|
|
|
- if(data&&data.status == 200){
|
|
|
+ printOk (data) {
|
|
|
+ if (data && data.status == 200) {
|
|
|
const rows = this.rowSelectionInfo && this.rowSelectionInfo.selectedRows || []
|
|
|
const ret = []
|
|
|
rows.map(item => {
|
|
|
ret.push({
|
|
|
id: item.id,
|
|
|
- printStatus:"PRINT"
|
|
|
+ printStatus: 'PRINT'
|
|
|
})
|
|
|
})
|
|
|
expenseAccountUpdateBatch(ret).then(res => {
|
|
|
- if(res.status == 200){
|
|
|
+ if (res.status == 200) {
|
|
|
this.$refs.table.refresh()
|
|
|
this.$refs.table.clearSelected()
|
|
|
}
|
|
|
this.spinning = false
|
|
|
this.showTipModal = false
|
|
|
})
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
this.spinning = false
|
|
|
}
|
|
|
},
|
|
@@ -295,12 +307,12 @@ export default {
|
|
|
this.spinning = true
|
|
|
const pageData = []
|
|
|
const businessSnList = []
|
|
|
-
|
|
|
- for(let i=0;i<rows.length;i++){
|
|
|
+
|
|
|
+ for (let i = 0; i < rows.length; i++) {
|
|
|
// 费用明细
|
|
|
const fyListData = await expenseAcctDetailFindList({ expenseAccountSn: rows[i].expenseAccountSn }).then(res => res.data)
|
|
|
// 审核明细,待提交状态不获取
|
|
|
- if(rows[i].state != 'WAIT_SUBMIT'){
|
|
|
+ if (rows[i].state != 'WAIT_SUBMIT') {
|
|
|
businessSnList.push(rows[i].expenseAccountSn)
|
|
|
}
|
|
|
pageData.push({
|
|
@@ -312,7 +324,7 @@ export default {
|
|
|
// 获取审核进度信息
|
|
|
const spListData = await getBatchLastProcessInstance({ 'businessType': 'EXPENSES', 'businessSnList': businessSnList }).then(res => res.data)
|
|
|
pageData.map(item => {
|
|
|
- if(spListData){
|
|
|
+ if (spListData) {
|
|
|
const sp = spListData[item.expenseInfo.expenseAccountSn]
|
|
|
item.spListData = sp ? sp.taskVOList : []
|
|
|
}
|
|
@@ -320,7 +332,7 @@ export default {
|
|
|
console.log(pageData)
|
|
|
// 打开预览弹框
|
|
|
this.showTipModal = true
|
|
|
- this.$nextTick(()=>{
|
|
|
+ this.$nextTick(() => {
|
|
|
this.$refs.printModal.setData(pageData)
|
|
|
this.spinning = false
|
|
|
})
|
|
@@ -396,7 +408,7 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
- searchForm(){
|
|
|
+ searchForm () {
|
|
|
this.$refs.table.refresh(true)
|
|
|
this.$refs.table.clearSelected()
|
|
|
},
|
|
@@ -409,8 +421,9 @@ export default {
|
|
|
expenseType: undefined, // 费用类型
|
|
|
expenseType2: undefined, // 费用类型2
|
|
|
state: undefined, // 状态
|
|
|
- printStatus:undefined,
|
|
|
- applyPersonSn: undefined
|
|
|
+ printStatus: undefined,
|
|
|
+ applyPersonSn: undefined,
|
|
|
+ salesBillNo: ''// 销售单号
|
|
|
}
|
|
|
this.expenseTypes = []
|
|
|
this.searchForm()
|