|
|
@@ -23,36 +23,46 @@
|
|
|
<el-col :span="18">
|
|
|
<div class="datascreen">
|
|
|
<!-- <el-input placeholder="可按费用名称、流向、经办人查找" class="input_css" v-model="searchKeyWord" clearable></el-input> -->
|
|
|
- <el-select v-model="warehouseName" filterable placeholder="按仓库筛选" clearable @change="getList1" class="options_css">
|
|
|
+ <el-select v-model="warehouseName" filterable placeholder="按仓库筛选" clearable @change="getList1"
|
|
|
+ class="options_css">
|
|
|
<el-option label="全部仓库" value=""></el-option>
|
|
|
- <el-option v-for="item in warehousNameList" :key="item.id" :label="item.warehouseName" :value="item.warehouseName"></el-option>
|
|
|
+ <el-option v-for="item in warehousNameList" :key="item.id" :label="item.warehouseName"
|
|
|
+ :value="item.warehouseName"></el-option>
|
|
|
</el-select>
|
|
|
- <el-select v-model="costNo" multiple filterable allow-create default-first-option placeholder="按编号筛选" clearable @change="getList1" class="options_css">
|
|
|
+ <el-select v-model="costNo" multiple filterable allow-create default-first-option placeholder="按编号筛选"
|
|
|
+ clearable @change="getList1" class="options_css">
|
|
|
<el-option v-for="item in choiceObj" :key="item.id" :label="item.costNo" :value="item.costNo">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
- <el-select v-model="purpose" multiple filterable allow-create default-first-option placeholder="按用途筛选" clearable @change="getList1" class="options_css">
|
|
|
+ <el-select v-model="purpose" multiple filterable allow-create default-first-option placeholder="按用途筛选"
|
|
|
+ clearable @change="getList1" class="options_css">
|
|
|
<el-option v-for="item in costChoice" :key="item.id" :label="item.name" :value="item.name">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
- <el-select v-model="flowTo" multiple filterable allow-create default-first-option placeholder="按流向筛选" clearable @change="getList1" class="options_css">
|
|
|
+ <el-select v-model="flowTo" multiple filterable allow-create default-first-option placeholder="按流向筛选"
|
|
|
+ clearable @change="getList1" class="options_css">
|
|
|
<el-option v-for="item in flowToList" :key="item.id" :label="item.flowTo" :value="item.flowTo">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
-
|
|
|
- <el-select v-model="expenseName" multiple filterable allow-create default-first-option placeholder="按费用名称筛选" clearable @change="getList1" class="options_css">
|
|
|
- <el-option v-for="item in costNameList" :key="item.id" :label="item.expenseName" :value="item.expenseName">
|
|
|
+
|
|
|
+ <el-select v-model="expenseName" multiple filterable allow-create default-first-option placeholder="按费用名称筛选"
|
|
|
+ clearable @change="getList1" class="options_css">
|
|
|
+ <el-option v-for="item in costNameList" :key="item.id" :label="item.expenseName"
|
|
|
+ :value="item.expenseName">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
- <el-select v-model="unallocatedAmount" multiple filterable allow-create default-first-option placeholder="按未分配金额筛选" clearable @change="getList1" class="options_css">
|
|
|
- <el-option v-for="item in moneyList" :key="item.id" :label="item.unallocatedAmount" :value="item.unallocatedAmount">
|
|
|
+ <el-select v-model="unallocatedAmount" multiple filterable allow-create default-first-option
|
|
|
+ placeholder="按未分配金额筛选" clearable @change="getList1" class="options_css">
|
|
|
+ <el-option v-for="item in moneyList" :key="item.id" :label="item.unallocatedAmount"
|
|
|
+ :value="item.unallocatedAmount">
|
|
|
</el-option>
|
|
|
- </el-select>
|
|
|
- <el-select v-model="agent" multiple filterable allow-create default-first-option placeholder="按经办人筛选" clearable @change="getList1" class="options_css">
|
|
|
+ </el-select>
|
|
|
+ <el-select v-model="agent" multiple filterable allow-create default-first-option placeholder="按经办人筛选"
|
|
|
+ clearable @change="getList1" class="options_css">
|
|
|
<el-option v-for="item in personList" :key="item.id" :label="item.agent" :value="item.agent">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
- <el-select v-model="toExamineType" filterable clearable @change="getList1" class="options_css">
|
|
|
+ <el-select v-model="toExamineType" filterable clearable @change="getList1" class="options_css">
|
|
|
<el-option label="全部状态" value=""></el-option>
|
|
|
<el-option label="待审核" value="1"></el-option>
|
|
|
<el-option label="待付款" value="2"></el-option>
|
|
|
@@ -60,7 +70,8 @@
|
|
|
<!-- <el-select v-model="deptBudgetList.otherPersonPhone" placeholder="请选择其他驻库人员，可选多人" allow-create default-first-option @change="selectstaffOther" multiple filterable clearable>
|
|
|
<el-option v-for="item in optionsOther" :key="item.staffMobilePhone" :label="item.staffName" :value="item.staffMobilePhone" />
|
|
|
</el-select> -->
|
|
|
- <el-button class="find" type="primary" @click="find()"><img width="16" height="16" style="left: -8px" src="../../../public/img/sousuo.png" alt="" /></el-button>
|
|
|
+ <el-button class="find" type="primary" @click="find()"><img width="16" height="16" style="left: -8px"
|
|
|
+ src="../../../public/img/sousuo.png" alt="" /></el-button>
|
|
|
</div>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
@@ -152,9 +163,9 @@
|
|
|
src="../../../public/img/fujian.png" @click="fujian(scope.row)" alt="" />
|
|
|
<span v-if="scope.row.addressUrlArray != null">
|
|
|
{{
|
|
|
- scope.row.addressUrlArray.length == 0
|
|
|
- ? ''
|
|
|
- : scope.row.addressUrlArray.length
|
|
|
+ scope.row.addressUrlArray.length == 0
|
|
|
+ ? ''
|
|
|
+ : scope.row.addressUrlArray.length
|
|
|
}}
|
|
|
</span>
|
|
|
</template>
|
|
|
@@ -164,20 +175,20 @@
|
|
|
<el-table-column prop="status" label="费用状态" width="100">
|
|
|
<template slot-scope="scope">
|
|
|
<span v-if="scope.row.approveStatus">{{
|
|
|
- scope.row.approveStatus
|
|
|
+ scope.row.approveStatus
|
|
|
}}</span><span v-else>{{ scope.row.status }}</span>
|
|
|
<i @click="handlerecord(scope.row)" class="el-icon-s-claim"></i>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="address" label="操作" width="300">
|
|
|
<template slot-scope="scope">
|
|
|
- <el-button v-if="scope.row.expenseName!='保证金抵粮款'" @click="look(scope.row)" type="primary">查看</el-button>
|
|
|
+ <el-button v-if="scope.row.expenseName != '保证金抵粮款'" @click="look(scope.row)" type="primary">查看</el-button>
|
|
|
<div v-hasPermission="`lirunhesuan.feiyongguanli.queshou`" style="display: inline-block">
|
|
|
<el-button v-if="
|
|
|
- scope.row.status == '待确认' &&scope.row.expenseName!='保证金抵粮款'
|
|
|
+ scope.row.status == '待确认' && scope.row.expenseName != '保证金抵粮款'
|
|
|
" @click="shoukuanqueren(scope.row)" type="primary">确认</el-button>
|
|
|
<el-button v-if="
|
|
|
- scope.row.status == '待确认'&&scope.row.expenseName=='保证金抵粮款'
|
|
|
+ scope.row.status == '待确认' && scope.row.expenseName == '保证金抵粮款'
|
|
|
" @click="shoukuanqueren1(scope.row)" type="primary">确认</el-button>
|
|
|
</div>
|
|
|
<!-- <el-button v-if='scope.row.approveStatus=="待确认"' @click="accomplish(scope.row)" type="primary">完成</el-button> -->
|
|
|
@@ -192,8 +203,10 @@
|
|
|
scope.row.status == '已付款' &&
|
|
|
!scope.row.approveStatus)
|
|
|
" @click="accomplish(scope.row)" type="primary">完成</el-button>
|
|
|
- <el-button v-if="scope.row.approveStatus && scope.row.approveStatus !='发起人撤回' " v-show="scope.row.showFlag" @click="withdraw(scope.row)" type="primary">撤回</el-button>
|
|
|
- <el-button v-if="scope.row.status == '已驳回' || scope.row.approveStatus == '发起人撤回'" @click="edit(scope.row)" type="primary">编辑</el-button>
|
|
|
+ <el-button v-if="scope.row.approveStatus && scope.row.approveStatus != '发起人撤回'"
|
|
|
+ v-show="scope.row.showFlag" @click="withdraw(scope.row)" type="primary">撤回</el-button>
|
|
|
+ <el-button v-if="scope.row.status == '已驳回' || scope.row.approveStatus == '发起人撤回'" @click="edit(scope.row)"
|
|
|
+ type="primary">编辑</el-button>
|
|
|
<el-button v-if="
|
|
|
(!scope.row.distributionStatus &&
|
|
|
scope.row.expensesPurpose == 1 &&
|
|
|
@@ -213,9 +226,13 @@
|
|
|
scope.row.unallocatedAmount > 0)
|
|
|
" @click="allot(scope.row)" type="primary">分配</el-button>
|
|
|
<!-- <el-button v-if='scope.row.approveStatus=="已驳回"' @click="del(0,scope.row)" type="primary">删除</el-button> -->
|
|
|
- <el-button v-if='scope.row.status=="已驳回" ||scope.row.approveStatus =="发起人撤回" ' @click="del(0,scope.row)" type="danger">删除</el-button>
|
|
|
- <el-button v-if='scope.row.approveStatus=="待财务审核"||scope.row.approveStatus=="待杜大光审核"||scope.row.approveStatus=="待决策人审核"||scope.row.approveStatus=="待内勤审核"||scope.row.approveStatus=="待单证中心审核"' @click="aduit(scope.row)" type="primary">审核</el-button>
|
|
|
- <el-button v-if='!scope.row.approveStatus&&scope.row.expensesType==2&&scope.row.status=="待付款"' @click="payment(scope.row)" type="primary">付款</el-button>
|
|
|
+ <el-button v-if='scope.row.status == "已驳回" || scope.row.approveStatus == "发起人撤回"' @click="del(0, scope.row)"
|
|
|
+ type="danger">删除</el-button>
|
|
|
+ <el-button
|
|
|
+ v-if='scope.row.approveStatus == "待财务审核" || scope.row.approveStatus == "待杜大光审核" || scope.row.approveStatus == "待决策人审核" || scope.row.approveStatus == "待内勤审核" || scope.row.approveStatus == "待单证中心审核"'
|
|
|
+ @click="aduit(scope.row)" type="primary">审核</el-button>
|
|
|
+ <el-button v-if='!scope.row.approveStatus && scope.row.expensesType == 2 && scope.row.status == "待付款"'
|
|
|
+ @click="payment(scope.row)" type="primary">付款</el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="expenseRemarks" label="分配状态">
|
|
|
@@ -265,11 +282,11 @@
|
|
|
</div>
|
|
|
<div style="width: 33.333%; text-align: center">
|
|
|
{{
|
|
|
- statusdata.expensesType != 1
|
|
|
- ? item.approveResult == 1
|
|
|
- ? '通过'
|
|
|
- : item.approveResult == 0?'驳回':item.dealMsg
|
|
|
- : item.dealMsg
|
|
|
+ statusdata.expensesType != 1
|
|
|
+ ? item.approveResult == 1
|
|
|
+ ? '通过'
|
|
|
+ : item.approveResult == 0 ? '驳回' : item.dealMsg
|
|
|
+ : item.dealMsg
|
|
|
}}
|
|
|
</div>
|
|
|
<div style="width: 33.333%; text-align: right">
|
|
|
@@ -277,10 +294,10 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<div v-if="index < recordList.length - 1" style="width: 100%; text-align: left">
|
|
|
- 审核意见：{{ item.verifyRemark }}
|
|
|
+ 审核意见：{{item.verifyRemark?item.verifyRemark.split('##')[0]:""}}
|
|
|
</div>
|
|
|
<div v-else style="width: 100%; text-align: left">
|
|
|
- 审核意见：{{ item.verifyRemark }}
|
|
|
+ 审核意见：{{item.verifyRemark?item.verifyRemark.split('##')[0]:""}}
|
|
|
</div>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
@@ -288,21 +305,16 @@
|
|
|
<ws-upload ref="upload" @onChange="onChange1" accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .xls, .xlsx"
|
|
|
:comp-id="compId" :appendix-ids="appendixIdss" :size-limit="size" />
|
|
|
</WinseaContentModal>
|
|
|
- <el-dialog
|
|
|
- title="确认保证金抵粮款信息"
|
|
|
- :visible.sync="dialogVisible"
|
|
|
- width="30%"
|
|
|
- :before-close="handleClose">
|
|
|
- <div>
|
|
|
- <ws-upload ref="upload1" accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .xls, .xlsx"
|
|
|
- @onChange="onChange" :comp-id="compId" :appendix-ids="appendixIdss1" :size-limit="size" />
|
|
|
- <span slot="footer" class="dialog-footer">
|
|
|
- <el-button @click="dialogVisible = false">取 消</el-button>
|
|
|
- <el-button type="primary" @click="querenbazheng">确 定</el-button>
|
|
|
- </span>
|
|
|
- </div>
|
|
|
-
|
|
|
-</el-dialog>
|
|
|
+ <el-dialog title="确认保证金抵粮款信息" :visible.sync="dialogVisible" width="30%" :before-close="handleClose">
|
|
|
+ <div>
|
|
|
+ <ws-upload ref="upload1" accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .xls, .xlsx" @onChange="onChange"
|
|
|
+ :comp-id="compId" :appendix-ids="appendixIdss1" :size-limit="size" />
|
|
|
+ <span slot="footer" class="dialog-footer">
|
|
|
+ <el-button @click="dialogVisible = false">取 消</el-button>
|
|
|
+ <el-button type="primary" @click="querenbazheng">确 定</el-button>
|
|
|
+ </span>
|
|
|
+ </div>
|
|
|
+ </el-dialog>
|
|
|
</div>
|
|
|
</template>
|
|
|
<script>
|
|
|
@@ -322,10 +334,11 @@ import {
|
|
|
getcostNo,
|
|
|
editfujian
|
|
|
} from '@/model/profitable/index'
|
|
|
-import { getwarehousName} from '@/model/warehouse/index'
|
|
|
+import { getwarehousName } from '@/model/warehouse/index'
|
|
|
import {
|
|
|
- downloadFile
|
|
|
- } from '@/utils/batchDown'
|
|
|
+ downloadFile
|
|
|
+} from '@/utils/batchDown'
|
|
|
+import { split } from 'lodash'
|
|
|
export default {
|
|
|
components: {
|
|
|
WsUpload,
|
|
|
@@ -338,23 +351,23 @@ export default {
|
|
|
deptBudgetTotal: 0,
|
|
|
currentPage: 1,
|
|
|
pageSize: 10,
|
|
|
- showFlag:false,
|
|
|
+ showFlag: false,
|
|
|
size: 100,
|
|
|
expensesPurpose: '',
|
|
|
recordList: [],
|
|
|
- dialogVisible:false,
|
|
|
- toExamineType:'',
|
|
|
+ dialogVisible: false,
|
|
|
+ toExamineType: '',
|
|
|
compId: localStorage.getItem('ws-pf_compId'),
|
|
|
dialogVisible1: false,
|
|
|
deptCircularPage: {},
|
|
|
searchType: '',
|
|
|
searchKeyWord: '',
|
|
|
costNo: [],//编号
|
|
|
- purpose:[],//用途
|
|
|
- flowTo:[],//流向
|
|
|
- expenseName:[],//费用名称
|
|
|
- unallocatedAmount:[],//未分配金额(元)
|
|
|
- agent:[],//经办人
|
|
|
+ purpose: [],//用途
|
|
|
+ flowTo: [],//流向
|
|
|
+ expenseName: [],//费用名称
|
|
|
+ unallocatedAmount: [],//未分配金额(元)
|
|
|
+ agent: [],//经办人
|
|
|
startDate: '',
|
|
|
endDate: '',
|
|
|
title: '附件',
|
|
|
@@ -362,11 +375,11 @@ export default {
|
|
|
outtotal: 0,
|
|
|
intotal: 0,
|
|
|
fujianshow: false,
|
|
|
- statusdata:{},
|
|
|
+ statusdata: {},
|
|
|
appendixIdss: [],
|
|
|
- appendixIdss1:'',
|
|
|
+ appendixIdss1: '',
|
|
|
approveStatus: false,
|
|
|
- currectdata:{},
|
|
|
+ currectdata: {},
|
|
|
choiceObj: [],
|
|
|
costChoice: [
|
|
|
{
|
|
|
@@ -376,7 +389,7 @@ export default {
|
|
|
{
|
|
|
name: '库点费用',
|
|
|
id: 2
|
|
|
- },
|
|
|
+ },
|
|
|
{
|
|
|
name: '经营性费用',
|
|
|
id: 3
|
|
|
@@ -390,13 +403,13 @@ export default {
|
|
|
id: 5
|
|
|
}
|
|
|
],
|
|
|
- addressUrl:'',
|
|
|
- flowToList:[],
|
|
|
- costNameList:[],
|
|
|
- moneyList:[],
|
|
|
- personList:[],
|
|
|
- warehousNameList:[],
|
|
|
- warehouseName:''
|
|
|
+ addressUrl: '',
|
|
|
+ flowToList: [],
|
|
|
+ costNameList: [],
|
|
|
+ moneyList: [],
|
|
|
+ personList: [],
|
|
|
+ warehousNameList: [],
|
|
|
+ warehouseName: ''
|
|
|
}
|
|
|
},
|
|
|
activated() {
|
|
|
@@ -405,38 +418,38 @@ export default {
|
|
|
this.xiala()
|
|
|
},
|
|
|
methods: {
|
|
|
- async exportFile(){
|
|
|
- let _data = {
|
|
|
- // expenseInfoExportList:this.choiceObj,
|
|
|
- compId: localStorage.getItem('ws-pf_compId'),
|
|
|
- startDate: this.startDate,
|
|
|
- endDate: this.endDate,
|
|
|
- searchKeyWord: this.searchKeyWord,
|
|
|
- currentPage: this.currentPage,
|
|
|
- pageSize: 9999,
|
|
|
- searchType: this.searchType,
|
|
|
- expensesPurpose: this.expensesPurpose,
|
|
|
- costNo:this.costNo.length>0?this.costNo.toString():'',
|
|
|
- purpose:this.purpose.length>0?this.purpose.toString():'',
|
|
|
- expenseName:this.expenseName.length>0?this.expenseName.toString():'',
|
|
|
- unallocatedNumber:this.unallocatedAmount.length>0?this.unallocatedAmount.toString():'',
|
|
|
- agent:this.agent.length>0?this.agent.toString():'',
|
|
|
- flowTo:this.flowTo.length>0?this.flowTo.toString():'',
|
|
|
- warehouseName:this.warehouseName,
|
|
|
- toExamineType:this.toExamineType
|
|
|
- }
|
|
|
- const {
|
|
|
- data
|
|
|
- } = await exportFile(
|
|
|
- _data, {}, {
|
|
|
- responseType: 'blob',
|
|
|
- }
|
|
|
- ).toPromise()
|
|
|
- downloadFile({
|
|
|
- res: data,
|
|
|
- fileName: `费用明细`,
|
|
|
- type: 'xls',
|
|
|
- })
|
|
|
+ async exportFile() {
|
|
|
+ let _data = {
|
|
|
+ // expenseInfoExportList:this.choiceObj,
|
|
|
+ compId: localStorage.getItem('ws-pf_compId'),
|
|
|
+ startDate: this.startDate,
|
|
|
+ endDate: this.endDate,
|
|
|
+ searchKeyWord: this.searchKeyWord,
|
|
|
+ currentPage: this.currentPage,
|
|
|
+ pageSize: 9999,
|
|
|
+ searchType: this.searchType,
|
|
|
+ expensesPurpose: this.expensesPurpose,
|
|
|
+ costNo: this.costNo.length > 0 ? this.costNo.toString() : '',
|
|
|
+ purpose: this.purpose.length > 0 ? this.purpose.toString() : '',
|
|
|
+ expenseName: this.expenseName.length > 0 ? this.expenseName.toString() : '',
|
|
|
+ unallocatedNumber: this.unallocatedAmount.length > 0 ? this.unallocatedAmount.toString() : '',
|
|
|
+ agent: this.agent.length > 0 ? this.agent.toString() : '',
|
|
|
+ flowTo: this.flowTo.length > 0 ? this.flowTo.toString() : '',
|
|
|
+ warehouseName: this.warehouseName,
|
|
|
+ toExamineType: this.toExamineType
|
|
|
+ }
|
|
|
+ const {
|
|
|
+ data
|
|
|
+ } = await exportFile(
|
|
|
+ _data, {}, {
|
|
|
+ responseType: 'blob',
|
|
|
+ }
|
|
|
+ ).toPromise()
|
|
|
+ downloadFile({
|
|
|
+ res: data,
|
|
|
+ fileName: `费用明细`,
|
|
|
+ type: 'xls',
|
|
|
+ })
|
|
|
},
|
|
|
withdraw(row) {
|
|
|
this.$confirm(`撤回成功后，可再次提交，确定撤回吗？`, {
|
|
|
@@ -454,7 +467,7 @@ export default {
|
|
|
})
|
|
|
})
|
|
|
},
|
|
|
- xiala(){
|
|
|
+ xiala() {
|
|
|
//仓库筛选
|
|
|
getwarehousName({
|
|
|
compId: localStorage.getItem('ws-pf_compId'),
|
|
|
@@ -463,8 +476,8 @@ export default {
|
|
|
.then((response) => {
|
|
|
this.warehousNameList = response
|
|
|
})
|
|
|
- //搜索框下拉数据
|
|
|
- getcostNo({
|
|
|
+ //搜索框下拉数据
|
|
|
+ getcostNo({
|
|
|
compId: localStorage.getItem('ws-pf_compId'),
|
|
|
// currentPage: 1,
|
|
|
// pageSize: 9999,
|
|
|
@@ -473,21 +486,21 @@ export default {
|
|
|
.then((response) => {
|
|
|
this.choiceObj = response
|
|
|
})
|
|
|
- //流向
|
|
|
- getXialaList({
|
|
|
+ //流向
|
|
|
+ getXialaList({
|
|
|
removeRepeatFlag: 1,
|
|
|
})
|
|
|
.toPromise()
|
|
|
.then((response) => {
|
|
|
this.flowToList = response
|
|
|
- for(let i = 0 ;i<this.flowToList.length;i++){
|
|
|
- if(this.flowToList[i].expensesPurpose == 3){
|
|
|
+ for (let i = 0; i < this.flowToList.length; i++) {
|
|
|
+ if (this.flowToList[i].expensesPurpose == 3) {
|
|
|
this.flowToList[i].flowTo = this.flowToList[i].warehouseName
|
|
|
- }else if(this.flowToList[i].expensesPurpose == 1){
|
|
|
+ } else if (this.flowToList[i].expensesPurpose == 1) {
|
|
|
this.flowToList[i].flowTo = this.flowToList[i].contractNo
|
|
|
- }else if(this.flowToList[i].expensesPurpose == 5){
|
|
|
+ } else if (this.flowToList[i].expensesPurpose == 5) {
|
|
|
this.flowToList[i].flowTo = '中天昊元'
|
|
|
- }else if(this.flowToList[i].expensesPurpose == 2){
|
|
|
+ } else if (this.flowToList[i].expensesPurpose == 2) {
|
|
|
this.flowToList[i].flowTo = this.flowToList[i].contractNo
|
|
|
}
|
|
|
}
|
|
|
@@ -500,16 +513,16 @@ export default {
|
|
|
.then((response) => {
|
|
|
this.costNameList = response
|
|
|
})
|
|
|
- //未分配金额
|
|
|
- getXialaList({
|
|
|
+ //未分配金额
|
|
|
+ getXialaList({
|
|
|
removeRepeatFlag: 3,
|
|
|
})
|
|
|
.toPromise()
|
|
|
.then((response) => {
|
|
|
this.moneyList = response
|
|
|
})
|
|
|
- //经办人
|
|
|
- getXialaList({
|
|
|
+ //经办人
|
|
|
+ getXialaList({
|
|
|
removeRepeatFlag: 4,
|
|
|
})
|
|
|
.toPromise()
|
|
|
@@ -518,64 +531,64 @@ export default {
|
|
|
})
|
|
|
|
|
|
},
|
|
|
- querenbazheng(){
|
|
|
- if(this.addressUrl){
|
|
|
- this.currectdata.addressUrl=this.currectdata.addressUrl+','+this.addressUrl
|
|
|
- }
|
|
|
- this.currectdata.flag=7
|
|
|
- console.log(this.addressUrl,this.currectdata)
|
|
|
- editexenseinfo(this.currectdata)
|
|
|
- .toPromise()
|
|
|
- .then((response) => {
|
|
|
- this.$message({
|
|
|
- message: '提交成功!',
|
|
|
- type: 'success',
|
|
|
+ querenbazheng() {
|
|
|
+ if (this.addressUrl) {
|
|
|
+ this.currectdata.addressUrl = this.currectdata.addressUrl + ',' + this.addressUrl
|
|
|
+ }
|
|
|
+ this.currectdata.flag = 7
|
|
|
+ console.log(this.addressUrl, this.currectdata)
|
|
|
+ editexenseinfo(this.currectdata)
|
|
|
+ .toPromise()
|
|
|
+ .then((response) => {
|
|
|
+ this.$message({
|
|
|
+ message: '提交成功!',
|
|
|
+ type: 'success',
|
|
|
+ })
|
|
|
+ this.dialogVisible = false
|
|
|
+ this.getList()
|
|
|
+ // this.$router.go(-1)
|
|
|
})
|
|
|
- this.dialogVisible=false
|
|
|
- this.getList()
|
|
|
- // this.$router.go(-1)
|
|
|
- })
|
|
|
},
|
|
|
- getList1(){
|
|
|
+ getList1() {
|
|
|
console.log(this.toExamineType)
|
|
|
- this.currentPage=1
|
|
|
+ this.currentPage = 1
|
|
|
this.getList()
|
|
|
},
|
|
|
onChange() {
|
|
|
- this.$refs.upload1
|
|
|
- .handleSaveBill()
|
|
|
- .then(async response => {
|
|
|
- this.addressUrl = response
|
|
|
- })
|
|
|
- .catch(res => {
|
|
|
- EventBus.$emit('error', (JSON.parse(res) || {}).message)
|
|
|
- this.$refs.upload1.clearFiles()
|
|
|
- })
|
|
|
- },
|
|
|
- onChange1() {
|
|
|
- this.$refs.upload
|
|
|
- .handleSaveBill()
|
|
|
- .then(async (response) => {
|
|
|
- editfujian({addressUrl:response,id:this.id})
|
|
|
- .toPromise()
|
|
|
- .then((response) => {
|
|
|
- this.fujianshow = false
|
|
|
- this.$message.success('上传成功')
|
|
|
- this.getList()
|
|
|
- })
|
|
|
- })
|
|
|
- .catch((res) => {
|
|
|
- EventBus.$emit('error', (JSON.parse(res) || {}).message)
|
|
|
- this.$refs.upload.clearFiles()
|
|
|
- })
|
|
|
- },
|
|
|
+ this.$refs.upload1
|
|
|
+ .handleSaveBill()
|
|
|
+ .then(async response => {
|
|
|
+ this.addressUrl = response
|
|
|
+ })
|
|
|
+ .catch(res => {
|
|
|
+ EventBus.$emit('error', (JSON.parse(res) || {}).message)
|
|
|
+ this.$refs.upload1.clearFiles()
|
|
|
+ })
|
|
|
+ },
|
|
|
+ onChange1() {
|
|
|
+ this.$refs.upload
|
|
|
+ .handleSaveBill()
|
|
|
+ .then(async (response) => {
|
|
|
+ editfujian({ addressUrl: response, id: this.id })
|
|
|
+ .toPromise()
|
|
|
+ .then((response) => {
|
|
|
+ this.fujianshow = false
|
|
|
+ this.$message.success('上传成功')
|
|
|
+ this.getList()
|
|
|
+ })
|
|
|
+ })
|
|
|
+ .catch((res) => {
|
|
|
+ EventBus.$emit('error', (JSON.parse(res) || {}).message)
|
|
|
+ this.$refs.upload.clearFiles()
|
|
|
+ })
|
|
|
+ },
|
|
|
handlerecord(row) {
|
|
|
if (row.expensesType == 1) {
|
|
|
this.title1 = '收款审核记录'
|
|
|
} else {
|
|
|
this.title1 = '请款审核记录'
|
|
|
}
|
|
|
- this.statusdata=row
|
|
|
+ this.statusdata = row
|
|
|
getAuditRecord({ id: row.id, workflowId: row.workflowId })
|
|
|
.toPromise()
|
|
|
.then((response) => {
|
|
|
@@ -594,8 +607,8 @@ export default {
|
|
|
this.id = row.id
|
|
|
|
|
|
// if (row.addressUrl) {
|
|
|
- this.appendixIdss = row.addressUrl
|
|
|
- this.fujianshow = true
|
|
|
+ this.appendixIdss = row.addressUrl
|
|
|
+ this.fujianshow = true
|
|
|
// } else {
|
|
|
// this.$message({
|
|
|
// message: '暂无附件查看!',
|
|
|
@@ -760,9 +773,9 @@ export default {
|
|
|
})
|
|
|
}
|
|
|
},
|
|
|
- shoukuanqueren1(row){
|
|
|
- this.currectdata=row
|
|
|
- this.dialogVisible=true
|
|
|
+ shoukuanqueren1(row) {
|
|
|
+ this.currectdata = row
|
|
|
+ this.dialogVisible = true
|
|
|
},
|
|
|
aduit(row) {
|
|
|
if (row.taskId) {
|
|
|
@@ -785,7 +798,7 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
allotaduit(row) {
|
|
|
- var role=allRoles()
|
|
|
+ var role = allRoles()
|
|
|
if (role.roleName.indexOf('单证中心主任') != -1) {
|
|
|
localStorage.setItem(
|
|
|
'expenseqr',
|
|
|
@@ -860,7 +873,7 @@ export default {
|
|
|
}
|
|
|
this.startDate = year + '-' + month + '-' + strDate
|
|
|
this.endDate = year1 + '-' + month1 + '-' + strDate1
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
this.startDate = localStorage.getItem('startDate')
|
|
|
this.endDate = localStorage.getItem('endDate')
|
|
|
}
|
|
|
@@ -880,14 +893,14 @@ export default {
|
|
|
pageSize: this.pageSize,
|
|
|
searchType: this.searchType,
|
|
|
expensesPurpose: this.expensesPurpose,
|
|
|
- costNo:this.costNo.length>0?this.costNo.toString():'',
|
|
|
- purpose:this.purpose.length>0?this.purpose.toString():'',
|
|
|
- expenseName:this.expenseName.length>0?this.expenseName.toString():'',
|
|
|
- unallocatedNumber:this.unallocatedAmount.length>0?this.unallocatedAmount.toString():'',
|
|
|
- agent:this.agent.length>0?this.agent.toString():'',
|
|
|
- flowTo:this.flowTo.length>0?this.flowTo.toString():'',
|
|
|
- warehouseName:this.warehouseName,
|
|
|
- toExamineType:this.toExamineType,
|
|
|
+ costNo: this.costNo.length > 0 ? this.costNo.toString() : '',
|
|
|
+ purpose: this.purpose.length > 0 ? this.purpose.toString() : '',
|
|
|
+ expenseName: this.expenseName.length > 0 ? this.expenseName.toString() : '',
|
|
|
+ unallocatedNumber: this.unallocatedAmount.length > 0 ? this.unallocatedAmount.toString() : '',
|
|
|
+ agent: this.agent.length > 0 ? this.agent.toString() : '',
|
|
|
+ flowTo: this.flowTo.length > 0 ? this.flowTo.toString() : '',
|
|
|
+ warehouseName: this.warehouseName,
|
|
|
+ toExamineType: this.toExamineType,
|
|
|
})
|
|
|
.toPromise()
|
|
|
.then((response) => {
|
|
|
@@ -928,7 +941,7 @@ export default {
|
|
|
},
|
|
|
pickerOptions() { },
|
|
|
find() {
|
|
|
- this.currentPage=1
|
|
|
+ this.currentPage = 1
|
|
|
this.getList()
|
|
|
},
|
|
|
handleSizeChange(val) {
|
|
|
@@ -1026,7 +1039,8 @@ export default {
|
|
|
.bg-right {
|
|
|
padding-top: 15px;
|
|
|
}
|
|
|
-.options_css{
|
|
|
- margin:0 5px;
|
|
|
+
|
|
|
+.options_css {
|
|
|
+ margin: 0 5px;
|
|
|
}
|
|
|
</style>
|
