|
@@ -161,7 +161,9 @@
|
|
|
<!-- 新增 -->
|
|
|
<baseDataModal :show="openBaseModal" @close="openBaseModal=false"></baseDataModal>
|
|
|
<!-- 打印预览 -->
|
|
|
- <previewModal ref="printModal" @printOk="printOk"></previewModal>
|
|
|
+ <commonModal modalTit="费用报销单打印预览" width="700pt" okText="立即打印" :openModal="showTipModal" @cancel="showTipModal=false" @ok="$refs.printModal.prints()">
|
|
|
+ <previewModal ref="printModal" @printOk="printOk"></previewModal>
|
|
|
+ </commonModal>
|
|
|
</a-card>
|
|
|
</template>
|
|
|
|
|
@@ -174,6 +176,7 @@ import employee from './employee.js'
|
|
|
import { STable, VSelect } from '@/components'
|
|
|
import verifyModal from './verifyModal.vue'
|
|
|
import previewModal from './previewModal.vue'
|
|
|
+import commonModal from '@/views/common/commonModal.vue'
|
|
|
import expenseType from '@/views/common/expenseType.js'
|
|
|
import { getBatchLastProcessInstance } from '@/api/financeBook'
|
|
|
import { expenseAccountList, expenseAccountDelete, expenseAccountAgainEdit, expenseAcctDetailFindList, expenseAccountUpdateBatch } from '@/api/expenseManagement'
|
|
@@ -181,7 +184,7 @@ import baseDataModal from './baseDataModal.vue'
|
|
|
export default {
|
|
|
name: 'ExpenseReimbursementList',
|
|
|
mixins: [commonMixin],
|
|
|
- components: { STable, VSelect, subarea, verifyModal, baseDataModal, employee, expenseType, previewModal },
|
|
|
+ components: { STable, VSelect, subarea, verifyModal, baseDataModal, employee, expenseType, previewModal, commonModal },
|
|
|
data () {
|
|
|
let _this=this
|
|
|
return {
|
|
@@ -191,6 +194,7 @@ export default {
|
|
|
disabled: false, // 查询、重置按钮是否可操作
|
|
|
openModal: false, // 审核进度弹框是否显示
|
|
|
openBaseModal: false, // 基础信息新建
|
|
|
+ showTipModal: false,
|
|
|
itemSn: '', // 费用单sn
|
|
|
tableHeight: 0,
|
|
|
expenseTypes: [],
|
|
@@ -268,6 +272,7 @@ export default {
|
|
|
this.$refs.table.clearSelected()
|
|
|
}
|
|
|
this.spinning = false
|
|
|
+ this.showTipModal = false
|
|
|
})
|
|
|
}else{
|
|
|
this.spinning = false
|
|
@@ -306,7 +311,12 @@ export default {
|
|
|
item.spListData = sp ? sp.taskVOList : []
|
|
|
})
|
|
|
console.log(pageData)
|
|
|
- this.$refs.printModal.setData(pageData)
|
|
|
+ // 打开预览弹框
|
|
|
+ this.showTipModal = true
|
|
|
+ this.$nextTick(()=>{
|
|
|
+ this.$refs.printModal.setData(pageData)
|
|
|
+ this.spinning = false
|
|
|
+ })
|
|
|
},
|
|
|
onChange (date, dateString) {
|
|
|
this.queryParam.expenseDate = dateString
|