From 8324c778ee797ea5a844614c47d93bdacf3ffeab Mon Sep 17 00:00:00 2001 From: WXL <1785969728@qq.com> Date: 星期日, 07 一月 2024 13:17:33 +0800 Subject: [PATCH] 11 --- src/views/project/fund/expertFeeApply/index.vue | 1234 +++++++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 912 insertions(+), 322 deletions(-) diff --git a/src/views/project/fund/expertFeeApply/index.vue b/src/views/project/fund/expertFeeApply/index.vue index a22f99a..5813975 100644 --- a/src/views/project/fund/expertFeeApply/index.vue +++ b/src/views/project/fund/expertFeeApply/index.vue @@ -1,28 +1,6 @@ <!-- --> <template> <div class="app-container"> - <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-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> - </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-col> - </el-row> - </el-form> <el-row> <el-col :span="6"> <el-card shadow="never"> @@ -33,58 +11,194 @@ </el-row> </el-col> </el-row> - <el-table v-loading="loading" highlight-current-row :data="donatebaseinfoList" @row-click="selectDonotor"> + <div> + <el-form + :model="queryParams" + ref="queryForm" + :inline="true" + label-width="70px" + > + <el-form-item label="濮撳悕" prop="name"> + <el-input + v-model="queryParams.donorname" + placeholder="璇疯緭鍏ュ鍚�" + clearable + size="small" + @keyup.enter.native="handleQuery" + /> + </el-form-item> + <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> + </el-form-item> + <div style="float: right; margin-bottom: 10px;"> + <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 + > + </div> + </el-form> + </div> + <el-table + v-loading="loading" + 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" :key="dict.value" /> + <dict-tag + :options="dict.type.sys_DonationStatus" + :value="scope.row.recordstate" + :key="dict.value" + /> <!-- :label="dict.label" --> </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"> <el-card shadow="naver"> <el-form ref="infoform" label-width="100px"> <el-row :gutter="4" align="right" class="mb8"> - <el-col :span="1.5"> - <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" - v-hasPermi="['project:expretfund:add']">涓撳璐圭敤鐢宠</el-button> - </el-col> - <el-col :span="9"> + <el-col :span="7"> <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"> + <el-col :span="8"> <el-form-item label="濮撳悕"> <el-input v-model="curCase.name" :disabled="true"></el-input> </el-form-item> </el-col> - <el-col> - <!-- <el-button round @click='totaldayin'>涓嬭浇</el-button> --> + <el-col :span="3"> + <el-button + type="primary" + icon="el-icon-search" + size="mini" + @click="allgetfundList" + >妫�绱㈠叏閮�</el-button + > + </el-col> + </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:expretfund: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="180px"> + <el-table + v-loading="loading" + border + :data="donateconsolationfundList" + > + <el-table-column + label="鐢宠鏃ユ湡" + align="center" + prop="applyTime" + width="180px" + > <template slot-scope="scope"> <span>{{ - parseTime(scope.row.createTime, "{y}-{m}-{d}") + parseTime(scope.row.applyTime, "{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="managername" width="120px" /> - <el-table-column label="鎵�灞炵粍鍒�" align="center" prop="deptmentname" width="200px" /> - <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="donorname" + width="120px" + /> + <el-table-column + label="缁勯暱" + align="center" + prop="managername" + width="120px" + /> + <el-table-column + label="鎵�灞炵粍鍒�" + align="center" + prop="deptmentname" + width="200px" + /> + <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" + > + <template slot-scope="scope"> + <dict-tag + :options="dict.type.sys_stage_type" + :value="scope.row.checkstatus" + /> </template> </el-table-column> <!-- @@ -92,20 +206,55 @@ <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)">淇敼</el-button> - <el-button size="mini" type="text" icon="el-icon-edit" @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-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)" + >淇敼</el-button + > + <el-button + size="mini" + type="text" + icon="el-icon-view" + @click="handleDetail(scope.row)" + >鏌ョ湅</el-button + > <!-- v-hasPermi="['project:expretfund:edit']" --> - <el-button v-if="scope.row.recordstatus == -1 || - scope.row.recordstatus == 1 - " size="mini" type="text" icon="el-icon-delete" @click="handleDelete(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)" + >鍒犻櫎</el-button + > <!-- v-hasPermi="['project:expretfund:delete']" --> <!-- <el-button size="mini" @@ -125,34 +274,70 @@ </el-row> <!-- 娣诲姞鎴栦慨鏀硅垂鐢ㄧ敵璇峰崟 --> - <el-dialog :visible.sync="dialogOpen" :close-on-click-modal="false" width="1400px" :title="title" - style="text-align: center" v-loading="loading"> - <el-form style="height: 550px; overflow-y: auto; overflow-x: hidden" ref="form" :model="form" label-width="120px" - :rules="rules"> + <el-dialog + :visible.sync="dialogOpen" + :close-on-click-modal="false" + width="1400px" + :title="title" + style="text-align: center" + v-loading="loading" + > + <el-form + style="height: 550px; overflow-y: auto; overflow-x: hidden" + 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-form-item label="鐢宠鏃ユ湡" prop="applyTime"> + <el-date-picker + clearable + style="width: 100%" + v-model="form.applyTime" + 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> @@ -171,7 +356,9 @@ --> <el-col :span="5"> <el-form-item label="璐圭敤绫诲瀷"> - <el-radio v-model="form.applytype" label="1">涓撳璐圭敤鐢宠</el-radio> + <el-radio v-model="form.applytype" label="1" + >涓撳璐圭敤鐢宠</el-radio + > </el-form-item> </el-col> <el-col :span="10"> @@ -184,7 +371,6 @@ <el-input v-model="form.phone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" /> </el-form-item> </el-col> - </el-row> <el-row style="text-align: left"> <!-- @@ -196,30 +382,52 @@ --> <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="taxcost"> - <el-input v-model="form.taxcost" placeholder="搴旂即绋庨噾棰濆悎璁�" :disabled="true" /> - </el-form-item> - </el-col><!-- + <el-input + v-model="form.taxcost" + 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-form-item> </el-col>--> <el-col :span="5"> - <el-form-item label="鎹愮尞鑰�" prop="name"> - <el-input :disabled="true" v-model="form.name" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" /> + <el-form-item label="鎹愮尞鑰�" prop="donorname"> + <el-input + :disabled="true" + v-model="form.donorname" + placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" + /> </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> @@ -227,64 +435,161 @@ <el-row style="margin-top: 5px; margin-bottom: 5px"> <el-row style="margin-bottom: 10px"> <el-col :span="4"> - <el-button @click.native.prevent="addAllItems" type="primary" size="small"> + <el-button + @click.native.prevent="addAllItems" + type="primary" + size="small" + > 瀵煎叆鏈嶅姟椤圭洰 </el-button> </el-col> </el-row> - <el-table :data="fundDetails" v-loading="loading" border highlight-current-row> - <el-table-column prop="orderno" align="center" label="搴忓彿" width="65"> + <el-table + :data="fundDetails" + v-loading="loading" + border + highlight-current-row + > + <el-table-column + prop="orderno" + align="center" + label="搴忓彿" + width="65" + > <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="loadItemType(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="loadItemType(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.itemArr" :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.itemArr" + :key="dict.index" + :label="dict.itemName" + :value="dict.id" + ></el-option> </el-select> </template> </el-table-column> - <el-table-column prop="itemcode" align="center" label="椤圭洰缂栧彿" show-overflow-tooltip="" v-if="false"> + <el-table-column + prop="itemcode" + align="center" + label="椤圭洰缂栧彿" + show-overflow-tooltip="" + v-if="false" + > </el-table-column> - <el-table-column prop="servicesscope" align="center" label="璐圭敤璇存槑" width="180"> + <el-table-column + prop="servicesscope" + align="center" + label="璐圭敤璇存槑" + width="180" + > <template slot-scope="scope"> - <el-select v-model="scope.row.servicesscope" placeholder="璐圭敤璇存槑" clearable allow-create filterable - @change="selectedRemark(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 + filterable + @change="selectedRemark(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 v-if="this.ismanager == true" prop="amount" align="center" label="绋庡墠閲戦" width="120"> + <el-table-column + v-if="this.ismanager == true" + prop="amount" + align="center" + label="绋庡墠閲戦" + width="120" + > <template slot-scope="scope"> - <el-select v-model="scope.row.amount" placeholder="绋庡墠閲戦" clearable filterable allow-create - @change="selectamount(scope.row)"> - <el-option v-for="dict in scope.row.rowfeeblocks" :key="dict.expensedescribe" :label="dict.expense" - :value="dict.expense"></el-option> + <el-select + v-model="scope.row.amount" + placeholder="绋庡墠閲戦" + clearable + filterable + allow-create + @change="selectamount(scope.row)" + > + <el-option + v-for="dict in scope.row.rowfeeblocks" + :key="dict.expensedescribe" + :label="dict.expense" + :value="dict.expense" + ></el-option> </el-select> </template> </el-table-column> - <el-table-column prop="taxedamount" align="center" label="绋庡悗閲戦" width="120" v-if="this.ismanager == true"> + <el-table-column + prop="taxedamount" + align="center" + label="绋庡悗閲戦" + width="120" + v-if="this.ismanager == true" + > <!-- v-if="form.applytype != '3'"涓婂悓 --> <template slot-scope="scope"> - <el-input v-model="scope.row.taxedamount" placeholder="绋庡悗閲戦" /> + <el-input + v-model="scope.row.taxedamount" + placeholder="绋庡悗閲戦" + /> </template> </el-table-column> - <el-table-column prop="beneficiaryname" align="center" label="濮撳悕" width="100" v-if="form.applytype != 3"> + <el-table-column + prop="beneficiaryname" + align="center" + label="濮撳悕" + width="100" + 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-select filterable allow-create @@ -304,10 +609,19 @@ </el-select> --> </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 + > <!-- <el-select v-model="scope.row.unitno" placeholder="鍗曚綅" @@ -324,54 +638,124 @@ </el-select> --> </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(scope.row); - } - " /> + <el-input + v-model="scope.row.quantity" + placeholder="鏁伴噺" + @blur=" + val => { + sumTotalFee(scope.row); + } + " + /> </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(scope.row); - } - " /> + <el-input + v-model="scope.row.price" + placeholder="浠锋牸" + @blur=" + val => { + sumTotalFee(scope.row); + } + " + /> </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="180" v-if="dialogType == 'edit'"> + <el-table-column + fixed="right" + align="center" + label="鎿嶄綔" + width="180" + 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, fundDetails) - " 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, fundDetails) + " + type="text" + size="small" + > 鍒犻櫎 </el-button> </template> @@ -421,38 +805,94 @@ --> <el-row> <el-col :span="12"> - <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) => - 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> + <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) => + 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 + > </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="showDetailInfoDialog" :close-on-click-modal="false" :title="'瀵煎叆淇℃伅'" width="500px" - style="text-align: center" v-loading="loading"> + <el-dialog + :visible.sync="showDetailInfoDialog" + :close-on-click-modal="false" + :title="'瀵煎叆淇℃伅'" + width="500px" + style="text-align: center" + v-loading="loading" + > <el-form ref="funddetailForm" :model="funddetailForm"> <el-row> <el-col :span="24" v-if="showDetailInfoDialogType == 'name'"> @@ -463,22 +903,50 @@ </el-radio-group> </el-form-item> </el-col> - <el-col :span="24" v-if="showDetailInfoDialogType == 'name' && 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.reportNo" :label="item.reportName" - :value="item.reportName"> + <el-col + :span="24" + v-if="showDetailInfoDialogType == 'name' && 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.reportNo" + :label="item.reportName" + :value="item.reportName" + > </el-option> </el-select> </el-form-item> </el-col> <el-col :span="24" v-if="showDetailInfoDialogType == 'unit'"> <el-form-item 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 + 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> @@ -486,22 +954,43 @@ <el-row> <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-input + v-model="funddetailForm.expertname" + 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-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-form-item> </el-col> </el-row> <el-row> <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-form-item + label="韬唤璇佸彿" + prop="expertidcardno" + label-width="80px" + > + <el-input + v-model="funddetailForm.expertidcardno" + placeholder="蹇呭~椤�" + /> </el-form-item> </el-col> </el-row> @@ -519,30 +1008,60 @@ --> <el-row> <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-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> <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-form-item + label="寮�鎴烽摱琛�" + prop="expertdepositbank" + label-width="80px" + > + <el-input + v-model="funddetailForm.expertdepositbank" + 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 + label="閾惰鍗″彿" + prop="expertbankcardno" + label-width="80px" + > + <el-input + v-model="funddetailForm.expertbankcardno" + placeholder="蹇呭~椤�" + /> </el-form-item> </el-col> </el-row> </el-form> <span slot="footer" class="dialog-footer"> <el-button @click="showDetailInfoDialog = false">鍙� 娑�</el-button> - <el-button type="primary" @click="ConfirmDetailDialog()">纭� 瀹�</el-button> + <el-button type="primary" @click="ConfirmDetailDialog()" + >纭� 瀹�</el-button + > </span> </el-dialog> </div> @@ -623,7 +1142,7 @@ //import寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢� components: { Li_area_select, - OrgSelecter, + OrgSelecter }, name: "fundApply", @@ -640,7 +1159,8 @@ //"sys_financeitemtype", //"sys_expensetype", "sys_recordstatus", - "sys_professionaltitle" + "sys_professionaltitle", + "sys_stage_type" ], data() { @@ -666,13 +1186,14 @@ donorno: null, reportername: null, reporttime: null, + donorname: null }, fundQueryParam: { pageNum: 1, pageSize: 100, infoid: null, applytype: "1", - createBy: null, + createBy: null }, // 琛ㄥ崟鍙傛暟 form: {}, @@ -683,11 +1204,11 @@ pageSize: 10000, userno: null, username: null, - usertype: null, + usertype: null }, // - amount: 0.00, + amount: 0.0, //鐢宠鍗曠被鍨� currentApplyType: "1", @@ -697,21 +1218,21 @@ expertfrom: "1", //璁$畻涓◣鍙傛暟 taxParam: { - beneficiaryNo: '', - money: '0', - startTime: '', + beneficiaryNo: "", + money: "0", + startTime: "" }, // 琛ㄥ崟鏍¢獙 rules: { username: [ - { required: true, message: "璇疯緭鍏ョ敵璇蜂汉", trigger: "blur" }, + { required: true, message: "璇疯緭鍏ョ敵璇蜂汉", trigger: "blur" } ], - createTime: [ - { required: true, message: "璇疯緭鍏ョ敵璇锋棩鏈�", trigger: "blur" }, + applyTime: [ + { required: true, message: "璇疯緭鍏ョ敵璇锋棩鏈�", trigger: "blur" } ], deptmentname: [ - { required: true, message: "璇疯緭鍏ユ墍灞炰笟鍔$粍", trigger: "blur" }, - ], + { required: true, message: "璇疯緭鍏ユ墍灞炰笟鍔$粍", trigger: "blur" } + ] // amountrequested: [ // { required: true, message: "璇疯緭鍏ョ敵璇烽噾棰�", trigger: "blur" }, // ], @@ -771,7 +1292,7 @@ expertunitname: null, experttitle: null, expertdepositbank: null, - expertbankcardno: null, + expertbankcardno: null }, expertform: { id: null, @@ -798,7 +1319,7 @@ userno: null, userstatus: 1, usertype: null, - wbm: null, + wbm: null }, //闄勪欢鍒楄〃 @@ -807,23 +1328,21 @@ uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", headers: { - Authorization: "Bearer " + getToken(), - }, - + Authorization: "Bearer " + getToken() + } }; }, //鐩戝惉灞炴�� 绫讳技浜巇ata姒傚康 computed: {}, //鐩戞帶data涓殑鏁版嵁鍙樺寲 watch: {}, - //鐢熷懡鍛ㄦ湡 - 鍒涘缓瀹屾垚锛堝彲浠ヨ闂綋鍓峵his瀹炰緥锛� + //鐢熷懡鍛ㄦ湡 - 鍒涘缓瀹屾垚锛堝彲浠ヨ闂綋鍓峵his瀹炰緥锛� created() { this.getList(); this.getBaseInfoList(); this.getCurFundType(); this.getUserList(); this.getUnitList(); - }, //鐢熷懡鍛ㄦ湡 - 鎸傝浇瀹屾垚锛堝彲浠ヨ闂瓺OM鍏冪礌锛� @@ -833,17 +1352,16 @@ this.getExternalpersonList(); }, - beforeCreate() { }, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠 - beforeMount() { }, //鐢熷懡鍛ㄦ湡 - 鎸傝浇涔嬪墠 - beforeUpdate() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪墠 - updated() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗 - beforeDestroy() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓� - destroyed() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴� - activated() { }, //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂 + beforeCreate() {}, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠 + beforeMount() {}, //鐢熷懡鍛ㄦ湡 - 鎸傝浇涔嬪墠 + beforeUpdate() {}, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪墠 + updated() {}, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗 + beforeDestroy() {}, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓� + destroyed() {}, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴� + activated() {}, //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂 //鏂规硶闆嗗悎 methods: { - /** 鎼滅储鎸夐挳鎿嶄綔 */ handleQuery() { this.queryParams.pageNum = 1; @@ -859,6 +1377,26 @@ /** 鏂板鎸夐挳鎿嶄綔 */ handleAdd() { + if (this.curCase.id) { + this.$router.push({ + path: "/finance/applyDetail/", + query: { + id: 0, + businessType: "1", + operationType: "add", + curCase: this.curCase + } + }); + } else { + const h = this.$createElement; + this.$message({ + message: h("p", null, [ + h("span", null, "璇峰湪宸﹁竟鐨勬崘鐚渚嬭〃閫夋嫨闇�瑕佹搷浣滅殑妗堜緥锛�") + ]) + }); + } + return; + if (this.curCase.id) { this.istrue += 2; this.reset(); @@ -885,13 +1423,24 @@ } else { const h = this.$createElement; this.$message({ - message: h("p", null, [h("span", null, "璇峰厛閫夋嫨宸︽柟鎹愮尞妗堜緥 ")]), + message: h("p", null, [h("span", null, "璇峰厛閫夋嫨宸︽柟鎹愮尞妗堜緥 ")]) }); } }, /** 淇敼鎸夐挳鎿嶄綔 */ handleUpdate(row) { + this.$router.push({ + path: "/finance/applyDetail/", + query: { + id: row.id, + businessType: "1", + operationType: "update", + curCase: this.curCase + } + }); + return; + this.isopen = 0; this.reset(); this.queryParams.params = {}; @@ -900,13 +1449,17 @@ this.dialogType = "edit"; const id = row.id || this.ids; - getFund(id).then((response) => { + getFund(id).then(response => { this.form = response.data; // this.form.recordstate =-1; // this.form.recordstatus = response.data.recordstatus + ""; //闄勪欢澶勭悊 - this.fileList = this.form.annexbankcard ? this.form.annexbankcard.split(",").map(item => ({ url: item, name: item })) : [] - getownFundDetail(id).then((res) => { + this.fileList = this.form.annexbankcard + ? this.form.annexbankcard + .split(",") + .map(item => ({ url: item, name: item })) + : []; + getownFundDetail(id).then(res => { this.fundDetails = res.data; for (let m = 0; m < this.fundDetails.length; m++) { this.fundDetails[m].itemArr = []; @@ -919,7 +1472,7 @@ servicesscope: this.fundDetails[m].servicesscope, expensedescribe: this.fundDetails[m].servicesscopename, expense: this.fundDetails[m].expense, - remark: this.fundDetails[m].servicesscopename, + remark: this.fundDetails[m].servicesscopename }); // getdetailsByItemId(this.fundDetails[m].itemid).then((res) => { // let fundmsg = res.data; @@ -943,6 +1496,17 @@ /** 鏌ョ湅鎸夐挳鎿嶄綔 */ handleDetail(row) { + this.$router.push({ + path: "/finance/applyDetail/", + query: { + id: row.id, + businessType: "1", + operationType: "detail", + curCase: this.curCase + } + }); + return; + this.isopen = 0; this.reset(); this.queryParams.params = {}; @@ -951,19 +1515,23 @@ this.dialogType = "detail"; const id = row.id || this.ids; - getFund(id).then((response) => { + getFund(id).then(response => { this.form = response.data; let listFundflowparams = { fundid: row.id, - fundtype: 2, + fundtype: 2 }; //闄勪欢澶勭悊 - this.fileList = this.form.annexbankcard ? this.form.annexbankcard.split(",").map(item => ({ url: item, name: item })) : [] + this.fileList = this.form.annexbankcard + ? this.form.annexbankcard + .split(",") + .map(item => ({ url: item, name: item })) + : []; - listFundflow(listFundflowparams).then((res) => { + listFundflow(listFundflowparams).then(res => { this.fundflowList = res.rows; }); - getownFundDetail(id).then((res) => { + getownFundDetail(id).then(res => { this.fundDetails = res.data; for (let m = 0; m < this.fundDetails.length; m++) { this.fundDetails[m].itemArr = []; @@ -973,7 +1541,7 @@ expense: this.fundDetails[m].expense, expensedescribe: this.fundDetails[m].servicesscopename, remark: this.fundDetails[m].servicesscope, - servicesscope: this.fundDetails[m].servicesscope, + servicesscope: this.fundDetails[m].servicesscope }); } @@ -988,11 +1556,11 @@ const ids = row.id || this.ids; this.$modal .confirm("鏄惁纭鍒犻櫎璇ヨ褰曪紵") - .then(function () { + .then(function() { return delFund(ids); }) .then(() => { - getownFundDetail(ids).then((res) => { + getownFundDetail(ids).then(res => { let listdetails = res.data; for (let i = 0; i < listdetails.length; i++) { delFunddetail(listdetails[i].id); @@ -1002,31 +1570,34 @@ this.getfundList(); this.$modal.msgSuccess("鍒犻櫎鎴愬姛"); }) - .catch(() => { }); + .catch(() => {}); }, /** 涓婃姤鎸夐挳鎿嶄綔 */ handleUp(row) { + console.log(row); this.$confirm("鏄惁纭灏嗙櫥璁拌褰曚笂鎶ワ紵", "鎻愮ず", { confirmButtonText: "纭畾", cancelButtonText: "鍙栨秷", - type: "warning", + type: "warning" }) .then(() => { //鏌ユ壘鏄惁瀛樺湪鐧昏瀹屾垚璁板綍 //鍒ゆ柇鏄惁瀛樺湪涓婃姤璁板綍 row.recordstatus = 0; - console.log("updateFund", row); - updateFund(row).then((response) => { + var currenttime = new Date(); + row.applyTime = currenttime.getFullYear() + "-" + (currenttime.getMonth()+1) + "-" + currenttime.getDate() + " " + currenttime.getHours() + ":" + currenttime.getMinutes() + ":" + currenttime.getSeconds(); + + updateFund(row).then(response => { if (response.code == 200) { this.$message({ type: "success", - message: "鎻愪氦涓撳璐圭敤鐢宠瀹℃壒鎴愬姛锛�", + message: "鎻愪氦涓撳璐圭敤鐢宠瀹℃壒鎴愬姛锛�" }); } else { this.$message({ type: "error", - message: "鎻愪氦涓撳璐圭敤鐢宠澶辫触锛�", + message: "鎻愪氦涓撳璐圭敤鐢宠澶辫触锛�" }); } this.loading = false; @@ -1035,14 +1606,14 @@ .catch(() => { this.$message({ type: "info", - message: "宸插彇娑堢敵璇�", + message: "宸插彇娑堢敵璇�" }); }); }, /** 鎻愪氦鎸夐挳 */ submitForm() { - this.$refs["form"].validate((valid) => { + this.$refs["form"].validate(valid => { if (valid) { this.formData = this.form; // let totalPreTaxAmount = 0.0; @@ -1053,17 +1624,29 @@ for (let k = 0; k < this.fundDetails.length; k++) { let tempDetail = this.fundDetails[k]; if (tempDetail.itemid == null) { - this.$modal.msgWarning("鏈嶅姟椤圭洰琛ㄤ腑锛岀" + (k + 1).toString() + "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�"); + this.$modal.msgWarning( + "鏈嶅姟椤圭洰琛ㄤ腑锛岀" + + (k + 1).toString() + + "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�" + ); return; } if (tempDetail.servicesscope == null) { - this.$modal.msgWarning("鏈嶅姟椤圭洰琛ㄤ腑锛岀" + (k + 1).toString() + "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�"); + this.$modal.msgWarning( + "鏈嶅姟椤圭洰琛ㄤ腑锛岀" + + (k + 1).toString() + + "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�" + ); return; } if (tempDetail.beneficiaryno == null) { - this.$modal.msgWarning("鏈嶅姟椤圭洰琛ㄤ腑锛岀" + (k + 1).toString() + "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�"); + this.$modal.msgWarning( + "鏈嶅姟椤圭洰琛ㄤ腑锛岀" + + (k + 1).toString() + + "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�" + ); return; } @@ -1094,7 +1677,7 @@ //鑾峰彇鏈嶅姟椤圭洰鏄庣粏 let tempItemArr = tempDetail.itemArr; let itemIndex = tempItemArr.findIndex( - (item) => tempDetail.itemid == item.id + item => tempDetail.itemid == item.id ); if (itemIndex > -1) { tempDetail.itemname = tempItemArr[itemIndex].itemName; @@ -1103,12 +1686,18 @@ //鑾峰彇applytypename銆佹湇鍔¤垂鐢ㄥぇ绫� let applytypeIndex = this.rowfeeItemTypes.findIndex( - (item) => tempDetail.applytype == item.value + item => tempDetail.applytype == item.value ); if (applytypeIndex > -1) { - tempDetail.applytypename = this.rowfeeItemTypes[applytypeIndex].label; - tempDetail.subjecttype = this.rowfeeItemTypes[applytypeIndex].subjecttype; - tempDetail.subjecttypename = this.rowfeeItemTypes[applytypeIndex].subjecttypename; + tempDetail.applytypename = this.rowfeeItemTypes[ + applytypeIndex + ].label; + tempDetail.subjecttype = this.rowfeeItemTypes[ + applytypeIndex + ].subjecttype; + tempDetail.subjecttypename = this.rowfeeItemTypes[ + applytypeIndex + ].subjecttypename; } this.fundDetails[i] = tempDetail; /* @@ -1145,7 +1734,6 @@ this.totalAfterTaxAmount += parseFloat(tempDetail.taxedamount); this.totalAmount += parseFloat(tempDetail.amount); - console.log("1", this.amount); } }); } @@ -1159,7 +1747,7 @@ //淇濆瓨鏁版嵁 this.loading = true; this.form.serviceFunddetails = 0; - this.fundDetails.map((item) => { + this.fundDetails.map(item => { this.form.serviceFunddetails += item.amount; }); this.form.serviceFunddetails = this.fundDetails; @@ -1180,7 +1768,6 @@ // this.$modal.msgError("涓撳鍔冲姟璐逛繚瀛樺け璐ワ細" + response.msg); // } // }); - } else { this.form.recordstatus = -1; @@ -1193,7 +1780,7 @@ // }); } - addorupdateFund(this.form).then((response) => { + addorupdateFund(this.form).then(response => { if (response.code === 200) { this.selectDonotor(this.curCase); this.$modal.msgSuccess("涓撳鍔冲姟璐逛繚瀛樻垚鍔燂紒"); @@ -1208,7 +1795,6 @@ // this.getfundList(); this.getList(); this.selectDonotor(this.curCase); - } }); }, @@ -1259,11 +1845,11 @@ applytype: "1", servicetypename: null, servicesscope: null, - servicesscopename: null, + servicesscopename: null }; this.resetForm("form"); //娓呯┖闄勪欢 - this.fileList = [] + this.fileList = []; }, ShowDetailDialog(spoce, showType) { @@ -1292,12 +1878,10 @@ let singleDetail = this.fundDetails[tempIndex]; if (this.showDetailInfoDialogType == "name") { - if (this.expertfrom == "1") { //浠庝笓瀹跺垪琛ㄨ幏鍙栦俊鎭� - this.personlist.map((res) => { + this.personlist.map(res => { if (tempName == res.username) { - console.log("閫夋嫨涓撳", res); singleDetail.beneficiaryno = res.userno; singleDetail.beneficiaryname = res.username; singleDetail.bankcardno = res.bankcardno; @@ -1313,7 +1897,8 @@ } else { //淇濆瓨鏂板涓撳 this.expertform.id = null; - this.expertform.userno = this.personlist[this.personlist.length - 1].id + 1; + 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; @@ -1326,10 +1911,12 @@ this.expertform.unitno = this.funddetailForm.expertunitno; try { let unitIndex = this.unitList.findIndex( - (item) => this.expertform.unitno == item.organizationid + item => this.expertform.unitno == item.organizationid ); if (unitIndex > -1) { - this.expertform.unitname = this.unitList[unitIndex].organizationname; + this.expertform.unitname = this.unitList[ + unitIndex + ].organizationname; } else { this.expertform.unitname = this.expertform.unitno; } @@ -1345,17 +1932,15 @@ this.expertform.remark = null; this.expertform.del_flag = "0"; - addExternalperson(this.expertform).then((response) => { + addExternalperson(this.expertform).then(response => { if (response.code == 200) { this.$modal.msgSuccess("鏂板涓撳淇℃伅鎴愬姛锛�"); - listExternalperson().then((res) => { + listExternalperson().then(res => { this.personlist = res.rows; - console.log("new personlist", this.personlist); //浠庝笓瀹跺垪琛ㄨ幏鍙栦俊鎭� - this.personlist.map((res) => { + this.personlist.map(res => { if (res.username == this.funddetailForm.expertname) { - console.log("鏂板涓撳", res); singleDetail.beneficiaryno = res.userno; singleDetail.beneficiaryname = res.username; singleDetail.bankcardno = res.bankcardno; @@ -1372,12 +1957,11 @@ } }); } - } else if (this.showDetailInfoDialogType == "unit") { singleDetail.unitno = this.funddetailForm.unitno; try { let unitIndex = this.unitList.findIndex( - (item) => singleDetail.unitno == item.organizationid + item => singleDetail.unitno == item.organizationid ); if (unitIndex > -1) { singleDetail.unitname = this.unitList[unitIndex].organizationname; @@ -1395,11 +1979,14 @@ //鑾峰彇褰撳墠鐢ㄦ埛淇℃伅 getUsermsg() { - getUserProfile().then((response) => { - console.log("getUserProfile", response); + getUserProfile().then(response => { this.defaultperson = response.data; this.standardlevel = response.data.standardlevel; - if (this.defaultperson.createBy == "admin" || this.defaultperson.createBy == "001" || this.defaultperson.createBy == "002") { + if ( + this.defaultperson.createBy == "admin" || + this.defaultperson.createBy == "001" || + this.defaultperson.createBy == "002" + ) { this.ismanager = true; } else { this.ismanager = false; @@ -1423,7 +2010,7 @@ } this.form.serviceFunddetails = 0; - this.fundDetails.map((item) => { + this.fundDetails.map(item => { this.form.serviceFunddetails += item.amount; }); } @@ -1432,32 +2019,34 @@ //鏍¢獙鏀惰垂椤圭洰鏄惁閲嶅 verifyFeeItem(row) { - row.itemArr.map((res) => { + row.itemArr.map(res => { if (row.itemid === res.id) { row.remark = res.itemDescribe; row.itemcode = res.itemCode; } }); - var repeatNum = 0; - this.fundDetails.map((res) => { - if (res.applytype === row.applytype && res.itemid == row.itemid) { - repeatNum++; + if (this.businessType == "1") { + var repeatNum = 0; + this.fundDetails.map(res => { + if (res.applytype === row.applytype && res.itemid == row.itemid) { + repeatNum++; + } + }); + if (repeatNum > 1) { + this.$modal.msgWarning("鎮ㄥ凡缁忔彁浜よ繃璇ユ湇鍔¢」鐩簡"); } - }); - if (repeatNum > 1) { - this.$modal.msgWarning("鎮ㄥ凡缁忔彁浜よ繃璇ユ湇鍔¢」鐩簡"); } //鑾峰彇璐圭敤椤圭洰鐨勮缁嗕俊鎭� - getdetailsByItemId(row.itemid).then((res) => { + getdetailsByItemId(row.itemid).then(res => { let fundmsg = res.data; let rowfeeblocks = []; - fundmsg.forEach((item) => { + fundmsg.forEach(item => { rowfeeblocks.push({ expense: item.expense, expensedescribe: item.expensedescribe, remark: item.expensedescribe, - servicesscope: item.id, + servicesscope: item.id }); }); @@ -1465,7 +2054,6 @@ row.servicesscope = null; row.servicesscopename = ""; }); - }, // @@ -1482,14 +2070,14 @@ this.loading = true; this.queryParams.params = {}; if (null != this.daterangeReporttime && "" != this.daterangeReporttime) { - this.queryParams.params["beginReporttime"] = - this.daterangeReporttime[0]; + this.queryParams.params[ + "beginReporttime" + ] = this.daterangeReporttime[0]; this.queryParams.params["endReporttime"] = this.daterangeReporttime[1]; } // this.queryParams.residencetown = this.$refs.areaSelect.getQu(); - console.log("111", this.queryParams); - listDonatebaseinfo(this.queryParams).then((response) => { + listDonatebaseinfo(this.queryParams).then(response => { this.donatebaseinfoList = response.rows; this.total = response.total; this.loading = false; @@ -1497,12 +2085,12 @@ }, getUnitList() { - listOrganization(3).then((response) => { + listOrganization(3).then(response => { for (let i = 0; i < response.rows.length; i++) { this.unitList.push({ //organizationid: response.rows[i].organizationid, organizationid: response.rows[i].id, - organizationname: response.rows[i].organizationname, + organizationname: response.rows[i].organizationname }); } }); @@ -1510,7 +2098,7 @@ getBaseInfoList() { this.loading = true; - listDonatebaseinfo(this.queryParams).then((response) => { + listDonatebaseinfo(this.queryParams).then(response => { this.donatebaseinfoList = response.rows; this.total = response.total; this.loading = false; @@ -1522,12 +2110,20 @@ this.curCase = row; this.getfundList(); }, - + allgetfundList() { + this.loading = true; + this.reset(); + this.fundQueryParam.infoid = null; + listFund(this.fundQueryParam).then(response => { + this.loading = false; + this.donateconsolationfundList = response.rows; + }); + }, getfundList() { this.loading = true; this.reset(); this.fundQueryParam.infoid = this.curCase.id; - listFund(this.fundQueryParam).then((response) => { + listFund(this.fundQueryParam).then(response => { this.loading = false; this.donateconsolationfundList = response.rows; }); @@ -1537,14 +2133,14 @@ addAllItems() { this.loading = true; this.fundDetails = this.fundDetails.filter( - (r) => r.applytype != "" && r.applytype != null + r => r.applytype != "" && r.applytype != null ); let listAdd = []; //let listAdd = this.fundDetails; for (let i = 0; i < this.feeItemTypes.length; i++) { for (let j = 0; j < this.feeItemTypes[i].itemDetails.length; j++) { let list = this.fundDetails.filter( - (r) => + r => r.applytype == this.feeItemTypes[i].itemType && r.itemid == this.feeItemTypes[i].itemDetails[j].id ); @@ -1566,15 +2162,15 @@ }; //鑾峰彇鏀惰垂椤圭洰鐨勮鏄庝俊鎭� - getdetailsByItemId(rowData.itemid).then((res) => { + getdetailsByItemId(rowData.itemid).then(res => { let fundmsg = res.data; let rowfeeblocks = []; - fundmsg.forEach((item) => { + fundmsg.forEach(item => { rowfeeblocks.push({ expense: item.expense, expensedescribe: item.expensedescribe, remark: item.expensedescribe, - servicesscope: item.id, + servicesscope: item.id }); }); @@ -1602,7 +2198,7 @@ }, addAll(row, i, arr) { - row.itemArr.map((res) => { + row.itemArr.map(res => { if (res.id !== row.itemid) { let a = arr.length; this.addRow(); @@ -1610,15 +2206,15 @@ arr[a].applytype = row.applytype; arr[a].itemid = res.id; - getdetailsByItemId(arr[a].itemid).then((res) => { + getdetailsByItemId(arr[a].itemid).then(res => { let fundmsg = res.data; let rowfeeblocks = []; - fundmsg.forEach((item) => { + fundmsg.forEach(item => { rowfeeblocks.push({ expense: item.expense, expensedescribe: item.expensedescribe, remark: item.expensedescribe, - servicesscope: item.id, + servicesscope: item.id }); }); row.rowfeeblocks = rowfeeblocks; @@ -1670,7 +2266,7 @@ uploadtime: null, itemArr: [], servicesscope: null, - rowfeeblocks: [], + rowfeeblocks: [] }; if (rowIndex == undefined || rowIndex == null || rowIndex < 0) { this.fundDetails.push(rowData); @@ -1684,7 +2280,7 @@ //鍔犺浇鏈嶅姟椤圭洰 loadItemType(row) { - let list = this.feeItemTypes.filter((r) => r.itemType == row.applytype); + let list = this.feeItemTypes.filter(r => r.itemType == row.applytype); row.itemArr = list[0].itemDetails; row.itemid = null; this.$forceUpdate(); @@ -1699,7 +2295,7 @@ //鑾峰彇涓撳鍒楄〃 getExternalpersonList() { - listExternalperson().then((res) => { + listExternalperson().then(res => { this.personlist = res.rows; }); }, @@ -1710,11 +2306,11 @@ let templist = []; for (let i = 0; i < types.length; i++) { templist = []; - listReportname(types[i]).then((res) => { + 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, + reportNo: res.data[j].reportNo }); } this.expertlist = this.expertlist.concat(templist); @@ -1724,7 +2320,7 @@ selectpersonmsg(row) { // if(row.beneficiaryname) - this.personlist.map((res) => { + this.personlist.map(res => { if (row.beneficiaryname == res.username) { row.beneficiaryno = res.userno; row.beneficiaryname = res.username; @@ -1743,8 +2339,7 @@ }, getUserList() { - listUser().then((res) => { - console.log("listUser", res); + listUser().then(res => { this.userlist = res.data; }); }, @@ -1764,7 +2359,7 @@ } scope.row.itemArr = result; } else { - getItemNames(scope.row.applytype).then((res) => { + getItemNames(scope.row.applytype).then(res => { scope.row.itemArr = res.data; //this.$set(this.fundDetails, rowindex, row); }); @@ -1775,19 +2370,19 @@ this.$confirm("鏄惁纭鍒犻櫎?", "鎻愮ず", { confirmButtonText: "纭畾", cancelButtonText: "鍙栨秷", - type: "success", + type: "success" }) .then(() => { if (row.id !== null) { - delFunddetail(row.id).then((res) => { + delFunddetail(row.id).then(res => { if (res.code === 200) { this.$confirm("鍒犻櫎鎴愬姛", "鎻愮ず", { confirmButtonText: "纭畾", cancelButtonText: "鍙栨秷", - type: "success", + type: "success" }).then(() => { this.$set(rows, rows.splice(index, 1)); - getownFundDetail(this.form.id).then((res) => { + getownFundDetail(this.form.id).then(res => { this.$set(this.fundDetails, res.data); this.sumTotalFee(); // this.fundDetails = res.data @@ -1810,7 +2405,7 @@ }, //璁$畻涓◣ - calculateTax() { }, + calculateTax() {}, //璁$畻鎬婚噾棰� sumTotalFee(row) { @@ -1854,7 +2449,7 @@ //鑾峰彇璐圭敤绫诲瀷 getCurFundType() { - getFundTypeAll(this.currentApplyType).then((res) => { + getFundTypeAll(this.currentApplyType).then(res => { let dataList = res.data; this.feeItemTypes = dataList; this.rowfeeItemTypes = []; @@ -1863,14 +2458,14 @@ value: dataList[m].itemType, label: dataList[m].itemTypeName, subjecttype: dataList[m].subjecttype, - subjecttypename: dataList[m].subjecttypename, + subjecttypename: dataList[m].subjecttypename }); } }); }, getItemArr(rowindex, row) { - let list = this.feeItemTypes.filter((r) => r.itemType == row.applytype); + let list = this.feeItemTypes.filter(r => r.itemType == row.applytype); row.itemArr = list[0].itemDetails; this.$set(this.fundDetails, rowindex, row); //this.loading = true; @@ -1888,7 +2483,7 @@ //涓撳璐瑰姵鍔℃墦鍗� dayin(id) { - getdownloadLW(id).then((res) => { + getdownloadLW(id).then(res => { if (res.downloadUrl) { var fileUrl = res; //鑾峰彇褰撳墠缃戝潃 @@ -1902,7 +2497,7 @@ aEle.click(); this.$alert("涓嬭浇鎴愬姛", "鎻愮ず", { confirmButtonText: "纭畾", - type: "success", + type: "success" }); } }); @@ -1911,7 +2506,7 @@ //姹囨�绘墦鍗� totaldayin(e) { // const id =this.row.id - getdownloadBX(e).then((res) => { + getdownloadBX(e).then(res => { if (res.downloadUrl) { var fileUrl = res; //鑾峰彇褰撳墠缃戝潃 @@ -1925,29 +2520,27 @@ aEle.click(); this.$alert("涓嬭浇鎴愬姛", "鎻愮ず", { confirmButtonText: "纭畾", - type: "success", + type: "success" }); } }); }, - - //鏂囦欢涓婁紶 - handleUploadError() { }, + handleUploadError() {}, /** 涓嬭浇鏂囦欢鎸夐挳鎿嶄綔 */ downFile(item) { - const url = process.env.VUE_APP_BASE_API + item.url - var a = document.createElement('a'); - var event = new MouseEvent('click'); + const url = process.env.VUE_APP_BASE_API + item.url; + var a = document.createElement("a"); + var event = new MouseEvent("click"); a.download = item.name; a.href = url; a.dispatchEvent(event); }, remove(file) { - this.fileList.splice(this.fileList.indexOf(file), 1) + this.fileList.splice(this.fileList.indexOf(file), 1); }, handleExceed() { @@ -1962,14 +2555,11 @@ this.$modal.msgSuccess(response.msg); this.fileList.push({ name: response.fileName, url: response.fileName }); } else { - console.log(response.msg);; + console.log(response.msg); } - }, - - }, - + } + } }; - </script> <style scoped> /* @import url(); 寮曞叆鍏叡css绫� */ -- Gitblit v1.9.3