From e95f985e2dc8178d777074dd43b4dea5658eecdf Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期日, 17 十二月 2023 13:06:46 +0800
Subject: [PATCH] yxh：报销专家账号维护
---
src/views/project/donationdetails/index.vue | 1
src/views/project/fund/performancedetails/index.vue | 609 +++-----
src/views/project/fund/applyDetail/index.vue | 1843 ++++++++-------------------
src/views/project/fund/expertFeeApply/index.vue | 3
src/views/project/fund/ethicalExpertFeeApply/index.vue | 771 ++--------
src/views/project/fund/medicalCostApply/index.vue | 4
src/views/project/travelexpenseapply/travelexpensedetail/index.vue | 6
src/views/project/donatebaseinfo/index.vue | 559 +------
src/views/project/externalperson/index.vue | 8
src/views/project/fund/officeExpenseApply/index.vue | 4
src/views/project/fund/performanceApply/index.vue | 247 --
11 files changed, 1,103 insertions(+), 2,952 deletions(-)
diff --git a/src/views/project/donatebaseinfo/index.vue b/src/views/project/donatebaseinfo/index.vue
index 7b7b5d9..a582e79 100644
--- a/src/views/project/donatebaseinfo/index.vue
+++ b/src/views/project/donatebaseinfo/index.vue
@@ -1,63 +1,31 @@
<template>
<div class="app-container">
- <el-form
- :model="queryParams"
- ref="queryForm"
- :inline="true"
- v-show="showSearch"
- label-width="70px"
- >
+ <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="70px">
<el-row :gutter="8">
<el-col :span="5">
<el-form-item label="濮撳悕" prop="name">
- <el-input
- v-model="queryParams.name"
- placeholder="璇疯緭鍏ュ鍚�"
- clearable
- size="small"
- @keyup.enter.native="handleQuery"
- />
+ <el-input v-model="queryParams.name" placeholder="璇疯緭鍏ュ鍚�" clearable size="small"
+ @keyup.enter.native="handleQuery" />
</el-form-item>
</el-col>
<el-col :span="5">
- <el-form-item
- align="left"
- label="鍖荤枟鏈烘瀯"
- prop="treatmenthospitalname"
- >
- <org-selecter
- ref="orgSelecter"
- :org-type="'3'"
- v-model="queryParams.treatmenthospitalno"
- @keyup.enter.native="handleQuery"
- />
+ <el-form-item align="left" label="鍖荤枟鏈烘瀯" prop="treatmenthospitalname">
+ <org-selecter ref="orgSelecter" :org-type="'3'" v-model="queryParams.treatmenthospitalno"
+ @keyup.enter.native="handleQuery" />
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="鎹愮尞鍦板競">
<el-select v-model="queryParams.city" placeholder="璇烽�夋嫨鍦板競">
- <el-option
- v-for="item in provinceData"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
+ <el-option v-for="item in provinceData" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
- </el-col>
+ </el-col>
<el-col :span="9">
<el-form-item label="鏃ユ湡">
- <el-date-picker
- style="width: 100%"
- v-model="selecttime"
- type="monthrange"
- range-separator="鑷�"
- start-placeholder="寮�濮嬫湀浠�"
- end-placeholder="缁撴潫鏈堜唤"
- value-format="yyyy-MM-dd"
- @change="getTimeList"
- >
+ <el-date-picker style="width: 100%" v-model="selecttime" type="monthrange" range-separator="鑷�"
+ start-placeholder="寮�濮嬫湀浠�" end-placeholder="缁撴潫鏈堜唤" value-format="yyyy-MM-dd" @change="getTimeList">
</el-date-picker>
</el-form-item>
</el-col>
@@ -65,33 +33,16 @@
<el-row :gutter="8">
<el-col :span="5">
<el-form-item label="鎹愮尞杩涘害" prop="recordstate">
- <el-select
- v-model="queryParams.recordstate"
- placeholder="璇烽�夋嫨褰撳墠杩涘害"
- clearable
- size="small"
- >
- <el-option
- v-for="dict in dict.type.sys_DonationStatus"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
+ <el-select v-model="queryParams.recordstate" placeholder="璇烽�夋嫨褰撳墠杩涘害" clearable size="small">
+ <el-option v-for="dict in dict.type.sys_DonationStatus" :key="dict.value" :label="dict.label"
+ :value="dict.value" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="鎶ュ憡浜�">
- <el-select
- v-model="queryParams.reporterno"
- placeholder="璇烽�夋嫨鎶ュ憡浜�"
- >
- <el-option
- v-for="item in reportlist"
- :key="item.index"
- :label="item.reportername"
- :value="item.reporterno"
- >
+ <el-select v-model="queryParams.reporterno" placeholder="璇烽�夋嫨鎶ュ憡浜�">
+ <el-option v-for="item in reportlist" :key="item.index" :label="item.reportername" :value="item.reporterno">
</el-option>
</el-select>
</el-form-item>
@@ -99,40 +50,22 @@
<el-col :span="9">
<el-form-item label="绫嶈疮">
<div>
- <li_area_select
- ref="areaSelect"
- v-model="searchAddress"
- ></li_area_select>
+ <li_area_select ref="areaSelect" v-model="searchAddress"></li_area_select>
</div>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item>
- <el-button
- type="primary"
- icon="el-icon-search"
- size="mini"
- @click="handleQuery"
- >鎼滅储</el-button
- >
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
- >閲嶇疆</el-button
- >
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-plus"
- size="mini"
- @click="handleAdd"
- v-hasPermi="['project:donatebaseinfo:add']"
- >鏂板</el-button
- >
+ <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+ v-hasPermi="['project:donatebaseinfo:add']">鏂板</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-button
@@ -148,38 +81,17 @@
</el-col> -->
<el-col :span="1.5">
- <el-button
- type="warning"
- plain
- icon="el-icon-download"
- size="mini"
- :loading="exportLoading"
- @click="handleExport"
- v-hasPermi="['project:donatebaseinfo:export']"
- >瀵煎嚭</el-button
- >
+ <el-button type="warning" plain icon="el-icon-download" size="mini" :loading="exportLoading" @click="handleExport"
+ v-hasPermi="['project:donatebaseinfo:export']">瀵煎嚭</el-button>
</el-col>
- <right-toolbar
- :showSearch.sync="showSearch"
- @queryTable="getList"
- ></right-toolbar>
+ <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
- <el-table
- v-loading="loading"
- :data="donatebaseinfoList"
- @selection-change="handleSelectionChange"
- border
- :default-sort="{ prop: 'reporttime', order: 'descending' }"
- >
+ <el-table v-loading="loading" :data="donatebaseinfoList" @selection-change="handleSelectionChange" border
+ :default-sort="{ prop: 'reporttime', order: 'descending' }">
<!-- <el-table-column label="鎶ュ憡鏃堕棿" align="center" prop="id" /> -->
<!-- <el-table-column type="selection" width="55" align="center" /> -->
- <el-table-column
- label="鏃堕棿"
- align="center"
- prop="reporttime"
- width="100"
- >
+ <el-table-column label="鏃堕棿" align="center" prop="reporttime" width="100">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.reporttime, "{y}-{m}-{d}") }}</span>
</template>
@@ -188,32 +100,23 @@
<el-table-column label="濮撳悕" align="center" prop="name" width="100" />
<el-table-column label="鎬у埆" align="center" prop="sex" width="100">
<template slot-scope="scope">
- <dict-tag
- :options="dict.type.sys_user_sex"
- :value="parseInt(scope.row.sex)"
- />
+ <dict-tag :options="dict.type.sys_user_sex" :value="parseInt(scope.row.sex)" />
</template>
</el-table-column>
<el-table-column label="骞撮緞" align="center" prop="age" width="100" />
- <el-table-column
- label="鍖荤枟鏈烘瀯"
- align="center"
- prop="treatmenthospitalname"
- />
+ <el-table-column label="鍖荤枟鏈烘瀯" align="center" prop="treatmenthospitalname" />
<el-table-column label="琛�鍨�" align="center" prop="bloodtype" width="100">
<template slot-scope="scope">
- <dict-tag
- :options="dict.type.sys_BloodType"
- :value="scope.row.bloodtype"
- />
+ <dict-tag :options="dict.type.sys_BloodType" :value="scope.row.bloodtype" />
</template>
- </el-table-column>
- <el-table-column
- label="鎶ュ憡浜�"
- align="center"
- prop="reportername"
- width="100"
- />
+ </el-table-column>
+
+ <el-table-column label="鎹愮尞绫诲埆" align="center" prop="donationcategory" width="150">
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.sys_DonationCategory" :value="scope.row.donationcategory" />
+ </template>
+ </el-table-column>
+ <el-table-column label="鎶ュ憡浜�" align="center" prop="reportername" width="100" />
<!--
<el-table-column
label="鐜版墍鍦ㄥ湴甯�"
@@ -235,41 +138,22 @@
</template>
</el-table-column>
-->
- <el-table-column
- label="鎹愮尞杩涘害"
- align="center"
- prop="workflow"
- width="120"
- >
+ <el-table-column label="鎹愮尞杩涘害" align="center" prop="workflow" width="120">
<template slot-scope="scope">
- <dict-tag
- :options="dict.type.sys_donornode"
- :value="scope.row.workflow"
- />
+ <dict-tag :options="dict.type.sys_donornode" :value="scope.row.workflow" />
</template>
- </el-table-column>
- <el-table-column
- label="鎿嶄綔"
- align="center"
- class-name="small-padding fixed-width"
- fixed="right"
- >
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width" fixed="right">
<template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['project:donatebaseinfo:edit']"
- >璇︽儏</el-button
- >
+ <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+ v-hasPermi="['project:donatebaseinfo:edit']">璇︽儏</el-button>
<el-button v-if="scope.row.recordstate == 0" size="mini" type="text" icon="el-icon-delete"
@click="handleDelete(scope.row)" v-hasPermi="['project:donatebaseinfo:remove']">鍒犻櫎</el-button>
<!--
<el-button v-if="scope.row.recordstate == 0 || scope.row.recordstate == 3" size="mini" type="text"
icon="el-icon-thumb" @click="handleapproval(scope.row)">鎻愪氦</el-button>
-->
- <el-button size="mini" type="text" icon="el-icon-refrigerator" @click="handledownload(scope.row)">涓嬭浇</el-button>
+ <el-button size="mini" type="text" icon="el-icon-refrigerator" @click="handledownload(scope.row)">涓嬭浇</el-button>
<!--
<el-button size="mini" type="text" icon="el-icon-edit" @click="handletermination(scope.row)"
v-hasPermi="['project:donatebaseinfo:edit']">{{ scope.row.recordstate == 99 ? "鎭㈠": "缁堟" }}</el-button>
@@ -277,35 +161,16 @@
</template>
</el-table-column>
</el-table>
- <pagination
- v-show="total > 0"
- :total="total"
- :page.sync="queryParams.pageNum"
- :limit.sync="queryParams.pageSize"
- @pagination="getList"
- />
+ <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+ @pagination="getList" />
<!-- 娣诲姞鎴栦慨鏀规崘鐚熀纭�瀵硅瘽妗� -->
- <el-dialog
- :title="title"
- align="center"
- :visible.sync="open"
- :close-on-click-modal="false"
- width="1100px"
- >
- <el-form
- ref="form"
- :model="form"
- :rules="rules"
- label-width="130px"
- label-position="right"
- >
- <div
- style="
+ <el-dialog :title="title" align="center" :visible.sync="open" :close-on-click-modal="false" width="1100px">
+ <el-form ref="form" :model="form" :rules="rules" label-width="130px" label-position="right">
+ <div style="
border-bottom: 1px solid #ddd;
border-top: 1px solid #ddd;
padding-right: 60px;
- "
- >
+ ">
<el-row style="margin-top: 40px">
<el-col :span="8">
<el-form-item label="鎹愮尞缂栧彿" prop="donorno">
@@ -313,24 +178,13 @@
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item
- align="left"
- label="鍖荤枟鏈烘瀯"
- prop="treatmenthospitalno"
- >
- <org-selecter
- ref="addOrgSelect"
- :org-type="'3'"
- v-model="form.treatmenthospitalno"
- />
+ <el-form-item align="left" label="鍖荤枟鏈烘瀯" prop="treatmenthospitalno">
+ <org-selecter ref="addOrgSelect" :org-type="'3'" v-model="form.treatmenthospitalno" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="绉戝" prop="treatmentdeptno">
- <el-input
- v-model="form.treatmentdeptname"
- placeholder="璇疯緭鍏ョ瀹�"
- />
+ <el-input v-model="form.treatmentdeptname" placeholder="璇疯緭鍏ョ瀹�" />
</el-form-item>
</el-col>
</el-row>
@@ -343,12 +197,8 @@
<el-col :span="6">
<el-form-item label="姘戞棌" prop="nation">
<el-select v-model="form.nation" placeholder="璇烽�夋嫨姘戞棌">
- <el-option
- v-for="dict in dict.type.sys_nation"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
+ <el-option v-for="dict in dict.type.sys_nation" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -366,40 +216,23 @@
<el-row>
<el-col :span="6">
<el-form-item label="璇佷欢绫诲瀷" prop="idcardtype">
- <el-select
- v-model="form.idcardtype"
- placeholder="璇烽�夋嫨璇佷欢绫诲瀷"
- >
- <el-option
- v-for="dict in dict.type.sys_IDType"
- :key="dict.value"
- :label="dict.label"
- :value="parseInt(dict.value)"
- ></el-option>
+ <el-select v-model="form.idcardtype" placeholder="璇烽�夋嫨璇佷欢绫诲瀷">
+ <el-option v-for="dict in dict.type.sys_IDType" :key="dict.value" :label="dict.label"
+ :value="parseInt(dict.value)"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="璇佷欢鍙风爜" prop="idcardno">
- <el-input
- style="width: 174px"
- ref="updateBSvalue"
- class="sfzcode"
- v-model="form.idcardno"
- placeholder="璇疯緭鍏ヨ瘉浠跺彿鐮�"
- @blur="updateMessage"
- />
+ <el-input style="width: 174px" ref="updateBSvalue" class="sfzcode" v-model="form.idcardno"
+ placeholder="璇疯緭鍏ヨ瘉浠跺彿鐮�" @blur="updateMessage" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="鎬у埆" prop="sex">
<el-select v-model="form.sex" placeholder="璇疯緭鍏ユ�у埆">
- <el-option
- v-for="dict in dict.type.sys_user_sex"
- :key="dict.label"
- :label="dict.label"
- :value="parseInt(dict.value)"
- ></el-option>
+ <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.label" :label="dict.label"
+ :value="parseInt(dict.value)"></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -412,39 +245,24 @@
<el-row>
<el-col :span="6">
<el-form-item label="鍑虹敓鏃ユ湡" prop="birthday">
- <el-date-picker
- clearable
- size="small"
- v-model="form.birthday"
- type="date"
- style="width: 174px"
- value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="閫夋嫨鍑虹敓鏃ユ湡"
- >
+ <el-date-picker clearable size="small" v-model="form.birthday" type="date" style="width: 174px"
+ value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨鍑虹敓鏃ユ湡">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="鑱屼笟" prop="occupation">
<el-select v-model="form.occupation" placeholder="璇烽�夋嫨鑱屼笟">
- <el-option
- v-for="dict in dict.type.sys_occupation"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
+ <el-option v-for="dict in dict.type.sys_occupation" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="瀛﹀巻" prop="education">
<el-select v-model="form.education" placeholder="璇烽�夋嫨瀛﹀巻">
- <el-option
- v-for="dict in dict.type.sys_education"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
+ <el-option v-for="dict in dict.type.sys_education" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -453,19 +271,13 @@
<el-col :span="12">
<el-form-item label="浣忓潃" prop="residenceaddress">
<div>
- <li_area_select
- ref="residenceSelect"
- v-model="residenceAddresss"
- ></li_area_select>
+ <li_area_select ref="residenceSelect" v-model="residenceAddresss"></li_area_select>
<!-- <div>{{defultAddress}}</div> -->
</div>
</el-form-item>
</el-col>
<el-col :span="11" :push="1">
- <el-input
- v-model="form.residenceaddress"
- placeholder="璇疯緭鍏ュ唴瀹�"
- />
+ <el-input v-model="form.residenceaddress" placeholder="璇疯緭鍏ュ唴瀹�" />
</el-col>
</el-row>
@@ -473,30 +285,22 @@
<el-col :span="12">
<el-form-item label="鐜版墍鍦ㄥ湴" prop="registeraddress">
<div>
- <li_area_select
- ref="registerSelect"
- v-model="registerAddresss"
- ></li_area_select>
+ <li_area_select ref="registerSelect" v-model="registerAddresss"></li_area_select>
<!-- <div>{{defultAddress}}</div> -->
</div>
</el-form-item>
</el-col>
<el-col :span="11" :push="1">
- <el-input
- v-model="form.registeraddress"
- placeholder="璇疯緭鍏ュ唴瀹�"
- />
+ <el-input v-model="form.registeraddress" placeholder="璇疯緭鍏ュ唴瀹�" />
</el-col>
</el-row>
</div>
- <div
- style="
+ <div style="
border-bottom: 1px solid #ddd;
margin-top: 20px;
padding-right: 60px;
- "
- >
+ ">
<el-row>
<el-col :span="8">
<el-form-item label="浣忛櫌鍙�" prop="inpatientno">
@@ -505,10 +309,7 @@
</el-col>
<el-col :span="16">
<el-form-item label="鐤剧梾璇婃柇" prop="diagnosisname">
- <el-input
- v-model="form.diagnosisname"
- placeholder="璇疯緭鍏ョ柧鐥呰瘖鏂悕绉�"
- />
+ <el-input v-model="form.diagnosisname" placeholder="璇疯緭鍏ョ柧鐥呰瘖鏂悕绉�" />
</el-form-item>
</el-col>
</el-row>
@@ -516,24 +317,16 @@
<el-col :span="12">
<el-form-item align="left" label="琛�鍨�" prop="bloodtype">
<el-radio-group v-model="form.bloodtype">
- <el-radio
- v-for="dict in dict.type.sys_BloodType"
- :key="dict.value"
- :label="dict.value"
- >{{ dict.label }}</el-radio
- >
+ <el-radio v-for="dict in dict.type.sys_BloodType" :key="dict.value" :label="dict.value">{{ dict.label
+ }}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12" :pull="1">
<el-form-item label="Rh(D)" align="left" prop="rhyin">
<el-radio-group v-model="form.rhyin">
- <el-radio
- v-for="dict in dict.type.sys_bloodtype_rhd"
- :key="dict.value"
- :label="dict.value"
- >{{ dict.label }}</el-radio
- >
+ <el-radio v-for="dict in dict.type.sys_bloodtype_rhd" :key="dict.value" :label="dict.value">{{
+ dict.label }}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@@ -541,31 +334,20 @@
<el-row>
<el-form-item label="鐤剧梾绫诲瀷" align="left">
<el-checkbox-group v-model="form.diseasetype">
- <el-checkbox
- v-for="dict in dict.type.sys_DiseaseType"
- :key="dict.value"
- :label="dict.value"
- >
+ <el-checkbox v-for="dict in dict.type.sys_DiseaseType" :key="dict.value" :label="dict.value">
{{ dict.label }}
</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item label="鍏朵粬" prop="diseasetypeOther">
- <el-input
- v-model="form.diseasetypeOther"
- placeholder="璇疯緭鍏ュ叾浠�"
- />
+ <el-input v-model="form.diseasetypeOther" placeholder="璇疯緭鍏ュ叾浠�" />
</el-form-item>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item align="left" label="浼犳煋鐥�">
<el-checkbox-group v-model="form.infectious">
- <el-checkbox
- v-for="dict in dict.type.sys_Infectious"
- :key="dict.value"
- :label="dict.value"
- >
+ <el-checkbox v-for="dict in dict.type.sys_Infectious" :key="dict.value" :label="dict.value">
{{ dict.label }}
</el-checkbox>
</el-checkbox-group>
@@ -573,10 +355,7 @@
</el-col>
<el-col :span="12">
<el-form-item align="left" label="鍏朵粬" prop="infectiousOther">
- <el-input
- v-model="form.infectiousOther"
- placeholder="璇疯緭鍏ュ叾浠�"
- />
+ <el-input v-model="form.infectiousOther" placeholder="璇疯緭鍏ュ叾浠�" />
</el-form-item>
</el-col>
</el-row>
@@ -584,11 +363,7 @@
<el-col :span="9">
<el-form-item align="left" label="鐥呬汉鐘跺喌">
<el-checkbox-group v-model="form.patientstate">
- <el-checkbox
- v-for="dict in dict.type.sys_patientstate"
- :key="dict.value"
- :label="dict.value"
- >
+ <el-checkbox v-for="dict in dict.type.sys_patientstate" :key="dict.value" :label="dict.value">
{{ dict.label }}
</el-checkbox>
</el-checkbox-group>
@@ -597,11 +372,7 @@
<el-col :span="15" align="left">
<el-form-item label="鍏朵粬鎯呭喌">
<el-checkbox-group v-model="form.othercases">
- <el-checkbox
- v-for="dict in dict.type.sys_OtherCases"
- :key="dict.value"
- :label="dict.value"
- >
+ <el-checkbox v-for="dict in dict.type.sys_OtherCases" :key="dict.value" :label="dict.value">
{{ dict.label }}
</el-checkbox>
</el-checkbox-group>
@@ -610,29 +381,18 @@
</el-row>
</div>
- <div
- style="
+ <div style="
border-bottom: 1px solid #ddd;
padding-right: 60px;
margin-top: 20px;
- "
- >
+ ">
<el-row>
<div display="flex">
<el-row>
<el-col :span="12">
- <el-form-item
- label="浜插睘鐘跺喌"
- prop="kinship"
- class="relation"
- align="left"
- >
+ <el-form-item label="浜插睘鐘跺喌" prop="kinship" class="relation" align="left">
<el-checkbox-group v-model="form.kinship">
- <el-checkbox
- v-for="dict in dict.type.sys_Kinship"
- :key="dict.value"
- :label="dict.value"
- >
+ <el-checkbox v-for="dict in dict.type.sys_Kinship" :key="dict.value" :label="dict.value">
{{ dict.label }}
</el-checkbox>
</el-checkbox-group>
@@ -640,10 +400,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="鍏朵粬" prop="kinshipOther">
- <el-input
- v-model="form.kinshipOther"
- placeholder="璇疯緭鍏ュ叾浠�"
- />
+ <el-input v-model="form.kinshipOther" placeholder="璇疯緭鍏ュ叾浠�" />
</el-form-item>
</el-col>
</el-row>
@@ -653,11 +410,7 @@
<el-col :span="24">
<el-form-item align="left" label="鏈汉鎰忔効 ">
<el-checkbox-group v-model="form.selfwill">
- <el-checkbox
- v-for="dict in dict.type.sys_SelfWill"
- :key="dict.value"
- :label="dict.value"
- >
+ <el-checkbox v-for="dict in dict.type.sys_SelfWill" :key="dict.value" :label="dict.value">
{{ dict.label }}
</el-checkbox>
</el-checkbox-group>
@@ -667,24 +420,14 @@
<el-row>
<el-col :span="12">
<el-form-item label="涓昏浜插睘" prop="majorrelatives">
- <el-input
- v-model="form.majorrelatives"
- placeholder="璇疯緭鍏ヤ富瑕佷翰灞�"
- />
+ <el-input v-model="form.majorrelatives" placeholder="璇疯緭鍏ヤ富瑕佷翰灞�" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="涓庢崘璧犺�呭叧绯�" prop="familyrelations">
- <el-select
- v-model="form.familyrelations"
- placeholder="璇烽�夋嫨涓庢崘璧犺�呭叧绯�"
- >
- <el-option
- v-for="dict in dict.type.sys_FamilyRelation"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
+ <el-select v-model="form.familyrelations" placeholder="璇烽�夋嫨涓庢崘璧犺�呭叧绯�">
+ <el-option v-for="dict in dict.type.sys_FamilyRelation" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -693,11 +436,7 @@
<el-col :span="12">
<el-form-item align="left" label="淇℃伅鏉ユ簮">
<el-checkbox-group v-model="form.infosources">
- <el-checkbox
- v-for="dict in dict.type.sys_InfoSources"
- :key="dict.value"
- :label="dict.value"
- >
+ <el-checkbox v-for="dict in dict.type.sys_InfoSources" :key="dict.value" :label="dict.value">
{{ dict.label }}
</el-checkbox>
</el-checkbox-group>
@@ -705,10 +444,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="鍏朵粬" prop="infosourcesOther">
- <el-input
- v-model="form.infosourcesOther"
- placeholder="璇疯緭鍏ヤ俊鎭潵婧愬叾浠�"
- />
+ <el-input v-model="form.infosourcesOther" placeholder="璇疯緭鍏ヤ俊鎭潵婧愬叾浠�" />
</el-form-item>
</el-col>
</el-row>
@@ -720,99 +456,55 @@
</el-col>
<el-col :span="8">
<el-form-item label="鑱旂郴鐢佃瘽" prop="infophone">
- <el-input
- v-model="form.infophone"
- placeholder="璇疯緭鍏ヤ俊鎭憳鑱旂郴鐢佃瘽"
- />
+ <el-input v-model="form.infophone" placeholder="璇疯緭鍏ヤ俊鎭憳鑱旂郴鐢佃瘽" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item align="left" label="绾㈠崄瀛椾細" prop="redorganno">
- <org-selecter
- ref="addCrossOrgSelect"
- :org-type="'2'"
- v-model="form.redorganno"
- />
+ <org-selecter ref="addCrossOrgSelect" :org-type="'2'" v-model="form.redorganno" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="鑱旂郴浜�" prop="contactperson">
- <el-input
- v-model="form.contactperson"
- placeholder="璇疯緭鍏ヨ仈绯讳汉"
- />
+ <el-input v-model="form.contactperson" placeholder="璇疯緭鍏ヨ仈绯讳汉" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="鑱旂郴鏃堕棿" prop="contacttime">
- <el-date-picker
- clearable
- size="small"
- style="width: 190px"
- v-model="form.contacttime"
- type="datetime"
- value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="閫夋嫨鎶ュ憡鏃堕棿"
- >
+ <el-date-picker clearable size="small" style="width: 190px" v-model="form.contacttime" type="datetime"
+ value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨鎶ュ憡鏃堕棿">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
- <el-form-item
- align="left"
- label="鑾峰彇缁勭粐"
- prop="acquisitiontissuename"
- >
- <org-selecter
- style="width: 260px"
- ref="orgSelecter"
- :org-type="'1'"
- v-model="form.acquisitiontissueno"
- />
+ <el-form-item align="left" label="鑾峰彇缁勭粐" prop="acquisitiontissuename">
+ <org-selecter style="width: 260px" ref="orgSelecter" :org-type="'1'" v-model="form.acquisitiontissueno" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="鎶ュ憡浜�" prop="reporterno">
- <el-select
- ref="getReportname"
- v-model="form.reporterno"
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in reporters"
- :key="item.reportNo"
- :label="item.reportName"
- :value="item.reportNo"
- >
+ <el-select ref="getReportname" v-model="form.reporterno" placeholder="璇烽�夋嫨">
+ <el-option v-for="item in reporters" :key="item.reportNo" :label="item.reportName"
+ :value="item.reportNo">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="鑱旂郴鐢佃瘽" prop="reporterphone">
- <el-input
- v-model="form.reporterphone"
- placeholder="璇疯緭鍏ヨ仈绯荤數璇�"
- />
+ <el-input v-model="form.reporterphone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="鎶ュ憡鏃堕棿" align="left" prop="reporttime">
- <el-date-picker
- clearable
- size="small"
- style="width: 190px"
- v-model="form.reporttime"
- type="datetime"
- value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="閫夋嫨鎶ュ憡鏃堕棿"
- >
+ <el-date-picker clearable size="small" style="width: 190px" v-model="form.reporttime" type="datetime"
+ value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨鎶ュ憡鏃堕棿">
</el-date-picker>
</el-form-item>
</el-col>
@@ -828,15 +520,8 @@
</div> -->
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button v-show="showSaveBtn" type="primary" @click="submitForm"
- >淇濆瓨骞跺墠寰�妗堜緥宸ヤ綔鍙�</el-button
- >
- <el-button
- v-show="showTerminationBtn"
- type="primary"
- @click="submitForm"
- >缁堟妗堜緥</el-button
- >
+ <el-button v-show="showSaveBtn" type="primary" @click="submitForm">淇濆瓨骞跺墠寰�妗堜緥宸ヤ綔鍙�</el-button>
+ <el-button v-show="showTerminationBtn" type="primary" @click="submitForm">缁堟妗堜緥</el-button>
<el-button @click="cancel">鍙� 娑�</el-button>
<!-- <el-button @click="handleapproval">鎻愪氦瀹℃牳</el-button> -->
</div>
@@ -1084,7 +769,7 @@
]
};
},
- created() {},
+ created() { },
mounted(e) {
// let idd = this.$route.query.userid
@@ -1165,7 +850,7 @@
resetArr(Arr) {
var hash = {};
- Arr = Arr.reduce(function(arr, current) {
+ Arr = Arr.reduce(function (arr, current) {
hash[current.reporterno]
? ""
: (hash[current.reporterno] = true && arr.push(current));
@@ -1299,8 +984,8 @@
d.getFullYear() -
birthdays.getFullYear() -
(d.getMonth() < birthdays.getMonth() ||
- (d.getMonth() == birthdays.getMonth() &&
- d.getDate() < birthdays.getDate())
+ (d.getMonth() == birthdays.getMonth() &&
+ d.getDate() < birthdays.getDate())
? 1
: 0);
// 璧嬪�肩粰琛ㄦ牸
@@ -1309,7 +994,7 @@
this.form.age = age;
} else {
}
- } catch {}
+ } catch { }
},
// sheng: '娴欐睙鐪�',
// shi: '',
@@ -1534,7 +1219,7 @@
this.showSaveBtn = true;
//this.$refs.annex.getAnnexList();
this.open = true;
- this.$nextTick(function() {
+ this.$nextTick(function () {
this.$refs.annex.getAnnexList();
});
@@ -1605,7 +1290,7 @@
this.open = true;
this.title = "浜轰綋鍣ㄥ畼娼滃湪鎹愮尞鑰呯櫥璁拌〃";
this.form.recordstate = 99;
- this.$nextTick(function() {
+ this.$nextTick(function () {
this.$refs.annex.getAnnexList();
});
});
@@ -1700,14 +1385,14 @@
const ids = row.id || this.ids;
this.$modal
.confirm('鏄惁纭鍒犻櫎鎹愮尞鍩虹缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�')
- .then(function() {
+ .then(function () {
return delDonatebaseinfo(ids);
})
.then(() => {
this.getList();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
})
- .catch(() => {});
+ .catch(() => { });
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
@@ -1723,7 +1408,7 @@
this.$download.name(response.msg);
this.exportLoading = false;
})
- .catch(() => {});
+ .catch(() => { });
},
// 瀵硅薄杞垚鎸囧畾瀛楃涓插垎闅�
diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue
index 26cdb13..2c1b3b8 100644
--- a/src/views/project/donationdetails/index.vue
+++ b/src/views/project/donationdetails/index.vue
@@ -2952,6 +2952,7 @@
this.$modal.msgSuccess("鑾峰彇瑙佽瘉淇℃伅鏂板鎴愬姛");
});
}
+ this.form.donationcategory=this.witnessform.donationcategory;
this.Processvalidation();
}
});
diff --git a/src/views/project/externalperson/index.vue b/src/views/project/externalperson/index.vue
index e2951a9..5e6b2eb 100644
--- a/src/views/project/externalperson/index.vue
+++ b/src/views/project/externalperson/index.vue
@@ -152,14 +152,14 @@
</el-row>
<el-row>
<el-col :span="24">
- <el-form-item label="鑱旂郴鐢佃瘽" prop="telephone">
- <el-input v-model="form.telephone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" /> </el-form-item>
+ <el-form-item label="鑱旂郴鍦板潃" prop="address">
+ <el-input v-model="form.address" placeholder="璇疯緭鍏ヨ仈绯诲湴鍧�" /> </el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
- <el-form-item label="鑱旂郴鍦板潃" prop="address">
- <el-input v-model="form.address" placeholder="璇疯緭鍏ヨ仈绯诲湴鍧�" /> </el-form-item>
+ <el-form-item label="鑱旂郴鐢佃瘽" prop="telephone">
+ <el-input v-model="form.telephone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" /> </el-form-item>
</el-col>
</el-row>
<!--
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index 6f6f751..bc1e350 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -7,54 +7,28 @@
<el-row>
<el-col :span="5">
<el-form-item label="鐢宠鏃ユ湡" prop="createTime">
- <el-date-picker
- clearable
- :disabled="true"
- style="width: 100%"
- v-model="form.createTime"
- type="date"
- value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="鏃� 鏈�"
- >
+ <el-date-picker clearable :disabled="true" style="width: 100%" v-model="form.createTime" type="date"
+ value-format="yyyy-MM-dd HH:mm:ss" placeholder="鏃� 鏈�">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="缁忓姙浜�" prop="username">
- <el-select
- v-model="form.username"
- placeholder="鐢宠浜�"
- clearable
- filterable
- allow-create
- style="width: 100%"
- @change="getUserAccount"
- >
- <el-option
- v-for="dict in userlist"
- :key="dict.index"
- :label="dict.nickname"
- :value="dict.nickname"
- ></el-option>
+ <el-select v-model="form.username" placeholder="鐢宠浜�" clearable filterable allow-create style="width: 100%"
+ @change="getUserAccount">
+ <el-option v-for="dict in userlist" :key="dict.index" :label="dict.nickname"
+ :value="dict.nickname"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="鎵�灞炵粍鍒�" prop="deptmentname">
- <el-input
- v-model="form.deptmentname"
- placeholder="璇疯緭鍏ユ墍灞炵粍鍒�"
- clearable
- />
+ <el-input v-model="form.deptmentname" placeholder="璇疯緭鍏ユ墍灞炵粍鍒�" clearable />
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="缁勯暱" prop="managername">
- <el-input
- v-model="form.managername"
- placeholder="璇疯緭鍏ョ粍闀�"
- clearable
- />
+ <el-input v-model="form.managername" placeholder="璇疯緭鍏ョ粍闀�" clearable />
</el-form-item>
</el-col>
</el-row>
@@ -81,20 +55,12 @@
</el-col>
<el-col :span="5">
<el-form-item label="鎹愮尞鑰�" prop="name">
- <el-input
- :disabled="true"
- v-model="form.donorname"
- placeholder="璇疯緭鍏ユ崘鐚�呭鍚�"
- />
+ <el-input :disabled="true" v-model="form.donorname" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" />
</el-form-item>
</el-col>
<el-col :span="5" v-if="ismanager == true">
<el-form-item label="鐢宠閲戦" prop="pretaxcost">
- <el-input
- v-model="form.pretaxcost"
- placeholder="绋庡墠閲戦鍚堣"
- :disabled="true"
- />
+ <el-input v-model="form.pretaxcost" placeholder="绋庡墠閲戦鍚堣" :disabled="true" />
</el-form-item>
</el-col>
</el-row>
@@ -119,65 +85,32 @@
<el-row v-if="jurisdiction">
<!-- <el-alert title="褰撳墠涓烘煡鐪嬬姸鎬侊紝涓嶆敮鎸佷慨鏀瑰瓨鍌ㄣ��" type="warning">
</el-alert> -->
- <el-alert
- title="褰撳墠涓烘煡鐪嬬姸鎬侊紝涓嶆敮鎸佷慨鏀瑰瓨鍌ㄣ��"
- type="warning"
- show-icon
- >
+ <el-alert title="褰撳墠涓烘煡鐪嬬姸鎬侊紝涓嶆敮鎸佷慨鏀瑰瓨鍌ㄣ��" type="warning" show-icon>
</el-alert>
</el-row>
<el-row>
<el-col :span="3" v-if="businessType == '1'">
- <el-button
- @click.native.prevent="importFeeItems"
- type="primary"
- size="small"
- >
+ <el-button @click.native.prevent="importFeeItems" type="primary" size="small">
瀵煎叆鏈嶅姟椤圭洰
</el-button>
</el-col>
- <el-col :span="3"
- ><div style="margin-bottom: 15px;" v-if="businessType == 2">
- <el-button
- type="success"
- icon="el-icon-download"
- @click="Batchentry"
- >鎵归噺褰曞叆</el-button
- >
+ <el-col :span="3">
+ <div style="margin-bottom: 15px;" v-if="businessType == 2">
+ <el-button type="success" icon="el-icon-download" @click="Batchentry">鎵归噺褰曞叆</el-button>
</div>
</el-col>
<el-col :span="3">
- <div
- style="margin-bottom: 15px;"
- v-if="
- userprofile.nickName == '闄堟厱鍗�' &&
- (businessType == '1' || businessType == '2')
- "
- >
- <el-button
- type="success"
- icon="el-icon-edit-outline"
- @click="Manualcalculationfn"
- >璁＄畻涓◣</el-button
- >
+ <div style="margin-bottom: 15px;" v-if="userprofile.nickName == '闄堟厱鍗�' &&
+ (businessType == '1' || businessType == '2')
+ ">
+ <el-button type="success" icon="el-icon-edit-outline" @click="Manualcalculationfn">璁＄畻涓◣</el-button>
</div>
</el-col>
</el-row>
<el-row>
- <el-table
- :data="rbDetails"
- v-loading="loading"
- max-height="800"
- border
- highlight-current-row
- >
- <el-table-column
- prop="orderno"
- align="center"
- label="搴忓彿"
- width="88"
- >
+ <el-table :data="rbDetails" v-loading="loading" max-height="800" border highlight-current-row>
+ <el-table-column prop="orderno" align="center" label="搴忓彿" width="88">
<template slot-scope="scope">
<el-input v-model="scope.row.orderno" placeholder="搴忓彿" />
</template>
@@ -186,124 +119,53 @@
<el-table-column prop="itemcode" align="center" label="椤圭洰缂栧彿" show-overflow-tooltip=""
v-if="form.applytype == '1'">
</el-table-column>-->
- <el-table-column
- prop="applytype"
- align="center"
- label="鏈嶅姟绫诲瀷"
- width="200"
- >
+ <el-table-column prop="applytype" align="center" label="鏈嶅姟绫诲瀷" width="200">
<template slot-scope="scope">
- <el-select
- v-model="scope.row.applytype"
- placeholder="璇烽�夋嫨鏈嶅姟绫诲瀷"
- @change="verifyFeeItemType(scope.row)"
- >
- <el-option
- v-for="dict in rowfeeItemTypes"
- :key="dict.index"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
+ <el-select v-model="scope.row.applytype" placeholder="璇烽�夋嫨鏈嶅姟绫诲瀷" @change="verifyFeeItemType(scope.row)">
+ <el-option v-for="dict in rowfeeItemTypes" :key="dict.index" :label="dict.label"
+ :value="dict.value"></el-option>
</el-select>
</template>
</el-table-column>
- <el-table-column
- prop="itemid"
- align="center"
- label="鏈嶅姟椤圭洰"
- width="260"
- >
+ <el-table-column prop="itemid" align="center" label="鏈嶅姟椤圭洰" width="260">
<template slot-scope="scope">
- <el-select
- v-model="scope.row.itemid"
- placeholder="璇烽�夋嫨鏈嶅姟椤圭洰"
- filterable
- @change="verifyFeeItem(scope.row)"
- :filter-method="val => searchItemType(val, scope)"
- >
- <el-option
- v-for="dict in scope.row.itemlist"
- :key="dict.index"
- :label="dict.itemName"
- :value="dict.id"
- ></el-option>
+ <el-select v-model="scope.row.itemid" placeholder="璇烽�夋嫨鏈嶅姟椤圭洰" filterable @change="verifyFeeItem(scope.row)"
+ :filter-method="val => searchItemType(val, scope)">
+ <el-option v-for="dict in scope.row.itemlist" :key="dict.index" :label="dict.itemName"
+ :value="dict.id"></el-option>
</el-select>
</template>
</el-table-column>
- <el-table-column
- prop="servicesscope"
- align="center"
- label="鏈嶅姟璇存槑"
- v-if="form.applytype == '1'"
- width="180"
- >
+ <el-table-column prop="servicesscope" align="center" label="鏈嶅姟璇存槑" v-if="form.applytype == '1'" width="180">
<template slot-scope="scope">
- <el-select
- v-model="scope.row.servicesscope"
- placeholder="鏈嶅姟璇存槑"
- clearable
- allow-create
- @change="verifyFeeRemark(scope.row)"
- >
- <el-option
- v-for="dict in scope.row.rowfeeblocks"
- :key="dict.servicesscope"
- :label="dict.remark"
- :value="dict.servicesscope"
- ></el-option>
+ <el-select v-model="scope.row.servicesscope" placeholder="鏈嶅姟璇存槑" clearable allow-create
+ @change="verifyFeeRemark(scope.row)">
+ <el-option v-for="dict in scope.row.rowfeeblocks" :key="dict.servicesscope" :label="dict.remark"
+ :value="dict.servicesscope"></el-option>
</el-select>
</template>
</el-table-column>
- <el-table-column
- prop="price"
- align="center"
- label="鍗曚环"
- width="120"
- v-if="businessType == 4"
- >
+ <el-table-column prop="price" align="center" label="鍗曚环" width="120" v-if="businessType == 4">
<template slot-scope="scope">
- <el-input
- v-model="scope.row.price"
- placeholder="鍗曚环"
- @blur="
- val => {
- sumTotalFee(scope.row);
- }
- "
- />
+ <el-input v-model="scope.row.price" placeholder="鍗曚环" @blur="val => {
+ sumTotalFee(scope.row);
+ }
+ " />
</template>
</el-table-column>
- <el-table-column
- prop="quantity"
- align="center"
- label="鏁伴噺"
- width="120"
- v-if="businessType == 4"
- >
+ <el-table-column prop="quantity" align="center" label="鏁伴噺" width="120" v-if="businessType == 4">
<template slot-scope="scope">
- <el-input
- v-model="scope.row.quantity"
- placeholder="鏁伴噺"
- @blur="
- val => {
- sumTotalFee(scope.row);
- }
- "
- />
+ <el-input v-model="scope.row.quantity" placeholder="鏁伴噺" @blur="val => {
+ sumTotalFee(scope.row);
+ }
+ " />
</template>
</el-table-column>
- <el-table-column
- v-if="
- businessType == 2 ||
- businessType == 3 ||
- businessType == 4 ||
- ismanager == true
- "
- prop="amount"
- align="center"
- :label="amountLabel"
- width="120"
- >
+ <el-table-column v-if="businessType == 2 ||
+ businessType == 3 ||
+ businessType == 4 ||
+ ismanager == true
+ " prop="amount" align="center" :label="amountLabel" width="120">
<template slot-scope="scope">
<!--
<el-select v-model="scope.row.amount" placeholder="绋庡墠閲戦" clearable filterable allow-create
@@ -312,93 +174,57 @@
:value="dict.expense"></el-option>
</el-select>
-->
- <el-input
- v-model="scope.row.amount"
- placeholder="閲戦"
- @blur="
- val => {
- calculateTax(scope.row, 'A');
- }
- "
- />
+ <el-input v-model="scope.row.amount" placeholder="閲戦" @blur="val => {
+ calculateTax(scope.row, 'A');
+ }
+ " />
</template>
</el-table-column>
- <el-table-column
- prop="taxamount"
- align="center"
- label="鎵ｇ◣閲戦"
- width="120"
- v-if="
- (this.ismanager == true) &
- (form.applytype == '1' || form.applytype == '2')
- "
- >
+ <el-table-column prop="taxamount" align="center" label="鎵ｇ◣閲戦" width="120" v-if="(this.ismanager == true) &
+ (form.applytype == '1' || form.applytype == '2')
+ ">
<template slot-scope="scope">
- <el-input
- v-model="scope.row.taxamount"
- placeholder="鎵ｇ◣閲戦"
- />
+ <el-input v-model="scope.row.taxamount" placeholder="鎵ｇ◣閲戦" />
</template>
</el-table-column>
- <el-table-column
- prop="taxedamount"
- align="center"
- label="绋庡悗閲戦"
- width="120"
- v-if="
- (this.ismanager == true) &
- (form.applytype == '1' || form.applytype == '2')
- "
- >
+ <el-table-column prop="taxedamount" align="center" label="绋庡悗閲戦" width="120" v-if="(this.ismanager == true) &
+ (form.applytype == '1' || form.applytype == '2')
+ ">
<template slot-scope="scope">
- <el-input
- v-model="scope.row.taxedamount"
- placeholder="绋庡悗閲戦"
- @blur="
- val => {
- calculateTax(scope.row, 'B');
- }
- "
- />
+ <el-input v-model="scope.row.taxedamount" placeholder="绋庡悗閲戦" @blur="val => {
+ calculateTax(scope.row, 'B');
+ }
+ " />
</template>
</el-table-column>
- <el-table-column
- prop="beneficiaryname"
- align="center"
- label="涓撳/鍗曚綅"
- width="120"
- v-if="form.applytype == '1' || form.applytype == '2'"
- >
+ <el-table-column prop="beneficiaryname" align="center" :label="beneficiarylabel" width="200">
<template slot-scope="scope">
- <el-button
- type="primary"
- plain
- @click="ShowDetailDialog(scope, 'expert')"
- >{{
- scope.row.beneficiaryname
- ? scope.row.beneficiaryname
- : "鐐瑰嚮閫夋嫨"
- }}</el-button
- >
+ <el-button type="primary" plain @click="showSelectionDialog(scope, 'account')">{{
+ scope.row.beneficiaryname
+ ? scope.row.beneficiaryname
+ : "鐐瑰嚮閫夋嫨"
+ }}</el-button>
</template>
</el-table-column>
- <el-table-column
- prop="unitno"
- align="center"
- label="涓撳鎵�鍦ㄥ崟浣�"
- width="250"
- v-if="form.applytype != '4' && form.applytype != '3'"
- >
+ <el-table-column prop="unitno" align="center" label="涓撳鎵�鍦ㄥ崟浣�" width="250"
+ v-if="form.applytype == '1' && form.applytype == '2'">
<template slot-scope="scope">
- <el-button
- type="primary"
- plain
- @click="ShowDetailDialog(scope, 'unit')"
- >{{
- scope.row.unitname ? scope.row.unitname : "鐐瑰嚮閫夋嫨"
- }}</el-button
- >
- <!-- <el-select
+ <el-button type="primary" plain @click="showSelectionDialog(scope, 'workunit')">{{
+ scope.row.unitname ? scope.row.unitname : "鐐瑰嚮閫夋嫨"
+ }}</el-button>
+ </template>
+ </el-table-column>
+ <!--
+ <el-table-column prop="unitname" align="center" label="鍗曚綅锛堜釜浜猴級鍚嶇О" width="300"
+ v-if="form.applytype == '4' || form.applytype == '3'">
+ <template slot-scope="scope">
+ <el-button type="primary" plain @click="showSelectionDialog(scope, 'account')">{{
+ scope.row.unitname
+ ? scope.row.unitname
+ : "鐐瑰嚮閫夋嫨"
+ }}</el-button>
+
+ <el-select
v-model="scope.row.unitno"
placeholder="鍗曚綅"
clearable
@@ -411,186 +237,70 @@
:label="spec.organizationname"
:value="spec.organizationid"
></el-option>
- </el-select> -->
+ </el-select>
</template>
</el-table-column>
- <el-table-column
- prop="beneficiaryname"
- align="center"
- label="鍗曚綅/涓汉"
- width="250"
- v-if="form.applytype == '4' || form.applytype == '3'"
- >
- <template slot-scope="scope">
- <el-button
- type="primary"
- plain
- @click="ShowDetailDialog(scope, 'expert')"
- >{{
- scope.row.beneficiaryname
- ? scope.row.beneficiaryname
- : "鐐瑰嚮閫夋嫨"
- }}</el-button
- >
- <!-- <el-select
- v-model="scope.row.unitno"
- placeholder="鍗曚綅"
- clearable
- filterable
- allow-create
- >
- <el-option
- v-for="(spec, index) in unitList"
- :key="index"
- :label="spec.organizationname"
- :value="spec.organizationid"
- ></el-option>
- </el-select> -->
- </template>
- </el-table-column>
- <el-table-column
- prop="title"
- align="center"
- label="鑱岀О"
- width="120"
- v-if="form.applytype == '1' || form.applytype == '2'"
- >
+ -->
+ <el-table-column prop="title" align="center" label="鑱岀О" width="120"
+ v-if="form.applytype == '1' || form.applytype == '2'">
<template slot-scope="scope">
<el-input v-model="scope.row.title" placeholder="鑱岀О" />
</template>
</el-table-column>
- <el-table-column
- prop="idcardno"
- align="center"
- label="韬唤璇佸彿"
- width="200"
- v-if="form.applytype == '1' || form.applytype == '2'"
- >
+ <el-table-column prop="idcardno" align="center" label="韬唤璇佸彿" width="200"
+ v-if="form.applytype == '1' || form.applytype == '2'">
<template slot-scope="scope">
<el-form-item :error="scope.row.error" label-width="0">
- <el-input
- :disabled="
- userprofile.nickName != '闄堟厱鍗�' && businessType == 1
- "
- v-model.number="scope.row.idcardno"
- @input="tableParValueChange1(scope.row)"
- placeholder="韬唤璇佸彿"
- />
+ <el-input :disabled="userprofile.nickName != '闄堟厱鍗�' && businessType == 1
+ " v-model.number="scope.row.idcardno" @input="tableParValueChange1(scope.row)"
+ placeholder="韬唤璇佸彿" />
</el-form-item>
</template>
</el-table-column>
- <el-table-column
- prop="depositbank"
- align="center"
- label="寮�鎴烽摱琛�"
- width="200"
- >
- <!-- v-if="form.applytype != '4'" -->
+ <el-table-column prop="depositbank" align="center" label="寮�鎴烽摱琛�" width="200">
<template slot-scope="scope">
- <el-input
- :disabled="
- userprofile.nickName != '闄堟厱鍗�' && businessType == 1
- "
- v-model="scope.row.depositbank"
- placeholder="寮�鎴烽摱琛�"
- />
+ <el-input :disabled="userprofile.nickName != '闄堟厱鍗�' && businessType == 1
+ " v-model="scope.row.depositbank" placeholder="寮�鎴烽摱琛�" />
</template>
</el-table-column>
- <el-table-column
- prop="bankcardno"
- align="center"
- label="閾惰甯愬彿"
- width="210"
- >
+ <el-table-column prop="bankcardno" align="center" label="閾惰甯愬彿" width="210">
<template slot-scope="scope">
- <el-input
- :disabled="
- userprofile.nickName != '闄堟厱鍗�' && businessType == 1
- "
- v-model="scope.row.bankcardno"
- placeholder="閾惰甯愬彿"
- />
+ <el-input :disabled="userprofile.nickName != '闄堟厱鍗�' && businessType == 1
+ " v-model="scope.row.bankcardno" placeholder="閾惰甯愬彿" />
</template>
</el-table-column>
- <el-table-column
- prop="itemdescrisca"
- align="center"
- width="330"
- label="椤圭洰璇存槑"
- >
+ <el-table-column prop="itemdescrisca" align="center" width="330" label="椤圭洰璇存槑">
<template slot-scope="scope">
- <el-input
- type="textarea"
- :rows="2"
- v-model="scope.row.itemdescribe"
- placeholder="椤圭洰璇存槑"
- />
+ <el-input type="textarea" :rows="2" v-model="scope.row.itemdescribe" placeholder="椤圭洰璇存槑" />
</template>
</el-table-column>
- <el-table-column
- prop="remark"
- align="center"
- width="330"
- label="澶囨敞"
- v-if="
- businessType == 2 ||
- businessType == 3 ||
- businessType == 4 ||
- ismanager == true
- "
- >
+ <el-table-column prop="remark" align="center" width="330" label="澶囨敞" v-if="businessType == 2 ||
+ businessType == 3 ||
+ businessType == 4 ||
+ ismanager == true
+ ">
<template slot-scope="scope">
- <el-input
- type="textarea"
- :rows="2"
- v-model="scope.row.remark"
- placeholder="澶囨敞"
- />
+ <el-input type="textarea" :rows="2" v-model="scope.row.remark" placeholder="澶囨敞" />
</template>
</el-table-column>
- <el-table-column
- fixed="right"
- align="center"
- label="鎿嶄綔"
- width="180"
- >
+ <el-table-column fixed="right" align="center" label="鎿嶄綔" width="180">
<template slot-scope="scope">
- <el-button
- type="text"
- size="mini"
- @click="addRow(scope.$index)"
- v-if="
- operationType == 'add' ||
- operationType == 'update' ||
- operationType == 'check'
- "
- >鏂板</el-button
- >
- <el-button
- @click.native.prevent="
- deleteRows(scope.row, scope.$index, rbDetails)
- "
- type="text"
- size="small"
- v-if="
- operationType == 'add' ||
- operationType == 'update' ||
- operationType == 'check'
- "
- >
+ <el-button type="text" size="mini" @click="addRow(scope.$index)" v-if="operationType == 'add' ||
+ operationType == 'update' ||
+ operationType == 'check'
+ ">鏂板</el-button>
+ <el-button @click.native.prevent="
+ deleteRows(scope.row, scope.$index, rbDetails)
+ " type="text" size="small" v-if="operationType == 'add' ||
+ operationType == 'update' ||
+ operationType == 'check'
+ ">
鍒犻櫎
</el-button>
- <el-button
- @click.native.prevent="
- Filepopup(scope.$index, rbDetails, scope.row)
- "
- type="text"
- size="small"
- v-if="
- businessType == 3 || businessType == 2 || businessType == 4
- "
- >绁ㄦ嵁</el-button
- >
+ <el-button @click.native.prevent="
+ Filepopup(scope.$index, rbDetails, scope.row)
+ " type="text" size="small" v-if="businessType == 3 || businessType == 2 || businessType == 4
+ ">绁ㄦ嵁</el-button>
</template>
</el-table-column>
</el-table>
@@ -598,55 +308,20 @@
<el-row>
<el-col :span="12">
- <el-form-item
- label="璐圭敤鐢宠闄勪欢"
- align="left"
- prop="annexbankcard"
- v-if="businessType == 0"
- >
- <el-upload
- size="mini"
- class="upload-demo"
- :action="uploadFileUrl"
- :file-list="fileListto"
- :show-file-list="false"
- multiple
- drag
- :headers="headers"
- :on-success="
- (response, file, fileList) =>
- uploadSccess(response, file, fileList)
- "
- :on-preview="downFile"
- :disabled="operationType == 'detail'"
- :on-error="handleUploadError"
- :on-remove="remove"
- accept="image/*,.pdf"
- >
+ <el-form-item label="璐圭敤鐢宠闄勪欢" align="left" prop="annexbankcard" v-if="businessType == 0">
+ <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileListto"
+ :show-file-list="false" multiple drag :headers="headers" :on-success="(response, file, fileList) =>
+ uploadSccess(response, file, fileList)
+ " :on-preview="downFile" :disabled="operationType == 'detail'" :on-error="handleUploadError"
+ :on-remove="remove" accept="image/*,.pdf">
<i class="el-icon-upload"></i>
<div class="el-upload__text">
灏嗙エ鎹嫋鍒版澶勶紝鎴�
- <em
- ><el-button
- :disabled="operationType == 'detail'"
- size="small"
- type="primary"
- >鐐瑰嚮涓婁紶</el-button
- ></em
- >
+ <em><el-button :disabled="operationType == 'detail'" size="small" type="primary">鐐瑰嚮涓婁紶</el-button></em>
</div>
</el-upload>
- <el-table
- :data="fileListto"
- @row-click="downFile"
- style="width: 100%"
- height="400"
- >
- <el-table-column
- prop="name"
- :show-overflow-tooltip="true"
- label="鍚嶇О"
- >
+ <el-table :data="fileListto" @row-click="downFile" style="width: 100%" height="400">
+ <el-table-column prop="name" :show-overflow-tooltip="true" label="鍚嶇О">
<template slot-scope="scope">
<i style="color:#409EFF" class=" el-icon-s-order" />{{
scope.row.name
@@ -654,74 +329,37 @@
</template>
</el-table-column>
- <el-table-column
- prop="name"
- width="180"
- :show-overflow-tooltip="true"
- label="鍔熻兘"
- >
+ <el-table-column prop="name" width="180" :show-overflow-tooltip="true" label="鍔熻兘">
<template slot-scope="scope">
- <el-button
- type="primary"
- size="mini"
- @click.native.prevent.stop="deletedowfile(scope.row)"
- >鍒犻櫎</el-button
- >
- <el-button
- type="primary"
- size="mini"
- @click.native.prevent.stop="moveupdowfile(scope.row)"
- >涓婄Щ</el-button
- >
+ <el-button type="primary" size="mini"
+ @click.native.prevent.stop="deletedowfile(scope.row)">鍒犻櫎</el-button>
+ <el-button type="primary" size="mini"
+ @click.native.prevent.stop="moveupdowfile(scope.row)">涓婄Щ</el-button>
</template>
</el-table-column>
</el-table>
</el-form-item>
</el-col>
</el-row>
- <el-row
- v-if="
- operationType == 'detail' ||
- operationType == 'check' ||
- operationType == 'update'
- "
- >
+ <el-row v-if="operationType == 'detail' ||
+ operationType == 'check' ||
+ operationType == 'update'
+ ">
<el-table :data="fundflowList" border>
- <el-table-column
- label="瀹℃牳鏃ユ湡"
- align="center"
- width="160"
- prop="createTime"
- />
- <el-table-column
- label="瀹℃牳浜�"
- align="center"
- width="120"
- prop="checkusername"
- />
- <el-table-column
- label="瀹℃牳缁撴灉"
- align="center"
- width="200"
- prop="flowconclusion"
- >
+ <el-table-column label="瀹℃牳鏃ユ湡" align="center" width="160" prop="createTime" />
+ <el-table-column label="瀹℃牳浜�" align="center" width="120" prop="checkusername" />
+ <el-table-column label="瀹℃牳缁撴灉" align="center" width="200" prop="flowconclusion">
<template slot-scope="scope">
<span v-if="scope.row.flowconclusion == 1">閫氳繃</span>
<span v-if="scope.row.flowconclusion == 2">涓嶉�氳繃</span>
</template>
</el-table-column>
- <el-table-column
- label="瀹℃牳澶囨敞"
- align="center"
- prop="flowcontent"
- />
+ <el-table-column label="瀹℃牳澶囨敞" align="center" prop="flowcontent" />
</el-table>
</el-row>
- <el-row
- style="margin-top: 25px; margin-bottom: 5px"
- v-if="operationType == 'check' && userprofile.nickName == '闄堟厱鍗�'"
- >
+ <el-row style="margin-top: 25px; margin-bottom: 5px"
+ v-if="operationType == 'check' && userprofile.nickName == '闄堟厱鍗�'">
<el-col :span="20">
<el-form-item label="鐢宠鏉愭枡鐘舵��" prop="infoid">
<el-radio-group v-model="form.checkstatus" align="left">
@@ -732,10 +370,7 @@
</el-form-item>
</el-col>
</el-row>
- <el-row
- style="margin-top: 5px; margin-bottom: 5px"
- v-if="operationType == 'check'"
- >
+ <el-row style="margin-top: 5px; margin-bottom: 5px" v-if="operationType == 'check'">
<el-col :span="20">
<el-form-item label="瀹℃牳缁撴灉" align="left">
<el-radio-group v-model="checkObj.flowlevelone" align="left">
@@ -745,7 +380,6 @@
</el-form-item>
</el-col>
</el-row>
-
<el-row v-if="operationType == 'check'">
<el-col :span="17">
<el-form-item label="瀹℃牳澶囨敞" align="left">
@@ -755,327 +389,134 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button
- type="primary"
- @click="submitForm"
- v-if="
- operationType == 'add' ||
- operationType == 'update' ||
- ismanager == true
- "
- >淇濆瓨</el-button
- >
- <el-button
- type="success"
- @click="handleup"
- v-if="operationType == 'add' || operationType == 'update'"
- >涓婃姤</el-button
- >
- <el-button
- type="primary"
- @click="checksubmit"
- v-if="operationType == 'check'"
- >鎻愪氦瀹℃牳</el-button
- >
+ <el-button type="primary" @click="submitForm" v-if="operationType == 'add' ||
+ operationType == 'update' ||
+ ismanager == true
+ ">淇濆瓨</el-button>
+ <el-button type="success" @click="handleup"
+ v-if="operationType == 'add' || operationType == 'update'">涓婃姤</el-button>
+ <el-button type="primary" @click="checksubmit" v-if="operationType == 'check'">鎻愪氦瀹℃牳</el-button>
<el-button @click="cancel">鍏� 闂�</el-button>
</div>
</div>
- <el-dialog
- :visible.sync="showSelectionDialog"
- :close-on-click-modal="false"
- :title="'鍗曚綅/涓汉淇℃伅閫夋嫨'"
- width="500px"
- style="text-align: center"
- v-loading="loading"
- >
- <el-form ref="funddetailForm" :rules="funddrules" :model="funddetailForm">
- <el-row v-if="businessType != 4 && businessType != 3">
- <el-col
- :span="24"
- v-if="selectionType == 'expert' && businessType != 4"
- >
- <el-form-item label="璇烽�夋嫨涓撳淇℃伅锛�" prop="expertfrom">
- <el-radio-group v-model="expertfrom" style="margin-bottom: 0">
- <el-radio label="1">涓撳搴�</el-radio>
- <el-radio label="2">鏂板涓撳</el-radio>
- </el-radio-group>
- </el-form-item>
- </el-col>
- <el-col
- :span="24"
- v-if="selectionType == 'expert' && expertfrom == '1'"
- >
- <el-form-item
- label="涓撳濮撳悕"
- prop="beneficiaryname"
- label-width="80px"
- >
- <el-select
- filterable
- allow-create
- ref="beneficiaryname"
- default-first-option
- v-model="funddetailForm.beneficiaryname"
- placeholder="璇烽�夋嫨"
- style="width: 100%"
- >
- <el-option
- v-for="item in expertlist"
- :key="item.expertNo"
- :label="item.exportName"
- :value="item.exportName"
- >
- </el-option>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="24" v-if="selectionType == 'unit'">
- <el-form-item
- label="鍗曚綅鍚嶇О"
- prop="unitno"
- label-width="120px"
- v-if="businessType == 1 || businessType == 2"
- >
- <el-select
- v-model="funddetailForm.unitno"
- placeholder="鍗曚綅鍚嶇О"
- clearable
- filterable
- allow-create
- style="width: 100%"
- >
- <el-option
- v-for="(spec, index) in unitList"
- :key="index"
- :label="spec.organizationname"
- :value="spec.organizationid"
- ></el-option>
- </el-select>
- </el-form-item>
- <el-form-item
- label="鍙戠エ鍗曚綅鍚嶇О"
- prop="unitno"
- label-width="120px"
- v-if="businessType == 3"
- >
- <el-select
- v-model="funddetailForm.unitno"
- placeholder="鍗曚綅鍚嶇О"
- clearable
- filterable
- allow-create
- style="width: 100%"
- >
- <el-option
- v-for="(item, index) in feeUnitList"
- :key="index"
- :label="item.reportName"
- :value="item.reportNo"
- ></el-option>
- </el-select>
- </el-form-item>
- </el-col>
- </el-row>
-
- <el-row v-if="businessType == 4 || businessType == 3">
+ <el-dialog :visible.sync="showselectiondialog" :close-on-click-modal="false" :title="'璐︽埛淇℃伅/鍗曚綅淇℃伅閫夋嫨'" width="650px"
+ style="text-align: center" v-loading="loading">
+ <el-form ref="accountselectform" :rules="dialogrules" :model="accountselectform" label-width="120px">
+ <el-row v-if="selectionType == 'workunit'">
<el-col :span="24">
- <el-form-item label="璇烽�夋嫨涓撳淇℃伅锛�" prop="experthear">
- <el-radio-group
- @change="ShowDetailDialog(spocewl)"
- v-model="experthear"
- style="margin-bottom: 0"
- >
- <el-radio label="unit">浜哄憳閫夐」</el-radio>
- <el-radio label="expert">鍗曚綅閫夐」</el-radio>
+ <el-form-item label="鍗曚綅鍚嶇О" prop="expertunitno" label-width="120px">
+ <el-select v-model="accountselectform.expertunitno" placeholder="鍗曚綅鍚嶇О" clearable filterable allow-create
+ style="width: 100%">
+ <el-option v-for="(spec, index) in unitList" :key="index" :label="spec.organizationname"
+ :value="spec.organizationid"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row v-if="selectionType == 'account'">
+ <el-col>
+ <el-form-item label="璐︽埛鏉ユ簮" prop="accountfrom" class="left-align">
+ <el-radio-group v-model="accountfrom" style="margin-bottom: 0">
+ <el-radio label="1">浠庤处鎴峰簱</el-radio>
+ <el-radio label="2">鏂板璐︽埛锛堟柊澧炲悗闇�瑕佸鏍哥‘璁ゆ墠鑳藉惎鐢級</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
- <el-col :span="24" v-if="experthear == 'unit'">
- <el-form-item
- label="涓撳/鍗曚綅"
- prop="beneficiaryname"
- label-width="80px"
- >
- <el-select
- filterable
- allow-create
- ref="beneficiaryname"
- default-first-option
- @change="bbaaccss"
- v-model="funddetailForm.beneficiaryname"
- placeholder="璇烽�夋嫨"
- style="width: 100%"
- >
- <el-option
- v-for="item in expertlist"
- :key="item.expertNo"
- :label="item.exportName"
- :value="item.exportName"
- >
+ <el-col :span="24" v-if="accountfrom == '1'">
+ <el-form-item label="璐︽埛鍚嶇О" prop="accountname">
+ <el-select filterable allow-create ref="accountname" default-first-option
+ v-model="accountselectform.accountname" placeholder="璇烽�夋嫨" style="width: 100%">
+ <el-option v-for="item in accountlist" :key="item.id" :label="item.username" :value="item.username">
</el-option>
</el-select>
</el-form-item>
</el-col>
- <el-col :span="24" v-if="experthear == 'expert'">
- <el-form-item label="鍗曚綅鍚嶇О" prop="unitno" label-width="120px">
- <el-select
- v-model="funddetailForm.beneficiaryname"
- placeholder="鍗曚綅鍚嶇О"
- @change="bbaaccss"
- clearable
- filterable
- allow-create
- style="width: 100%"
- >
- <el-option
- v-for="(spec, index) in feeUnitList"
- :key="index"
- :label="spec.reportName"
- :value="spec.reportName"
- ></el-option>
- </el-select>
+ </el-row>
+ <el-row v-if="accountfrom == '2'">
+ <el-col :span="16"><el-form-item label="鏂板绫诲瀷" prop="usertype">
+ <el-radio-group v-model="accountselectform.usertype" style="margin-bottom: 0">
+ <el-radio label="expert">鏂板涓撳璐﹀彿</el-radio>
+ <el-radio label="org">鏂板鍗曚綅璐﹀彿</el-radio>
+ </el-radio-group>
</el-form-item>
</el-col>
</el-row>
-
- <el-row v-if="businessType != 4 && businessType != 3">
- <el-col :span="12" v-if="expertfrom == '2'">
- <el-form-item label="涓撳濮撳悕" prop="expertname" label-width="80px">
- <el-input
- v-model="funddetailForm.expertname"
- placeholder="蹇呭～椤�"
- />
- </el-form-item>
+ <el-row v-if="accountfrom == '2'">
+ <el-col :span="24">
+ <el-form-item label="璐﹀彿鍚嶇О" prop="username">
+ <el-input v-model="accountselectform.username" placeholder="璇疯緭鍏ュ崟浣嶅悕绉版垨涓撳濮撳悕" /> </el-form-item>
</el-col>
- <el-col :span="12" v-if="expertfrom == '2'">
- <el-form-item
- label="鑱� 绉�"
- prop="experttitle"
- label-width="80px"
- >
- <el-select
- v-model="funddetailForm.experttitle"
- placeholder="蹇呭～椤�"
- >
- <el-option
- v-for="dict in dict.type.sys_professionaltitle"
- :key="dict.value"
- :label="dict.label"
- :value="dict.label"
- ></el-option>
- </el-select>
+ </el-row>
+ <el-row v-if="accountfrom == '2' && accountselectform.usertype != 'org'">
+ <el-col :span="12">
+ <el-form-item label="韬唤璇佸彿" prop="idcardno">
+ <el-input v-model="accountselectform.idcardno" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" /> </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鑱岀О" prop="title">
+ <el-select v-model="accountselectform.title" placeholder="璇烽�夋嫨浜哄憳鑱岀О">
+ <el-option v-for="dict in dict.type.sys_professionaltitle" :key="dict.value" :label="dict.label"
+ :value="dict.label"></el-option> </el-select>
</el-form-item>
</el-col>
</el-row>
- <el-row v-if="businessType != 4 && businessType != 3">
- <el-col :span="24" v-if="expertfrom == '2'">
- <el-form-item
- label="韬唤璇佸彿"
- prop="expertidcardno"
- label-width="80px"
- >
- <el-input
- v-model="funddetailForm.expertidcardno"
- placeholder="蹇呭～椤�"
- />
+ <el-row v-if="accountfrom == '2' && accountselectform.usertype != 'org'">
+ <el-col>
+ <el-form-item label="鎵�鍦ㄥ崟浣�" prop="unitno">
+ <el-select v-model="accountselectform.unitno" placeholder="鍗曚綅鍚嶇О" clearable filterable allow-create
+ style="width: 100%">
+ <el-option v-for="(spec, index) in unitList" :key="index" :label="spec.organizationname"
+ :value="spec.organizationid"></el-option>
+ </el-select> </el-form-item>
+ </el-form-item>
+ </el-col>
+ <el-col>
+ <el-form-item label="鍗曚綅宸ュ彿" prop="personnelunitno">
+ <el-input v-model="accountselectform.personnelunitno" placeholder="璇疯緭鍏ユ墍鍦ㄥ崟浣嶇殑宸ュ彿" />
</el-form-item>
</el-col>
</el-row>
-
- <el-row v-if="businessType != 4 && businessType != 3">
- <el-col :span="24" v-if="expertfrom == '2'">
- <el-form-item
- label="鍗曚綅鍚嶇О"
- prop="expertunitno"
- label-width="80px"
- >
- <el-select
- v-model="funddetailForm.expertunitno"
- placeholder="鍗曚綅鍚嶇О"
- clearable
- filterable
- allow-create
- style="width: 100%"
- >
- <el-option
- v-for="(spec, index) in unitList"
- :key="index"
- :label="spec.organizationname"
- :value="spec.organizationid"
- ></el-option>
- </el-select> </el-form-item
- ></el-col>
- </el-row>
- <el-row v-if="businessType != 4 && businessType != 3">
- <el-col :span="24" v-if="expertfrom == '2'">
- <el-form-item
- label="寮�鎴烽摱琛�"
- prop="expertdepositbank"
- label-width="80px"
- >
- <el-input
- v-model="funddetailForm.expertdepositbank"
- placeholder="蹇呭～椤�"
- />
+ <el-row v-if="accountfrom == '2'">
+ <el-col><el-form-item label="寮�鎴烽摱琛�" prop="depositbank">
+ <el-input v-model="accountselectform.depositbank" placeholder="璇疯緭鍏ュ紑鎴烽摱琛屽悕绉�" /> </el-form-item>
+ </el-col>
+ <el-col><el-form-item label="閾惰鍗″彿" prop="bankcardno">
+ <el-input v-model="accountselectform.bankcardno" placeholder="璇疯緭鍏ラ摱琛屽崱鍙�" />
</el-form-item>
</el-col>
- <el-col :span="24" v-if="expertfrom == '2'">
- <el-form-item
- label="閾惰鍗″彿"
- prop="expertbankcardno"
- label-width="80px"
- >
- <el-input
- v-model="funddetailForm.expertbankcardno"
- placeholder="蹇呭～椤�"
- />
- </el-form-item>
+ </el-row>
+ <el-row v-if="accountfrom == '2'">
+ <el-col>
+ <el-form-item label="鑱旂郴鍦板潃" prop="address">
+ <el-input v-model="accountselectform.address" placeholder="璇疯緭鍏ヨ仈绯诲湴鍧�" /> </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row v-if="accountfrom == '2'">
+ <el-col>
+ <el-form-item label="鑱旂郴鐢佃瘽" prop="telephone">
+ <el-input v-model="accountselectform.telephone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" /> </el-form-item>
</el-col>
</el-row>
</el-form>
<span slot="footer" class="dialog-footer">
- <el-button @click="showSelectionDialog = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="ConfirmDetailDialog()"
- >纭� 瀹�</el-button
- >
+ <el-button type="primary" @click="confirmSelectionDialog()">纭� 瀹�</el-button>
+ <el-button @click="showselectiondialog = false">鍙� 娑�</el-button>
</span>
</el-dialog>
- <el-dialog
- v-dialogDrags
- :modal="false"
- :close-on-click-modal="false"
- :title="pdftitle"
- :visible.sync="pdfVisible"
- width="60%"
- >
+ <el-dialog v-dialogDrags :modal="false" :close-on-click-modal="false" :title="pdftitle" :visible.sync="pdfVisible"
+ width="60%">
<div>
<el-table :data="tableDatatop" style="width: 100%">
- <el-table-column
- v-if="businessType == 4"
- prop="price"
- align="center"
- label="鍗曚环"
- >
+ <el-table-column v-if="businessType == 4" prop="price" align="center" label="鍗曚环">
</el-table-column>
- <el-table-column
- prop="quantity"
- align="center"
- label="鏁伴噺"
- v-if="businessType == 4"
- >
+ <el-table-column prop="quantity" align="center" label="鏁伴噺" v-if="businessType == 4">
</el-table-column>
<el-table-column prop="amount" align="center" :label="amountLabel">
</el-table-column>
- <el-table-column
- prop="taxedamount"
- align="center"
- label="绋庡悗閲戦"
- v-if="
- (this.ismanager == true) &
- (form.applytype == '1' || form.applytype == '2')
- "
- >
+ <el-table-column prop="taxedamount" align="center" label="绋庡悗閲戦" v-if="(this.ismanager == true) &
+ (form.applytype == '1' || form.applytype == '2')
+ ">
</el-table-column>
<!-- <el-table-column
prop="beneficiaryname"
@@ -1093,142 +534,62 @@
v-if="form.applytype != '4'"
>
</el-table-column> -->
- <el-table-column
- prop="beneficiaryname"
- align="center"
- label="鍗曚綅/涓汉"
- width="250"
- >
+ <el-table-column prop="" align="center" label="鍗曚綅/涓汉" width="250">
</el-table-column>
- <el-table-column
- prop="title"
- align="center"
- label="鑱岀О"
- width="120"
- v-if="form.applytype == '1' || form.applytype == '2'"
- >
+ <el-table-column prop="title" align="center" label="鑱岀О" width="120"
+ v-if="form.applytype == '1' || form.applytype == '2'">
</el-table-column>
- <el-table-column
- prop="idcardno"
- align="center"
- label="韬唤璇佸彿"
- width="200"
- v-if="form.applytype == '1' || form.applytype == '2'"
- >
+ <el-table-column prop="idcardno" align="center" label="韬唤璇佸彿" width="200"
+ v-if="form.applytype == '1' || form.applytype == '2'">
</el-table-column>
<el-table-column prop="depositbank" align="center" label="寮�鎴烽摱琛�">
</el-table-column>
- <el-table-column
- prop="bankcardno"
- align="center"
- label="閾惰甯愬彿"
- width="210"
- >
+ <el-table-column prop="bankcardno" align="center" label="閾惰甯愬彿" width="210">
</el-table-column>
</el-table>
</div>
- <el-tabs
- style="margin-top: 20px;"
- v-model="activeName"
- type="border-card"
- @tab-click="handleClick"
- >
+ <el-tabs style="margin-top: 20px;" v-model="activeName" type="border-card" @tab-click="handleClick">
<el-tab-pane label="鏅�氶檮浠�" :name="1">
<div class="pdfimg">
<div class="box-pdf">
<div>
- <el-upload
- size="mini"
- class="upload-demo"
- :action="uploadFileUrl"
- :file-list="fileListto"
- :show-file-list="false"
- multiple
- drag
- :headers="headers"
- :on-success="
- (response, file, fileList) =>
- uploadSccess(response, file, fileList)
- "
- :on-preview="downFile"
- :disabled="operationType == 'detail'"
- :on-error="handleUploadError"
- :on-remove="remove"
- accept="image/*,.pdf"
- >
+ <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileListto"
+ :show-file-list="false" multiple drag :headers="headers" :on-success="(response, file, fileList) =>
+ uploadSccess(response, file, fileList)
+ " :on-preview="downFile" :disabled="operationType == 'detail'" :on-error="handleUploadError"
+ :on-remove="remove" accept="image/*,.pdf">
<i class="el-icon-upload"></i>
<div class="el-upload__text">
灏嗙エ鎹嫋鍒版澶勶紝鎴�
- <em
- ><el-button
- :disabled="operationType == 'detail'"
- size="small"
- type="primary"
- >鐐瑰嚮涓婁紶</el-button
- ></em
- >
+ <em><el-button :disabled="operationType == 'detail'" size="small" type="primary">鐐瑰嚮涓婁紶</el-button></em>
</div>
</el-upload>
- <el-table
- :data="fileListto"
- @row-click="downFile"
- style="width: 100%"
- height="400"
- >
- <el-table-column
- prop="name"
- :show-overflow-tooltip="true"
- label="鍚嶇О"
- >
+ <el-table :data="fileListto" @row-click="downFile" style="width: 100%" height="400">
+ <el-table-column prop="name" :show-overflow-tooltip="true" label="鍚嶇О">
<template slot-scope="scope">
<i style="color:#409EFF" class=" el-icon-s-order" />
<span>{{ scope.row.name }}</span>
</template>
</el-table-column>
- <el-table-column
- prop="name"
- width="190"
- :show-overflow-tooltip="true"
- label="鍔熻兘"
- >
+ <el-table-column prop="name" width="190" :show-overflow-tooltip="true" label="鍔熻兘">
<template slot-scope="scope">
- <el-button
- type="primary"
- size="mini"
- @click.native.prevent.stop="deletedowfile(scope.row)"
- >鍒犻櫎</el-button
- >
- <el-button
- type="primary"
- size="mini"
- @click.native.prevent.stop="moveupdowfile(scope.row)"
- >涓婄Щ</el-button
- >
- <el-button
- type="success"
- size="mini"
- icon="el-icon-search"
- circle
- @click.native.prevent.stop="Downloadfile(scope.row)"
- ></el-button>
+ <el-button type="primary" size="mini"
+ @click.native.prevent.stop="deletedowfile(scope.row)">鍒犻櫎</el-button>
+ <el-button type="primary" size="mini"
+ @click.native.prevent.stop="moveupdowfile(scope.row)">涓婄Щ</el-button>
+ <el-button type="success" size="mini" icon="el-icon-search" circle
+ @click.native.prevent.stop="Downloadfile(scope.row)"></el-button>
</template>
</el-table-column>
</el-table>
</div>
</div>
- <div
- v-if="this.previewpdf && pdfimgsrcList.length"
- class="pdfimgmin"
- >
+ <div v-if="this.previewpdf && pdfimgsrcList.length" class="pdfimgmin">
<!-- <img :src="pdfimg" /> -->
- <el-image
- style="width: 95%; height: 90%"
- :src="pdfimg"
- :preview-src-list="pdfimgsrcList"
- >
+ <el-image style="width: 95%; height: 90%" :src="pdfimg" :preview-src-list="pdfimgsrcList">
<!-- <div slot="error" class="image-slot">
<i class="el-icon-picture-outline"></i>
</div> -->
@@ -1241,154 +602,78 @@
<div class="pdfimg">
<div class="box-pdf">
<div>
- <el-upload
- size="mini"
- class="upload-demo"
- :action="uploadFileUrl"
- :file-list="invoicefileList"
- :show-file-list="false"
- multiple
- drag
- :headers="headers"
- :on-success="
- (response, file, fileList) =>
- uploadSccess(response, file, fileList)
- "
- :on-preview="downFile"
- :disabled="operationType == 'detail'"
- :on-error="handleUploadError"
- :on-remove="remove"
- accept="image/*,.pdf"
- >
+ <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="invoicefileList"
+ :show-file-list="false" multiple drag :headers="headers" :on-success="(response, file, fileList) =>
+ uploadSccess(response, file, fileList)
+ " :on-preview="downFile" :disabled="operationType == 'detail'" :on-error="handleUploadError"
+ :on-remove="remove" accept="image/*,.pdf">
<i class="el-icon-upload"></i>
<div class="el-upload__text">
灏嗗彂绁ㄦ枃浠舵嫋鍒版澶勶紝鎴�
- <em
- ><el-button
- :disabled="operationType == 'detail'"
- size="small"
- type="primary"
- >鐐瑰嚮涓婁紶</el-button
- ></em
- >
+ <em><el-button :disabled="operationType == 'detail'" size="small" type="primary">鐐瑰嚮涓婁紶</el-button></em>
</div>
</el-upload>
- <el-table
- :data="invoicefileListto"
- @row-click="downFile"
- style="width: 100%"
- height="400"
- >
- <el-table-column
- prop="name"
- :show-overflow-tooltip="true"
- label="鍚嶇О"
- >
+ <el-table :data="invoicefileListto" @row-click="downFile" style="width: 100%" height="400">
+ <el-table-column prop="name" :show-overflow-tooltip="true" label="鍚嶇О">
<template slot-scope="scope">
<i style="color:#409EFF" class=" el-icon-s-order" />
<span>{{ scope.row.name }}</span>
</template>
</el-table-column>
- <el-table-column
- prop="name"
- width="190"
- :show-overflow-tooltip="true"
- label="鍔熻兘"
- >
+ <el-table-column prop="name" width="190" :show-overflow-tooltip="true" label="鍔熻兘">
<template slot-scope="scope">
- <el-button
- type="primary"
- size="mini"
- @click.native.prevent.stop="deletedowfile(scope.row)"
- >鍒犻櫎</el-button
- >
- <el-button
- type="primary"
- size="mini"
- @click.native.prevent.stop="moveupdowfile(scope.row)"
- >涓婄Щ</el-button
- >
- <el-button
- type="success"
- size="mini"
- icon="el-icon-search"
- circle
- @click.native.prevent.stop="Downloadfile(scope.row)"
- ></el-button>
+ <el-button type="primary" size="mini"
+ @click.native.prevent.stop="deletedowfile(scope.row)">鍒犻櫎</el-button>
+ <el-button type="primary" size="mini"
+ @click.native.prevent.stop="moveupdowfile(scope.row)">涓婄Щ</el-button>
+ <el-button type="success" size="mini" icon="el-icon-search" circle
+ @click.native.prevent.stop="Downloadfile(scope.row)"></el-button>
</template>
</el-table-column>
</el-table>
</div>
</div>
- <div
- v-if="this.previewpdf && invoicepdfimgsrcList.length"
- class="pdfimgmin"
- >
+ <div v-if="this.previewpdf && invoicepdfimgsrcList.length" class="pdfimgmin">
<!-- <img :src="pdfimg" /> -->
- <el-image
- style="width: 95%; height: 90%"
- :src="invoicepdfimg"
- :preview-src-list="invoicepdfimgsrcList"
- >
+ <el-image style="width: 95%; height: 90%" :src="invoicepdfimg" :preview-src-list="invoicepdfimgsrcList">
<!-- <div slot="error" class="image-slot">
<i class="el-icon-picture-outline"></i>
</div> -->
</el-image>
</div>
<div v-else class="pdfimgmins">{{ hintitle }}</div>
- </div></el-tab-pane
- >
+ </div>
+ </el-tab-pane>
</el-tabs>
</el-dialog>
<el-dialog title="鎻愮ず" :visible.sync="Savereminder" width="30%">
- <el-alert
- :title="
- '鎮ㄥ凡娣诲姞' +
- totalquantity +
- '鏉℃暟鎹紝涓洪槻姝㈡暟鎹涪澶辨槸鍚︽彁浜や繚瀛樺啀缁х画娣诲姞銆�'
- "
- type="warning"
- >
+ <el-alert :title="'鎮ㄥ凡娣诲姞' +
+ totalquantity +
+ '鏉℃暟鎹紝涓洪槻姝㈡暟鎹涪澶辨槸鍚︽彁浜や繚瀛樺啀缁х画娣诲姞銆�'
+ " type="warning">
</el-alert>
<span slot="footer" class="dialog-footer">
- <el-button @click="unsave">鍙� 娑�</el-button>
<el-button type="primary" @click="Savenow">纭� 瀹�</el-button>
+ <el-button @click="unsave">鍙� 娑�</el-button>
</span>
</el-dialog>
<!-- 鎵归噺閫夊彇 -->
- <el-dialog
- title="鎵归噺鐢熸垚鏄庣粏淇℃伅"
- :visible.sync="batchdialogVisible"
- width="30%"
- >
+ <el-dialog title="鎵归噺鐢熸垚鏄庣粏淇℃伅" :visible.sync="batchdialogVisible" width="30%">
<div style="max-height: 300px; overflow-y: auto">
- <el-checkbox
- :indeterminate="isIndeterminate"
- v-model="checkAll"
- @change="handleCheckAllChange"
- >鍏ㄩ��</el-checkbox
- >
+ <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">鍏ㄩ��</el-checkbox>
<div style="margin: 15px 0;"></div>
- <el-checkbox-group
- v-model="checkedCities"
- @change="handleCheckedCitiesChange"
- >
- <el-checkbox
- border
- v-for="city in cityOptions"
- :label="city"
- :key="city.reportNo"
- >{{ city.reportName }}</el-checkbox
- >
+ <el-checkbox-group v-model="checkedCities" @change="handleCheckedCitiesChange">
+ <el-checkbox border v-for="city in cityOptions" :label="city" :key="city.reportNo">{{ city.reportName
+ }}</el-checkbox>
</el-checkbox-group>
</div>
<span slot="footer" class="dialog-footer">
- <el-button @click="batchdialogVisible = false">鍙� 娑�</el-button>
<el-button type="primary" @click="BatchentryFn">纭� 瀹�</el-button>
+ <el-button @click="batchdialogVisible = false">鍙� 娑�</el-button>
</span>
</el-dialog>
</div>
@@ -1513,8 +798,6 @@
Routinglevel: 1,
// 琛ㄥ崟鍙傛暟
form: {},
- experthear: "",
- spocewl: "",
//璐圭敤鐢宠琛ㄥ崟title
title: "",
//鐢宠鍗曠被鍨�
@@ -1534,14 +817,11 @@
userprofile: {},
//绯荤粺鐢ㄦ埛鍒楄〃
userlist: [],
- //鎵�鏈変汉鍛樿〃
- personlist: [],
- //涓撳鍒楄〃
- expertlist: [],
+ //璐﹀彿鍒楄〃
+ accountlist: [],
//鍖荤枟鏈烘瀯鍒楄〃
unitList: [],
- //璐圭敤鎶ラ攢鏈烘瀯鍒楄〃
- feeUnitList: [],
+
// 缃戠粶璇锋眰澶�
Networkheader: null,
batchdialogVisible: false,
@@ -1555,8 +835,6 @@
//鏄惁鏄笓瀹惰垂鐨凮PO瀹℃壒浜哄憳
ismanager: false,
- //涓撳璐归�夋嫨锛�1鏄笓瀹跺簱锛�2鏄柊澧�
- expertfrom: "1",
baselisttages: [
{
id: 1,
@@ -1597,9 +875,16 @@
// 闅忔満鏁�
randomnumber: "",
- //涓撳/鍗曚綅閫夋嫨锛歟xpert/unit
+ //閫夋嫨绐楀彛鏄剧ず鐘舵��
+ showselectiondialog: false,
+ //閫夋嫨鏃跺綋鍓嶈
+ selectionScope: "",
+ //閫夋嫨绫诲瀷锛氫笓瀹讹紙鍗曚綅锛夎处鎴枫�佸伐浣滃崟浣嶏紙account/workunit锛�
selectionType: "",
- showSelectionDialog: false,
+ //鍙楃泭浜烘爣绛撅細涓撳璐�-涓撳锛堝崟浣嶏級鍚嶇О锛屽尰瀛︽垚鏈�-鍔炲叕-鍗曚綅锛堜釜浜猴級鍚嶇О
+ beneficiarylabel: "",
+ //璐︽埛閫夋嫨锛�1鏄处鎴峰簱锛�2鏄柊澧�
+ accountfrom: "1",
//绋庡墠閲戦鏍囬锛氫笓瀹惰垂-绋庡墠閲戦锛涘尰瀛︽垚鏈�佸姙鍏垂鐢�-閲戦
amountLabel: "绋庡墠閲戦",
@@ -1615,60 +900,65 @@
{ required: true, message: "璇疯緭鍏ユ墍灞炰笟鍔＄粍", trigger: "blur" }
]
},
- funddrules: {
+ dialogrules: {
// expertidcardno: [{ validator: validatePass, trigger: "blur" }],
- expertdepositbank: [
+ depositbank: [
{ required: true, message: "璇疯緭鍏ュ紑鎴烽摱琛�", trigger: "change" }
],
- expertbankcardno: [
+ bankcardno: [
{ required: true, message: "璇疯緭鍏ラ摱琛屽崱鍙�", trigger: "change" }
],
- expertunitno: [
+ unitno: [
{ required: true, message: "璇烽�夋嫨鍗曚綅鍚嶇О", trigger: "change" }
]
},
- funddetailForm: {
+ accountselectform: {
index: null,
- beneficiaryname: null,
- beneficiaryno: null,
- unitno: null,
- unitname: null,
- expertname: null,
- expertidcardno: null,
- expertunitno: null,
+ usertype: 'expert',
+ accountname: null,
+ accountno: null,
expertunitname: null,
- experttitle: null,
- expertdepositbank: null,
- expertbankcardno: null
- },
-
- expertform: {
- id: null,
- address: null,
- bankcardno: null,
- branchbankname: null,
- createBy: null,
- createTime: null,
- del_flag: null,
+ expertunitno: null,
depositbank: null,
+ bankcardno: null,
idcardno: null,
- personnelunitno: null,
- pym: null,
- remark: null,
- searchValue: null,
- sex: null,
- telephone: null,
title: null,
unitname: null,
unitno: null,
- updateBy: null,
- updateTime: null,
- username: null,
- userno: null,
+ personnelunitno: null,
+ address: null,
+ telephone: null
+ },
+
+ accountform: {
+ searchValue: null,
+ id: null,
userstatus: 1,
usertype: null,
- wbm: null
+
+ pym: null,
+ wbm: null,
+ username: null,
+ userno: null,
+ sex: null,
+ idcardno: null,
+ title: null,
+ address: null,
+ telephone: null,
+ depositbank: null,
+ branchbankname: null,
+ bankcardno: null,
+ unitname: null,
+ unitno: null,
+ personnelunitno: null,
+
+ del_flag: null,
+ createBy: null,
+ createTime: null,
+ updateBy: null,
+ updateTime: null,
+ remark: null
},
//瀹℃壒鍙傛暟
checkObj: {
@@ -1763,13 +1053,13 @@
watch: {},
//鏂规硶闆嗗悎
methods: {
- bbaaccss(val) {},
+ bbaaccss(val) { },
// 娴忚鍣ㄩ〉闈㈠叧闂垨鍒锋柊鎻愮ず
beforeunloadHandler(e) {
if (
(JSON.stringify(this.form) == sessionStorage.getItem("apiform") &&
JSON.stringify(this.rbDetails) ==
- sessionStorage.getItem("apifunddetail")) ||
+ sessionStorage.getItem("apifunddetail")) ||
!sessionStorage.getItem("apifunddetail")
) {
} else {
@@ -1856,18 +1146,22 @@
if (this.businessType == "1") {
this.businessName = "涓撳鍔冲姟璐圭敵璇峰崟";
this.amountLabel = "绋庡墠閲戦";
+ this.beneficiarylabel = "涓撳鎴栧崟浣嶅悕绉�";
this.getUnitList();
} else if (this.businessType == "2") {
this.businessName = "浼︾悊涓撳鍔冲姟璐圭敵璇峰崟";
this.amountLabel = "绋庡墠閲戦";
+ this.beneficiarylabel = "涓撳鎴栧崟浣嶅悕绉�";
this.getUnitList();
} else if (this.businessType == "3") {
this.businessName = "鍖诲鎴愭湰鎶ラ攢鍗�";
this.amountLabel = "閲戦";
+ this.beneficiarylabel = "鍗曚綅鍚嶇О鎴栦釜浜�";
this.getUnitList();
} else if (this.businessType == "4") {
this.businessName = "鍔炲叕璐圭敤鎶ラ攢鍗�";
this.amountLabel = "閲戦";
+ this.beneficiarylabel = "鍗曚綅鍚嶇О鎴栦釜浜�";
this.getUnitList();
// this.getBaseInfoList();
@@ -2067,7 +1361,7 @@
handleDelete() {
this.$modal
.confirm("鏄惁纭鍒犻櫎璇ヨ褰曪紵")
- .then(function() {
+ .then(function () {
return delFund(this.curId);
})
.then(() => {
@@ -2080,7 +1374,7 @@
this.getfundList();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
})
- .catch(() => {});
+ .catch(() => { });
},
/** 涓婃姤鎸夐挳鎿嶄綔 */
@@ -2088,7 +1382,7 @@
if (
(JSON.stringify(this.form) == sessionStorage.getItem("apiform") &&
JSON.stringify(this.rbDetails) ==
- sessionStorage.getItem("apifunddetail")) ||
+ sessionStorage.getItem("apifunddetail")) ||
!sessionStorage.getItem("apifunddetail")
) {
} else {
@@ -2104,6 +1398,9 @@
//鏌ユ壘鏄惁瀛樺湪鐧昏瀹屾垚璁板綍
//鍒ゆ柇鏄惁瀛樺湪涓婃姤璁板綍
this.form.recordstatus = 0;
+ var currenttime = new Date();
+ this.form.createTime = currenttime.getFullYear() + "-" + (currenttime.getMonth() + 1) + "-" + currenttime.getDate() + " " + currenttime.getHours() + ":" + currenttime.getMinutes() + ":" + currenttime.getSeconds();
+
if (!this.form.id) {
this.form.id = this.$route.query.id;
}
@@ -2143,7 +1440,7 @@
return randomString;
},
/** 鎻愪氦鎸夐挳 */
- submitForm: debounce(function() {
+ submitForm: debounce(function () {
if (!this.randomnumber) {
this.randomnumber = this.generateRandomString(9);
this.form.randomnumber = this.randomnumber;
@@ -2159,8 +1456,8 @@
if (tempDetail.itemid == null) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (k + 1).toString() +
- "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�"
+ (k + 1).toString() +
+ "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -2185,8 +1482,8 @@
if (tempDetail.servicesscope == null) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (k + 1).toString() +
- "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�"
+ (k + 1).toString() +
+ "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -2194,8 +1491,8 @@
if (tempDetail.beneficiaryno == null) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (k + 1).toString() +
- "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�"
+ (k + 1).toString() +
+ "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -2242,8 +1539,8 @@
) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (j + 1).toString() +
- "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
+ (j + 1).toString() +
+ "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -2257,8 +1554,8 @@
) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (j + 1).toString() +
- "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
+ (j + 1).toString() +
+ "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -2375,13 +1672,13 @@
// },
checksubmit() {
console.log(this.checkObj.flowlevelone);
- if(this.userprofile.nickName == "闄堟厱鍗�"){
+ if (this.userprofile.nickName == "闄堟厱鍗�") {
//妫�鏌ユ槸鍚︽敹鍒扮焊璐ㄦ潗鏂�
- if ( this.form.checkstatus != 3 && this.checkObj.flowlevelone == 1 ) {
+ if (this.form.checkstatus != 3 && this.checkObj.flowlevelone == 1) {
this.$modal.msgError("璇风‘璁ゆ姤閿�鐨勭焊璐ㄦ潗鏂欏凡缁忔敹鍒帮紒");
return;
- }
-
+ }
+
//妫�鏌ヤ釜绋庤绠�
// if ( (this.form.applytype == "1" || this.form.applytype == "2") && this.form.fundtaxtime == null ) {
// this.$modal.msgError(
@@ -2389,7 +1686,7 @@
// );
// return;
// }
- if ( (this.form.applytype == "1") && this.form.fundtaxtime == null ) {
+ if ((this.form.applytype == "1") && this.form.fundtaxtime == null) {
this.$modal.msgError(
"鎻愪氦涓撳璐圭敤鐢宠鍗曞鏍革紝闇�瑕佸厛瀹屾垚涓◣璁＄畻锛�"
);
@@ -2447,67 +1744,43 @@
});
},
- //鑾峰彇鎵�鏈変笓瀹�/鍖荤枟鏈烘瀯/璐圭敤鎶ラ攢鏈烘瀯鍒楄〃
- getExternalList() {
+ //鑾峰彇涓撳銆佸崟浣嶆満鏋勭殑璐︽埛鍒楄〃
+ getAccountList() {
listExternalperson().then(res => {
- this.personlist = res.rows;
- for (let j = 0; j < this.personlist.length; j++) {
- //鑾峰彇璐圭敤鎶ラ攢鏈烘瀯鍒楄〃
- if (this.personlist[j].usertype == "org") {
- this.feeUnitList.push({
- id: this.personlist[j].id,
- reportNo: this.personlist[j].userno,
- reportName: this.personlist[j].username,
- depositbank: this.personlist[j].depositbank,
- branchbankname: this.personlist[j].branchbankname,
- bankcardno: this.personlist[j].bankcardno
+ this.accountlist = res.rows;
+ /**
+ for (let j = 0; j < this.accountlist.length; j++) {
+ //鍗曚綅璐﹀彿鍒楄〃
+ if (this.accountlist[j].usertype == "org") {
+ this.feeAccountList.push({
+ id: this.accountlist[j].id,
+ reportNo: this.accountlist[j].userno,
+ reportName: this.accountlist[j].username,
+ depositbank: this.accountlist[j].depositbank,
+ branchbankname: this.accountlist[j].branchbankname,
+ bankcardno: this.accountlist[j].bankcardno
});
}
- //涓撳浜哄憳鍒楄〃
+ //涓撳璐﹀彿鍒楄〃
else if (res.rows[j].usertype == "expert") {
- this.expertlist.push({
- expertNo: this.personlist[j].id,
- exportName: this.personlist[j].username
+ this.expertAccountList.push({
+ expertNo: this.accountlist[j].id,
+ exportName: this.accountlist[j].username+"("+this.accountlist[j].id+")"
});
}
}
+ */
});
},
//鑾峰彇缁忓姙浜鸿处鍙蜂俊鎭�
getUserAccount() {
- this.personlist.map(res => {
+ this.accountlist.map(res => {
if (res.username == this.form.username) {
this.form.bankname = res.depositbank; //res.branchbankname銆乺es.depositbank;
this.form.bankcardno = res.bankcardno;
this.form.phone = res.telephone;
}
- });
- },
-
- //鑾峰彇涓撳浜哄憳鍒楄〃
- getExpertList() {
- let types = ["expert"];
- let templist = [];
- for (let i = 0; i < types.length; i++) {
- templist = [];
- listReportname(types[i]).then(res => {
- for (let j = 0; j < res.data.length; j++) {
- templist.push({
- reportName: res.data[j].reportName,
- reportNo: res.data[j].reportNo
- });
- }
- this.expertlist = this.expertlist.concat(templist);
- });
- }
- },
-
- //鑾峰彇璐圭敤鏈烘瀯鍒楄〃
- getFeeUnitList() {
- listReportname("org").then(res => {
- this.feeUnitList = res.data;
- console.log(this.feeUnitList);
});
},
@@ -2796,8 +2069,8 @@
if (tempDetail.itemid == null) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (k + 1).toString() +
- "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�"
+ (k + 1).toString() +
+ "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -2806,8 +2079,8 @@
if (tempDetail.servicesscope == null) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (k + 1).toString() +
- "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�"
+ (k + 1).toString() +
+ "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -2815,8 +2088,8 @@
if (tempDetail.beneficiaryno == null) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (k + 1).toString() +
- "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�"
+ (k + 1).toString() +
+ "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -2863,8 +2136,8 @@
) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (j + 1).toString() +
- "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
+ (j + 1).toString() +
+ "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -2878,8 +2151,8 @@
) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (j + 1).toString() +
- "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
+ (j + 1).toString() +
+ "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -2929,7 +2202,7 @@
}
this.Getnetworkheader();
this.getroute();
- this.getExternalList();
+ this.getAccountList();
this.getUserList();
this.getUserProfile();
} else {
@@ -3254,7 +2527,7 @@
},
//鏂囦欢涓婁紶
- handleUploadError() {},
+ handleUploadError() { },
remove(file, fileList) {
const rbDetails = [...this.rbDetails];
if (this.activeName == 1) {
@@ -3463,176 +2736,163 @@
window.location.href = this.Networkheader + "/prod-api" + row.url;
},
//涓撳/鍖荤枟鏈烘瀯/璐圭敤鎶ラ攢鏈烘瀯閫夋嫨
- ShowDetailDialog(spoce, showType) {
- this.spocewl = spoce;
- this.selectionType = showType;
- if (this.businessType == 4 || this.businessType == 3 || !showType) {
- this.selectionType = this.experthear;
+ showSelectionDialog(scope, selectiontype) {
+ this.selectionScope = scope;
+ this.selectionType = selectiontype;
+ this.accountselectform.index = scope.$index;
+
+ if (this.selectionType == "account") {
+ //榛樿浠庤处鎴峰簱閫夋嫨锛�1,璐︽埛搴擄紱2锛屾柊寤鸿处鎴�
+ this.accountfrom = "1";
+
+ this.accountselectform.accountno = scope.row.beneficiaryno;
+ this.accountselectform.accountname = scope.row.beneficiaryname;
+ this.accountselectform.expertunitname = "";
+ this.accountselectform.expertunitno = "";
+ this.accountselectform.unitno = "";
+ this.accountselectform.unitname = "";
+ this.accountselectform.telephone = "";
+ this.accountselectform.idcardno = "";
+ this.accountselectform.title = "";
+ this.accountselectform.unitno = "";
+ this.accountselectform.unitname = "";
+ this.accountselectform.depositbank = "";
+ this.accountselectform.bankcardno = "";
+ this.accountselectform.personnelunitno = "";
+ this.accountselectform.address = "";
+ this.accountselectform.telephone = "";
+ } else if (this.selectionType == "workunit") {
+ this.accountselectform.expertunitname = scope.row.unitname;
+ this.accountselectform.expertunitno = scope.row.unitno;
}
- this.expertfrom = "1";
- console.log(spoce);
- this.funddetailForm.index = spoce.$index;
- this.funddetailForm.beneficiaryno = spoce.row.beneficiaryno;
- this.funddetailForm.beneficiaryname = spoce.row.beneficiaryname;
- this.funddetailForm.unitno = spoce.row.unitno;
- this.funddetailForm.unitname = spoce.row.unitname;
- this.funddetailForm.expertname = "";
- this.funddetailForm.expertidcardno = "";
- this.funddetailForm.expertunitno = "";
- this.funddetailForm.expertunitname = "";
- this.funddetailForm.experttitle = "";
- this.funddetailForm.expertdepositbank = "";
- this.funddetailForm.expertbankcardno = "";
-
- this.showSelectionDialog = true;
+ this.showselectiondialog = true;
},
//涓撳/鍖荤枟鏈烘瀯/璐圭敤鎶ラ攢鏈烘瀯閫夋嫨
- ConfirmDetailDialog() {
- this.$refs["funddetailForm"].validate(valid => {
- let tempIndex = this.funddetailForm.index;
- let tempExpertName = this.funddetailForm.beneficiaryname;
- let tempUnitname = this.funddetailForm.unitname;
- let singleDetail = this.rbDetails[tempIndex];
+ confirmSelectionDialog() {
+ this.$refs["accountselectform"].validate(valid => {
+ let tempIndex = this.accountselectform.index;
+ if (this.selectionType == "account") {
+ if (this.accountfrom == "1") {
+ //璧嬪�间俊鎭�
+ this.accountlist.map(res => {
+ if (res.username == this.accountselectform.accountname) {
+ this.rbDetails[tempIndex].beneficiaryno = res.userno;
+ this.rbDetails[tempIndex].beneficiaryname = res.username;
+ this.rbDetails[tempIndex].depositbank = res.depositbank;
+ this.rbDetails[tempIndex].branchbankname = res.branchbankname;
+ this.rbDetails[tempIndex].bankcardno = res.bankcardno;
+ this.rbDetails[tempIndex].phone = res.telephone;
- if (
- this.selectionType == "expert" ||
- this.businessType == 4 ||
- this.businessType == 3
- ) {
- if (this.expertfrom == "1" || this.experthear == "unit") {
- //浠庝笓瀹跺垪琛ㄨ幏鍙栦俊鎭�
- this.personlist.map(res => {
- if (tempExpertName == res.username) {
- singleDetail.beneficiaryno = res.userno;
- singleDetail.beneficiaryname = res.username;
- singleDetail.bankcardno = res.bankcardno;
- singleDetail.branchbankname = res.branchbankname;
- singleDetail.depositbank = res.depositbank;
- singleDetail.idcardno = res.idcardno;
- singleDetail.phone = res.telephone;
- singleDetail.title = res.title;
- singleDetail.unitname = res.unitname;
- singleDetail.unitno = parseInt(res.unitno);
+ if (res.usertype == 'org') {
+ this.rbDetails[tempIndex].idcardno = "";
+ this.rbDetails[tempIndex].title = "";
+ this.rbDetails[tempIndex].unitno = "";
+ this.rbDetails[tempIndex].unitname = "";
+ } else {
+ this.rbDetails[tempIndex].idcardno = res.idcardno;
+ this.rbDetails[tempIndex].title = res.title;
+ this.rbDetails[tempIndex].unitno = parseInt(res.unitno);
+ this.rbDetails[tempIndex].unitname = res.unitname;
+ }
}
});
- } else {
- //淇濆瓨鏂板涓撳
- this.expertform.id = null;
- this.expertform.userno =
- this.personlist[this.personlist.length - 1].id + 1;
- this.expertform.usertype = "expert";
- this.expertform.username = this.funddetailForm.expertname;
- this.expertform.idcardno = this.funddetailForm.expertidcardno;
- this.expertform.sex = null;
- this.expertform.telephone = null;
- this.expertform.address = null;
- this.expertform.wbm = null;
- this.expertform.pym = null;
+ } else if (this.accountfrom == "2") {
+ //淇濆瓨鏂板璐﹀彿
+ this.accountform.id = null;
+ this.accountform.userno = this.accountlist[this.accountlist.length - 1].id + 1;
+ this.accountform.usertype = this.accountselectform.usertype;
+ this.accountform.username = this.accountselectform.username;
+ this.accountform.idcardno = this.accountselectform.idcardno;
+ this.accountform.sex = null;
+ this.accountform.title = this.accountselectform.title;
+ this.accountform.telephone = this.accountselectform.telephone;
+ this.accountform.address = this.accountselectform.address;
+ this.accountform.wbm = null;
+ this.accountform.pym = null;
- this.expertform.unitno = this.funddetailForm.expertunitno;
- try {
- let unitIndex = this.unitList.findIndex(
- item => this.expertform.unitno == item.organizationid
- );
- if (unitIndex > -1) {
- this.expertform.unitname = this.unitList[
- unitIndex
- ].organizationname;
- } else {
- this.expertform.unitname = this.expertform.unitno;
- }
- } catch {
- this.expertform.unitname = this.expertform.unitno;
+ this.accountform.depositbank = this.accountselectform.depositbank;
+ this.accountform.bankcardno = this.accountselectform.bankcardno;
+ this.accountform.branchbankname = null;
+ this.accountform.remark = null;
+ this.accountform.del_flag = "0";
+ this.accountform.personnelunitno = null;
+
+ if (this.accountselectform.usertype != 'org') {
+ this.accountform.unitno = this.accountselectform.unitno;
+ this.unitList.map(res => {
+ if (res.organizationid == this.accountform.unitno) {
+ this.accountform.unitname = res.organizationname;
+ }
+ });
+ // try {
+ // let unitIndex = this.unitList.findIndex(
+ // item => this.accountform.unitno == item.organizationid
+ // );
+ // if (unitIndex > -1) {
+ // this.accountform.unitname = this.unitList[unitIndex].organizationname;
+ // } else {
+ // this.accountform.unitname = this.accountform.unitno;
+ // }
+ // } catch {
+ // this.accountform.unitname = this.accountform.unitno;
+ // }
}
- this.expertform.title = this.funddetailForm.experttitle;
- this.expertform.personnelunitno = null;
-
- this.expertform.depositbank = this.funddetailForm.expertdepositbank;
- this.expertform.bankcardno = this.funddetailForm.expertbankcardno;
- this.expertform.branchbankname = null;
- this.expertform.remark = null;
- this.expertform.del_flag = "0";
-
- addExternalperson(this.expertform).then(response => {
+ addExternalperson(this.accountform).then(response => {
if (response.code == 200) {
- this.$modal.msgSuccess("鏂板涓撳淇℃伅鎴愬姛锛�");
+ //this.$modal.msgSuccess("鏂扮殑涓撳鎴栧崟浣嶈处鎴蜂俊鎭凡娣诲姞鎴愬姛锛�");
+ this.accountselectform.accountno = this.accountselectform.userno;
+ this.accountselectform.accountname = this.accountselectform.username;
+ //閲嶆柊鑾峰彇璐︽埛鍒楄〃
listExternalperson().then(res => {
- this.personlist = res.rows;
- //浠庝笓瀹跺垪琛ㄨ幏鍙栦俊鎭�
- this.personlist.map(res => {
- if (res.username == this.funddetailForm.expertname) {
- singleDetail.beneficiaryno = res.userno;
- singleDetail.beneficiaryname = res.username;
- singleDetail.bankcardno = res.bankcardno;
- singleDetail.branchbankname = res.branchbankname;
- singleDetail.depositbank = res.depositbank;
- singleDetail.idcardno = res.idcardno;
- singleDetail.phone = res.telephone;
- singleDetail.title = res.title;
- singleDetail.unitname = res.unitname;
- singleDetail.unitno = parseInt(res.unitno);
+ this.accountlist = res.rows;
+
+ //璧嬪�间俊鎭�
+ this.accountlist.map(res => {
+ if (res.username == this.accountselectform.accountname) {
+ this.rbDetails[tempIndex].beneficiaryno = res.userno;
+ this.rbDetails[tempIndex].beneficiaryname = res.username;
+ this.rbDetails[tempIndex].depositbank = res.depositbank;
+ this.rbDetails[tempIndex].branchbankname = res.branchbankname;
+ this.rbDetails[tempIndex].bankcardno = res.bankcardno;
+ this.rbDetails[tempIndex].phone = res.telephone;
+
+ if (res.usertype == 'org') {
+ this.rbDetails[tempIndex].idcardno = "";
+ this.rbDetails[tempIndex].title = "";
+ this.rbDetails[tempIndex].unitno = "";
+ this.rbDetails[tempIndex].unitname = "";
+ } else {
+ this.rbDetails[tempIndex].idcardno = res.idcardno;
+ this.rbDetails[tempIndex].title = res.title;
+ this.rbDetails[tempIndex].unitno = parseInt(res.unitno);
+ this.rbDetails[tempIndex].unitname = res.unitname;
+ }
}
});
});
}
});
}
- } else if (this.selectionType == "unit") {
- singleDetail.unitno = this.funddetailForm.unitno;
- if (this.businessType == 1 || this.businessType == 2) {
- try {
- let unitIndex = this.unitList.findIndex(
- item => singleDetail.unitno == item.organizationid
- );
- if (unitIndex > -1) {
- singleDetail.unitname = this.unitList[
- unitIndex
- ].organizationname;
- } else {
- singleDetail.unitname = singleDetail.unitno;
- }
- } catch {
- singleDetail.unitname = singleDetail.unitno;
+ } else if (this.selectionType == "workunit") {
+ this.rbDetails[tempIndex].unitno = this.accountselectform.expertunitno;
+ this.unitList.map(res => {
+ if (res.organizationid == this.accountform.unitno) {
+ this.rbDetails[tempIndex].unitno.unitname = res.organizationname;
}
- } else if (this.businessType == 3 || this.businessType == 4) {
- try {
- let unitIndex = this.feeUnitList.findIndex(
- item => singleDetail.unitno == item.reportNo
- );
- if (unitIndex > -1) {
- singleDetail.unitname = this.feeUnitList[unitIndex].reportName;
- singleDetail.depositbank = this.feeUnitList[
- unitIndex
- ].depositbank;
- singleDetail.bankcardno = this.feeUnitList[
- unitIndex
- ].bankcardno;
- } else {
- singleDetail.unitname = singleDetail.unitno;
- }
- } catch {
- singleDetail.unitname = singleDetail.unitno;
- }
- }
+ });
}
- // if (this.experthear == "unit") {
- // singleDetail.unitname = "";
- // }
- if (this.businessType == 4 || this.businessType == 3) {
- singleDetail.beneficiaryname = this.funddetailForm.beneficiaryname;
- }
- this.rbDetails[tempIndex] = singleDetail;
- this.showSelectionDialog = false;
+ //鍏抽棴绐楀彛
+ this.showselectiondialog = false;
});
},
tableParValueChange(row, tto) {
const regex = /^[1-9]\d{5}(19|20)\d{2}(0[1-9]|1[012])(0[1-9]|[12]\d|3[01])\d{3}([0-9]|X)$/;
if (tto) {
- if (regex.test(funddetailForm.expertidcardno)) {
+ if (regex.test(accountselectform.expertidcardno)) {
row.error = "";
} else {
row.error = "韬唤璇佸彿鐮佹牸寮忛敊璇�";
@@ -3653,8 +2913,7 @@
//鑾峰彇璺敱鍙傛暟
this.Getnetworkheader();
this.getroute();
- this.getExternalList();
- this.getFeeUnitList();
+ this.getAccountList();
},
//鐢熷懡鍛ㄦ湡 - 鎸傝浇瀹屾垚锛堝彲浠ヨ闂瓺OM鍏冪礌锛�
@@ -3662,25 +2921,23 @@
window.addEventListener("beforeunload", e => this.beforeunloadHandler(e));
this.getUserList();
this.getUserProfile();
- let apifunddetailForm = this.funddetailForm;
+ let apiaccountselectform = this.accountselectform;
let apiform = this.form;
-
- // this.getFeeUnitList();
},
beforeRouteLeave(to, from, next) {
// 鎵ц閿�姣佹搷浣�
this.$destroy();
next();
},
- beforeCreate() {}, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠
- beforeMount() {}, //鐢熷懡鍛ㄦ湡 - 鎸傝浇涔嬪墠
- beforeUpdate() {}, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪墠
- updated() {}, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗
- beforeDestroy() {}, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓�
+ beforeCreate() { }, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠
+ beforeMount() { }, //鐢熷懡鍛ㄦ湡 - 鎸傝浇涔嬪墠
+ beforeUpdate() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪墠
+ updated() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗
+ beforeDestroy() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓�
destroyed() {
window.removeEventListener("beforeunload", e => this.beforeunloadFn(e));
}, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴�
- activated() {} //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂
+ activated() { } //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂
};
</script>
@@ -3763,7 +3020,7 @@
line-height: 25px;
}
-::v-deep .el-checkbox.is-bordered + .el-checkbox.is-bordered {
+::v-deep .el-checkbox.is-bordered+.el-checkbox.is-bordered {
margin-left: 0 !important;
margin-bottom: 10px;
}
diff --git a/src/views/project/fund/ethicalExpertFeeApply/index.vue b/src/views/project/fund/ethicalExpertFeeApply/index.vue
index e07dd2b..7b4dbdf 100644
--- a/src/views/project/fund/ethicalExpertFeeApply/index.vue
+++ b/src/views/project/fund/ethicalExpertFeeApply/index.vue
@@ -1,63 +1,31 @@
<!-- -->
<template>
<div class="app-container">
- <el-form
- :model="queryParams"
- ref="queryForm"
- :inline="true"
- label-width="70px"
- >
+ <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="70px">
<el-row align="left">
<el-col :span="6">
<el-form-item label="濮撳悕" prop="name">
- <el-input
- v-model="queryParams.name"
- placeholder="璇疯緭鍏ュ鍚�"
- clearable
- size="small"
- @keyup.enter.native="handleQuery"
- />
+ <el-input v-model="queryParams.name" placeholder="璇疯緭鍏ュ鍚�" clearable size="small"
+ @keyup.enter.native="handleQuery" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="鎹愮尞杩涘害" prop="recordstate">
- <el-select
- v-model="queryParams.recordstate"
- placeholder="璇烽�夋嫨璁板綍鐘舵��"
- clearable
- size="small"
- >
- <el-option
- v-for="dict in dict.type.sys_DonationStatus"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
+ <el-select v-model="queryParams.recordstate" placeholder="璇烽�夋嫨璁板綍鐘舵��" clearable size="small">
+ <el-option v-for="dict in dict.type.sys_DonationStatus" :key="dict.value" :label="dict.label"
+ :value="dict.value" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="鎹愮尞鑰�" prop="name">
- <el-input
- v-model="queryParams.donorname"
- placeholder="璇疯緭鍏ユ崘鐚�呭鍚�"
- clearable
- size="small"
- @keyup.enter.native="handleQuery"
- />
+ <el-input v-model="queryParams.donorname" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" clearable size="small"
+ @keyup.enter.native="handleQuery" />
</el-form-item>
</el-col>
<el-col :span="6">
- <el-button
- type="primary"
- icon="el-icon-search"
- size="mini"
- @click="handleQuery"
- >鎼滅储</el-button
- >
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
- >閲嶇疆</el-button
- >
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
</el-col>
</el-row>
</el-form>
@@ -71,32 +39,18 @@
</el-row>
</el-col>
</el-row>
- <el-table
- v-loading="loading"
- border
- highlight-current-row
- :data="donatebaseinfoList"
- @row-click="selectDonotor"
- >
+ <el-table v-loading="loading" border highlight-current-row :data="donatebaseinfoList"
+ @row-click="selectDonotor">
<!-- <el-table-column label="鎹愮尞缂栧彿" align="center" prop="donorno" /> -->
<el-table-column label="鎹愮尞杩涘害" align="center" prop="recordstate">
<template slot-scope="scope">
- <dict-tag
- :options="dict.type.sys_DonationStatus"
- :value="scope.row.recordstate"
- />
+ <dict-tag :options="dict.type.sys_DonationStatus" :value="scope.row.recordstate" />
</template>
</el-table-column>
<el-table-column label="濮撳悕" align="center" prop="name" />
</el-table>
- <pagination
- v-show="total > 0"
- :total="total"
- small
- :page.sync="queryParams.pageNum"
- :limit.sync="queryParams.pageSize"
- @pagination="getBaseInfoList"
- />
+ <pagination v-show="total > 0" :total="total" small :page.sync="queryParams.pageNum"
+ :limit.sync="queryParams.pageSize" @pagination="getBaseInfoList" />
</el-card>
</el-col>
<el-col :span="18">
@@ -105,10 +59,7 @@
<el-row :gutter="4" align="right" class="mb8">
<el-col :span="9">
<el-form-item label="鎹愮尞缂栧彿">
- <el-input
- v-model="curCase.donorno"
- :disabled="true"
- ></el-input>
+ <el-input v-model="curCase.donorno" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="9">
@@ -119,146 +70,54 @@
</el-row>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-plus"
- size="mini"
- @click="handleAdd"
- v-hasPermi="['project:ethicalfund:add']"
- >鏂板鐢宠鍗�</el-button
- >
+ <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+ v-hasPermi="['project:ethicalfund:add']">鏂板鐢宠鍗�</el-button>
</el-col>
</el-row>
<el-row>
- <el-table
- v-loading="loading"
- border
- :data="donateconsolationfundList"
- >
- <el-table-column
- label="鐢宠鏃ユ湡"
- align="center"
- prop="createTime"
- width="150px"
- >
+ <el-table v-loading="loading" border :data="donateconsolationfundList">
+ <el-table-column label="鐢宠鏃ユ湡" align="center" prop="createTime" width="150px">
<template slot-scope="scope">
<span>{{
parseTime(scope.row.createTime, "{y}-{m}-{d}")
}}</span>
</template>
</el-table-column>
- <el-table-column
- label="鐢宠浜�"
- align="center"
- prop="username"
- width="120px"
- />
- <el-table-column
- label="鐢宠閲戦"
- align="center"
- prop="pretaxcost"
- width="200px"
- />
- <el-table-column
- label="鎵�灞炵粍鍒�"
- align="center"
- prop="deptmentname"
- width="200px"
- />
- <el-table-column
- label="缁勯暱"
- align="center"
- prop="managername"
- width="150px"
- />
- <el-table-column
- label="瀹℃牳鐘舵��"
- align="center"
- prop="recordstatus"
- >
+ <el-table-column label="鐢宠浜�" align="center" prop="username" width="120px" />
+ <el-table-column label="鐢宠閲戦" align="center" prop="pretaxcost" width="200px" />
+ <el-table-column label="鎵�灞炵粍鍒�" align="center" prop="deptmentname" width="200px" />
+ <el-table-column label="缁勯暱" align="center" prop="managername" width="150px" />
+ <el-table-column label="瀹℃牳鐘舵��" align="center" prop="recordstatus">
<template slot-scope="scope">
- <dict-tag
- :options="dict.type.sys_recordstatus"
- :value="scope.row.recordstatus"
- />
+ <dict-tag :options="dict.type.sys_recordstatus" :value="scope.row.recordstatus" />
</template>
</el-table-column>
- <el-table-column
- label="鐢宠鏉愭枡鐘舵��"
- width="140"
- align="center"
- prop="checkstatus"
- >
+ <el-table-column label="鐢宠鏉愭枡鐘舵��" width="140" align="center" prop="checkstatus">
<template slot-scope="scope">
- <dict-tag
- :options="dict.type.sys_stage_type"
- :value="scope.row.checkstatus"
- />
+ <dict-tag :options="dict.type.sys_stage_type" :value="scope.row.checkstatus" />
</template>
</el-table-column>
<!--
<el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="phone" width="150px" />
<el-table-column label="宸ヤ綔鍗曚綅" align="center" prop="unitname" width="220px" />
-->
- <el-table-column
- label="鎿嶄綔"
- fixed="right"
- align="center"
- class-name="small-padding fixed-width"
- width="280px"
- >
+ <el-table-column label="鎿嶄綔" fixed="right" align="center" class-name="small-padding fixed-width"
+ width="280px">
<template slot-scope="scope">
- <el-button
- v-if="
- scope.row.recordstatus == -1 ||
- scope.row.recordstatus == 1
- "
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleup(scope.row)"
- >涓婃姤</el-button
- >
- <el-button
- v-if="
- scope.row.recordstatus == -1 ||
- scope.row.recordstatus == 1
- "
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['project:ethicalfund:edit']"
- >淇敼</el-button
- >
- <el-button
- size="mini"
- type="text"
- icon="el-icon-view"
- @click="handleDetail(scope.row)"
- >鏌ョ湅</el-button
- >
- <el-button
- v-if="
- scope.row.recordstatus == -1 ||
- scope.row.recordstatus == 1
- "
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['project:ethicalfund:delete']"
- >鍒犻櫎</el-button
- >
- <el-button
- size="mini"
- type="text"
- icon="el-icon-download"
- @click="mixExport(scope.row.id)"
- v-hasPermi="['project:ethicalfund:download']"
- >涓嬭浇</el-button
- >
+ <el-button v-if="scope.row.recordstatus == -1 ||
+ scope.row.recordstatus == 1
+ " size="mini" type="text" icon="el-icon-edit" @click="handleup(scope.row)">涓婃姤</el-button>
+ <el-button v-if="scope.row.recordstatus == -1 ||
+ scope.row.recordstatus == 1
+ " size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+ v-hasPermi="['project:ethicalfund:edit']">淇敼</el-button>
+ <el-button size="mini" type="text" icon="el-icon-view" @click="handleDetail(scope.row)">鏌ョ湅</el-button>
+ <el-button v-if="scope.row.recordstatus == -1 ||
+ scope.row.recordstatus == 1
+ " size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+ v-hasPermi="['project:ethicalfund:delete']">鍒犻櫎</el-button>
+ <el-button size="mini" type="text" icon="el-icon-download" @click="mixExport(scope.row.id)"
+ v-hasPermi="['project:ethicalfund:download']">涓嬭浇</el-button>
</template>
</el-table-column>
</el-table>
@@ -269,134 +128,72 @@
</el-row>
<!-- 娣诲姞鎴栦慨鏀硅垂鐢ㄧ敵璇峰崟 -->
- <el-dialog
- :visible.sync="dialogOpen"
- :close-on-click-modal="false"
- width="1400px"
- :title="title"
- style="text-align: center"
- v-loading="loading"
- >
+ <el-dialog :visible.sync="dialogOpen" :close-on-click-modal="false" width="1400px" :title="title"
+ style="text-align: center" v-loading="loading">
<el-form ref="form" :model="form" label-width="120px" :rules="rules">
<el-row style="text-align: left">
<el-col :span="5">
<el-form-item label="鐢宠鏃ユ湡" prop="createTime">
- <el-date-picker
- clearable
- style="width: 100%"
- v-model="form.createTime"
- type="date"
- value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="鐢宠鏃ユ湡"
- >
+ <el-date-picker clearable style="width: 100%" v-model="form.createTime" type="date"
+ value-format="yyyy-MM-dd HH:mm:ss" placeholder="鐢宠鏃ユ湡">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="缁忓姙浜�" prop="username">
- <el-select
- v-model="form.username"
- placeholder="缁忓姙浜�"
- clearable
- filterable
- allow-create
- style="width: 100%"
- >
- <el-option
- v-for="dict in userlist"
- :key="dict.index"
- :label="dict.nickname"
- :value="dict.nickname"
- ></el-option>
+ <el-select v-model="form.username" placeholder="缁忓姙浜�" clearable filterable allow-create style="width: 100%">
+ <el-option v-for="dict in userlist" :key="dict.index" :label="dict.nickname"
+ :value="dict.nickname"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="鎵�灞炵粍鍒�" prop="deptmentname">
- <el-input
- v-model="form.deptmentname"
- placeholder="璇疯緭鍏ユ墍灞炵粍鍒�"
- clearable
- />
+ <el-input v-model="form.deptmentname" placeholder="璇疯緭鍏ユ墍灞炵粍鍒�" clearable />
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="缁勯暱" prop="managername">
- <el-input
- v-model="form.managername"
- placeholder="璇疯緭鍏ョ粍闀�"
- clearable
- />
+ <el-input v-model="form.managername" placeholder="璇疯緭鍏ョ粍闀�" clearable />
</el-form-item>
</el-col>
</el-row>
<el-row style="text-align: left">
<el-col :span="5">
<el-form-item label="鐢宠绫诲瀷">
- <el-radio v-model="form.applytype" label="2"
- >浼︾悊瀹℃煡涓撳璐圭敵璇�</el-radio
- >
- </el-form-item> </el-col
- ><el-col :span="10">
+ <el-radio v-model="form.applytype" label="2">浼︾悊瀹℃煡涓撳璐圭敵璇�</el-radio>
+ </el-form-item> </el-col><el-col :span="10">
<el-form-item label="鐢宠璇存槑" prop="remark">
<el-input v-model="form.remark" placeholder="鐢宠璇存槑" />
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="鎹愮尞鑰�" prop="donorname">
- <el-input
- :disabled="true"
- v-model="form.donorname"
- placeholder="璇疯緭鍏ユ崘鐚�呭鍚�"
- clearable
- />
+ <el-input :disabled="true" v-model="form.donorname" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" clearable />
</el-form-item>
</el-col>
</el-row>
- <el-row style="text-align: left"
- ><el-col :span="5">
+ <el-row style="text-align: left"><el-col :span="5">
<el-form-item label="鐢宠閲戦" prop="amountrequested">
- <el-input
- v-model="form.amountrequested"
- placeholder="鐢宠閲戦"
- :disabled="true"
- />
+ <el-input v-model="form.amountrequested" placeholder="鐢宠閲戦" :disabled="true" />
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="绋庡墠閲戦" prop="pretaxcost">
- <el-input
- v-model="form.pretaxcost"
- placeholder="绋庡墠閲戦鍚堣"
- :disabled="true"
- />
+ <el-input v-model="form.pretaxcost" placeholder="绋庡墠閲戦鍚堣" :disabled="true" />
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="绋庡悗閲戦" prop="pretaxcost">
- <el-input
- v-model="form.taxedcost"
- placeholder="绋庡悗閲戦鍚堣"
- :disabled="true"
- />
+ <el-input v-model="form.taxedcost" placeholder="绋庡悗閲戦鍚堣" :disabled="true" />
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="瀹℃牳鐘舵��" prop="recordstatus">
<!-- <el-input v-model="form.recordstatus" placeholder="瀹℃牳鎰忚" /> -->
- <el-select
- v-model="form.recordstatus"
- placeholder="璇烽�夋嫨瀹℃牳鐘舵��"
- clearable
- size="small"
- :disabled="true"
- >
- <el-option
- v-for="dict in dict.type.sys_recordstatus"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
+ <el-select v-model="form.recordstatus" placeholder="璇烽�夋嫨瀹℃牳鐘舵��" clearable size="small" :disabled="true">
+ <el-option v-for="dict in dict.type.sys_recordstatus" :key="dict.value" :label="dict.label"
+ :value="dict.value" />
</el-select>
</el-form-item>
</el-col>
@@ -415,294 +212,130 @@
</el-row>
<el-row style="margin-bottom: 10px">
<el-col :span="4">
- <el-button
- @click.native.prevent="addAlls"
- type="primary"
- size="small"
- >
+ <el-button @click.native.prevent="addAlls" type="primary" size="small">
瀵煎叆鏈嶅姟椤圭洰
</el-button>
</el-col>
</el-row>
<el-row style="margin-top: 5px; margin-bottom: 5px">
<el-table :data="fundDetailArr" border highlight-current-row>
- <el-table-column
- prop="orderno"
- align="center"
- label="鎺掑簭"
- width="80"
- >
+ <el-table-column prop="orderno" align="center" label="鎺掑簭" width="80">
<template slot-scope="scope">
<el-input v-model="scope.row.orderno" placeholder="鎺掑簭" />
</template>
</el-table-column>
- <el-table-column
- prop="itemtype"
- align="center"
- label="璐圭敤绫诲瀷"
- width="220"
- >
+ <el-table-column prop="itemtype" align="center" label="璐圭敤绫诲瀷" width="220">
<template slot-scope="scope">
- <el-select
- v-model="scope.row.applytype"
- placeholder="璐圭敤绫诲瀷"
- @change="LoadItemTypeArr(scope.row)"
- >
- <el-option
- v-for="dict in fundtypeArr"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
+ <el-select v-model="scope.row.applytype" placeholder="璐圭敤绫诲瀷" @change="LoadItemTypeArr(scope.row)">
+ <el-option v-for="dict in fundtypeArr" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
</el-select>
</template>
</el-table-column>
- <el-table-column
- prop="itemtype"
- align="center"
- label="鏈嶅姟椤圭洰"
- width="260"
- >
+ <el-table-column prop="itemtype" align="center" label="鏈嶅姟椤圭洰" width="260">
<template slot-scope="scope">
- <el-select
- v-model="scope.row.itemid"
- placeholder="鏈嶅姟椤圭洰"
- @change="select(scope.row)"
- clearable
- filterable
- allow-create
- :filter-method="val => SearchItem(val, scope)"
- >
- <el-option
- v-for="dict in scope.row.itemArr"
- :key="dict.index"
- :label="dict.itemName"
- :value="dict.id"
- ></el-option>
+ <el-select v-model="scope.row.itemid" placeholder="鏈嶅姟椤圭洰" @change="select(scope.row)" clearable filterable
+ allow-create :filter-method="val => SearchItem(val, scope)">
+ <el-option v-for="dict in scope.row.itemArr" :key="dict.index" :label="dict.itemName"
+ :value="dict.id"></el-option>
</el-select>
</template>
</el-table-column>
- <el-table-column
- prop="beneficiaryno"
- align="center"
- label="濮撳悕"
- width="120"
- v-if="form.applytype != 3"
- >
+ <el-table-column prop="beneficiaryno" align="center" label="濮撳悕" width="120" v-if="form.applytype != 3">
<template slot-scope="scope">
- <el-button
- type="primary"
- plain
- @click="ShowDetailDialog(scope, 'name')"
- >{{ scope.row.beneficiaryname }}</el-button
- >
+ <el-button type="primary" plain @click="ShowDetailDialog(scope, 'name')">{{ scope.row.beneficiaryname
+ }}</el-button>
<!-- <el-input
v-model="scope.row.beneficiaryname"
placeholder="濮撳悕"
/> -->
</template>
</el-table-column>
- <el-table-column
- prop="servicesscopename"
- align="center"
- label="璐圭敤璇存槑"
- width="180"
- >
+ <el-table-column prop="servicesscopename" align="center" label="璐圭敤璇存槑" width="180">
<template slot-scope="scope">
- <el-select
- v-model="scope.row.servicesscopename"
- placeholder="璐圭敤璇存槑"
- clearable
- allow-create
- filterable
- @change="selectremark(scope.row)"
- >
- <el-option
- v-for="dict in fundblock"
- :key="dict.expensedescribe"
- :label="dict.expensedescribe"
- :value="dict.expensedescribe"
- ></el-option>
+ <el-select v-model="scope.row.servicesscopename" placeholder="璐圭敤璇存槑" clearable allow-create filterable
+ @change="selectremark(scope.row)">
+ <el-option v-for="dict in fundblock" :key="dict.expensedescribe" :label="dict.expensedescribe"
+ :value="dict.expensedescribe"></el-option>
</el-select>
</template>
</el-table-column>
- <el-table-column
- prop="amount"
- align="center"
- label="绋庡墠閲戦"
- width="120"
- v-if="form.applytype != 3"
- >
+ <el-table-column prop="amount" align="center" label="绋庡墠閲戦" width="120" v-if="form.applytype != 3">
<template slot-scope="scope">
- <el-input
- v-model="scope.row.amount"
- placeholder="绋庡墠閲戦"
- @blur="
- val => {
- sumTotalFee();
- }
- "
- />
+ <el-input v-model="scope.row.amount" placeholder="绋庡墠閲戦" @blur="val => {
+ sumTotalFee();
+ }
+ " />
</template>
</el-table-column>
- <el-table-column
- prop="taxedamount"
- align="center"
- label="绋庡悗閲戦"
- width="120"
- v-if="form.applytype != '3'"
- >
+ <el-table-column prop="taxedamount" align="center" label="绋庡悗閲戦" width="120" v-if="form.applytype != '3'">
<template slot-scope="scope">
- <el-input
- v-model="scope.row.taxedamount"
- placeholder="绋庡悗閲戦"
- @blur="
- val => {
- sumTotalFee();
- }
- "
- />
+ <el-input v-model="scope.row.taxedamount" placeholder="绋庡悗閲戦" @blur="val => {
+ sumTotalFee();
+ }
+ " />
</template>
</el-table-column>
- <el-table-column
- prop="unitno"
- align="center"
- label="鍗曚綅"
- width="220"
- >
+ <el-table-column prop="unitno" align="center" label="鍗曚綅" width="220">
<template slot-scope="scope">
- <el-button
- type="primary"
- plain
- @click="ShowDetailDialog(scope, 'unit')"
- >{{ scope.row.unitname }}</el-button
- >
+ <el-button type="primary" plain @click="ShowDetailDialog(scope, 'unit')">{{ scope.row.unitname
+ }}</el-button>
</template>
</el-table-column>
- <el-table-column
- prop="quantity"
- align="center"
- label="鏁伴噺"
- width="120"
- v-if="form.applytype == '3'"
- >
+ <el-table-column prop="quantity" align="center" label="鏁伴噺" width="120" v-if="form.applytype == '3'">
<template slot-scope="scope">
- <el-input
- v-model="scope.row.quantity"
- placeholder="鏁伴噺"
- @blur="
- val => {
- sumTotalFee();
- }
- "
- />
+ <el-input v-model="scope.row.quantity" placeholder="鏁伴噺" @blur="val => {
+ sumTotalFee();
+ }
+ " />
</template>
</el-table-column>
- <el-table-column
- prop="price"
- align="center"
- label="浠锋牸"
- width="120"
- v-if="form.applytype == '3'"
- >
+ <el-table-column prop="price" align="center" label="浠锋牸" width="120" v-if="form.applytype == '3'">
<template slot-scope="scope">
- <el-input
- v-model="scope.row.price"
- placeholder="浠锋牸"
- @blur="
- val => {
- sumTotalFee();
- }
- "
- />
+ <el-input v-model="scope.row.price" placeholder="浠锋牸" @blur="val => {
+ sumTotalFee();
+ }
+ " />
</template>
</el-table-column>
- <el-table-column
- prop="remark"
- align="center"
- label="澶囨敞"
- width="210"
- v-if="form.applytype == '3'"
- >
+ <el-table-column prop="remark" align="center" label="澶囨敞" width="210" v-if="form.applytype == '3'">
<template slot-scope="scope">
<el-input v-model="scope.row.remark" placeholder="澶囨敞" />
</template>
</el-table-column>
- <el-table-column
- prop="title"
- align="center"
- label="鑱岀О"
- width="120"
- v-if="form.applytype != '3'"
- >
+ <el-table-column prop="title" align="center" label="鑱岀О" width="120" v-if="form.applytype != '3'">
<template slot-scope="scope">
<el-input v-model="scope.row.title" placeholder="鑱岀О" />
</template>
</el-table-column>
- <el-table-column
- prop="idcardno"
- align="center"
- label="韬唤璇佸彿"
- width="200"
- v-if="form.applytype != '3'"
- >
+ <el-table-column prop="idcardno" align="center" label="韬唤璇佸彿" width="200" v-if="form.applytype != '3'">
<template slot-scope="scope">
<el-input v-model="scope.row.idcardno" placeholder="韬唤璇佸彿" />
</template>
</el-table-column>
- <el-table-column
- prop="depositbank"
- align="center"
- label="寮�鎴烽摱琛�"
- width="200"
- v-if="form.applytype != '3'"
- >
+ <el-table-column prop="depositbank" align="center" label="寮�鎴烽摱琛�" width="200" v-if="form.applytype != '3'">
<template slot-scope="scope">
- <el-input
- v-model="scope.row.depositbank"
- placeholder="寮�鎴烽摱琛�"
- />
+ <el-input v-model="scope.row.depositbank" placeholder="寮�鎴烽摱琛�" />
</template>
</el-table-column>
- <el-table-column
- prop="bankcardno"
- align="center"
- label="閾惰鍗″彿"
- width="210"
- v-if="form.applytype != '3'"
- >
+ <el-table-column prop="bankcardno" align="center" label="閾惰鍗″彿" width="210" v-if="form.applytype != '3'">
<template slot-scope="scope">
- <el-input
- v-model="scope.row.bankcardno"
- placeholder="閾惰鍗″彿"
- />
+ <el-input v-model="scope.row.bankcardno" placeholder="閾惰鍗″彿" />
</template>
</el-table-column>
- <el-table-column
- fixed="right"
- align="center"
- label="鎿嶄綔"
- width="120"
- v-if="dialogType == 'edit'"
- >
+ <el-table-column fixed="right" align="center" label="鎿嶄綔" width="120" v-if="dialogType == 'edit'">
<template slot-scope="scope">
- <el-button type="text" size="mini" @click="addRow(scope.$index)"
- >鏂板</el-button
- >
- <el-button
- @click.native.prevent="
- deleteRows(scope.row, scope.$index, fundDetailArr)
- "
- type="text"
- size="small"
- >
+ <el-button type="text" size="mini" @click="addRow(scope.$index)">鏂板</el-button>
+ <el-button @click.native.prevent="
+ deleteRows(scope.row, scope.$index, fundDetailArr)
+ " type="text" size="small">
鍒犻櫎
</el-button>
</template>
@@ -752,139 +385,55 @@
<el-row>
<el-col :span="24">
<el-form-item label="鐢宠闄勪欢锛�" align="left" prop="annexbankcard">
- <el-upload
- size="mini"
- class="upload-demo"
- :action="uploadFileUrl"
- :file-list="fileList"
- multiple
- :limit="20"
- :headers="headers"
- :on-success="
- (response, file, fileList) =>
+ <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileList" multiple
+ :limit="20" :headers="headers" :on-success="(response, file, fileList) =>
uploadSccess(response, file, fileList)
- "
- :on-preview="downFile"
- :disabled="dialogType == 'detail'"
- :on-error="handleUploadError"
- :on-exceed="handleExceed"
- :on-remove="remove"
- accept="image/*,.pdf"
- >
- <el-button
- :disabled="dialogType == 'detail'"
- size="small"
- type="primary"
- >涓婁紶</el-button
- >
+ " :on-preview="downFile" :disabled="dialogType == 'detail'" :on-error="handleUploadError"
+ :on-exceed="handleExceed" :on-remove="remove" accept="image/*,.pdf">
+ <el-button :disabled="dialogType == 'detail'" size="small" type="primary">涓婁紶</el-button>
</el-upload>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="dialogType == 'detail'">
<el-table :data="fundflowList" border>
- <el-table-column
- label="瀹℃牳浜�"
- align="center"
- width="120"
- prop="checkusername"
- />
- <el-table-column
- label="瀹℃牳鏃ユ湡"
- align="center"
- width="160"
- prop="createTime"
- />
- <el-table-column
- label="瀹℃牳缁撴灉"
- align="center"
- width="200"
- prop="flowconclusion"
- ><template slot-scope="scope"
- ><span v-if="scope.row.flowconclusion == 1">閫氳繃</span
- ><span v-if="scope.row.flowconclusion == 2"
- >涓嶉�氳繃</span
- ></template
- >
+ <el-table-column label="瀹℃牳浜�" align="center" width="120" prop="checkusername" />
+ <el-table-column label="瀹℃牳鏃ユ湡" align="center" width="160" prop="createTime" />
+ <el-table-column label="瀹℃牳缁撴灉" align="center" width="200" prop="flowconclusion"><template
+ slot-scope="scope"><span v-if="scope.row.flowconclusion == 1">閫氳繃</span><span
+ v-if="scope.row.flowconclusion == 2">涓嶉�氳繃</span></template>
</el-table-column>
- <el-table-column
- label="瀹℃牳澶囨敞"
- align="center"
- prop="flowcontent"
- />
+ <el-table-column label="瀹℃牳澶囨敞" align="center" prop="flowcontent" />
</el-table>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button
- type="primary"
- @click="submitForm"
- v-if="dialogType == 'edit'"
- >淇� 瀛�</el-button
- >
+ <el-button type="primary" @click="submitForm" v-if="dialogType == 'edit'">淇� 瀛�</el-button>
<!-- <el-button type="success" @click="print">鎵� 鍗�</el-button> -->
<el-button @click="cancel">鍙� 娑�</el-button>
</div>
</el-dialog>
- <el-dialog
- :visible.sync="detailInfoDialogShow"
- :close-on-click-modal="false"
- :title="'淇℃伅淇敼'"
- style="text-align: center"
- v-loading="loading"
- width="500px"
- >
+ <el-dialog :visible.sync="detailInfoDialogShow" :close-on-click-modal="false" :title="'淇℃伅淇敼'"
+ style="text-align: center" v-loading="loading" width="500px">
<el-form ref="funddetailForm" :model="funddetailForm" label-width="120px">
<el-row>
<el-col :span="24" v-if="detailInfoDialogShowType == 'name'">
- <el-form-item
- align="left"
- label="濮撳悕"
- prop="beneficiaryname"
- label-width="80px"
- >
- <el-select
- filterable
- allow-create
- ref="beneficiaryname"
- default-first-option
- v-model="funddetailForm.beneficiaryname"
- placeholder="璇烽�夋嫨"
- style="width: 100%"
- >
- <el-option
- v-for="item in arrr3"
- :key="item.reportNo"
- :label="item.reportName"
- :value="item.reportName"
- >
+ <el-form-item align="left" label="濮撳悕" prop="beneficiaryname" label-width="80px">
+ <el-select filterable allow-create ref="beneficiaryname" default-first-option
+ v-model="funddetailForm.beneficiaryname" placeholder="璇烽�夋嫨" style="width: 100%">
+ <el-option v-for="item in arrr3" :key="item.reportNo" :label="item.reportName" :value="item.reportName">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24" v-if="detailInfoDialogShowType == 'unit'">
- <el-form-item
- align="left"
- label="鍗曚綅"
- prop="unitno"
- label-width="80px"
- >
- <el-select
- v-model="funddetailForm.unitno"
- placeholder="鍗曚綅"
- clearable
- filterable
- allow-create
- style="width: 100%"
- >
- <el-option
- v-for="(spec, index) in unitList"
- :key="index"
- :label="spec.organizationname"
- :value="spec.organizationid"
- ></el-option>
+ <el-form-item align="left" label="鍗曚綅" prop="unitno" label-width="80px">
+ <el-select v-model="funddetailForm.unitno" placeholder="鍗曚綅" clearable filterable allow-create
+ style="width: 100%">
+ <el-option v-for="(spec, index) in unitList" :key="index" :label="spec.organizationname"
+ :value="spec.organizationid"></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -892,9 +441,7 @@
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="detailInfoDialogShow = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="ConfirmDetailDialog()"
- >纭� 瀹�</el-button
- >
+ <el-button type="primary" @click="ConfirmDetailDialog()">纭� 瀹�</el-button>
</span>
</el-dialog>
</div>
@@ -1177,8 +724,8 @@
//闄勪欢澶勭悊
this.fileList = this.form.annexbankcard
? this.form.annexbankcard
- .split(",")
- .map(item => ({ url: item, name: item }))
+ .split(",")
+ .map(item => ({ url: item, name: item }))
: [];
getownFundDetail(id).then(async res => {
@@ -1221,8 +768,8 @@
//闄勪欢澶勭悊
this.fileList = this.form.annexbankcard
? this.form.annexbankcard
- .split(",")
- .map(item => ({ url: item, name: item }))
+ .split(",")
+ .map(item => ({ url: item, name: item }))
: [];
listFundflow(listFundflowparams).then(res => {
@@ -1250,7 +797,7 @@
const ids = row.id || this.ids;
this.$modal
.confirm("鏄惁纭鍒犻櫎璇ヨ褰曪紵")
- .then(function() {
+ .then(function () {
return delFund(ids);
})
.then(() => {
@@ -1264,7 +811,7 @@
this.getfundList();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
})
- .catch(() => {});
+ .catch(() => { });
},
/** 涓婃姤鎸夐挳鎿嶄綔 */
handleup(row) {
@@ -1277,6 +824,8 @@
//鏌ユ壘鏄惁瀛樺湪鐧昏瀹屾垚璁板綍
//鍒ゆ柇鏄惁瀛樺湪涓婃姤璁板綍
row.recordstatus = "0";
+ var currenttime = new Date();
+ row.createTime = currenttime.getFullYear() + "-" + (currenttime.getMonth()+1) + "-" + currenttime.getDate() + " " + currenttime.getHours() + ":" + currenttime.getMinutes() + ":" + currenttime.getSeconds();
updateFund(row).then(response => {
if (response.code == 200) {
@@ -1314,7 +863,7 @@
this.$download.name(response.msg);
this.exportLoading = false;
})
- .catch(() => {});
+ .catch(() => { });
},
/** 鎻愪氦鎸夐挳 */
@@ -1394,9 +943,9 @@
tempData.itemid = tempItemArr[itemIndex].id;
}
if (tempData.id > 0) {
- updateFunddetail(tempData).then(response2 => {});
+ updateFunddetail(tempData).then(response2 => { });
} else {
- addFunddetail(tempData).then(response2 => {});
+ addFunddetail(tempData).then(response2 => { });
}
}
});
@@ -1947,7 +1496,7 @@
},
//鏂囦欢涓婁紶
- handleUploadError() {},
+ handleUploadError() { },
remove(file) {
this.fileList.splice(this.fileList.indexOf(file), 1);
},
@@ -2042,13 +1591,13 @@
this.getUsermsg();
this.getlistExternalperson();
},
- beforeCreate() {}, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠
- beforeMount() {}, //鐢熷懡鍛ㄦ湡 - 鎸傝浇涔嬪墠
- beforeUpdate() {}, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪墠
- updated() {}, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗
- beforeDestroy() {}, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓�
- destroyed() {}, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴�
- activated() {} //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂
+ beforeCreate() { }, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠
+ beforeMount() { }, //鐢熷懡鍛ㄦ湡 - 鎸傝浇涔嬪墠
+ beforeUpdate() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪墠
+ updated() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗
+ beforeDestroy() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓�
+ destroyed() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴�
+ activated() { } //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂
};
</script>
<style scoped>
diff --git a/src/views/project/fund/expertFeeApply/index.vue b/src/views/project/fund/expertFeeApply/index.vue
index 8f4ae13..26bc82b 100644
--- a/src/views/project/fund/expertFeeApply/index.vue
+++ b/src/views/project/fund/expertFeeApply/index.vue
@@ -1585,6 +1585,9 @@
//鏌ユ壘鏄惁瀛樺湪鐧昏瀹屾垚璁板綍
//鍒ゆ柇鏄惁瀛樺湪涓婃姤璁板綍
row.recordstatus = 0;
+ var currenttime = new Date();
+ row.createTime = currenttime.getFullYear() + "-" + (currenttime.getMonth()+1) + "-" + currenttime.getDate() + " " + currenttime.getHours() + ":" + currenttime.getMinutes() + ":" + currenttime.getSeconds();
+
updateFund(row).then(response => {
if (response.code == 200) {
this.$message({
diff --git a/src/views/project/fund/medicalCostApply/index.vue b/src/views/project/fund/medicalCostApply/index.vue
index 49fabfa..8438b81 100644
--- a/src/views/project/fund/medicalCostApply/index.vue
+++ b/src/views/project/fund/medicalCostApply/index.vue
@@ -689,8 +689,8 @@
.then(() => {
//鏌ユ壘鏄惁瀛樺湪鐧昏瀹屾垚璁板綍
//鍒ゆ柇鏄惁瀛樺湪涓婃姤璁板綍
- row.recordstatus = 0;
-
+ row.recordstatus = 0;var currenttime = new Date();
+ row.createTime = currenttime.getFullYear() + "-" + (currenttime.getMonth()+1) + "-" + currenttime.getDate() + " " + currenttime.getHours() + ":" + currenttime.getMinutes() + ":" + currenttime.getSeconds();
updateFund(row).then(response => {
if (response.code == 200) {
this.$message({
diff --git a/src/views/project/fund/officeExpenseApply/index.vue b/src/views/project/fund/officeExpenseApply/index.vue
index c9d0f40..46f486e 100644
--- a/src/views/project/fund/officeExpenseApply/index.vue
+++ b/src/views/project/fund/officeExpenseApply/index.vue
@@ -1163,8 +1163,8 @@
.then(() => {
//鏌ユ壘鏄惁瀛樺湪鐧昏瀹屾垚璁板綍
//鍒ゆ柇鏄惁瀛樺湪涓婃姤璁板綍
- row.recordstatus = 0;
-
+ row.recordstatus = 0;var currenttime = new Date();
+ row.createTime = currenttime.getFullYear() + "-" + (currenttime.getMonth()+1) + "-" + currenttime.getDate() + " " + currenttime.getHours() + ":" + currenttime.getMinutes() + ":" + currenttime.getSeconds();
updateFund(row).then(response => {
if (response.code == 200) {
this.$message({
diff --git a/src/views/project/fund/performanceApply/index.vue b/src/views/project/fund/performanceApply/index.vue
index d39b062..28974f8 100644
--- a/src/views/project/fund/performanceApply/index.vue
+++ b/src/views/project/fund/performanceApply/index.vue
@@ -1,64 +1,32 @@
<!-- -->
<template>
<div class="app-container">
- <el-form
- :model="queryParams"
- ref="queryForm"
- :inline="true"
- label-width="70px"
- >
+ <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="70px">
<el-row align="left">
<el-col :span="5">
<el-form-item label="缁忓姙浜�" prop="name">
- <el-input
- v-model="queryParams.name"
- placeholder="璇疯緭鍏ョ粡鍔炰汉"
- clearable
- size="small"
- @keyup.enter.native="handleQuery"
- />
+ <el-input v-model="queryParams.name" placeholder="璇疯緭鍏ョ粡鍔炰汉" clearable size="small"
+ @keyup.enter.native="handleQuery" />
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="閲戦" prop="money" style="float: left">
- <el-input
- v-model="queryParams.money"
- placeholder="璇疯緭鍏ョ敵璇蜂汉閲戦"
- clearable
- size="small"
- @keyup.enter.native="handleQuery"
- />
+ <el-input v-model="queryParams.money" placeholder="璇疯緭鍏ョ敵璇蜂汉閲戦" clearable size="small"
+ @keyup.enter.native="handleQuery" />
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="鐢宠鏃ユ湡" prop="createTime">
- <el-date-picker
- format="yyyy-MM-dd"
- value-format="yyyy-MM-dd"
- v-model="value1"
- type="daterange"
- @blur="onpick"
- range-separator="鑷�"
- start-placeholder="鎶ラ攢鐢宠寮�濮嬫棩鏈�"
- end-placeholder="鎶ラ攢鐢宠缁撴潫鏃ユ湡"
- @keyup.enter.native="handleQuery"
- >
+ <el-date-picker format="yyyy-MM-dd" value-format="yyyy-MM-dd" v-model="value1" type="daterange" @blur="onpick"
+ range-separator="鑷�" start-placeholder="鎶ラ攢鐢宠寮�濮嬫棩鏈�" end-placeholder="鎶ラ攢鐢宠缁撴潫鏃ユ湡"
+ @keyup.enter.native="handleQuery">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="瀹℃壒鐘舵��" prop="CHECKFLAG" style="float: left">
- <el-select
- v-model="queryParams.CHECKFLAG"
- placeholder="璇烽�夋嫨"
- style="width: 100%"
- >
- <el-option
- v-for="item in checkFlagOptions"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
+ <el-select v-model="queryParams.CHECKFLAG" placeholder="璇烽�夋嫨" style="width: 100%">
+ <el-option v-for="item in checkFlagOptions" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
@@ -67,175 +35,67 @@
<el-row>
<el-col :span="6">
<el-form-item label="鎹愮尞鑰�" prop="name">
- <el-input
- v-model="queryParams.donorname"
- placeholder="璇疯緭鍏ユ崘鐚�呭鍚�"
- clearable
- size="small"
- @keyup.enter.native="handleQuery"
- />
+ <el-input v-model="queryParams.donorname" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" clearable size="small"
+ @keyup.enter.native="handleQuery" />
</el-form-item>
</el-col>
<el-col :span="4">
- <el-button
- type="primary"
- icon="el-icon-search"
- size="mini"
- @click="handleQuery"
- >鎼滅储</el-button
- >
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
- >閲嶇疆</el-button
- >
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
</el-col>
</el-row>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-plus"
- size="mini"
- @click="handleAdd"
- >鏂板</el-button
- >
+ <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">鏂板</el-button>
<!-- v-hasPermi="['project:medicalfund:add']" -->
</el-col>
<el-col :span="1.5">
- <el-button
- type="warning"
- plain
- icon="el-icon-download"
- size="mini"
- :loading="exportLoading"
- @click="handleExport"
- >瀵煎嚭</el-button
- >
+ <el-button type="warning" plain icon="el-icon-download" size="mini" :loading="exportLoading"
+ @click="handleExport">瀵煎嚭</el-button>
</el-col>
<!-- v-hasPermi="['project:medicalfund:export']" -->
<!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
</el-row>
<el-table v-loading="loading" border :data="donateconsolationfundList">
- <el-table-column
- label="鐢宠鏃ユ湡"
- align="center"
- prop="createTime"
- width="180px"
- >
+ <el-table-column label="鐢宠鏃ユ湡" align="center" prop="createTime" width="180px">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
- <el-table-column
- label="鐢宠浜�"
- align="center"
- prop="username"
- width="150px"
- />
- <el-table-column
- label="鐢宠閲戦"
- align="center"
- prop="pretaxcost"
- width="150px"
- />
+ <el-table-column label="鐢宠浜�" align="center" prop="username" width="150px" />
+ <el-table-column label="鐢宠閲戦" align="center" prop="pretaxcost" width="150px" />
- <el-table-column
- label="瀹℃牳鐘舵��"
- width="150"
- align="center"
- prop="recordstatus"
- >
+ <el-table-column label="瀹℃牳鐘舵��" width="150" align="center" prop="recordstatus">
<template slot-scope="scope">
- <dict-tag
- :options="dict.type.sys_recordstatus"
- :value="scope.row.recordstatus"
- />
+ <dict-tag :options="dict.type.sys_recordstatus" :value="scope.row.recordstatus" />
</template>
</el-table-column>
- <el-table-column
- label="鐢宠鏉愭枡鐘舵��"
- width="140"
- align="center"
- prop="checkstatus"
- >
+ <el-table-column label="鐢宠鏉愭枡鐘舵��" width="140" align="center" prop="checkstatus">
<template slot-scope="scope">
- <dict-tag
- :options="dict.type.sys_stage_type"
- :value="scope.row.checkstatus"
- />
+ <dict-tag :options="dict.type.sys_stage_type" :value="scope.row.checkstatus" />
</template>
</el-table-column>
- <el-table-column
- label="缁╂晥绫诲瀷"
- width="150"
- align="center"
- prop="performancetype"
- >
+ <el-table-column label="缁╂晥绫诲瀷" width="150" align="center" prop="performancetype">
<template slot-scope="scope">
- <dict-tag
- :options="dict.type.sys_performance_type"
- :value="scope.row.performancetype"
- />
+ <dict-tag :options="dict.type.sys_performance_type" :value="scope.row.performancetype" />
</template>
</el-table-column>
<el-table-column label="澶囨敞" align="center" prop="remark" />
- <el-table-column
- label="鎿嶄綔"
- fixed="right"
- align="center"
- class-name="small-padding fixed-width"
- width="280px"
- >
+ <el-table-column label="鎿嶄綔" fixed="right" align="center" class-name="small-padding fixed-width" width="280px">
<template slot-scope="scope">
- <el-button
- v-if="scope.row.recordstatus == -1 || scope.row.recordstatus == 1"
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleup(scope.row)"
- >涓婃姤</el-button
- >
- <el-button
- v-if="scope.row.recordstatus == -1 || scope.row.recordstatus == 1"
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['project:medicalfund:edit']"
- >淇敼</el-button
- >
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="duplicationfn(scope.row)"
- >澶嶅埗</el-button
- >
- <el-button
- size="mini"
- type="text"
- icon="el-icon-view"
- @click="handleDetail(scope.row)"
- >鏌ョ湅</el-button
- >
- <el-button
- v-if="scope.row.recordstatus == -1 || scope.row.recordstatus == 1"
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['project:medicalfund:delete']"
- >鍒犻櫎</el-button
- >
- <el-button
- size="mini"
- type="text"
- icon="el-icon-download"
- @click="mixExport(scope.row.id)"
- v-hasPermi="['project:medicalfund:download']"
- >涓嬭浇</el-button
- >
+ <el-button v-if="scope.row.recordstatus == -1 || scope.row.recordstatus == 1" size="mini" type="text"
+ icon="el-icon-edit" @click="handleup(scope.row)">涓婃姤</el-button>
+ <el-button v-if="scope.row.recordstatus == -1 || scope.row.recordstatus == 1" size="mini" type="text"
+ icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['project:medicalfund:edit']">淇敼</el-button>
+
+ <el-button size="mini" type="text" icon="el-icon-view" @click="handleDetail(scope.row)">鏌ョ湅</el-button>
+ <el-button v-if="scope.row.recordstatus == -1 || scope.row.recordstatus == 1" size="mini" type="text"
+ icon="el-icon-delete" @click="handleDelete(scope.row)"
+ v-hasPermi="['project:medicalfund:delete']">鍒犻櫎</el-button>
+ <el-button size="mini" type="text" icon="el-icon-download" @click="mixExport(scope.row.id)"
+ v-hasPermi="['project:medicalfund:download']">涓嬭浇</el-button>
+ <el-button size="mini" type="text" icon="el-icon-edit" @click="duplicationfn(scope.row)">澶嶅埗</el-button>
</template>
</el-table-column>
</el-table>
@@ -411,8 +271,8 @@
.then(() => {
//鏌ユ壘鏄惁瀛樺湪鐧昏瀹屾垚璁板綍
//鍒ゆ柇鏄惁瀛樺湪涓婃姤璁板綍
- row.recordstatus = 0;
-
+ row.recordstatus = 0;var currenttime = new Date();
+ row.createTime = currenttime.getFullYear() + "-" + (currenttime.getMonth()+1) + "-" + currenttime.getDate() + " " + currenttime.getHours() + ":" + currenttime.getMinutes() + ":" + currenttime.getSeconds();
updateFund(row).then(response => {
if (response.code == 200) {
this.$message({
@@ -468,8 +328,7 @@
query: {
id: row.id,
businessType: "5",
- Copy: "1",
- operationType: "update"
+ operationType: "copy"
}
});
},
@@ -494,14 +353,14 @@
this.$download.name(response.msg);
this.exportLoading = false;
})
- .catch(() => {});
+ .catch(() => { });
},
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal
.confirm("鏄惁纭鍒犻櫎璇ヨ褰曪紵")
- .then(function() {
+ .then(function () {
return delFund(ids);
})
.then(() => {
@@ -514,7 +373,7 @@
this.getList();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
})
- .catch(() => {});
+ .catch(() => { });
},
/** 鏌ヨ鍒楄〃 */
@@ -584,15 +443,15 @@
},
//鐢熷懡鍛ㄦ湡 - 鎸傝浇瀹屾垚锛堝彲浠ヨ闂瓺OM鍏冪礌锛�
- mounted() {},
+ mounted() { },
- beforeCreate() {}, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠
- beforeMount() {}, //鐢熷懡鍛ㄦ湡 - 鎸傝浇涔嬪墠
- beforeUpdate() {}, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪墠
- updated() {}, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗
- beforeDestroy() {}, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓�
- destroyed() {}, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴�
- activated() {} //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂
+ beforeCreate() { }, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠
+ beforeMount() { }, //鐢熷懡鍛ㄦ湡 - 鎸傝浇涔嬪墠
+ beforeUpdate() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪墠
+ updated() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗
+ beforeDestroy() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓�
+ destroyed() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴�
+ activated() { } //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂
};
</script>
<style scoped>
diff --git a/src/views/project/fund/performancedetails/index.vue b/src/views/project/fund/performancedetails/index.vue
index ec00066..8c15da9 100644
--- a/src/views/project/fund/performancedetails/index.vue
+++ b/src/views/project/fund/performancedetails/index.vue
@@ -7,53 +7,28 @@
<el-row>
<el-col :span="5">
<el-form-item label="鐢宠鏃ユ湡" prop="createTime">
- <el-date-picker
- clearable
- style="width: 100%"
- v-model="form.createTime"
- type="date"
- value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="鐢宠鏃ユ湡"
- >
+ <el-date-picker clearable style="width: 100%" v-model="form.createTime" type="date"
+ value-format="yyyy-MM-dd HH:mm:ss" placeholder="鐢宠鏃ユ湡">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="缁忓姙浜�" prop="username">
- <el-select
- v-model="form.username"
- placeholder="鐢宠浜�"
- clearable
- filterable
- allow-create
- style="width: 100%"
- @change="getUserAccount"
- >
- <el-option
- v-for="dict in userlist"
- :key="dict.index"
- :label="dict.nickname"
- :value="dict.nickname"
- ></el-option>
+ <el-select v-model="form.username" placeholder="鐢宠浜�" clearable filterable allow-create style="width: 100%"
+ @change="getUserAccount">
+ <el-option v-for="dict in userlist" :key="dict.index" :label="dict.nickname"
+ :value="dict.nickname"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="鎵�灞炵粍鍒�" prop="deptmentname">
- <el-input
- v-model="form.deptmentname"
- placeholder="璇疯緭鍏ユ墍灞炵粍鍒�"
- clearable
- />
+ <el-input v-model="form.deptmentname" placeholder="璇疯緭鍏ユ墍灞炵粍鍒�" clearable />
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="缁勯暱" prop="managername">
- <el-input
- v-model="form.managername"
- placeholder="璇疯緭鍏ョ粍闀�"
- clearable
- />
+ <el-input v-model="form.managername" placeholder="璇疯緭鍏ョ粍闀�" clearable />
</el-form-item>
</el-col>
</el-row>
@@ -65,26 +40,13 @@
</el-col>
<el-col :span="5">
<el-form-item label="鐢宠閲戦" prop="pretaxcost">
- <el-input
- v-model="form.pretaxcost"
- placeholder="绋庡墠閲戦鍚堣"
- :disabled="true"
- />
+ <el-input v-model="form.pretaxcost" placeholder="绋庡墠閲戦鍚堣" :disabled="true" />
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="鐢宠鏉愭枡鐘舵��" prop="infoid">
- <el-select
- v-model="form.checkstatus"
- filterable
- placeholder="璇烽�夋嫨鐢宠鏉愭枡鐘舵��"
- >
- <el-option
- v-for="item in baselisttages"
- :key="item.id"
- :label="item.name"
- :value="item.id"
- >
+ <el-select v-model="form.checkstatus" filterable placeholder="璇烽�夋嫨鐢宠鏉愭枡鐘舵��">
+ <el-option v-for="item in baselisttages" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
@@ -99,238 +61,105 @@
</el-row>
<el-row style="margin-top: 5px; margin-bottom: 5px" />
<el-row v-if="jurisdiction">
- <el-alert
- title="褰撳墠涓烘煡鐪嬬姸鎬侊紝涓嶆敮鎸佷慨鏀瑰瓨鍌ㄣ��"
- type="warning"
- show-icon
- >
+ <el-alert title="褰撳墠涓烘煡鐪嬬姸鎬侊紝涓嶆敮鎸佷慨鏀瑰瓨鍌ㄣ��" type="warning" show-icon>
</el-alert>
</el-row>
<el-row>
- <el-col :span="3"
- ><div style="margin-bottom: 15px;">
- <el-button
- type="success"
- icon="el-icon-download"
- @click="Batchentry"
- >鎵归噺褰曞叆</el-button
- >
- </div></el-col
- >
+ <el-col :span="3">
+ <div style="margin-bottom: 15px;">
+ <el-button type="success" icon="el-icon-download" @click="Batchentry">鎵归噺褰曞叆</el-button>
+ </div>
+ </el-col>
</el-row>
- <el-row
- v-if="userprofile.nickName == '闄堟厱鍗�' && operationType == 'check'"
- >
- <el-col :span="3"
- ><div style="margin-bottom: 15px;">
- <el-button
- type="success"
- icon="el-icon-edit-outline"
- @click="Manualcalculationfn"
- >璁＄畻涓◣</el-button
- >
- </div></el-col
- >
+ <el-row v-if="userprofile.nickName == '闄堟厱鍗�' && operationType == 'check'">
+ <el-col :span="3">
+ <div style="margin-bottom: 15px;">
+ <el-button type="success" icon="el-icon-edit-outline" @click="Manualcalculationfn">璁＄畻涓◣</el-button>
+ </div>
+ </el-col>
</el-row>
<el-row>
- <el-table
- :data="rbDetails"
- v-loading="loading"
- max-height="800"
- border
- highlight-current-row
- >
- <el-table-column
- prop="orderno"
- align="center"
- label="搴忓彿"
- width="88"
- >
+ <el-table :data="rbDetails" v-loading="loading" max-height="800" border highlight-current-row>
+ <el-table-column prop="orderno" align="center" label="搴忓彿" width="88">
<template slot-scope="scope">
<el-input v-model="scope.row.orderno" placeholder="搴忓彿" />
</template>
</el-table-column>
- <el-table-column
- prop="applytype"
- align="center"
- label="鏈嶅姟绫诲瀷"
- width="200"
- >
+ <el-table-column prop="applytype" align="center" label="鏈嶅姟绫诲瀷" width="200">
<template slot-scope="scope">
- <el-select
- v-model="scope.row.applytype"
- placeholder="璇烽�夋嫨鏈嶅姟绫诲瀷"
- @change="verifyFeeItemType(scope.row)"
- >
- <el-option
- v-for="dict in rowfeeItemTypes"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
+ <el-select v-model="scope.row.applytype" placeholder="璇烽�夋嫨鏈嶅姟绫诲瀷" @change="verifyFeeItemType(scope.row)">
+ <el-option v-for="dict in rowfeeItemTypes" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
</el-select>
</template>
</el-table-column>
- <el-table-column
- prop="itemid"
- align="center"
- label="鏈嶅姟椤圭洰"
- width="260"
- >
+ <el-table-column prop="itemid" align="center" label="鏈嶅姟椤圭洰" width="260">
<template slot-scope="scope">
- <el-select
- v-model="scope.row.itemid"
- placeholder="璇烽�夋嫨鏈嶅姟椤圭洰"
- filterable
- @change="verifyFeeItem(scope.row)"
- :filter-method="val => searchItemType(val, scope)"
- >
- <el-option
- v-for="dict in scope.row.itemlist"
- :key="dict.id"
- :label="dict.itemName"
- :value="dict.id"
- ></el-option>
+ <el-select v-model="scope.row.itemid" placeholder="璇烽�夋嫨鏈嶅姟椤圭洰" filterable @change="verifyFeeItem(scope.row)"
+ :filter-method="val => searchItemType(val, scope)">
+ <el-option v-for="dict in scope.row.itemlist" :key="dict.id" :label="dict.itemName"
+ :value="dict.id"></el-option>
</el-select>
</template>
</el-table-column>
- <el-table-column
- prop="amount"
- align="center"
- label="绋庡墠閲戦"
- width="120"
- >
+ <el-table-column prop="amount" align="center" label="绋庡墠閲戦" width="120">
<template slot-scope="scope">
- <el-input
- v-model="scope.row.amount"
- placeholder="绋庡墠閲戦"
- @blur="
- val => {
- calculateTax(scope.row, 'A');
- }
- "
- />
+ <el-input v-model="scope.row.amount" placeholder="绋庡墠閲戦" @blur="val => {
+ calculateTax(scope.row, 'A');
+ }
+ " />
</template>
</el-table-column>
- <el-table-column
- prop="taxedamount"
- align="center"
- label="绋庡悗閲戦"
- width="120"
- >
+ <el-table-column prop="taxedamount" align="center" label="绋庡悗閲戦" width="120">
<template slot-scope="scope">
- <el-input
- v-model="scope.row.taxedamount"
- placeholder="绋庡悗閲戦"
- @blur="
- val => {
- calculateTax(scope.row, 'B');
- }
- "
- />
+ <el-input v-model="scope.row.taxedamount" placeholder="绋庡悗閲戦" @blur="val => {
+ calculateTax(scope.row, 'B');
+ }
+ " />
</template>
</el-table-column>
- <el-table-column
- prop="beneficiaryname"
- align="center"
- label="濮撳悕"
- width="250"
- >
+ <el-table-column prop="beneficiaryname" align="center" label="缁╂晥浜哄憳鎴栧崟浣�" width="250">
<template slot-scope="scope">
- <el-button
- type="primary"
- plain
- @click="ShowDetailDialog(scope, 'expert')"
- >{{
- scope.row.beneficiaryname
- ? scope.row.beneficiaryname
- : "鐐瑰嚮閫夋嫨"
- }}</el-button
- >
+ <el-button type="primary" plain @click="ShowDetailDialog(scope, 'expert')">{{
+ scope.row.beneficiaryname
+ ? scope.row.beneficiaryname
+ : "鐐瑰嚮閫夋嫨"
+ }}</el-button>
</template>
</el-table-column>
- <el-table-column
- prop="idcardno"
- align="center"
- label="韬唤璇佸彿"
- width="200"
- >
+ <el-table-column prop="idcardno" align="center" label="韬唤璇佸彿" width="200">
<template slot-scope="scope">
<el-input v-model="scope.row.idcardno" placeholder="韬唤璇佸彿" />
</template>
</el-table-column>
- <el-table-column
- prop="depositbank"
- align="center"
- label="寮�鎴烽摱琛�"
- width="200"
- >
+ <el-table-column prop="depositbank" align="center" label="寮�鎴烽摱琛�" width="200">
<template slot-scope="scope">
- <el-input
- v-model="scope.row.depositbank"
- placeholder="寮�鎴烽摱琛�"
- />
+ <el-input v-model="scope.row.depositbank" placeholder="寮�鎴烽摱琛�" />
</template>
</el-table-column>
- <el-table-column
- prop="bankcardno"
- align="center"
- label="閾惰甯愬彿"
- width="210"
- >
+ <el-table-column prop="bankcardno" align="center" label="閾惰甯愬彿" width="210">
<template slot-scope="scope">
- <el-input
- v-model="scope.row.bankcardno"
- placeholder="閾惰甯愬彿"
- />
+ <el-input v-model="scope.row.bankcardno" placeholder="閾惰甯愬彿" />
</template>
</el-table-column>
- <el-table-column
- prop="remark"
- align="center"
- width="330"
- label="澶囨敞"
- >
+ <el-table-column prop="remark" align="center" width="330" label="澶囨敞">
<template slot-scope="scope">
- <el-input
- type="textarea"
- :rows="2"
- v-model="scope.row.remark"
- placeholder="澶囨敞"
- />
+ <el-input type="textarea" :rows="2" v-model="scope.row.remark" placeholder="澶囨敞" />
</template>
</el-table-column>
- <el-table-column
- fixed="right"
- align="center"
- label="鎿嶄綔"
- width="180"
- >
+ <el-table-column fixed="right" align="center" label="鎿嶄綔" width="180">
<template slot-scope="scope">
- <el-button
- type="text"
- size="mini"
- @click="addRow(scope.$index)"
- v-if="
- operationType == 'add' ||
- operationType == 'update' ||
- operationType == 'check'
- "
- >鏂板</el-button
- >
- <el-button
- @click.native.prevent="
- deleteRows(scope.row, scope.$index, rbDetails)
- "
- type="text"
- size="small"
- v-if="
- operationType == 'add' ||
- operationType == 'update' ||
- operationType == 'check'
- "
- >
+ <el-button type="text" size="mini" @click="addRow(scope.$index)" v-if="operationType == 'add' ||
+ operationType == 'update' ||
+ operationType == 'check'
+ ">鏂板</el-button>
+ <el-button @click.native.prevent="
+ deleteRows(scope.row, scope.$index, rbDetails)
+ " type="text" size="small" v-if="operationType == 'add' ||
+ operationType == 'update' ||
+ operationType == 'check'
+ ">
鍒犻櫎
</el-button>
</template>
@@ -338,48 +167,23 @@
</el-table>
</el-row>
- <el-row
- v-if="
- operationType == 'detail' ||
- operationType == 'check' ||
- operationType == 'update'
- "
- >
+ <el-row v-if="operationType == 'detail' ||
+ operationType == 'check' ||
+ operationType == 'update'
+ ">
<el-table :data="fundflowList" border>
- <el-table-column
- label="瀹℃牳鏃ユ湡"
- align="center"
- width="160"
- prop="createTime"
- />
- <el-table-column
- label="瀹℃牳浜�"
- align="center"
- width="120"
- prop="checkusername"
- />
- <el-table-column
- label="瀹℃牳缁撴灉"
- align="center"
- width="200"
- prop="flowconclusion"
- >
+ <el-table-column label="瀹℃牳鏃ユ湡" align="center" width="160" prop="createTime" />
+ <el-table-column label="瀹℃牳浜�" align="center" width="120" prop="checkusername" />
+ <el-table-column label="瀹℃牳缁撴灉" align="center" width="200" prop="flowconclusion">
<template slot-scope="scope">
<span v-if="scope.row.flowconclusion == 1">閫氳繃</span>
<span v-if="scope.row.flowconclusion == 2">涓嶉�氳繃</span>
</template>
</el-table-column>
- <el-table-column
- label="瀹℃牳澶囨敞"
- align="center"
- prop="flowcontent"
- />
+ <el-table-column label="瀹℃牳澶囨敞" align="center" prop="flowcontent" />
</el-table>
</el-row>
- <el-row
- style="margin-top: 25px; margin-bottom: 5px"
- v-if="operationType == 'check'"
- >
+ <el-row style="margin-top: 25px; margin-bottom: 5px" v-if="operationType == 'check'">
<el-col :span="7">
<el-form-item label="瀹℃牳缁撴灉" align="left">
<el-radio-group v-model="checkObj.flowlevelone" align="left">
@@ -398,80 +202,42 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button
- type="primary"
- @click="submitForm"
- v-if="
- operationType == 'add' ||
- operationType == 'update' ||
- ismanager == true ||
- beforehandType == '1'
- "
- >鎻愪氦淇濆瓨</el-button
- >
- <el-button
- type="success"
- @click="handleup"
- v-if="operationType == 'add' || operationType == 'update'"
- >涓婃姤</el-button
- >
- <el-button
- type="primary"
- @click="checksubmit"
- v-if="operationType == 'check' && beforehandType != '1'"
- >鎻愪氦瀹℃牳</el-button
- >
+ <el-button type="primary" @click="submitForm" v-if="operationType == 'add' ||
+ operationType == 'update' ||
+ ismanager == true ||
+ beforehandType == '1'
+ ">鎻愪氦淇濆瓨</el-button>
+ <el-button type="success" @click="handleup"
+ v-if="operationType == 'add' || operationType == 'update'">涓婃姤</el-button>
+ <el-button type="primary" @click="checksubmit"
+ v-if="operationType == 'check' && beforehandType != '1'">鎻愪氦瀹℃牳</el-button>
<el-button @click="cancel">鍏� 闂�</el-button>
</div>
</div>
- <el-dialog
- :visible.sync="showSelectionDialog"
- :close-on-click-modal="false"
- :title="'涓汉淇℃伅閫夋嫨'"
- width="500px"
- style="text-align: center"
- v-loading="loading"
- >
+ <el-dialog :visible.sync="showSelectionDialog" :close-on-click-modal="false" :title="'缁╂晥浜哄憳锛堝惈鎵�鍦ㄥ崟浣嶏級璐﹀彿閫夋嫨'" width="500px"
+ style="text-align: center" v-loading="loading">
<el-form ref="funddetailForm" :model="funddetailForm">
<el-row>
- <el-select
- v-model="funddetailForm.userName"
- filterable
- remote
- reserve-keyword
- allow-create
- default-first-option
- placeholder="璇疯緭鍏ュ叧閿瘝"
- :remote-method="remoteMethod"
- :loading="loadingperformance"
- >
- <el-option
- v-for="item in optionsperformance"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
+ <el-form-item label="璇疯緭鍏ラ�夋嫨锛�" prop="unitno" label-width="120px">
+ <el-select v-model="funddetailForm.userName" filterable remote reserve-keyword allow-create default-first-option
+ placeholder="璇疯緭鍏ュ鍚嶆垨鍗曚綅鍚嶇О" :remote-method="remoteMethod" :loading="loadingperformance" style="width: 100%">
+ <el-option v-for="item in optionsperformance" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
+ </el-form-item>
</el-row>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="showSelectionDialog = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="ConfirmDetailDialog()"
- >纭� 瀹�</el-button
- >
+ <el-button type="primary" @click="ConfirmDetailDialog()">纭� 瀹�</el-button>
</span>
</el-dialog>
<el-dialog title="鎻愮ず" :visible.sync="Savereminder" width="30%">
- <el-alert
- :title="
- '鎮ㄥ凡娣诲姞' +
- totalquantity +
- '鏉℃暟鎹紝涓洪槻姝㈡暟鎹涪澶辨槸鍚︽彁浜や繚瀛樺啀缁х画娣诲姞銆�'
- "
- type="warning"
- >
+ <el-alert :title="'鎮ㄥ凡娣诲姞' +
+ totalquantity +
+ '鏉℃暟鎹紝涓洪槻姝㈡暟鎹涪澶辨槸鍚︽彁浜や繚瀛樺啀缁х画娣诲姞銆�'
+ " type="warning">
</el-alert>
<span slot="footer" class="dialog-footer">
<el-button @click="unsave">鍙� 娑�</el-button>
@@ -480,11 +246,7 @@
</el-dialog>
<!-- 鎵归噺閫夊彇 -->
- <el-dialog
- title="鎵归噺鐢熸垚鏄庣粏淇℃伅"
- :visible.sync="batchdialogVisible"
- width="40%"
- >
+ <el-dialog title="鎵归噺鐢熸垚鏄庣粏淇℃伅" :visible.sync="batchdialogVisible" width="40%">
<div style="margin-bottom: 15px; margin-left: 10px;">
<el-radio-group v-model="Performanceclass">
<el-radio-button :label="68">鏈堝害缁╂晥</el-radio-button>
@@ -493,24 +255,11 @@
</el-radio-group>
</div>
<div style="max-height: 330px; overflow-y: auto">
- <el-checkbox
- :indeterminate="isIndeterminate"
- v-model="checkAll"
- @change="handleCheckAllChange"
- >鍏ㄩ��</el-checkbox
- >
+ <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">鍏ㄩ��</el-checkbox>
<div style="margin: 15px 0;"></div>
- <el-checkbox-group
- v-model="checkedCities"
- @change="handleCheckedCitiesChange"
- >
- <el-checkbox
- border
- v-for="city in cityOptions"
- :label="city"
- :key="city.userNo"
- >{{ city.userName }}</el-checkbox
- >
+ <el-checkbox-group v-model="checkedCities" @change="handleCheckedCitiesChange">
+ <el-checkbox border v-for="city in cityOptions" :label="city" :key="city.userNo">{{ city.userName
+ }}</el-checkbox>
</el-checkbox-group>
</div>
@@ -597,7 +346,7 @@
spocewl: "",
//璐圭敤鐢宠琛ㄥ崟title
title: "",
- Copy: "",
+
//鐢宠鍗曠被鍨�
businessType: "0",
businessName: "",
@@ -832,13 +581,13 @@
watch: {},
//鏂规硶闆嗗悎
methods: {
- bbaaccss(val) {},
+ bbaaccss(val) { },
// 娴忚鍣ㄩ〉闈㈠叧闂垨鍒锋柊鎻愮ず
beforeunloadHandler(e) {
if (
(JSON.stringify(this.form) == sessionStorage.getItem("apiform") &&
JSON.stringify(this.rbDetails) ==
- sessionStorage.getItem("apifunddetail")) ||
+ sessionStorage.getItem("apifunddetail")) ||
!sessionStorage.getItem("apifunddetail")
) {
} else {
@@ -902,9 +651,8 @@
/** 閫氳繃鍙傛暟鑾峰彇涓氬姟绫诲瀷 */
getroute() {
console.log(11);
- //閫夋嫨涓氬姟绫诲瀷:1銆佹柊澧烇紱2銆佷慨鏀癸紱3銆佹煡鐪�
+ //閫夋嫨涓氬姟绫诲瀷:1銆佹柊澧烇紱2銆佷慨鏀癸紱3銆佸鍒讹紱4銆佹煡鐪�
this.curId = this.$route.query.id;
- this.Copy = this.$route.query.Copy;
this.businessType = this.$route.query.businessType;
this.operationType = this.$route.query.operationType;
this.beforehandType = this.$route.query.beforehandType;
@@ -920,11 +668,10 @@
this.handleAdd();
} else if (this.operationType == "update") {
this.title = this.businessName + "淇敼";
- if (this.Copy) {
- this.title = this.businessName + "澶嶅埗";
- }
- console.log(this.title);
this.handleUpdate();
+ } else if (this.operationType == "copy") {
+ this.title = this.businessName + "澶嶅埗";
+ this.handleCopy();
} else if (this.operationType == "detail") {
this.title = this.businessName + "鏌ョ湅";
this.jurisdiction = true;
@@ -963,15 +710,6 @@
//鏄庣粏澶勭悊
getownFundDetail(this.curId).then(res => {
this.rbDetails = res.data;
- if (this.Copy) {
- this.form.createTime = null;
- this.rbDetails.map(item => {
- item.amount = 0;
- item.taxedamount = 0;
- });
- console.log(this.rbDetails);
- }
-
if (this.rbDetails.length > 0) {
for (let m = 0; m < this.rbDetails.length; m++) {
this.rbDetails[m].itemlist = [];
@@ -999,6 +737,71 @@
listFundflow(listFundflowparams).then(res => {
this.fundflowList = res.rows;
});
+ });
+ },
+
+ /** 澶嶅埗鎸夐挳鎿嶄綔 */
+ handleCopy() {
+ this.isopen = 0;
+ this.reset();
+
+ getFund(this.curId).then(response => {
+ this.form = response.data;
+ sessionStorage.removeItem("apiform");
+ sessionStorage.setItem("apiform", JSON.stringify(this.form));
+
+ //鏄庣粏澶勭悊
+ getownFundDetail(this.curId).then(res => {
+ this.rbDetails = res.data;
+ if (this.rbDetails.length > 0) {
+ for (let m = 0; m < this.rbDetails.length; m++) {
+ this.rbDetails[m].itemlist = [];
+ this.getRowFeeItems(m, this.rbDetails[m]);
+
+ //鑾峰彇璐圭敤椤圭洰鐨勮缁嗕俊鎭�
+ this.rbDetails[m].rowfeeblocks = this.feeBlocks.filter(
+ r => r.itemid == this.rbDetails[m].itemid
+ );
+
+ //鍒濆鍖栨槑缁嗕俊鎭�
+ this.rbDetails[m].id = null;
+ this.rbDetails[m].fundid = null;
+ this.rbDetails[m].amount = 0;
+ this.rbDetails[m].taxamount = 0;
+ this.rbDetails[m].taxedamount = 0;
+ }
+
+ sessionStorage.removeItem("apifunddetail");
+ sessionStorage.setItem("apifunddetail", JSON.stringify(this.rbDetails));
+ } else {
+ this.addRow(0);
+ }
+ });
+
+ //鍒濆鍖栦富淇℃伅
+ this.curId = null;
+ this.form.id = null;
+ this.form.recordstatus = "-1";
+ this.form.checkstatus = null;
+ this.form.pretaxcost = 0;
+ this.form.istax = null;
+ this.form.fundtaxtime = null;
+ this.form.createTime = null;
+ this.form.updateTime = null;
+
+ this.form.flowlevel = null;
+ this.form.backflowlevel = null;
+
+ this.form.financedirector = null;
+ this.form.financechecher = null;
+ this.form.president = null;
+ this.form.finvicepresident = null;
+ this.form.busvicepresident = null;
+ this.form.zffs = null;
+ this.form.riqi = null;
+ this.form.bh = null;
+ this.form.istax = 0;
+ this.form.fundtaxtime = null;
});
},
@@ -1085,7 +888,7 @@
handleDelete() {
this.$modal
.confirm("鏄惁纭鍒犻櫎璇ヨ褰曪紵")
- .then(function() {
+ .then(function () {
return delFund(this.curId);
})
.then(() => {
@@ -1098,7 +901,7 @@
this.getfundList();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
})
- .catch(() => {});
+ .catch(() => { });
},
/** 涓婃姤鎸夐挳鎿嶄綔 */
@@ -1106,7 +909,7 @@
if (
(JSON.stringify(this.form) == sessionStorage.getItem("apiform") &&
JSON.stringify(this.rbDetails) ==
- sessionStorage.getItem("apifunddetail")) ||
+ sessionStorage.getItem("apifunddetail")) ||
!sessionStorage.getItem("apifunddetail")
) {
} else {
@@ -1122,6 +925,9 @@
//鏌ユ壘鏄惁瀛樺湪鐧昏瀹屾垚璁板綍
//鍒ゆ柇鏄惁瀛樺湪涓婃姤璁板綍
this.form.recordstatus = 0;
+ var currenttime = new Date();
+ this.form.createTime = currenttime.getFullYear() + "-" + (currenttime.getMonth()+1) + "-" + currenttime.getDate() + " " + currenttime.getHours() + ":" + currenttime.getMinutes() + ":" + currenttime.getSeconds();
+
if (!this.form.id) {
this.form.id = this.$route.query.id;
}
@@ -1161,7 +967,7 @@
return randomString;
},
/** 鎻愪氦鎸夐挳 */
- submitForm: debounce(function() {
+ submitForm: debounce(function () {
if (!this.randomnumber) {
this.randomnumber = this.generateRandomString(9);
this.form.randomnumber = this.randomnumber;
@@ -1177,16 +983,16 @@
if (tempDetail.itemid == null) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (k + 1).toString() +
- "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�"
+ (k + 1).toString() +
+ "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
if (tempDetail.idcardno == null) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (k + 1).toString() +
- "琛岀殑韬唤璇佹湭瀹屽杽锛岃鍏堝～鍐欒韩浠借瘉鍚庡啀鎻愪氦淇濆瓨锛�"
+ (k + 1).toString() +
+ "琛岀殑韬唤璇佹湭瀹屽杽锛岃鍏堝～鍐欒韩浠借瘉鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -1195,8 +1001,8 @@
if (tempDetail.servicesscope == null) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (k + 1).toString() +
- "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�"
+ (k + 1).toString() +
+ "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -1204,8 +1010,8 @@
if (tempDetail.beneficiaryno == null) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (k + 1).toString() +
- "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�"
+ (k + 1).toString() +
+ "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -1251,8 +1057,8 @@
) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (j + 1).toString() +
- "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
+ (j + 1).toString() +
+ "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -1266,8 +1072,8 @@
) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (j + 1).toString() +
- "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
+ (j + 1).toString() +
+ "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -1294,12 +1100,6 @@
if (this.form.id != null) {
} else {
this.form.recordstatus = -1;
- }
- if (this.Copy) {
- this.form.id = null;
- this.rbDetails.map(item => {
- return (item.id = null);
- });
}
sessionStorage.setItem(
@@ -1644,8 +1444,8 @@
if (tempDetail.itemid == null) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (k + 1).toString() +
- "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�"
+ (k + 1).toString() +
+ "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -1654,8 +1454,8 @@
if (tempDetail.servicesscope == null) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (k + 1).toString() +
- "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�"
+ (k + 1).toString() +
+ "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -1663,8 +1463,8 @@
if (tempDetail.beneficiaryno == null) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (k + 1).toString() +
- "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�"
+ (k + 1).toString() +
+ "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -1709,8 +1509,8 @@
) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (j + 1).toString() +
- "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
+ (j + 1).toString() +
+ "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -1984,7 +1784,6 @@
this.selectionType = showType;
this.selectionType = this.experthear;
this.expertfrom = "1";
- console.log(spoce);
this.funddetailForm.index = spoce.$index;
this.funddetailForm.beneficiaryno = spoce.row.beneficiaryno;
this.funddetailForm.beneficiaryname = spoce.row.beneficiaryname;
@@ -2059,7 +1858,7 @@
destroyed() {
window.removeEventListener("beforeunload", e => this.beforeunloadFn(e));
}, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴�
- activated() {} //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂
+ activated() { } //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂
};
</script>
@@ -2142,7 +1941,7 @@
line-height: 25px;
}
-::v-deep .el-checkbox.is-bordered + .el-checkbox.is-bordered {
+::v-deep .el-checkbox.is-bordered+.el-checkbox.is-bordered {
margin-left: 0 !important;
margin-bottom: 10px;
}
diff --git a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
index 548ef5c..5dba5d3 100644
--- a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
+++ b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
@@ -12,6 +12,7 @@
type="date"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="鐢宠鏃ユ湡"
+ :disabled="true"
>
</el-date-picker>
</el-form-item>
@@ -1358,10 +1359,7 @@
reimbursementList: [],
// 琛ㄥ崟鏍￠獙
- rules: {
- createTime: [
- { required: true, message: "璇疯緭鍏ュ～鎶ユ棩鏈�", trigger: "blur" }
- ],
+ rules: {
reason: [
{ required: true, message: "璇疯緭鍏ュ嚭宸簨鐢�", trigger: "blur" }
],
--
Gitblit v1.9.3