From 32334e8157941dab3e680112aa3b1495ea5ad609 Mon Sep 17 00:00:00 2001 From: WXL <1785969728@qq.com> Date: 星期四, 18 一月 2024 13:15:05 +0800 Subject: [PATCH] 11 --- src/views/project/fund/applyDetail/index.vue | 1656 ++++++++++++++++------------------------------------------ 1 files changed, 474 insertions(+), 1,182 deletions(-) diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue index b5bcedd..9310d30 100644 --- a/src/views/project/fund/applyDetail/index.vue +++ b/src/views/project/fund/applyDetail/index.vue @@ -6,55 +6,29 @@ <el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-row> <el-col :span="5"> - <el-form-item label="鐢宠鏃ユ湡" prop="createTime"> - <el-date-picker - clearable - :disabled="true" - style="width: 100%" - v-model="form.createTime" - type="date" - value-format="yyyy-MM-dd HH:mm:ss" - placeholder="鏃� 鏈�" - > + <el-form-item label="鎶ラ攢鍗曞彿" prop="bh"> + <el-input v-model="form.bh" :disabled="true" placeholder="鎶ラ攢鍗曞彿" clearable /> + </el-form-item> + </el-col> + <el-col :span="5"> + <el-form-item label="鐢宠鏃ユ湡" prop="applyTime"> + <el-date-picker clearable :disabled="true" style="width: 100%" v-model="form.applyTime" type="date" + value-format="yyyy-MM-dd HH:mm:ss" placeholder="鏃� 鏈�"> </el-date-picker> </el-form-item> </el-col> <el-col :span="5"> <el-form-item label="缁忓姙浜�" prop="username"> - <el-select - v-model="form.username" - placeholder="鐢宠浜�" - clearable - filterable - allow-create - style="width: 100%" - @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-form-item> - </el-col> - <el-col :span="5"> - <el-form-item label="缁勯暱" prop="managername"> - <el-input - v-model="form.managername" - placeholder="璇疯緭鍏ョ粍闀�" - clearable - /> + <el-form-item label="鑱旂郴鐢佃瘽" prop="phone"> + <el-input v-model="form.phone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" /> </el-form-item> </el-col> </el-row> @@ -73,38 +47,33 @@ }}</el-radio> </el-form-item> </el-col> - - <el-col :span="5"> - <el-form-item label="鑱旂郴鐢佃瘽" prop="phone"> - <el-input v-model="form.phone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" /> - </el-form-item> - </el-col> - <el-col :span="5"> - <el-form-item label="鎹愮尞鑰�" prop="name"> - <el-input - :disabled="true" - v-model="form.donorname" - placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" - /> - </el-form-item> - </el-col> <el-col :span="5" v-if="ismanager == true"> <el-form-item label="鐢宠閲戦" prop="pretaxcost"> - <el-input - v-model="form.pretaxcost" - placeholder="绋庡墠閲戦鍚堣" - :disabled="true" - /> + <el-input v-model="form.pretaxcost" placeholder="绋庡墠閲戦鍚堣" :disabled="true" /> + </el-form-item> + </el-col> + <el-col :span="5"> + <el-form-item label="鎵�灞炵粍鍒�" prop="deptmentname"> + <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-form-item> </el-col> </el-row> <el-row style="text-align: left"> - <el-col :span="8"> + <el-col :span="5"> + <el-form-item label="鎹愮尞妗堜緥" prop="name"> + <el-input :disabled="true" v-model="form.donorname" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" /> + </el-form-item> + </el-col> + <el-col :span="10"> <el-form-item label="鐢宠璇存槑" prop="remark"> <el-input v-model="form.remark" placeholder="鐢宠璇存槑" /> </el-form-item> </el-col> - <!-- <el-col :span="5"> <el-form-item label="鐢宠鐘舵��" prop="recordstatus"> @@ -119,65 +88,32 @@ <el-row v-if="jurisdiction"> <!-- <el-alert title="褰撳墠涓烘煡鐪嬬姸鎬侊紝涓嶆敮鎸佷慨鏀瑰瓨鍌ㄣ��" type="warning"> </el-alert> --> - <el-alert - title="褰撳墠涓烘煡鐪嬬姸鎬侊紝涓嶆敮鎸佷慨鏀瑰瓨鍌ㄣ��" - type="warning" - show-icon - > + <el-alert title="褰撳墠涓烘煡鐪嬬姸鎬侊紝涓嶆敮鎸佷慨鏀瑰瓨鍌ㄣ��" type="warning" show-icon> </el-alert> </el-row> <el-row> <el-col :span="3" v-if="businessType == '1'"> - <el-button - @click.native.prevent="importFeeItems" - type="primary" - size="small" - > - 瀵煎叆鏈嶅姟椤圭洰 - </el-button> - </el-col> - <el-col :span="3"> - <div style="margin-bottom: 15px;" v-if="businessType == 2"> - <el-button - type="success" - icon="el-icon-download" - @click="Batchentry" - >鎵归噺褰曞叆</el-button - > + <div style="margin-bottom: 15px;"> + <el-button type="primary" icon="el-icon-download" size="small" @click.native.prevent="importFeeItems"> + 鎵归噺瀵煎叆鏈嶅姟椤圭洰 + </el-button> </div> </el-col> - - <el-col :span="3"> - <div - style="margin-bottom: 15px;" - v-if=" - userprofile.nickName == '闄堟厱鍗�' && - (businessType == '1' || businessType == '2') - " - > - <el-button - type="success" - icon="el-icon-edit-outline" - @click="Manualcalculationfn" - >璁$畻涓◣</el-button - > + <el-col :span="3" v-if="businessType == 2"> + <div style="margin-bottom: 15px;"> + <el-button type="primary" icon="el-icon-download" size="small" @click="Batchentry">鎵归噺褰曞叆涓撳</el-button> + </div> + </el-col> + <el-col :span="3" v-if="userprofile.nickName == '闄堟厱鍗�' && (businessType == '1' || businessType == '2')"> + <div style="margin-bottom: 15px;"> + <el-button type="success" icon="el-icon-edit-outline" size="small" + @click="Manualcalculationfn">璁$畻涓◣</el-button> </div> </el-col> </el-row> <el-row> - <el-table - :data="rbDetails" - v-loading="loading" - max-height="800" - border - highlight-current-row - > - <el-table-column - prop="orderno" - align="center" - label="搴忓彿" - width="88" - > + <el-table :data="rbDetails" v-loading="loading" max-height="800" border highlight-current-row> + <el-table-column prop="orderno" align="center" label="搴忓彿" width="88"> <template slot-scope="scope"> <el-input v-model="scope.row.orderno" placeholder="搴忓彿" /> </template> @@ -186,211 +122,78 @@ <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="businessType == '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-show=" - businessType == 2 || - businessType == 3 || - businessType == 4 || - ismanager == true - " - prop="amount" - align="center" - :label="amountLabel" - width="120" - > + <el-table-column prop="amount" align="center" :label="amountlabel" width="120"> <template slot-scope="scope"> - <el-input - v-model="scope.row.amount" - placeholder="閲戦" - @blur=" - val => { - calculateTax(scope.row, 'A'); - } - " - /> + <el-input v-model="scope.row.amount" placeholder="閲戦" /> </template> </el-table-column> - <el-table-column - prop="taxamount" - align="center" - label="鎵g◣閲戦" - width="120" - v-show=" - (this.ismanager == true) & - (form.applytype == '1' || form.applytype == '2') - " - > + <el-table-column prop="taxamount" align="center" label="鎵g◣閲戦" width="120" + v-if="(ismanager == true) && (businessType == '1' || businessType == '2')"> <template slot-scope="scope"> - <el-input - v-model="scope.row.taxamount" - placeholder="鎵g◣閲戦" - /> + <el-input v-model="scope.row.taxamount" placeholder="鎵g◣閲戦" /> </template> </el-table-column> - <el-table-column - prop="taxedamount" - align="center" - label="绋庡悗閲戦" - width="120" - v-show=" - (this.ismanager == true) & - (form.applytype == '1' || form.applytype == '2') - " - > + <el-table-column prop="taxedamount" align="center" label="绋庡悗閲戦" width="120" + v-if="(ismanager == true) && (businessType == '1' || businessType == '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="绋庡悗閲戦" /> </template> </el-table-column> - <el-table-column - prop="beneficiaryname" - column-key="sdad" - align="center" - :label="beneficiarylabel" - width="200" - > + <el-table-column prop="beneficiaryname" column-key="sdad" align="center" :label="beneficiarylabel" + width="200"> <template slot-scope="scope"> - <el-button - type="primary" - plain - @click="showSelectionDialog(scope, 'account')" - >{{ - scope.row.beneficiaryname - ? scope.row.beneficiaryname - : "鐐瑰嚮閫夋嫨" - }}</el-button - > + <el-button type="primary" plain @click="showSelectionDialog(scope, 'account')">{{ + scope.row.beneficiaryname ? scope.row.beneficiaryname : "鐐瑰嚮閫夋嫨" }}</el-button> </template> </el-table-column> - <el-table-column - prop="unitno" - align="center" - label="涓撳鎵�鍦ㄥ崟浣�" - width="250" - v-if="form.applytype == '1' && form.applytype == '2'" - > + <el-table-column prop="unitno" align="center" label="涓撳鎵�鍦ㄥ崟浣�" width="250" + v-if="businessType == '1' || businessType == '2'"> <template slot-scope="scope"> - <el-button - type="primary" - plain - @click="showSelectionDialog(scope, 'workunit')" - >{{ - scope.row.unitname ? scope.row.unitname : "鐐瑰嚮閫夋嫨" - }}</el-button - > + <el-button type="primary" plain @click="showSelectionDialog(scope, 'workunit')">{{ + scope.row.unitname ? scope.row.unitname : "鐐瑰嚮閫夋嫨" + }}</el-button> </template> </el-table-column> <!-- @@ -420,148 +223,61 @@ </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="businessType == '1' || businessType == '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="businessType == '1' || businessType == '2'"> <template slot-scope="scope"> - <el-form-item :error="scope.row.error" label-width="0"> - <el-input - :disabled=" - userprofile.nickName != '闄堟厱鍗�' && businessType == 1 - " - v-model.number="scope.row.idcardno" - @input="tableParValueChange1(scope.row)" - placeholder="韬唤璇佸彿" - /> + <el-form-item label-width="0"> + <el-input :disabled="userprofile.nickName != '闄堟厱鍗�' + " v-model.number="scope.row.idcardno" @input="tableParValueChange1(scope.row)" + placeholder="韬唤璇佸彿" /> </el-form-item> </template> </el-table-column> - <el-table-column - prop="depositbank" - align="center" - label="寮�鎴烽摱琛�" - width="200" - > + <el-table-column prop="depositbank" align="center" label="寮�鎴烽摱琛�" width="200"> <template slot-scope="scope"> - <el-input - :disabled=" - userprofile.nickName != '闄堟厱鍗�' && businessType == 1 - " - v-model="scope.row.depositbank" - placeholder="寮�鎴烽摱琛�" - /> + <el-input :disabled="userprofile.nickName != '闄堟厱鍗�'" v-model="scope.row.depositbank" placeholder="寮�鎴烽摱琛�" /> </template> </el-table-column> - <el-table-column - prop="bankcardno" - align="center" - label="閾惰甯愬彿" - width="210" - > + <el-table-column prop="bankcardno" align="center" label="閾惰甯愬彿" width="210"> <template slot-scope="scope"> - <el-input - :disabled=" - userprofile.nickName != '闄堟厱鍗�' && businessType == 1 - " - v-model="scope.row.bankcardno" - placeholder="閾惰甯愬彿" - /> + <el-input :disabled="userprofile.nickName != '闄堟厱鍗�' + " v-model="scope.row.bankcardno" placeholder="閾惰甯愬彿" /> </template> </el-table-column> - <el-table-column - prop="itemdescrisca" - align="center" - width="330" - label="椤圭洰璇存槑" - > + <el-table-column prop="itemdescrisca" align="center" width="330" label="椤圭洰璇存槑"> <template slot-scope="scope"> - <el-input - type="textarea" - :rows="2" - v-model="scope.row.itemdescribe" - placeholder="椤圭洰璇存槑" - /> + <el-input type="textarea" :rows="2" v-model="scope.row.itemdescribe" placeholder="椤圭洰璇存槑" /> </template> </el-table-column> - <el-table-column - prop="remark" - align="center" - width="330" - label="澶囨敞" - v-if=" - businessType == 2 || - businessType == 3 || - businessType == 4 || - ismanager == true - " - > + <el-table-column prop="remark" align="center" width="330" label="澶囨敞" v-show="ismanager == true"> <template slot-scope="scope"> - <el-input - type="textarea" - :rows="2" - v-model="scope.row.remark" - placeholder="澶囨敞" - /> + <el-input type="textarea" :rows="2" v-model="scope.row.remark" placeholder="澶囨敞" /> </template> </el-table-column> - <el-table-column - fixed="right" - align="center" - label="鎿嶄綔" - width="180" - > + <el-table-column fixed="right" align="center" label="鎿嶄綔" width="180"> <template slot-scope="scope"> - <el-button - type="text" - size="mini" - @click="addRow(scope.$index)" - v-if=" - operationType == 'add' || - operationType == 'update' || - operationType == 'check' - " - >鏂板</el-button - > - <el-button - @click.native.prevent=" - deleteRows(scope.row, scope.$index, rbDetails) - " - type="text" - size="small" - v-if=" - operationType == 'add' || - operationType == 'update' || - operationType == 'check' - " - > + <el-button type="text" size="mini" @click="addRow(scope.$index)" v-if="operationType == 'add' || + operationType == 'update' || + operationType == 'check' + ">鏂板</el-button> + <el-button @click.native.prevent=" + deleteRows(scope.row, scope.$index, rbDetails) + " type="text" size="small" v-if="operationType == 'add' || + operationType == 'update' || + operationType == 'check' + "> 鍒犻櫎 </el-button> - <el-button - @click.native.prevent=" - Filepopup(scope.$index, rbDetails, scope.row) - " - type="text" - size="small" - v-if=" - businessType == 3 || businessType == 2 || businessType == 4 - " - >绁ㄦ嵁</el-button - > + <el-button @click.native.prevent=" + Filepopup(scope.$index, rbDetails, scope.row) + " type="text" size="small" v-if="businessType == 2 || businessType == 3 || businessType == 4 + ">绁ㄦ嵁</el-button> </template> </el-table-column> </el-table> @@ -569,55 +285,20 @@ <el-row> <el-col :span="12"> - <el-form-item - label="璐圭敤鐢宠闄勪欢" - align="left" - prop="annexbankcard" - v-if="businessType == 0" - > - <el-upload - size="mini" - class="upload-demo" - :action="uploadFileUrl" - :file-list="fileListto" - :show-file-list="false" - multiple - drag - :headers="headers" - :on-success=" - (response, file, fileList) => - uploadSccess(response, file, fileList) - " - :on-preview="downFile" - :disabled="operationType == 'detail'" - :on-error="handleUploadError" - :on-remove="remove" - accept="image/*,.pdf" - > + <el-form-item label="璐圭敤鐢宠闄勪欢" align="left" prop="annexbankcard" v-if="businessType == 0"> + <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileListto" + :show-file-list="false" multiple drag :headers="headers" :on-success="(response, file, fileList) => + uploadSccess(response, file, fileList) + " :on-preview="downFile" :disabled="operationType == 'detail'" :on-error="handleUploadError" + :on-remove="remove" accept="image/*,.pdf"> <i class="el-icon-upload"></i> <div class="el-upload__text"> 灏嗙エ鎹嫋鍒版澶勶紝鎴� - <em - ><el-button - :disabled="operationType == 'detail'" - size="small" - type="primary" - >鐐瑰嚮涓婁紶</el-button - ></em - > + <em><el-button :disabled="operationType == 'detail'" size="small" type="primary">鐐瑰嚮涓婁紶</el-button></em> </div> </el-upload> - <el-table - :data="fileListto" - @row-click="downFile" - style="width: 100%" - height="400" - > - <el-table-column - prop="name" - :show-overflow-tooltip="true" - label="鍚嶇О" - > + <el-table :data="fileListto" @row-click="downFile" style="width: 100%" height="400"> + <el-table-column prop="name" :show-overflow-tooltip="true" label="鍚嶇О"> <template slot-scope="scope"> <i style="color:#409EFF" class=" el-icon-s-order" />{{ scope.row.name @@ -625,76 +306,39 @@ </template> </el-table-column> - <el-table-column - prop="name" - width="180" - :show-overflow-tooltip="true" - label="鍔熻兘" - > + <el-table-column prop="name" width="180" :show-overflow-tooltip="true" label="鍔熻兘"> <template slot-scope="scope"> - <el-button - type="primary" - size="mini" - @click.native.prevent.stop="deletedowfile(scope.row)" - >鍒犻櫎</el-button - > - <el-button - type="primary" - size="mini" - @click.native.prevent.stop="moveupdowfile(scope.row)" - >涓婄Щ</el-button - > + <el-button type="primary" size="mini" + @click.native.prevent.stop="deletedowfile(scope.row)">鍒犻櫎</el-button> + <el-button type="primary" size="mini" + @click.native.prevent.stop="moveupdowfile(scope.row)">涓婄Щ</el-button> </template> </el-table-column> </el-table> </el-form-item> </el-col> </el-row> - <el-row - v-if=" - operationType == 'detail' || - operationType == 'check' || - operationType == 'update' - " - > + <el-row v-if="operationType == 'detail' || + operationType == 'check' || + operationType == 'update' + "> <el-table :data="fundflowList" border> - <el-table-column - label="瀹℃牳鏃ユ湡" - align="center" - width="160" - prop="createTime" - /> - <el-table-column - label="瀹℃牳浜�" - align="center" - width="120" - prop="checkusername" - /> - <el-table-column - label="瀹℃牳缁撴灉" - align="center" - width="200" - prop="flowconclusion" - > + <el-table-column label="瀹℃牳鏃ユ湡" align="center" width="160" prop="createTime" /> + <el-table-column label="瀹℃牳浜�" align="center" width="120" prop="checkusername" /> + <el-table-column label="瀹℃牳缁撴灉" align="center" width="200" prop="flowconclusion"> <template slot-scope="scope"> <span v-if="scope.row.flowconclusion == 1">閫氳繃</span> <span v-if="scope.row.flowconclusion == 2">涓嶉�氳繃</span> </template> </el-table-column> - <el-table-column - label="瀹℃牳澶囨敞" - align="center" - prop="flowcontent" - /> + <el-table-column label="瀹℃牳澶囨敞" align="center" prop="flowcontent" /> </el-table> </el-row> - <el-row - style="margin-top: 25px; margin-bottom: 5px" - v-if="operationType == 'check' && userprofile.nickName == '闄堟厱鍗�'" - > + <el-row style="margin-top: 25px; margin-bottom: 5px" + v-if="operationType == 'check' && userprofile.nickName == '闄堟厱鍗�'"> <el-col :span="20"> - <el-form-item label="鐢宠鏉愭枡鐘舵��" prop="infoid"> + <el-form-item label="棰勫鏉愭枡" prop="infoid"> <el-radio-group v-model="form.checkstatus" align="left"> <el-radio :label="1">寰呯敵璇锋潗鏂�</el-radio> <el-radio :label="2">瀹℃牳閫氳繃绛夊緟閭瘎绾歌川鏉愭枡</el-radio> @@ -703,10 +347,7 @@ </el-form-item> </el-col> </el-row> - <el-row - style="margin-top: 5px; margin-bottom: 5px" - v-if="operationType == 'check'" - > + <el-row style="margin-top: 5px; margin-bottom: 5px" v-if="operationType == 'check'"> <el-col :span="20"> <el-form-item label="瀹℃牳缁撴灉" align="left"> <el-radio-group v-model="checkObj.flowlevelone" align="left"> @@ -725,270 +366,143 @@ </el-row> </el-form> <div slot="footer" class="dialog-footer"> - <el-button - type="primary" - @click="submitForm" - v-if=" - operationType == 'add' || - operationType == 'update' || - ismanager == true - " - >淇濆瓨</el-button - > - <el-button - type="success" - @click="handleup" - v-if="operationType == 'add' || operationType == 'update'" - >涓婃姤</el-button - > - <el-button - type="primary" - @click="checksubmit" - v-if="operationType == 'check'" - >鎻愪氦瀹℃牳</el-button - > + <el-button type="primary" @click="submitForm" v-if="operationType == 'add' || + operationType == 'update' || + ismanager == true + ">淇濆瓨</el-button> + <el-button type="success" @click="handleup" + v-if="operationType == 'add' || operationType == 'update'">涓婃姤</el-button> + <el-button type="primary" @click="checksubmit" v-if="operationType == 'check'">鎻愪氦瀹℃牳</el-button> <el-button @click="cancel">鍏� 闂�</el-button> </div> </div> - <el-dialog - :visible.sync="showselectiondialog" - :close-on-click-modal="false" - :title="'璐︽埛淇℃伅/鍗曚綅淇℃伅閫夋嫨'" - width="650px" - style="text-align: center" - v-loading="loading" - > - <el-form - ref="accountselectform" - :rules="dialogrules" - :model="accountselectform" - label-width="120px" - > + <el-dialog :visible.sync="showselectiondialog" :close-on-click-modal="false" :title="'璐︽埛淇℃伅/鍗曚綅淇℃伅閫夋嫨'" width="650px" + style="text-align: center" v-loading="loading"> + <el-form ref="accountselectform" :rules="dialogrules" :model="accountselectform" label-width="120px"> <el-row v-if="selectionType == 'workunit'"> <el-col :span="24"> - <el-form-item - label="鍗曚綅鍚嶇О" - prop="expertunitno" - label-width="120px" - > - <el-select - v-model="accountselectform.expertunitno" - placeholder="鍗曚綅鍚嶇О" - clearable - filterable - allow-create - style="width: 100%" - > - <el-option - v-for="(spec, index) in unitList" - :key="index" - :label="spec.organizationname" - :value="spec.organizationid" - ></el-option> + <el-form-item label="鍗曚綅鍚嶇О" prop="expertunitname" label-width="120px"> + <el-select v-model="accountselectform.expertunitname" placeholder="鍗曚綅鍚嶇О" 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> </el-row> <el-row v-if="selectionType == 'account'"> <el-col> - <el-form-item - label="璐︽埛鏉ユ簮" - prop="accountfrom" - class="left-align" - > + <el-form-item label="璐︽埛鏉ユ簮" prop="accountfrom" class="left-align"> <el-radio-group v-model="accountfrom" style="margin-bottom: 0"> <el-radio label="1">浠庤处鎴峰簱</el-radio> - <el-radio label="2" - >鏂板璐︽埛锛堟柊澧炲悗闇�瑕佸鏍哥‘璁ゆ墠鑳藉惎鐢級</el-radio - > + <el-radio label="2">鏂板璐︽埛锛堟柊澧炰笓瀹惰处鎴峰悗闇�瑕佸鏍稿惎鐢ㄦ墠鑳戒娇鐢級</el-radio> </el-radio-group> </el-form-item> </el-col> <el-col :span="24" v-if="accountfrom == '1'"> <el-form-item label="璐︽埛鍚嶇О" prop="accountname"> - <el-select - filterable - allow-create - ref="accountname" - default-first-option - v-model="accountselectform.accountname" - placeholder="璇烽�夋嫨" - style="width: 100%" - > - <el-option - v-for="item in accountlist" - :key="item.id" - :label="item.username" - :value="item.username" - > + <el-select filterable allow-create ref="accountname" default-first-option + v-model="accountselectform.accountname" placeholder="璇烽�夋嫨" style="width: 100%"> + <el-option v-for="item in accountlist" :key="item.id" :label="item.username" :value="item.username"> </el-option> </el-select> </el-form-item> </el-col> </el-row> - <el-row v-if="accountfrom == '2'"> - <el-col :span="16" - ><el-form-item label="鏂板绫诲瀷" prop="usertype"> - <el-radio-group - v-model="accountselectform.usertype" - style="margin-bottom: 0" - > - <el-radio label="expert">鏂板涓撳璐﹀彿</el-radio> - <el-radio label="org">鏂板鍗曚綅璐﹀彿</el-radio> + <el-row v-if="selectionType == 'account' && accountfrom == '2'"> + <el-col :span="24"> + <el-form-item label="鏂板绫诲瀷" prop="usertype" class="left-align"> + <el-radio-group v-model="accountselectform.usertype" style="margin-bottom: 0" + @change="userTypeChange(accountselectform.usertype)"> + <el-radio label="expert">涓撳璐﹀彿</el-radio> + <el-radio label="org">鍗曚綅璐﹀彿</el-radio> + <el-radio label="donor">鎹愮尞鑰呬翰灞炶处鍙�</el-radio> </el-radio-group> </el-form-item> </el-col> </el-row> - <el-row v-if="accountfrom == '2'"> + <el-row v-if="selectionType == 'account' && accountfrom == '2'"> <el-col :span="24"> <el-form-item label="璐﹀彿鍚嶇О" prop="username"> - <el-input - v-model="accountselectform.username" - placeholder="璇疯緭鍏ュ崟浣嶅悕绉版垨涓撳濮撳悕" - /> + <el-input v-model="accountselectform.username" placeholder="璇疯緭鍏ュ崟浣嶅悕绉帮紝鎴栦笓瀹跺鍚嶏紝鎴栧叾浠栬处鍙�" /> </el-form-item> </el-col> </el-row> - <el-row - v-if="accountfrom == '2' && accountselectform.usertype != 'org'" - > + <el-row v-if="selectionType == 'account' && accountfrom == '2' && accountselectform.usertype != 'org'"> <el-col :span="12"> <el-form-item label="韬唤璇佸彿" prop="idcardno"> - <el-input - v-model="accountselectform.idcardno" - placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" - /> + <el-input v-model="accountselectform.idcardno" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" /> </el-form-item> </el-col> - <el-col :span="12"> + <el-col :span="12" v-if="accountselectform.usertype == 'expert'"> <el-form-item label="鑱岀О" prop="title"> - <el-select - v-model="accountselectform.title" - placeholder="璇烽�夋嫨浜哄憳鑱岀О" - > - <el-option - v-for="dict in dict.type.sys_professionaltitle" - :key="dict.value" - :label="dict.label" - :value="dict.label" - ></el-option> + <el-select v-model="accountselectform.title" placeholder="璇烽�夋嫨浜哄憳鑱岀О"> + <el-option v-for="dict in dict.type.sys_professionaltitle" :key="dict.value" :label="dict.label" + :value="dict.label"></el-option> </el-select> </el-form-item> </el-col> </el-row> - <el-row - v-if="accountfrom == '2' && accountselectform.usertype != 'org'" - > + <el-row v-if="selectionType == 'account' && accountfrom == '2' && accountselectform.usertype == 'expert'"> <el-col> <el-form-item label="鎵�鍦ㄥ崟浣�" prop="unitno"> - <el-select - v-model="accountselectform.unitno" - placeholder="鍗曚綅鍚嶇О" - clearable - filterable - allow-create - style="width: 100%" - > - <el-option - v-for="(spec, index) in unitList" - :key="index" - :label="spec.organizationname" - :value="spec.organizationid" - ></el-option> + <el-select v-model="accountselectform.unitno" placeholder="鍗曚綅鍚嶇О" clearable filterable allow-create + style="width: 100%"> + <el-option v-for="(spec, index) in unitList" :key="index" :label="spec.organizationname" + :value="spec.organizationid"></el-option> </el-select> </el-form-item> </el-col> <el-col> <el-form-item label="鍗曚綅宸ュ彿" prop="personnelunitno"> - <el-input - v-model="accountselectform.personnelunitno" - placeholder="璇疯緭鍏ユ墍鍦ㄥ崟浣嶇殑宸ュ彿" - /> + <el-input v-model="accountselectform.personnelunitno" placeholder="璇疯緭鍏ユ墍鍦ㄥ崟浣嶇殑宸ュ彿" /> </el-form-item> </el-col> </el-row> - <el-row v-if="accountfrom == '2'"> - <el-col - ><el-form-item label="寮�鎴烽摱琛�" prop="depositbank"> - <el-input - v-model="accountselectform.depositbank" - placeholder="璇疯緭鍏ュ紑鎴烽摱琛屽悕绉�" - /> + <el-row v-if="selectionType == 'account' && accountfrom == '2'"> + <el-col><el-form-item label="寮�鎴烽摱琛�" prop="depositbank"> + <el-input v-model="accountselectform.depositbank" placeholder="璇疯緭鍏ュ紑鎴烽摱琛屽悕绉�" /> </el-form-item> </el-col> - <el-col - ><el-form-item label="閾惰鍗″彿" prop="bankcardno"> - <el-input - v-model="accountselectform.bankcardno" - placeholder="璇疯緭鍏ラ摱琛屽崱鍙�" - /> + <el-col><el-form-item label="閾惰鍗″彿" prop="bankcardno"> + <el-input v-model="accountselectform.bankcardno" placeholder="璇疯緭鍏ラ摱琛屽崱鍙�" /> </el-form-item> </el-col> </el-row> - <el-row v-if="accountfrom == '2'"> + <el-row v-if="selectionType == 'account' && accountfrom == '2'"> <el-col> <el-form-item label="鑱旂郴鍦板潃" prop="address"> - <el-input - v-model="accountselectform.address" - placeholder="璇疯緭鍏ヨ仈绯诲湴鍧�" - /> + <el-input v-model="accountselectform.address" placeholder="璇疯緭鍏ヨ仈绯诲湴鍧�" /> </el-form-item> </el-col> </el-row> - <el-row v-if="accountfrom == '2'"> + <el-row v-if="selectionType == 'account' && accountfrom == '2'"> <el-col> <el-form-item label="鑱旂郴鐢佃瘽" prop="telephone"> - <el-input - v-model="accountselectform.telephone" - placeholder="璇疯緭鍏ヨ仈绯荤數璇�" - /> + <el-input v-model="accountselectform.telephone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" /> </el-form-item> </el-col> </el-row> </el-form> <span slot="footer" class="dialog-footer"> - <el-button type="primary" @click="confirmSelectionDialog()" - >纭� 瀹�</el-button - > + <el-button type="primary" @click="confirmSelectionDialog()">纭� 瀹�</el-button> <el-button @click="showselectiondialog = false">鍙� 娑�</el-button> </span> </el-dialog> - <el-dialog - v-dialogDrags - :modal="false" - :close-on-click-modal="false" - :title="pdftitle" - :visible.sync="pdfVisible" - width="60%" - > + <el-dialog v-dialogDrags :modal="false" :close-on-click-modal="false" :title="pdftitle" :visible.sync="pdfVisible" + width="60%"> <div> <el-table :data="tableDatatop" style="width: 100%"> - <el-table-column - v-if="businessType == 4" - prop="price" - align="center" - label="鍗曚环" - > + <el-table-column v-if="businessType == 4" prop="price" align="center" label="鍗曚环"> </el-table-column> - <el-table-column - prop="quantity" - align="center" - label="鏁伴噺" - v-if="businessType == 4" - > + <el-table-column prop="quantity" align="center" label="鏁伴噺" v-if="businessType == 4"> </el-table-column> - <el-table-column prop="amount" align="center" :label="amountLabel"> + <el-table-column prop="amount" align="center" :label="amountlabel"> </el-table-column> - <el-table-column - prop="taxedamount" - align="center" - label="绋庡悗閲戦" - v-if=" - (this.ismanager == true) & - (form.applytype == '1' || form.applytype == '2') - " - > + <el-table-column prop="taxedamount" align="center" label="绋庡悗閲戦" v-if="(this.ismanager == true) & + (form.applytype == '1' || form.applytype == '2') + "> </el-table-column> <!-- <el-table-column prop="beneficiaryname" @@ -1008,135 +522,60 @@ </el-table-column> --> <el-table-column prop="" align="center" label="鍗曚綅/涓汉" width="250"> </el-table-column> - <el-table-column - prop="title" - align="center" - label="鑱岀О" - width="120" - v-if="form.applytype == '1' || form.applytype == '2'" - > + <el-table-column prop="title" align="center" label="鑱岀О" width="120" + v-if="form.applytype == '1' || form.applytype == '2'"> </el-table-column> - <el-table-column - prop="idcardno" - align="center" - label="韬唤璇佸彿" - width="200" - v-if="form.applytype == '1' || form.applytype == '2'" - > + <el-table-column prop="idcardno" align="center" label="韬唤璇佸彿" width="200" + v-if="form.applytype == '1' || form.applytype == '2'"> </el-table-column> <el-table-column prop="depositbank" align="center" label="寮�鎴烽摱琛�"> </el-table-column> - <el-table-column - prop="bankcardno" - align="center" - label="閾惰甯愬彿" - width="210" - > + <el-table-column prop="bankcardno" align="center" label="閾惰甯愬彿" width="210"> </el-table-column> </el-table> </div> - <el-tabs - style="margin-top: 20px;" - v-model="activeName" - type="border-card" - @tab-click="handleClick" - > + <el-tabs style="margin-top: 20px;" v-model="activeName" type="border-card" @tab-click="handleClick"> <el-tab-pane label="鏅�氶檮浠�" :name="1"> <div class="pdfimg"> <div class="box-pdf"> <div> - <el-upload - size="mini" - class="upload-demo" - :action="uploadFileUrl" - :file-list="fileListto" - :show-file-list="false" - multiple - drag - :headers="headers" - :on-success=" - (response, file, fileList) => - uploadSccess(response, file, fileList) - " - :on-preview="downFile" - :disabled="operationType == 'detail'" - :on-error="handleUploadError" - :on-remove="remove" - accept="image/*,.pdf" - > + <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileListto" + :show-file-list="false" multiple drag :headers="headers" :on-success="(response, file, fileList) => + uploadSccess(response, file, fileList) + " :on-preview="downFile" :disabled="operationType == 'detail'" :on-error="handleUploadError" + :on-remove="remove" accept="image/*,.pdf"> <i class="el-icon-upload"></i> <div class="el-upload__text"> 灏嗙エ鎹嫋鍒版澶勶紝鎴� - <em - ><el-button - :disabled="operationType == 'detail'" - size="small" - type="primary" - >鐐瑰嚮涓婁紶</el-button - ></em - > + <em><el-button :disabled="operationType == 'detail'" size="small" type="primary">鐐瑰嚮涓婁紶</el-button></em> </div> </el-upload> - <el-table - :data="fileListto" - @row-click="downFile" - style="width: 100%" - height="400" - > - <el-table-column - prop="name" - :show-overflow-tooltip="true" - label="鍚嶇О" - > + <el-table :data="fileListto" @row-click="downFile" style="width: 100%" height="400"> + <el-table-column prop="name" :show-overflow-tooltip="true" label="鍚嶇О"> <template slot-scope="scope"> <i style="color:#409EFF" class=" el-icon-s-order" /> <span>{{ scope.row.name }}</span> </template> </el-table-column> - <el-table-column - prop="name" - width="190" - :show-overflow-tooltip="true" - label="鍔熻兘" - > + <el-table-column prop="name" width="190" :show-overflow-tooltip="true" label="鍔熻兘"> <template slot-scope="scope"> - <el-button - type="primary" - size="mini" - @click.native.prevent.stop="deletedowfile(scope.row)" - >鍒犻櫎</el-button - > - <el-button - type="primary" - size="mini" - @click.native.prevent.stop="moveupdowfile(scope.row)" - >涓婄Щ</el-button - > - <el-button - type="success" - size="mini" - icon="el-icon-search" - circle - @click.native.prevent.stop="Downloadfile(scope.row)" - ></el-button> + <el-button type="primary" size="mini" + @click.native.prevent.stop="deletedowfile(scope.row)">鍒犻櫎</el-button> + <el-button type="primary" size="mini" + @click.native.prevent.stop="moveupdowfile(scope.row)">涓婄Щ</el-button> + <el-button type="success" size="mini" icon="el-icon-search" circle + @click.native.prevent.stop="Downloadfile(scope.row)"></el-button> </template> </el-table-column> </el-table> </div> </div> - <div - v-if="this.previewpdf && pdfimgsrcList.length" - class="pdfimgmin" - > + <div v-if="this.previewpdf && pdfimgsrcList.length" class="pdfimgmin"> <!-- <img :src="pdfimg" /> --> - <el-image - style="width: 95%; height: 90%" - :src="pdfimg" - :preview-src-list="pdfimgsrcList" - > + <el-image style="width: 95%; height: 90%" :src="pdfimg" :preview-src-list="pdfimgsrcList"> <!-- <div slot="error" class="image-slot"> <i class="el-icon-picture-outline"></i> </div> --> @@ -1149,97 +588,42 @@ <div class="pdfimg"> <div class="box-pdf"> <div> - <el-upload - size="mini" - class="upload-demo" - :action="uploadFileUrl" - :file-list="invoicefileList" - :show-file-list="false" - multiple - drag - :headers="headers" - :on-success=" - (response, file, fileList) => - uploadSccess(response, file, fileList) - " - :on-preview="downFile" - :disabled="operationType == 'detail'" - :on-error="handleUploadError" - :on-remove="remove" - accept="image/*,.pdf" - > + <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="invoicefileList" + :show-file-list="false" multiple drag :headers="headers" :on-success="(response, file, fileList) => + uploadSccess(response, file, fileList) + " :on-preview="downFile" :disabled="operationType == 'detail'" :on-error="handleUploadError" + :on-remove="remove" accept="image/*,.pdf"> <i class="el-icon-upload"></i> <div class="el-upload__text"> 灏嗗彂绁ㄦ枃浠舵嫋鍒版澶勶紝鎴� - <em - ><el-button - :disabled="operationType == 'detail'" - size="small" - type="primary" - >鐐瑰嚮涓婁紶</el-button - ></em - > + <em><el-button :disabled="operationType == 'detail'" size="small" type="primary">鐐瑰嚮涓婁紶</el-button></em> </div> </el-upload> - <el-table - :data="invoicefileListto" - @row-click="downFile" - style="width: 100%" - height="400" - > - <el-table-column - prop="name" - :show-overflow-tooltip="true" - label="鍚嶇О" - > + <el-table :data="invoicefileListto" @row-click="downFile" style="width: 100%" height="400"> + <el-table-column prop="name" :show-overflow-tooltip="true" label="鍚嶇О"> <template slot-scope="scope"> <i style="color:#409EFF" class=" el-icon-s-order" /> <span>{{ scope.row.name }}</span> </template> </el-table-column> - <el-table-column - prop="name" - width="190" - :show-overflow-tooltip="true" - label="鍔熻兘" - > + <el-table-column prop="name" width="190" :show-overflow-tooltip="true" label="鍔熻兘"> <template slot-scope="scope"> - <el-button - type="primary" - size="mini" - @click.native.prevent.stop="deletedowfile(scope.row)" - >鍒犻櫎</el-button - > - <el-button - type="primary" - size="mini" - @click.native.prevent.stop="moveupdowfile(scope.row)" - >涓婄Щ</el-button - > - <el-button - type="success" - size="mini" - icon="el-icon-search" - circle - @click.native.prevent.stop="Downloadfile(scope.row)" - ></el-button> + <el-button type="primary" size="mini" + @click.native.prevent.stop="deletedowfile(scope.row)">鍒犻櫎</el-button> + <el-button type="primary" size="mini" + @click.native.prevent.stop="moveupdowfile(scope.row)">涓婄Щ</el-button> + <el-button type="success" size="mini" icon="el-icon-search" circle + @click.native.prevent.stop="Downloadfile(scope.row)"></el-button> </template> </el-table-column> </el-table> </div> </div> - <div - v-if="this.previewpdf && invoicepdfimgsrcList.length" - class="pdfimgmin" - > + <div v-if="this.previewpdf && invoicepdfimgsrcList.length" class="pdfimgmin"> <!-- <img :src="pdfimg" /> --> - <el-image - style="width: 95%; height: 90%" - :src="invoicepdfimg" - :preview-src-list="invoicepdfimgsrcList" - > + <el-image style="width: 95%; height: 90%" :src="invoicepdfimg" :preview-src-list="invoicepdfimgsrcList"> <!-- <div slot="error" class="image-slot"> <i class="el-icon-picture-outline"></i> </div> --> @@ -1251,14 +635,10 @@ </el-tabs> </el-dialog> <el-dialog title="鎻愮ず" :visible.sync="Savereminder" width="30%"> - <el-alert - :title=" - '鎮ㄥ凡娣诲姞' + - totalquantity + - '鏉℃暟鎹紝涓洪槻姝㈡暟鎹涪澶辨槸鍚︽彁浜や繚瀛樺啀缁х画娣诲姞銆�' - " - type="warning" - > + <el-alert :title="'鎮ㄥ凡娣诲姞' + + totalquantity + + '鏉℃暟鎹紝涓洪槻姝㈡暟鎹涪澶辨槸鍚︽彁浜や繚瀛樺啀缁х画娣诲姞銆�' + " type="warning"> </el-alert> <span slot="footer" class="dialog-footer"> <el-button type="primary" @click="Savenow">纭� 瀹�</el-button> @@ -1267,30 +647,13 @@ </el-dialog> <!-- 鎵归噺閫夊彇 --> - <el-dialog - title="鎵归噺鐢熸垚鏄庣粏淇℃伅" - :visible.sync="batchdialogVisible" - width="30%" - > + <el-dialog title="鎵归噺鐢熸垚鏄庣粏淇℃伅" :visible.sync="batchdialogVisible" width="30%"> <div style="max-height: 300px; overflow-y: auto"> - <el-checkbox - :indeterminate="isIndeterminate" - v-model="checkAll" - @change="handleCheckAllChange" - >鍏ㄩ��</el-checkbox - > + <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">鍏ㄩ��</el-checkbox> <div style="margin: 15px 0;"></div> - <el-checkbox-group - v-model="checkedCities" - @change="handleCheckedCitiesChange" - > - <el-checkbox - border - v-for="city in cityOptions" - :label="city" - :key="city.reportNo" - >{{ city.reportName }}</el-checkbox - > + <el-checkbox-group v-model="checkedCities" @change="handleCheckedCitiesChange"> + <el-checkbox border v-for="city in cityOptions" :label="city" :key="city.reportNo">{{ city.reportName + }}</el-checkbox> </el-checkbox-group> </div> @@ -1367,7 +730,8 @@ delExternalperson, addExternalperson, updateExternalperson, - exportExternalperson + exportExternalperson, + getOnlyCode, } from "@/api/project/externalperson"; import { listItemexpense } from "@/api/project/itemexpense"; @@ -1504,36 +868,26 @@ selectionScope: "", //閫夋嫨绫诲瀷锛氫笓瀹讹紙鍗曚綅锛夎处鎴枫�佸伐浣滃崟浣嶏紙account/workunit锛� selectionType: "", - //鍙楃泭浜烘爣绛撅細涓撳璐�-涓撳锛堝崟浣嶏級鍚嶇О锛屽尰瀛︽垚鏈�-鍔炲叕-鍗曚綅锛堜釜浜猴級鍚嶇О - beneficiarylabel: "", //璐︽埛閫夋嫨锛�1鏄处鎴峰簱锛�2鏄柊澧� accountfrom: "1", + //鍙楃泭浜烘爣绛撅細涓撳璐�-涓撳锛堝崟浣嶏級鍚嶇О锛屽尰瀛︽垚鏈�-鍔炲叕-鍗曚綅锛堜釜浜猴級鍚嶇О + beneficiarylabel: "", //绋庡墠閲戦鏍囬锛氫笓瀹惰垂-绋庡墠閲戦锛涘尰瀛︽垚鏈�佸姙鍏垂鐢�-閲戦 - amountLabel: "绋庡墠閲戦", + amountlabel: "绋庡墠閲戦", // 琛ㄥ崟鏍¢獙 rules: { - // createTime: [ - // { required: true, message: "璇疯緭鍏ュ~鎶ユ棩鏈�", trigger: "blur" } - // ], - reason: [ - { required: true, message: "璇疯緭鍏ュ嚭宸簨鐢�", trigger: "blur" } - ], - deptmentname: [ - { required: true, message: "璇疯緭鍏ユ墍灞炰笟鍔$粍", trigger: "blur" } - ] + reason: [{ required: true, message: "璇疯緭鍏ュ嚭宸簨鐢�", trigger: "blur" }], + deptmentname: [{ required: true, message: "璇疯緭鍏ユ墍灞炰笟鍔$粍", trigger: "blur" }] }, + dialogrules: { - // expertidcardno: [{ validator: validatePass, trigger: "blur" }], - depositbank: [ - { required: true, message: "璇疯緭鍏ュ紑鎴烽摱琛�", trigger: "change" } - ], - bankcardno: [ - { required: true, message: "璇疯緭鍏ラ摱琛屽崱鍙�", trigger: "change" } - ], - unitno: [ - { required: true, message: "璇烽�夋嫨鍗曚綅鍚嶇О", trigger: "change" } - ] + usertype: [{ required: true, message: "璇疯緭鍏ヨ处鎴风被鍨�", trigger: "blur" }], + username: [{ required: true, message: "璇疯緭鍏ヨ处鎴峰悕绉�", trigger: "blur" }], + idcardno: [{ required: true, message: "璇疯緭鍏ヨ韩浠借处鍙�", trigger: "blur" }], + //idcardno: [{ validator: validatePass, trigger: "blur" }], + depositbank: [{ required: true, message: "璇疯緭鍏ュ紑鎴烽摱琛�", trigger: "change" }], + bankcardno: [{ required: true, message: "璇疯緭鍏ラ摱琛屽崱鍙�", trigger: "change" }], }, accountselectform: { @@ -1551,13 +905,15 @@ unitno: null, personnelunitno: null, address: null, - telephone: null + telephone: null, + username: null, + userno: null }, accountform: { searchValue: null, id: null, - userstatus: 1, + userstatus: 0, usertype: null, pym: null, @@ -1623,6 +979,11 @@ username: null, usertype: null }, + // 鏌ヨ鏈�鏂板簭鍙峰弬鏁� + seqnoParams: { + businessType: "externalperson", + datequery: false, + }, //璁$畻涓◣鍙傛暟 taxParam: { @@ -1676,13 +1037,13 @@ watch: {}, //鏂规硶闆嗗悎 methods: { - bbaaccss(val) {}, + bbaaccss(val) { }, // 娴忚鍣ㄩ〉闈㈠叧闂垨鍒锋柊鎻愮ず beforeunloadHandler(e) { if ( (JSON.stringify(this.form) == sessionStorage.getItem("apiform") && JSON.stringify(this.rbDetails) == - sessionStorage.getItem("apifunddetail")) || + sessionStorage.getItem("apifunddetail")) || !sessionStorage.getItem("apifunddetail") ) { } else { @@ -1768,22 +1129,22 @@ // if (!this.businessType && !this.operationType) { if (this.businessType == "1") { this.businessName = "涓撳鍔冲姟璐圭敵璇峰崟"; - this.amountLabel = "绋庡墠閲戦"; + this.amountlabel = "绋庡墠閲戦"; this.beneficiarylabel = "涓撳鎴栧崟浣嶅悕绉�"; this.getUnitList(); } else if (this.businessType == "2") { this.businessName = "浼︾悊涓撳鍔冲姟璐圭敵璇峰崟"; - this.amountLabel = "绋庡墠閲戦"; + this.amountlabel = "绋庡墠閲戦"; this.beneficiarylabel = "涓撳鎴栧崟浣嶅悕绉�"; this.getUnitList(); } else if (this.businessType == "3") { this.businessName = "鍖诲鎴愭湰鎶ラ攢鍗�"; - this.amountLabel = "閲戦"; + this.amountlabel = "閲戦"; this.beneficiarylabel = "鍗曚綅鍚嶇О鎴栦釜浜�"; this.getUnitList(); } else if (this.businessType == "4") { this.businessName = "鍔炲叕璐圭敤鎶ラ攢鍗�"; - this.amountLabel = "閲戦"; + this.amountlabel = "閲戦"; this.beneficiarylabel = "鍗曚綅鍚嶇О鎴栦釜浜�"; this.getUnitList(); @@ -1842,11 +1203,8 @@ this.reset(); getFund(this.curId).then(response => { - console.log(response.data, "鍒濆"); - this.form = response.data; sessionStorage.removeItem("apiform"); - sessionStorage.setItem("apiform", JSON.stringify(this.form)); // this.form.recordstate =-1; @@ -1894,8 +1252,6 @@ this.reset(); getFund(this.curId).then(response => { - console.log(response.data, "鍒濆"); - this.form = response.data; sessionStorage.removeItem("apiform"); sessionStorage.setItem("apiform", JSON.stringify(this.form)); @@ -1905,7 +1261,7 @@ //涓氬姟鏄庣粏 getownFundDetail(this.curId).then(res => { this.rbDetails = res.data; - console.log("this.feeBlocks", this.feeBlocks); + for (let m = 0; m < this.rbDetails.length; m++) { this.rbDetails[m].itemlist = []; this.getRowFeeItems(m, this.rbDetails[m]); @@ -1913,10 +1269,6 @@ //鑾峰彇璐圭敤椤圭洰鐨勮缁嗕俊鎭� this.rbDetails[m].rowfeeblocks = this.feeBlocks.filter( r => r.itemid == this.rbDetails[m].itemid - ); - console.log( - "this.rbDetails[m].rowfeeblocks", - this.rbDetails[m].rowfeeblocks ); } @@ -1942,10 +1294,8 @@ this.reset(); getFund(this.curId).then(response => { - console.log(response.data, "鍒濆"); this.form = response.data; sessionStorage.removeItem("apiform"); - sessionStorage.setItem("apiform", JSON.stringify(this.form)); //闄勪欢澶勭悊 @@ -1984,7 +1334,7 @@ handleDelete() { this.$modal .confirm("鏄惁纭鍒犻櫎璇ヨ褰曪紵") - .then(function() { + .then(function () { return delFund(this.curId); }) .then(() => { @@ -1997,7 +1347,7 @@ this.getfundList(); this.$modal.msgSuccess("鍒犻櫎鎴愬姛"); }) - .catch(() => {}); + .catch(() => { }); }, /** 涓婃姤鎸夐挳鎿嶄綔 */ @@ -2005,7 +1355,7 @@ if ( (JSON.stringify(this.form) == sessionStorage.getItem("apiform") && JSON.stringify(this.rbDetails) == - sessionStorage.getItem("apifunddetail")) || + sessionStorage.getItem("apifunddetail")) || !sessionStorage.getItem("apifunddetail") ) { } else { @@ -2022,7 +1372,7 @@ //鍒ゆ柇鏄惁瀛樺湪涓婃姤璁板綍 this.form.recordstatus = 0; var currenttime = new Date(); - this.form.createTime = + this.form.applyTime = currenttime.getFullYear() + "-" + (currenttime.getMonth() + 1) + @@ -2074,7 +1424,7 @@ return randomString; }, /** 鎻愪氦鎸夐挳 */ - submitForm: debounce(function() { + submitForm: debounce(function () { if (!this.randomnumber) { this.randomnumber = this.generateRandomString(9); this.form.randomnumber = this.randomnumber; @@ -2090,34 +1440,18 @@ if (tempDetail.itemid == null) { this.$modal.msgWarning( "鏈嶅姟椤圭洰琛ㄤ腑锛岀" + - (k + 1).toString() + - "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�" + (k + 1).toString() + + "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�" ); return; } - - /* - if ( - tempDetail.idcardno == null && - this.businessType != "3" && - this.businessType != "4" - ) { - console.log(1122); - this.$modal.msgWarning( - "鏈嶅姟椤圭洰琛ㄤ腑锛岀" + - (k + 1).toString() + - "琛岀殑韬唤璇佹湭瀹屽杽锛岃鍏堝~鍐欒韩浠借瘉鍚庡啀鎻愪氦淇濆瓨锛�" - ); - return; - } - */ if (this.businessType == "1") { if (tempDetail.servicesscope == null) { this.$modal.msgWarning( "鏈嶅姟椤圭洰琛ㄤ腑锛岀" + - (k + 1).toString() + - "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�" + (k + 1).toString() + + "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�" ); return; } @@ -2125,8 +1459,8 @@ if (tempDetail.beneficiaryno == null) { this.$modal.msgWarning( "鏈嶅姟椤圭洰琛ㄤ腑锛岀" + - (k + 1).toString() + - "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�" + (k + 1).toString() + + "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�" ); return; } @@ -2173,8 +1507,8 @@ ) { this.$modal.msgWarning( "鏈嶅姟椤圭洰琛ㄤ腑锛岀" + - (j + 1).toString() + - "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�" + (j + 1).toString() + + "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�" ); return; } @@ -2188,8 +1522,8 @@ ) { this.$modal.msgWarning( "鏈嶅姟椤圭洰琛ㄤ腑锛岀" + - (j + 1).toString() + - "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�" + (j + 1).toString() + + "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�" ); return; } @@ -2237,6 +1571,8 @@ // }); } else { this.form.recordstatus = -1; + var currenttime = new Date(); + this.form.applyTime = currenttime.getFullYear() + "-" + (currenttime.getMonth() + 1) + "-" + currenttime.getDate() + " " + currenttime.getHours() + ":" + currenttime.getMinutes() + ":" + currenttime.getSeconds(); // addorupdateFund(this.form).then((response) => { // if (response.code === 200) { @@ -2254,8 +1590,6 @@ sessionStorage.setItem("apiform", JSON.stringify(this.form)); addorupdateFund(this.form) .then(response => { - console.log(this.form); - console.log(response, "淇濆瓨杩斿弬"); if (response.code === 200) { if (this.form.id) { this.$modal.msgSuccess("鐢宠鍗曚慨鏀规垚鍔燂紒"); @@ -2290,40 +1624,32 @@ }); }, 500), - //瀹℃壒鎻愪氦 - // checksubmit() { - // console.log(this.checkObj.flowlevelone); - // if ( - // this.form.checkstatus != 3 && - // this.userprofile.nickName == "闄堟厱鍗�" && - // this.checkObj.flowlevelone == 1 - // ) { - // this.$modal.msgError("璇烽�夌‘璁ゆ潗鏂欑姸鎬佸凡鏀跺埌锛�"); - // return; - // } - // this.Savenow(); - // console.log("淇濆瓨骞跺鎵�"); - // }, checksubmit() { - console.log(this.checkObj.flowlevelone); - if (this.userprofile.nickName == "闄堟厱鍗�") { - //妫�鏌ユ槸鍚︽敹鍒扮焊璐ㄦ潗鏂� - if (this.form.checkstatus != 3 && this.checkObj.flowlevelone == 1) { - this.$modal.msgError("璇风‘璁ゆ姤閿�鐨勭焊璐ㄦ潗鏂欏凡缁忔敹鍒帮紒"); + //妫�鏌ユ槸鍚︽敹鍒扮焊璐ㄦ潗鏂� + if (this.checkObj.flowlevelone == 2) { + if (!this.checkObj.flowconclusion) { + this.$modal.msgError("璇疯緭鍏ュ鏍镐笉閫氳繃鐨勮鏄庝俊鎭紝鏂逛究缁忓姙浜轰慨鏀圭敵璇峰崟锛�"); return; } + } + else if (this.checkObj.flowlevelone == 1) { + if (this.userprofile.nickName == "闄堟厱鍗�") { + //妫�鏌ユ槸鍚︽敹鍒扮焊璐ㄦ潗鏂� + if (this.form.checkstatus != 3 && this.checkObj.flowlevelone == 1) { + this.$modal.msgError("璇峰厛纭鎶ラ攢鐨勭焊璐ㄦ潗鏂欐槸鍚﹀凡缁忔敹鍒帮紒"); + return; + } - //妫�鏌ヤ釜绋庤绠� - // if ( (this.form.applytype == "1" || this.form.applytype == "2") && this.form.fundtaxtime == null ) { - // this.$modal.msgError( - // "鎻愪氦涓撳璐圭敤鐢宠鍗曘�佷鸡鐞嗕笓瀹剁敵璇疯垂鐢ㄧ敵璇峰崟瀹℃牳锛岄渶瑕佸厛瀹屾垚涓◣璁$畻锛�" - // ); - // return; - // } - if (this.form.applytype == "1" && this.form.fundtaxtime == null) { - this.$modal.msgError("鎻愪氦涓撳璐圭敤鐢宠鍗曞鏍革紝闇�瑕佸厛瀹屾垚涓◣璁$畻锛�"); - return; + //妫�鏌ヤ釜绋庤绠� + if (this.form.applytype == "1" && this.form.fundtaxtime == null) { + this.$modal.msgError("鎻愪氦涓撳璐圭敤鐢宠鍗曞鏍革紝闇�瑕佸厛瀹屾垚涓◣璁$畻锛�"); + return; + } } + } + else { + this.$modal.msgError("璇峰厛閫夋嫨瀹℃壒缁撴灉鍐嶆彁浜わ紒"); + return; } this.Savenow(); @@ -2340,7 +1666,6 @@ getUserProfile() { getUserProfile().then(res => { this.userprofile = res.data; - console.log(this.userprofile); this.standardlevel = res.data.standardlevel; if ( this.userprofile.userName == "admin" || @@ -2359,8 +1684,7 @@ this.form.deptmentno = this.userprofile.dept.deptId; this.form.managername = this.userprofile.dept.leader; this.form.phone = this.userprofile.phonenumber; - // this.form.applytype = this.businessType; - // this.form.createTime = new Date(); + // this.form.applytype = this.businessType; if (this.businessType == "4") { this.getUserAccount(); @@ -2380,28 +1704,23 @@ getAccountList() { listExternalperson().then(res => { this.accountlist = res.rows; - /** - for (let j = 0; j < this.accountlist.length; j++) { + //鑾峰彇鍚敤鐨勮处鎴峰垪琛� + for (let j = 0; j < res.length; j++) { //鍗曚綅璐﹀彿鍒楄〃 - if (this.accountlist[j].usertype == "org") { - this.feeAccountList.push({ - id: this.accountlist[j].id, - reportNo: this.accountlist[j].userno, - reportName: this.accountlist[j].username, - depositbank: this.accountlist[j].depositbank, - branchbankname: this.accountlist[j].branchbankname, - bankcardno: this.accountlist[j].bankcardno - }); - } - //涓撳璐﹀彿鍒楄〃 - else if (res.rows[j].usertype == "expert") { - this.expertAccountList.push({ - expertNo: this.accountlist[j].id, - exportName: this.accountlist[j].username+"("+this.accountlist[j].id+")" + if (res.userstatus == "1") { + this.accountlist.push({ + id: res.id, + userno: res.userno, + username: res.username, + idcardno: res.idcardno, + title: res.title, + depositbank: res.depositbank, + bankcardno: res.bankcardno, + unitno: res.unitno, + unitname: res.unitname }); } } - */ }); }, @@ -2409,7 +1728,7 @@ getUserAccount() { this.accountlist.map(res => { if (res.username == this.form.username) { - this.form.bankname = res.depositbank; //res.branchbankname銆乺es.depositbank; + this.form.bankname = res.depositbank; this.form.bankcardno = res.bankcardno; this.form.phone = res.telephone; } @@ -2421,7 +1740,6 @@ listOrganization(3).then(response => { for (let i = 0; i < response.rows.length; i++) { this.unitList.push({ - //organizationid: response.rows[i].organizationid, organizationid: response.rows[i].id, organizationname: response.rows[i].organizationname }); @@ -2480,7 +1798,6 @@ //鑾峰彇鏈嶅姟椤圭洰 getRowFeeItems(rowindex, row) { let list = this.feeItemTypes.filter(r => r.itemType == row.applytype); - console.log(list[0]); row.itemlist = list[0].itemDetails; this.$set(this.rbDetails, rowindex, row); }, @@ -2502,22 +1819,11 @@ row.amount = 0.0; row.taxamount = 0.0; row.taxedamount = item.expense; - - //璁$畻绋庡墠閲戦 - // this.calculateTax(row, "B"); } else { row.amount = item.expense; row.taxamount = 0.0; row.taxedamount = 0.0; - - //璁$畻绋庡悗閲戦 - // this.calculateTax(row, "A"); } - - // this.form.serviceFunddetails = 0; - // this.rbDetails.map(item => { - // this.form.serviceFunddetails += item.amount; - // }); } }); }, @@ -2609,7 +1915,6 @@ } targetValue += parseFloat(this.rbDetails[i].amount); // 鍋囪姣忎釜瀵硅薄涓殑鐗瑰畾鍊煎瓨鍌ㄥ湪'specificValue'灞炴�т笅 } - console.log(targetValue, "鍚堣"); this.form.pretaxcost = targetValue; }, @@ -2701,8 +2006,8 @@ if (tempDetail.itemid == null) { this.$modal.msgWarning( "鏈嶅姟椤圭洰琛ㄤ腑锛岀" + - (k + 1).toString() + - "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�" + (k + 1).toString() + + "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�" ); return; } @@ -2711,8 +2016,8 @@ if (tempDetail.servicesscope == null) { this.$modal.msgWarning( "鏈嶅姟椤圭洰琛ㄤ腑锛岀" + - (k + 1).toString() + - "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�" + (k + 1).toString() + + "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�" ); return; } @@ -2720,8 +2025,8 @@ if (tempDetail.beneficiaryno == null) { this.$modal.msgWarning( "鏈嶅姟椤圭洰琛ㄤ腑锛岀" + - (k + 1).toString() + - "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�" + (k + 1).toString() + + "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�" ); return; } @@ -2768,8 +2073,8 @@ ) { this.$modal.msgWarning( "鏈嶅姟椤圭洰琛ㄤ腑锛岀" + - (j + 1).toString() + - "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�" + (j + 1).toString() + + "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�" ); return; } @@ -2783,8 +2088,8 @@ ) { this.$modal.msgWarning( "鏈嶅姟椤圭洰琛ㄤ腑锛岀" + - (j + 1).toString() + - "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�" + (j + 1).toString() + + "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�" ); return; } @@ -2861,7 +2166,6 @@ // 鎵嬪姩璁$畻 Manualcalculationfn() { ManualCalculation(this.rbDetails).then(res => { - console.log(res); if (res.code == 200) { sessionStorage.removeItem("apiform"); sessionStorage.removeItem("apifunddetail"); @@ -3004,10 +2308,6 @@ rowfeeblocks: [], annexfiles: null }; - // if (this.Reminderquantity >= 5) { - // this.Savereminder = true; - // return; - // } if (rowIndex == undefined || rowIndex == null || rowIndex < 0) { this.rbDetails.push(rowData); } else { @@ -3159,7 +2459,7 @@ }, //鏂囦欢涓婁紶 - handleUploadError() {}, + handleUploadError() { }, remove(file, fileList) { const rbDetails = [...this.rbDetails]; if (this.activeName == 1) { @@ -3174,8 +2474,6 @@ uploadSccess(response, file, fileList) { this.rbDetails; //鑾峰彇绁ㄦ嵁淇℃伅浣嶇疆 - console.log(response); - console.log(file); if (this.activeName == 1) { if (response.code == 200) { // this.form.filename = file.raw.name; @@ -3188,7 +2486,6 @@ this.pdfimgsrcList.push( this.Networkheader + "/prod-api" + response.fileName ); - console.log(this.pdfimgsrcList); this.pdftitle = "鍏�" + this.pdfimgsrcList.length + "椤�"; this.pdfimg = this.Networkheader + "/prod-api" + response.fileName; this.rbDetails[this.atpresent].annexfilesList = this.fileListto; @@ -3197,7 +2494,6 @@ } } else { if (response.code == 200) { - // this.form.filename = file.raw.name; this.previewpdf = true; this.$modal.msgSuccess(response.msg); this.invoicefileListto.push({ @@ -3207,15 +2503,12 @@ this.invoicepdfimgsrcList.push( this.Networkheader + "/prod-api" + response.fileName ); - console.log(this.invoicepdfimgsrcList); this.pdftitle = "鍏�" + this.invoicepdfimgsrcList.length + "椤�"; this.pdfimg = this.Networkheader + "/prod-api" + response.fileName; this.rbDetails[ this.atpresent ].invoicefilesList = this.invoicefileListto; - console.log(this.rbDetails[this.atpresent]); } else { - console.log(response.msg); } } }, @@ -3230,11 +2523,9 @@ this.tableDatatop.push(row); this.atpresent = index; this.pdfVisible = true; - console.log(this.rbDetails[index]); if (this.rbDetails[index].annexfilesList) { this.previewpdf = true; this.fileListto = this.rbDetails[index].annexfilesList; - console.log(this.fileListto); this.pdfimg = this.Networkheader + "/prod-api" + this.fileListto[0].url; this.fileListto.forEach(item => { this.pdfimgsrcList.push(this.Networkheader + "/prod-api" + item.url); @@ -3248,7 +2539,6 @@ if (this.rbDetails[index].invoicefilesList) { this.previewpdf = true; this.invoicefileListto = this.rbDetails[index].invoicefilesList; - console.log(this.invoicefileListto); this.invoicepdfimg = this.Networkheader + "/prod-api" + this.invoicefileListto[0].url; this.invoicefileListto.forEach(item => { @@ -3256,8 +2546,6 @@ this.Networkheader + "/prod-api" + item.url ); }); - console.log(this.invoicepdfimgsrcList); - console.log(this.invoicepdfimg); } else { this.invoicefileListto = []; this.invoicepdfimg = ""; @@ -3274,7 +2562,6 @@ // 鐐瑰嚮宸蹭笂浼犳枃浠� downFile(item) { if (this.activeName == 1) { - console.log(item, "鐐瑰嚮鏂囦欢鎷縤tem"); this.pdftitle = "鍏�" + this.pdfimgsrcList.length + "椤癸紝褰撳墠閫変腑" + item.name; let name = item.name.split("."); @@ -3295,7 +2582,6 @@ this.previewpdf = false; } } else { - console.log(item, "鐐瑰嚮鏂囦欢鎷縤tem"); this.pdftitle = "鍏�" + this.invoicepdfimgsrcList.length + "椤癸紝褰撳墠閫変腑" + item.name; let name = item.name.split("."); @@ -3307,8 +2593,6 @@ this.previewpdf = true; if (item.url) { this.invoicepdfimg = this.Networkheader + "/prod-api" + item.url; - console.log(this.invoicepdfimg, "pdfimg"); - console.log(this.invoicepdfimgsrcList, "imglist"); } else { this.invoicepdfimg = this.Networkheader + "/prod-api" + item.response.url; @@ -3364,9 +2648,9 @@ } }, Downloadfile(row) { - console.log(row); window.location.href = this.Networkheader + "/prod-api" + row.url; }, + //涓撳/鍖荤枟鏈烘瀯/璐圭敤鎶ラ攢鏈烘瀯閫夋嫨 showSelectionDialog(scope, selectiontype) { this.selectionScope = scope; @@ -3376,15 +2660,15 @@ if (this.selectionType == "account") { //榛樿浠庤处鎴峰簱閫夋嫨锛�1,璐︽埛搴擄紱2锛屾柊寤鸿处鎴� this.accountfrom = "1"; - - this.accountselectform.accountno = scope.row.beneficiaryno; this.accountselectform.accountname = scope.row.beneficiaryname; + this.accountselectform.accountno = scope.row.beneficiaryno; this.accountselectform.expertunitname = ""; this.accountselectform.expertunitno = ""; - this.accountselectform.unitno = ""; - this.accountselectform.unitname = ""; - this.accountselectform.telephone = ""; + + this.accountselectform.username = ''; + this.accountselectform.userno = ''; this.accountselectform.idcardno = ""; + this.accountselectform.telephone = ""; this.accountselectform.title = ""; this.accountselectform.unitno = ""; this.accountselectform.unitname = ""; @@ -3397,7 +2681,6 @@ this.accountselectform.expertunitname = scope.row.unitname; this.accountselectform.expertunitno = scope.row.unitno; } - this.showselectiondialog = true; }, @@ -3408,126 +2691,124 @@ if (this.selectionType == "account") { if (this.accountfrom == "1") { //璧嬪�间俊鎭� - this.accountlist.map(res => { - if (res.username == this.accountselectform.accountname) { - console.log(res); - this.rbDetails[tempIndex].beneficiaryno = res.userno; - this.rbDetails[tempIndex].beneficiaryname = res.username; - this.rbDetails[tempIndex].depositbank = res.depositbank; - this.rbDetails[tempIndex].branchbankname = res.branchbankname; - this.rbDetails[tempIndex].bankcardno = res.bankcardno; - this.rbDetails[tempIndex].phone = res.telephone; + if (this.rbDetails[tempIndex].beneficiaryname != this.accountselectform.accountname) { + this.accountlist.map(res => { + if (res.username == this.accountselectform.accountname) { + this.rbDetails[tempIndex].beneficiaryno = res.userno; + this.rbDetails[tempIndex].beneficiaryname = res.username; + this.rbDetails[tempIndex].depositbank = res.depositbank; + this.rbDetails[tempIndex].branchbankname = res.branchbankname; + this.rbDetails[tempIndex].bankcardno = res.bankcardno; + this.rbDetails[tempIndex].phone = res.telephone; - if (res.usertype == "org") { - this.rbDetails[tempIndex].idcardno = ""; - this.rbDetails[tempIndex].title = ""; - this.rbDetails[tempIndex].unitno = ""; - this.rbDetails[tempIndex].unitname = ""; - } else { - this.rbDetails[tempIndex].idcardno = res.idcardno; - this.rbDetails[tempIndex].title = res.title; - this.rbDetails[tempIndex].unitno = parseInt(res.unitno); - this.rbDetails[tempIndex].unitname = res.unitname; - } - } - }); - } else if (this.accountfrom == "2") { - //淇濆瓨鏂板璐﹀彿 - this.accountform.id = null; - this.accountform.userno = - this.accountlist[this.accountlist.length - 1].id + 1; - this.accountform.usertype = this.accountselectform.usertype; - this.accountform.username = this.accountselectform.username; - this.accountform.idcardno = this.accountselectform.idcardno; - this.accountform.sex = null; - this.accountform.title = this.accountselectform.title; - this.accountform.telephone = this.accountselectform.telephone; - this.accountform.address = this.accountselectform.address; - this.accountform.wbm = null; - this.accountform.pym = null; - - this.accountform.depositbank = this.accountselectform.depositbank; - this.accountform.bankcardno = this.accountselectform.bankcardno; - this.accountform.branchbankname = null; - this.accountform.remark = null; - this.accountform.del_flag = "0"; - this.accountform.personnelunitno = null; - - if (this.accountselectform.usertype != "org") { - this.accountform.unitno = this.accountselectform.unitno; - this.unitList.map(res => { - if (res.organizationid == this.accountform.unitno) { - this.accountform.unitname = res.organizationname; + if (res.usertype == "org") { + this.rbDetails[tempIndex].idcardno = ""; + this.rbDetails[tempIndex].title = ""; + this.rbDetails[tempIndex].unitno = ""; + this.rbDetails[tempIndex].unitname = ""; + } else { + this.rbDetails[tempIndex].idcardno = res.idcardno; + this.rbDetails[tempIndex].title = res.title; + this.rbDetails[tempIndex].unitno = parseInt(res.unitno); + this.rbDetails[tempIndex].unitname = res.unitname; + } } }); - // try { - // let unitIndex = this.unitList.findIndex( - // item => this.accountform.unitno == item.organizationid - // ); - // if (unitIndex > -1) { - // this.accountform.unitname = this.unitList[unitIndex].organizationname; - // } else { - // this.accountform.unitname = this.accountform.unitno; - // } - // } catch { - // this.accountform.unitname = this.accountform.unitno; - // } } - addExternalperson(this.accountform).then(response => { - if (response.code == 200) { - //this.$modal.msgSuccess("鏂扮殑涓撳鎴栧崟浣嶈处鎴蜂俊鎭凡娣诲姞鎴愬姛锛�"); - this.accountselectform.accountno = this.accountselectform.userno; - this.accountselectform.accountname = this.accountselectform.username; + } else if (this.accountfrom == "2") { + //淇濆瓨鏂板璐﹀彿 + //鑾峰彇鐢ㄦ埛缂栧彿 + getOnlyCode(this.seqnoParams).then((res) => { + this.accountform.userno = res.data.currentvalue; + this.accountform.id = null; - //閲嶆柊鑾峰彇璐︽埛鍒楄〃 - listExternalperson().then(res => { - this.accountlist = res.rows; + this.accountform.usertype = this.accountselectform.usertype; + this.accountform.username = this.accountselectform.username; + this.accountform.idcardno = this.accountselectform.idcardno; + this.accountform.sex = null; + this.accountform.title = this.accountselectform.title; + this.accountform.telephone = this.accountselectform.telephone; + this.accountform.address = this.accountselectform.address; + this.accountform.wbm = null; + this.accountform.pym = null; - //璧嬪�间俊鎭� - this.accountlist.map(res => { - if (res.username == this.accountselectform.accountname) { - this.rbDetails[tempIndex].beneficiaryno = res.userno; - this.rbDetails[tempIndex].beneficiaryname = res.username; - this.rbDetails[tempIndex].depositbank = res.depositbank; - this.rbDetails[tempIndex].branchbankname = - res.branchbankname; - this.rbDetails[tempIndex].bankcardno = res.bankcardno; - this.rbDetails[tempIndex].phone = res.telephone; + this.accountform.depositbank = this.accountselectform.depositbank; + this.accountform.bankcardno = this.accountselectform.bankcardno; + this.accountform.branchbankname = null; + this.accountform.remark = null; + this.accountform.del_flag = "0"; + this.accountform.personnelunitno = null; - if (res.usertype == "org") { - this.rbDetails[tempIndex].idcardno = ""; - this.rbDetails[tempIndex].title = ""; - this.rbDetails[tempIndex].unitno = ""; - this.rbDetails[tempIndex].unitname = ""; - } else { - this.rbDetails[tempIndex].idcardno = res.idcardno; - this.rbDetails[tempIndex].title = res.title; - this.rbDetails[tempIndex].unitno = parseInt(res.unitno); - this.rbDetails[tempIndex].unitname = res.unitname; - } - } - }); + if (this.accountselectform.usertype == "expert") { + this.accountform.unitno = this.accountselectform.unitno; + this.unitList.map(res => { + if (res.organizationid == this.accountform.unitno) { + this.accountform.unitname = res.organizationname; + } }); } + + addExternalperson(this.accountform).then(response => { + if (response.code == 200) { + if (this.accountselectform.usertype == "expert") { + this.$modal.msgSuccess("鏂拌处鎴蜂俊鎭凡娣诲姞鎴愬姛,闇�瑕佸湪璐﹀彿鐘舵�佸惎鐢ㄥ悗鎵嶈兘琚娇鐢紒"); + return; + } else { + this.$modal.msgSuccess("鏂拌处鎴蜂俊鎭凡娣诲姞鎴愬姛锛�"); + } + + this.accountselectform.accountno = this.accountselectform.userno; + this.accountselectform.accountname = this.accountselectform.username; + + //閲嶆柊鑾峰彇璐︽埛鍒楄〃 + listExternalperson().then(res => { + this.accountlist = res.rows; + + //璧嬪�间俊鎭� + this.accountlist.map(res => { + if (res.username == this.accountselectform.accountname) { + this.rbDetails[tempIndex].beneficiaryno = res.userno; + this.rbDetails[tempIndex].beneficiaryname = res.username; + this.rbDetails[tempIndex].depositbank = res.depositbank; + this.rbDetails[tempIndex].branchbankname = res.branchbankname; + this.rbDetails[tempIndex].bankcardno = res.bankcardno; + this.rbDetails[tempIndex].phone = res.telephone; + + if (res.usertype == "org") { + this.rbDetails[tempIndex].idcardno = ""; + this.rbDetails[tempIndex].title = ""; + this.rbDetails[tempIndex].unitno = ""; + this.rbDetails[tempIndex].unitname = ""; + } else { + this.rbDetails[tempIndex].idcardno = res.idcardno; + this.rbDetails[tempIndex].title = res.title; + this.rbDetails[tempIndex].unitno = parseInt(res.unitno); + this.rbDetails[tempIndex].unitname = res.unitname; + } + } + }); + }); + + } + }); }); } } else if (this.selectionType == "workunit") { - console.log(tempIndex); - - this.rbDetails[ - tempIndex - ].unitno = this.accountselectform.expertunitno; - this.unitList.map(res => { - if (res.organizationid == this.accountform.unitno) { - this.rbDetails[tempIndex].unitno.unitname = res.organizationname; - } - }); + if (this.rbDetails[tempIndex].unitname != this.accountselectform.expertunitname) { + this.rbDetails[tempIndex].unitname = this.accountselectform.expertunitname; + this.unitList.map(res => { + if (res.organizationname == this.accountselectform.expertunitname) { + this.rbDetails[tempIndex].unitno = res.organizationid; + } + }); + } } //鍏抽棴绐楀彛 this.showselectiondialog = false; }); }, + tableParValueChange(row, tto) { const regex = /^[1-9]\d{5}(19|20)\d{2}(0[1-9]|1[012])(0[1-9]|[12]\d|3[01])\d{3}([0-9]|X)$/; if (tto) { @@ -3538,12 +2819,23 @@ } return; } - console.log(11); + if (regex.test(row.idcardno)) { row.error = ""; } else { row.error = "韬唤璇佸彿鐮佹牸寮忛敊璇�"; } + }, + + //璐︽埛绫诲瀷閫夋嫨鍙樺寲 + userTypeChange(type) { + if (type == "org") { + this.accountselectform.idcardno = ""; + this.accountselectform.unitno = ""; + this.accountselectform.unitname = ""; + this.accountselectform.personnelunitno = ""; + }; + // this.$modal.msgWarning(type); } }, @@ -3568,15 +2860,15 @@ this.$destroy(); next(); }, - beforeCreate() {}, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠 - beforeMount() {}, //鐢熷懡鍛ㄦ湡 - 鎸傝浇涔嬪墠 - beforeUpdate() {}, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪墠 - updated() {}, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗 - beforeDestroy() {}, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓� + beforeCreate() { }, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠 + beforeMount() { }, //鐢熷懡鍛ㄦ湡 - 鎸傝浇涔嬪墠 + beforeUpdate() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪墠 + updated() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗 + beforeDestroy() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓� destroyed() { window.removeEventListener("beforeunload", e => this.beforeunloadFn(e)); }, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴� - activated() {} //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂 + activated() { } //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂 }; </script> @@ -3659,7 +2951,7 @@ line-height: 25px; } -::v-deep .el-checkbox.is-bordered + .el-checkbox.is-bordered { +::v-deep .el-checkbox.is-bordered+.el-checkbox.is-bordered { margin-left: 0 !important; margin-bottom: 10px; } -- Gitblit v1.9.3