From be47dc22ea72ba989f75419181284dca0021d018 Mon Sep 17 00:00:00 2001 From: heimawl <1785969728@qq.com> Date: 星期四, 10 八月 2023 11:13:16 +0800 Subject: [PATCH] 11 --- vue.config.js | 4 src/views/project/fund/fundcontext/index.vue | 1148 +++++++++++++++------- src/views/project/travelexpenseslist/Modifydetails/index.vue | 833 ++++++++++++--- src/views/project/fund/medicalCostFundApply/index.vue | 1007 +++++++++++++++----- 4 files changed, 2,185 insertions(+), 807 deletions(-) diff --git a/src/views/project/fund/fundcontext/index.vue b/src/views/project/fund/fundcontext/index.vue index 67f06de..861f102 100644 --- a/src/views/project/fund/fundcontext/index.vue +++ b/src/views/project/fund/fundcontext/index.vue @@ -7,27 +7,52 @@ <el-row> <el-col :span="5"> <el-form-item label="鐢宠鏃ユ湡" prop="createTime"> - <el-date-picker clearable style="width: 100%" v-model="form.createTime" type="date" - value-format="yyyy-MM-dd HH:mm:ss" placeholder="鐢宠鏃ユ湡"> + <el-date-picker + clearable + style="width: 100%" + v-model="form.createTime" + type="date" + value-format="yyyy-MM-dd HH:mm:ss" + placeholder="鐢宠鏃ユ湡" + > </el-date-picker> </el-form-item> </el-col> <el-col :span="5"> <el-form-item label="缁忓姙浜�" prop="username"> - <el-select v-model="form.username" placeholder="鐢宠浜�" clearable filterable allow-create style="width: 100%"> - <el-option v-for="dict in userlist" :key="dict.index" :label="dict.nickname" - :value="dict.nickname"></el-option> + <el-select + v-model="form.username" + placeholder="鐢宠浜�" + clearable + filterable + allow-create + style="width: 100%" + > + <el-option + v-for="dict in userlist" + :key="dict.index" + :label="dict.nickname" + :value="dict.nickname" + ></el-option> </el-select> </el-form-item> </el-col> <el-col :span="5"> <el-form-item label="鎵�灞炵粍鍒�" prop="deptmentname"> - <el-input v-model="form.deptmentname" placeholder="璇疯緭鍏ユ墍灞炵粍鍒�" clearable /> + <el-input + v-model="form.deptmentname" + placeholder="璇疯緭鍏ユ墍灞炵粍鍒�" + clearable + /> </el-form-item> </el-col> <el-col :span="5"> <el-form-item label="缁勯暱" prop="managername"> - <el-input v-model="form.managername" placeholder="璇疯緭鍏ョ粍闀�" clearable /> + <el-input + v-model="form.managername" + placeholder="璇疯緭鍏ョ粍闀�" + clearable + /> </el-form-item> </el-col> </el-row> @@ -41,7 +66,9 @@ --> <el-col :span="5"> <el-form-item label="鐢宠鍗曠被鍨�"> - <el-radio v-model="form.applytype" :label="businessType">{{ businessName }}</el-radio> + <el-radio v-model="form.applytype" :label="businessType">{{ + businessName + }}</el-radio> </el-form-item> </el-col> <el-col :span="10"> @@ -54,7 +81,6 @@ <el-input v-model="form.phone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" /> </el-form-item> </el-col> - </el-row> <el-row style="text-align: left"> <!-- @@ -66,12 +92,20 @@ --> <el-col :span="5"> <el-form-item label="鐢宠閲戦" prop="pretaxcost"> - <el-input v-model="form.pretaxcost" placeholder="绋庡墠閲戦鍚堣" :disabled="true" /> + <el-input + v-model="form.pretaxcost" + placeholder="绋庡墠閲戦鍚堣" + :disabled="true" + /> </el-form-item> </el-col> <el-col :span="5"> <el-form-item label="搴旂即绋�" prop="taxcost"> - <el-input v-model="form.taxcost" placeholder="搴旂即绋庨噾棰濆悎璁�" :disabled="true" /> + <el-input + v-model="form.taxcost" + placeholder="搴旂即绋庨噾棰濆悎璁�" + :disabled="true" + /> </el-form-item> </el-col> <!-- @@ -82,15 +116,29 @@ </el-col>--> <el-col :span="5"> <el-form-item label="鎹愮尞鑰�" prop="name"> - <el-input :disabled="true" v-model="form.name" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" /> + <el-input + :disabled="true" + v-model="form.name" + placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" + /> </el-form-item> </el-col> <el-col :span="5"> <el-form-item label="鐢宠鐘舵��" prop="recordstatus"> <!-- <el-input v-model="form.recordstatus" placeholder="瀹℃牳鎰忚"/> --> - <el-select v-model="form.recordstatus" placeholder="璇烽�夋嫨瀹℃牳鐘舵��" clearable size="small" :disabled="true"> - <el-option v-for="dict in dict.type.sys_recordstatus" :key="dict.value" :label="dict.label" - :value="dict.value" /> + <el-select + v-model="form.recordstatus" + placeholder="璇烽�夋嫨瀹℃牳鐘舵��" + clearable + size="small" + :disabled="true" + > + <el-option + v-for="dict in dict.type.sys_recordstatus" + :key="dict.value" + :label="dict.label" + :value="dict.value" + /> </el-select> </el-form-item> </el-col> @@ -98,65 +146,155 @@ <el-row style="margin-top: 5px; margin-bottom: 5px" /> <el-row style="margin-bottom: 10px" v-if="businessType == '1'"> <el-col :span="4"> - <el-button @click.native.prevent="addAllItems" type="primary" size="small"> + <el-button + @click.native.prevent="addAllItems" + type="primary" + size="small" + > 瀵煎叆鏈嶅姟椤圭洰 </el-button> </el-col> </el-row> <el-row> - <el-table :data="fundDetails" v-loading="loading" border highlight-current-row> - <el-table-column prop="orderno" align="center" label="搴忓彿" width="65"> + <el-table + :data="rbDetails" + v-loading="loading" + border + highlight-current-row + > + <el-table-column + prop="orderno" + align="center" + label="搴忓彿" + width="65" + > <template slot-scope="scope"> <el-input v-model="scope.row.orderno" placeholder="搴忓彿" /> </template> </el-table-column> - <el-table-column prop="applytype" align="center" label="璐圭敤绫诲瀷" width="200"> + <el-table-column + prop="applytype" + align="center" + label="璐圭敤绫诲瀷" + width="200" + > <template slot-scope="scope"> - <el-select v-model="scope.row.applytype" placeholder="璐圭敤绫诲瀷" @change="loadItemType(scope.row)"> - <el-option v-for="dict in rowfeeItemTypes" :key="dict.index" :label="dict.label" - :value="dict.value"></el-option> + <el-select + v-model="scope.row.applytype" + placeholder="璐圭敤绫诲瀷" + @change="loadItemType(scope.row)" + > + <el-option + v-for="dict in rowfeeItemTypes" + :key="dict.index" + :label="dict.label" + :value="dict.value" + ></el-option> </el-select> </template> </el-table-column> - <el-table-column prop="itemid" align="center" label="璐圭敤椤圭洰" width="260"> + <el-table-column + prop="itemid" + align="center" + label="璐圭敤椤圭洰" + width="260" + > <template slot-scope="scope"> - <el-select v-model="scope.row.itemid" placeholder="璐圭敤椤圭洰" filterable @change="verifyFeeItem(scope.row)" - :filter-method="(val) => searchItemType(val, scope)"> - <el-option v-for="dict in scope.row.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="itemcode" align="center" label="椤圭洰缂栧彿" show-overflow-tooltip="" - v-if="form.applytype == '1'"> + <el-table-column + prop="itemcode" + align="center" + label="椤圭洰缂栧彿" + show-overflow-tooltip="" + v-if="form.applytype == '1'" + > </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 filterable - @change="selectedRemark(scope.row)"> - <el-option v-for="dict in scope.row.rowfeeblocks" :key="dict.servicesscope" :label="dict.remark" - :value="dict.servicesscope"></el-option> + <el-select + v-model="scope.row.servicesscope" + placeholder="璐圭敤璇存槑" + clearable + allow-create + filterable + @change="selectedRemark(scope.row)" + > + <el-option + v-for="dict in scope.row.rowfeeblocks" + :key="dict.servicesscope" + :label="dict.remark" + :value="dict.servicesscope" + ></el-option> </el-select> </template> </el-table-column> - <el-table-column prop="price" align="center" label="鍗曚环" width="120" v-if="0"> + <el-table-column + prop="price" + align="center" + label="鍗曚环" + width="120" + v-if="0" + > <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="0"> + <el-table-column + prop="quantity" + align="center" + label="鏁伴噺" + width="120" + v-if="0" + > <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="this.ismanager == true" prop="amount" align="center" label="绋庡墠閲戦" width="120"> + <el-table-column + v-if="this.ismanager == true" + prop="amount" + align="center" + label="绋庡墠閲戦" + width="120" + > <template slot-scope="scope"> <!-- <el-select v-model="scope.row.amount" placeholder="绋庡墠閲戦" clearable filterable allow-create @@ -168,17 +306,37 @@ <el-input v-model="scope.row.amount" placeholder="绋庡墠閲戦" /> </template> </el-table-column> - <el-table-column prop="taxedamount" align="center" label="绋庡悗閲戦" width="120" - v-if="this.ismanager == true & (form.applytype == '1' || form.applytype == '2')"> + <el-table-column + prop="taxedamount" + align="center" + label="绋庡悗閲戦" + width="120" + v-if=" + (this.ismanager == true) & + (form.applytype == '1' || form.applytype == '2') + " + > <template slot-scope="scope"> - <el-input v-model="scope.row.taxedamount" placeholder="绋庡悗閲戦" /> + <el-input + v-model="scope.row.taxedamount" + placeholder="绋庡悗閲戦" + /> </template> </el-table-column> - <el-table-column prop="beneficiaryname" align="center" label="濮撳悕" width="100" - v-if="form.applytype == '1' || form.applytype == '2'"> + <el-table-column + prop="beneficiaryname" + align="center" + label="濮撳悕" + width="100" + v-if="form.applytype == '1' || form.applytype == '2'" + > <template slot-scope="scope"> - <el-button type="primary" plain @click="ShowDetailDialog(scope, 'name')">{{ scope.row.beneficiaryname - }}</el-button> + <el-button + type="primary" + plain + @click="ShowDetailDialog(scope, 'name')" + >{{ scope.row.beneficiaryname }}</el-button + > <!-- <el-select filterable allow-create @@ -198,10 +356,19 @@ </el-select> --> </template> </el-table-column> - <el-table-column prop="unitno" align="center" label="鍗曚綅鍚嶇О" v-if="form.applytype != '4'"> + <el-table-column + prop="unitno" + align="center" + label="鍗曚綅鍚嶇О" + v-if="form.applytype != '4'" + > <template slot-scope="scope"> - <el-button type="primary" plain @click="ShowDetailDialog(scope, 'unit')">{{ scope.row.unitname - }}</el-button> + <el-button + type="primary" + plain + @click="ShowDetailDialog(scope, 'unit')" + >{{ scope.row.unitname }}</el-button + > <!-- <el-select v-model="scope.row.unitno" placeholder="鍗曚綅" @@ -218,43 +385,98 @@ </el-select> --> </template> </el-table-column> - <el-table-column prop="remark" align="center" label="澶囨敞" v-if="form.applytype == '4'"> + <el-table-column + prop="remark" + align="center" + label="澶囨敞" + v-if="form.applytype == '4'" + > <template slot-scope="scope"> <el-input v-model="scope.row.remark" placeholder="澶囨敞" /> </template> </el-table-column> - <el-table-column prop="title" align="center" label="鑱岀О" width="120" - v-if="form.applytype == '1' || form.applytype == '2'"> + <el-table-column + prop="title" + align="center" + label="鑱岀О" + width="120" + v-if="form.applytype == '1' || form.applytype == '2'" + > <template slot-scope="scope"> <el-input v-model="scope.row.title" placeholder="鑱岀О" /> </template> </el-table-column> - <el-table-column prop="idcardno" align="center" label="韬唤璇佸彿" width="200" - v-if="form.applytype == '1' || form.applytype == '2'"> + <el-table-column + prop="idcardno" + align="center" + label="韬唤璇佸彿" + width="200" + v-if="form.applytype == '1' || form.applytype == '2'" + > <template slot-scope="scope"> <el-input v-model="scope.row.idcardno" placeholder="韬唤璇佸彿" /> </template> </el-table-column> - <el-table-column prop="depositbank" align="center" label="寮�鎴烽摱琛�" width="200" v-if="form.applytype != '4'"> + <el-table-column + prop="depositbank" + align="center" + label="寮�鎴烽摱琛�" + width="200" + v-if="form.applytype != '4'" + > <template slot-scope="scope"> - <el-input v-model="scope.row.depositbank" placeholder="寮�鎴烽摱琛�" /> + <el-input + v-model="scope.row.depositbank" + placeholder="寮�鎴烽摱琛�" + /> </template> </el-table-column> - <el-table-column prop="bankcardno" align="center" label="閾惰甯愬彿" width="210" v-if="form.applytype != '4'"> + <el-table-column + prop="bankcardno" + align="center" + label="閾惰甯愬彿" + width="210" + v-if="form.applytype != '4'" + > <template slot-scope="scope"> - <el-input v-model="scope.row.bankcardno" placeholder="閾惰甯愬彿" /> + <el-input + v-model="scope.row.bankcardno" + placeholder="閾惰甯愬彿" + /> </template> </el-table-column> - <el-table-column fixed="right" align="center" label="鎿嶄綔" width="180"> + <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'">鏂板</el-button> - <el-button @click.native.prevent="deleteRows(scope.row, scope.$index, fundDetails)" type="text" - size="small" v-if="operationType == 'add' || operationType == 'update'"> + <el-button + type="text" + size="mini" + @click="addRow(scope.$index)" + v-if="operationType == 'add' || operationType == 'update'" + >鏂板</el-button + > + <el-button + @click.native.prevent=" + deleteRows(scope.row, scope.$index, rbDetails) + " + type="text" + size="small" + v-if="operationType == 'add' || operationType == 'update'" + > 鍒犻櫎 </el-button> - <el-button @click.native.prevent="Filepopup(scope.$index, fundDetails, scope.row)" type="text" - size="small">绁ㄦ嵁</el-button> + <el-button + @click.native.prevent=" + Filepopup(scope.$index, rbDetails, scope.row) + " + type="text" + size="small" + >绁ㄦ嵁</el-button + > </template> </el-table-column> </el-table> @@ -302,29 +524,78 @@ --> <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="fileList" multiple - :limit="20" :headers="headers" :on-success="(response, file, fileList) => - uploadSccess(response, file, fileList) - " :on-preview="downFile" :disabled='operationType == "detail"' :on-error="handleUploadError" - :on-exceed="handleExceed" :on-remove="remove" accept="image/*,.pdf"> - <el-button :disabled='operationType == "detail"' size="small" type="primary">涓婁紶</el-button> + <el-form-item + label="璐圭敤鐢宠闄勪欢" + align="left" + prop="annexbankcard" + v-if="businessType == 0" + > + <el-upload + size="mini" + class="upload-demo" + :action="uploadFileUrl" + :file-list="fileList" + multiple + :limit="20" + :headers="headers" + :on-success=" + (response, file, fileList) => + uploadSccess(response, file, fileList) + " + :on-preview="downFile" + :disabled="operationType == 'detail'" + :on-error="handleUploadError" + :on-exceed="handleExceed" + :on-remove="remove" + accept="image/*,.pdf" + > + <el-button + :disabled="operationType == 'detail'" + size="small" + type="primary" + >涓婁紶</el-button + > </el-upload> </el-form-item> </el-col> </el-row> <el-row v-if="operationType == 'detail' || operationType == 'check'"> <el-table :data="fundflowList" border> - <el-table-column label="瀹℃牳浜�" align="center" width="120" prop="checkusername" /> - <el-table-column label="瀹℃牳鏃ユ湡" align="center" width="160" prop="createTime" /> - <el-table-column label="瀹℃牳缁撴灉" align="center" width="200" prop="flowconclusion"><template - slot-scope="scope"><span v-if="scope.row.flowconclusion == 1">閫氳繃</span><span - v-if="scope.row.flowconclusion == 2">涓嶉�氳繃</span></template> + <el-table-column + label="瀹℃牳浜�" + align="center" + width="120" + prop="checkusername" + /> + <el-table-column + label="瀹℃牳鏃ユ湡" + align="center" + width="160" + prop="createTime" + /> + <el-table-column + label="瀹℃牳缁撴灉" + align="center" + width="200" + prop="flowconclusion" + ><template slot-scope="scope" + ><span v-if="scope.row.flowconclusion == 1">閫氳繃</span + ><span v-if="scope.row.flowconclusion == 2" + >涓嶉�氳繃</span + ></template + > </el-table-column> - <el-table-column label="瀹℃牳澶囨敞" align="center" prop="flowcontent" /> + <el-table-column + label="瀹℃牳澶囨敞" + align="center" + prop="flowcontent" + /> </el-table> </el-row> - <el-row style="margin-top: 25px; margin-bottom: 5px" v-if="operationType == 'check'"> + <el-row + style="margin-top: 25px; margin-bottom: 5px" + v-if="operationType == 'check'" + > <el-col :span="7"> <el-form-item label="瀹℃牳缁撴灉" align="left"> <el-radio-group v-model="checkObj.flowlevelone" align="left"> @@ -343,15 +614,32 @@ </el-row> </el-form> <div slot="footer" class="dialog-footer"> - <el-button type="primary" @click="submitForm" v-if="operationType == 'add' || operationType == 'update'">淇� - 瀛�</el-button> - <el-button type="primary" @click="checksubmit" v-if="operationType == 'check'">淇� 瀛�</el-button> - <el-button @click="cancel" v-if="operationType == 'detail'">閫� 鍑�</el-button> + <el-button + type="primary" + @click="submitForm" + v-if="operationType == 'add' || operationType == 'update'" + >淇� 瀛�</el-button + > + <el-button + type="primary" + @click="checksubmit" + v-if="operationType == 'check'" + >淇� 瀛�</el-button + > + <el-button @click="cancel" v-if="operationType == 'detail'" + >閫� 鍑�</el-button + > </div> </div> - <el-dialog :visible.sync="showDetailInfoDialog" :close-on-click-modal="false" :title="'鍗曚綅/涓撳淇℃伅閫夋嫨'" width="500px" - style="text-align: center" v-loading="loading"> + <el-dialog + :visible.sync="showDetailInfoDialog" + :close-on-click-modal="false" + :title="'鍗曚綅/涓撳淇℃伅閫夋嫨'" + width="500px" + style="text-align: center" + v-loading="loading" + > <el-form ref="funddetailForm" :model="funddetailForm"> <el-row> <el-col :span="24" v-if="showDetailInfoType == 'name'"> @@ -362,29 +650,77 @@ </el-radio-group> </el-form-item> </el-col> - <el-col :span="24" v-if="showDetailInfoType == 'name' && expertfrom == '1'"> - <el-form-item label="涓撳濮撳悕" prop="beneficiaryname" label-width="80px"> - <el-select filterable allow-create ref="beneficiaryname" default-first-option - v-model="funddetailForm.beneficiaryname" placeholder="璇烽�夋嫨" style="width: 100%"> - <el-option v-for="item in expertlist" :key="item.reportNo" :label="item.reportName" - :value="item.reportName"> + <el-col + :span="24" + v-if="showDetailInfoType == 'name' && expertfrom == '1'" + > + <el-form-item + label="涓撳濮撳悕" + prop="beneficiaryname" + label-width="80px" + > + <el-select + filterable + allow-create + ref="beneficiaryname" + default-first-option + v-model="funddetailForm.beneficiaryname" + placeholder="璇烽�夋嫨" + style="width: 100%" + > + <el-option + v-for="item in expertlist" + :key="item.reportNo" + :label="item.reportName" + :value="item.reportName" + > </el-option> </el-select> </el-form-item> </el-col> <el-col :span="24" v-if="showDetailInfoType == 'unit'"> - <el-form-item label="鍗曚綅鍚嶇О" prop="unitno" label-width="120px" v-if="businessType == 1 || businessType == 2"> - <el-select v-model="funddetailForm.unitno" placeholder="鍗曚綅鍚嶇О" clearable filterable allow-create - style="width: 100%"> - <el-option v-for="(spec, index) in unitList" :key="index" :label="spec.organizationname" - :value="spec.organizationid"></el-option> + <el-form-item + label="鍗曚綅鍚嶇О" + prop="unitno" + label-width="120px" + v-if="businessType == 1 || businessType == 2" + > + <el-select + v-model="funddetailForm.unitno" + placeholder="鍗曚綅鍚嶇О" + clearable + filterable + allow-create + style="width: 100%" + > + <el-option + v-for="(spec, index) in unitList" + :key="index" + :label="spec.organizationname" + :value="spec.organizationid" + ></el-option> </el-select> </el-form-item> - <el-form-item label="鍙戠エ鍗曚綅鍚嶇О" prop="unitno" label-width="120px" v-if="businessType == 3 || businessType == 4"> - <el-select v-model="funddetailForm.unitno" placeholder="鍗曚綅鍚嶇О" clearable filterable allow-create - style="width: 100%"> - <el-option v-for="(item, index) in feeUnitList" :key="index" :label="item.reportName" - :value="item.reportNo"></el-option> + <el-form-item + label="鍙戠エ鍗曚綅鍚嶇О" + prop="unitno" + label-width="120px" + v-if="businessType == 3 || businessType == 4" + > + <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> @@ -392,22 +728,43 @@ <el-row> <el-col :span="12" v-if="expertfrom == '2'"> <el-form-item label="涓撳濮撳悕" prop="expertname" label-width="80px"> - <el-input v-model="funddetailForm.expertname" placeholder="蹇呭~椤�" /> + <el-input + v-model="funddetailForm.expertname" + placeholder="蹇呭~椤�" + /> </el-form-item> </el-col> <el-col :span="12" v-if="expertfrom == '2'"> - <el-form-item label="鑱� 绉�" prop="experttitle" label-width="80px"> - <el-select v-model="funddetailForm.experttitle" placeholder="蹇呭~椤�"> - <el-option v-for="dict in dict.type.sys_professionaltitle" :key="dict.value" :label="dict.label" - :value="dict.label"></el-option> + <el-form-item + label="鑱� 绉�" + prop="experttitle" + label-width="80px" + > + <el-select + v-model="funddetailForm.experttitle" + placeholder="蹇呭~椤�" + > + <el-option + v-for="dict in dict.type.sys_professionaltitle" + :key="dict.value" + :label="dict.label" + :value="dict.label" + ></el-option> </el-select> </el-form-item> </el-col> </el-row> <el-row> <el-col :span="24" v-if="expertfrom == '2'"> - <el-form-item label="韬唤璇佸彿" prop="expertidcardno" label-width="80px"> - <el-input v-model="funddetailForm.expertidcardno" placeholder="蹇呭~椤�" /> + <el-form-item + label="韬唤璇佸彿" + prop="expertidcardno" + label-width="80px" + > + <el-input + v-model="funddetailForm.expertidcardno" + placeholder="蹇呭~椤�" + /> </el-form-item> </el-col> </el-row> @@ -425,42 +782,91 @@ --> <el-row> <el-col :span="24" v-if="expertfrom == '2'"> - <el-form-item label="鍗曚綅鍚嶇О" prop="expertunitno" label-width="80px"> - <el-select v-model="funddetailForm.expertunitno" placeholder="鍗曚綅鍚嶇О" clearable filterable allow-create - style="width: 100%"> - <el-option v-for="(spec, index) in unitList" :key="index" :label="spec.organizationname" - :value="spec.organizationid"></el-option> - </el-select> - </el-form-item></el-col> + <el-form-item + label="鍗曚綅鍚嶇О" + prop="expertunitno" + label-width="80px" + > + <el-select + v-model="funddetailForm.expertunitno" + placeholder="鍗曚綅鍚嶇О" + clearable + filterable + allow-create + style="width: 100%" + > + <el-option + v-for="(spec, index) in unitList" + :key="index" + :label="spec.organizationname" + :value="spec.organizationid" + ></el-option> + </el-select> </el-form-item + ></el-col> </el-row> <el-row> <el-col :span="24" v-if="expertfrom == '2'"> - <el-form-item label="寮�鎴烽摱琛�" prop="expertdepositbank" label-width="80px"> - <el-input v-model="funddetailForm.expertdepositbank" placeholder="蹇呭~椤�" /> + <el-form-item + label="寮�鎴烽摱琛�" + prop="expertdepositbank" + label-width="80px" + > + <el-input + v-model="funddetailForm.expertdepositbank" + placeholder="蹇呭~椤�" + /> </el-form-item> </el-col> <el-col :span="24" v-if="expertfrom == '2'"> - <el-form-item label="閾惰鍗″彿" prop="expertbankcardno" label-width="80px"> - <el-input v-model="funddetailForm.expertbankcardno" placeholder="蹇呭~椤�" /> + <el-form-item + label="閾惰鍗″彿" + prop="expertbankcardno" + label-width="80px" + > + <el-input + v-model="funddetailForm.expertbankcardno" + placeholder="蹇呭~椤�" + /> </el-form-item> </el-col> </el-row> </el-form> <span slot="footer" class="dialog-footer"> <el-button @click="showDetailInfoDialog = false">鍙� 娑�</el-button> - <el-button type="primary" @click="ConfirmDetailDialog()">纭� 瀹�</el-button> + <el-button type="primary" @click="ConfirmDetailDialog()" + >纭� 瀹�</el-button + > </span> </el-dialog> <el-dialog :title="pdftitle" :visible.sync="pdfVisible" width="50%"> <div class="pdfimg"> <div class="box-pdf"> <div> - <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileListto" multiple - :limit="20" :headers="headers" :on-success="(response, file, fileList) => - uploadSccess(response, file, fileList) - " :on-preview="downFile" :disabled="operationType == 'detail'" :on-error="handleUploadError" - :on-exceed="handleExceed" :on-remove="remove" accept="image/*,.pdf"> - <el-button :disabled="operationType == 'detail'" size="small" type="primary">涓婁紶</el-button> + <el-upload + size="mini" + class="upload-demo" + :action="uploadFileUrl" + :file-list="fileListto" + multiple + :limit="20" + :headers="headers" + :on-success=" + (response, file, fileList) => + uploadSccess(response, file, fileList) + " + :on-preview="downFile" + :disabled="operationType == 'detail'" + :on-error="handleUploadError" + :on-exceed="handleExceed" + :on-remove="remove" + accept="image/*,.pdf" + > + <el-button + :disabled="operationType == 'detail'" + size="small" + type="primary" + >涓婁紶</el-button + > </el-upload> </div> <!-- <div @@ -509,7 +915,7 @@ import { onelistFunds, - listFunddetails, + listrbDetails, listFunddetail, getFunddetail, delFunddetail, @@ -556,7 +962,7 @@ //import寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢� components: { Li_area_select, - OrgSelecter, + OrgSelecter }, name: "fundApply", @@ -629,9 +1035,9 @@ // 鎹愮尞浜洪亾鎱伴棶閲戣〃鏍兼暟鎹� donateconsolationfundList: [], //璐圭敤鏄庣粏鍒楄〃 - fundDetails: [], + rbDetails: [], formData: {}, - amount: 0.00, + amount: 0.0, totalPreTaxAmount: 0.0, totalAfterTaxAmount: 0.0, totalAmount: 0.0, @@ -673,7 +1079,7 @@ expertunitname: null, experttitle: null, expertdepositbank: null, - expertbankcardno: null, + expertbankcardno: null }, expertform: { @@ -701,7 +1107,7 @@ userno: null, userstatus: 1, usertype: null, - wbm: null, + wbm: null }, // 鏌ヨ鍙傛暟 @@ -719,7 +1125,7 @@ treatmenthospitalname: null, donorno: null, reportername: null, - reporttime: null, + reporttime: null }, fundQueryParam: { @@ -727,7 +1133,7 @@ pageSize: 100, infoid: null, applytype: "0", - createBy: null, + createBy: null }, expertQueryParam: { @@ -735,14 +1141,14 @@ pageSize: 10000, userno: null, username: null, - usertype: null, + usertype: null }, //璁$畻涓◣鍙傛暟 taxParam: { - beneficiaryNo: '', - money: '0', - startTime: '', + beneficiaryNo: "", + money: "0", + startTime: "" }, //闄勪欢鍒楄〃 @@ -752,7 +1158,7 @@ uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", //鏂囦欢涓婁紶token headers: { - Authorization: "Bearer " + getToken(), + Authorization: "Bearer " + getToken() }, //绁ㄦ嵁鏂囦欢 pdftitle: "", @@ -760,15 +1166,14 @@ pdfVisible: false, previewpdf: false, hintitle: "閫変腑宸︿晶宸蹭笂浼犳枃浠堕瑙堟煡鐪�", - atpresent: "", - + atpresent: "" }; }, //鐩戝惉灞炴�� 绫讳技浜巇ata姒傚康 computed: {}, //鐩戞帶data涓殑鏁版嵁鍙樺寲 watch: {}, - //鐢熷懡鍛ㄦ湡 - 鍒涘缓瀹屾垚锛堝彲浠ヨ闂綋鍓峵his瀹炰緥锛� + //鐢熷懡鍛ㄦ湡 - 鍒涘缓瀹屾垚锛堝彲浠ヨ闂綋鍓峵his瀹炰緥锛� created() { //鑾峰彇璺敱鍙傛暟 @@ -784,14 +1189,13 @@ this.getExternalList(); }, - beforeCreate() { - }, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠 - beforeMount() { }, //鐢熷懡鍛ㄦ湡 - 鎸傝浇涔嬪墠 - beforeUpdate() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪墠 - updated() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗 - beforeDestroy() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓� - destroyed() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴� - activated() { }, //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂 + beforeCreate() {}, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠 + beforeMount() {}, //鐢熷懡鍛ㄦ湡 - 鎸傝浇涔嬪墠 + beforeUpdate() {}, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪墠 + updated() {}, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗 + beforeDestroy() {}, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓� + destroyed() {}, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴� + activated() {}, //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂 //鏂规硶闆嗗悎 methods: { @@ -838,11 +1242,11 @@ consolationmoney: null, servicetypename: null, servicesscope: null, - servicesscopename: null, + servicesscopename: null }; this.resetForm("form"); //娓呯┖闄勪欢 - this.fileList = [] + this.fileList = []; }, /** 閫氳繃鍙傛暟鑾峰彇涓氬姟绫诲瀷 */ getroute() { @@ -857,31 +1261,28 @@ // if (!this.businessType && !this.operationType) { if (this.businessType == "1") { this.curCase = this.$route.query.curCase; - this.businessName = '涓撳鍔冲姟璐圭敵璇峰崟'; + this.businessName = "涓撳鍔冲姟璐圭敵璇峰崟"; } else if (this.businessType == "2") { this.curCase = this.$route.query.curCase; - this.businessName = '浼︾悊涓撳鍔冲姟璐圭敵璇峰崟'; - } - else if (this.businessType == "3") { + this.businessName = "浼︾悊涓撳鍔冲姟璐圭敵璇峰崟"; + } else if (this.businessType == "3") { this.curCase = this.$route.query.curCase; - this.businessName = '鍖诲鎴愭湰鎶ラ攢鍗�'; - } - else if (this.businessType == "4") { - this.businessName = '鏉傞」璐圭敤鎶ラ攢鍗�'; + this.businessName = "鍖诲鎴愭湰鎶ラ攢鍗�"; + } else if (this.businessType == "4") { + this.businessName = "鏉傞」璐圭敤鎶ラ攢鍗�"; } - if (this.operationType == 'add') { - this.title = this.businessName + '鏂板缓' + if (this.operationType == "add") { + this.title = this.businessName + "鏂板缓"; this.handleAdd(); - } else if (this.operationType == 'update') { - this.title = this.businessName + '淇敼' + } else if (this.operationType == "update") { + this.title = this.businessName + "淇敼"; this.handleUpdate(); - } - else if (this.operationType == 'detail') { - this.title = this.businessName + '鏌ョ湅' + } else if (this.operationType == "detail") { + this.title = this.businessName + "鏌ョ湅"; this.handleDetail(); - } else if (this.operationType == 'check') { - this.title = this.businessName + '瀹℃牳' + } else if (this.operationType == "check") { + this.title = this.businessName + "瀹℃牳"; this.handleCheck(); } // } else { @@ -898,15 +1299,19 @@ /** businessType锛�1锛氫笓瀹惰垂锛�2锛氫鸡鐞嗕笓瀹惰垂锛�3锛氬尰瀛︽垚鏈紱4锛氭潅椤硅垂鐢�*/ this.form.applytype = this.businessType; - if (this.businessType == "1" || this.businessType == "2" || this.businessType == "3") { - console.log("", this.curCase) + if ( + this.businessType == "1" || + this.businessType == "2" || + this.businessType == "3" + ) { + console.log("", this.curCase); this.form.infoid = this.curCase.id; this.form.donorname = this.curCase.name; this.form.donorno = this.curCase.donorno; } - //鍒濆鍖栨槑缁� - this.fundDetails = []; + //鍒濆鍖栨槑缁� + this.rbDetails = []; this.addRow(0); }, @@ -915,34 +1320,34 @@ this.isopen = 0; this.reset(); - getFund(this.curId).then((response) => { + getFund(this.curId).then(response => { this.form = response.data; // this.form.recordstate =-1; // this.form.recordstatus = response.data.recordstatus + ""; //闄勪欢澶勭悊 - this.fileList = this.form.annexbankcard ? this.form.annexbankcard.split(",").map(item => ({ url: item, name: item })) : [] + // this.fileList = this.form.annexbankcard ? this.form.annexbankcard.split(",").map(item => ({ url: item, name: item })) : [] //鏄庣粏澶勭悊 - getownFundDetail(this.curId).then((res) => { - this.fundDetails = res.data; - console.log(this.curId,res.data); - if (this.fundDetails.length > 0) { - for (let m = 0; m < this.fundDetails.length; m++) { - this.fundDetails[m].itemlist = []; - this.getitemlist(m, this.fundDetails[m]); + getownFundDetail(this.curId).then(res => { + this.rbDetails = res.data; + console.log(this.curId, res.data); + if (this.rbDetails.length > 0) { + for (let m = 0; m < this.rbDetails.length; m++) { + this.rbDetails[m].itemlist = []; + this.getitemlist(m, this.rbDetails[m]); //鑾峰彇璐圭敤椤圭洰鐨勮缁嗕俊鎭� - this.fundDetails[m].rowfeeblocks = []; - this.fundDetails[m].rowfeeblocks.push({ - servicesscope: this.fundDetails[m].servicesscope, - expensedescribe: this.fundDetails[m].servicesscopename, - expense: this.fundDetails[m].expense, - remark: this.fundDetails[m].servicesscopename, + this.rbDetails[m].rowfeeblocks = []; + this.rbDetails[m].rowfeeblocks.push({ + servicesscope: this.rbDetails[m].servicesscope, + expensedescribe: this.rbDetails[m].servicesscopename, + expense: this.rbDetails[m].expense, + remark: this.rbDetails[m].servicesscopename }); - // getdetailsByItemId(this.fundDetails[m].itemid).then((res) => { + // getdetailsByItemId(this.rbDetails[m].itemid).then((res) => { // let fundmsg = res.data; // fundmsg.forEach((item) => { - // this.fundDetails[m].rowfeeblocks.push({ + // this.rbDetails[m].rowfeeblocks.push({ // servicesscope: item.id, // expensedescribe: item.expensedescribe, // expense: item.expense, @@ -951,7 +1356,9 @@ // }); // }); } - } else { this.addRow(0); } + } else { + this.addRow(0); + } }); }); }, @@ -961,37 +1368,37 @@ this.isopen = 0; this.reset(); - getFund(this.curId).then((response) => { + getFund(this.curId).then(response => { this.form = response.data; let listFundflowparams = { fundid: this.curId, - fundtype: this.businessType, + fundtype: this.businessType }; //闄勪欢澶勭悊 - this.fileList = this.form.annexbankcard ? this.form.annexbankcard.split(",").map(item => ({ url: item, name: item })) : [] + // this.fileList = this.form.annexbankcard ? this.form.annexbankcard.split(",").map(item => ({ url: item, name: item })) : [] //涓氬姟鏄庣粏 - getownFundDetail(this.curId).then((res) => { - this.fundDetails = res.data; - for (let m = 0; m < this.fundDetails.length; m++) { - this.fundDetails[m].itemlist = []; - this.getitemlist(m, this.fundDetails[m]); - this.fundDetails[m].rowfeeblocks = []; - this.fundDetails[m].rowfeeblocks.push({ - expense: this.fundDetails[m].expense, - expensedescribe: this.fundDetails[m].servicesscopename, - remark: this.fundDetails[m].servicesscope, - servicesscope: this.fundDetails[m].servicesscope, + getownFundDetail(this.curId).then(res => { + this.rbDetails = res.data; + for (let m = 0; m < this.rbDetails.length; m++) { + this.rbDetails[m].itemlist = []; + this.getitemlist(m, this.rbDetails[m]); + this.rbDetails[m].rowfeeblocks = []; + this.rbDetails[m].rowfeeblocks.push({ + expense: this.rbDetails[m].expense, + expensedescribe: this.rbDetails[m].servicesscopename, + remark: this.rbDetails[m].servicesscope, + servicesscope: this.rbDetails[m].servicesscope }); } - if (this.fundDetails.length == 0) { + if (this.rbDetails.length == 0) { this.addRow(0); } }); //涓氬姟娴佺▼ - listFundflow(listFundflowparams).then((res) => { + listFundflow(listFundflowparams).then(res => { this.fundflowList = res.rows; }); }); @@ -1000,11 +1407,11 @@ handleDelete() { this.$modal .confirm("鏄惁纭鍒犻櫎璇ヨ褰曪紵") - .then(function () { + .then(function() { return delFund(this.curId); }) .then(() => { - getownFundDetail(this.curId).then((res) => { + getownFundDetail(this.curId).then(res => { let listdetails = res.data; for (let i = 0; i < listdetails.length; i++) { delFunddetail(listdetails[i].id); @@ -1013,7 +1420,7 @@ this.getfundList(); this.$modal.msgSuccess("鍒犻櫎鎴愬姛"); }) - .catch(() => { }); + .catch(() => {}); }, /** 涓婃姤鎸夐挳鎿嶄綔 */ @@ -1021,23 +1428,23 @@ this.$confirm("鏄惁纭灏嗙櫥璁拌褰曚笂鎶ワ紵", "鎻愮ず", { confirmButtonText: "纭畾", cancelButtonText: "鍙栨秷", - type: "warning", + type: "warning" }) .then(() => { //鏌ユ壘鏄惁瀛樺湪鐧昏瀹屾垚璁板綍 //鍒ゆ柇鏄惁瀛樺湪涓婃姤璁板綍 this.form.recordstatus = 0; - updateFund(this.form).then((response) => { + updateFund(this.form).then(response => { if (response.code == 200) { this.$message({ type: "success", - message: "鐢宠鎴愬姛", + message: "鐢宠鎴愬姛" }); } else { this.$message({ type: "error", - message: "鐢宠澶辫触", + message: "鐢宠澶辫触" }); } this.loading = false; @@ -1046,14 +1453,14 @@ .catch(() => { this.$message({ type: "info", - message: "宸插彇娑堢敵璇�", + message: "宸插彇娑堢敵璇�" }); }); }, /** 鎻愪氦鎸夐挳 */ submitForm() { - this.$refs["form"].validate((valid) => { + this.$refs["form"].validate(valid => { if (valid) { this.formData = this.form; // let totalPreTaxAmount = 0.0; @@ -1061,21 +1468,33 @@ // let totalAmount = 0.0; //淇濆瓨鍓嶆牎楠屾暟鎹� - for (let k = 0; k < this.fundDetails.length; k++) { - let tempDetail = this.fundDetails[k]; + for (let k = 0; k < this.rbDetails.length; k++) { + let tempDetail = this.rbDetails[k]; if (tempDetail.itemid == null) { - this.$modal.msgWarning("鏈嶅姟椤圭洰琛ㄤ腑锛岀" + (k + 1).toString() + "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�"); + this.$modal.msgWarning( + "鏈嶅姟椤圭洰琛ㄤ腑锛岀" + + (k + 1).toString() + + "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�" + ); return; } - if (this.businessType == '1' || this.businessType == '2') { + if (this.businessType == "1" || this.businessType == "2") { if (tempDetail.servicesscope == null) { - this.$modal.msgWarning("鏈嶅姟椤圭洰琛ㄤ腑锛岀" + (k + 1).toString() + "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�"); + this.$modal.msgWarning( + "鏈嶅姟椤圭洰琛ㄤ腑锛岀" + + (k + 1).toString() + + "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�" + ); return; } if (tempDetail.beneficiaryno == null) { - this.$modal.msgWarning("鏈嶅姟椤圭洰琛ㄤ腑锛岀" + (k + 1).toString() + "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�"); + this.$modal.msgWarning( + "鏈嶅姟椤圭洰琛ㄤ腑锛岀" + + (k + 1).toString() + + "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�" + ); return; } } @@ -1096,17 +1515,18 @@ //闄勪欢澶勭悊 let list = this.fileList; - if (list.length > 0) { - this.form.annexfiles = list.map(item => item.url).join(","); - } + console.log(list); + // if (list.length > 0) { + // this.form.annexfiles = list.map(item => item.url).join(","); + // } //澶勭悊鏄庣粏 - for (let i = 0; i < this.fundDetails.length; i++) { - let tempDetail = this.fundDetails[i]; + for (let i = 0; i < this.rbDetails.length; i++) { + let tempDetail = this.rbDetails[i]; //鑾峰彇鏈嶅姟椤圭洰鏄庣粏 let tempitemlist = tempDetail.itemlist; let itemIndex = tempitemlist.findIndex( - (item) => tempDetail.itemid == item.id + item => tempDetail.itemid == item.id ); if (itemIndex > -1) { tempDetail.itemname = tempitemlist[itemIndex].itemName; @@ -1115,14 +1535,20 @@ //鑾峰彇applytypename銆佹湇鍔¤垂鐢ㄥぇ绫� let applytypeIndex = this.rowfeeItemTypes.findIndex( - (item) => tempDetail.applytype == item.value + item => tempDetail.applytype == item.value ); if (applytypeIndex > -1) { - tempDetail.applytypename = this.rowfeeItemTypes[applytypeIndex].label; - tempDetail.subjecttype = this.rowfeeItemTypes[applytypeIndex].subjecttype; - tempDetail.subjecttypename = this.rowfeeItemTypes[applytypeIndex].subjecttypename; + tempDetail.applytypename = this.rowfeeItemTypes[ + applytypeIndex + ].label; + tempDetail.subjecttype = this.rowfeeItemTypes[ + applytypeIndex + ].subjecttype; + tempDetail.subjecttypename = this.rowfeeItemTypes[ + applytypeIndex + ].subjecttypename; } - this.fundDetails[i] = tempDetail; + this.rbDetails[i] = tempDetail; /* //璁$畻涓◣ //if (isNaN(parseFloat(tempDetail.taxedamount))) @@ -1137,7 +1563,7 @@ if (res.code == 200) { tempDetail.taxamount = res.data; tempDetail.taxedamount = tempDetail.amount - tempDetail.taxamount; - this.fundDetails[k] = tempDetail; + this.rbDetails[k] = tempDetail; this.totalAfterTaxAmount += parseFloat(tempDetail.taxedamount); this.totalAmount += parseFloat(tempDetail.amount); @@ -1153,7 +1579,7 @@ if (res.code == 200) { tempDetail.taxamount = res.data.nowTax; tempDetail.amount = parseFloat(res.data.nowTaxBeforeMoney); - this.fundDetails[k] = tempDetail; + this.rbDetails[k] = tempDetail; this.totalAfterTaxAmount += parseFloat(tempDetail.taxedamount); this.totalAmount += parseFloat(tempDetail.amount); @@ -1169,21 +1595,22 @@ //淇濆瓨鏁版嵁 this.loading = true; - this.form.serviceFunddetails = 0; - this.fundDetails.map((item) => { - this.form.serviceFunddetails += item.amount; + this.form.servicerbDetails = 0; + this.rbDetails.map(item => { + this.form.servicerbDetails += item.amount; }); - this.form.serviceFunddetails = this.fundDetails; + console.log(this.rbDetails); + this.form.servicerbDetails = this.rbDetails; if (this.form.id != null) { // updateFund(this.form).then((response) => { // if (response.code === 200) { // this.loading = false; - // for (let m = 0; m < this.fundDetails.length; m++) { - // if (this.fundDetails[m].id > 0) { - // updateFunddetail(this.fundDetails[m]).then((response2) => { if (response.code != 200) { this.$modal.msgError("涓撳鍔冲姟璐逛繚瀛樺け璐�1锛�" + response.msg); } }); + // for (let m = 0; m < this.rbDetails.length; m++) { + // if (this.rbDetails[m].id > 0) { + // updateFunddetail(this.rbDetails[m]).then((response2) => { if (response.code != 200) { this.$modal.msgError("涓撳鍔冲姟璐逛繚瀛樺け璐�1锛�" + response.msg); } }); // } else { - // addFunddetail(this.fundDetails[m]).then((response2) => { if (response.code != 200) { this.$modal.msgError("涓撳鍔冲姟璐逛繚瀛樺け璐�2锛�" + response.msg); } }); + // addFunddetail(this.rbDetails[m]).then((response2) => { if (response.code != 200) { this.$modal.msgError("涓撳鍔冲姟璐逛繚瀛樺け璐�2锛�" + response.msg); } }); // } // } // this.$modal.msgSuccess("涓撳鍔冲姟璐逛繚瀛樻垚鍔燂紒"); @@ -1191,7 +1618,6 @@ // this.$modal.msgError("涓撳鍔冲姟璐逛繚瀛樺け璐ワ細" + response.msg); // } // }); - } else { this.form.recordstatus = -1; @@ -1204,7 +1630,7 @@ // }); } - addorupdateFund(this.form).then((response) => { + addorupdateFund(this.form).then(response => { if (response.code === 200) { this.selectDonotor(this.curCase); this.$modal.msgSuccess("鐢宠鍗曚繚瀛樻垚鍔燂紒"); @@ -1218,23 +1644,26 @@ // this.getfundList(); // this.selectDonotor(this.curCase); this.$router.go(-1); - } }); }, // 鍙栨秷鎸夐挳 cancel() { - // this.reset(); + // this.reset(); this.$router.go(-1); }, //鑾峰彇褰撳墠鐢ㄦ埛淇℃伅 getUserProfile() { - getUserProfile().then((res) => { + getUserProfile().then(res => { this.userprofile = res.data; this.standardlevel = res.data.standardlevel; - if (this.userprofile.createBy == "admin" || this.userprofile.createBy == "001" || this.userprofile.createBy == "002") { + if ( + this.userprofile.createBy == "admin" || + this.userprofile.createBy == "001" || + this.userprofile.createBy == "002" + ) { this.ismanager = true; } else { this.ismanager = false; @@ -1252,19 +1681,19 @@ //鑾峰彇绯荤粺鐢ㄦ埛鍒楄〃 getUserList() { - listUser().then((res) => { + listUser().then(res => { this.userlist = res.data; }); - },//鑾峰彇绯荤粺鐢ㄦ埛鍒楄〃 + }, //鑾峰彇绯荤粺鐢ㄦ埛鍒楄〃 getUserList() { - listUser().then((res) => { + listUser().then(res => { this.userlist = res.data; }); }, //鑾峰彇鎵�鏈変笓瀹�/鍖荤枟鏈烘瀯/璐圭敤鎶ラ攢鏈烘瀯鍒楄〃 getExternalList() { - listExternalperson().then((res) => { + listExternalperson().then(res => { this.personlist = res.rows; for (let j = 0; j < this.personlist.length; j++) { //鑾峰彇璐圭敤鎶ラ攢鏈烘瀯鍒楄〃 @@ -1275,14 +1704,14 @@ reportName: this.personlist[j].username, depositbank: this.personlist[j].depositbank, branchbankname: this.personlist[j].branchbankname, - bankcardno: this.personlist[j].bankcardno, + bankcardno: this.personlist[j].bankcardno }); } //涓撳浜哄憳鍒楄〃 else if (res.rows[j].usertype == "expert") { this.expertlist.push({ expertNo: this.personlist[j].id, - exportName: this.personlist[j].username, + exportName: this.personlist[j].username }); } } @@ -1295,11 +1724,11 @@ let templist = []; for (let i = 0; i < types.length; i++) { templist = []; - listReportname(types[i]).then((res) => { + listReportname(types[i]).then(res => { for (let j = 0; j < res.data.length; j++) { templist.push({ reportName: res.data[j].reportName, - reportNo: res.data[j].reportNo, + reportNo: res.data[j].reportNo }); } this.expertlist = this.expertlist.concat(templist); @@ -1309,19 +1738,19 @@ //鑾峰彇璐圭敤鏈烘瀯鍒楄〃 getFeeUnitList() { - listReportname("org").then((res) => { + listReportname("org").then(res => { this.feeUnitList = res.data; }); }, //鑾峰彇鍖荤枟鏈烘瀯鍒楄〃 getUnitList() { - listOrganization(3).then((response) => { + listOrganization(3).then(response => { for (let i = 0; i < response.rows.length; i++) { this.unitList.push({ //organizationid: response.rows[i].organizationid, organizationid: response.rows[i].id, - organizationname: response.rows[i].organizationname, + organizationname: response.rows[i].organizationname }); } }); @@ -1329,7 +1758,7 @@ //鑾峰彇璐圭敤绫诲瀷 getFundType() { - getFundTypeAll(this.businessType).then((res) => { + getFundTypeAll(this.businessType).then(res => { let dataList = res.data; this.feeItemTypes = dataList; this.rowfeeItemTypes = []; @@ -1338,28 +1767,28 @@ value: dataList[m].itemType, label: dataList[m].itemTypeName, subjecttype: dataList[m].subjecttype, - subjecttypename: dataList[m].subjecttypename, + subjecttypename: dataList[m].subjecttypename }); } }); }, getitemlist(rowindex, row) { - let list = this.feeItemTypes.filter((r) => r.itemType == row.applytype); + let list = this.feeItemTypes.filter(r => r.itemType == row.applytype); row.itemlist = list[0].itemDetails; - this.$set(this.fundDetails, rowindex, row); + this.$set(this.rbDetails, rowindex, row); //this.loading = true; // getItemNames(row.applytype).then((res) => { // this.loading = false; // row.itemlist = res.data; - // this.$set(this.fundDetails, rowindex, row); + // this.$set(this.rbDetails, rowindex, row); // }); }, //鑾峰彇鎹愮尞妗堜緥鍒楄〃 getBaseInfoList() { this.loading = true; - listDonatebaseinfo(this.queryParams).then((response) => { + listDonatebaseinfo(this.queryParams).then(response => { this.donatebaseinfoList = response.rows; this.total = response.total; this.loading = false; @@ -1370,7 +1799,7 @@ this.loading = true; this.reset(); this.fundQueryParam.infoid = this.curCase.id; - listFund(this.fundQueryParam).then((response) => { + listFund(this.fundQueryParam).then(response => { this.loading = false; this.donateconsolationfundList = response.rows; }); @@ -1391,9 +1820,9 @@ row.taxedamount = 0.0; } - this.form.serviceFunddetails = 0; - this.fundDetails.map((item) => { - this.form.serviceFunddetails += item.amount; + this.form.servicerbDetails = 0; + this.rbDetails.map(item => { + this.form.servicerbDetails += item.amount; }); } }); @@ -1401,14 +1830,14 @@ //鏍¢獙鏀惰垂椤圭洰鏄惁閲嶅 verifyFeeItem(row) { - row.itemlist.map((res) => { + row.itemlist.map(res => { if (row.itemid === res.id) { row.remark = res.itemDescribe; row.itemcode = res.itemCode; } }); var repeatNum = 0; - this.fundDetails.map((res) => { + this.rbDetails.map(res => { if (res.applytype === row.applytype && res.itemid == row.itemid) { repeatNum++; } @@ -1418,15 +1847,15 @@ } //鑾峰彇璐圭敤椤圭洰鐨勮缁嗕俊鎭� - getdetailsByItemId(row.itemid).then((res) => { + getdetailsByItemId(row.itemid).then(res => { let fundmsg = res.data; let rowfeeblocks = []; - fundmsg.forEach((item) => { + fundmsg.forEach(item => { rowfeeblocks.push({ expense: item.expense, expensedescribe: item.expensedescribe, remark: item.expensedescribe, - servicesscope: item.id, + servicesscope: item.id }); }); @@ -1434,7 +1863,6 @@ row.servicesscope = null; row.servicesscopename = ""; }); - }, //鍚堣璐圭敤 @@ -1455,15 +1883,15 @@ //瀵煎叆鎵�鏈夐」鐩� addAllItems() { this.loading = true; - this.fundDetails = this.fundDetails.filter( - (r) => r.applytype != "" && r.applytype != null + this.rbDetails = this.rbDetails.filter( + r => r.applytype != "" && r.applytype != null ); let listAdd = []; - //let listAdd = this.fundDetails; + //let listAdd = this.rbDetails; for (let i = 0; i < this.feeItemTypes.length; i++) { for (let j = 0; j < this.feeItemTypes[i].itemDetails.length; j++) { - let list = this.fundDetails.filter( - (r) => + let list = this.rbDetails.filter( + r => r.applytype == this.feeItemTypes[i].itemType && r.itemid == this.feeItemTypes[i].itemDetails[j].id ); @@ -1485,15 +1913,15 @@ }; //鑾峰彇鏀惰垂椤圭洰鐨勮鏄庝俊鎭� - getdetailsByItemId(rowData.itemid).then((res) => { + getdetailsByItemId(rowData.itemid).then(res => { let fundmsg = res.data; let rowfeeblocks = []; - fundmsg.forEach((item) => { + fundmsg.forEach(item => { rowfeeblocks.push({ expense: item.expense, expensedescribe: item.expensedescribe, remark: item.expensedescribe, - servicesscope: item.id, + servicesscope: item.id }); }); @@ -1506,9 +1934,9 @@ } } } - this.fundDetails = listAdd; + this.rbDetails = listAdd; this.loading = false; - // let Outerarr = this.fundDetails; + // let Outerarr = this.rbDetails; // Outerarr.map((res) => { // let onelist = this.rowfeeItemTypes; // onelist.map((item) => { @@ -1521,7 +1949,7 @@ }, addAll(row, i, arr) { - row.itemlist.map((res) => { + row.itemlist.map(res => { if (res.id !== row.itemid) { let a = arr.length; this.addRow(); @@ -1529,15 +1957,15 @@ arr[a].applytype = row.applytype; arr[a].itemid = res.id; - getdetailsByItemId(arr[a].itemid).then((res) => { + getdetailsByItemId(arr[a].itemid).then(res => { let fundmsg = res.data; let rowfeeblocks = []; - fundmsg.forEach((item) => { + fundmsg.forEach(item => { rowfeeblocks.push({ expense: item.expense, expensedescribe: item.expensedescribe, remark: item.expensedescribe, - servicesscope: item.id, + servicesscope: item.id }); }); row.rowfeeblocks = rowfeeblocks; @@ -1590,21 +2018,21 @@ itemlist: [], servicesscope: null, rowfeeblocks: [], - annexfiles: null, + annexfiles: null }; if (rowIndex == undefined || rowIndex == null || rowIndex < 0) { - this.fundDetails.push(rowData); + this.rbDetails.push(rowData); } else { - this.fundDetails.splice(rowIndex + 1, 0, rowData); + this.rbDetails.splice(rowIndex + 1, 0, rowData); } - for (let i = 0; i < this.fundDetails.length; i++) { - this.fundDetails[i].orderno = i + 1; + for (let i = 0; i < this.rbDetails.length; i++) { + this.rbDetails[i].orderno = i + 1; } }, //鍔犺浇鏈嶅姟椤圭洰 loadItemType(row) { - let list = this.feeItemTypes.filter((r) => r.itemType == row.applytype); + let list = this.feeItemTypes.filter(r => r.itemType == row.applytype); row.itemlist = list[0].itemDetails; row.itemid = null; this.$forceUpdate(); @@ -1619,7 +2047,7 @@ selectpersonmsg(row) { // if(row.beneficiaryname) - this.personlist.map((res) => { + this.personlist.map(res => { if (row.beneficiaryname == res.username) { row.beneficiaryno = res.userno; row.beneficiaryname = res.username; @@ -1652,9 +2080,9 @@ } scope.row.itemlist = result; } else { - getItemNames(scope.row.applytype).then((res) => { + getItemNames(scope.row.applytype).then(res => { scope.row.itemlist = res.data; - //this.$set(this.fundDetails, rowindex, row); + //this.$set(this.rbDetails, rowindex, row); }); } }, @@ -1663,28 +2091,28 @@ this.$confirm("鍒犻櫎鏁版嵁鍚庡皢涓嶈兘鎭㈠锛岀‘璁よ鍒犻櫎鍚�?", "鎻愮ず", { confirmButtonText: "纭畾", cancelButtonText: "鍙栨秷", - type: "success", + type: "success" }) .then(() => { if (row.id !== null) { - delFunddetail(row.id).then((res) => { + delFunddetail(row.id).then(res => { if (res.code === 200) { this.$confirm("鍒犻櫎鏁版嵁鎴愬姛", "鎻愮ず", { confirmButtonText: "纭畾", cancelButtonText: "鍙栨秷", - type: "success", + type: "success" }).then(() => { this.$set(rows, rows.splice(index, 1)); - getownFundDetail(this.form.id).then((res) => { - this.$set(this.fundDetails, res.data); + getownFundDetail(this.form.id).then(res => { + this.$set(this.rbDetails, res.data); this.sumTotalFee(); - // this.fundDetails = res.data + // this.rbDetails = res.data }); }); } // getownFundDetail(this.form.id).then(res=>{ - // this.$set(this.fundDetails,res.data) - // this.fundDetails = res.data + // this.$set(this.rbDetails,res.data) + // this.rbDetails = res.data // }) }); } else { @@ -1697,49 +2125,47 @@ }); //鍏ㄩ儴鍒犻櫎鍚庢坊鍔犱竴鏉℃柊琛� - if (this.fundDetails.length == 1) { + if (this.rbDetails.length == 1) { this.addRow(0); } - }, //璁$畻涓◣ - calculateTax() { }, + calculateTax() {}, //璁$畻鎬婚噾棰� sumTotalFee(row) { let allSum = 0; if (this.form.applytype != null) { - for (let i = 0; i < this.fundDetails.length; i++) { - + for (let i = 0; i < this.rbDetails.length; i++) { let totalFee = 0; let taxFee = 0; if (this.form.applytype == 1 || this.form.applytype == 2) { //璁$畻褰撳墠鎶ラ攢鍐呭璐圭敤鍚堣 - if (!isNaN(parseFloat(this.fundDetails[i].amount))) { - totalFee += parseFloat(this.fundDetails[i].amount); - taxFee += parseFloat(this.fundDetails[i].amount); + if (!isNaN(parseFloat(this.rbDetails[i].amount))) { + totalFee += parseFloat(this.rbDetails[i].amount); + taxFee += parseFloat(this.rbDetails[i].amount); } - if (!isNaN(parseFloat(this.fundDetails[i].taxamount))) { - totalFee -= parseFloat(this.fundDetails[i].taxamount); - taxFee -= parseFloat(this.fundDetails[i].taxamount); + if (!isNaN(parseFloat(this.rbDetails[i].taxamount))) { + totalFee -= parseFloat(this.rbDetails[i].taxamount); + taxFee -= parseFloat(this.rbDetails[i].taxamount); } } else if (this.form.applytype == 3 || this.form.applytype == 4) { //鍗曚环*鏁伴噺=绋庡墠閲戦 if ( - !isNaN(parseFloat(this.fundDetails[i].price)) && - !isNaN(parseFloat(this.fundDetails[i].quantity)) + !isNaN(parseFloat(this.rbDetails[i].price)) && + !isNaN(parseFloat(this.rbDetails[i].quantity)) ) { totalFee += - parseFloat(this.fundDetails[i].price) * - parseFloat(this.fundDetails[i].quantity); - this.fundDetails[i].amount = totalFee; + parseFloat(this.rbDetails[i].price) * + parseFloat(this.rbDetails[i].quantity); + this.rbDetails[i].amount = totalFee; } } //绋庡墠銆佺◣鍚庨渶瑕佺嫭绔嬪綍鍏� // if (!isNaN(parseFloat(taxFee))) { - // this.fundDetails[i].taxedamount = taxFee.toFixed(2); + // this.rbDetails[i].taxedamount = taxFee.toFixed(2); // } allSum += totalFee; @@ -1756,7 +2182,7 @@ //涓撳璐瑰姵鍔℃墦鍗� dayin(id) { - getdownloadLW(id).then((res) => { + getdownloadLW(id).then(res => { if (res.downloadUrl) { var fileUrl = res; //鑾峰彇褰撳墠缃戝潃 @@ -1770,7 +2196,7 @@ aEle.click(); this.$alert("涓嬭浇鎴愬姛", "鎻愮ず", { confirmButtonText: "纭畾", - type: "success", + type: "success" }); } }); @@ -1779,7 +2205,7 @@ //姹囨�绘墦鍗� totaldayin(e) { // const id =this.row.id - getdownloadBX(e).then((res) => { + getdownloadBX(e).then(res => { if (res.downloadUrl) { var fileUrl = res; //鑾峰彇褰撳墠缃戝潃 @@ -1793,20 +2219,20 @@ aEle.click(); this.$alert("涓嬭浇鎴愬姛", "鎻愮ず", { confirmButtonText: "纭畾", - type: "success", + type: "success" }); } }); }, //鏂囦欢涓婁紶 - handleUploadError() { }, + handleUploadError() {}, /** 涓嬭浇鏂囦欢鎸夐挳鎿嶄綔 */ downFile(item) { - const url = process.env.VUE_APP_BASE_API + item.url - var a = document.createElement('a'); - var event = new MouseEvent('click'); + const url = process.env.VUE_APP_BASE_API + item.url; + var a = document.createElement("a"); + var event = new MouseEvent("click"); a.download = item.name; a.href = url; a.dispatchEvent(event); @@ -1855,7 +2281,7 @@ Filepopup(index, rows, row) { this.atpresent = index; this.pdfVisible = true; - if (this.fundDetails[index].annexfilesList) { + if (this.rbDetails[index].annexfilesList) { this.fileListto = this.rbDetails[index].annexfilesList; } else { this.fileListto = []; @@ -1910,12 +2336,12 @@ let tempIndex = this.funddetailForm.index; let tempName = this.funddetailForm.beneficiaryname; let tempUnitname = this.funddetailForm.unitname; - let singleDetail = this.fundDetails[tempIndex]; + let singleDetail = this.rbDetails[tempIndex]; if (this.showDetailInfoType == "name") { if (this.expertfrom == "1") { //浠庝笓瀹跺垪琛ㄨ幏鍙栦俊鎭� - this.personlist.map((res) => { + this.personlist.map(res => { if (tempName == res.username) { singleDetail.beneficiaryno = res.userno; singleDetail.beneficiaryname = res.username; @@ -1932,7 +2358,8 @@ } else { //淇濆瓨鏂板涓撳 this.expertform.id = null; - this.expertform.userno = this.personlist[this.personlist.length - 1].id + 1; + this.expertform.userno = + this.personlist[this.personlist.length - 1].id + 1; this.expertform.usertype = "expert"; this.expertform.username = this.funddetailForm.expertname; this.expertform.idcardno = this.funddetailForm.expertidcardno; @@ -1945,10 +2372,12 @@ this.expertform.unitno = this.funddetailForm.expertunitno; try { let unitIndex = this.unitList.findIndex( - (item) => this.expertform.unitno == item.organizationid + item => this.expertform.unitno == item.organizationid ); if (unitIndex > -1) { - this.expertform.unitname = this.unitList[unitIndex].organizationname; + this.expertform.unitname = this.unitList[ + unitIndex + ].organizationname; } else { this.expertform.unitname = this.expertform.unitno; } @@ -1964,14 +2393,14 @@ this.expertform.remark = null; this.expertform.del_flag = "0"; - addExternalperson(this.expertform).then((response) => { + addExternalperson(this.expertform).then(response => { if (response.code == 200) { this.$modal.msgSuccess("鏂板涓撳淇℃伅鎴愬姛锛�"); - listExternalperson().then((res) => { + listExternalperson().then(res => { this.personlist = res.rows; //浠庝笓瀹跺垪琛ㄨ幏鍙栦俊鎭� - this.personlist.map((res) => { + this.personlist.map(res => { if (res.username == this.funddetailForm.expertname) { singleDetail.beneficiaryno = res.userno; singleDetail.beneficiaryname = res.username; @@ -1989,13 +2418,12 @@ } }); } - } else if (this.showDetailInfoType == "unit") { singleDetail.unitno = this.funddetailForm.unitno; if (this.businessType == 1 || this.businessType == 2) { try { let unitIndex = this.unitList.findIndex( - (item) => singleDetail.unitno == item.organizationid + item => singleDetail.unitno == item.organizationid ); if (unitIndex > -1) { singleDetail.unitname = this.unitList[unitIndex].organizationname; @@ -2008,12 +2436,14 @@ } else if (this.businessType == 3 || this.businessType == 4) { try { let unitIndex = this.feeUnitList.findIndex( - (item) => singleDetail.unitno == item.reportNo + item => singleDetail.unitno == item.reportNo ); if (unitIndex > -1) { singleDetail.unitname = this.feeUnitList[unitIndex].reportName; - singleDetail.depositbank = this.feeUnitList[unitIndex].depositbank; + singleDetail.depositbank = this.feeUnitList[ + unitIndex + ].depositbank; singleDetail.bankcardno = this.feeUnitList[unitIndex].bankcardno; } else { singleDetail.unitname = singleDetail.unitno; @@ -2024,16 +2454,12 @@ } } - this.fundDetails[tempIndex] = singleDetail; + this.rbDetails[tempIndex] = singleDetail; this.showDetailInfoDialog = false; - }, - - }, - + } + } }; - </script> - <style lang="scss" scoped> .Modifydetailscla { @@ -2076,7 +2502,7 @@ border: 1px solid #dcdfe6; -webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.12), 0 0 6px 0 rgba(0, 0, 0, 0.04); - box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.1); // <- Add this to fix. + box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.1); // <- Add this to fix. } .pdftit { @@ -2102,8 +2528,6 @@ width: 60%; text-align: center; } - - } ::v-deep .el-input--medium .el-input__inner { @@ -2111,4 +2535,4 @@ line-height: 36px; text-align: center; } -</style> \ No newline at end of file +</style> diff --git a/src/views/project/fund/medicalCostFundApply/index.vue b/src/views/project/fund/medicalCostFundApply/index.vue index efff279..c2c164a 100644 --- a/src/views/project/fund/medicalCostFundApply/index.vue +++ b/src/views/project/fund/medicalCostFundApply/index.vue @@ -1,25 +1,52 @@ <!-- --> <template> <div class="app-container"> - <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="70px"> + <el-form + :model="queryParams" + ref="queryForm" + :inline="true" + label-width="70px" + > <el-row align="left"> <el-col :span="6"> <el-form-item label="濮撳悕" prop="name"> - <el-input v-model="queryParams.name" placeholder="璇疯緭鍏ュ鍚�" clearable size="small" - @keyup.enter.native="handleQuery" /> + <el-input + v-model="queryParams.name" + placeholder="璇疯緭鍏ュ鍚�" + clearable + size="small" + @keyup.enter.native="handleQuery" + /> </el-form-item> </el-col> <el-col :span="6"> <el-form-item label="鎹愮尞杩涘害" prop="recordstate"> - <el-select v-model="queryParams.recordstate" placeholder="璇烽�夋嫨璁板綍鐘舵��" clearable size="small"> - <el-option v-for="dict in dict.type.sys_DonationStatus" :key="dict.value" :label="dict.label" - :value="dict.value" /> + <el-select + v-model="queryParams.recordstate" + placeholder="璇烽�夋嫨璁板綍鐘舵��" + clearable + size="small" + > + <el-option + v-for="dict in dict.type.sys_DonationStatus" + :key="dict.value" + :label="dict.label" + :value="dict.value" + /> </el-select> </el-form-item> </el-col> <el-col :span="6"> - <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button> - <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button> + <el-button + type="primary" + icon="el-icon-search" + size="mini" + @click="handleQuery" + >鎼滅储</el-button + > + <el-button icon="el-icon-refresh" size="mini" @click="resetQuery" + >閲嶇疆</el-button + > </el-col> </el-row> </el-form> @@ -33,18 +60,32 @@ </el-row> </el-col> </el-row> - <el-table v-loading="loading" border highlight-current-row :data="donatebaseinfoList" - @row-click="selectDonotor"> + <el-table + v-loading="loading" + border + highlight-current-row + :data="donatebaseinfoList" + @row-click="selectDonotor" + > <!-- <el-table-column label="鎹愮尞缂栧彿" align="center" prop="donorno" /> --> <el-table-column label="鎹愮尞杩涘害" align="center" prop="recordstate"> <template slot-scope="scope"> - <dict-tag :options="dict.type.sys_DonationStatus" :value="scope.row.recordstate" /> + <dict-tag + :options="dict.type.sys_DonationStatus" + :value="scope.row.recordstate" + /> </template> </el-table-column> <el-table-column label="濮撳悕" align="center" prop="name" /> </el-table> - <pagination v-show="total > 0" :total="total" small :page.sync="queryParams.pageNum" - :limit.sync="queryParams.pageSize" @pagination="getBaseInfoList" /> + <pagination + v-show="total > 0" + :total="total" + small + :page.sync="queryParams.pageNum" + :limit.sync="queryParams.pageSize" + @pagination="getBaseInfoList" + /> </el-card> </el-col> <el-col :span="18"> @@ -52,13 +93,23 @@ <el-form ref="infoform" label-width="100px"> <el-row :gutter="4" align="right" class="mb8"> <el-col :span="1.5"> - <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" - v-hasPermi="['project:medicalfund:add']">鍖诲鎴愭湰鐢宠</el-button> + <el-button + type="primary" + plain + icon="el-icon-plus" + size="mini" + @click="handleAdd" + v-hasPermi="['project:medicalfund:add']" + >鍖诲鎴愭湰鐢宠</el-button + > </el-col> <el-col :span="9"> <el-form-item label="鎹愮尞缂栧彿"> - <el-input v-model="curCase.donorno" :disabled="true"></el-input> + <el-input + v-model="curCase.donorno" + :disabled="true" + ></el-input> </el-form-item> </el-col> <el-col :span="9"> @@ -69,44 +120,122 @@ <el-col> </el-col> </el-row> <el-row> - <el-table v-loading="loading" border :data="donateconsolationfundList"> - <el-table-column label="鐢宠鏃ユ湡" align="center" prop="createTime" width="150px"> + <el-table + v-loading="loading" + border + :data="donateconsolationfundList" + > + <el-table-column + label="鐢宠鏃ユ湡" + align="center" + prop="createTime" + width="150px" + > <template slot-scope="scope"> <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span> </template> </el-table-column> - <el-table-column label="鐢宠浜�" align="center" prop="username" width="150px" /> - <el-table-column label="瀹℃牳鐘舵��" width="150" align="center" prop="recordstatus"> + <el-table-column + label="鐢宠浜�" + align="center" + prop="username" + width="150px" + /> + <el-table-column + label="瀹℃牳鐘舵��" + width="150" + align="center" + prop="recordstatus" + > <template slot-scope="scope"> - <dict-tag :options="dict.type.sys_recordstatus" :value="scope.row.recordstatus" /> + <dict-tag + :options="dict.type.sys_recordstatus" + :value="scope.row.recordstatus" + /> </template> </el-table-column> - <el-table-column label="鐢宠閲戦" align="center" prop="amountrequested" width="150px" /> - <el-table-column label="鎵�灞炵粍鍒�" align="center" prop="deptmentname" width="150px" /> - <el-table-column label="缁勯暱" align="center" prop="managername" width="220px" /> + <el-table-column + label="鐢宠閲戦" + align="center" + prop="amountrequested" + width="150px" + /> + <el-table-column + label="鎵�灞炵粍鍒�" + align="center" + prop="deptmentname" + width="150px" + /> + <el-table-column + label="缁勯暱" + align="center" + prop="managername" + width="220px" + /> <!-- <el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="phone" width="150px" /> <el-table-column label="宸ヤ綔鍗曚綅" align="center" prop="unitname" width="150px" /> --> - <el-table-column label="鎿嶄綔" fixed="right" align="center" class-name="small-padding fixed-width" - width="280px"> + <el-table-column + label="鎿嶄綔" + fixed="right" + align="center" + class-name="small-padding fixed-width" + width="280px" + > <template slot-scope="scope"> - <el-button v-if="scope.row.recordstatus == -1 || - scope.row.recordstatus == 1 - " size="mini" type="text" icon="el-icon-edit" @click="handleup(scope.row)">涓婃姤</el-button> - <el-button v-if="scope.row.recordstatus == -1 || - scope.row.recordstatus == 1 - " size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" - v-hasPermi="['project:medicalfund:edit']">淇敼</el-button> - <el-button size="mini" type="text" icon="el-icon-edit" @click="handleDetail(scope.row)">鏌ョ湅</el-button> - <el-button v-if="scope.row.recordstatus == -1 || - scope.row.recordstatus == 1 - " size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" - v-hasPermi="['project:medicalfund:delete']">鍒犻櫎</el-button> - <el-button size="mini" type="text" icon="el-icon-download" @click="mixExport(scope.row.id)" - v-hasPermi="['project:medicalfund:download']">涓嬭浇</el-button> + <el-button + v-if=" + scope.row.recordstatus == -1 || + scope.row.recordstatus == 1 + " + size="mini" + type="text" + icon="el-icon-edit" + @click="handleup(scope.row)" + >涓婃姤</el-button + > + <el-button + v-if=" + scope.row.recordstatus == -1 || + scope.row.recordstatus == 1 + " + size="mini" + type="text" + icon="el-icon-edit" + @click="handleUpdate(scope.row)" + v-hasPermi="['project:medicalfund:edit']" + >淇敼</el-button + > + <el-button + size="mini" + type="text" + icon="el-icon-edit" + @click="handleDetail(scope.row)" + >鏌ョ湅</el-button + > + <el-button + v-if=" + scope.row.recordstatus == -1 || + scope.row.recordstatus == 1 + " + size="mini" + type="text" + icon="el-icon-delete" + @click="handleDelete(scope.row)" + v-hasPermi="['project:medicalfund:delete']" + >鍒犻櫎</el-button + > + <el-button + size="mini" + type="text" + icon="el-icon-download" + @click="mixExport(scope.row.id)" + v-hasPermi="['project:medicalfund:download']" + >涓嬭浇</el-button + > </template> </el-table-column> </el-table> @@ -116,40 +245,73 @@ </el-col> </el-row> <!-- 娣诲姞鎴栦慨鏀硅垂鐢ㄧ敵璇峰崟 --> - <el-dialog :visible.sync="dialogOpen" :close-on-click-modal="false" width="1400px" :title="title" - style="text-align: center" v-loading="loading"> + <el-dialog + :visible.sync="dialogOpen" + :close-on-click-modal="false" + width="1400px" + :title="title" + style="text-align: center" + v-loading="loading" + > <el-form ref="form" :model="form" label-width="120px" :rules="rules"> <el-row style="text-align: left"> <el-col :span="5"> <el-form-item label="鐢宠鏃ユ湡" prop="createTime"> - <el-date-picker clearable style="width: 100%" v-model="form.createTime" type="date" - value-format="yyyy-MM-dd HH:mm:ss" placeholder="鐢宠鏃ユ湡"> + <el-date-picker + clearable + style="width: 100%" + v-model="form.createTime" + type="date" + value-format="yyyy-MM-dd HH:mm:ss" + placeholder="鐢宠鏃ユ湡" + > </el-date-picker> </el-form-item> </el-col> <el-col :span="5"> <el-form-item label="缁忓姙浜�" prop="username"> - <el-select v-model="form.username" placeholder="鐢宠浜�" clearable filterable allow-create style="width: 100%"> - <el-option v-for="dict in userlist" :key="dict.index" :label="dict.nickname" - :value="dict.nickname"></el-option> + <el-select + v-model="form.username" + placeholder="鐢宠浜�" + clearable + filterable + allow-create + style="width: 100%" + > + <el-option + v-for="dict in userlist" + :key="dict.index" + :label="dict.nickname" + :value="dict.nickname" + ></el-option> </el-select> </el-form-item> </el-col> <el-col :span="5"> <el-form-item label="鎵�灞炵粍鍒�" prop="deptmentname"> - <el-input v-model="form.deptmentname" placeholder="璇疯緭鍏ユ墍灞炵粍鍒�" clearable /> + <el-input + v-model="form.deptmentname" + placeholder="璇疯緭鍏ユ墍灞炵粍鍒�" + clearable + /> </el-form-item> </el-col> <el-col :span="5"> <el-form-item label="缁勯暱" prop="managername"> - <el-input v-model="form.managername" placeholder="璇疯緭鍏ョ粍闀�" clearable /> + <el-input + v-model="form.managername" + placeholder="璇疯緭鍏ョ粍闀�" + clearable + /> </el-form-item> </el-col> </el-row> <el-row style="text-align: left"> <el-col :span="5"> <el-form-item label="鐢宠绫诲瀷"> - <el-radio v-model="form.applytype" label='3'>鍖诲鎴愭湰鐢宠</el-radio> + <el-radio v-model="form.applytype" label="3" + >鍖诲鎴愭湰鐢宠</el-radio + > </el-form-item> </el-col> <el-col :span="10"> @@ -159,16 +321,26 @@ </el-col> <el-col :span="5"> <el-form-item label="鎹愮尞鑰�" prop="name"> - <el-input :disabled="true" v-model="form.name" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" clearable /> + <el-input + :disabled="true" + v-model="form.name" + placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" + clearable + /> </el-form-item> </el-col> </el-row> <el-row style="text-align: left"> <el-col :span="5"> <el-form-item label="鐢宠閲戦" prop="amountrequested"> - <el-input v-model="form.amountrequested" placeholder="鐢宠閲戦" :disabled="true" /> + <el-input + v-model="form.amountrequested" + placeholder="鐢宠閲戦" + :disabled="true" + /> </el-form-item> - </el-col> <!--<el-col :span="5"> + </el-col> + <!--<el-col :span="5"> <el-form-item label="绋庡墠閲戦" prop="pretaxcost"> <el-input v-model="form.pretaxcost" placeholder="绋庡墠閲戦鍚堣" :disabled="true" /> </el-form-item> @@ -201,40 +373,88 @@ </el-row> <el-row style="margin-bottom: 10px"> <el-col :span="4"> - <el-button @click.native.prevent="addAlls" type="primary" size="small"> + <el-button + @click.native.prevent="addAlls" + type="primary" + size="small" + > 瀵煎叆鏈嶅姟椤圭洰 </el-button> </el-col> </el-row> <el-row style="margin-top: 5px; margin-bottom: 5px"> <el-table :data="fundDetails" border highlight-current-row> - <el-table-column prop="orderno" align="center" label="鎺掑簭" width="80"> + <el-table-column + prop="orderno" + align="center" + label="鎺掑簭" + width="80" + > <template slot-scope="scope"> <el-input v-model="scope.row.orderno" placeholder="鎺掑簭" /> </template> </el-table-column> - <el-table-column prop="itemtype" align="center" label="璐圭敤绫诲瀷" width="220"> + <el-table-column + prop="itemtype" + align="center" + label="璐圭敤绫诲瀷" + width="220" + > <template slot-scope="scope"> - <el-select v-model="scope.row.applytype" placeholder="璐圭敤绫诲瀷" @change="LoadItemTypeArr(scope.row)"> - <el-option v-for="dict in fundtypeArr" :key="dict.value" :label="dict.label" - :value="dict.value"></el-option> + <el-select + v-model="scope.row.applytype" + placeholder="璐圭敤绫诲瀷" + @change="LoadItemTypeArr(scope.row)" + > + <el-option + v-for="dict in fundtypeArr" + :key="dict.value" + :label="dict.label" + :value="dict.value" + ></el-option> </el-select> </template> </el-table-column> - <el-table-column prop="itemtype" align="center" label="鏈嶅姟椤圭洰" width="260"> + <el-table-column + prop="itemtype" + align="center" + label="鏈嶅姟椤圭洰" + width="260" + > <template slot-scope="scope"> - <el-select v-model="scope.row.itemid" placeholder="鏈嶅姟椤圭洰" clearable filterable allow-create - @change="select(scope.row)" :filter-method="(val) => SearchItem(val, scope)"> - <el-option v-for="dict in scope.row.itemArr" :key="dict.id" :label="dict.itemName" - :value="dict.id"></el-option> + <el-select + v-model="scope.row.itemid" + placeholder="鏈嶅姟椤圭洰" + clearable + filterable + allow-create + @change="select(scope.row)" + :filter-method="val => SearchItem(val, scope)" + > + <el-option + v-for="dict in scope.row.itemArr" + :key="dict.id" + :label="dict.itemName" + :value="dict.id" + ></el-option> </el-select> </template> </el-table-column> - <el-table-column prop="beneficiaryno" align="center" label="濮撳悕" width="120" v-if="form.applytype != 3"> + <el-table-column + prop="beneficiaryno" + align="center" + label="濮撳悕" + width="120" + v-if="form.applytype != 3" + > <template slot-scope="scope"> - <el-button type="primary" plain @click="ShowDetailDialog(scope, 'name')">{{ scope.row.beneficiaryname - }}</el-button> + <el-button + type="primary" + plain + @click="ShowDetailDialog(scope, 'name')" + >{{ scope.row.beneficiaryname }}</el-button + > </template> </el-table-column> <!-- <el-table-column @@ -261,12 +481,28 @@ </el-select> </template> </el-table-column> --> - <el-table-column prop="amount" align="center" label="绋庡墠閲戦" width="120" v-if="form.applytype != 3"> + <el-table-column + prop="amount" + align="center" + label="绋庡墠閲戦" + width="120" + v-if="form.applytype != 3" + > <template slot-scope="scope"> - <el-select v-model="scope.row.amount" placeholder="绋庡墠閲戦" clearable filterable allow-create - @change="selectamount(scope.row)"> - <el-option v-for="dict in fundblock" :key="dict.expensedescribe" :label="dict.expense" - :value="dict.expense"></el-option> + <el-select + v-model="scope.row.amount" + placeholder="绋庡墠閲戦" + clearable + filterable + allow-create + @change="selectamount(scope.row)" + > + <el-option + v-for="dict in fundblock" + :key="dict.expensedescribe" + :label="dict.expense" + :value="dict.expense" + ></el-option> </el-select> <!-- <el-input @@ -281,96 +517,226 @@ --> </template> </el-table-column> - <el-table-column prop="taxamount" align="center" label="鎵g◣" width="120" v-if="form.applytype != '3'"> + <el-table-column + prop="taxamount" + align="center" + label="鎵g◣" + width="120" + v-if="form.applytype != '3'" + > <template slot-scope="scope"> - <el-input v-model="scope.row.taxamount" placeholder="鎵g◣" @blur="(val) => { - sumTotalFee(scope.row); - } - " /> + <el-input + v-model="scope.row.taxamount" + placeholder="鎵g◣" + @blur=" + val => { + sumTotalFee(scope.row); + } + " + /> </template> </el-table-column> - <el-table-column prop="taxedamount" align="center" label="绋庡悗閲戦" width="120" v-if="form.applytype != '3'"> + <el-table-column + prop="taxedamount" + align="center" + label="绋庡悗閲戦" + width="120" + v-if="form.applytype != '3'" + > <template slot-scope="scope"> - <el-input v-model="scope.row.taxedamount" placeholder="绋庡悗閲戦" /> + <el-input + v-model="scope.row.taxedamount" + placeholder="绋庡悗閲戦" + /> </template> </el-table-column> - <el-table-column prop="price" align="center" label="浠锋牸" width="120" v-if="form.applytype == '3'"> + <el-table-column + prop="price" + align="center" + label="浠锋牸" + width="120" + v-if="form.applytype == '3'" + > <template slot-scope="scope"> - <el-input v-model="scope.row.price" placeholder="浠锋牸" @blur="(val) => { - sumTotalFee(scope.row); - } - " /> + <el-input + v-model="scope.row.price" + placeholder="浠锋牸" + @blur=" + val => { + sumTotalFee(scope.row); + } + " + /> </template> </el-table-column> - <el-table-column prop="quantity" align="center" label="鏁伴噺" width="80" v-if="form.applytype == '3'"> + <el-table-column + prop="quantity" + align="center" + label="鏁伴噺" + width="80" + v-if="form.applytype == '3'" + > <template slot-scope="scope"> - <el-input v-model="scope.row.quantity" placeholder="鏁伴噺" @blur="(val) => { - sumTotalFee(scope.row); - } - " /> + <el-input + v-model="scope.row.quantity" + placeholder="鏁伴噺" + @blur=" + val => { + sumTotalFee(scope.row); + } + " + /> </template> </el-table-column> - <el-table-column prop="amount" align="center" label="閲戦" width="120" v-if="form.applytype == '3'"> + <el-table-column + prop="amount" + align="center" + label="閲戦" + width="120" + v-if="form.applytype == '3'" + > <template slot-scope="scope"> - <el-input v-model="scope.row.amount" placeholder="浠锋牸" @blur="(val) => { - sumTotalFee(scope.row); - } - " /> + <el-input + v-model="scope.row.amount" + placeholder="浠锋牸" + @blur=" + val => { + sumTotalFee(scope.row); + } + " + /> </template> </el-table-column> - <el-table-column prop="unitno" align="center" label="璐圭敤鍗曚綅鍚嶇О" width="220"> + <el-table-column + prop="unitno" + align="center" + label="璐圭敤鍗曚綅鍚嶇О" + width="220" + > <template slot-scope="scope"> - <el-button type="primary" plain @click="ShowDetailDialog(scope, 'unit')">{{ scope.row.unitname - }}</el-button> + <el-button + type="primary" + plain + @click="ShowDetailDialog(scope, 'unit')" + >{{ scope.row.unitname }}</el-button + > </template> </el-table-column> - <el-table-column prop="depositbank" align="center" label="寮�鎴烽摱琛�" width="200"> + <el-table-column + prop="depositbank" + align="center" + label="寮�鎴烽摱琛�" + width="200" + > <template slot-scope="scope"> - <el-input v-model="scope.row.depositbank" placeholder="寮�鎴烽摱琛�" /> + <el-input + v-model="scope.row.depositbank" + placeholder="寮�鎴烽摱琛�" + /> </template> </el-table-column> - <el-table-column prop="bankcardno" align="center" label="閾惰鍗″彿" width="210"> + <el-table-column + prop="bankcardno" + align="center" + label="閾惰鍗″彿" + width="210" + > <template slot-scope="scope"> - <el-input v-model="scope.row.bankcardno" placeholder="閾惰鍗″彿" /> + <el-input + v-model="scope.row.bankcardno" + placeholder="閾惰鍗″彿" + /> </template> </el-table-column> - <el-table-column prop="remark" align="center" label="澶囨敞" width="210" v-if="form.applytype == '3'"> + <el-table-column + prop="remark" + align="center" + label="澶囨敞" + width="210" + v-if="form.applytype == '3'" + > <template slot-scope="scope"> <el-input v-model="scope.row.remark" placeholder="澶囨敞" /> </template> </el-table-column> - <el-table-column prop="title" align="center" label="鑱岀О" width="120" v-if="form.applytype != '3'"> + <el-table-column + prop="title" + align="center" + label="鑱岀О" + width="120" + v-if="form.applytype != '3'" + > <template slot-scope="scope"> <el-input v-model="scope.row.title" placeholder="鑱岀О" /> </template> </el-table-column> - <el-table-column prop="idcardno" align="center" label="韬唤璇佸彿" width="200" v-if="form.applytype != '3'"> + <el-table-column + prop="idcardno" + align="center" + label="韬唤璇佸彿" + width="200" + v-if="form.applytype != '3'" + > <template slot-scope="scope"> <el-input v-model="scope.row.idcardno" placeholder="韬唤璇佸彿" /> </template> </el-table-column> - <el-table-column prop="depositbank" align="center" label="寮�鎴烽摱琛�" width="200" v-if="form.applytype != '3'"> + <el-table-column + prop="depositbank" + align="center" + label="寮�鎴烽摱琛�" + width="200" + v-if="form.applytype != '3'" + > <template slot-scope="scope"> - <el-input v-model="scope.row.depositbank" placeholder="寮�鎴烽摱琛�" /> + <el-input + v-model="scope.row.depositbank" + placeholder="寮�鎴烽摱琛�" + /> </template> </el-table-column> - <el-table-column prop="bankcardno" align="center" label="閾惰鍗″彿" width="210" v-if="form.applytype != '3'"> + <el-table-column + prop="bankcardno" + align="center" + label="閾惰鍗″彿" + width="210" + v-if="form.applytype != '3'" + > <template slot-scope="scope"> - <el-input v-model="scope.row.bankcardno" placeholder="閾惰鍗″彿" /> + <el-input + v-model="scope.row.bankcardno" + placeholder="閾惰鍗″彿" + /> </template> </el-table-column> - <el-table-column fixed="right" align="center" label="鎿嶄綔" width="120" v-if="dialogType == 'edit'"> + <el-table-column + fixed="right" + align="center" + label="鎿嶄綔" + width="120" + v-if="dialogType == 'edit'" + > <template slot-scope="scope"> - <el-button type="text" size="mini" @click="addRow(scope.$index)">鏂板</el-button> - <el-button @click.native.prevent=" - deleteRows(scope.row, scope.$index, fundDetails) - " type="text" size="small"> + <el-button type="text" size="mini" @click="addRow(scope.$index)" + >鏂板</el-button + > + <el-button + @click.native.prevent=" + deleteRows(scope.row, scope.$index, fundDetails) + " + type="text" + size="small" + > 鍒犻櫎 </el-button> - <el-button @click.native.prevent=" - Filepopup(scope.$index, fundDetails, scope.row) - " type="text" size="small"> + <el-button + @click.native.prevent=" + Filepopup(scope.$index, fundDetails, scope.row) + " + type="text" + size="small" + > 绁ㄦ嵁 </el-button> </template> @@ -428,55 +794,143 @@ </el-row> --> <el-row> <el-col :span="24"> - <el-form-item label="璐圭敤鐢宠闄勪欢锛�" align="left" prop="annexbankcard"> - <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileList" multiple - :limit="20" :headers="headers" :on-success="(response, file, fileList) => - uploadSccess(response, file, fileList) - " :on-preview="downFile" :disabled='dialogType == "detail"' :on-error="handleUploadError" - :on-exceed="handleExceed" :on-remove="handleremove" accept="image/*,.pdf"> - <el-button :disabled='dialogType == "detail"' size="small" type="primary">涓婁紶</el-button> + <el-form-item + label="璐圭敤鐢宠闄勪欢锛�" + align="left" + prop="annexbankcard" + > + <el-upload + size="mini" + class="upload-demo" + :action="uploadFileUrl" + :file-list="fileList" + multiple + :limit="20" + :headers="headers" + :on-success=" + (response, file, fileList) => + uploadSccess(response, file, fileList) + " + :on-preview="downFile" + :disabled="dialogType == 'detail'" + :on-error="handleUploadError" + :on-exceed="handleExceed" + :on-remove="handleremove" + accept="image/*,.pdf" + > + <el-button + :disabled="dialogType == 'detail'" + size="small" + type="primary" + >涓婁紶</el-button + > </el-upload> </el-form-item> </el-col> </el-row> <el-row v-if="dialogType == 'detail'"> <el-table :data="fundflowList" border> - <el-table-column label="瀹℃牳浜�" align="center" width="120" prop="checkusername" /> - <el-table-column label="瀹℃牳鏃ユ湡" align="center" width="160" prop="createTime" /> - <el-table-column label="瀹℃牳缁撴灉" align="center" width="200" prop="flowconclusion"><template - slot-scope="scope"><span v-if="scope.row.flowconclusion == 1">閫氳繃</span><span - v-if="scope.row.flowconclusion == 2">涓嶉�氳繃</span></template> + <el-table-column + label="瀹℃牳浜�" + align="center" + width="120" + prop="checkusername" + /> + <el-table-column + label="瀹℃牳鏃ユ湡" + align="center" + width="160" + prop="createTime" + /> + <el-table-column + label="瀹℃牳缁撴灉" + align="center" + width="200" + prop="flowconclusion" + ><template slot-scope="scope" + ><span v-if="scope.row.flowconclusion == 1">閫氳繃</span + ><span v-if="scope.row.flowconclusion == 2" + >涓嶉�氳繃</span + ></template + > </el-table-column> - <el-table-column label="瀹℃牳澶囨敞" align="center" prop="flowcontent" /> + <el-table-column + label="瀹℃牳澶囨敞" + align="center" + prop="flowcontent" + /> </el-table> </el-row> </el-form> <div slot="footer" class="dialog-footer"> - <el-button type="primary" @click="submitForm" v-if="dialogType == 'edit'">淇� 瀛�</el-button> + <el-button + type="primary" + @click="submitForm" + v-if="dialogType == 'edit'" + >淇� 瀛�</el-button + > <!-- <el-button type="success" @click="print">鎵� 鍗�</el-button> --> <el-button @click="cancel">鍙� 娑�</el-button> </div> </el-dialog> - <el-dialog :visible.sync="detailInfoDialogShow" :close-on-click-modal="false" :title="'璐圭敤鍗曚綅閫夋嫨'" - style="text-align: center" v-loading="loading" width="500px"> + <el-dialog + :visible.sync="detailInfoDialogShow" + :close-on-click-modal="false" + :title="'璐圭敤鍗曚綅閫夋嫨'" + style="text-align: center" + v-loading="loading" + width="500px" + > <el-form ref="funddetailForm" :model="funddetailForm" label-width="120px"> <el-row> <el-col :span="24" v-if="detailInfoDialogShowType == 'name'"> - <el-form-item align="left" label="濮撳悕" prop="beneficiaryname" label-width="80px"> - <el-select filterable allow-create ref="beneficiaryname" default-first-option - v-model="funddetailForm.beneficiaryname" placeholder="璇烽�夋嫨" style="width: 100%"> - <el-option v-for="item in arrr3" :key="item.reportNo" :label="item.reportName" :value="item.reportName"> + <el-form-item + align="left" + label="濮撳悕" + prop="beneficiaryname" + label-width="80px" + > + <el-select + filterable + allow-create + ref="beneficiaryname" + default-first-option + v-model="funddetailForm.beneficiaryname" + placeholder="璇烽�夋嫨" + style="width: 100%" + > + <el-option + v-for="item in arrr3" + :key="item.reportNo" + :label="item.reportName" + :value="item.reportName" + > </el-option> </el-select> </el-form-item> </el-col> <el-col :span="24" v-if="detailInfoDialogShowType == 'unit'"> - <el-form-item align="left" label="鍗曚綅鍚嶇О" prop="unitno" label-width="80px"> - <el-select v-model="funddetailForm.unitno" placeholder="璇烽�夋嫨鍗曚綅" clearable filterable allow-create - style="width: 100%"> - <el-option v-for="(item, index) in bankaccountlist" :key="index" :label="item.reportName" - :value="item.reportNo"></el-option> + <el-form-item + align="left" + label="鍗曚綅鍚嶇О" + prop="unitno" + label-width="80px" + > + <el-select + v-model="funddetailForm.unitno" + placeholder="璇烽�夋嫨鍗曚綅" + clearable + filterable + allow-create + style="width: 100%" + > + <el-option + v-for="(item, index) in bankaccountlist" + :key="index" + :label="item.reportName" + :value="item.reportNo" + ></el-option> </el-select> </el-form-item> </el-col> @@ -484,7 +938,9 @@ </el-form> <span slot="footer" class="dialog-footer"> <el-button @click="detailInfoDialogShow = false">鍙� 娑�</el-button> - <el-button type="primary" @click="ConfirmDetailDialog()">纭� 瀹�</el-button> + <el-button type="primary" @click="ConfirmDetailDialog()" + >纭� 瀹�</el-button + > </span> </el-dialog> @@ -492,12 +948,31 @@ <div class="pdfimg"> <div class="box-pdf"> <div> - <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileListto" multiple - :limit="20" :headers="headers" :on-success="(response, file, fileList) => - uploadSccess(response, file, fileList) - " :on-preview="downFile" :disabled="dialogType == 'detail'" :on-error="handleUploadError" - :on-exceed="handleExceed" :on-remove="remove" accept="image/*,.pdf"> - <el-button :disabled="dialogType == 'detail'" size="small" type="primary">涓婁紶</el-button> + <el-upload + size="mini" + class="upload-demo" + :action="uploadFileUrl" + :file-list="fileListto" + multiple + :limit="20" + :headers="headers" + :on-success=" + (response, file, fileList) => + uploadSccess(response, file, fileList) + " + :on-preview="downFile" + :disabled="dialogType == 'detail'" + :on-error="handleUploadError" + :on-exceed="handleExceed" + :on-remove="remove" + accept="image/*,.pdf" + > + <el-button + :disabled="dialogType == 'detail'" + size="small" + type="primary" + >涓婁紶</el-button + > </el-upload> </div> <!-- <div @@ -536,7 +1011,7 @@ getdownloadYX, getdownloadBX, addorupdateFund, - getdetailsByItemId, + getdetailsByItemId } from "@/api/project/fund"; import { onelistFunds, @@ -551,13 +1026,13 @@ getItemNames, getFundType, getFundTypeAll, - listcountItem, + listcountItem } from "@/api/project/funddetail"; import { listOrganization, getOrganization, listReportname, - listUser, + listUser } from "@/api/project/organization"; import { listExternalperson, @@ -566,11 +1041,11 @@ delExternalperson, addExternalperson, updateExternalperson, - exportExternalperson, + exportExternalperson } from "@/api/project/externalperson"; import { listDonatebaseinfo, - getDonatebaseinfo, + getDonatebaseinfo } from "@/api/project/donatebaseinfo"; import Li_area_select from "@/components/Address"; import OrgSelecter from "@/views/project/components/orgselect"; @@ -582,7 +1057,7 @@ //import寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢� components: { Li_area_select, - OrgSelecter, + OrgSelecter }, name: "fundApply", dicts: [ @@ -596,7 +1071,7 @@ "sys_fund_type", "sys_finsubject", "sys_financeitemtype", - "sys_expensetype", + "sys_expensetype" ], data() { //杩欓噷瀛樻斁鏁版嵁 @@ -621,7 +1096,7 @@ treatmenthospitalname: null, donorno: null, reportername: null, - reporttime: null, + reporttime: null }, fundQueryParam: { @@ -629,21 +1104,21 @@ pageSize: 100, infoid: null, applytype: "3", - createBy: null, + createBy: null }, // 琛ㄥ崟鍙傛暟 form: {}, // 琛ㄥ崟鏍¢獙 rules: { username: [ - { required: true, message: "璇疯緭鍏ョ敵璇蜂汉", trigger: "blur" }, + { required: true, message: "璇疯緭鍏ョ敵璇蜂汉", trigger: "blur" } ], createTime: [ - { required: true, message: "璇疯緭鍏ョ敵璇锋棩鏈�", trigger: "blur" }, + { required: true, message: "璇疯緭鍏ョ敵璇锋棩鏈�", trigger: "blur" } ], deptmentname: [ - { required: true, message: "璇疯緭鍏ユ墍灞炰笟鍔$粍", trigger: "blur" }, - ], + { required: true, message: "璇疯緭鍏ユ墍灞炰笟鍔$粍", trigger: "blur" } + ] }, //鎹愮尞妗堜緥鍒楄〃鏁版嵁 @@ -679,7 +1154,6 @@ fundtypeArrAll: [], dialogType: "edit", - detailInfoDialogShow: false, detailInfoDialogShowType: "", funddetailForm: { @@ -687,7 +1161,7 @@ beneficiaryno: null, unitno: null, unitname: null, - index: null, + index: null }, //闄勪欢鍒楄〃 @@ -696,7 +1170,7 @@ //涓婁紶闄勪欢璺緞 uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", headers: { - Authorization: "Bearer " + getToken(), + Authorization: "Bearer " + getToken() }, //绁ㄦ嵁鏂囦欢 pdftitle: "", @@ -704,7 +1178,7 @@ pdfVisible: false, previewpdf: false, hintitle: "閫変腑宸︿晶宸蹭笂浼犳枃浠堕瑙堟煡鐪�", - atpresent: "", + atpresent: "" }; }, //鐩戝惉灞炴�� 绫讳技浜巇ata姒傚康 @@ -726,13 +1200,13 @@ this.getUsermsg(); }, - beforeCreate() { }, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠 - beforeMount() { }, //鐢熷懡鍛ㄦ湡 - 鎸傝浇涔嬪墠 - beforeUpdate() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪墠 - updated() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗 - beforeDestroy() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓� - destroyed() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴� - activated() { }, //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂 + beforeCreate() {}, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠 + beforeMount() {}, //鐢熷懡鍛ㄦ湡 - 鎸傝浇涔嬪墠 + beforeUpdate() {}, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪墠 + updated() {}, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗 + beforeDestroy() {}, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓� + destroyed() {}, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴� + activated() {}, //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂 //鏂规硶闆嗗悎 methods: { @@ -754,12 +1228,13 @@ this.loading = true; this.queryParams.params = {}; if (null != this.daterangeReporttime && "" != this.daterangeReporttime) { - this.queryParams.params["beginReporttime"] = - this.daterangeReporttime[0]; + this.queryParams.params[ + "beginReporttime" + ] = this.daterangeReporttime[0]; this.queryParams.params["endReporttime"] = this.daterangeReporttime[1]; } // this.queryParams.residencetown = this.$refs.areaSelect.getQu(); - listDonatebaseinfo(this.queryParams).then((response) => { + listDonatebaseinfo(this.queryParams).then(response => { this.donatebaseinfoList = response.rows; this.total = response.total; this.loading = false; @@ -770,7 +1245,12 @@ handleAdd() { this.$router.push({ path: "/finance/fundcontext/", - query: { id: 0, businessType: "3", operationType: "add", curCase: this.curCase } + query: { + id: 0, + businessType: "3", + operationType: "add", + curCase: this.curCase + } }); return; @@ -798,7 +1278,7 @@ } else { const h = this.$createElement; this.$message({ - message: h("p", null, [h("span", null, "璇峰厛閫夋嫨宸︽柟鎹愮尞妗堜緥 ")]), + message: h("p", null, [h("span", null, "璇峰厛閫夋嫨宸︽柟鎹愮尞妗堜緥 ")]) }); } }, @@ -806,7 +1286,13 @@ handleUpdate(row) { this.$router.push({ path: "/finance/fundcontext/", - query: { id: row.id, businessType: "3", operationType: "update", curCase: this.curCase } + query: { + id: row.id, + businessType: "3", + pos: 2, + operationType: "update", + curCase: this.curCase + } }); return; @@ -819,15 +1305,18 @@ this.dialogOpen = true; this.title = "淇敼璐圭敤鐢宠"; - const id = row.id || this.ids; - getFund(id).then((response) => { + getFund(id).then(response => { this.form = response.data; this.form.name = this.curCase.name; //闄勪欢澶勭悊 - this.fileList = this.form.annexbankcard ? this.form.annexbankcard.split(",").map(item => ({ url: item, name: item })) : [] + this.fileList = this.form.annexbankcard + ? this.form.annexbankcard + .split(",") + .map(item => ({ url: item, name: item })) + : []; - getownFundDetail(id).then(async (res) => { + getownFundDetail(id).then(async res => { this.fundDetails = res.data; for (let m = 0; m < this.fundDetails.length; m++) { this.fundDetails[m].itemArr = []; @@ -841,7 +1330,12 @@ handleDetail(row) { this.$router.push({ path: "/finance/fundcontext/", - query: { id: row.id, businessType: "3", operationType: "detail", curCase: this.curCase } + query: { + id: row.id, + businessType: "3", + operationType: "detail", + curCase: this.curCase + } }); return; @@ -855,20 +1349,24 @@ this.dialogType = "detail"; const id = row.id || this.ids; - getFund(id).then((response) => { + getFund(id).then(response => { this.form = response.data; this.form.name = this.curCase.name; let listFundflowparams = { fundid: row.id, - fundtype: 2, + fundtype: 2 }; //闄勪欢澶勭悊 - this.fileList = this.form.annexbankcard ? this.form.annexbankcard.split(",").map(item => ({ url: item, name: item })) : [] + this.fileList = this.form.annexbankcard + ? this.form.annexbankcard + .split(",") + .map(item => ({ url: item, name: item })) + : []; - listFundflow(listFundflowparams).then((res) => { + listFundflow(listFundflowparams).then(res => { this.fundflowList = res.rows; }); - getownFundDetail(id).then((res) => { + getownFundDetail(id).then(res => { this.fundDetails = res.data; for (let m = 0; m < this.fundDetails.length; m++) { this.fundDetails[m].itemArr = []; @@ -878,7 +1376,7 @@ expense: this.fundDetails[m].expense, expensedescribe: this.fundDetails[m].servicesscopename, remark: this.fundDetails[m].servicesscope, - servicesscope: this.fundDetails[m].servicesscope, + servicesscope: this.fundDetails[m].servicesscope }); } }); @@ -890,11 +1388,11 @@ const ids = row.id || this.ids; this.$modal .confirm("鏄惁纭鍒犻櫎璇ヨ褰曪紵") - .then(function () { + .then(function() { return delFund(ids); }) .then(() => { - getownFundDetail(ids).then((res) => { + getownFundDetail(ids).then(res => { let listdetails = res.data; for (let i = 0; i < listdetails.length; i++) { delFunddetail(listdetails[i].id); @@ -904,7 +1402,7 @@ this.getfundList(); this.$modal.msgSuccess("鍒犻櫎鎴愬姛"); }) - .catch(() => { }); + .catch(() => {}); }, /** 涓婃姤鎸夐挳鎿嶄綔 */ @@ -912,23 +1410,23 @@ this.$confirm("鏄惁纭灏嗙櫥璁拌褰曚笂鎶ワ紵", "鎻愮ず", { confirmButtonText: "纭畾", cancelButtonText: "鍙栨秷", - type: "warning", + type: "warning" }) .then(() => { //鏌ユ壘鏄惁瀛樺湪鐧昏瀹屾垚璁板綍 //鍒ゆ柇鏄惁瀛樺湪涓婃姤璁板綍 row.recordstatus = 0; - updateFund(row).then((response) => { + updateFund(row).then(response => { if (response.code == 200) { this.$message({ type: "success", - message: "鐢宠鎴愬姛", + message: "鐢宠鎴愬姛" }); } else { this.$message({ type: "error", - message: "鐢宠澶辫触", + message: "鐢宠澶辫触" }); } this.loading = false; @@ -937,7 +1435,7 @@ .catch(() => { this.$message({ type: "info", - message: "宸插彇娑堢敵璇�", + message: "宸插彇娑堢敵璇�" }); }); }, @@ -958,7 +1456,7 @@ let tempUnitname = this.funddetailForm.unitname; let singleDetail = this.fundDetails[tempIndex]; if (this.detailInfoDialogShowType == "name") { - this.personlist.map((res) => { + this.personlist.map(res => { if (tempName == res.username) { singleDetail.beneficiaryno = res.userno; singleDetail.beneficiaryname = res.username; @@ -979,13 +1477,17 @@ singleDetail.unitno = this.funddetailForm.unitno; try { let unitIndex = this.bankaccountlist.findIndex( - (item) => singleDetail.unitno == item.reportNo + item => singleDetail.unitno == item.reportNo ); if (unitIndex > -1) { singleDetail.unitname = this.bankaccountlist[unitIndex].reportName; - singleDetail.depositbank = this.bankaccountlist[unitIndex].depositbank; - singleDetail.bankcardno = this.bankaccountlist[unitIndex].bankcardno; + singleDetail.depositbank = this.bankaccountlist[ + unitIndex + ].depositbank; + singleDetail.bankcardno = this.bankaccountlist[ + unitIndex + ].bankcardno; } else { singleDetail.unitname = singleDetail.unitno; } @@ -993,7 +1495,7 @@ singleDetail.unitname = singleDetail.unitno; } } - + this.fundDetails[tempIndex] = singleDetail; this.detailInfoDialogShow = false; }, @@ -1004,7 +1506,7 @@ row.servivesscope = item.servivesscope; row.amount = item.expense; this.form.serviceFunddetails = 0; - this.fundDetails.map((item) => { + this.fundDetails.map(item => { this.form.serviceFunddetails += item.amount; }); } @@ -1012,14 +1514,14 @@ }, select(row) { - row.itemArr.map((res) => { + row.itemArr.map(res => { if (row.itemid === res.id) { row.remark = res.itemDescribe; row.itemcode = res.itemCode; } }); var repeatNum = 0; - this.fundDetails.map((res) => { + this.fundDetails.map(res => { if (res.applytype === row.applytype && res.itemid == row.itemid) { repeatNum++; } @@ -1028,15 +1530,15 @@ this.$modal.msgWarning("鎮ㄥ凡缁忔彁浜よ繃鏈嶅姟椤圭洰"); } - getdetailsByItemId(row.itemid).then((res) => { + getdetailsByItemId(row.itemid).then(res => { let fundmsg = res.data; let fundblock = []; - fundmsg.forEach((item) => { + fundmsg.forEach(item => { fundblock.push({ expense: item.expense, expensedescribe: item.expensedescribe, remark: item.expensedescribe, - servicesscope: item.id, + servicesscope: item.id }); }); row.fundblock = fundblock; @@ -1052,7 +1554,7 @@ }); }, getUsermsg() { - getUserProfile().then((response) => { + getUserProfile().then(response => { this.defaultperson = response.data; this.standardlevel = response.data.standardlevel; }); @@ -1060,13 +1562,12 @@ getBaseInfoList() { this.loading = true; - listDonatebaseinfo(this.queryParams).then((response) => { + listDonatebaseinfo(this.queryParams).then(response => { this.donatebaseinfoList = response.rows; this.total = response.total; this.loading = false; }); }, - //鐐瑰嚮鎹愮尞妗堜緥鍒楄〃瑙﹀彂鏂规硶 selectDonotor(row, column, event) { @@ -1077,7 +1578,7 @@ this.loading = true; this.reset(); this.fundQueryParam.infoid = this.curCase.id; - listFund(this.fundQueryParam).then((response) => { + listFund(this.fundQueryParam).then(response => { this.loading = false; this.donateconsolationfundList = response.rows; }); @@ -1130,12 +1631,12 @@ servicetypename: null, servicesscopename: null, dialogType: "edit", - fundflowList: [], + fundflowList: [] }; this.resetForm("form"); //娓呯┖闄勪欢 - this.fileList = [] + this.fileList = []; }, //鏂板涓�琛� @@ -1180,7 +1681,7 @@ uploadflag: null, uploadtime: null, itemArr: [], - servivesscope: null, + servivesscope: null }; if (rowIndex == undefined || rowIndex == null || rowIndex < 0) { this.fundDetails.push(rowData); @@ -1194,7 +1695,7 @@ //鍔犺浇鏈嶅姟椤圭洰 LoadItemTypeArr(row) { - let list = this.fundtypeArrAll.filter((r) => r.itemType == row.applytype); + let list = this.fundtypeArrAll.filter(r => r.itemType == row.applytype); row.itemArr = list[0].itemDetails; row.itemid = null; this.$forceUpdate(); @@ -1209,7 +1710,7 @@ /** 鎻愪氦鎸夐挳 */ submitForm() { - this.$refs["form"].validate((valid) => { + this.$refs["form"].validate(valid => { if (valid) { let formData = this.form; for (let k = 0; k < this.fundDetails.length; k++) { @@ -1253,7 +1754,7 @@ ); if (this.form.id != null) { - updateFund(this.form).then((response) => { + updateFund(this.form).then(response => { this.getfundList(); this.dialogOpen = false; @@ -1267,16 +1768,16 @@ tempData.fundid = formData.id; //鑾峰彇鏈嶅姟椤圭洰鏄庣粏 let itemIndex = tempItemArr.findIndex( - (item) => tempData.itemid == item.id + item => tempData.itemid == item.id ); if (itemIndex > -1) { tempData.itemname = tempItemArr[itemIndex].itemName; tempData.itemid = tempItemArr[itemIndex].id; } if (tempData.id > 0) { - updateFunddetail(tempData).then((response2) => { }); + updateFunddetail(tempData).then(response2 => {}); } else { - addFunddetail(tempData).then((response2) => { }); + addFunddetail(tempData).then(response2 => {}); } } }); @@ -1288,7 +1789,7 @@ //鑾峰彇鏈嶅姟椤圭洰鏄庣粏 let itemIndex = tempUtemArr.findIndex( - (item) => tempData.itemid == item.id + item => tempData.itemid == item.id ); if (itemIndex > -1) { tempData.itemname = tempUtemArr[itemIndex].itemName; @@ -1296,7 +1797,7 @@ } //鑾峰彇applytypename let applytypeIndex = this.fundtypeArr.findIndex( - (item) => tempData.applytype == item.value + item => tempData.applytype == item.value ); if (applytypeIndex > -1) { tempData.applytypename = this.fundtypeArr[applytypeIndex].label; @@ -1305,7 +1806,7 @@ } this.form.serviceFunddetails = this.fundDetails; - addorupdateFund(this.form).then((response) => { + addorupdateFund(this.form).then(response => { if (response.code === 200) { this.$modal.msgSuccess("鏂板鎴愬姛"); this.loading = false; @@ -1328,36 +1829,34 @@ getBankAccount() { //鑾峰彇閾惰璐﹀彿鍒楄〃锛岀被鍨嬫槸鏈烘瀯 - listReportname("org").then((res) => { + listReportname("org").then(res => { this.bankaccountlist = res.data; }); }, getlistUser() { - listUser().then((res) => { + listUser().then(res => { this.userlist = res.data; }); }, - - deleteRows(row, index, rows) { this.$confirm("鏄惁纭鍒犻櫎?", "鎻愮ず", { confirmButtonText: "纭畾", cancelButtonText: "鍙栨秷", - type: "success", + type: "success" }) .then(() => { if (row.id !== null) { - delFunddetail(row.id).then((res) => { + delFunddetail(row.id).then(res => { if (res.code === 200) { this.$confirm("鍒犻櫎鎴愬姛", "鎻愮ず", { confirmButtonText: "纭畾", cancelButtonText: "鍙栨秷", - type: "success", + type: "success" }).then(() => { this.$set(rows, rows.splice(index, 1)); - getownFundDetail(this.form.id).then((res) => { + getownFundDetail(this.form.id).then(res => { this.$set(this.fundDetails, res.data); this.sumTotalFee(row); // this.fundDetails = res.data @@ -1415,21 +1914,21 @@ //鑾峰彇璐圭敤绫诲瀷 getCurFundType() { - getFundTypeAll(this.currentApplyType).then((res) => { + getFundTypeAll(this.currentApplyType).then(res => { let dataList = res.data; this.fundtypeArrAll = dataList; this.fundtypeArr = []; for (let m = 0; m < dataList.length; m++) { this.fundtypeArr.push({ value: dataList[m].itemType, - label: dataList[m].itemTypeName, + label: dataList[m].itemTypeName }); } }); }, getItemArr(rowindex, row) { - let list = this.fundtypeArrAll.filter((r) => r.itemType == row.applytype); + let list = this.fundtypeArrAll.filter(r => r.itemType == row.applytype); row.itemArr = list[0].itemDetails; this.$set(this.fundDetails, rowindex, row); //this.loading = true; @@ -1443,14 +1942,14 @@ addAlls() { this.loading = true; this.fundDetails = this.fundDetails.filter( - (r) => r.applytype != "" && r.applytype != null + r => r.applytype != "" && r.applytype != null ); let listAdd = []; //let listAdd = this.fundDetails; for (let i = 0; i < this.fundtypeArrAll.length; i++) { for (let j = 0; j < this.fundtypeArrAll[i].itemDetails.length; j++) { let list = this.fundDetails.filter( - (r) => + r => r.applytype == this.fundtypeArrAll[i].itemType && r.itemid == this.fundtypeArrAll[i].itemDetails[j].id ); @@ -1464,7 +1963,7 @@ recordstatus: "-1", itemArr: this.fundtypeArrAll[i].itemDetails, beneficiaryname: "鐐瑰嚮閫夋嫨", - unitname: "鐐瑰嚮閫夋嫨", + unitname: "鐐瑰嚮閫夋嫨" }; listAdd.push(rowData); } @@ -1485,13 +1984,13 @@ }, getUnitList() { - listOrganization(3).then((res) => { + listOrganization(3).then(res => { for (let i = 0; i < res.rows.length; i++) { this.unitList.push({ organizationid: res.rows[i].organizationid, organizationname: res.rows[i].organizationname, bankname: res.rows[i].bankname, - bankaccount: res.rows[i].bankaccount, + bankaccount: res.rows[i].bankaccount }); } }); @@ -1499,7 +1998,7 @@ // 鎹愮尞鑰呭尰瀛︾粺璁℃墦鍗� dayin2(id) { - getdownloadYX(id).then((res) => { + getdownloadYX(id).then(res => { if (res.downloadUrl) { var fileUrl = res; //鑾峰彇褰撳墠缃戝潃 @@ -1513,7 +2012,7 @@ aEle.click(); this.$alert("涓嬭浇鎴愬姛", "鎻愮ず", { confirmButtonText: "纭畾", - type: "success", + type: "success" }); } }); @@ -1522,7 +2021,7 @@ //姹囨�绘墦鍗� totaldayin(e) { // const id =this.row.id - getdownloadBX(e).then((res) => { + getdownloadBX(e).then(res => { if (res.downloadUrl) { var fileUrl = res; //鑾峰彇褰撳墠缃戝潃 @@ -1536,7 +2035,7 @@ aEle.click(); this.$alert("涓嬭浇鎴愬姛", "鎻愮ず", { confirmButtonText: "纭畾", - type: "success", + type: "success" }); } }); @@ -1561,7 +2060,7 @@ } scope.row.itemArr = result; } else { - getItemNames(scope.row.applytype).then((res) => { + getItemNames(scope.row.applytype).then(res => { scope.row.itemArr = res.data; //this.$set(this.fundDetails, rowindex, row); }); @@ -1569,10 +2068,10 @@ }, //鏂囦欢涓婁紶 - handleUploadError() { }, + handleUploadError() {}, handleremove(file) { - this.fileList.splice(this.fileList.indexOf(file), 1) + this.fileList.splice(this.fileList.indexOf(file), 1); }, handleExceed() { @@ -1587,21 +2086,21 @@ this.$modal.msgSuccess(response.msg); this.fileList.push({ name: response.fileName, url: response.fileName }); } else { - console.log(response.msg);; + console.log(response.msg); } }, // 涓嬭浇鏂囦欢 downFile(item) { - const url = process.env.VUE_APP_BASE_API + item.url - var a = document.createElement('a'); - var event = new MouseEvent('click'); + const url = process.env.VUE_APP_BASE_API + item.url; + var a = document.createElement("a"); + var event = new MouseEvent("click"); a.download = item.name; a.href = url; a.dispatchEvent(event); }, remove(file) { - this.fileList.splice(this.fileList.indexOf(file), 1) + this.fileList.splice(this.fileList.indexOf(file), 1); }, // 鐐瑰嚮鏂囦欢 @@ -1636,8 +2135,8 @@ this.$modal.msgWarning("褰撳墠鏂囦欢鏆備笉鏀寔棰勮"); this.previewpdf = false; } - }, - }, + } + } }; </script> <style scoped> diff --git a/src/views/project/travelexpenseslist/Modifydetails/index.vue b/src/views/project/travelexpenseslist/Modifydetails/index.vue index 9080a9c..cd24f2c 100644 --- a/src/views/project/travelexpenseslist/Modifydetails/index.vue +++ b/src/views/project/travelexpenseslist/Modifydetails/index.vue @@ -3,19 +3,36 @@ <div class="boxdiv"> <div class="top-text">{{ title }}</div> <el-form ref="form" :model="form" :rules="rules" label-width="120px"> - <el-row><el-col :span="5"> + <el-row + ><el-col :span="5"> <el-form-item label="鐢宠鏃ユ湡" prop="createTime"> - <el-date-picker style="width: 100%" v-model="form.createTime" type="date" value-format="yyyy-MM-dd HH:mm:ss" - placeholder="鐢宠鏃ユ湡"> + <el-date-picker + 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" clearable filterable allow-create ref="getReportname" - default-first-option placeholder="璇烽�夋嫨"> - <el-option v-for="item in personsList" :key="item.reportNo" :label="item.reportName" - :value="item.reportName"> + <el-select + v-model="form.username" + clearable + filterable + allow-create + ref="getReportname" + default-first-option + placeholder="璇烽�夋嫨" + > + <el-option + v-for="item in personsList" + :key="item.reportNo" + :label="item.reportName" + :value="item.reportName" + > </el-option> </el-select> </el-form-item> @@ -40,8 +57,18 @@ </el-col> <el-col :span="5"> <el-form-item label="鎹愮尞鑰�" prop="infoid"> - <el-select v-model="form.infoid" @change="selectbaseinfo" filterable placeholder="璇烽�夋嫨鎹愮尞鑰�"> - <el-option v-for="item in baselist" :key="item.index" :label="item.name" :value="item.infoid"> + <el-select + v-model="form.infoid" + @change="selectbaseinfo" + filterable + placeholder="璇烽�夋嫨鎹愮尞鑰�" + > + <el-option + v-for="item in baselist" + :key="item.index" + :label="item.name" + :value="item.infoid" + > </el-option> </el-select> </el-form-item> @@ -50,17 +77,36 @@ <el-row style="margin-top: 10px"> <el-col :span="5"> <el-form-item label="鎶ラ攢閲戦" prop="amountrequested"> - <el-input :disabled="true" v-model="form.amountrequested" placeholder="鎶ラ攢鍚堣閲戦" /> + <el-input + :disabled="true" + v-model="form.amountrequested" + placeholder="鎶ラ攢鍚堣閲戦" + /> </el-form-item> </el-col> <el-col :span="10"> <el-form-item label="澶у啓閲戦" prop="bigstrmoney"> - <el-input :disabled="true" v-model="form.bigstrmoney" placeholder="鎶ラ攢澶у啓閲戦" /> - </el-form-item> </el-col><el-col :span="5"> + <el-input + :disabled="true" + v-model="form.bigstrmoney" + placeholder="鎶ラ攢澶у啓閲戦" + /> + </el-form-item> </el-col + ><el-col :span="5"> <el-form-item label="瀹℃牳鐘舵��" prop="flowlevel"> - <el-select v-model="form.recordstatus" placeholder="璇烽�夋嫨瀹℃牳鐘舵��" clearable :disabled="true" size="small"> - <el-option v-for="dict in dict.type.sys_recordstatus" :key="dict.value" :label="dict.label" - :value="dict.value" /> + <el-select + v-model="form.recordstatus" + placeholder="璇烽�夋嫨瀹℃牳鐘舵��" + clearable + :disabled="true" + size="small" + > + <el-option + v-for="dict in dict.type.sys_recordstatus" + :key="dict.value" + :label="dict.label" + :value="dict.value" + /> </el-select> </el-form-item> </el-col> @@ -166,117 +212,270 @@ <el-col :span="20">鎶ラ攢鏄庣粏褰曞叆锛�</el-col> </el-row> <el-row> - <el-table :data="rbDetails" border highlight-current-row :summary-method="getSummaries" show-summary> - <el-table-column prop="orderno" slot="" label="搴忓彿" align="center" fixed width="65"> + <el-table + :data="rbDetails" + border + highlight-current-row + :summary-method="getSummaries" + show-summary + > + <el-table-column + prop="orderno" + slot="" + label="搴忓彿" + align="center" + fixed + width="65" + > <template slot-scope="scope"> <el-input v-model="scope.row.orderno" placeholder="搴忓彿" /> </template> </el-table-column> <!--涓婚敭銆佸涓嶅睍绀�--> - <el-table-column prop="id" slot="" label="涓婚敭" align="center" fixed width="95" v-if="false"> + <el-table-column + prop="id" + slot="" + label="涓婚敭" + align="center" + fixed + width="95" + v-if="false" + > <template slot-scope="scope"> <el-input v-model="scope.row.id" placeholder="id" /> </template> </el-table-column> - <el-table-column prop="rbid" slot="" label="澶栭敭" align="center" fixed width="95" v-if="false"> + <el-table-column + prop="rbid" + slot="" + label="澶栭敭" + align="center" + fixed + width="95" + v-if="false" + > <template slot-scope="scope"> <el-input v-model="scope.row.rbid" placeholder="rbid" /> </template> </el-table-column> - <el-table-column prop="persontype" slot="" label="浜哄憳绫诲埆" align="center" fixed width="130"> + <el-table-column + prop="persontype" + slot="" + label="浜哄憳绫诲埆" + align="center" + fixed + width="130" + > <template slot-scope="scope"> - <el-select v-model="scope.row.persontype" value-key="value" placeholder="浜哄憳绫诲埆" - @change="getPersons(scope.row)"> - <el-option v-for="dict in dict.type.sys_travelexpensebelong" :key="dict.value" :label="dict.label" - :value="dict.label"></el-option> + <el-select + v-model="scope.row.persontype" + value-key="value" + placeholder="浜哄憳绫诲埆" + @change="getPersons(scope.row)" + > + <el-option + v-for="dict in dict.type.sys_travelexpensebelong" + :key="dict.value" + :label="dict.label" + :value="dict.label" + ></el-option> </el-select> </template> </el-table-column> - <el-table-column prop="personname" slot="" label="璐圭敤浜哄憳" align="center" fixed width="110"> + <el-table-column + prop="personname" + slot="" + label="璐圭敤浜哄憳" + align="center" + fixed + width="110" + > <template slot-scope="scope"> - <el-select v-model="scope.row.personname" clearable filterable allow-create default-first-option - placeholder="璇烽�夋嫨" @focus1="getPersons(scope.row)"> - <el-option v-for="item in personsSel" :key="item.reportNo" :label="item.reportName" - :value="item.reportName"> + <el-select + v-model="scope.row.personname" + clearable + filterable + allow-create + default-first-option + placeholder="璇烽�夋嫨" + @focus1="getPersons(scope.row)" + > + <el-option + v-for="item in personsSel" + :key="item.reportNo" + :label="item.reportName" + :value="item.reportName" + > </el-option> </el-select> </template> </el-table-column> - <el-table-column prop="starttime" slot="" label="寮�濮嬫棩鏈�" fixed align="center" width="150"> + <el-table-column + prop="starttime" + slot="" + label="寮�濮嬫棩鏈�" + fixed + align="center" + width="150" + > <template slot-scope="scope"> - <el-date-picker :picker-options="{ - disabledDate: time => { - if (scope.row.endtime) { - return ( - time.getTime() > - new Date(scope.row.endtime.replace(/-/g, '/')) - ); + <el-date-picker + :picker-options="{ + disabledDate: time => { + if (scope.row.endtime) { + return ( + time.getTime() > + new Date(scope.row.endtime.replace(/-/g, '/')) + ); + } } - } - }" clearable size="small" style="width: 100%" v-model="scope.row.starttime" type="date" - value-format="yyyy-MM-dd HH:mm:ss" placeholder="寮�濮嬫棩鏈�" @blur="getdays(scope.row)"> + }" + clearable + size="small" + style="width: 100%" + v-model="scope.row.starttime" + type="date" + value-format="yyyy-MM-dd HH:mm:ss" + placeholder="寮�濮嬫棩鏈�" + @blur="getdays(scope.row)" + > </el-date-picker> </template> </el-table-column> - <el-table-column prop="endtime" slot="" label="缁撴潫鏃ユ湡" align="center" fixed width="150"> + <el-table-column + prop="endtime" + slot="" + label="缁撴潫鏃ユ湡" + align="center" + fixed + width="150" + > <template slot-scope="scope"> - <el-date-picker :picker-options="{ - disabledDate: time => { - if (scope.row.starttime) { - return ( - time.getTime() < - new Date(scope.row.starttime.replace(/-/g, '/')) - ); + <el-date-picker + :picker-options="{ + disabledDate: time => { + if (scope.row.starttime) { + return ( + time.getTime() < + new Date(scope.row.starttime.replace(/-/g, '/')) + ); + } } - } - }" clearable size="small" style="width: 100%" v-model="scope.row.endtime" type="date" - value-format="yyyy-MM-dd HH:mm:ss" placeholder="缁撴潫鏃ユ湡" @blur="getdays(scope.row)"> + }" + clearable + size="small" + style="width: 100%" + v-model="scope.row.endtime" + type="date" + value-format="yyyy-MM-dd HH:mm:ss" + placeholder="缁撴潫鏃ユ湡" + @blur="getdays(scope.row)" + > </el-date-picker> </template> </el-table-column> - <el-table-column prop="departure" slot="" label="鍑哄彂鍦�" align="center" width="100"> + <el-table-column + prop="departure" + slot="" + label="鍑哄彂鍦�" + align="center" + width="100" + > <template slot-scope="scope"> <el-input v-model="scope.row.departure" placeholder="鍑哄彂鍦�" /> </template> </el-table-column> - <el-table-column label="鍒拌揪鍦�" prop="destination" align="center" width="140"> + <el-table-column + label="鍒拌揪鍦�" + prop="destination" + align="center" + width="140" + > <template slot-scope="scope"> <!-- <el-input v-model="scope.row.destination" placeholder="鍒拌揪鍦�" @blur="getallowance(scope.row)" /> --> - <el-select filterable allow-create v-model="scope.row.destination" value-key="value" placeholder="鍒拌揪鍦�" - @change="getallowance(scope.row)"> - <el-option v-for="dict in dict.type.sys_area_name" :key="dict.value" :label="dict.label" - :value="dict.label"></el-option> + <el-select + filterable + allow-create + v-model="scope.row.destination" + value-key="value" + placeholder="鍒拌揪鍦�" + @change="getallowance(scope.row)" + > + <el-option + v-for="dict in dict.type.sys_area_name" + :key="dict.value" + :label="dict.label" + :value="dict.label" + ></el-option> </el-select> </template> </el-table-column> <el-table-column prop="days" label="澶╂暟" width="65" align="center"> <template slot-scope="scope"> - <el-input v-model="scope.row.days" @blur="getallowance(scope.row)" placeholder="澶╂暟" /> + <el-input + v-model="scope.row.days" + @blur="getallowance(scope.row)" + placeholder="澶╂暟" + /> </template> </el-table-column> - <el-table-column prop="traffictype" label="鍑哄彂浜ら�氬伐鍏�" align="center" width="100"> + <el-table-column + prop="traffictype" + label="鍑哄彂浜ら�氬伐鍏�" + align="center" + width="100" + > <template slot-scope="scope"> - <el-select v-model="scope.row.traffictype" placeholder="鍑哄彂浜ら�氬伐鍏�"> - <el-option v-for="dict in dict.type.sys_traffictype" :key="dict.value" :label="dict.label" - :value="dict.label"></el-option> + <el-select + v-model="scope.row.traffictype" + placeholder="鍑哄彂浜ら�氬伐鍏�" + > + <el-option + v-for="dict in dict.type.sys_traffictype" + :key="dict.value" + :label="dict.label" + :value="dict.label" + ></el-option> </el-select> </template> </el-table-column> - <el-table-column prop="traffictype2" label="杩斿洖浜ら�氬伐鍏�" align="center" width="100"> + <el-table-column + prop="traffictype2" + label="杩斿洖浜ら�氬伐鍏�" + align="center" + width="100" + > <template slot-scope="scope"> - <el-select v-model="scope.row.traffictype2" placeholder="杩斿洖浜ら�氬伐鍏�"> - <el-option v-for="dict in dict.type.sys_traffictype" :key="dict.value" :label="dict.label" - :value="dict.label"></el-option> + <el-select + v-model="scope.row.traffictype2" + placeholder="杩斿洖浜ら�氬伐鍏�" + > + <el-option + v-for="dict in dict.type.sys_traffictype" + :key="dict.value" + :label="dict.label" + :value="dict.label" + ></el-option> </el-select> </template> </el-table-column> - <el-table-column prop="trafficexpense" label="浜ら�氳垂" align="center" width="80"> + <el-table-column + prop="trafficexpense" + label="浜ら�氳垂" + align="center" + width="80" + > <template slot-scope="scope"> - <el-input v-model="scope.row.trafficexpense" placeholder="浜ら�氳垂" @blur="val => { - sumRowFee(scope.row); - } - " /> + <el-input + v-model="scope.row.trafficexpense" + placeholder="浜ら�氳垂" + @blur=" + val => { + sumRowFee(scope.row); + } + " + /> </template> </el-table-column> <!-- @@ -291,67 +490,155 @@ </template> </el-table-column> --> - <el-table-column prop="hotelexpense" label="浣忓璐�" align="center" width="80"> + <el-table-column + prop="hotelexpense" + label="浣忓璐�" + align="center" + width="80" + > <template slot-scope="scope"> - <el-input v-model="scope.row.hotelexpense" placeholder="浣忓璐�" @blur="val => { - sumRowFee(scope.row); - } - " /> + <el-input + v-model="scope.row.hotelexpense" + placeholder="浣忓璐�" + @blur=" + val => { + sumRowFee(scope.row); + } + " + /> </template> </el-table-column> - <el-table-column prop="foodexpenses" label="椁愯垂鎶ラ攢" align="center" width="80"> + <el-table-column + prop="foodexpenses" + label="椁愯垂鎶ラ攢" + align="center" + width="80" + > <template slot-scope="scope"> - <el-input v-model="scope.row.foodexpenses" placeholder="浼欓璐规姤閿�" @blur="val => { - sumRowFee(scope.row); - } - " /> + <el-input + v-model="scope.row.foodexpenses" + placeholder="浼欓璐规姤閿�" + @blur=" + val => { + sumRowFee(scope.row); + } + " + /> </template> </el-table-column> - <el-table-column prop="foodallowance" label="浼欓琛ュ姪" align="center" width="80"> + <el-table-column + prop="foodallowance" + label="浼欓琛ュ姪" + align="center" + width="80" + > <template slot-scope="scope"> - <el-input v-model="scope.row.foodallowance" placeholder="浼欓璐硅ˉ鍔�" @blur="val => { - sumRowFee(scope.row); - } - " /> + <el-input + v-model="scope.row.foodallowance" + placeholder="浼欓璐硅ˉ鍔�" + @blur=" + val => { + sumRowFee(scope.row); + } + " + /> </template> </el-table-column> - <el-table-column prop="otherexpense" label="鍏潅璐硅ˉ鍔�" align="center" width="80"> + <el-table-column + prop="otherexpense" + label="鍏潅璐硅ˉ鍔�" + align="center" + width="80" + > <template slot-scope="scope"> - <el-input v-model="scope.row.otherexpense" placeholder="鏉傝垂" @blur="val => { - sumRowFee(scope.row); - } - " /> + <el-input + v-model="scope.row.otherexpense" + placeholder="鏉傝垂" + @blur=" + val => { + sumRowFee(scope.row); + } + " + /> </template> </el-table-column> - <el-table-column prop="otherfeeamount" label="鍏朵粬璐圭敤" align="center" width="90"> + <el-table-column + prop="otherfeeamount" + label="鍏朵粬璐圭敤" + align="center" + width="90" + > <template slot-scope="scope"> - <el-input v-model="scope.row.otherfeeamount" placeholder="鍏朵粬璐圭敤" @blur="val => { - sumRowFee(scope.row); - } - " /> + <el-input + v-model="scope.row.otherfeeamount" + placeholder="鍏朵粬璐圭敤" + @blur=" + val => { + sumRowFee(scope.row); + } + " + /> </template> </el-table-column> - <el-table-column prop="departure" slot="" label="鍏朵粬璐圭敤璇存槑" align="center" width="120"> + <el-table-column + prop="departure" + slot="" + label="鍏朵粬璐圭敤璇存槑" + align="center" + width="120" + > <template slot-scope="scope"> - <el-input v-model="scope.row.otherfeedesc" placeholder="鍏朵粬璐圭敤璇存槑" /> + <el-input + v-model="scope.row.otherfeedesc" + placeholder="鍏朵粬璐圭敤璇存槑" + /> </template> </el-table-column> - <el-table-column prop="total" label="鍚堣" align="center" width="110" fixed="right"> + <el-table-column + prop="total" + label="鍚堣" + align="center" + width="110" + fixed="right" + > <template slot-scope="scope"> <el-input v-model="scope.row.total" placeholder="鍚堣" /> </template> </el-table-column> - <el-table-column fixed="right" label="鎿嶄綔" align="center" width="120"> + <el-table-column + fixed="right" + label="鎿嶄綔" + align="center" + width="120" + > <template slot-scope="scope"> - <el-button type="text" size="mini" @click="addDetailRow(scope.$index)" - v-if="dialogType == 'edit'">鏂板</el-button> - <el-button @click.native.prevent="deleteDetailRow(scope.$index, rbDetails, scope.row)" type="text" - size="small" v-if="dialogType == 'edit'">鍒犻櫎</el-button> - <el-button @click.native.prevent="Filepopup(scope.$index, rbDetails, scope.row)" type="text" - size="small">绁ㄦ嵁</el-button> + <el-button + type="text" + size="mini" + @click="addDetailRow(scope.$index)" + v-if="dialogType == 'edit'" + >鏂板</el-button + > + <el-button + @click.native.prevent=" + deleteDetailRow(scope.$index, rbDetails, scope.row) + " + type="text" + size="small" + v-if="dialogType == 'edit'" + >鍒犻櫎</el-button + > + <el-button + @click.native.prevent=" + Filepopup(scope.$index, rbDetails, scope.row) + " + type="text" + size="small" + >绁ㄦ嵁</el-button + > </template> </el-table-column> </el-table> @@ -360,60 +647,153 @@ <el-col :span="20">鎶ラ攢璇锋鏄庣粏锛�</el-col> </el-row> <el-row style="margin-top: 30px"> - <el-table :data="rbPayees" border highlight-current-row :summary-method="getSummaries" show-summary> - <el-table-column prop="orderno" slot="" label="搴忓彿" align="center" fixed width="65"> + <el-table + :data="rbPayees" + border + highlight-current-row + :summary-method="getSummaries" + show-summary + > + <el-table-column + prop="orderno" + slot="" + label="搴忓彿" + align="center" + fixed + width="65" + > <template slot-scope="scope"> <el-input v-model="scope.row.orderno" placeholder="搴忓彿" /> </template> </el-table-column> <!--涓婚敭銆佸閿笉灞曠ず--> - <el-table-column prop="id" slot="" label="涓婚敭" align="center" fixed width="95" v-if="false"> + <el-table-column + prop="id" + slot="" + label="涓婚敭" + align="center" + fixed + width="95" + v-if="false" + > <template slot-scope="scope"> <el-input v-model="scope.row.id" placeholder="id" /> </template> </el-table-column> - <el-table-column prop="rbid" slot="" label="澶栭敭" align="center" fixed width="95" v-if="false"> + <el-table-column + prop="rbid" + slot="" + label="澶栭敭" + align="center" + fixed + width="95" + v-if="false" + > <template slot-scope="scope"> <el-input v-model="scope.row.rbid" placeholder="rbid" /> </template> </el-table-column> - <el-table-column prop="persontype" slot="" label="浜哄憳绫诲埆" align="center" fixed width="130"> + <el-table-column + prop="persontype" + slot="" + label="浜哄憳绫诲埆" + align="center" + fixed + width="130" + > <template slot-scope="scope"> - <el-select v-model="scope.row.persontype" value-key="value" placeholder="浜哄憳绫诲埆" - @change="getPersons(scope.row)"> - <el-option v-for="dict in dict.type.sys_travelexpensebelong" :key="dict.value" :label="dict.label" - :value="dict.label"></el-option> + <el-select + v-model="scope.row.persontype" + value-key="value" + placeholder="浜哄憳绫诲埆" + @change="getPersons(scope.row)" + > + <el-option + v-for="dict in dict.type.sys_travelexpensebelong" + :key="dict.value" + :label="dict.label" + :value="dict.label" + ></el-option> </el-select> </template> </el-table-column> - <el-table-column prop="personname" slot="" label="鏀舵浜�" align="center" fixed width="110"> + <el-table-column + prop="personname" + slot="" + label="鏀舵浜�" + align="center" + fixed + width="110" + > <template slot-scope="scope"> - <el-select v-model="scope.row.personname" clearable filterable allow-create ref="getReportname" - default-first-option placeholder="璇烽�夋嫨" @change="getAccountinfo2(scope.row, scope.row.persontype)"> - <el-option v-for="item in personsSel" :key="item.reportNo" :label="item.reportName" - :value="item.reportName"> + <el-select + v-model="scope.row.personname" + clearable + filterable + allow-create + ref="getReportname" + default-first-option + placeholder="璇烽�夋嫨" + @change="getAccountinfo2(scope.row, scope.row.persontype)" + > + <el-option + v-for="item in personsSel" + :key="item.reportNo" + :label="item.reportName" + :value="item.reportName" + > </el-option> </el-select> </template> </el-table-column> - <el-table-column prop="bankname" slot="" label="閾惰鍚嶇О" align="center" fixed width="200"> + <el-table-column + prop="bankname" + slot="" + label="閾惰鍚嶇О" + align="center" + fixed + width="200" + > <template slot-scope="scope"> <el-input v-model="scope.row.bankname" placeholder="閾惰鍚嶇О" /> </template> </el-table-column> - <el-table-column prop="bankcardno" slot="" label="閾惰鍗″彿" align="center" fixed width="200"> + <el-table-column + prop="bankcardno" + slot="" + label="閾惰鍗″彿" + align="center" + fixed + width="200" + > <template slot-scope="scope"> - <el-input v-model="scope.row.bankcardno" placeholder="閾惰鍗″彿" /> + <el-input + v-model="scope.row.bankcardno" + placeholder="閾惰鍗″彿" + /> </template> </el-table-column> - <el-table-column prop="amount" slot="" label="鎵撴閲戦" align="center" fixed width="130"> + <el-table-column + prop="amount" + slot="" + label="鎵撴閲戦" + align="center" + fixed + width="130" + > <template slot-scope="scope"> <el-input v-model="scope.row.amount" placeholder="鎵撴閲戦" /> </template> </el-table-column> - <el-table-column prop="remark" slot="" label="璇锋璇存槑" align="center" fixed> + <el-table-column + prop="remark" + slot="" + label="璇锋璇存槑" + align="center" + fixed + > <template slot-scope="scope"> <el-input v-model="scope.row.remark" placeholder="璇存槑" /> </template> @@ -426,12 +806,26 @@ </el-date-picker> </template> </el-table-column>--> - <el-table-column label="鎿嶄綔" align="center" width="100" v-if="dialogType == 'edit'"> + <el-table-column + label="鎿嶄綔" + align="center" + width="100" + v-if="dialogType == 'edit'" + > <template slot-scope="scope"> - <el-button type="text" size="mini" @click="addPayeeRow(scope.$index)">鏂板</el-button> - <el-button @click.native.prevent=" - deletePayeeRow(scope.$index, rbPayees, scope.row) - " type="text" size="small"> + <el-button + type="text" + size="mini" + @click="addPayeeRow(scope.$index)" + >鏂板</el-button + > + <el-button + @click.native.prevent=" + deletePayeeRow(scope.$index, rbPayees, scope.row) + " + type="text" + size="small" + > 鍒犻櫎 </el-button> </template> @@ -441,16 +835,41 @@ <el-row v-if="dialogType == 'detail' || dialogType == 'check'"> <el-table :data="fundflowList" border> - <el-table-column label="瀹℃牳浜�" align="center" width="120" prop="checkusername" /> - <el-table-column label="瀹℃牳鏃ユ湡" align="center" width="160" prop="createTime" /> - <el-table-column label="瀹℃牳缁撴灉" align="center" width="200" prop="flowconclusion"><template - slot-scope="scope"><span v-if="scope.row.flowconclusion == 1">閫氳繃</span><span - v-if="scope.row.flowconclusion == 2">涓嶉�氳繃</span></template> + <el-table-column + label="瀹℃牳浜�" + align="center" + width="120" + prop="checkusername" + /> + <el-table-column + label="瀹℃牳鏃ユ湡" + align="center" + width="160" + prop="createTime" + /> + <el-table-column + label="瀹℃牳缁撴灉" + align="center" + width="200" + prop="flowconclusion" + ><template slot-scope="scope" + ><span v-if="scope.row.flowconclusion == 1">閫氳繃</span + ><span v-if="scope.row.flowconclusion == 2" + >涓嶉�氳繃</span + ></template + > </el-table-column> - <el-table-column label="瀹℃牳澶囨敞" align="center" prop="flowcontent" /> + <el-table-column + label="瀹℃牳澶囨敞" + align="center" + prop="flowcontent" + /> </el-table> </el-row> - <el-row style="margin-top: 25px; margin-bottom: 5px" v-if="dialogType == 'check'"> + <el-row + style="margin-top: 25px; margin-bottom: 5px" + v-if="dialogType == 'check'" + > <el-col :span="7"> <el-form-item label="瀹℃牳缁撴灉" align="left"> <el-radio-group v-model="checkObj.flowlevelone" align="left"> @@ -469,8 +888,18 @@ </el-row> </el-form> <div slot="footer" class="dialog-footer"> - <el-button type="primary" @click="submitForm" v-if="dialogType == 'edit'">淇� 瀛�</el-button> - <el-button type="primary" @click="checksubmit" v-if="dialogType == 'check'">鎻� 浜�</el-button> + <el-button + type="primary" + @click="submitForm" + v-if="dialogType == 'edit'" + >淇� 瀛�</el-button + > + <el-button + type="primary" + @click="checksubmit" + v-if="dialogType == 'check'" + >鎻� 浜�</el-button + > <!--<el-button @click="cancel">閫� 鍑�</el-button>--> </div> </div> @@ -479,12 +908,31 @@ <div class="pdfimg"> <div class="box-pdf"> <div> - <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileListto" multiple - :limit="20" :headers="headers" :on-success="(response, file, fileList) => - uploadSccess(response, file, fileList) - " :on-preview="downFile" :disabled="dialogType == 'detail'" :on-error="handleUploadError" - :on-exceed="handleExceed" :on-remove="remove" accept="image/*,.pdf"> - <el-button :disabled="dialogType == 'detail'" size="small" type="primary">涓婁紶</el-button> + <el-upload + size="mini" + class="upload-demo" + :action="uploadFileUrl" + :file-list="fileListto" + multiple + :limit="20" + :headers="headers" + :on-success=" + (response, file, fileList) => + uploadSccess(response, file, fileList) + " + :on-preview="downFile" + :disabled="dialogType == 'detail'" + :on-error="handleUploadError" + :on-exceed="handleExceed" + :on-remove="remove" + accept="image/*,.pdf" + > + <el-button + :disabled="dialogType == 'detail'" + size="small" + type="primary" + >涓婁紶</el-button + > </el-upload> </div> <!-- <div @@ -686,12 +1134,11 @@ checkObj: { flowlevelone: null, flowconclusion: null, - fundid: null, + fundid: null }, //淇濆瓨鎸夐挳鎺у埗 - idisabled: false, - + idisabled: false }; }, @@ -707,7 +1154,6 @@ this.defaultperson = response.data; this.standardlevel = response.data.standardlevel; console.log("this.defaultperson", this.defaultperson); - }); //鑾峰彇鎹愮尞鑰呭鍚� @@ -729,7 +1175,6 @@ //鑾峰彇閮ㄩ棬淇℃伅 //this.getTreeselect(); - }, mounted() { @@ -741,17 +1186,15 @@ this.handleAdd(ids); } else if (pos == 2) { this.handleUpdate(ids); - } - else if (pos == 3) { + } else if (pos == 3) { this.handleDetail(ids); - } - else if (pos == 4) { + } else if (pos == 4) { this.handleCheck(ids); } }, methods: { - handleUploadError() { }, + handleUploadError() {}, remove(file, fileList) { const rbDetails = [...this.rbDetails]; @@ -911,7 +1354,7 @@ row.days = ( Math.floor( Math.abs(Date.parse(row.starttime) - Date.parse(row.endtime)) / - (1000 * 3600 * 24) + (1000 * 3600 * 24) ) + 1 ).toString(); } else { @@ -920,12 +1363,15 @@ //璁$畻琛ュ姪 this.getallowance(row); - }, //璁$畻琛ュ姪 getallowance(row) { - if (row.persontype == "涓撹亴浜哄憳" || row.persontype == "鍗忚皟鍛�" || row.persontype == "绠$悊浜哄憳") { + if ( + row.persontype == "涓撹亴浜哄憳" || + row.persontype == "鍗忚皟鍛�" || + row.persontype == "绠$悊浜哄憳" + ) { //鍏潅璐硅ˉ鍔╋細鏉窞妗愬簮锛屽缓寰凤紝娣冲畨60锛屾澀宸炲叾浠栧湴鍖�0锛岄潪鏉窞鍦板尯80 if (row.destination != "") { var tempStr = row.destination; @@ -1222,8 +1668,8 @@ this.form = response.data; this.fileListto = this.form.annexfiles ? this.form.annexfiles - .split(",") - .map(item => ({ url: item, name: item })) + .split(",") + .map(item => ({ url: item, name: item })) : []; this.form.recordstatus = response.data.recordstatus + ""; @@ -1231,6 +1677,7 @@ //鑾峰彇鎶ラ攢鏄庣粏淇℃伅 getReimbursementdetaillist(ids).then(res => { this.rbDetails = res.data; + console.log(this.rbDetails); if (this.rbDetails.length == 0) { this.addDetailRow(0); } @@ -1275,8 +1722,8 @@ //绁ㄦ嵁 this.fileListto = this.form.annexfiles ? this.form.annexfiles - .split(",") - .map(item => ({ url: item, name: item })) + .split(",") + .map(item => ({ url: item, name: item })) : []; //瀹℃牳鐘舵�� @@ -1336,8 +1783,8 @@ //绁ㄦ嵁 this.fileListto = this.form.annexfiles ? this.form.annexfiles - .split(",") - .map(item => ({ url: item, name: item })) + .split(",") + .map(item => ({ url: item, name: item })) : []; //瀹℃牳鐘舵�� @@ -1355,6 +1802,7 @@ //鎶ラ攢鏄庣粏 getReimbursementdetaillist(ids).then(res => { this.rbDetails = res.data; + console.log(this.rbDetails); /* for (let i = 0; i < this.rbDetails.length; i++) { this.rbDetails[i].index = i; @@ -1389,7 +1837,7 @@ let checkfundobj = { flowconclusion: this.checkObj.flowlevelone, flowcontent: this.checkObj.flowconclusion, - fundid: this.checkObj.fundid, + fundid: this.checkObj.fundid }; if ( @@ -1401,7 +1849,7 @@ return; } - checkfund(checkfundobj).then((res) => { + checkfund(checkfundobj).then(res => { this.reset(); this.open = false; this.getList(); @@ -1520,9 +1968,9 @@ this.$modal.msgSuccess("淇敼鎶ラ攢鍗曚繚瀛樻垚鍔�!"); this.open = false; - - // 鍏抽棴绐楀彛 - this.$router.go(-1); + + // 鍏抽棴绐楀彛 + this.$router.go(-1); // this.getList(); // }) // .catch(err => { @@ -1548,17 +1996,14 @@ this.$modal.msgSuccess("鏂板鎶ラ攢鍗曚繚瀛樻垚鍔�!"); this.open = false; - - // 鍏抽棴绐楀彛 - this.$router.go(-1); + // 鍏抽棴绐楀彛 + this.$router.go(-1); }) .catch(err => { this.$modal.msgError("鏂板鎶ラ攢鍗曚繚瀛樺け璐ワ紒"); }); } - - } }); }, @@ -1568,7 +2013,7 @@ const ids = row.id || this.ids; this.$modal .confirm("鏄惁纭鍒犻櫎璇ユ潯璁板綍锛�") - .then(function () { + .then(function() { // 鍒犻櫎details鍐呯殑鏁版嵁 return delReimbursement(ids); }) @@ -1577,7 +2022,7 @@ this.getList(); this.$modal.msgSuccess("鍒犻櫎鎴愬姛"); }) - .catch(() => { }); + .catch(() => {}); }, /** 瀵煎嚭鎸夐挳鎿嶄綔 */ @@ -1593,7 +2038,7 @@ this.$download.name(response.msg); this.exportLoading = false; }) - .catch(() => { }); + .catch(() => {}); }, //鏂板涓�琛� @@ -1876,7 +2321,7 @@ this.form.amountrequested = allSum.toFixed(2); this.form.bigstrmoney = this.convertCurrency(this.form.amountrequested); - } catch { } + } catch {} }, //閲戦鏁板瓧杞崲鎴愬ぇ鍐� @@ -1983,14 +2428,28 @@ getSummaries(param) { const { columns, data } = param; const sums = []; - var columnnames = ["bankname", "bankcardno", "remark", "personname", "starttime", "endtime", "departure", "destination", "traffictype", "traffictype2", "departure"]; + var columnnames = [ + "bankname", + "bankcardno", + "remark", + "personname", + "starttime", + "endtime", + "departure", + "destination", + "traffictype", + "traffictype2", + "departure" + ]; columns.forEach((column, index) => { if (index === 0) { - sums[index] = '鍚堣'; + sums[index] = "鍚堣"; return; } //鍘婚櫎閮ㄥ垎瀛楁璁$畻 - if (columnnames.indexOf(column.property) > -1) { return; } + if (columnnames.indexOf(column.property) > -1) { + return; + } const values = data.map(item => Number(item[column.property])); if (!values.every(value => isNaN(value))) { @@ -2002,17 +2461,15 @@ return prev; } }, 0); - sums[index] += ''; + sums[index] += ""; } else { - sums[index] = ''; + sums[index] = ""; } }); return sums; - }, - + } } }; - </script> <style lang="scss" scoped> @@ -2056,7 +2513,7 @@ border: 1px solid #dcdfe6; -webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.12), 0 0 6px 0 rgba(0, 0, 0, 0.04); - box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.1); // <- Add this to fix. + box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.1); // <- Add this to fix. } .pdftit { @@ -2082,8 +2539,6 @@ width: 60%; text-align: center; } - - } ::v-deep .el-input--medium .el-input__inner { diff --git a/vue.config.js b/vue.config.js index eab82c3..415fed3 100644 --- a/vue.config.js +++ b/vue.config.js @@ -33,9 +33,9 @@ proxy: { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { - target:`http://localhost:8080`, + // target:`http://localhost:8080`, // target:`http://116.62.18.175:8080`, - // target:`http://192.168.1.4:8086`, + target:`http://192.168.1.4:8086`, // target: `https://slb.hospitalstar.com:9093`, changeOrigin: true, pathRewrite: { -- Gitblit v1.9.3