From e95f985e2dc8178d777074dd43b4dea5658eecdf Mon Sep 17 00:00:00 2001 From: yxh <172933527@qq.com> Date: 星期日, 17 十二月 2023 13:06:46 +0800 Subject: [PATCH] yxh:报销专家账号维护 --- src/views/project/fund/applyDetail/index.vue | 1843 +++++++++++++++++----------------------------------------- 1 files changed, 550 insertions(+), 1,293 deletions(-) diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue index 6f6f751..bc1e350 100644 --- a/src/views/project/fund/applyDetail/index.vue +++ b/src/views/project/fund/applyDetail/index.vue @@ -7,54 +7,28 @@ <el-row> <el-col :span="5"> <el-form-item label="鐢宠鏃ユ湡" prop="createTime"> - <el-date-picker - clearable - :disabled="true" - style="width: 100%" - v-model="form.createTime" - type="date" - value-format="yyyy-MM-dd HH:mm:ss" - placeholder="鏃� 鏈�" - > + <el-date-picker clearable :disabled="true" style="width: 100%" v-model="form.createTime" type="date" + value-format="yyyy-MM-dd HH:mm:ss" placeholder="鏃� 鏈�"> </el-date-picker> </el-form-item> </el-col> <el-col :span="5"> <el-form-item label="缁忓姙浜�" prop="username"> - <el-select - v-model="form.username" - placeholder="鐢宠浜�" - clearable - filterable - allow-create - style="width: 100%" - @change="getUserAccount" - > - <el-option - v-for="dict in userlist" - :key="dict.index" - :label="dict.nickname" - :value="dict.nickname" - ></el-option> + <el-select v-model="form.username" placeholder="鐢宠浜�" clearable filterable allow-create style="width: 100%" + @change="getUserAccount"> + <el-option v-for="dict in userlist" :key="dict.index" :label="dict.nickname" + :value="dict.nickname"></el-option> </el-select> </el-form-item> </el-col> <el-col :span="5"> <el-form-item label="鎵�灞炵粍鍒�" prop="deptmentname"> - <el-input - v-model="form.deptmentname" - placeholder="璇疯緭鍏ユ墍灞炵粍鍒�" - clearable - /> + <el-input v-model="form.deptmentname" placeholder="璇疯緭鍏ユ墍灞炵粍鍒�" clearable /> </el-form-item> </el-col> <el-col :span="5"> <el-form-item label="缁勯暱" prop="managername"> - <el-input - v-model="form.managername" - placeholder="璇疯緭鍏ョ粍闀�" - clearable - /> + <el-input v-model="form.managername" placeholder="璇疯緭鍏ョ粍闀�" clearable /> </el-form-item> </el-col> </el-row> @@ -81,20 +55,12 @@ </el-col> <el-col :span="5"> <el-form-item label="鎹愮尞鑰�" prop="name"> - <el-input - :disabled="true" - v-model="form.donorname" - placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" - /> + <el-input :disabled="true" v-model="form.donorname" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" /> </el-form-item> </el-col> <el-col :span="5" v-if="ismanager == true"> <el-form-item label="鐢宠閲戦" prop="pretaxcost"> - <el-input - v-model="form.pretaxcost" - placeholder="绋庡墠閲戦鍚堣" - :disabled="true" - /> + <el-input v-model="form.pretaxcost" placeholder="绋庡墠閲戦鍚堣" :disabled="true" /> </el-form-item> </el-col> </el-row> @@ -119,65 +85,32 @@ <el-row v-if="jurisdiction"> <!-- <el-alert title="褰撳墠涓烘煡鐪嬬姸鎬侊紝涓嶆敮鎸佷慨鏀瑰瓨鍌ㄣ��" type="warning"> </el-alert> --> - <el-alert - title="褰撳墠涓烘煡鐪嬬姸鎬侊紝涓嶆敮鎸佷慨鏀瑰瓨鍌ㄣ��" - type="warning" - show-icon - > + <el-alert title="褰撳墠涓烘煡鐪嬬姸鎬侊紝涓嶆敮鎸佷慨鏀瑰瓨鍌ㄣ��" type="warning" show-icon> </el-alert> </el-row> <el-row> <el-col :span="3" v-if="businessType == '1'"> - <el-button - @click.native.prevent="importFeeItems" - type="primary" - size="small" - > + <el-button @click.native.prevent="importFeeItems" type="primary" size="small"> 瀵煎叆鏈嶅姟椤圭洰 </el-button> </el-col> - <el-col :span="3" - ><div style="margin-bottom: 15px;" v-if="businessType == 2"> - <el-button - type="success" - icon="el-icon-download" - @click="Batchentry" - >鎵归噺褰曞叆</el-button - > + <el-col :span="3"> + <div style="margin-bottom: 15px;" v-if="businessType == 2"> + <el-button type="success" icon="el-icon-download" @click="Batchentry">鎵归噺褰曞叆</el-button> </div> </el-col> <el-col :span="3"> - <div - style="margin-bottom: 15px;" - v-if=" - userprofile.nickName == '闄堟厱鍗�' && - (businessType == '1' || businessType == '2') - " - > - <el-button - type="success" - icon="el-icon-edit-outline" - @click="Manualcalculationfn" - >璁$畻涓◣</el-button - > + <div style="margin-bottom: 15px;" v-if="userprofile.nickName == '闄堟厱鍗�' && + (businessType == '1' || businessType == '2') + "> + <el-button type="success" icon="el-icon-edit-outline" @click="Manualcalculationfn">璁$畻涓◣</el-button> </div> </el-col> </el-row> <el-row> - <el-table - :data="rbDetails" - v-loading="loading" - max-height="800" - border - highlight-current-row - > - <el-table-column - prop="orderno" - align="center" - label="搴忓彿" - width="88" - > + <el-table :data="rbDetails" v-loading="loading" max-height="800" border highlight-current-row> + <el-table-column prop="orderno" align="center" label="搴忓彿" width="88"> <template slot-scope="scope"> <el-input v-model="scope.row.orderno" placeholder="搴忓彿" /> </template> @@ -186,124 +119,53 @@ <el-table-column prop="itemcode" align="center" label="椤圭洰缂栧彿" show-overflow-tooltip="" v-if="form.applytype == '1'"> </el-table-column>--> - <el-table-column - prop="applytype" - align="center" - label="鏈嶅姟绫诲瀷" - width="200" - > + <el-table-column prop="applytype" align="center" label="鏈嶅姟绫诲瀷" width="200"> <template slot-scope="scope"> - <el-select - v-model="scope.row.applytype" - placeholder="璇烽�夋嫨鏈嶅姟绫诲瀷" - @change="verifyFeeItemType(scope.row)" - > - <el-option - v-for="dict in rowfeeItemTypes" - :key="dict.index" - :label="dict.label" - :value="dict.value" - ></el-option> + <el-select v-model="scope.row.applytype" placeholder="璇烽�夋嫨鏈嶅姟绫诲瀷" @change="verifyFeeItemType(scope.row)"> + <el-option v-for="dict in rowfeeItemTypes" :key="dict.index" :label="dict.label" + :value="dict.value"></el-option> </el-select> </template> </el-table-column> - <el-table-column - prop="itemid" - align="center" - label="鏈嶅姟椤圭洰" - width="260" - > + <el-table-column prop="itemid" align="center" label="鏈嶅姟椤圭洰" width="260"> <template slot-scope="scope"> - <el-select - v-model="scope.row.itemid" - placeholder="璇烽�夋嫨鏈嶅姟椤圭洰" - filterable - @change="verifyFeeItem(scope.row)" - :filter-method="val => searchItemType(val, scope)" - > - <el-option - v-for="dict in scope.row.itemlist" - :key="dict.index" - :label="dict.itemName" - :value="dict.id" - ></el-option> + <el-select v-model="scope.row.itemid" placeholder="璇烽�夋嫨鏈嶅姟椤圭洰" filterable @change="verifyFeeItem(scope.row)" + :filter-method="val => searchItemType(val, scope)"> + <el-option v-for="dict in scope.row.itemlist" :key="dict.index" :label="dict.itemName" + :value="dict.id"></el-option> </el-select> </template> </el-table-column> - <el-table-column - prop="servicesscope" - align="center" - label="鏈嶅姟璇存槑" - v-if="form.applytype == '1'" - width="180" - > + <el-table-column prop="servicesscope" align="center" label="鏈嶅姟璇存槑" v-if="form.applytype == '1'" width="180"> <template slot-scope="scope"> - <el-select - v-model="scope.row.servicesscope" - placeholder="鏈嶅姟璇存槑" - clearable - allow-create - @change="verifyFeeRemark(scope.row)" - > - <el-option - v-for="dict in scope.row.rowfeeblocks" - :key="dict.servicesscope" - :label="dict.remark" - :value="dict.servicesscope" - ></el-option> + <el-select v-model="scope.row.servicesscope" placeholder="鏈嶅姟璇存槑" clearable allow-create + @change="verifyFeeRemark(scope.row)"> + <el-option v-for="dict in scope.row.rowfeeblocks" :key="dict.servicesscope" :label="dict.remark" + :value="dict.servicesscope"></el-option> </el-select> </template> </el-table-column> - <el-table-column - prop="price" - align="center" - label="鍗曚环" - width="120" - v-if="businessType == 4" - > + <el-table-column prop="price" align="center" label="鍗曚环" width="120" v-if="businessType == 4"> <template slot-scope="scope"> - <el-input - v-model="scope.row.price" - placeholder="鍗曚环" - @blur=" - val => { - sumTotalFee(scope.row); - } - " - /> + <el-input v-model="scope.row.price" placeholder="鍗曚环" @blur="val => { + sumTotalFee(scope.row); + } + " /> </template> </el-table-column> - <el-table-column - prop="quantity" - align="center" - label="鏁伴噺" - width="120" - v-if="businessType == 4" - > + <el-table-column prop="quantity" align="center" label="鏁伴噺" width="120" v-if="businessType == 4"> <template slot-scope="scope"> - <el-input - v-model="scope.row.quantity" - placeholder="鏁伴噺" - @blur=" - val => { - sumTotalFee(scope.row); - } - " - /> + <el-input v-model="scope.row.quantity" placeholder="鏁伴噺" @blur="val => { + sumTotalFee(scope.row); + } + " /> </template> </el-table-column> - <el-table-column - v-if=" - businessType == 2 || - businessType == 3 || - businessType == 4 || - ismanager == true - " - prop="amount" - align="center" - :label="amountLabel" - width="120" - > + <el-table-column v-if="businessType == 2 || + businessType == 3 || + businessType == 4 || + ismanager == true + " prop="amount" align="center" :label="amountLabel" width="120"> <template slot-scope="scope"> <!-- <el-select v-model="scope.row.amount" placeholder="绋庡墠閲戦" clearable filterable allow-create @@ -312,93 +174,57 @@ :value="dict.expense"></el-option> </el-select> --> - <el-input - v-model="scope.row.amount" - placeholder="閲戦" - @blur=" - val => { - calculateTax(scope.row, 'A'); - } - " - /> + <el-input v-model="scope.row.amount" placeholder="閲戦" @blur="val => { + calculateTax(scope.row, 'A'); + } + " /> </template> </el-table-column> - <el-table-column - prop="taxamount" - align="center" - label="鎵g◣閲戦" - width="120" - v-if=" - (this.ismanager == true) & - (form.applytype == '1' || form.applytype == '2') - " - > + <el-table-column prop="taxamount" align="center" label="鎵g◣閲戦" width="120" v-if="(this.ismanager == true) & + (form.applytype == '1' || form.applytype == '2') + "> <template slot-scope="scope"> - <el-input - v-model="scope.row.taxamount" - placeholder="鎵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-if=" - (this.ismanager == true) & - (form.applytype == '1' || form.applytype == '2') - " - > + <el-table-column prop="taxedamount" align="center" label="绋庡悗閲戦" width="120" v-if="(this.ismanager == true) & + (form.applytype == '1' || form.applytype == '2') + "> <template slot-scope="scope"> - <el-input - v-model="scope.row.taxedamount" - placeholder="绋庡悗閲戦" - @blur=" - val => { - calculateTax(scope.row, 'B'); - } - " - /> + <el-input v-model="scope.row.taxedamount" placeholder="绋庡悗閲戦" @blur="val => { + calculateTax(scope.row, 'B'); + } + " /> </template> </el-table-column> - <el-table-column - prop="beneficiaryname" - align="center" - label="涓撳/鍗曚綅" - width="120" - v-if="form.applytype == '1' || form.applytype == '2'" - > + <el-table-column prop="beneficiaryname" align="center" :label="beneficiarylabel" width="200"> <template slot-scope="scope"> - <el-button - type="primary" - plain - @click="ShowDetailDialog(scope, 'expert')" - >{{ - scope.row.beneficiaryname - ? scope.row.beneficiaryname - : "鐐瑰嚮閫夋嫨" - }}</el-button - > + <el-button type="primary" plain @click="showSelectionDialog(scope, 'account')">{{ + scope.row.beneficiaryname + ? scope.row.beneficiaryname + : "鐐瑰嚮閫夋嫨" + }}</el-button> </template> </el-table-column> - <el-table-column - prop="unitno" - align="center" - label="涓撳鎵�鍦ㄥ崟浣�" - width="250" - v-if="form.applytype != '4' && form.applytype != '3'" - > + <el-table-column prop="unitno" align="center" label="涓撳鎵�鍦ㄥ崟浣�" width="250" + v-if="form.applytype == '1' && form.applytype == '2'"> <template slot-scope="scope"> - <el-button - type="primary" - plain - @click="ShowDetailDialog(scope, 'unit')" - >{{ - scope.row.unitname ? scope.row.unitname : "鐐瑰嚮閫夋嫨" - }}</el-button - > - <!-- <el-select + <el-button type="primary" plain @click="showSelectionDialog(scope, 'workunit')">{{ + scope.row.unitname ? scope.row.unitname : "鐐瑰嚮閫夋嫨" + }}</el-button> + </template> + </el-table-column> + <!-- + <el-table-column prop="unitname" align="center" label="鍗曚綅锛堜釜浜猴級鍚嶇О" width="300" + v-if="form.applytype == '4' || form.applytype == '3'"> + <template slot-scope="scope"> + <el-button type="primary" plain @click="showSelectionDialog(scope, 'account')">{{ + scope.row.unitname + ? scope.row.unitname + : "鐐瑰嚮閫夋嫨" + }}</el-button> + + <el-select v-model="scope.row.unitno" placeholder="鍗曚綅" clearable @@ -411,186 +237,70 @@ :label="spec.organizationname" :value="spec.organizationid" ></el-option> - </el-select> --> + </el-select> </template> </el-table-column> - <el-table-column - prop="beneficiaryname" - align="center" - label="鍗曚綅/涓汉" - width="250" - v-if="form.applytype == '4' || form.applytype == '3'" - > - <template slot-scope="scope"> - <el-button - type="primary" - plain - @click="ShowDetailDialog(scope, 'expert')" - >{{ - scope.row.beneficiaryname - ? scope.row.beneficiaryname - : "鐐瑰嚮閫夋嫨" - }}</el-button - > - <!-- <el-select - v-model="scope.row.unitno" - placeholder="鍗曚綅" - clearable - filterable - allow-create - > - <el-option - v-for="(spec, index) in unitList" - :key="index" - :label="spec.organizationname" - :value="spec.organizationid" - ></el-option> - </el-select> --> - </template> - </el-table-column> - <el-table-column - prop="title" - align="center" - label="鑱岀О" - width="120" - v-if="form.applytype == '1' || form.applytype == '2'" - > + --> + <el-table-column prop="title" align="center" label="鑱岀О" width="120" + v-if="form.applytype == '1' || form.applytype == '2'"> <template slot-scope="scope"> <el-input v-model="scope.row.title" placeholder="鑱岀О" /> </template> </el-table-column> - <el-table-column - prop="idcardno" - align="center" - label="韬唤璇佸彿" - width="200" - v-if="form.applytype == '1' || form.applytype == '2'" - > + <el-table-column prop="idcardno" align="center" label="韬唤璇佸彿" width="200" + v-if="form.applytype == '1' || form.applytype == '2'"> <template slot-scope="scope"> <el-form-item :error="scope.row.error" label-width="0"> - <el-input - :disabled=" - userprofile.nickName != '闄堟厱鍗�' && businessType == 1 - " - v-model.number="scope.row.idcardno" - @input="tableParValueChange1(scope.row)" - placeholder="韬唤璇佸彿" - /> + <el-input :disabled="userprofile.nickName != '闄堟厱鍗�' && businessType == 1 + " v-model.number="scope.row.idcardno" @input="tableParValueChange1(scope.row)" + placeholder="韬唤璇佸彿" /> </el-form-item> </template> </el-table-column> - <el-table-column - prop="depositbank" - align="center" - label="寮�鎴烽摱琛�" - width="200" - > - <!-- v-if="form.applytype != '4'" --> + <el-table-column prop="depositbank" align="center" label="寮�鎴烽摱琛�" width="200"> <template slot-scope="scope"> - <el-input - :disabled=" - userprofile.nickName != '闄堟厱鍗�' && businessType == 1 - " - v-model="scope.row.depositbank" - placeholder="寮�鎴烽摱琛�" - /> + <el-input :disabled="userprofile.nickName != '闄堟厱鍗�' && businessType == 1 + " v-model="scope.row.depositbank" placeholder="寮�鎴烽摱琛�" /> </template> </el-table-column> - <el-table-column - prop="bankcardno" - align="center" - label="閾惰甯愬彿" - width="210" - > + <el-table-column prop="bankcardno" align="center" label="閾惰甯愬彿" width="210"> <template slot-scope="scope"> - <el-input - :disabled=" - userprofile.nickName != '闄堟厱鍗�' && businessType == 1 - " - v-model="scope.row.bankcardno" - placeholder="閾惰甯愬彿" - /> + <el-input :disabled="userprofile.nickName != '闄堟厱鍗�' && businessType == 1 + " v-model="scope.row.bankcardno" placeholder="閾惰甯愬彿" /> </template> </el-table-column> - <el-table-column - prop="itemdescrisca" - align="center" - width="330" - label="椤圭洰璇存槑" - > + <el-table-column prop="itemdescrisca" align="center" width="330" label="椤圭洰璇存槑"> <template slot-scope="scope"> - <el-input - type="textarea" - :rows="2" - v-model="scope.row.itemdescribe" - placeholder="椤圭洰璇存槑" - /> + <el-input type="textarea" :rows="2" v-model="scope.row.itemdescribe" placeholder="椤圭洰璇存槑" /> </template> </el-table-column> - <el-table-column - prop="remark" - align="center" - width="330" - label="澶囨敞" - v-if=" - businessType == 2 || - businessType == 3 || - businessType == 4 || - ismanager == true - " - > + <el-table-column prop="remark" align="center" width="330" label="澶囨敞" v-if="businessType == 2 || + businessType == 3 || + businessType == 4 || + ismanager == true + "> <template slot-scope="scope"> - <el-input - type="textarea" - :rows="2" - v-model="scope.row.remark" - placeholder="澶囨敞" - /> + <el-input type="textarea" :rows="2" v-model="scope.row.remark" placeholder="澶囨敞" /> </template> </el-table-column> - <el-table-column - fixed="right" - align="center" - label="鎿嶄綔" - width="180" - > + <el-table-column fixed="right" align="center" label="鎿嶄綔" width="180"> <template slot-scope="scope"> - <el-button - type="text" - size="mini" - @click="addRow(scope.$index)" - v-if=" - operationType == 'add' || - operationType == 'update' || - operationType == 'check' - " - >鏂板</el-button - > - <el-button - @click.native.prevent=" - deleteRows(scope.row, scope.$index, rbDetails) - " - type="text" - size="small" - v-if=" - operationType == 'add' || - operationType == 'update' || - operationType == 'check' - " - > + <el-button type="text" size="mini" @click="addRow(scope.$index)" v-if="operationType == 'add' || + operationType == 'update' || + operationType == 'check' + ">鏂板</el-button> + <el-button @click.native.prevent=" + deleteRows(scope.row, scope.$index, rbDetails) + " type="text" size="small" v-if="operationType == 'add' || + operationType == 'update' || + operationType == 'check' + "> 鍒犻櫎 </el-button> - <el-button - @click.native.prevent=" - Filepopup(scope.$index, rbDetails, scope.row) - " - type="text" - size="small" - v-if=" - businessType == 3 || businessType == 2 || businessType == 4 - " - >绁ㄦ嵁</el-button - > + <el-button @click.native.prevent=" + Filepopup(scope.$index, rbDetails, scope.row) + " type="text" size="small" v-if="businessType == 3 || businessType == 2 || businessType == 4 + ">绁ㄦ嵁</el-button> </template> </el-table-column> </el-table> @@ -598,55 +308,20 @@ <el-row> <el-col :span="12"> - <el-form-item - label="璐圭敤鐢宠闄勪欢" - align="left" - prop="annexbankcard" - v-if="businessType == 0" - > - <el-upload - size="mini" - class="upload-demo" - :action="uploadFileUrl" - :file-list="fileListto" - :show-file-list="false" - multiple - drag - :headers="headers" - :on-success=" - (response, file, fileList) => - uploadSccess(response, file, fileList) - " - :on-preview="downFile" - :disabled="operationType == 'detail'" - :on-error="handleUploadError" - :on-remove="remove" - accept="image/*,.pdf" - > + <el-form-item label="璐圭敤鐢宠闄勪欢" align="left" prop="annexbankcard" v-if="businessType == 0"> + <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileListto" + :show-file-list="false" multiple drag :headers="headers" :on-success="(response, file, fileList) => + uploadSccess(response, file, fileList) + " :on-preview="downFile" :disabled="operationType == 'detail'" :on-error="handleUploadError" + :on-remove="remove" accept="image/*,.pdf"> <i class="el-icon-upload"></i> <div class="el-upload__text"> 灏嗙エ鎹嫋鍒版澶勶紝鎴� - <em - ><el-button - :disabled="operationType == 'detail'" - size="small" - type="primary" - >鐐瑰嚮涓婁紶</el-button - ></em - > + <em><el-button :disabled="operationType == 'detail'" size="small" type="primary">鐐瑰嚮涓婁紶</el-button></em> </div> </el-upload> - <el-table - :data="fileListto" - @row-click="downFile" - style="width: 100%" - height="400" - > - <el-table-column - prop="name" - :show-overflow-tooltip="true" - label="鍚嶇О" - > + <el-table :data="fileListto" @row-click="downFile" style="width: 100%" height="400"> + <el-table-column prop="name" :show-overflow-tooltip="true" label="鍚嶇О"> <template slot-scope="scope"> <i style="color:#409EFF" class=" el-icon-s-order" />{{ scope.row.name @@ -654,74 +329,37 @@ </template> </el-table-column> - <el-table-column - prop="name" - width="180" - :show-overflow-tooltip="true" - label="鍔熻兘" - > + <el-table-column prop="name" width="180" :show-overflow-tooltip="true" label="鍔熻兘"> <template slot-scope="scope"> - <el-button - type="primary" - size="mini" - @click.native.prevent.stop="deletedowfile(scope.row)" - >鍒犻櫎</el-button - > - <el-button - type="primary" - size="mini" - @click.native.prevent.stop="moveupdowfile(scope.row)" - >涓婄Щ</el-button - > + <el-button type="primary" size="mini" + @click.native.prevent.stop="deletedowfile(scope.row)">鍒犻櫎</el-button> + <el-button type="primary" size="mini" + @click.native.prevent.stop="moveupdowfile(scope.row)">涓婄Щ</el-button> </template> </el-table-column> </el-table> </el-form-item> </el-col> </el-row> - <el-row - v-if=" - operationType == 'detail' || - operationType == 'check' || - operationType == 'update' - " - > + <el-row v-if="operationType == 'detail' || + operationType == 'check' || + operationType == 'update' + "> <el-table :data="fundflowList" border> - <el-table-column - label="瀹℃牳鏃ユ湡" - align="center" - width="160" - prop="createTime" - /> - <el-table-column - label="瀹℃牳浜�" - align="center" - width="120" - prop="checkusername" - /> - <el-table-column - label="瀹℃牳缁撴灉" - align="center" - width="200" - prop="flowconclusion" - > + <el-table-column label="瀹℃牳鏃ユ湡" align="center" width="160" prop="createTime" /> + <el-table-column label="瀹℃牳浜�" align="center" width="120" prop="checkusername" /> + <el-table-column label="瀹℃牳缁撴灉" align="center" width="200" prop="flowconclusion"> <template slot-scope="scope"> <span v-if="scope.row.flowconclusion == 1">閫氳繃</span> <span v-if="scope.row.flowconclusion == 2">涓嶉�氳繃</span> </template> </el-table-column> - <el-table-column - label="瀹℃牳澶囨敞" - align="center" - prop="flowcontent" - /> + <el-table-column label="瀹℃牳澶囨敞" align="center" prop="flowcontent" /> </el-table> </el-row> - <el-row - style="margin-top: 25px; margin-bottom: 5px" - v-if="operationType == 'check' && userprofile.nickName == '闄堟厱鍗�'" - > + <el-row style="margin-top: 25px; margin-bottom: 5px" + v-if="operationType == 'check' && userprofile.nickName == '闄堟厱鍗�'"> <el-col :span="20"> <el-form-item label="鐢宠鏉愭枡鐘舵��" prop="infoid"> <el-radio-group v-model="form.checkstatus" align="left"> @@ -732,10 +370,7 @@ </el-form-item> </el-col> </el-row> - <el-row - style="margin-top: 5px; margin-bottom: 5px" - v-if="operationType == 'check'" - > + <el-row style="margin-top: 5px; margin-bottom: 5px" v-if="operationType == 'check'"> <el-col :span="20"> <el-form-item label="瀹℃牳缁撴灉" align="left"> <el-radio-group v-model="checkObj.flowlevelone" align="left"> @@ -745,7 +380,6 @@ </el-form-item> </el-col> </el-row> - <el-row v-if="operationType == 'check'"> <el-col :span="17"> <el-form-item label="瀹℃牳澶囨敞" align="left"> @@ -755,327 +389,134 @@ </el-row> </el-form> <div slot="footer" class="dialog-footer"> - <el-button - type="primary" - @click="submitForm" - v-if=" - operationType == 'add' || - operationType == 'update' || - ismanager == true - " - >淇濆瓨</el-button - > - <el-button - type="success" - @click="handleup" - v-if="operationType == 'add' || operationType == 'update'" - >涓婃姤</el-button - > - <el-button - type="primary" - @click="checksubmit" - v-if="operationType == 'check'" - >鎻愪氦瀹℃牳</el-button - > + <el-button type="primary" @click="submitForm" v-if="operationType == 'add' || + operationType == 'update' || + ismanager == true + ">淇濆瓨</el-button> + <el-button type="success" @click="handleup" + v-if="operationType == 'add' || operationType == 'update'">涓婃姤</el-button> + <el-button type="primary" @click="checksubmit" v-if="operationType == 'check'">鎻愪氦瀹℃牳</el-button> <el-button @click="cancel">鍏� 闂�</el-button> </div> </div> - <el-dialog - :visible.sync="showSelectionDialog" - :close-on-click-modal="false" - :title="'鍗曚綅/涓汉淇℃伅閫夋嫨'" - width="500px" - style="text-align: center" - v-loading="loading" - > - <el-form ref="funddetailForm" :rules="funddrules" :model="funddetailForm"> - <el-row v-if="businessType != 4 && businessType != 3"> - <el-col - :span="24" - v-if="selectionType == 'expert' && businessType != 4" - > - <el-form-item label="璇烽�夋嫨涓撳淇℃伅锛�" prop="expertfrom"> - <el-radio-group v-model="expertfrom" style="margin-bottom: 0"> - <el-radio label="1">涓撳搴�</el-radio> - <el-radio label="2">鏂板涓撳</el-radio> - </el-radio-group> - </el-form-item> - </el-col> - <el-col - :span="24" - v-if="selectionType == 'expert' && expertfrom == '1'" - > - <el-form-item - label="涓撳濮撳悕" - prop="beneficiaryname" - label-width="80px" - > - <el-select - filterable - allow-create - ref="beneficiaryname" - default-first-option - v-model="funddetailForm.beneficiaryname" - placeholder="璇烽�夋嫨" - style="width: 100%" - > - <el-option - v-for="item in expertlist" - :key="item.expertNo" - :label="item.exportName" - :value="item.exportName" - > - </el-option> - </el-select> - </el-form-item> - </el-col> - <el-col :span="24" v-if="selectionType == 'unit'"> - <el-form-item - label="鍗曚綅鍚嶇О" - prop="unitno" - label-width="120px" - v-if="businessType == 1 || businessType == 2" - > - <el-select - v-model="funddetailForm.unitno" - placeholder="鍗曚綅鍚嶇О" - clearable - filterable - allow-create - style="width: 100%" - > - <el-option - v-for="(spec, index) in unitList" - :key="index" - :label="spec.organizationname" - :value="spec.organizationid" - ></el-option> - </el-select> - </el-form-item> - <el-form-item - label="鍙戠エ鍗曚綅鍚嶇О" - prop="unitno" - label-width="120px" - v-if="businessType == 3" - > - <el-select - v-model="funddetailForm.unitno" - placeholder="鍗曚綅鍚嶇О" - clearable - filterable - allow-create - style="width: 100%" - > - <el-option - v-for="(item, index) in feeUnitList" - :key="index" - :label="item.reportName" - :value="item.reportNo" - ></el-option> - </el-select> - </el-form-item> - </el-col> - </el-row> - - <el-row v-if="businessType == 4 || businessType == 3"> + <el-dialog :visible.sync="showselectiondialog" :close-on-click-modal="false" :title="'璐︽埛淇℃伅/鍗曚綅淇℃伅閫夋嫨'" width="650px" + style="text-align: center" v-loading="loading"> + <el-form ref="accountselectform" :rules="dialogrules" :model="accountselectform" label-width="120px"> + <el-row v-if="selectionType == 'workunit'"> <el-col :span="24"> - <el-form-item label="璇烽�夋嫨涓撳淇℃伅锛�" prop="experthear"> - <el-radio-group - @change="ShowDetailDialog(spocewl)" - v-model="experthear" - style="margin-bottom: 0" - > - <el-radio label="unit">浜哄憳閫夐」</el-radio> - <el-radio label="expert">鍗曚綅閫夐」</el-radio> + <el-form-item label="鍗曚綅鍚嶇О" prop="expertunitno" label-width="120px"> + <el-select v-model="accountselectform.expertunitno" placeholder="鍗曚綅鍚嶇О" clearable filterable allow-create + style="width: 100%"> + <el-option v-for="(spec, index) in unitList" :key="index" :label="spec.organizationname" + :value="spec.organizationid"></el-option> + </el-select> + </el-form-item> + </el-col> + </el-row> + <el-row v-if="selectionType == 'account'"> + <el-col> + <el-form-item label="璐︽埛鏉ユ簮" prop="accountfrom" class="left-align"> + <el-radio-group v-model="accountfrom" style="margin-bottom: 0"> + <el-radio label="1">浠庤处鎴峰簱</el-radio> + <el-radio label="2">鏂板璐︽埛锛堟柊澧炲悗闇�瑕佸鏍哥‘璁ゆ墠鑳藉惎鐢級</el-radio> </el-radio-group> </el-form-item> </el-col> - <el-col :span="24" v-if="experthear == 'unit'"> - <el-form-item - label="涓撳/鍗曚綅" - prop="beneficiaryname" - label-width="80px" - > - <el-select - filterable - allow-create - ref="beneficiaryname" - default-first-option - @change="bbaaccss" - v-model="funddetailForm.beneficiaryname" - placeholder="璇烽�夋嫨" - style="width: 100%" - > - <el-option - v-for="item in expertlist" - :key="item.expertNo" - :label="item.exportName" - :value="item.exportName" - > + <el-col :span="24" v-if="accountfrom == '1'"> + <el-form-item label="璐︽埛鍚嶇О" prop="accountname"> + <el-select filterable allow-create ref="accountname" default-first-option + v-model="accountselectform.accountname" placeholder="璇烽�夋嫨" style="width: 100%"> + <el-option v-for="item in accountlist" :key="item.id" :label="item.username" :value="item.username"> </el-option> </el-select> </el-form-item> </el-col> - <el-col :span="24" v-if="experthear == 'expert'"> - <el-form-item label="鍗曚綅鍚嶇О" prop="unitno" label-width="120px"> - <el-select - v-model="funddetailForm.beneficiaryname" - placeholder="鍗曚綅鍚嶇О" - @change="bbaaccss" - clearable - filterable - allow-create - style="width: 100%" - > - <el-option - v-for="(spec, index) in feeUnitList" - :key="index" - :label="spec.reportName" - :value="spec.reportName" - ></el-option> - </el-select> + </el-row> + <el-row v-if="accountfrom == '2'"> + <el-col :span="16"><el-form-item label="鏂板绫诲瀷" prop="usertype"> + <el-radio-group v-model="accountselectform.usertype" style="margin-bottom: 0"> + <el-radio label="expert">鏂板涓撳璐﹀彿</el-radio> + <el-radio label="org">鏂板鍗曚綅璐﹀彿</el-radio> + </el-radio-group> </el-form-item> </el-col> </el-row> - - <el-row v-if="businessType != 4 && businessType != 3"> - <el-col :span="12" v-if="expertfrom == '2'"> - <el-form-item label="涓撳濮撳悕" prop="expertname" label-width="80px"> - <el-input - v-model="funddetailForm.expertname" - placeholder="蹇呭~椤�" - /> - </el-form-item> + <el-row v-if="accountfrom == '2'"> + <el-col :span="24"> + <el-form-item label="璐﹀彿鍚嶇О" prop="username"> + <el-input v-model="accountselectform.username" placeholder="璇疯緭鍏ュ崟浣嶅悕绉版垨涓撳濮撳悕" /> </el-form-item> </el-col> - <el-col :span="12" v-if="expertfrom == '2'"> - <el-form-item - label="鑱� 绉�" - prop="experttitle" - label-width="80px" - > - <el-select - v-model="funddetailForm.experttitle" - placeholder="蹇呭~椤�" - > - <el-option - v-for="dict in dict.type.sys_professionaltitle" - :key="dict.value" - :label="dict.label" - :value="dict.label" - ></el-option> - </el-select> + </el-row> + <el-row v-if="accountfrom == '2' && accountselectform.usertype != 'org'"> + <el-col :span="12"> + <el-form-item label="韬唤璇佸彿" prop="idcardno"> + <el-input v-model="accountselectform.idcardno" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" /> </el-form-item> + </el-col> + <el-col :span="12"> + <el-form-item label="鑱岀О" prop="title"> + <el-select v-model="accountselectform.title" placeholder="璇烽�夋嫨浜哄憳鑱岀О"> + <el-option v-for="dict in dict.type.sys_professionaltitle" :key="dict.value" :label="dict.label" + :value="dict.label"></el-option> </el-select> </el-form-item> </el-col> </el-row> - <el-row v-if="businessType != 4 && businessType != 3"> - <el-col :span="24" v-if="expertfrom == '2'"> - <el-form-item - label="韬唤璇佸彿" - prop="expertidcardno" - label-width="80px" - > - <el-input - v-model="funddetailForm.expertidcardno" - placeholder="蹇呭~椤�" - /> + <el-row v-if="accountfrom == '2' && accountselectform.usertype != 'org'"> + <el-col> + <el-form-item label="鎵�鍦ㄥ崟浣�" prop="unitno"> + <el-select v-model="accountselectform.unitno" placeholder="鍗曚綅鍚嶇О" clearable filterable allow-create + style="width: 100%"> + <el-option v-for="(spec, index) in unitList" :key="index" :label="spec.organizationname" + :value="spec.organizationid"></el-option> + </el-select> </el-form-item> + </el-form-item> + </el-col> + <el-col> + <el-form-item label="鍗曚綅宸ュ彿" prop="personnelunitno"> + <el-input v-model="accountselectform.personnelunitno" placeholder="璇疯緭鍏ユ墍鍦ㄥ崟浣嶇殑宸ュ彿" /> </el-form-item> </el-col> </el-row> - - <el-row v-if="businessType != 4 && businessType != 3"> - <el-col :span="24" v-if="expertfrom == '2'"> - <el-form-item - label="鍗曚綅鍚嶇О" - prop="expertunitno" - label-width="80px" - > - <el-select - v-model="funddetailForm.expertunitno" - placeholder="鍗曚綅鍚嶇О" - clearable - filterable - allow-create - style="width: 100%" - > - <el-option - v-for="(spec, index) in unitList" - :key="index" - :label="spec.organizationname" - :value="spec.organizationid" - ></el-option> - </el-select> </el-form-item - ></el-col> - </el-row> - <el-row v-if="businessType != 4 && businessType != 3"> - <el-col :span="24" v-if="expertfrom == '2'"> - <el-form-item - label="寮�鎴烽摱琛�" - prop="expertdepositbank" - label-width="80px" - > - <el-input - v-model="funddetailForm.expertdepositbank" - placeholder="蹇呭~椤�" - /> + <el-row v-if="accountfrom == '2'"> + <el-col><el-form-item label="寮�鎴烽摱琛�" prop="depositbank"> + <el-input v-model="accountselectform.depositbank" placeholder="璇疯緭鍏ュ紑鎴烽摱琛屽悕绉�" /> </el-form-item> + </el-col> + <el-col><el-form-item label="閾惰鍗″彿" prop="bankcardno"> + <el-input v-model="accountselectform.bankcardno" placeholder="璇疯緭鍏ラ摱琛屽崱鍙�" /> </el-form-item> </el-col> - <el-col :span="24" v-if="expertfrom == '2'"> - <el-form-item - label="閾惰鍗″彿" - prop="expertbankcardno" - label-width="80px" - > - <el-input - v-model="funddetailForm.expertbankcardno" - placeholder="蹇呭~椤�" - /> - </el-form-item> + </el-row> + <el-row v-if="accountfrom == '2'"> + <el-col> + <el-form-item label="鑱旂郴鍦板潃" prop="address"> + <el-input v-model="accountselectform.address" placeholder="璇疯緭鍏ヨ仈绯诲湴鍧�" /> </el-form-item> + </el-col> + </el-row> + <el-row v-if="accountfrom == '2'"> + <el-col> + <el-form-item label="鑱旂郴鐢佃瘽" prop="telephone"> + <el-input v-model="accountselectform.telephone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" /> </el-form-item> </el-col> </el-row> </el-form> <span slot="footer" class="dialog-footer"> - <el-button @click="showSelectionDialog = false">鍙� 娑�</el-button> - <el-button type="primary" @click="ConfirmDetailDialog()" - >纭� 瀹�</el-button - > + <el-button type="primary" @click="confirmSelectionDialog()">纭� 瀹�</el-button> + <el-button @click="showselectiondialog = false">鍙� 娑�</el-button> </span> </el-dialog> - <el-dialog - v-dialogDrags - :modal="false" - :close-on-click-modal="false" - :title="pdftitle" - :visible.sync="pdfVisible" - width="60%" - > + <el-dialog v-dialogDrags :modal="false" :close-on-click-modal="false" :title="pdftitle" :visible.sync="pdfVisible" + width="60%"> <div> <el-table :data="tableDatatop" style="width: 100%"> - <el-table-column - v-if="businessType == 4" - prop="price" - align="center" - label="鍗曚环" - > + <el-table-column v-if="businessType == 4" prop="price" align="center" label="鍗曚环"> </el-table-column> - <el-table-column - prop="quantity" - align="center" - label="鏁伴噺" - v-if="businessType == 4" - > + <el-table-column prop="quantity" align="center" label="鏁伴噺" v-if="businessType == 4"> </el-table-column> <el-table-column prop="amount" align="center" :label="amountLabel"> </el-table-column> - <el-table-column - prop="taxedamount" - align="center" - label="绋庡悗閲戦" - v-if=" - (this.ismanager == true) & - (form.applytype == '1' || form.applytype == '2') - " - > + <el-table-column prop="taxedamount" align="center" label="绋庡悗閲戦" v-if="(this.ismanager == true) & + (form.applytype == '1' || form.applytype == '2') + "> </el-table-column> <!-- <el-table-column prop="beneficiaryname" @@ -1093,142 +534,62 @@ v-if="form.applytype != '4'" > </el-table-column> --> - <el-table-column - prop="beneficiaryname" - align="center" - label="鍗曚綅/涓汉" - width="250" - > + <el-table-column prop="" align="center" label="鍗曚綅/涓汉" width="250"> </el-table-column> - <el-table-column - prop="title" - align="center" - label="鑱岀О" - width="120" - v-if="form.applytype == '1' || form.applytype == '2'" - > + <el-table-column prop="title" align="center" label="鑱岀О" width="120" + v-if="form.applytype == '1' || form.applytype == '2'"> </el-table-column> - <el-table-column - prop="idcardno" - align="center" - label="韬唤璇佸彿" - width="200" - v-if="form.applytype == '1' || form.applytype == '2'" - > + <el-table-column prop="idcardno" align="center" label="韬唤璇佸彿" width="200" + v-if="form.applytype == '1' || form.applytype == '2'"> </el-table-column> <el-table-column prop="depositbank" align="center" label="寮�鎴烽摱琛�"> </el-table-column> - <el-table-column - prop="bankcardno" - align="center" - label="閾惰甯愬彿" - width="210" - > + <el-table-column prop="bankcardno" align="center" label="閾惰甯愬彿" width="210"> </el-table-column> </el-table> </div> - <el-tabs - style="margin-top: 20px;" - v-model="activeName" - type="border-card" - @tab-click="handleClick" - > + <el-tabs style="margin-top: 20px;" v-model="activeName" type="border-card" @tab-click="handleClick"> <el-tab-pane label="鏅�氶檮浠�" :name="1"> <div class="pdfimg"> <div class="box-pdf"> <div> - <el-upload - size="mini" - class="upload-demo" - :action="uploadFileUrl" - :file-list="fileListto" - :show-file-list="false" - multiple - drag - :headers="headers" - :on-success=" - (response, file, fileList) => - uploadSccess(response, file, fileList) - " - :on-preview="downFile" - :disabled="operationType == 'detail'" - :on-error="handleUploadError" - :on-remove="remove" - accept="image/*,.pdf" - > + <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileListto" + :show-file-list="false" multiple drag :headers="headers" :on-success="(response, file, fileList) => + uploadSccess(response, file, fileList) + " :on-preview="downFile" :disabled="operationType == 'detail'" :on-error="handleUploadError" + :on-remove="remove" accept="image/*,.pdf"> <i class="el-icon-upload"></i> <div class="el-upload__text"> 灏嗙エ鎹嫋鍒版澶勶紝鎴� - <em - ><el-button - :disabled="operationType == 'detail'" - size="small" - type="primary" - >鐐瑰嚮涓婁紶</el-button - ></em - > + <em><el-button :disabled="operationType == 'detail'" size="small" type="primary">鐐瑰嚮涓婁紶</el-button></em> </div> </el-upload> - <el-table - :data="fileListto" - @row-click="downFile" - style="width: 100%" - height="400" - > - <el-table-column - prop="name" - :show-overflow-tooltip="true" - label="鍚嶇О" - > + <el-table :data="fileListto" @row-click="downFile" style="width: 100%" height="400"> + <el-table-column prop="name" :show-overflow-tooltip="true" label="鍚嶇О"> <template slot-scope="scope"> <i style="color:#409EFF" class=" el-icon-s-order" /> <span>{{ scope.row.name }}</span> </template> </el-table-column> - <el-table-column - prop="name" - width="190" - :show-overflow-tooltip="true" - label="鍔熻兘" - > + <el-table-column prop="name" width="190" :show-overflow-tooltip="true" label="鍔熻兘"> <template slot-scope="scope"> - <el-button - type="primary" - size="mini" - @click.native.prevent.stop="deletedowfile(scope.row)" - >鍒犻櫎</el-button - > - <el-button - type="primary" - size="mini" - @click.native.prevent.stop="moveupdowfile(scope.row)" - >涓婄Щ</el-button - > - <el-button - type="success" - size="mini" - icon="el-icon-search" - circle - @click.native.prevent.stop="Downloadfile(scope.row)" - ></el-button> + <el-button type="primary" size="mini" + @click.native.prevent.stop="deletedowfile(scope.row)">鍒犻櫎</el-button> + <el-button type="primary" size="mini" + @click.native.prevent.stop="moveupdowfile(scope.row)">涓婄Щ</el-button> + <el-button type="success" size="mini" icon="el-icon-search" circle + @click.native.prevent.stop="Downloadfile(scope.row)"></el-button> </template> </el-table-column> </el-table> </div> </div> - <div - v-if="this.previewpdf && pdfimgsrcList.length" - class="pdfimgmin" - > + <div v-if="this.previewpdf && pdfimgsrcList.length" class="pdfimgmin"> <!-- <img :src="pdfimg" /> --> - <el-image - style="width: 95%; height: 90%" - :src="pdfimg" - :preview-src-list="pdfimgsrcList" - > + <el-image style="width: 95%; height: 90%" :src="pdfimg" :preview-src-list="pdfimgsrcList"> <!-- <div slot="error" class="image-slot"> <i class="el-icon-picture-outline"></i> </div> --> @@ -1241,154 +602,78 @@ <div class="pdfimg"> <div class="box-pdf"> <div> - <el-upload - size="mini" - class="upload-demo" - :action="uploadFileUrl" - :file-list="invoicefileList" - :show-file-list="false" - multiple - drag - :headers="headers" - :on-success=" - (response, file, fileList) => - uploadSccess(response, file, fileList) - " - :on-preview="downFile" - :disabled="operationType == 'detail'" - :on-error="handleUploadError" - :on-remove="remove" - accept="image/*,.pdf" - > + <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="invoicefileList" + :show-file-list="false" multiple drag :headers="headers" :on-success="(response, file, fileList) => + uploadSccess(response, file, fileList) + " :on-preview="downFile" :disabled="operationType == 'detail'" :on-error="handleUploadError" + :on-remove="remove" accept="image/*,.pdf"> <i class="el-icon-upload"></i> <div class="el-upload__text"> 灏嗗彂绁ㄦ枃浠舵嫋鍒版澶勶紝鎴� - <em - ><el-button - :disabled="operationType == 'detail'" - size="small" - type="primary" - >鐐瑰嚮涓婁紶</el-button - ></em - > + <em><el-button :disabled="operationType == 'detail'" size="small" type="primary">鐐瑰嚮涓婁紶</el-button></em> </div> </el-upload> - <el-table - :data="invoicefileListto" - @row-click="downFile" - style="width: 100%" - height="400" - > - <el-table-column - prop="name" - :show-overflow-tooltip="true" - label="鍚嶇О" - > + <el-table :data="invoicefileListto" @row-click="downFile" style="width: 100%" height="400"> + <el-table-column prop="name" :show-overflow-tooltip="true" label="鍚嶇О"> <template slot-scope="scope"> <i style="color:#409EFF" class=" el-icon-s-order" /> <span>{{ scope.row.name }}</span> </template> </el-table-column> - <el-table-column - prop="name" - width="190" - :show-overflow-tooltip="true" - label="鍔熻兘" - > + <el-table-column prop="name" width="190" :show-overflow-tooltip="true" label="鍔熻兘"> <template slot-scope="scope"> - <el-button - type="primary" - size="mini" - @click.native.prevent.stop="deletedowfile(scope.row)" - >鍒犻櫎</el-button - > - <el-button - type="primary" - size="mini" - @click.native.prevent.stop="moveupdowfile(scope.row)" - >涓婄Щ</el-button - > - <el-button - type="success" - size="mini" - icon="el-icon-search" - circle - @click.native.prevent.stop="Downloadfile(scope.row)" - ></el-button> + <el-button type="primary" size="mini" + @click.native.prevent.stop="deletedowfile(scope.row)">鍒犻櫎</el-button> + <el-button type="primary" size="mini" + @click.native.prevent.stop="moveupdowfile(scope.row)">涓婄Щ</el-button> + <el-button type="success" size="mini" icon="el-icon-search" circle + @click.native.prevent.stop="Downloadfile(scope.row)"></el-button> </template> </el-table-column> </el-table> </div> </div> - <div - v-if="this.previewpdf && invoicepdfimgsrcList.length" - class="pdfimgmin" - > + <div v-if="this.previewpdf && invoicepdfimgsrcList.length" class="pdfimgmin"> <!-- <img :src="pdfimg" /> --> - <el-image - style="width: 95%; height: 90%" - :src="invoicepdfimg" - :preview-src-list="invoicepdfimgsrcList" - > + <el-image style="width: 95%; height: 90%" :src="invoicepdfimg" :preview-src-list="invoicepdfimgsrcList"> <!-- <div slot="error" class="image-slot"> <i class="el-icon-picture-outline"></i> </div> --> </el-image> </div> <div v-else class="pdfimgmins">{{ hintitle }}</div> - </div></el-tab-pane - > + </div> + </el-tab-pane> </el-tabs> </el-dialog> <el-dialog title="鎻愮ず" :visible.sync="Savereminder" width="30%"> - <el-alert - :title=" - '鎮ㄥ凡娣诲姞' + - totalquantity + - '鏉℃暟鎹紝涓洪槻姝㈡暟鎹涪澶辨槸鍚︽彁浜や繚瀛樺啀缁х画娣诲姞銆�' - " - type="warning" - > + <el-alert :title="'鎮ㄥ凡娣诲姞' + + totalquantity + + '鏉℃暟鎹紝涓洪槻姝㈡暟鎹涪澶辨槸鍚︽彁浜や繚瀛樺啀缁х画娣诲姞銆�' + " type="warning"> </el-alert> <span slot="footer" class="dialog-footer"> - <el-button @click="unsave">鍙� 娑�</el-button> <el-button type="primary" @click="Savenow">纭� 瀹�</el-button> + <el-button @click="unsave">鍙� 娑�</el-button> </span> </el-dialog> <!-- 鎵归噺閫夊彇 --> - <el-dialog - title="鎵归噺鐢熸垚鏄庣粏淇℃伅" - :visible.sync="batchdialogVisible" - width="30%" - > + <el-dialog title="鎵归噺鐢熸垚鏄庣粏淇℃伅" :visible.sync="batchdialogVisible" width="30%"> <div style="max-height: 300px; overflow-y: auto"> - <el-checkbox - :indeterminate="isIndeterminate" - v-model="checkAll" - @change="handleCheckAllChange" - >鍏ㄩ��</el-checkbox - > + <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">鍏ㄩ��</el-checkbox> <div style="margin: 15px 0;"></div> - <el-checkbox-group - v-model="checkedCities" - @change="handleCheckedCitiesChange" - > - <el-checkbox - border - v-for="city in cityOptions" - :label="city" - :key="city.reportNo" - >{{ city.reportName }}</el-checkbox - > + <el-checkbox-group v-model="checkedCities" @change="handleCheckedCitiesChange"> + <el-checkbox border v-for="city in cityOptions" :label="city" :key="city.reportNo">{{ city.reportName + }}</el-checkbox> </el-checkbox-group> </div> <span slot="footer" class="dialog-footer"> - <el-button @click="batchdialogVisible = false">鍙� 娑�</el-button> <el-button type="primary" @click="BatchentryFn">纭� 瀹�</el-button> + <el-button @click="batchdialogVisible = false">鍙� 娑�</el-button> </span> </el-dialog> </div> @@ -1513,8 +798,6 @@ Routinglevel: 1, // 琛ㄥ崟鍙傛暟 form: {}, - experthear: "", - spocewl: "", //璐圭敤鐢宠琛ㄥ崟title title: "", //鐢宠鍗曠被鍨� @@ -1534,14 +817,11 @@ userprofile: {}, //绯荤粺鐢ㄦ埛鍒楄〃 userlist: [], - //鎵�鏈変汉鍛樿〃 - personlist: [], - //涓撳鍒楄〃 - expertlist: [], + //璐﹀彿鍒楄〃 + accountlist: [], //鍖荤枟鏈烘瀯鍒楄〃 unitList: [], - //璐圭敤鎶ラ攢鏈烘瀯鍒楄〃 - feeUnitList: [], + // 缃戠粶璇锋眰澶� Networkheader: null, batchdialogVisible: false, @@ -1555,8 +835,6 @@ //鏄惁鏄笓瀹惰垂鐨凮PO瀹℃壒浜哄憳 ismanager: false, - //涓撳璐归�夋嫨锛�1鏄笓瀹跺簱锛�2鏄柊澧� - expertfrom: "1", baselisttages: [ { id: 1, @@ -1597,9 +875,16 @@ // 闅忔満鏁� randomnumber: "", - //涓撳/鍗曚綅閫夋嫨锛歟xpert/unit + //閫夋嫨绐楀彛鏄剧ず鐘舵�� + showselectiondialog: false, + //閫夋嫨鏃跺綋鍓嶈 + selectionScope: "", + //閫夋嫨绫诲瀷锛氫笓瀹讹紙鍗曚綅锛夎处鎴枫�佸伐浣滃崟浣嶏紙account/workunit锛� selectionType: "", - showSelectionDialog: false, + //鍙楃泭浜烘爣绛撅細涓撳璐�-涓撳锛堝崟浣嶏級鍚嶇О锛屽尰瀛︽垚鏈�-鍔炲叕-鍗曚綅锛堜釜浜猴級鍚嶇О + beneficiarylabel: "", + //璐︽埛閫夋嫨锛�1鏄处鎴峰簱锛�2鏄柊澧� + accountfrom: "1", //绋庡墠閲戦鏍囬锛氫笓瀹惰垂-绋庡墠閲戦锛涘尰瀛︽垚鏈�佸姙鍏垂鐢�-閲戦 amountLabel: "绋庡墠閲戦", @@ -1615,60 +900,65 @@ { required: true, message: "璇疯緭鍏ユ墍灞炰笟鍔$粍", trigger: "blur" } ] }, - funddrules: { + dialogrules: { // expertidcardno: [{ validator: validatePass, trigger: "blur" }], - expertdepositbank: [ + depositbank: [ { required: true, message: "璇疯緭鍏ュ紑鎴烽摱琛�", trigger: "change" } ], - expertbankcardno: [ + bankcardno: [ { required: true, message: "璇疯緭鍏ラ摱琛屽崱鍙�", trigger: "change" } ], - expertunitno: [ + unitno: [ { required: true, message: "璇烽�夋嫨鍗曚綅鍚嶇О", trigger: "change" } ] }, - funddetailForm: { + accountselectform: { index: null, - beneficiaryname: null, - beneficiaryno: null, - unitno: null, - unitname: null, - expertname: null, - expertidcardno: null, - expertunitno: null, + usertype: 'expert', + accountname: null, + accountno: null, expertunitname: null, - experttitle: null, - expertdepositbank: null, - expertbankcardno: null - }, - - expertform: { - id: null, - address: null, - bankcardno: null, - branchbankname: null, - createBy: null, - createTime: null, - del_flag: null, + expertunitno: null, depositbank: null, + bankcardno: null, idcardno: null, - personnelunitno: null, - pym: null, - remark: null, - searchValue: null, - sex: null, - telephone: null, title: null, unitname: null, unitno: null, - updateBy: null, - updateTime: null, - username: null, - userno: null, + personnelunitno: null, + address: null, + telephone: null + }, + + accountform: { + searchValue: null, + id: null, userstatus: 1, usertype: null, - wbm: null + + pym: null, + wbm: null, + username: null, + userno: null, + sex: null, + idcardno: null, + title: null, + address: null, + telephone: null, + depositbank: null, + branchbankname: null, + bankcardno: null, + unitname: null, + unitno: null, + personnelunitno: null, + + del_flag: null, + createBy: null, + createTime: null, + updateBy: null, + updateTime: null, + remark: null }, //瀹℃壒鍙傛暟 checkObj: { @@ -1763,13 +1053,13 @@ watch: {}, //鏂规硶闆嗗悎 methods: { - bbaaccss(val) {}, + bbaaccss(val) { }, // 娴忚鍣ㄩ〉闈㈠叧闂垨鍒锋柊鎻愮ず beforeunloadHandler(e) { if ( (JSON.stringify(this.form) == sessionStorage.getItem("apiform") && JSON.stringify(this.rbDetails) == - sessionStorage.getItem("apifunddetail")) || + sessionStorage.getItem("apifunddetail")) || !sessionStorage.getItem("apifunddetail") ) { } else { @@ -1856,18 +1146,22 @@ if (this.businessType == "1") { this.businessName = "涓撳鍔冲姟璐圭敵璇峰崟"; this.amountLabel = "绋庡墠閲戦"; + this.beneficiarylabel = "涓撳鎴栧崟浣嶅悕绉�"; this.getUnitList(); } else if (this.businessType == "2") { this.businessName = "浼︾悊涓撳鍔冲姟璐圭敵璇峰崟"; this.amountLabel = "绋庡墠閲戦"; + this.beneficiarylabel = "涓撳鎴栧崟浣嶅悕绉�"; this.getUnitList(); } else if (this.businessType == "3") { this.businessName = "鍖诲鎴愭湰鎶ラ攢鍗�"; this.amountLabel = "閲戦"; + this.beneficiarylabel = "鍗曚綅鍚嶇О鎴栦釜浜�"; this.getUnitList(); } else if (this.businessType == "4") { this.businessName = "鍔炲叕璐圭敤鎶ラ攢鍗�"; this.amountLabel = "閲戦"; + this.beneficiarylabel = "鍗曚綅鍚嶇О鎴栦釜浜�"; this.getUnitList(); // this.getBaseInfoList(); @@ -2067,7 +1361,7 @@ handleDelete() { this.$modal .confirm("鏄惁纭鍒犻櫎璇ヨ褰曪紵") - .then(function() { + .then(function () { return delFund(this.curId); }) .then(() => { @@ -2080,7 +1374,7 @@ this.getfundList(); this.$modal.msgSuccess("鍒犻櫎鎴愬姛"); }) - .catch(() => {}); + .catch(() => { }); }, /** 涓婃姤鎸夐挳鎿嶄綔 */ @@ -2088,7 +1382,7 @@ if ( (JSON.stringify(this.form) == sessionStorage.getItem("apiform") && JSON.stringify(this.rbDetails) == - sessionStorage.getItem("apifunddetail")) || + sessionStorage.getItem("apifunddetail")) || !sessionStorage.getItem("apifunddetail") ) { } else { @@ -2104,6 +1398,9 @@ //鏌ユ壘鏄惁瀛樺湪鐧昏瀹屾垚璁板綍 //鍒ゆ柇鏄惁瀛樺湪涓婃姤璁板綍 this.form.recordstatus = 0; + var currenttime = new Date(); + this.form.createTime = currenttime.getFullYear() + "-" + (currenttime.getMonth() + 1) + "-" + currenttime.getDate() + " " + currenttime.getHours() + ":" + currenttime.getMinutes() + ":" + currenttime.getSeconds(); + if (!this.form.id) { this.form.id = this.$route.query.id; } @@ -2143,7 +1440,7 @@ return randomString; }, /** 鎻愪氦鎸夐挳 */ - submitForm: debounce(function() { + submitForm: debounce(function () { if (!this.randomnumber) { this.randomnumber = this.generateRandomString(9); this.form.randomnumber = this.randomnumber; @@ -2159,8 +1456,8 @@ if (tempDetail.itemid == null) { this.$modal.msgWarning( "鏈嶅姟椤圭洰琛ㄤ腑锛岀" + - (k + 1).toString() + - "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�" + (k + 1).toString() + + "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�" ); return; } @@ -2185,8 +1482,8 @@ if (tempDetail.servicesscope == null) { this.$modal.msgWarning( "鏈嶅姟椤圭洰琛ㄤ腑锛岀" + - (k + 1).toString() + - "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�" + (k + 1).toString() + + "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�" ); return; } @@ -2194,8 +1491,8 @@ if (tempDetail.beneficiaryno == null) { this.$modal.msgWarning( "鏈嶅姟椤圭洰琛ㄤ腑锛岀" + - (k + 1).toString() + - "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�" + (k + 1).toString() + + "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�" ); return; } @@ -2242,8 +1539,8 @@ ) { this.$modal.msgWarning( "鏈嶅姟椤圭洰琛ㄤ腑锛岀" + - (j + 1).toString() + - "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�" + (j + 1).toString() + + "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�" ); return; } @@ -2257,8 +1554,8 @@ ) { this.$modal.msgWarning( "鏈嶅姟椤圭洰琛ㄤ腑锛岀" + - (j + 1).toString() + - "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�" + (j + 1).toString() + + "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�" ); return; } @@ -2375,13 +1672,13 @@ // }, checksubmit() { console.log(this.checkObj.flowlevelone); - if(this.userprofile.nickName == "闄堟厱鍗�"){ + if (this.userprofile.nickName == "闄堟厱鍗�") { //妫�鏌ユ槸鍚︽敹鍒扮焊璐ㄦ潗鏂� - if ( this.form.checkstatus != 3 && this.checkObj.flowlevelone == 1 ) { + if (this.form.checkstatus != 3 && this.checkObj.flowlevelone == 1) { this.$modal.msgError("璇风‘璁ゆ姤閿�鐨勭焊璐ㄦ潗鏂欏凡缁忔敹鍒帮紒"); return; - } - + } + //妫�鏌ヤ釜绋庤绠� // if ( (this.form.applytype == "1" || this.form.applytype == "2") && this.form.fundtaxtime == null ) { // this.$modal.msgError( @@ -2389,7 +1686,7 @@ // ); // return; // } - if ( (this.form.applytype == "1") && this.form.fundtaxtime == null ) { + if ((this.form.applytype == "1") && this.form.fundtaxtime == null) { this.$modal.msgError( "鎻愪氦涓撳璐圭敤鐢宠鍗曞鏍革紝闇�瑕佸厛瀹屾垚涓◣璁$畻锛�" ); @@ -2447,67 +1744,43 @@ }); }, - //鑾峰彇鎵�鏈変笓瀹�/鍖荤枟鏈烘瀯/璐圭敤鎶ラ攢鏈烘瀯鍒楄〃 - getExternalList() { + //鑾峰彇涓撳銆佸崟浣嶆満鏋勭殑璐︽埛鍒楄〃 + getAccountList() { listExternalperson().then(res => { - this.personlist = res.rows; - for (let j = 0; j < this.personlist.length; j++) { - //鑾峰彇璐圭敤鎶ラ攢鏈烘瀯鍒楄〃 - if (this.personlist[j].usertype == "org") { - this.feeUnitList.push({ - id: this.personlist[j].id, - reportNo: this.personlist[j].userno, - reportName: this.personlist[j].username, - depositbank: this.personlist[j].depositbank, - branchbankname: this.personlist[j].branchbankname, - bankcardno: this.personlist[j].bankcardno + this.accountlist = res.rows; + /** + for (let j = 0; j < this.accountlist.length; j++) { + //鍗曚綅璐﹀彿鍒楄〃 + if (this.accountlist[j].usertype == "org") { + this.feeAccountList.push({ + id: this.accountlist[j].id, + reportNo: this.accountlist[j].userno, + reportName: this.accountlist[j].username, + depositbank: this.accountlist[j].depositbank, + branchbankname: this.accountlist[j].branchbankname, + bankcardno: this.accountlist[j].bankcardno }); } - //涓撳浜哄憳鍒楄〃 + //涓撳璐﹀彿鍒楄〃 else if (res.rows[j].usertype == "expert") { - this.expertlist.push({ - expertNo: this.personlist[j].id, - exportName: this.personlist[j].username + this.expertAccountList.push({ + expertNo: this.accountlist[j].id, + exportName: this.accountlist[j].username+"("+this.accountlist[j].id+")" }); } } + */ }); }, //鑾峰彇缁忓姙浜鸿处鍙蜂俊鎭� getUserAccount() { - this.personlist.map(res => { + this.accountlist.map(res => { if (res.username == this.form.username) { this.form.bankname = res.depositbank; //res.branchbankname銆乺es.depositbank; this.form.bankcardno = res.bankcardno; this.form.phone = res.telephone; } - }); - }, - - //鑾峰彇涓撳浜哄憳鍒楄〃 - getExpertList() { - let types = ["expert"]; - let templist = []; - for (let i = 0; i < types.length; i++) { - templist = []; - listReportname(types[i]).then(res => { - for (let j = 0; j < res.data.length; j++) { - templist.push({ - reportName: res.data[j].reportName, - reportNo: res.data[j].reportNo - }); - } - this.expertlist = this.expertlist.concat(templist); - }); - } - }, - - //鑾峰彇璐圭敤鏈烘瀯鍒楄〃 - getFeeUnitList() { - listReportname("org").then(res => { - this.feeUnitList = res.data; - console.log(this.feeUnitList); }); }, @@ -2796,8 +2069,8 @@ if (tempDetail.itemid == null) { this.$modal.msgWarning( "鏈嶅姟椤圭洰琛ㄤ腑锛岀" + - (k + 1).toString() + - "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�" + (k + 1).toString() + + "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�" ); return; } @@ -2806,8 +2079,8 @@ if (tempDetail.servicesscope == null) { this.$modal.msgWarning( "鏈嶅姟椤圭洰琛ㄤ腑锛岀" + - (k + 1).toString() + - "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�" + (k + 1).toString() + + "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�" ); return; } @@ -2815,8 +2088,8 @@ if (tempDetail.beneficiaryno == null) { this.$modal.msgWarning( "鏈嶅姟椤圭洰琛ㄤ腑锛岀" + - (k + 1).toString() + - "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�" + (k + 1).toString() + + "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�" ); return; } @@ -2863,8 +2136,8 @@ ) { this.$modal.msgWarning( "鏈嶅姟椤圭洰琛ㄤ腑锛岀" + - (j + 1).toString() + - "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�" + (j + 1).toString() + + "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�" ); return; } @@ -2878,8 +2151,8 @@ ) { this.$modal.msgWarning( "鏈嶅姟椤圭洰琛ㄤ腑锛岀" + - (j + 1).toString() + - "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�" + (j + 1).toString() + + "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�" ); return; } @@ -2929,7 +2202,7 @@ } this.Getnetworkheader(); this.getroute(); - this.getExternalList(); + this.getAccountList(); this.getUserList(); this.getUserProfile(); } else { @@ -3254,7 +2527,7 @@ }, //鏂囦欢涓婁紶 - handleUploadError() {}, + handleUploadError() { }, remove(file, fileList) { const rbDetails = [...this.rbDetails]; if (this.activeName == 1) { @@ -3463,176 +2736,163 @@ window.location.href = this.Networkheader + "/prod-api" + row.url; }, //涓撳/鍖荤枟鏈烘瀯/璐圭敤鎶ラ攢鏈烘瀯閫夋嫨 - ShowDetailDialog(spoce, showType) { - this.spocewl = spoce; - this.selectionType = showType; - if (this.businessType == 4 || this.businessType == 3 || !showType) { - this.selectionType = this.experthear; + showSelectionDialog(scope, selectiontype) { + this.selectionScope = scope; + this.selectionType = selectiontype; + this.accountselectform.index = scope.$index; + + if (this.selectionType == "account") { + //榛樿浠庤处鎴峰簱閫夋嫨锛�1,璐︽埛搴擄紱2锛屾柊寤鸿处鎴� + this.accountfrom = "1"; + + this.accountselectform.accountno = scope.row.beneficiaryno; + this.accountselectform.accountname = scope.row.beneficiaryname; + this.accountselectform.expertunitname = ""; + this.accountselectform.expertunitno = ""; + this.accountselectform.unitno = ""; + this.accountselectform.unitname = ""; + this.accountselectform.telephone = ""; + this.accountselectform.idcardno = ""; + this.accountselectform.title = ""; + this.accountselectform.unitno = ""; + this.accountselectform.unitname = ""; + this.accountselectform.depositbank = ""; + this.accountselectform.bankcardno = ""; + this.accountselectform.personnelunitno = ""; + this.accountselectform.address = ""; + this.accountselectform.telephone = ""; + } else if (this.selectionType == "workunit") { + this.accountselectform.expertunitname = scope.row.unitname; + this.accountselectform.expertunitno = scope.row.unitno; } - this.expertfrom = "1"; - console.log(spoce); - this.funddetailForm.index = spoce.$index; - this.funddetailForm.beneficiaryno = spoce.row.beneficiaryno; - this.funddetailForm.beneficiaryname = spoce.row.beneficiaryname; - this.funddetailForm.unitno = spoce.row.unitno; - this.funddetailForm.unitname = spoce.row.unitname; - this.funddetailForm.expertname = ""; - this.funddetailForm.expertidcardno = ""; - this.funddetailForm.expertunitno = ""; - this.funddetailForm.expertunitname = ""; - this.funddetailForm.experttitle = ""; - this.funddetailForm.expertdepositbank = ""; - this.funddetailForm.expertbankcardno = ""; - - this.showSelectionDialog = true; + this.showselectiondialog = true; }, //涓撳/鍖荤枟鏈烘瀯/璐圭敤鎶ラ攢鏈烘瀯閫夋嫨 - ConfirmDetailDialog() { - this.$refs["funddetailForm"].validate(valid => { - let tempIndex = this.funddetailForm.index; - let tempExpertName = this.funddetailForm.beneficiaryname; - let tempUnitname = this.funddetailForm.unitname; - let singleDetail = this.rbDetails[tempIndex]; + confirmSelectionDialog() { + this.$refs["accountselectform"].validate(valid => { + let tempIndex = this.accountselectform.index; + if (this.selectionType == "account") { + if (this.accountfrom == "1") { + //璧嬪�间俊鎭� + this.accountlist.map(res => { + if (res.username == this.accountselectform.accountname) { + this.rbDetails[tempIndex].beneficiaryno = res.userno; + this.rbDetails[tempIndex].beneficiaryname = res.username; + this.rbDetails[tempIndex].depositbank = res.depositbank; + this.rbDetails[tempIndex].branchbankname = res.branchbankname; + this.rbDetails[tempIndex].bankcardno = res.bankcardno; + this.rbDetails[tempIndex].phone = res.telephone; - if ( - this.selectionType == "expert" || - this.businessType == 4 || - this.businessType == 3 - ) { - if (this.expertfrom == "1" || this.experthear == "unit") { - //浠庝笓瀹跺垪琛ㄨ幏鍙栦俊鎭� - this.personlist.map(res => { - if (tempExpertName == res.username) { - singleDetail.beneficiaryno = res.userno; - singleDetail.beneficiaryname = res.username; - singleDetail.bankcardno = res.bankcardno; - singleDetail.branchbankname = res.branchbankname; - singleDetail.depositbank = res.depositbank; - singleDetail.idcardno = res.idcardno; - singleDetail.phone = res.telephone; - singleDetail.title = res.title; - singleDetail.unitname = res.unitname; - singleDetail.unitno = parseInt(res.unitno); + if (res.usertype == 'org') { + this.rbDetails[tempIndex].idcardno = ""; + this.rbDetails[tempIndex].title = ""; + this.rbDetails[tempIndex].unitno = ""; + this.rbDetails[tempIndex].unitname = ""; + } else { + this.rbDetails[tempIndex].idcardno = res.idcardno; + this.rbDetails[tempIndex].title = res.title; + this.rbDetails[tempIndex].unitno = parseInt(res.unitno); + this.rbDetails[tempIndex].unitname = res.unitname; + } } }); - } else { - //淇濆瓨鏂板涓撳 - this.expertform.id = null; - this.expertform.userno = - this.personlist[this.personlist.length - 1].id + 1; - this.expertform.usertype = "expert"; - this.expertform.username = this.funddetailForm.expertname; - this.expertform.idcardno = this.funddetailForm.expertidcardno; - this.expertform.sex = null; - this.expertform.telephone = null; - this.expertform.address = null; - this.expertform.wbm = null; - this.expertform.pym = null; + } else if (this.accountfrom == "2") { + //淇濆瓨鏂板璐﹀彿 + this.accountform.id = null; + this.accountform.userno = this.accountlist[this.accountlist.length - 1].id + 1; + this.accountform.usertype = this.accountselectform.usertype; + this.accountform.username = this.accountselectform.username; + this.accountform.idcardno = this.accountselectform.idcardno; + this.accountform.sex = null; + this.accountform.title = this.accountselectform.title; + this.accountform.telephone = this.accountselectform.telephone; + this.accountform.address = this.accountselectform.address; + this.accountform.wbm = null; + this.accountform.pym = null; - this.expertform.unitno = this.funddetailForm.expertunitno; - try { - let unitIndex = this.unitList.findIndex( - item => this.expertform.unitno == item.organizationid - ); - if (unitIndex > -1) { - this.expertform.unitname = this.unitList[ - unitIndex - ].organizationname; - } else { - this.expertform.unitname = this.expertform.unitno; - } - } catch { - this.expertform.unitname = this.expertform.unitno; + this.accountform.depositbank = this.accountselectform.depositbank; + this.accountform.bankcardno = this.accountselectform.bankcardno; + this.accountform.branchbankname = null; + this.accountform.remark = null; + this.accountform.del_flag = "0"; + this.accountform.personnelunitno = null; + + if (this.accountselectform.usertype != 'org') { + this.accountform.unitno = this.accountselectform.unitno; + this.unitList.map(res => { + if (res.organizationid == this.accountform.unitno) { + this.accountform.unitname = res.organizationname; + } + }); + // try { + // let unitIndex = this.unitList.findIndex( + // item => this.accountform.unitno == item.organizationid + // ); + // if (unitIndex > -1) { + // this.accountform.unitname = this.unitList[unitIndex].organizationname; + // } else { + // this.accountform.unitname = this.accountform.unitno; + // } + // } catch { + // this.accountform.unitname = this.accountform.unitno; + // } } - this.expertform.title = this.funddetailForm.experttitle; - this.expertform.personnelunitno = null; - - this.expertform.depositbank = this.funddetailForm.expertdepositbank; - this.expertform.bankcardno = this.funddetailForm.expertbankcardno; - this.expertform.branchbankname = null; - this.expertform.remark = null; - this.expertform.del_flag = "0"; - - addExternalperson(this.expertform).then(response => { + addExternalperson(this.accountform).then(response => { if (response.code == 200) { - this.$modal.msgSuccess("鏂板涓撳淇℃伅鎴愬姛锛�"); + //this.$modal.msgSuccess("鏂扮殑涓撳鎴栧崟浣嶈处鎴蜂俊鎭凡娣诲姞鎴愬姛锛�"); + this.accountselectform.accountno = this.accountselectform.userno; + this.accountselectform.accountname = this.accountselectform.username; + //閲嶆柊鑾峰彇璐︽埛鍒楄〃 listExternalperson().then(res => { - this.personlist = res.rows; - //浠庝笓瀹跺垪琛ㄨ幏鍙栦俊鎭� - this.personlist.map(res => { - if (res.username == this.funddetailForm.expertname) { - singleDetail.beneficiaryno = res.userno; - singleDetail.beneficiaryname = res.username; - singleDetail.bankcardno = res.bankcardno; - singleDetail.branchbankname = res.branchbankname; - singleDetail.depositbank = res.depositbank; - singleDetail.idcardno = res.idcardno; - singleDetail.phone = res.telephone; - singleDetail.title = res.title; - singleDetail.unitname = res.unitname; - singleDetail.unitno = parseInt(res.unitno); + this.accountlist = res.rows; + + //璧嬪�间俊鎭� + this.accountlist.map(res => { + if (res.username == this.accountselectform.accountname) { + this.rbDetails[tempIndex].beneficiaryno = res.userno; + this.rbDetails[tempIndex].beneficiaryname = res.username; + this.rbDetails[tempIndex].depositbank = res.depositbank; + this.rbDetails[tempIndex].branchbankname = res.branchbankname; + this.rbDetails[tempIndex].bankcardno = res.bankcardno; + this.rbDetails[tempIndex].phone = res.telephone; + + if (res.usertype == 'org') { + this.rbDetails[tempIndex].idcardno = ""; + this.rbDetails[tempIndex].title = ""; + this.rbDetails[tempIndex].unitno = ""; + this.rbDetails[tempIndex].unitname = ""; + } else { + this.rbDetails[tempIndex].idcardno = res.idcardno; + this.rbDetails[tempIndex].title = res.title; + this.rbDetails[tempIndex].unitno = parseInt(res.unitno); + this.rbDetails[tempIndex].unitname = res.unitname; + } } }); }); } }); } - } else if (this.selectionType == "unit") { - singleDetail.unitno = this.funddetailForm.unitno; - if (this.businessType == 1 || this.businessType == 2) { - try { - let unitIndex = this.unitList.findIndex( - item => singleDetail.unitno == item.organizationid - ); - if (unitIndex > -1) { - singleDetail.unitname = this.unitList[ - unitIndex - ].organizationname; - } else { - singleDetail.unitname = singleDetail.unitno; - } - } catch { - singleDetail.unitname = singleDetail.unitno; + } else if (this.selectionType == "workunit") { + this.rbDetails[tempIndex].unitno = this.accountselectform.expertunitno; + this.unitList.map(res => { + if (res.organizationid == this.accountform.unitno) { + this.rbDetails[tempIndex].unitno.unitname = res.organizationname; } - } else if (this.businessType == 3 || this.businessType == 4) { - try { - let unitIndex = this.feeUnitList.findIndex( - item => singleDetail.unitno == item.reportNo - ); - if (unitIndex > -1) { - singleDetail.unitname = this.feeUnitList[unitIndex].reportName; - singleDetail.depositbank = this.feeUnitList[ - unitIndex - ].depositbank; - singleDetail.bankcardno = this.feeUnitList[ - unitIndex - ].bankcardno; - } else { - singleDetail.unitname = singleDetail.unitno; - } - } catch { - singleDetail.unitname = singleDetail.unitno; - } - } + }); } - // if (this.experthear == "unit") { - // singleDetail.unitname = ""; - // } - if (this.businessType == 4 || this.businessType == 3) { - singleDetail.beneficiaryname = this.funddetailForm.beneficiaryname; - } - this.rbDetails[tempIndex] = singleDetail; - this.showSelectionDialog = false; + //鍏抽棴绐楀彛 + this.showselectiondialog = false; }); }, tableParValueChange(row, tto) { const regex = /^[1-9]\d{5}(19|20)\d{2}(0[1-9]|1[012])(0[1-9]|[12]\d|3[01])\d{3}([0-9]|X)$/; if (tto) { - if (regex.test(funddetailForm.expertidcardno)) { + if (regex.test(accountselectform.expertidcardno)) { row.error = ""; } else { row.error = "韬唤璇佸彿鐮佹牸寮忛敊璇�"; @@ -3653,8 +2913,7 @@ //鑾峰彇璺敱鍙傛暟 this.Getnetworkheader(); this.getroute(); - this.getExternalList(); - this.getFeeUnitList(); + this.getAccountList(); }, //鐢熷懡鍛ㄦ湡 - 鎸傝浇瀹屾垚锛堝彲浠ヨ闂瓺OM鍏冪礌锛� @@ -3662,25 +2921,23 @@ window.addEventListener("beforeunload", e => this.beforeunloadHandler(e)); this.getUserList(); this.getUserProfile(); - let apifunddetailForm = this.funddetailForm; + let apiaccountselectform = this.accountselectform; let apiform = this.form; - - // this.getFeeUnitList(); }, beforeRouteLeave(to, from, next) { // 鎵ц閿�姣佹搷浣� this.$destroy(); next(); }, - beforeCreate() {}, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠 - beforeMount() {}, //鐢熷懡鍛ㄦ湡 - 鎸傝浇涔嬪墠 - beforeUpdate() {}, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪墠 - updated() {}, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗 - beforeDestroy() {}, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓� + beforeCreate() { }, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠 + beforeMount() { }, //鐢熷懡鍛ㄦ湡 - 鎸傝浇涔嬪墠 + beforeUpdate() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪墠 + updated() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗 + beforeDestroy() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓� destroyed() { window.removeEventListener("beforeunload", e => this.beforeunloadFn(e)); }, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴� - activated() {} //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂 + activated() { } //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂 }; </script> @@ -3763,7 +3020,7 @@ line-height: 25px; } -::v-deep .el-checkbox.is-bordered + .el-checkbox.is-bordered { +::v-deep .el-checkbox.is-bordered+.el-checkbox.is-bordered { margin-left: 0 !important; margin-bottom: 10px; } -- Gitblit v1.9.3