From 6914d3d6ab1f76e6f1b85fdb547b016707ae0179 Mon Sep 17 00:00:00 2001 From: WXL <1785969728@qq.com> Date: 星期四, 01 八月 2024 17:34:30 +0800 Subject: [PATCH] 11 --- src/views/project/travelexpensecheck/index.vue | 33 src/views/project/fund/performancedetails/index.vue | 20 src/views/project/fund/applyDetail/index.vue | 18 src/views/project/fund/applyDetail0/index.vue | 1018 ++++++++++++--- src/views/project/fundcheck/medicalCostCheck/index.vue | 721 +++++++++-- src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue | 591 +++++++- src/views/project/travelexpenseapply/travelexpensedetail/index.vue | 18 src/views/project/fundcheck/expertFeeCheck/index.vue | 621 +++++++- src/views/project/fundcheck/officeExpenseCheck/index.vue | 723 +++++++++-- 9 files changed, 2,977 insertions(+), 786 deletions(-) diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue index a0282ff..8da0d89 100644 --- a/src/views/project/fund/applyDetail/index.vue +++ b/src/views/project/fund/applyDetail/index.vue @@ -2807,11 +2807,19 @@ }; this.$modal.loading("姝e湪鎻愪氦瀹℃牳锛岃绋嶅�欙紒"); checkfund(checkFundObj).then(res => { - //鍏抽棴绐楀彛 - this.$modal.closeLoading(); - this.$modal.msgSuccess("瀹℃牳瀹屾垚!"); - this.$store.dispatch("tagsView/delView", this.$route); - this.$router.go(-1); + if (res.code == 200) { + //鍏抽棴绐楀彛 + this.$modal.closeLoading(); + this.$modal.msgSuccess("瀹℃牳瀹屾垚!"); + this.$store.dispatch("tagsView/delView", this.$route); + this.$router.go(-1); + } else { + if (res.msg) { + this.$modal.msgError("鎿嶄綔澶辫"); + } else { + this.$modal.msgError(res.msg); + } + } }); } this.Getnetworkheader(); diff --git a/src/views/project/fund/applyDetail0/index.vue b/src/views/project/fund/applyDetail0/index.vue index 450aca3..3299f69 100644 --- a/src/views/project/fund/applyDetail0/index.vue +++ b/src/views/project/fund/applyDetail0/index.vue @@ -7,33 +7,58 @@ <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> <el-row> - <!-- + <!-- <el-col :span="7"> <el-form-item label="宸ヤ綔鍗曚綅" prop="unitno"> <org-selecter ref="orgSelecter" :org-type="'3'" v-model="form.unitno" /> @@ -66,12 +91,20 @@ </el-col> <el-col :span="5"> <el-form-item label="鎹愮尞鑰�" prop="donorname"> - <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"> <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> @@ -101,7 +134,7 @@ </el-form-item> </el-col> - <!-- + <!-- <el-col :span="5"> <el-form-item label="鐢宠鐘舵��" prop="recordstatus"> <el-select v-model="form.recordstatus" placeholder="璇烽�夋嫨瀹℃牳鐘舵��" clearable size="small" :disabled="true"> @@ -114,7 +147,11 @@ <el-row style="margin-top: 5px; margin-bottom: 5px" /> <el-row style="margin-bottom: 10px" v-if="businessType == '1'"> <el-col :span="4"> - <el-button @click.native.prevent="importFeeItems" type="primary" size="small"> + <el-button + @click.native.prevent="importFeeItems" + type="primary" + size="small" + > 瀵煎叆鏈嶅姟椤圭洰 </el-button> </el-col> @@ -122,12 +159,27 @@ <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-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> @@ -136,53 +188,124 @@ <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 @@ -191,27 +314,53 @@ :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="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="濮撳悕" + width="120" + v-if="form.applytype == '1' || form.applytype == '2'" + > <template slot-scope="scope"> - <el-button type="primary" plain @click="ShowDetailDialog(scope, 'expert')">{{ scope.row.beneficiaryname - }}</el-button> + <el-button + type="primary" + plain + @click="ShowDetailDialog(scope, 'expert')" + >{{ scope.row.beneficiaryname }}</el-button + > <!-- <el-select filterable allow-create @@ -231,10 +380,20 @@ </el-select> --> </template> </el-table-column> - <el-table-column prop="unitno" align="center" label="鍗曚綅鍚嶇О" width="250" v-if="form.applytype != '4'"> + <el-table-column + prop="unitno" + align="center" + label="鍗曚綅鍚嶇О" + width="250" + v-if="form.applytype != '4'" + > <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="鍗曚綅" @@ -251,13 +410,24 @@ </el-select> --> </template> </el-table-column> - <el-table-column prop="unitno" align="center" label="鍗曚綅/涓汉" width="250" v-if="form.applytype == '4'"> + <el-table-column + prop="unitno" + align="center" + label="鍗曚綅/涓汉" + width="250" + v-if="form.applytype == '4'" + > <template slot-scope="scope"> - <el-button type="primary" plain @click="ShowDetailDialog(scope, 'expert')">{{ - experthear == "expert" - ? scope.row.unitname - : scope.row.beneficiaryname - }}</el-button> + <el-button + type="primary" + plain + @click="ShowDetailDialog(scope, 'expert')" + >{{ + experthear == "expert" + ? scope.row.unitname + : scope.row.beneficiaryname + }}</el-button + > <!-- <el-select v-model="scope.row.unitno" placeholder="鍗曚綅" @@ -274,64 +444,124 @@ </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-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" + > <!-- v-if="form.applytype != '4'" --> <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> - <el-button @click.native.prevent=" - Filepopup(scope.$index, rbDetails, scope.row) - " type="text" size="small" v-if="businessType == 3 || businessType == 4">绁ㄦ嵁</el-button> + <el-button + @click.native.prevent=" + Filepopup(scope.$index, rbDetails, scope.row) + " + type="text" + size="small" + v-if="businessType == 3 || businessType == 4" + >绁ㄦ嵁</el-button + > </template> </el-table-column> </el-table> </el-row> <!-- - <el-row> + <el-row> <el-col :span="7"> <el-form-item label="棰勬敮閲戦" prop="prepaidamount"> <el-input v-model="form.prepaidamount" placeholder="鐢宠閲戦" /> </el-form-item> - </el-col> - </el-row> - <el-row> + </el-col> + </el-row> + <el-row> <el-col :span="7"> <el-form-item label="OPO涓績绛惧瓧" prop="opochecker"> <el-input v-model="form.opochecker" placeholder="opo涓績绛惧瓧" /> @@ -366,20 +596,55 @@ --> <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 @@ -387,35 +652,73 @@ </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'"> + <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"> @@ -434,20 +737,40 @@ </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="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="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-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 v-if="businessType != 4"> - <el-col :span="24" v-if="selectionType == 'expert' && businessType != 4"> + <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> @@ -455,29 +778,77 @@ </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-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-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-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> @@ -486,28 +857,59 @@ <el-row v-if="businessType == 4"> <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-group + @change="ShowDetailDialog(spocewl)" + v-model="experthear" + style="margin-bottom: 0" + > <el-radio label="unit">浜哄憳閫夐」</el-radio> <el-radio label="expert">鍗曚綅閫夐」</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-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-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.unitname" placeholder="鍗曚綅鍚嶇О" @change="bbaaccss" clearable filterable - allow-create style="width: 100%"> - <el-option v-for="(spec, index) in unitList" :key="index" :label="spec.organizationname" - :value="spec.organizationname"></el-option> + <el-select + v-model="funddetailForm.unitname" + placeholder="鍗曚綅鍚嶇О" + @change="bbaaccss" + clearable + filterable + allow-create + style="width: 100%" + > + <el-option + v-for="(spec, index) in unitList" + :key="index" + :label="spec.organizationname" + :value="spec.organizationname" + ></el-option> </el-select> </el-form-item> </el-col> @@ -516,22 +918,43 @@ <el-row v-if="businessType != 4"> <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 v-if="businessType != 4"> <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> @@ -544,57 +967,124 @@ :value="dict.value"></el-option> </el-select> </el-form-item> - </el-col> + </el-col> </el-row> --> <el-row v-if="businessType != 4"> <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 v-if="businessType != 4"> <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="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 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 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> <!-- <div class="el-upload__tip" slot="tip"> 鍙兘涓婁紶jpg/png鏂囦欢锛屼笖涓嶈秴杩�500kb </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 @@ -602,12 +1092,25 @@ </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> @@ -624,17 +1127,25 @@ <div v-if="this.previewpdf" 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" + > </el-image> </div> <div v-else class="pdfimgmins">{{ hintitle }}</div> </div> </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> @@ -932,7 +1443,7 @@ itemid: null, expense: null, expensedescribe: null, - usestate: null, + usestate: null }, //闄勪欢鍒楄〃 @@ -974,7 +1485,7 @@ if ( (JSON.stringify(this.form) == sessionStorage.getItem("apiform") && JSON.stringify(this.rbDetails) == - sessionStorage.getItem("apifunddetail")) || + sessionStorage.getItem("apifunddetail")) || !sessionStorage.getItem("apifunddetail") ) { console.log(cg); @@ -1152,7 +1663,9 @@ this.getRowFeeItems(m, this.rbDetails[m]); //鑾峰彇璐圭敤椤圭洰鐨勮缁嗕俊鎭� - this.rbDetails[m].rowfeeblocks = this.feeBlocks.filter(r => r.itemid == this.rbDetails[m].itemid); + this.rbDetails[m].rowfeeblocks = this.feeBlocks.filter( + r => r.itemid == this.rbDetails[m].itemid + ); } sessionStorage.removeItem("apifunddetail"); @@ -1198,7 +1711,9 @@ this.getRowFeeItems(m, this.rbDetails[m]); //鑾峰彇璐圭敤椤圭洰鐨勮缁嗕俊鎭� - this.rbDetails[m].rowfeeblocks = this.feeBlocks.filter(r => r.itemid == this.rbDetails[m].itemid); + this.rbDetails[m].rowfeeblocks = this.feeBlocks.filter( + r => r.itemid == this.rbDetails[m].itemid + ); } if (this.rbDetails.length == 0) { @@ -1239,7 +1754,9 @@ this.getRowFeeItems(m, this.rbDetails[m]); //鑾峰彇璐圭敤椤圭洰鐨勮缁嗕俊鎭� - this.rbDetails[m].rowfeeblocks = this.feeBlocks.filter(r => r.itemid == this.rbDetails[m].itemid); + this.rbDetails[m].rowfeeblocks = this.feeBlocks.filter( + r => r.itemid == this.rbDetails[m].itemid + ); } if (this.rbDetails.length == 0) { @@ -1262,7 +1779,7 @@ handleDelete() { this.$modal .confirm("鏄惁纭鍒犻櫎璇ヨ褰曪紵") - .then(function () { + .then(function() { return delFund(this.curId); }) .then(() => { @@ -1277,7 +1794,7 @@ this.getfundList(); this.$modal.msgSuccess("鍒犻櫎鎴愬姛"); }) - .catch(() => { }); + .catch(() => {}); }, /** 涓婃姤鎸夐挳鎿嶄綔 */ @@ -1326,7 +1843,7 @@ return randomString; }, /** 鎻愪氦鎸夐挳 */ - submitForm: debounce(function () { + submitForm: debounce(function() { if (!this.randomnumber) { this.randomnumber = this.generateRandomString(9); this.form.randomnumber = this.randomnumber; @@ -1345,8 +1862,8 @@ if (tempDetail.itemid == null) { this.$modal.msgWarning( "鏈嶅姟椤圭洰琛ㄤ腑锛岀" + - (k + 1).toString() + - "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�" + (k + 1).toString() + + "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�" ); return; } @@ -1355,8 +1872,8 @@ if (tempDetail.servicesscope == null) { this.$modal.msgWarning( "鏈嶅姟椤圭洰琛ㄤ腑锛岀" + - (k + 1).toString() + - "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�" + (k + 1).toString() + + "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�" ); return; } @@ -1367,8 +1884,8 @@ ) { this.$modal.msgWarning( "鏈嶅姟椤圭洰琛ㄤ腑锛岀" + - (k + 1).toString() + - "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�" + (k + 1).toString() + + "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�" ); return; } @@ -1425,7 +1942,7 @@ } this.rbDetails[i] = tempDetail; /* - //璁$畻涓◣ + //璁$畻涓◣ //if (isNaN(parseFloat(tempDetail.taxedamount))) //鑾峰彇鍙傛暟 this.taxParam.beneficiaryNo = tempDetail.beneficiaryno; @@ -1439,13 +1956,13 @@ tempDetail.taxamount = res.data; tempDetail.taxedamount = tempDetail.amount - tempDetail.taxamount; this.rbDetails[k] = tempDetail; - + this.totalAfterTaxAmount += parseFloat(tempDetail.taxedamount); this.totalAmount += parseFloat(tempDetail.amount); } }); } - + // 璁$畻绋庡墠銆佺◣璐广�佺◣鍚庨噾棰� if (tempDetail.amount == undefined || tempDetail.amount == null || tempDetail.amount == 0 || tempDetail.amount == '') { //鑾峰彇鍙傛暟 @@ -1455,7 +1972,7 @@ tempDetail.taxamount = res.data.nowTax; tempDetail.amount = parseFloat(res.data.nowTaxBeforeMoney); this.rbDetails[k] = tempDetail; - + this.totalAfterTaxAmount += parseFloat(tempDetail.taxedamount); this.totalAmount += parseFloat(tempDetail.amount); } @@ -1473,8 +1990,8 @@ ) { this.$modal.msgWarning( "鏈嶅姟椤圭洰琛ㄤ腑锛岀" + - (j + 1).toString() + - "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�" + (j + 1).toString() + + "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�" ); return; } @@ -1488,8 +2005,8 @@ ) { this.$modal.msgWarning( "鏈嶅姟椤圭洰琛ㄤ腑锛岀" + - (j + 1).toString() + - "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�" + (j + 1).toString() + + "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�" ); return; } @@ -1579,11 +2096,19 @@ flowcontent: this.checkObj.flowconclusion }; checkfund(checkFundObj).then(res => { - //鍏抽棴绐楀彛 - this.reset(); - this.$modal.msgSuccess("瀹℃牳瀹屾垚!"); - this.$store.dispatch("tagsView/delView", this.$route); - this.$router.go(-1); + if (res.code == 200) { + //鍏抽棴绐楀彛 + this.reset(); + this.$modal.msgSuccess("瀹℃牳瀹屾垚!"); + this.$store.dispatch("tagsView/delView", this.$route); + this.$router.go(-1); + } else { + if (res.msg) { + this.$modal.msgError("鎿嶄綔澶辫"); + } else { + this.$modal.msgError(res.msg); + } + } }); }, @@ -1743,7 +2268,7 @@ }); //鑾峰彇鏈嶅姟璐圭敤璇存槑鍒楄〃 - if (this.businessType == '1' || this.businessType == '2') { + if (this.businessType == "1" || this.businessType == "2") { this.loading = true; listItemexpense(this.expenseQueryParams).then(response => { response.rows.forEach(item => { @@ -1969,10 +2494,13 @@ rowData.taxamount = 0.0; rowData.taxedamount = 0.0; - rowData.rowfeeblocks = this.feeBlocks.filter(r => r.itemid == rowData.itemid); + rowData.rowfeeblocks = this.feeBlocks.filter( + r => r.itemid == rowData.itemid + ); if (rowData.rowfeeblocks.length == 1) { rowData.servicesscope = rowData.rowfeeblocks[0].servicesscope; - rowData.servicesscopename = rowData.rowfeeblocks[0].expensedescribe; + rowData.servicesscopename = + rowData.rowfeeblocks[0].expensedescribe; if (rowData.servicesscopename.includes("绋庡悗")) { rowData.amount = 0.0; rowData.taxamount = 0.0; @@ -2018,8 +2546,8 @@ if (tempDetail.itemid == null) { this.$modal.msgWarning( "鏈嶅姟椤圭洰琛ㄤ腑锛岀" + - (k + 1).toString() + - "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�" + (k + 1).toString() + + "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�" ); return; } @@ -2028,8 +2556,8 @@ if (tempDetail.servicesscope == null) { this.$modal.msgWarning( "鏈嶅姟椤圭洰琛ㄤ腑锛岀" + - (k + 1).toString() + - "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�" + (k + 1).toString() + + "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�" ); return; } @@ -2040,8 +2568,8 @@ ) { this.$modal.msgWarning( "鏈嶅姟椤圭洰琛ㄤ腑锛岀" + - (k + 1).toString() + - "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�" + (k + 1).toString() + + "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�" ); return; } @@ -2098,7 +2626,7 @@ } this.rbDetails[i] = tempDetail; /* - //璁$畻涓◣ + //璁$畻涓◣ //if (isNaN(parseFloat(tempDetail.taxedamount))) //鑾峰彇鍙傛暟 this.taxParam.beneficiaryNo = tempDetail.beneficiaryno; @@ -2112,13 +2640,13 @@ tempDetail.taxamount = res.data; tempDetail.taxedamount = tempDetail.amount - tempDetail.taxamount; this.rbDetails[k] = tempDetail; - + this.totalAfterTaxAmount += parseFloat(tempDetail.taxedamount); this.totalAmount += parseFloat(tempDetail.amount); } }); } - + // 璁$畻绋庡墠銆佺◣璐广�佺◣鍚庨噾棰� if (tempDetail.amount == undefined || tempDetail.amount == null || tempDetail.amount == 0 || tempDetail.amount == '') { //鑾峰彇鍙傛暟 @@ -2128,7 +2656,7 @@ tempDetail.taxamount = res.data.nowTax; tempDetail.amount = parseFloat(res.data.nowTaxBeforeMoney); this.rbDetails[k] = tempDetail; - + this.totalAfterTaxAmount += parseFloat(tempDetail.taxedamount); this.totalAmount += parseFloat(tempDetail.amount); } @@ -2146,8 +2674,8 @@ ) { this.$modal.msgWarning( "鏈嶅姟椤圭洰琛ㄤ腑锛岀" + - (j + 1).toString() + - "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�" + (j + 1).toString() + + "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�" ); return; } @@ -2161,8 +2689,8 @@ ) { this.$modal.msgWarning( "鏈嶅姟椤圭洰琛ㄤ腑锛岀" + - (j + 1).toString() + - "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�" + (j + 1).toString() + + "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�" ); return; } @@ -2441,7 +2969,7 @@ }, //鏂囦欢涓婁紶 - handleUploadError() { }, + handleUploadError() {}, /** 涓嬭浇鏂囦欢鎸夐挳鎿嶄綔 */ // downFile(item) { @@ -2762,13 +3290,13 @@ // this.getFeeUnitList(); }, - beforeCreate() { }, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠 - beforeMount() { }, //鐢熷懡鍛ㄦ湡 - 鎸傝浇涔嬪墠 - beforeUpdate() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪墠 - updated() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗 - beforeDestroy() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓� - destroyed() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴� - activated() { } //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂 + beforeCreate() {}, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠 + beforeMount() {}, //鐢熷懡鍛ㄦ湡 - 鎸傝浇涔嬪墠 + beforeUpdate() {}, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪墠 + updated() {}, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗 + beforeDestroy() {}, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓� + destroyed() {}, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴� + activated() {} //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂 }; </script> diff --git a/src/views/project/fund/performancedetails/index.vue b/src/views/project/fund/performancedetails/index.vue index 97a3078..760c5a3 100644 --- a/src/views/project/fund/performancedetails/index.vue +++ b/src/views/project/fund/performancedetails/index.vue @@ -1789,12 +1789,20 @@ }; this.$modal.loading("姝e湪鎻愪氦瀹℃牳锛岃绋嶅�欙紒"); checkfund(checkFundObj).then(res => { - //鍏抽棴绐楀彛 - this.reset(); - this.$modal.closeLoading(); - this.$modal.msgSuccess("瀹℃牳瀹屾垚!"); - this.$store.dispatch("tagsView/delView", this.$route); - this.$router.go(-1); + if (res.code == 200) { + //鍏抽棴绐楀彛 + this.reset(); + this.$modal.closeLoading(); + this.$modal.msgSuccess("瀹℃牳瀹屾垚!"); + this.$store.dispatch("tagsView/delView", this.$route); + this.$router.go(-1); + } else { + if (res.msg) { + this.$modal.msgError("鎿嶄綔澶辫"); + } else { + this.$modal.msgError(res.msg); + } + } }); }, diff --git a/src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue b/src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue index 901b4c7..410e247 100644 --- a/src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue +++ b/src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue @@ -1,112 +1,265 @@ <template> <div class="app-container"> - <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="120px"> + <el-form + :model="queryParams" + ref="queryForm" + :inline="true" + v-show="showSearch" + label-width="120px" + > <el-row> <el-col :span="5"> <el-form-item label="鎹愮尞妗堜緥" prop="donorname" style="float: left"> - <el-input v-model="queryParams.donorname" placeholder="璇疯緭鍏ョ敵璇蜂汉鎹愮尞鑰�" clearable size="small" - @keyup.enter.native="flowconclusion" /> + <el-input + v-model="queryParams.donorname" + placeholder="璇疯緭鍏ョ敵璇蜂汉鎹愮尞鑰�" + clearable + size="small" + @keyup.enter.native="flowconclusion" + /> </el-form-item> </el-col> <el-col :span="5"> <el-form-item label="棰勫鐘舵��" prop="checkstatus" style="float: left"> - <el-select v-model="queryParams.checkstatus" placeholder="璇烽�夋嫨" style="width: 100%"> - <el-option v-for="item in checkmaterials" :key="item.value" :label="item.label" :value="item.value"> + <el-select + v-model="queryParams.checkstatus" + placeholder="璇烽�夋嫨" + style="width: 100%" + > + <el-option + v-for="item in checkmaterials" + :key="item.value" + :label="item.label" + :value="item.value" + > </el-option> </el-select> </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> </el-col> <el-col :span="5"> <el-form-item label="缁忓姙浜�" prop="APPLICANT" style="float: left"> - <el-input v-model="queryParams.APPLICANT" placeholder="璇疯緭鍏ョ敵璇蜂汉濮撳悕" clearable size="small" - @keyup.enter.native="flowconclusion" /> + <el-input + v-model="queryParams.APPLICANT" + placeholder="璇疯緭鍏ョ敵璇蜂汉濮撳悕" + clearable + size="small" + @keyup.enter.native="flowconclusion" + /> </el-form-item> </el-col> </el-row> <el-row> <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="flowconclusion" /> + <el-input + v-model="queryParams.money" + placeholder="璇疯緭鍏ョ敵璇蜂汉閲戦" + clearable + size="small" + @keyup.enter.native="flowconclusion" + /> </el-form-item> </el-col> <el-col :span="8"> <el-form-item label="鐢宠鏃ユ湡" prop="applyTime"> - <el-date-picker format="yyyy-MM-dd" @change="selectapplication" value-format="yyyy-MM-dd" v-model="applyTime" - type="daterange" range-separator="鑷�" start-placeholder="鐢宠寮�濮嬫棩鏈�" end-placeholder="鐢宠缁撴潫鏃ユ湡" - @keyup.enter.native="flowconclusion"> + <el-date-picker + format="yyyy-MM-dd" + @change="selectapplication" + value-format="yyyy-MM-dd" + v-model="applyTime" + type="daterange" + range-separator="鑷�" + start-placeholder="鐢宠寮�濮嬫棩鏈�" + end-placeholder="鐢宠缁撴潫鏃ユ湡" + @keyup.enter.native="flowconclusion" + > </el-date-picker> </el-form-item> </el-col> <el-col :span="6"> - <el-button type="primary" icon="el-icon-search" size="mini" @click="flowconclusion">鎼滅储</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="flowconclusion" + >鎼滅储</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="8"> <div style="margin-bottom: 15px;"> - <el-button type="primary" plain icon="el-icon-circle-check" size="mini" - @click="Totalcalculation(1)">璁$◣鍚庡悎璁�</el-button> - <el-button icon="el-icon-remove-outline" type="success" plain size="mini" - @click="Totalcalculation(0)">璁$◣鍓嶅悎璁�</el-button> + <el-button + type="primary" + plain + icon="el-icon-circle-check" + size="mini" + @click="Totalcalculation(1)" + >璁$◣鍚庡悎璁�</el-button + > + <el-button + icon="el-icon-remove-outline" + type="success" + plain + size="mini" + @click="Totalcalculation(0)" + >璁$◣鍓嶅悎璁�</el-button + > </div> </el-col> </el-row> <el-form ref="infoform" label-width="100px"> <el-row> - <el-table v-loading="loading" ref="multipleTable" tooltip-effect="dark" border :data="donateconsolationfundList" - @selection-change="handleSelectionChange"> + <el-table + v-loading="loading" + ref="multipleTable" + tooltip-effect="dark" + border + :data="donateconsolationfundList" + @selection-change="handleSelectionChange" + > <el-table-column type="selection" width="45"> </el-table-column> - <el-table-column label="鎶ラ攢鍗曞彿" align="center" prop="bh" width="150px" /> - <el-table-column label="鐢宠鏃ユ湡" width="120" align="center" prop="applyTime"> + <el-table-column + label="鎶ラ攢鍗曞彿" + align="center" + prop="bh" + width="150px" + /> + <el-table-column + label="鐢宠鏃ユ湡" + width="120" + align="center" + prop="applyTime" + > <template slot-scope="scope"> <span>{{ parseTime(scope.row.applyTime, "{y}-{m}-{d}") }}</span> </template> </el-table-column> - <el-table-column label="鐢宠閲戦" align="center" prop="pretaxcost" width="200px" /> - <el-table-column label="缁忓姙浜�" align="center" prop="username" width="150px" /> - <el-table-column label="鐢宠鏉愭枡鐘舵��" width="140" align="center" prop="checkFlag"> + <el-table-column + label="鐢宠閲戦" + align="center" + prop="pretaxcost" + width="200px" + /> + <el-table-column + label="缁忓姙浜�" + align="center" + prop="username" + width="150px" + /> + <el-table-column + label="鐢宠鏉愭枡鐘舵��" + width="140" + align="center" + prop="checkFlag" + > <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="recordstatus" width="200"> + <el-table-column + label="瀹℃牳鐘舵��" + align="center" + prop="recordstatus" + width="200" + > <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="涓◣璁$畻鎯呭喌" align="center" prop="recordstatus" width="200"> + <el-table-column + label="涓◣璁$畻鎯呭喌" + align="center" + prop="recordstatus" + width="200" + > <template slot-scope="scope"> <dict-tag :options="dict.type.sys_tax" :value="scope.row.istax" /> </template> </el-table-column> - <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="donorname" width="120px" /> + <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="donorname" + width="120px" + /> <el-table-column label="澶囨敞" align="center" prop="remark" /> <!--<el-table-column label="鎹愮尞缂栧彿" align="center" prop="donorno" /> <el-table-column label="璐㈠姟瀹℃牳" align="center" prop="financechecher" width="140" />--> - <el-table-column label="鎿嶄綔" fixed="right" align="center" class-name="small-padding fixed-width" width="260px"> + <el-table-column + label="鎿嶄綔" + fixed="right" + align="center" + class-name="small-padding fixed-width" + width="260px" + > <template slot-scope="scope"> - <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.checkFlag == 0" - @click="handleDetail(scope.row)">璇︽儏</el-button> + <el-button + size="mini" + type="text" + icon="el-icon-edit" + v-if="scope.row.checkFlag == 0" + @click="handleDetail(scope.row)" + >璇︽儏</el-button + > - <el-button v-if="scope.row.checkFlag == 1" size="mini" type="text" icon="el-icon-edit" - @click="handleCheck(scope.row)">瀹℃牳</el-button> + <el-button + v-if="scope.row.checkFlag == 1" + size="mini" + type="text" + icon="el-icon-edit" + @click="handleCheck(scope.row)" + >瀹℃牳</el-button + > <!-- v-hasPermi="['project:donateconsolationfund:edit']" --> - <el-button size="mini" type="text" icon="el-icon-download" @click="totaldayin(scope.row.id)">涓嬭浇</el-button> + <el-button + size="mini" + type="text" + icon="el-icon-download" + @click="totaldayin(scope.row.id)" + >涓嬭浇</el-button + > <!-- <el-popover placement="right" width="400" trigger="click"> <el-table :data="gridData"> <el-table-column @@ -137,25 +290,45 @@ </el-table-column> </el-table> - <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" - @pagination="getlistbypower" /> + <pagination + v-show="total > 0" + :total="total" + :page.sync="queryParams.pageNum" + :limit.sync="queryParams.pageSize" + @pagination="getlistbypower" + /> </el-row> </el-form> <!-- 娣诲姞鎴栦慨鏀硅垂鐢ㄧ敵璇峰崟 --> - <el-dialog :visible.sync="dialogOpen" width="1600px" :title="title" style="text-align: center"> + <el-dialog + :visible.sync="dialogOpen" + width="1600px" + :title="title" + style="text-align: center" + > <el-form ref="form" :model="form" label-width="120px" :rules="rules"> <!-- <el-form ref="applyForm" :model="applicationForm" label-width="120px"> --> <el-row> <el-col :span="8"> <el-form-item label="鎹愮尞缂栧彿" prop="donorno"> - <el-input disabled v-model="form.donorno" placeholder="璇疯緭鍏ユ崘鐚紪鍙�" clearable /> + <el-input + disabled + v-model="form.donorno" + placeholder="璇疯緭鍏ユ崘鐚紪鍙�" + clearable + /> </el-form-item> </el-col> <el-col :span="8"> <el-form-item label="鎹愮尞鑰�" prop="name"> - <el-input disabled v-model="form.name" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" clearable /> + <el-input + disabled + v-model="form.name" + placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" + clearable + /> </el-form-item> </el-col> </el-row> @@ -167,23 +340,41 @@ placeholder="璇疯緭鍏ョ敵璇蜂汉濮撳悕" clearable /> --> - <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="8"> <el-form-item label="鑱旂郴鐢佃瘽" prop="phone"> - <el-input v-model="form.phone" placeholder="璇疯緭鍏ョ敵璇疯�呯殑鑱旂郴鏂瑰紡" clearable /> + <el-input + v-model="form.phone" + placeholder="璇疯緭鍏ョ敵璇疯�呯殑鑱旂郴鏂瑰紡" + clearable + /> </el-form-item> </el-col> <el-col :span="8"> <el-form-item label="宸ヤ綔鍗曚綅" prop="unitno"> - <org-selecter ref="orgSelecter" :org-type="'3'" v-model="form.unitno" /> + <org-selecter + ref="orgSelecter" + :org-type="'3'" + v-model="form.unitno" + /> </el-form-item> </el-col> </el-row> @@ -191,31 +382,72 @@ <el-row style="text-align: left"> <el-form-item label="鐢宠绫诲瀷"> <el-radio-group v-model="form.applytype" @change="LoadItemTypeArr"> - <el-radio v-model="form.applytype" label="2">浼︾悊瀹℃煡涓撳璐圭敵璇�</el-radio> + <el-radio v-model="form.applytype" label="2" + >浼︾悊瀹℃煡涓撳璐圭敵璇�</el-radio + > </el-radio-group> </el-form-item> </el-row> <el-row style="margin-top: 5px; margin-bottom: 5px"> - <el-table :data="fundDetailArr" :summary-method="getSummaries" border highlight-current-row v-loading="loading"> - <el-table-column prop="orderno" align="center" label="鎺掑簭" width="80"> + <el-table + :data="fundDetailArr" + :summary-method="getSummaries" + border + highlight-current-row + v-loading="loading" + > + <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="applytype" align="center" label="璐圭敤绫诲瀷" width="220"> + <el-table-column + prop="applytype" + 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.index" :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.index" + :label="dict.label" + :value="dict.value" + ></el-option> </el-select> </template> </el-table-column> - <el-table-column prop="itemtype" align="center" label="鏈嶅姟椤圭洰" width="200"> + <el-table-column + prop="itemtype" + align="center" + label="鏈嶅姟椤圭洰" + width="200" + > <template slot-scope="scope"> - <el-select v-model="scope.row.itemid" placeholder="鏈嶅姟椤圭洰" clearable filterable allow-create> - <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="鏈嶅姟椤圭洰" + clearable + filterable + allow-create + > + <el-option + v-for="dict in scope.row.itemArr" + :key="dict.index" + :label="dict.itemName" + :value="dict.id" + ></el-option> <!-- <el-option v-for="dict in itemArr" :key="dict.index" @@ -226,21 +458,48 @@ </template> </el-table-column> - <el-table-column prop="beneficiaryname" align="center" label="濮撳悕" width="120"> + <el-table-column + prop="beneficiaryname" + align="center" + label="濮撳悕" + width="120" + > <template slot-scope="scope"> - <el-select filterable allow-create ref="getReportname" default-first-option - @change="selectpersonmsg(scope.row)" v-model="scope.row.beneficiaryname" placeholder="璇烽�夋嫨"> - <el-option v-for="item in arrr3" :key="item.reportNo" :label="item.reportName" :value="item.reportName"> + <el-select + filterable + allow-create + ref="getReportname" + default-first-option + @change="selectpersonmsg(scope.row)" + v-model="scope.row.beneficiaryname" + placeholder="璇烽�夋嫨" + > + <el-option + v-for="item in arrr3" + :key="item.reportNo" + :label="item.reportName" + :value="item.reportName" + > </el-option> </el-select> </template> </el-table-column> - <el-table-column prop="amount" align="center" label="绋庡墠閲戦" width="150"> + <el-table-column + prop="amount" + align="center" + label="绋庡墠閲戦" + width="150" + > <template slot-scope="scope"> - <el-input v-model="scope.row.amount" @blur="val => { - sumTotalFee(); - } - " placeholder="绋庡墠閲戦" /> + <el-input + v-model="scope.row.amount" + @blur=" + val => { + sumTotalFee(); + } + " + placeholder="绋庡墠閲戦" + /> </template> </el-table-column> <!-- <el-table-column @@ -253,49 +512,111 @@ <el-input v-model="scope.row.taxamount" placeholder="鎵g◣" /> </template> </el-table-column> --> - <el-table-column prop="taxedamount" align="center" label="绋庡悗閲戦" width="150"> + <el-table-column + prop="taxedamount" + align="center" + label="绋庡悗閲戦" + width="150" + > <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="180"> + <el-table-column + prop="unitno" + align="center" + label="鍗曚綅" + width="180" + > <template slot-scope="scope"> - <org-selecter :ref="'unitSel' + scope.$index" :org-type="'3'" v-model="scope.row.unitno" /> + <org-selecter + :ref="'unitSel' + scope.$index" + :org-type="'3'" + v-model="scope.row.unitno" + /> </template> </el-table-column> - <el-table-column prop="title" align="center" label="鑱岀О" width="180"> + <el-table-column + prop="title" + align="center" + label="鑱岀О" + width="180" + > <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"> + <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 fixed="right" align="center" label="鎿嶄綔" width="120"> + <el-table-column + fixed="right" + align="center" + label="鎿嶄綔" + width="120" + > <template slot-scope="scope"> - <el-button type="text" size="mini" @click="addRow">鏂板</el-button> - <el-button @click="saveRows(scope.row, scope.$index)" type="text" size="small" v-if="show === 1"> + <el-button type="text" size="mini" @click="addRow" + >鏂板</el-button + > + <el-button + @click="saveRows(scope.row, scope.$index)" + type="text" + size="small" + v-if="show === 1" + > 淇濆瓨 </el-button> - <el-button @click.native.prevent=" - deleteRows(scope.row, scope.$index, fundDetailArr) - " type="text" size="small" v-hasPermi="['project:ethicFeeCheck:delete']"> + <el-button + @click.native.prevent=" + deleteRows(scope.row, scope.$index, fundDetailArr) + " + type="text" + size="small" + v-hasPermi="['project:ethicFeeCheck:delete']" + > 鍒犻櫎 </el-button> </template> @@ -306,8 +627,14 @@ <el-col :span="7"> <el-form-item label="鐢宠鏃ユ湡" prop="applyTime"> <!-- <el-input v-model="form.donorno" placeholder="璇疯緭鍏ョ敵璇锋棩鏈�" /> --> - <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 + 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> @@ -323,24 +650,49 @@ </el-col> <el-col :span="7"> <el-form-item label="璐㈠姟瀹℃牳" prop="financechecher"> - <el-input v-model="form.financechecher" placeholder="璇疯緭鍏ヨ储鍔″鏍�" /> + <el-input + v-model="form.financechecher" + placeholder="璇疯緭鍏ヨ储鍔″鏍�" + /> </el-form-item> </el-col> </el-row> <el-row style="margin-top: 5px; margin-bottom: 5px"> <el-table :data="fundflowList" border> - <el-table-column label="瀹℃牳浜�" align="center" prop="checkusername" /> - <el-table-column label="瀹℃牳鏃ユ湡" align="center" prop="createTime" /> - <el-table-column label="瀹℃牳缁撴灉" align="center" 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" + prop="checkusername" + /> + <el-table-column + label="瀹℃牳鏃ユ湡" + align="center" + prop="createTime" + /> + <el-table-column + label="瀹℃牳缁撴灉" + align="center" + 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="dialogType == 'edit'"> + <el-row + style="margin-top: 25px; margin-bottom: 5px" + v-if="dialogType == 'edit'" + > <el-col :span="7"> <el-form-item label="瀹℃牳" align="left"> <el-radio-group v-model="newobj.flowlevelone" align="left"> @@ -351,13 +703,18 @@ </el-col> <el-col :span="12"> <el-form-item label="瀹℃牳澶囨敞"> - <el-input v-model="newobj.flowconclusion" placeholder="鐢虫姤璐圭敤" /> + <el-input + v-model="newobj.flowconclusion" + placeholder="鐢虫姤璐圭敤" + /> </el-form-item> </el-col> </el-row> </el-form> <div slot="footer" class="dialog-footer"> - <el-button type="primary" @click="dundcheck" v-if="dialogType == 'edit'">瀹℃牳</el-button> + <el-button type="primary" @click="dundcheck" v-if="dialogType == 'edit'" + >瀹℃牳</el-button + > <el-button @click="cancel">鍙栨秷</el-button> </div> </el-dialog> @@ -704,11 +1061,19 @@ return; } checkfund(checkfundobj).then(res => { - console.log("瀹℃牳璐圭敤", res); - this.dialogOpen = false; - this.reset(); - this.$modal.msgSuccess("瀹℃牳瀹屾垚!"); - this.getlistbypower(); + if (res.code == 200) { + console.log("瀹℃牳璐圭敤", res); + this.dialogOpen = false; + this.reset(); + this.$modal.msgSuccess("瀹℃牳瀹屾垚!"); + this.getlistbypower(); + } else { + if (res.msg) { + this.$modal.msgError("鎿嶄綔澶辫"); + } else { + this.$modal.msgError(res.msg); + } + } }); }, getlistUser() { @@ -745,7 +1110,7 @@ }, getlistOrganization() { - listOrganization().then(res => { }); + listOrganization().then(res => {}); }, totaldayin(e) { @@ -774,7 +1139,7 @@ console.log(url); const link = document.createElement("a"); link.href = url; - const name=fileUrl["downloadName"] + const name = fileUrl["downloadName"]; link.setAttribute("download", name); // 鏇挎崲file.pdf涓哄疄闄呯殑鏂囦欢鍚� document.body.appendChild(link); link.click(); @@ -792,7 +1157,7 @@ username = res.data.username; this.$modal .confirm('鏄惁纭閫氳繃"' + username + '"鐨勮垂鐢ㄧ敵璇凤紵') - .then(function () { + .then(function() { getFund(e).then(res => { let data = res.data; let financechecher = "宸插鏍�"; @@ -850,7 +1215,7 @@ }); }, //鍔ㄦ�佽绠楃◣鍓嶉噾棰� - change(scope) { }, + change(scope) {}, autodonorno() { listDonatebaseinfo().then(res => { // console.log("鎵�鏈夋崘鐚�呭垪琛細",res); @@ -1143,7 +1508,7 @@ infoid: infoid, count: this.idss }; - listFunddetails(aaa).then(res => { }); + listFunddetails(aaa).then(res => {}); }, //鍒濆鍖栬垂鐢ㄧ敵璇疯〃鍗曠晫闈� @@ -1351,7 +1716,7 @@ for (let i = 0; i < this.applicationDetailArr.length; i++) { // console.log('qqq',this.applicationDetailArr[i]); let tempData = this.applicationDetailArr[i]; - Object.keys(tempData).forEach(function (key) { + Object.keys(tempData).forEach(function(key) { // console.log('iii',key, tempData[key]); if ( tempData[key] == null || diff --git a/src/views/project/fundcheck/expertFeeCheck/index.vue b/src/views/project/fundcheck/expertFeeCheck/index.vue index ec7fea6..ab5dac4 100644 --- a/src/views/project/fundcheck/expertFeeCheck/index.vue +++ b/src/views/project/fundcheck/expertFeeCheck/index.vue @@ -1,54 +1,109 @@ <template> <div class="app-container"> - <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="80px"> + <el-form + :model="queryParams" + ref="queryForm" + :inline="true" + v-show="showSearch" + label-width="80px" + > <el-row> <el-col :span="5"> <el-form-item label="鎹愮尞妗堜緥" prop="donorname" style="float: left"> - <el-input v-model="queryParams.donorname" placeholder="璇疯緭鍏ョ敵璇蜂汉鎹愮尞鑰�" clearable size="small" - @keyup.enter.native="flowconclusion" /> + <el-input + v-model="queryParams.donorname" + placeholder="璇疯緭鍏ョ敵璇蜂汉鎹愮尞鑰�" + clearable + size="small" + @keyup.enter.native="flowconclusion" + /> </el-form-item> </el-col> <el-col :span="5"> <el-form-item label="棰勫鐘舵��" prop="checkstatus" style="float: left"> - <el-select v-model="queryParams.checkstatus" placeholder="璇烽�夋嫨" style="width: 100%"> - <el-option v-for="item in checkmaterials" :key="item.value" :label="item.label" :value="item.value"> + <el-select + v-model="queryParams.checkstatus" + placeholder="璇烽�夋嫨" + style="width: 100%" + > + <el-option + v-for="item in checkmaterials" + :key="item.value" + :label="item.label" + :value="item.value" + > </el-option> </el-select> </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> - </el-col><el-col :span="5"> + </el-form-item> </el-col + ><el-col :span="5"> <el-form-item label="缁忓姙浜�" prop="APPLICANT" style="float: left"> - <el-input v-model="queryParams.APPLICANT" placeholder="璇疯緭鍏ョ敵璇蜂汉濮撳悕" clearable size="small" - @keyup.enter.native="flowconclusion" /> + <el-input + v-model="queryParams.APPLICANT" + placeholder="璇疯緭鍏ョ敵璇蜂汉濮撳悕" + clearable + size="small" + @keyup.enter.native="flowconclusion" + /> </el-form-item> </el-col> </el-row> <el-row> <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="flowconclusion" /> + <el-input + v-model="queryParams.money" + placeholder="璇疯緭鍏ョ敵璇蜂汉閲戦" + clearable + size="small" + @keyup.enter.native="flowconclusion" + /> </el-form-item> </el-col> <el-col :span="8"> <el-form-item label="鐢宠鏃ユ湡" prop="createTime"> - <el-date-picker format="yyyy-MM-dd" @change="selectapplication" value-format="yyyy-MM-dd" v-model="createTime" - type="daterange" range-separator="鑷�" start-placeholder="鐢宠寮�濮嬫棩鏈�" end-placeholder="鐢宠缁撴潫鏃ユ湡" - @keyup.enter.native="flowconclusion"> + <el-date-picker + format="yyyy-MM-dd" + @change="selectapplication" + value-format="yyyy-MM-dd" + v-model="createTime" + type="daterange" + range-separator="鑷�" + start-placeholder="鐢宠寮�濮嬫棩鏈�" + end-placeholder="鐢宠缁撴潫鏃ユ湡" + @keyup.enter.native="flowconclusion" + > </el-date-picker> </el-form-item> </el-col> <el-col :span="6"> <div style="margin-bottom: 15px;"> - <el-button type="primary" icon="el-icon-search" size="mini" @click="flowconclusion">鎼滅储</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="flowconclusion" + >鎼滅储</el-button + > + <el-button icon="el-icon-refresh" size="mini" @click="resetQuery" + >閲嶇疆</el-button + > </div> </el-col> </el-row> @@ -56,17 +111,35 @@ <el-row> <el-col :span="8"> <div style="margin-bottom: 15px;"> - <el-button icon="el-icon-remove-outline" type="success" plain size="mini" :disabled="true" - @click="Totalcalculation(0)">涓◣鍓嶆眹鎬�</el-button> - <el-button type="primary" plain icon="el-icon-circle-check" size="mini" - @click="Totalcalculation(1)">涓◣鍚庢眹鎬�</el-button> + <el-button + icon="el-icon-remove-outline" + type="success" + plain + size="mini" + :disabled="true" + @click="Totalcalculation(0)" + >涓◣鍓嶆眹鎬�</el-button + > + <el-button + type="primary" + plain + icon="el-icon-circle-check" + size="mini" + @click="Totalcalculation(1)" + >涓◣鍚庢眹鎬�</el-button + > </div> </el-col> </el-row> <el-form ref="infoform" label-width="100px"> <el-row> - <el-table ref="multipleTable" tooltip-effect="dark" border :data="donateconsolationfundList" - @selection-change="handleSelectionChange"> + <el-table + ref="multipleTable" + tooltip-effect="dark" + border + :data="donateconsolationfundList" + @selection-change="handleSelectionChange" + > <!-- <el-table-column label="瀹℃壒鐘舵��" width="120" align="center" prop="checkFlag"> <template slot-scope="scope"> @@ -87,109 +160,241 @@ <dict-tag :options="dict.type.sys_tax" :value="scope.row.istax" /> </template> </el-table-column> --> - <el-table-column label="鎶ラ攢鍗曞彿" align="center" prop="bh" width="150px" /> - <el-table-column label="鐢宠鏃ユ湡" width="120" align="center" prop="applyTime"> + <el-table-column + label="鎶ラ攢鍗曞彿" + align="center" + prop="bh" + width="150px" + /> + <el-table-column + label="鐢宠鏃ユ湡" + width="120" + align="center" + prop="applyTime" + > <template slot-scope="scope"> <span>{{ parseTime(scope.row.applyTime, "{y}-{m}-{d}") }}</span> </template> </el-table-column> - <el-table-column label="鐢宠閲戦" align="center" prop="pretaxcost" width="200px" /> - <el-table-column label="缁忓姙浜�" align="center" prop="username" width="150px" /> + <el-table-column + label="鐢宠閲戦" + align="center" + prop="pretaxcost" + width="200px" + /> + <el-table-column + label="缁忓姙浜�" + align="center" + prop="username" + width="150px" + /> <!-- <el-table-column label="宸ヤ綔鍗曚綅" align="center" prop="unitname" width="230px" /> --> <!-- <el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="phone" width="160" /> --> <!-- <el-table-column label="绋庡悗閲戦" align="center" prop="taxedcost" width="120px" /> <el-table-column label="鐢宠閲戦" align="center" prop="amountrequested" width="120px" /> <el-table-column label="棰勬敮璐圭敤" align="center" prop="prepaidamount" width="120px" /> --> - <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="recordstatus" width="200"> + <el-table-column + label="瀹℃牳鐘舵��" + align="center" + prop="recordstatus" + width="200" + > <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="120" align="center" prop="fundtaxtime"> + <el-table-column + label="涓◣璁$畻鏃ユ湡" + width="120" + align="center" + prop="fundtaxtime" + > <template slot-scope="scope"> <span>{{ parseTime(scope.row.fundtaxtime, "{y}-{m}-{d}") }}</span> </template> </el-table-column> - <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="donorname" width="120px" /> + <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="donorname" + width="120px" + /> <el-table-column label="澶囨敞" align="center" prop="remark" /> <!--<el-table-column label="鎹愮尞缂栧彿" align="center" prop="donorno" /> <el-table-column label="璐㈠姟瀹℃牳" align="center" prop="financechecher" width="140" />--> - <el-table-column label="鎿嶄綔" fixed="right" align="center" class-name="small-padding fixed-width" width="260px"> + <el-table-column + label="鎿嶄綔" + fixed="right" + align="center" + class-name="small-padding fixed-width" + width="260px" + > <template slot-scope="scope"> - <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.checkFlag == 0" - @click="handleDetail(scope.row)">璇︽儏</el-button> + <el-button + size="mini" + type="text" + icon="el-icon-edit" + v-if="scope.row.checkFlag == 0" + @click="handleDetail(scope.row)" + >璇︽儏</el-button + > - <el-button v-if="scope.row.checkFlag == 1" size="mini" type="text" icon="el-icon-edit" - @click="handleCheck(scope.row)">瀹℃牳</el-button> + <el-button + v-if="scope.row.checkFlag == 1" + size="mini" + type="text" + icon="el-icon-edit" + @click="handleCheck(scope.row)" + >瀹℃牳</el-button + > <!-- v-hasPermi="['project:donateconsolationfund:edit']" --> - <el-button size="mini" type="text" icon="el-icon-download" @click="totaldayin(scope.row.id)">涓嬭浇</el-button> + <el-button + size="mini" + type="text" + icon="el-icon-download" + @click="totaldayin(scope.row.id)" + >涓嬭浇</el-button + > </template> </el-table-column> </el-table> - <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" - @pagination="getlistbypower" /> + <pagination + v-show="total > 0" + :total="total" + :page.sync="queryParams.pageNum" + :limit.sync="queryParams.pageSize" + @pagination="getlistbypower" + /> </el-row> </el-form> <!-- 娣诲姞鎴栦慨鏀硅垂鐢ㄧ敵璇峰崟 --> - <el-dialog :visible.sync="dialogOpen" width="1400px" :title="title" style="text-align: center"> + <el-dialog + :visible.sync="dialogOpen" + width="1400px" + :title="title" + style="text-align: center" + > <el-form ref="form" :model="form" label-width="120px" :rules="rules"> <!-- <el-form ref="applyForm" :model="applicationForm" label-width="120px"> --> <el-row> <el-col :span="5"> <el-form-item label="鐢宠鏃ユ湡" prop="createTime"> <!-- <el-input v-model="form.donorno" 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 + 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-input v-model="form.username" placeholder="璇疯緭鍏ョ敵璇蜂汉濮撳悕" clearable /> --> - <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 disabled v-model="form.deptmentname" placeholder="璇疯緭鍏ユ墍灞炵粍鍒�" clearable /> + <el-input + disabled + v-model="form.deptmentname" + placeholder="璇疯緭鍏ユ墍灞炵粍鍒�" + clearable + /> </el-form-item> </el-col> <el-col :span="5"> <el-form-item label="缁勯暱" prop="managername"> - <el-input disabled v-model="form.managername" placeholder="璇疯緭鍏ョ粍闀�" clearable /> + <el-input + disabled + v-model="form.managername" + placeholder="璇疯緭鍏ョ粍闀�" + clearable + /> </el-form-item> </el-col> </el-row> <el-row> <el-col :span="5"> <el-form-item label="鐢宠绫诲瀷"> - <el-radio-group v-model="form.applytype" @change="LoadItemTypeArr"> + <el-radio-group + v-model="form.applytype" + @change="LoadItemTypeArr" + > <!--<el-radio v-for="dict in dict.type.sys_financeitemtype" :key="dict.value" :label="dict.value" :disabled="form.id != null">{{ dict.label }}</el-radio>--> - <el-radio v-model="form.applytype" label="1">涓撳璐圭敤鐢宠</el-radio> + <el-radio v-model="form.applytype" label="1" + >涓撳璐圭敤鐢宠</el-radio + > </el-radio-group> - </el-form-item></el-col> + </el-form-item></el-col + > <el-col :span="10"> <el-form-item label="鐢宠璇存槑" prop="remark"> - <el-input disabled v-model="form.remark" placeholder="璇疯緭鍏ョ敵璇疯鏄�" clearable /> + <el-input + disabled + v-model="form.remark" + placeholder="璇疯緭鍏ョ敵璇疯鏄�" + clearable + /> </el-form-item> </el-col> <el-col :span="5"> <el-form-item label="鎹愮尞鑰�" prop="donorname"> - <el-input disabled v-model="form.donorname" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" clearable /> + <el-input + disabled + v-model="form.donorname" + placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" + clearable + /> </el-form-item> </el-col> <!-- @@ -224,43 +429,90 @@ <el-col :span="5"> <el-form-item label="绋庡悗鍚堣" prop="taxedcost"> <el-input v-model="form.taxedcost" placeholder="绋庡悗閲戦鍚堣" /> - </el-form-item> </el-col><!-- + </el-form-item> </el-col + ><!-- <el-col :span="5"> <el-form-item label="鐢宠鐘舵��" prop="recordstatus"> <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-form-item> </el-col>--> </el-row> <el-row> <el-col :span="4"> - <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="addRow" - v-if="show === 1">鏂板涓撳璐�</el-button> + <el-button + type="primary" + plain + icon="el-icon-plus" + size="mini" + @click="addRow" + v-if="show === 1" + >鏂板涓撳璐�</el-button + > </el-col> </el-row> <el-row style="margin-top: 5px; margin-bottom: 5px"> - <el-table :data="fundDetailArr" :summary-method="getSummaries" border highlight-current-row v-loading="loading"> - <el-table-column prop="orderno" align="center" label="搴忓彿" width="80"> + <el-table + :data="fundDetailArr" + :summary-method="getSummaries" + border + highlight-current-row + v-loading="loading" + > + <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="applytype" align="center" label="璐圭敤绫诲瀷" width="220"> + <el-table-column + prop="applytype" + 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.index" :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.index" + :label="dict.label" + :value="dict.value" + ></el-option> </el-select> </template> </el-table-column> - <el-table-column prop="itemtype" align="center" label="鏈嶅姟椤圭洰" width="200"> + <el-table-column + prop="itemtype" + align="center" + label="鏈嶅姟椤圭洰" + width="200" + > <template slot-scope="scope"> - <el-select v-model="scope.row.itemid" placeholder="鏈嶅姟椤圭洰" clearable filterable allow-create> - <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="鏈嶅姟椤圭洰" + clearable + filterable + allow-create + > + <el-option + v-for="dict in scope.row.itemArr" + :key="dict.index" + :label="dict.itemName" + :value="dict.id" + ></el-option> <!-- <el-option v-for="dict in itemArr" :key="dict.index" @@ -270,34 +522,86 @@ </el-select> </template> </el-table-column> - <el-table-column v-if="show === 1" prop="servicesscopename" align="center" label="璐圭敤璇存槑" width="150"> + <el-table-column + v-if="show === 1" + prop="servicesscopename" + align="center" + label="璐圭敤璇存槑" + width="150" + > <template slot-scope="scope"> - <el-input v-model="scope.row.servicesscopename" placeholder="璐圭敤璇存槑" /> + <el-input + v-model="scope.row.servicesscopename" + placeholder="璐圭敤璇存槑" + /> </template> </el-table-column> - <el-table-column prop="beneficiaryno" align="center" label="濮撳悕" width="120"> + <el-table-column + prop="beneficiaryno" + align="center" + label="濮撳悕" + width="120" + > <template slot-scope="scope"> - <el-select filterable allow-create ref="getReportname" default-first-option - @change="selectpersonmsg(scope.row)" v-model="scope.row.beneficiaryname" placeholder="璇烽�夋嫨"> - <el-option v-for="item in arrr3" :key="item.reportNo" :label="item.reportName" :value="item.reportName"> + <el-select + filterable + allow-create + ref="getReportname" + default-first-option + @change="selectpersonmsg(scope.row)" + v-model="scope.row.beneficiaryname" + placeholder="璇烽�夋嫨" + > + <el-option + v-for="item in arrr3" + :key="item.reportNo" + :label="item.reportName" + :value="item.reportName" + > </el-option> </el-select> - </template> </el-table-column><el-table-column prop="title" align="center" label="鑱岀О" width="150"> + </template> </el-table-column + ><el-table-column + prop="title" + align="center" + label="鑱岀О" + width="150" + > <template slot-scope="scope"> <el-input v-model="scope.row.title" placeholder="鑱岀О" /> </template> </el-table-column> - <el-table-column v-if="show === 1" prop="amount" align="center" label="绋庡墠閲戦" width="100"> + <el-table-column + v-if="show === 1" + prop="amount" + align="center" + label="绋庡墠閲戦" + width="100" + > <template slot-scope="scope"> - <el-input v-model="scope.row.amount" v-on:input="val => { - change(scope.row); - } - " placeholder="绋庡墠閲戦" /> + <el-input + v-model="scope.row.amount" + v-on:input=" + val => { + change(scope.row); + } + " + placeholder="绋庡墠閲戦" + /> </template> </el-table-column> - <el-table-column v-if="show === 1" prop="taxedamount" align="center" label="绋庡悗閲戦" width="100"> + <el-table-column + v-if="show === 1" + prop="taxedamount" + align="center" + label="绋庡悗閲戦" + width="100" + > <template slot-scope="scope"> - <el-input v-model="scope.row.taxedamount" placeholder="绋庡悗閲戦" /> + <el-input + v-model="scope.row.taxedamount" + placeholder="绋庡悗閲戦" + /> </template> </el-table-column> <!-- @@ -307,35 +611,76 @@ </template> </el-table-column> --> - <el-table-column prop="unitname" align="center" label="宸ヤ綔鍗曚綅" width="180"> + <el-table-column + prop="unitname" + align="center" + label="宸ヤ綔鍗曚綅" + width="180" + > <template slot-scope="scope"> <el-input v-model="scope.row.unitname" placeholder="宸ヤ綔鍗曚綅" /> </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="240"> + <el-table-column + prop="depositbank" + align="center" + label="寮�鎴烽摱琛�" + width="240" + > <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="220"> + <el-table-column + prop="bankcardno" + align="center" + label="閾惰鍗″彿" + width="220" + > <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="200"> + <el-table-column + fixed="right" + align="center" + label="鎿嶄綔" + width="200" + > <template slot-scope="scope"> - <el-button @click="saveRows(scope.row, scope.$index)" type="text" size="small" v-if="show === 1"> + <el-button + @click="saveRows(scope.row, scope.$index)" + type="text" + size="small" + v-if="show === 1" + > 淇濆瓨 </el-button> - <el-button @click.native.prevent=" - deleteRows(scope.row, scope.$index, fundDetailArr) - " type="text" size="small" v-hasPermi="['project:expertFeeCheck:delete']"> + <el-button + @click.native.prevent=" + deleteRows(scope.row, scope.$index, fundDetailArr) + " + type="text" + size="small" + v-hasPermi="['project:expertFeeCheck:delete']" + > 鍒犻櫎 </el-button> </template> @@ -357,17 +702,39 @@ </el-row> <el-row style="margin-top: 5px; margin-bottom: 5px"> <el-table :data="fundflowList" border> - <el-table-column label="瀹℃牳浜�" align="center" prop="checkusername" /> - <el-table-column label="瀹℃牳鏃ユ湡" align="center" prop="createTime" /> - <el-table-column label="瀹℃牳缁撴灉" align="center" 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" + prop="checkusername" + /> + <el-table-column + label="瀹℃牳鏃ユ湡" + align="center" + prop="createTime" + /> + <el-table-column + label="瀹℃牳缁撴灉" + align="center" + 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="dialogType == 'edit'"> + <el-row + style="margin-top: 25px; margin-bottom: 5px" + v-if="dialogType == 'edit'" + > <el-col :span="7"> <el-form-item label="瀹℃牳" align="left"> <el-radio-group v-model="newobj.flowlevelone" align="left"> @@ -378,13 +745,18 @@ </el-col> <el-col :span="12"> <el-form-item label="瀹℃牳澶囨敞"> - <el-input v-model="newobj.flowconclusion" placeholder="鐢虫姤璐圭敤" /> + <el-input + v-model="newobj.flowconclusion" + placeholder="鐢虫姤璐圭敤" + /> </el-form-item> </el-col> </el-row> </el-form> <div slot="footer" class="dialog-footer"> - <el-button type="primary" @click="dundcheck" v-if="dialogType == 'edit'">淇濆瓨</el-button> + <el-button type="primary" @click="dundcheck" v-if="dialogType == 'edit'" + >淇濆瓨</el-button + > <el-button @click="cancel">鍙栨秷</el-button> </div> </el-dialog> @@ -457,7 +829,6 @@ import OrgSelecter from "@/views/project/components/orgselect"; import { setItem, grtItem, removeItem } from "@/utils/storage.js"; import { getToken } from "@/utils/auth"; - export default { components: { @@ -644,7 +1015,7 @@ dialogType: "show", headers: { Authorization: "Bearer " + getToken() - }, + } }; }, watch: {}, @@ -716,10 +1087,18 @@ return; } checkfund(checkfundobj).then(res => { - this.reset(); - this.$modal.msgSuccess("瀹℃牳瀹屾垚!"); - this.getlistbypower(); - this.dialogOpen = false; + if (res.code == 200) { + this.reset(); + this.$modal.msgSuccess("瀹℃牳瀹屾垚!"); + this.getlistbypower(); + this.dialogOpen = false; + } else { + if (res.msg) { + this.$modal.msgError("鎿嶄綔澶辫"); + } else { + this.$modal.msgError(res.msg); + } + } }); }, getlistUser() { @@ -756,7 +1135,7 @@ }, getlistOrganization() { - listOrganization().then(res => { }); + listOrganization().then(res => {}); }, totaldayin(e) { @@ -785,7 +1164,7 @@ console.log(url); const link = document.createElement("a"); link.href = url; - const name=fileUrl["downloadName"] + const name = fileUrl["downloadName"]; link.setAttribute("download", name); // 鏇挎崲file.pdf涓哄疄闄呯殑鏂囦欢鍚� document.body.appendChild(link); link.click(); @@ -804,7 +1183,7 @@ username = res.data.username; this.$modal .confirm('鏄惁纭閫氳繃"' + username + '"鐨勮垂鐢ㄧ敵璇凤紵') - .then(function () { + .then(function() { getFund(e).then(res => { let data = res.data; let financechecher = "宸插鏍�"; @@ -862,7 +1241,7 @@ }); }, //鍔ㄦ�佽绠楃◣鍓嶉噾棰� - change(scope) { }, + change(scope) {}, autodonorno() { listDonatebaseinfo().then(res => { res.rows.forEach(data => { @@ -978,14 +1357,12 @@ this.ids.forEach(item => { if (this.overallids.includes(item)) { - } else { this.overallids.push(item); const obj = selection.find(obj => obj.id === item); this.overallidsvalue.push(obj); } }); - }, // 鍒囨崲椤靛悗鎭㈠閫変腑 Restorecheck() { @@ -1028,7 +1405,6 @@ if (row.code == 200) { this.$modal.msgSuccess(row.msg); } else { - ; this.$modal.msgError(row.msg); } }) @@ -1183,7 +1559,7 @@ infoid: infoid, count: this.idss }; - listFunddetails(aaa).then(res => { }); + listFunddetails(aaa).then(res => {}); }, //鍒濆鍖栬垂鐢ㄧ敵璇疯〃鍗曠晫闈� @@ -1372,8 +1748,7 @@ type: "warning" }) .then(() => { - updateFunddetail(this.fundDetailArr).then(res => { - }); + updateFunddetail(this.fundDetailArr).then(res => {}); }) .catch(() => { //鍑犵偣鍙栨秷鐨勬彁绀� @@ -1386,7 +1761,7 @@ let detailDataCorrect = true; for (let i = 0; i < this.applicationDetailArr.length; i++) { let tempData = this.applicationDetailArr[i]; - Object.keys(tempData).forEach(function (key) { + Object.keys(tempData).forEach(function(key) { if ( tempData[key] == null || tempData[key] == undefined || diff --git a/src/views/project/fundcheck/medicalCostCheck/index.vue b/src/views/project/fundcheck/medicalCostCheck/index.vue index 4b2da11..5572327 100644 --- a/src/views/project/fundcheck/medicalCostCheck/index.vue +++ b/src/views/project/fundcheck/medicalCostCheck/index.vue @@ -1,63 +1,128 @@ <template> <div class="app-container"> - <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="120px"> + <el-form + :model="queryParams" + ref="queryForm" + :inline="true" + v-show="showSearch" + label-width="120px" + > <el-row align="left"> <el-col :span="5"> <el-form-item label="鎹愮尞妗堜緥" prop="donorname" style="float: left"> - <el-input v-model="queryParams.donorname" placeholder="璇疯緭鍏ョ敵璇蜂汉鎹愮尞鑰�" clearable size="small" - @keyup.enter.native="flowconclusion" /> + <el-input + v-model="queryParams.donorname" + placeholder="璇疯緭鍏ョ敵璇蜂汉鎹愮尞鑰�" + clearable + size="small" + @keyup.enter.native="flowconclusion" + /> </el-form-item> </el-col> <el-col :span="5"> - <el-form-item label-width="120px" label="棰勫鐘舵��" prop="checkstatus" style="float: left"> - <el-select v-model="queryParams.checkstatus" placeholder="璇烽�夋嫨" style="width: 100%"> - <el-option v-for="item in checkmaterials" :key="item.value" :label="item.label" :value="item.value"> + <el-form-item + label-width="120px" + label="棰勫鐘舵��" + prop="checkstatus" + style="float: left" + > + <el-select + v-model="queryParams.checkstatus" + placeholder="璇烽�夋嫨" + style="width: 100%" + > + <el-option + v-for="item in checkmaterials" + :key="item.value" + :label="item.label" + :value="item.value" + > </el-option> </el-select> </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> </el-col> <el-col :span="5"> <el-form-item label="缁忓姙浜�" prop="APPLICANT" style="float: left"> - <el-input v-model="queryParams.APPLICANT" placeholder="璇疯緭鍏ョ粡鍔炰汉" clearable size="small" - @keyup.enter.native="flowconclusion" /> + <el-input + v-model="queryParams.APPLICANT" + placeholder="璇疯緭鍏ョ粡鍔炰汉" + clearable + size="small" + @keyup.enter.native="flowconclusion" + /> </el-form-item> </el-col> </el-row> <el-row> <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="flowconclusion" /> + <el-input + v-model="queryParams.money" + placeholder="璇疯緭鍏ョ敵璇蜂汉閲戦" + clearable + size="small" + @keyup.enter.native="flowconclusion" + /> </el-form-item> </el-col> <el-col :span="8"> <el-form-item label="鐢宠鏃ユ湡" prop="createTime"> - <el-date-picker format="yyyy-MM-dd" @change="selectapplication" value-format="yyyy-MM-dd" v-model="createTime" - type="daterange" range-separator="鑷�" start-placeholder="鐢宠寮�濮嬫棩鏈�" end-placeholder="鐢宠缁撴潫鏃ユ湡" - @keyup.enter.native="flowconclusion"> + <el-date-picker + format="yyyy-MM-dd" + @change="selectapplication" + value-format="yyyy-MM-dd" + v-model="createTime" + type="daterange" + range-separator="鑷�" + start-placeholder="鐢宠寮�濮嬫棩鏈�" + end-placeholder="鐢宠缁撴潫鏃ユ湡" + @keyup.enter.native="flowconclusion" + > </el-date-picker> </el-form-item> </el-col> <el-col :span="6"> <div style="margin-bottom: 15px;"> - <el-button type="primary" icon="el-icon-search" size="mini" @click="flowconclusion">鎼滅储</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="flowconclusion" + >鎼滅储</el-button + > + <el-button icon="el-icon-refresh" size="mini" @click="resetQuery" + >閲嶇疆</el-button + > </div> </el-col> </el-row> </el-form> <el-form ref="infoform" label-width="100px"> <el-row> - <el-table v-loading="loading" border :data="donateconsolationfundList" @selection-change="handleSelectionChange"> - <!-- + <el-table + v-loading="loading" + border + :data="donateconsolationfundList" + @selection-change="handleSelectionChange" + > + <!-- <el-table-column label="瀹℃壒鐘舵��" width="120" align="center" prop="checkFlag"> <template slot-scope="scope"> <span v-if="scope.row.checkFlag == 0"><i class="el-icon-check" @@ -66,14 +131,34 @@ </template> </el-table-column> --> - <el-table-column label="鎶ラ攢鍗曞彿" align="center" prop="bh" width="150px" /> - <el-table-column label="鐢宠鏃ユ湡" width="180" align="center" prop="applyTime"> + <el-table-column + label="鎶ラ攢鍗曞彿" + align="center" + prop="bh" + width="150px" + /> + <el-table-column + label="鐢宠鏃ユ湡" + width="180" + align="center" + prop="applyTime" + > <template slot-scope="scope"> <span>{{ parseTime(scope.row.applyTime, "{y}-{m}-{d}") }}</span> </template> </el-table-column> - <el-table-column label="鐢宠閲戦" align="center" prop="pretaxcost" width="200px" /> - <el-table-column label="缁忓姙浜�" align="center" prop="username" width="150px" /> + <el-table-column + label="鐢宠閲戦" + align="center" + prop="pretaxcost" + width="200px" + /> + <el-table-column + label="缁忓姙浜�" + align="center" + prop="username" + width="150px" + /> <!--<el-table-column label="鎹愮尞缂栧彿" align="center" prop="donorno" />--> <!-- <el-table-column label="棰勬敮璐圭敤" align="center" prop="prepaidamount" width="120px" /> @@ -86,27 +171,82 @@ </el-table-column> <el-table-column label="璐㈠姟瀹℃牳" align="center" prop="financechecher" width="140" /> --> - <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="recordstatus" width="180"> + <el-table-column + label="瀹℃壒鐘舵��" + align="center" + prop="recordstatus" + width="180" + > <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="鎵�灞炵粍鍒�" align="center" prop="deptmentname" width="200px" /> - <el-table-column label="缁勯暱" align="center" prop="managername" width="150px" /> - <el-table-column label="鎹愮尞鑰�" align="center" prop="donorname" width="150px" /> + <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="donorname" + width="150px" + /> <el-table-column label="澶囨敞" align="center" prop="remark" /> - <el-table-column label="鎿嶄綔" fixed="right" align="center" class-name="small-padding fixed-width" width="260px"> + <el-table-column + label="鎿嶄綔" + fixed="right" + align="center" + class-name="small-padding fixed-width" + width="260px" + > <template slot-scope="scope"> - <el-button v-if="scope.row.checkFlag == 1" size="mini" type="text" icon="el-icon-edit" - @click="handleCheck(scope.row)">瀹℃牳</el-button> + <el-button + v-if="scope.row.checkFlag == 1" + size="mini" + type="text" + icon="el-icon-edit" + @click="handleCheck(scope.row)" + >瀹℃牳</el-button + > <!-- v-hasPermi="['project:donateconsolationfund:edit']" --> - <el-button size="mini" type="text" icon="el-icon-edit" @click="handleDetail(scope.row)">璇︽儏</el-button> - <el-button size="mini" type="text" icon="el-icon-download" @click="totaldayin(scope.row.id)">涓嬭浇</el-button> + <el-button + size="mini" + type="text" + icon="el-icon-edit" + @click="handleDetail(scope.row)" + >璇︽儏</el-button + > + <el-button + size="mini" + type="text" + icon="el-icon-download" + @click="totaldayin(scope.row.id)" + >涓嬭浇</el-button + > <!-- v-hasPermi="['project:donateconsolationfund:download']" --> <!-- 鏂板瀹℃牳椤甸潰 --> @@ -122,69 +262,121 @@ </el-table-column> </el-table> - <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" - @pagination="getlistbypower" /> + <pagination + v-show="total > 0" + :total="total" + :page.sync="queryParams.pageNum" + :limit.sync="queryParams.pageSize" + @pagination="getlistbypower" + /> </el-row> </el-form> <!-- 娣诲姞鎴栦慨鏀硅垂鐢ㄧ敵璇峰崟 --> - <el-dialog :visible.sync="dialogOpen" width="1400px" :title="title" style="text-align: center"> + <el-dialog + :visible.sync="dialogOpen" + width="1400px" + :title="title" + style="text-align: center" + > <el-form ref="form" :model="form" label-width="120px" :rules="rules"> <!-- <el-form ref="applyForm" :model="applicationForm" label-width="120px"> --> <el-row> <el-col :span="5"> <el-form-item label="鐢宠鏃ユ湡" prop="createTime"> <!-- <el-input v-model="form.donorno" 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 + 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 :disabled="true" /> + <el-input + v-model="form.deptmentname" + placeholder="璇疯緭鍏ユ墍灞炵粍鍒�" + clearable + :disabled="true" + /> </el-form-item> </el-col> <el-col :span="5"> <el-form-item label="缁勯暱" prop="managername"> - <el-input v-model="form.managername" placeholder="璇疯緭鍏ョ粍闀�" clearable :disabled="true" /> + <el-input + v-model="form.managername" + placeholder="璇疯緭鍏ョ粍闀�" + clearable + :disabled="true" + /> </el-form-item> </el-col> </el-row> <el-row> - <el-col :span="5"><el-form-item label="鐢宠绫诲瀷"> - <el-radio-group v-model="form.applytype" @change="LoadItemTypeArr"> + <el-col :span="5" + ><el-form-item label="鐢宠绫诲瀷"> + <el-radio-group + v-model="form.applytype" + @change="LoadItemTypeArr" + > <!--<el-radio v-for="dict in dict.type.sys_financeitemtype" :key="dict.value" :label="dict.value" :disabled="form.id != null">{{ dict.label }}</el-radio>--> - <el-radio v-model="form.applytype" label="3">鍖诲鎴愭湰璐圭敤鐢宠</el-radio> + <el-radio v-model="form.applytype" label="3" + >鍖诲鎴愭湰璐圭敤鐢宠</el-radio + > </el-radio-group> </el-form-item> </el-col> <el-col :span="10"> <el-form-item label="鐢宠璇存槑" prop="remark"> - <el-input v-model="form.remark" placeholder="璇疯緭鍏ョ敵璇疯鏄�" clearable :disabled="true" /> + <el-input + v-model="form.remark" + placeholder="璇疯緭鍏ョ敵璇疯鏄�" + clearable + :disabled="true" + /> </el-form-item> </el-col> <el-col :span="5"> <el-form-item label="鎹愮尞鑰�" prop="donorname"> - <el-input v-model="form.donorname" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" clearable :disabled="true" /> + <el-input + v-model="form.donorname" + placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" + clearable + :disabled="true" + /> </el-form-item> </el-col> - <!-- + <!-- <el-col :span="8"> <el-form-item label="鎹愮尞缂栧彿" prop="donorno"> <el-input disabled v-model="form.donorno" placeholder="璇疯緭鍏ユ崘鐚紪鍙�" clearable /> </el-form-item> - </el-col> + </el-col> <el-col :span="8"> <el-form-item label="鑱旂郴鐢佃瘽" prop="phone"> <el-input v-model="form.phone" placeholder="璇疯緭鍏ョ敵璇疯�呯殑鑱旂郴鏂瑰紡" clearable /> @@ -200,8 +392,13 @@ <el-row> <el-col :span="5"> <el-form-item label="鍚堣閲戦" prop="amountrequested"> - <el-input v-model="form.amountrequested" placeholder="鐢宠閲戦" :disabled="true" /> - </el-form-item> </el-col><!-- + <el-input + v-model="form.amountrequested" + placeholder="鐢宠閲戦" + :disabled="true" + /> + </el-form-item> </el-col + ><!-- <el-col :span="5"> <el-form-item label="绋庡墠閲戦" prop="amountrequested"> <el-input v-model="form.pretaxcost" placeholder="绋庡墠閲戦鍚堣" :disabled="true" /> @@ -223,37 +420,92 @@ </el-row> <el-row> <el-col :span="4"> - <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="addRow" - :disabled="true">鏂板涓撳璐�</el-button> + <el-button + type="primary" + plain + icon="el-icon-plus" + size="mini" + @click="addRow" + :disabled="true" + >鏂板涓撳璐�</el-button + > </el-col> </el-row> <el-row style="margin-top: 5px; margin-bottom: 5px"> - <el-table :data="fundDetailArr" :summary-method="getSummaries" border highlight-current-row> - <el-table-column prop="orderno" align="center" label="鎺掑簭" width="80"> + <el-table + :data="fundDetailArr" + :summary-method="getSummaries" + border + highlight-current-row + > + <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="鏈嶅姟椤圭洰" clearable filterable allow-create - @change="select(scope.row)" :filter-method="val => SearchItem(val, scope)"> - <el-option v-for="dict in scope.row.itemArr" :key="dict.id" :label="dict.itemName" - :value="dict.id"></el-option> + <el-select + v-model="scope.row.itemid" + placeholder="鏈嶅姟椤圭洰" + clearable + filterable + allow-create + @change="select(scope.row)" + :filter-method="val => SearchItem(val, scope)" + > + <el-option + v-for="dict in scope.row.itemArr" + :key="dict.id" + :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-input v-model="scope.row.beneficiaryname" placeholder="濮撳悕" /> + <el-input + v-model="scope.row.beneficiaryname" + placeholder="濮撳悕" + /> </template> </el-table-column> <!-- @@ -266,99 +518,234 @@ </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-select v-model="scope.row.amount" placeholder="绋庡墠閲戦" clearable filterable allow-create - @change="selectamount(scope.row)"> - <el-option v-for="dict in fundblock" :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 fundblock" + :key="dict.expensedescribe" + :label="dict.expense" + :value="dict.expense" + ></el-option> </el-select> </template> </el-table-column> - <el-table-column prop="taxamount" align="center" label="鎵g◣" width="120" v-if="form.applytype != '3'"> + <el-table-column + prop="taxamount" + align="center" + label="鎵g◣" + width="120" + v-if="form.applytype != '3'" + > <template slot-scope="scope"> <el-input v-model="scope.row.taxamount" placeholder="鎵g◣" /> </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="绋庡悗閲戦" /> + <el-input + v-model="scope.row.taxedamount" + placeholder="绋庡悗閲戦" + /> </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="quantity" align="center" label="鏁伴噺" width="80" v-if="form.applytype == '3'"> + <el-table-column + prop="quantity" + align="center" + label="鏁伴噺" + width="80" + 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="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="浠锋牸" /> </template> </el-table-column> - <el-table-column prop="unitname" align="center" label="鍗曚綅" width="220"> + <el-table-column + prop="unitname" + align="center" + label="鍗曚綅" + width="220" + > <template slot-scope="scope"> - <org-selecter :ref="'unitSel' + scope.$index" :org-type="'3'" v-model="scope.row.unitno" /> + <org-selecter + :ref="'unitSel' + scope.$index" + :org-type="'3'" + v-model="scope.row.unitno" + /> </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" 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="200"> + <el-table-column + fixed="right" + align="center" + label="鎿嶄綔" + width="200" + > <template slot-scope="scope"> - <el-button @click="saveRows(scope.row, scope.$index)" type="text" size="small" v-if="show === 1"> + <el-button + @click="saveRows(scope.row, scope.$index)" + type="text" + size="small" + v-if="show === 1" + > 淇濆瓨 </el-button> - <el-button @click.native.prevent=" - deleteRows(scope.row, scope.$index, fundDetailArr) - " type="text" size="small" v-hasPermi="['project:costFeeCheck:delete']"> + <el-button + @click.native.prevent=" + deleteRows(scope.row, scope.$index, fundDetailArr) + " + type="text" + size="small" + v-hasPermi="['project:costFeeCheck:delete']" + > 鍒犻櫎 </el-button> </template> @@ -368,13 +755,36 @@ <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) => - 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> @@ -382,17 +792,39 @@ <el-row style="margin-top: 5px; margin-bottom: 5px"> <el-table :data="fundflowList" border> - <el-table-column label="瀹℃牳浜�" align="center" prop="checkusername" /> - <el-table-column label="瀹℃牳鏃ユ湡" align="center" prop="createTime" /> - <el-table-column label="瀹℃牳缁撴灉" align="center" 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" + prop="checkusername" + /> + <el-table-column + label="瀹℃牳鏃ユ湡" + align="center" + prop="createTime" + /> + <el-table-column + label="瀹℃牳缁撴灉" + align="center" + 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="dialogType == 'edit'"> + <el-row + style="margin-top: 25px; margin-bottom: 5px" + v-if="dialogType == 'edit'" + > <el-col :span="7"> <el-form-item label="瀹℃牳" align="left"> <el-radio-group v-model="newobj.flowlevelone" align="left"> @@ -403,13 +835,18 @@ </el-col> <el-col :span="12"> <el-form-item label="瀹℃牳澶囨敞"> - <el-input v-model="newobj.flowconclusion" placeholder="鐢虫姤璐圭敤" /> + <el-input + v-model="newobj.flowconclusion" + placeholder="鐢虫姤璐圭敤" + /> </el-form-item> </el-col> </el-row> </el-form> <div slot="footer" class="dialog-footer"> - <el-button type="primary" @click="dundcheck" v-if="dialogType == 'edit'">纭</el-button> + <el-button type="primary" @click="dundcheck" v-if="dialogType == 'edit'" + >纭</el-button + > <el-button @click="cancel">鍙栨秷</el-button> </div> </el-dialog> @@ -724,9 +1161,17 @@ fundid: this.newobj.fundid }; checkfund(checkfundobj).then(res => { - this.reset(); - this.$modal.msgSuccess("瀹℃牳瀹屾垚!"); - this.getlistbypower(); + if (res.code == 200) { + this.reset(); + this.$modal.msgSuccess("瀹℃牳瀹屾垚!"); + this.getlistbypower(); + } else { + if (res.msg) { + this.$modal.msgError("鎿嶄綔澶辫"); + } else { + this.$modal.msgError(res.msg); + } + } }); }, getlistUser() { @@ -763,7 +1208,7 @@ }, getlistOrganization() { - listOrganization().then(res => { }); + listOrganization().then(res => {}); }, totaldayin(e) { @@ -792,7 +1237,7 @@ console.log(url); const link = document.createElement("a"); link.href = url; - const name=fileUrl["downloadName"] + const name = fileUrl["downloadName"]; link.setAttribute("download", name); // 鏇挎崲file.pdf涓哄疄闄呯殑鏂囦欢鍚� document.body.appendChild(link); link.click(); @@ -811,7 +1256,7 @@ username = res.data.username; this.$modal .confirm('鏄惁纭閫氳繃"' + username + '"鐨勮垂鐢ㄧ敵璇凤紵') - .then(function () { + .then(function() { getFund(e).then(res => { let data = res.data; let financechecher = "宸插鏍�"; @@ -869,7 +1314,7 @@ }); }, //鍔ㄦ�佽绠楃◣鍓嶉噾棰� - change(scope) { }, + change(scope) {}, autodonorno() { listDonatebaseinfo().then(res => { res.rows.forEach(data => { @@ -1021,8 +1466,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(res => { @@ -1070,8 +1515,8 @@ //闄勪欢澶勭悊 this.fileList = this.form.annexbankcard ? this.form.annexbankcard - .split(",") - .map(item => ({ url: item, name: item })) + .split(",") + .map(item => ({ url: item, name: item })) : []; getownFundDetail(row.id).then(res => { @@ -1122,7 +1567,7 @@ infoid: infoid, count: this.idss }; - listFunddetails(aaa).then(res => { }); + listFunddetails(aaa).then(res => {}); }, //鍒濆鍖栬垂鐢ㄧ敵璇疯〃鍗曠晫闈� @@ -1367,7 +1812,7 @@ type: "warning" }) .then(() => { - updateFunddetail(this.fundDetailArr).then(res => { }); + updateFunddetail(this.fundDetailArr).then(res => {}); }) .catch(() => { //鍑犵偣鍙栨秷鐨勬彁绀� @@ -1380,7 +1825,7 @@ let detailDataCorrect = true; for (let i = 0; i < this.applicationDetailArr.length; i++) { let tempData = this.applicationDetailArr[i]; - Object.keys(tempData).forEach(function (key) { + Object.keys(tempData).forEach(function(key) { if ( tempData[key] == null || tempData[key] == undefined || @@ -1713,7 +2158,7 @@ }, //鏂囦欢涓婁紶 - handleUploadError() { }, + handleUploadError() {}, remove(file) { this.fileList.splice(this.fileList.indexOf(file), 1); }, diff --git a/src/views/project/fundcheck/officeExpenseCheck/index.vue b/src/views/project/fundcheck/officeExpenseCheck/index.vue index c70309e..245cc2b 100644 --- a/src/views/project/fundcheck/officeExpenseCheck/index.vue +++ b/src/views/project/fundcheck/officeExpenseCheck/index.vue @@ -1,63 +1,128 @@ <template> <div class="app-container"> - <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="120px"> + <el-form + :model="queryParams" + ref="queryForm" + :inline="true" + v-show="showSearch" + label-width="120px" + > <el-row align="left"> <el-col :span="5"> <el-form-item label="鎹愮尞妗堜緥" prop="donorname" style="float: left"> - <el-input v-model="queryParams.donorname" placeholder="璇疯緭鍏ョ敵璇蜂汉鎹愮尞鑰�" clearable size="small" - @keyup.enter.native="flowconclusion" /> + <el-input + v-model="queryParams.donorname" + placeholder="璇疯緭鍏ョ敵璇蜂汉鎹愮尞鑰�" + clearable + size="small" + @keyup.enter.native="flowconclusion" + /> </el-form-item> </el-col> <el-col :span="5"> - <el-form-item label-width="120px" label="棰勫鐘舵��" prop="checkstatus" style="float: left"> - <el-select v-model="queryParams.checkstatus" placeholder="璇烽�夋嫨" style="width: 100%"> - <el-option v-for="item in checkmaterials" :key="item.value" :label="item.label" :value="item.value"> + <el-form-item + label-width="120px" + label="棰勫鐘舵��" + prop="checkstatus" + style="float: left" + > + <el-select + v-model="queryParams.checkstatus" + placeholder="璇烽�夋嫨" + style="width: 100%" + > + <el-option + v-for="item in checkmaterials" + :key="item.value" + :label="item.label" + :value="item.value" + > </el-option> </el-select> </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> </el-col> <el-col :span="5"> <el-form-item label="缁忓姙浜�" prop="APPLICANT" style="float: left"> - <el-input v-model="queryParams.APPLICANT" placeholder="璇疯緭鍏ョ敵璇蜂汉濮撳悕" clearable size="small" - @keyup.enter.native="flowconclusion" /> + <el-input + v-model="queryParams.APPLICANT" + placeholder="璇疯緭鍏ョ敵璇蜂汉濮撳悕" + clearable + size="small" + @keyup.enter.native="flowconclusion" + /> </el-form-item> </el-col> </el-row> <el-row> <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="flowconclusion" /> + <el-input + v-model="queryParams.money" + placeholder="璇疯緭鍏ョ敵璇蜂汉閲戦" + clearable + size="small" + @keyup.enter.native="flowconclusion" + /> </el-form-item> </el-col> <el-col :span="8"> <el-form-item label="鐢宠鏃ユ湡" prop="createTime"> - <el-date-picker format="yyyy-MM-dd" @change="selectapplication" value-format="yyyy-MM-dd" v-model="createTime" - type="daterange" range-separator="鑷�" start-placeholder="鐢宠寮�濮嬫棩鏈�" end-placeholder="鐢宠缁撴潫鏃ユ湡" - @keyup.enter.native="flowconclusion"> + <el-date-picker + format="yyyy-MM-dd" + @change="selectapplication" + value-format="yyyy-MM-dd" + v-model="createTime" + type="daterange" + range-separator="鑷�" + start-placeholder="鐢宠寮�濮嬫棩鏈�" + end-placeholder="鐢宠缁撴潫鏃ユ湡" + @keyup.enter.native="flowconclusion" + > </el-date-picker> </el-form-item> </el-col> <el-col :span="6"> <div style="margin-bottom: 15px;"> - <el-button type="primary" icon="el-icon-search" size="mini" @click="flowconclusion">鎼滅储</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="flowconclusion" + >鎼滅储</el-button + > + <el-button icon="el-icon-refresh" size="mini" @click="resetQuery" + >閲嶇疆</el-button + > </div> </el-col> </el-row> </el-form> <el-form ref="infoform" label-width="100px"> <el-row> - <el-table v-loading="loading" border :data="donateconsolationfundList" @selection-change="handleSelectionChange"> - <!-- + <el-table + v-loading="loading" + border + :data="donateconsolationfundList" + @selection-change="handleSelectionChange" + > + <!-- <el-table-column label="瀹℃壒鐘舵��" width="120" align="center" prop="checkFlag"> <template slot-scope="scope"> <span v-if="scope.row.checkFlag == 0"><i class="el-icon-check" @@ -67,14 +132,34 @@ </el-table-column> --> - <el-table-column label="鎶ラ攢鍗曞彿" align="center" prop="bh" width="150px" /> - <el-table-column label="鐢宠鏃ユ湡" width="180" align="center" prop="applyTime"> + <el-table-column + label="鎶ラ攢鍗曞彿" + align="center" + prop="bh" + width="150px" + /> + <el-table-column + label="鐢宠鏃ユ湡" + width="180" + align="center" + prop="applyTime" + > <template slot-scope="scope"> <span>{{ parseTime(scope.row.applyTime, "{y}-{m}-{d}") }}</span> </template> </el-table-column> - <el-table-column label="鐢宠閲戦" align="center" prop="pretaxcost" width="200px" /> - <el-table-column label="缁忓姙浜�" align="center" prop="username" width="150px" /> + <el-table-column + label="鐢宠閲戦" + align="center" + prop="pretaxcost" + width="200px" + /> + <el-table-column + label="缁忓姙浜�" + align="center" + prop="username" + width="150px" + /> <!--<el-table-column label="鎹愮尞缂栧彿" align="center" prop="donorno" />--> <!-- <el-table-column label="棰勬敮璐圭敤" align="center" prop="prepaidamount" width="120px" /> @@ -87,29 +172,84 @@ </el-table-column> <el-table-column label="璐㈠姟瀹℃牳" align="center" prop="financechecher" width="140" /> --> - <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="recordstatus" width="200"> + <el-table-column + label="瀹℃牳鐘舵��" + align="center" + prop="recordstatus" + width="200" + > <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="鎵�灞炵粍鍒�" align="center" prop="deptmentname" width="200px" /> - <el-table-column label="缁勯暱" align="center" prop="managername" width="150px" /> - <el-table-column label="鎹愮尞鑰�" align="center" prop="donorname" width="150px" /> + <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="donorname" + width="150px" + /> <el-table-column label="澶囨敞" align="center" prop="remark" /> - <el-table-column label="鎿嶄綔" fixed="right" align="center" class-name="small-padding fixed-width" width="260px"> + <el-table-column + label="鎿嶄綔" + fixed="right" + align="center" + class-name="small-padding fixed-width" + width="260px" + > <template slot-scope="scope"> - <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.checkFlag == 0" - @click="handleDetail(scope.row)">璇︽儏</el-button> + <el-button + size="mini" + type="text" + icon="el-icon-edit" + v-if="scope.row.checkFlag == 0" + @click="handleDetail(scope.row)" + >璇︽儏</el-button + > - <el-button v-if="scope.row.checkFlag == 1" size="mini" type="text" icon="el-icon-edit" - @click="handleCheck(scope.row)">瀹℃牳</el-button> + <el-button + v-if="scope.row.checkFlag == 1" + size="mini" + type="text" + icon="el-icon-edit" + @click="handleCheck(scope.row)" + >瀹℃牳</el-button + > <!-- v-hasPermi="['project:donateconsolationfund:edit']" --> - <el-button size="mini" type="text" icon="el-icon-download" @click="totaldayin(scope.row.id)">涓嬭浇</el-button> + <el-button + size="mini" + type="text" + icon="el-icon-download" + @click="totaldayin(scope.row.id)" + >涓嬭浇</el-button + > <!-- v-hasPermi="['project:donateconsolationfund:download']" --> <!-- 鏂板瀹℃牳椤甸潰 --> @@ -125,69 +265,121 @@ </el-table-column> </el-table> - <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" - @pagination="getlistbypower" /> + <pagination + v-show="total > 0" + :total="total" + :page.sync="queryParams.pageNum" + :limit.sync="queryParams.pageSize" + @pagination="getlistbypower" + /> </el-row> </el-form> <!-- 娣诲姞鎴栦慨鏀硅垂鐢ㄧ敵璇峰崟 --> - <el-dialog :visible.sync="dialogOpen" width="1400px" :title="title" style="text-align: center"> + <el-dialog + :visible.sync="dialogOpen" + width="1400px" + :title="title" + style="text-align: center" + > <el-form ref="form" :model="form" label-width="120px" :rules="rules"> <!-- <el-form ref="applyForm" :model="applicationForm" label-width="120px"> --> <el-row> <el-col :span="5"> <el-form-item label="鐢宠鏃ユ湡" prop="createTime"> <!-- <el-input v-model="form.donorno" 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 + 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 :disabled="true" /> + <el-input + v-model="form.deptmentname" + placeholder="璇疯緭鍏ユ墍灞炵粍鍒�" + clearable + :disabled="true" + /> </el-form-item> </el-col> <el-col :span="5"> <el-form-item label="缁勯暱" prop="managername"> - <el-input v-model="form.managername" placeholder="璇疯緭鍏ョ粍闀�" clearable :disabled="true" /> + <el-input + v-model="form.managername" + placeholder="璇疯緭鍏ョ粍闀�" + clearable + :disabled="true" + /> </el-form-item> </el-col> </el-row> <el-row> - <el-col :span="5"><el-form-item label="鐢宠绫诲瀷"> - <el-radio-group v-model="form.applytype" @change="LoadItemTypeArr"> + <el-col :span="5" + ><el-form-item label="鐢宠绫诲瀷"> + <el-radio-group + v-model="form.applytype" + @change="LoadItemTypeArr" + > <!--<el-radio v-for="dict in dict.type.sys_financeitemtype" :key="dict.value" :label="dict.value" :disabled="form.id != null">{{ dict.label }}</el-radio>--> - <el-radio v-model="form.applytype" label="4">鍔炲叕璐圭敤鐢宠</el-radio> + <el-radio v-model="form.applytype" label="4" + >鍔炲叕璐圭敤鐢宠</el-radio + > </el-radio-group> </el-form-item> </el-col> <el-col :span="10"> <el-form-item label="鐢宠璇存槑" prop="remark"> - <el-input v-model="form.remark" placeholder="璇疯緭鍏ョ敵璇疯鏄�" clearable :disabled="true" /> + <el-input + v-model="form.remark" + placeholder="璇疯緭鍏ョ敵璇疯鏄�" + clearable + :disabled="true" + /> </el-form-item> </el-col> <el-col :span="5"> <el-form-item label="鎹愮尞鑰�" prop="donorname"> - <el-input v-model="form.donorname" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" clearable :disabled="true" /> + <el-input + v-model="form.donorname" + placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" + clearable + :disabled="true" + /> </el-form-item> </el-col> - <!-- + <!-- <el-col :span="8"> <el-form-item label="鎹愮尞缂栧彿" prop="donorno"> <el-input disabled v-model="form.donorno" placeholder="璇疯緭鍏ユ崘鐚紪鍙�" clearable /> </el-form-item> - </el-col> + </el-col> <el-col :span="8"> <el-form-item label="鑱旂郴鐢佃瘽" prop="phone"> <el-input v-model="form.phone" placeholder="璇疯緭鍏ョ敵璇疯�呯殑鑱旂郴鏂瑰紡" clearable /> @@ -203,8 +395,13 @@ <el-row> <el-col :span="5"> <el-form-item label="鍚堣閲戦" prop="amountrequested"> - <el-input v-model="form.amountrequested" placeholder="鐢宠閲戦" :disabled="true" /> - </el-form-item> </el-col><!-- + <el-input + v-model="form.amountrequested" + placeholder="鐢宠閲戦" + :disabled="true" + /> + </el-form-item> </el-col + ><!-- <el-col :span="5"> <el-form-item label="绋庡墠閲戦" prop="amountrequested"> <el-input v-model="form.pretaxcost" placeholder="绋庡墠閲戦鍚堣" :disabled="true" /> @@ -226,37 +423,92 @@ </el-row> <el-row> <el-col :span="4"> - <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="addRow" - :disabled="true">鏂板涓撳璐�</el-button> + <el-button + type="primary" + plain + icon="el-icon-plus" + size="mini" + @click="addRow" + :disabled="true" + >鏂板涓撳璐�</el-button + > </el-col> </el-row> <el-row style="margin-top: 5px; margin-bottom: 5px"> - <el-table :data="fundDetailArr" :summary-method="getSummaries" border highlight-current-row> - <el-table-column prop="orderno" align="center" label="鎺掑簭" width="80"> + <el-table + :data="fundDetailArr" + :summary-method="getSummaries" + border + highlight-current-row + > + <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="鏈嶅姟椤圭洰" clearable filterable allow-create - @change="select(scope.row)" :filter-method="val => SearchItem(val, scope)"> - <el-option v-for="dict in scope.row.itemArr" :key="dict.id" :label="dict.itemName" - :value="dict.id"></el-option> + <el-select + v-model="scope.row.itemid" + placeholder="鏈嶅姟椤圭洰" + clearable + filterable + allow-create + @change="select(scope.row)" + :filter-method="val => SearchItem(val, scope)" + > + <el-option + v-for="dict in scope.row.itemArr" + :key="dict.id" + :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-input v-model="scope.row.beneficiaryname" placeholder="濮撳悕" /> + <el-input + v-model="scope.row.beneficiaryname" + placeholder="濮撳悕" + /> </template> </el-table-column> <!-- @@ -269,99 +521,234 @@ </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-select v-model="scope.row.amount" placeholder="绋庡墠閲戦" clearable filterable allow-create - @change="selectamount(scope.row)"> - <el-option v-for="dict in fundblock" :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 fundblock" + :key="dict.expensedescribe" + :label="dict.expense" + :value="dict.expense" + ></el-option> </el-select> </template> </el-table-column> - <el-table-column prop="taxamount" align="center" label="鎵g◣" width="120" v-if="form.applytype != '3'"> + <el-table-column + prop="taxamount" + align="center" + label="鎵g◣" + width="120" + v-if="form.applytype != '3'" + > <template slot-scope="scope"> <el-input v-model="scope.row.taxamount" placeholder="鎵g◣" /> </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="绋庡悗閲戦" /> + <el-input + v-model="scope.row.taxedamount" + placeholder="绋庡悗閲戦" + /> </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="quantity" align="center" label="鏁伴噺" width="80" v-if="form.applytype == '3'"> + <el-table-column + prop="quantity" + align="center" + label="鏁伴噺" + width="80" + 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="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="浠锋牸" /> </template> </el-table-column> - <el-table-column prop="unitname" align="center" label="鍗曚綅" width="220"> + <el-table-column + prop="unitname" + align="center" + label="鍗曚綅" + width="220" + > <template slot-scope="scope"> - <org-selecter :ref="'unitSel' + scope.$index" :org-type="'3'" v-model="scope.row.unitno" /> + <org-selecter + :ref="'unitSel' + scope.$index" + :org-type="'3'" + v-model="scope.row.unitno" + /> </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" 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"> + <el-table-column + fixed="right" + align="center" + label="鎿嶄綔" + width="120" + > <template slot-scope="scope"> - <el-button @click="saveRows(scope.row, scope.$index)" type="text" size="small" v-if="show === 1"> + <el-button + @click="saveRows(scope.row, scope.$index)" + type="text" + size="small" + v-if="show === 1" + > 淇濆瓨 </el-button> - <el-button @click.native.prevent=" - deleteRows(scope.row, scope.$index, fundDetailArr) - " type="text" size="small" v-hasPermi="['project:costFeeCheck:delete']"> + <el-button + @click.native.prevent=" + deleteRows(scope.row, scope.$index, fundDetailArr) + " + type="text" + size="small" + v-hasPermi="['project:costFeeCheck:delete']" + > 鍒犻櫎 </el-button> </template> @@ -371,13 +758,36 @@ <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) => - 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> @@ -385,17 +795,39 @@ <el-row style="margin-top: 5px; margin-bottom: 5px"> <el-table :data="fundflowList" border> - <el-table-column label="瀹℃牳浜�" align="center" prop="checkusername" /> - <el-table-column label="瀹℃牳鏃ユ湡" align="center" prop="createTime" /> - <el-table-column label="瀹℃牳缁撴灉" align="center" 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" + prop="checkusername" + /> + <el-table-column + label="瀹℃牳鏃ユ湡" + align="center" + prop="createTime" + /> + <el-table-column + label="瀹℃牳缁撴灉" + align="center" + 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="dialogType == 'edit'"> + <el-row + style="margin-top: 25px; margin-bottom: 5px" + v-if="dialogType == 'edit'" + > <el-col :span="7"> <el-form-item label="瀹℃牳" align="left"> <el-radio-group v-model="newobj.flowlevelone" align="left"> @@ -406,13 +838,18 @@ </el-col> <el-col :span="12"> <el-form-item label="瀹℃牳澶囨敞"> - <el-input v-model="newobj.flowconclusion" placeholder="鐢虫姤璐圭敤" /> + <el-input + v-model="newobj.flowconclusion" + placeholder="鐢虫姤璐圭敤" + /> </el-form-item> </el-col> </el-row> </el-form> <div slot="footer" class="dialog-footer"> - <el-button type="primary" @click="dundcheck" v-if="dialogType == 'edit'">纭</el-button> + <el-button type="primary" @click="dundcheck" v-if="dialogType == 'edit'" + >纭</el-button + > <el-button @click="cancel">鍙栨秷</el-button> </div> </el-dialog> @@ -729,9 +1166,17 @@ fundid: this.newobj.fundid }; checkfund(checkfundobj).then(res => { - this.reset(); - this.$modal.msgSuccess("瀹℃牳瀹屾垚!"); - this.getlistbypower(); + if (res.code == 200) { + this.reset(); + this.$modal.msgSuccess("瀹℃牳瀹屾垚!"); + this.getlistbypower(); + } else { + if (res.msg) { + this.$modal.msgError("鎿嶄綔澶辫"); + } else { + this.$modal.msgError(res.msg); + } + } }); }, getlistUser() { @@ -768,7 +1213,7 @@ }, getlistOrganization() { - listOrganization().then(res => { }); + listOrganization().then(res => {}); }, totaldayin(e) { @@ -797,7 +1242,7 @@ console.log(url); const link = document.createElement("a"); link.href = url; - const name=fileUrl["downloadName"] + const name = fileUrl["downloadName"]; link.setAttribute("download", name); // 鏇挎崲file.pdf涓哄疄闄呯殑鏂囦欢鍚� document.body.appendChild(link); link.click(); @@ -816,7 +1261,7 @@ username = res.data.username; this.$modal .confirm('鏄惁纭閫氳繃"' + username + '"鐨勮垂鐢ㄧ敵璇凤紵') - .then(function () { + .then(function() { getFund(e).then(res => { let data = res.data; let financechecher = "宸插鏍�"; @@ -874,7 +1319,7 @@ }); }, //鍔ㄦ�佽绠楃◣鍓嶉噾棰� - change(scope) { }, + change(scope) {}, autodonorno() { listDonatebaseinfo().then(res => { res.rows.forEach(data => { @@ -1026,8 +1471,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(res => { @@ -1075,8 +1520,8 @@ //闄勪欢澶勭悊 this.fileList = this.form.annexbankcard ? this.form.annexbankcard - .split(",") - .map(item => ({ url: item, name: item })) + .split(",") + .map(item => ({ url: item, name: item })) : []; getownFundDetail(row.id).then(res => { @@ -1127,7 +1572,7 @@ infoid: infoid, count: this.idss }; - listFunddetails(aaa).then(res => { }); + listFunddetails(aaa).then(res => {}); }, //鍒濆鍖栬垂鐢ㄧ敵璇疯〃鍗曠晫闈� @@ -1372,7 +1817,7 @@ type: "warning" }) .then(() => { - updateFunddetail(this.fundDetailArr).then(res => { }); + updateFunddetail(this.fundDetailArr).then(res => {}); }) .catch(() => { //鍑犵偣鍙栨秷鐨勬彁绀� @@ -1385,7 +1830,7 @@ let detailDataCorrect = true; for (let i = 0; i < this.applicationDetailArr.length; i++) { let tempData = this.applicationDetailArr[i]; - Object.keys(tempData).forEach(function (key) { + Object.keys(tempData).forEach(function(key) { if ( tempData[key] == null || tempData[key] == undefined || @@ -1718,7 +2163,7 @@ }, //鏂囦欢涓婁紶 - handleUploadError() { }, + handleUploadError() {}, remove(file) { this.fileList.splice(this.fileList.indexOf(file), 1); }, diff --git a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue index b97444d..c501264 100644 --- a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue +++ b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue @@ -2494,11 +2494,19 @@ this.$modal.loading("姝e湪鎻愪氦瀹℃牳锛岃绋嶅�欙紒"); checkfund(checkfundobj).then(res => { - this.$modal.closeLoading(); - this.$modal.msgSuccess("鎻愪氦瀹℃牳鎴愬姛!"); - // 鍏抽棴绐楀彛 - this.$store.dispatch("tagsView/delView", this.$route); - this.$router.go(-1); + if (res.code == 200) { + this.$modal.closeLoading(); + this.$modal.msgSuccess("鎻愪氦瀹℃牳鎴愬姛!"); + // 鍏抽棴绐楀彛 + this.$store.dispatch("tagsView/delView", this.$route); + this.$router.go(-1); + } else { + if (res.msg) { + this.$modal.msgError("鎿嶄綔澶辫"); + } else { + this.$modal.msgError(res.msg); + } + } }); }, diff --git a/src/views/project/travelexpensecheck/index.vue b/src/views/project/travelexpensecheck/index.vue index 20d572b..0608b84 100644 --- a/src/views/project/travelexpensecheck/index.vue +++ b/src/views/project/travelexpensecheck/index.vue @@ -210,7 +210,7 @@ align="center" prop="donorname" /> - <!-- + <!-- <el-table-column label="鍑哄樊浜�" width="180" align="center" prop="travelers"> </el-table-column> <el-table-column label="鑱旂郴鐢佃瘽" width="120" align="center" prop="phone"> @@ -219,10 +219,10 @@ </el-table-column> <el-table-column label="閾惰鍗″彿" width="180" align="center" prop="bankcardno"> </el-table-column> - - <el-table-column label="缁勯暱瀹℃壒" align="center" prop="managername"/> - <el-table-column label="涓氬姟鏍稿" align="center" prop="opochecher"/> - <el-table-column label="涓氬姟瀹℃壒" align="center" prop="officedirector"/> + + <el-table-column label="缁勯暱瀹℃壒" align="center" prop="managername"/> + <el-table-column label="涓氬姟鏍稿" align="center" prop="opochecher"/> + <el-table-column label="涓氬姟瀹℃壒" align="center" prop="officedirector"/> <el-table-column label="璐㈠姟鏍稿" align="center" prop="financechecher"/> <el-table-column label="璐㈠姟瀹℃牳" width="120" align="center" prop="financedirector"/> --> @@ -357,7 +357,7 @@ <el-form-item label="鑱旂郴鐢佃瘽" prop="phone"> <el-input v-model="form.phone" placeholder="鑱旂郴鐢佃瘽" /> </el-form-item> - </el-col> + </el-col> </el-row> --> <el-row> @@ -391,7 +391,7 @@ :disabled="true" /> </el-form-item> </el-col - ><!-- + ><!-- <el-col :span="6"> <el-form-item label="棰嗘閲戦" prop="amountrequested"> <el-input v-model="form.amountrequested" placeholder="棰嗘閲戦" /> @@ -1407,10 +1407,19 @@ } checkfund(checkfundobj).then(res => { - this.reset(); - this.open = false; - this.getList(); - this.$modal.msgSuccess("瀹℃牳瀹屾垚!"); + if (res.code == 200) { + this.reset(); + this.open = false; + this.getList(); + this.$modal.msgSuccess("瀹℃牳瀹屾垚!"); + } else { + this.open = false; + if (res.msg) { + this.$modal.msgError("鎿嶄綔澶辫"); + } else { + this.$modal.msgError(res.msg); + } + } }); }, @@ -1444,7 +1453,7 @@ console.log(url); const link = document.createElement("a"); link.href = url; - const name=fileUrl["downloadName"] + const name = fileUrl["downloadName"]; link.setAttribute("download", name); // 鏇挎崲file.pdf涓哄疄闄呯殑鏂囦欢鍚� document.body.appendChild(link); link.click(); -- Gitblit v1.9.3