From 8022f7036945b75f82f2dfc43055623f81ed98f6 Mon Sep 17 00:00:00 2001 From: yxh <172933527@qq.com> Date: 星期五, 23 五月 2025 22:42:56 +0800 Subject: [PATCH] yxh --- src/views/project/travelexpensecheck/index.vue | 44 + /dev/null | 0 src/views/project/donationdetails/index.vue | 12 vue.config.js | 4 src/views/project/fundcheck/medicalCostCheck/index.vue | 723 ++++++----------------------- src/views/project/fundcheck/expertFeeCheck/index.vue | 624 +++++-------------------- src/views/project/fundcheck/officeExpenseCheck/index.vue | 31 + 7 files changed, 367 insertions(+), 1,071 deletions(-) diff --git "a/dist \0502\051.zip" "b/dist \0502\051.zip" deleted file mode 100644 index 1a618c5..0000000 --- "a/dist \0502\051.zip" +++ /dev/null Binary files differ diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue index 97b9aff..6d1dd35 100644 --- a/src/views/project/donationdetails/index.vue +++ b/src/views/project/donationdetails/index.vue @@ -2967,10 +2967,12 @@ if (this.transplantdata[0] && !this.istb) { return; } - console.log("瀹屾垚鐧昏"); + console.log("瀹屾垚鐧昏鍔犺浇鏁版嵁..."); listDonatecomporgan(searchParam).then(res => { - if (res.code == 200) { + if (res.code == 200) { + console.log("listDonatecomporgan 鏁版嵁锛�", res.rows); + if (res.rows[0]) { this.transplantdata = res.rows; // this.transplantdata.infoid = this.infoid; @@ -3003,7 +3005,9 @@ // 鑾峰彇瀹屾垚鐧昏淇℃伅 listDonatecompletioninfo(searchParam).then(response => { - if (response.code == 200 && response.rows.length) { + if (response.code == 200 && response.rows.length) { + console.log("listDonatecompletioninfo 鏁版嵁锛�", response.rows[0]); + this.accomplishform = response.rows[0]; this.accomplishform.infoid = this.infoid; } else { @@ -3016,9 +3020,9 @@ if (!this.allocateddata[0]) { listDonateorgan(searchParam).then(res => { if (res.code == 200) { + console.log("listDonateorgan 鏁版嵁锛�", res.rows); if (res.rows[0]) { this.allocateddata = res.rows; - console.log("this.allocateddata", this.allocateddata); this.allocateddataform.allocateddata = this.allocateddata; } this.organList.organallocated = []; diff --git a/src/views/project/fundcheck/expertFeeCheck/index.vue b/src/views/project/fundcheck/expertFeeCheck/index.vue index ab5dac4..43f9bce 100644 --- a/src/views/project/fundcheck/expertFeeCheck/index.vue +++ b/src/views/project/fundcheck/expertFeeCheck/index.vue @@ -1,109 +1,70 @@ <template> <div class="app-container"> - <el-form - :model="queryParams" - ref="queryForm" - :inline="true" - v-show="showSearch" - label-width="80px" - > + <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="80px"> <el-row> <el-col :span="5"> <el-form-item label="鎹愮尞妗堜緥" prop="donorname" style="float: left"> - <el-input - v-model="queryParams.donorname" - placeholder="璇疯緭鍏ョ敵璇蜂汉鎹愮尞鑰�" - clearable - size="small" - @keyup.enter.native="flowconclusion" - /> + <el-input v-model="queryParams.donorname" placeholder="璇疯緭鍏ョ敵璇蜂汉鎹愮尞鑰�" clearable size="small" + @keyup.enter.native="flowconclusion" /> </el-form-item> </el-col> <el-col :span="5"> <el-form-item label="棰勫鐘舵��" prop="checkstatus" style="float: left"> - <el-select - v-model="queryParams.checkstatus" - placeholder="璇烽�夋嫨" - style="width: 100%" - > - <el-option - v-for="item in checkmaterials" - :key="item.value" - :label="item.label" - :value="item.value" - > + <el-select v-model="queryParams.checkstatus" placeholder="璇烽�夋嫨" style="width: 100%"> + <el-option v-for="item in checkmaterials" :key="item.value" :label="item.label" :value="item.value"> </el-option> </el-select> </el-form-item> </el-col> <el-col :span="5"> <el-form-item label="瀹℃壒鐘舵��" prop="CHECKFLAG" style="float: left"> + <el-select v-model="queryParams.CHECKFLAG" placeholder="璇烽�夋嫨" style="width: 100%"> + <el-option v-for="item in checkFlagOptions" :key="item.value" :label="item.label" :value="item.value"> + </el-option> + </el-select> + </el-form-item> + </el-col> + <el-col :span="5"> + <el-form-item align="left" label="涓氬姟缁�" prop="deptnos"> <el-select - v-model="queryParams.CHECKFLAG" - placeholder="璇烽�夋嫨" - style="width: 100%" + v-model="queryParams.deptnos" + placeholder="璇烽�夋嫨妗堜緥鐘舵��" > <el-option - v-for="item in checkFlagOptions" - :key="item.value" - :label="item.label" - :value="item.value" + v-for="item in deptList" + :label="item.deptName" + :value="item.deptId" > </el-option> </el-select> - </el-form-item> </el-col - ><el-col :span="5"> - <el-form-item label="缁忓姙浜�" prop="APPLICANT" style="float: left"> - <el-input - v-model="queryParams.APPLICANT" - placeholder="璇疯緭鍏ョ敵璇蜂汉濮撳悕" - clearable - size="small" - @keyup.enter.native="flowconclusion" - /> </el-form-item> </el-col> </el-row> <el-row> <el-col :span="5"> + <el-form-item label="缁忓姙浜�" prop="APPLICANT" style="float: left"> + <el-input v-model="queryParams.APPLICANT" placeholder="璇疯緭鍏ョ敵璇蜂汉濮撳悕" clearable size="small" + @keyup.enter.native="flowconclusion" /> + </el-form-item> + </el-col> + <el-col :span="5"> <el-form-item label="鎶ラ攢閲戦" prop="money" style="float: left"> - <el-input - v-model="queryParams.money" - placeholder="璇疯緭鍏ョ敵璇蜂汉閲戦" - clearable - size="small" - @keyup.enter.native="flowconclusion" - /> + <el-input v-model="queryParams.money" placeholder="璇疯緭鍏ョ敵璇蜂汉閲戦" clearable size="small" + @keyup.enter.native="flowconclusion" /> </el-form-item> </el-col> <el-col :span="8"> <el-form-item label="鐢宠鏃ユ湡" prop="createTime"> - <el-date-picker - format="yyyy-MM-dd" - @change="selectapplication" - value-format="yyyy-MM-dd" - v-model="createTime" - type="daterange" - range-separator="鑷�" - start-placeholder="鐢宠寮�濮嬫棩鏈�" - end-placeholder="鐢宠缁撴潫鏃ユ湡" - @keyup.enter.native="flowconclusion" - > + <el-date-picker format="yyyy-MM-dd" @change="selectapplication" value-format="yyyy-MM-dd" + v-model="createTime" type="daterange" range-separator="鑷�" start-placeholder="鐢宠寮�濮嬫棩鏈�" + end-placeholder="鐢宠缁撴潫鏃ユ湡" @keyup.enter.native="flowconclusion"> </el-date-picker> </el-form-item> </el-col> <el-col :span="6"> <div style="margin-bottom: 15px;"> - <el-button - type="primary" - icon="el-icon-search" - size="mini" - @click="flowconclusion" - >鎼滅储</el-button - > - <el-button icon="el-icon-refresh" size="mini" @click="resetQuery" - >閲嶇疆</el-button - > + <el-button type="primary" icon="el-icon-search" size="mini" @click="flowconclusion">鎼滅储</el-button> + <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button> </div> </el-col> </el-row> @@ -111,35 +72,17 @@ <el-row> <el-col :span="8"> <div style="margin-bottom: 15px;"> - <el-button - icon="el-icon-remove-outline" - type="success" - plain - size="mini" - :disabled="true" - @click="Totalcalculation(0)" - >涓◣鍓嶆眹鎬�</el-button - > - <el-button - type="primary" - plain - icon="el-icon-circle-check" - size="mini" - @click="Totalcalculation(1)" - >涓◣鍚庢眹鎬�</el-button - > + <el-button icon="el-icon-remove-outline" type="success" plain size="mini" :disabled="true" + @click="Totalcalculation(0)">涓◣鍓嶆眹鎬�</el-button> + <el-button type="primary" plain icon="el-icon-circle-check" size="mini" + @click="Totalcalculation(1)">涓◣鍚庢眹鎬�</el-button> </div> </el-col> </el-row> <el-form ref="infoform" label-width="100px"> <el-row> - <el-table - ref="multipleTable" - tooltip-effect="dark" - border - :data="donateconsolationfundList" - @selection-change="handleSelectionChange" - > + <el-table ref="multipleTable" tooltip-effect="dark" border :data="donateconsolationfundList" + @selection-change="handleSelectionChange"> <!-- <el-table-column label="瀹℃壒鐘舵��" width="120" align="center" prop="checkFlag"> <template slot-scope="scope"> @@ -147,8 +90,8 @@ style="color: #5fb878; font-weight: bold"></i></span> <span v-else>寰呭鏍�</span> </template> - </el-table-column> - --> +</el-table-column> +--> <el-table-column type="selection" width="45"> </el-table-column> <!-- <el-table-column label="涓◣璁$畻" @@ -160,241 +103,110 @@ <dict-tag :options="dict.type.sys_tax" :value="scope.row.istax" /> </template> </el-table-column> --> - <el-table-column - label="鎶ラ攢鍗曞彿" - align="center" - prop="bh" - width="150px" - /> - <el-table-column - label="鐢宠鏃ユ湡" - width="120" - align="center" - prop="applyTime" - > + <el-table-column label="鎶ラ攢鍗曞彿" align="center" prop="bh" width="150px" /> + <el-table-column label="鐢宠鏃ユ湡" width="120" align="center" prop="applyTime"> <template slot-scope="scope"> <span>{{ parseTime(scope.row.applyTime, "{y}-{m}-{d}") }}</span> </template> </el-table-column> - <el-table-column - label="鐢宠閲戦" - align="center" - prop="pretaxcost" - width="200px" - /> - <el-table-column - label="缁忓姙浜�" - align="center" - prop="username" - width="150px" - /> + <el-table-column label="鐢宠閲戦" align="center" prop="pretaxcost" width="200px" /> + <el-table-column label="缁忓姙浜�" align="center" prop="username" width="150px" /> <!-- <el-table-column label="宸ヤ綔鍗曚綅" align="center" prop="unitname" width="230px" /> --> <!-- <el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="phone" width="160" /> --> <!-- <el-table-column label="绋庡悗閲戦" align="center" prop="taxedcost" width="120px" /> <el-table-column label="鐢宠閲戦" align="center" prop="amountrequested" width="120px" /> <el-table-column label="棰勬敮璐圭敤" align="center" prop="prepaidamount" width="120px" /> --> - <el-table-column - label="鐢宠鏉愭枡鐘舵��" - width="140" - align="center" - prop="checkstatus" - > + <el-table-column label="鐢宠鏉愭枡鐘舵��" width="140" align="center" prop="checkstatus"> <template slot-scope="scope"> - <dict-tag - :options="dict.type.sys_stage_type" - :value="scope.row.checkstatus" - /> + <dict-tag :options="dict.type.sys_stage_type" :value="scope.row.checkstatus" /> </template> </el-table-column> - <el-table-column - label="瀹℃牳鐘舵��" - align="center" - prop="recordstatus" - width="200" - > + <el-table-column label="瀹℃牳鐘舵��" align="center" prop="recordstatus" width="200"> <template slot-scope="scope"> - <dict-tag - :options="dict.type.sys_recordstatus" - :value="scope.row.recordstatus" - /> + <dict-tag :options="dict.type.sys_recordstatus" :value="scope.row.recordstatus" /> </template> </el-table-column> - <el-table-column - label="涓◣璁$畻鏃ユ湡" - width="120" - align="center" - prop="fundtaxtime" - > + <el-table-column label="涓◣璁$畻鏃ユ湡" width="120" align="center" prop="fundtaxtime"> <template slot-scope="scope"> <span>{{ parseTime(scope.row.fundtaxtime, "{y}-{m}-{d}") }}</span> </template> </el-table-column> - <el-table-column - label="鎵�灞炵粍鍒�" - align="center" - prop="deptmentname" - width="200px" - /> - <el-table-column - label="缁勯暱" - align="center" - prop="managername" - width="150px" - /> - <el-table-column - label="鎹愮尞鑰�" - align="center" - prop="donorname" - width="120px" - /> + <el-table-column label="鎵�灞炵粍鍒�" align="center" prop="deptmentname" width="200px" /> + <el-table-column label="缁勯暱" align="center" prop="managername" width="150px" /> + <el-table-column label="鎹愮尞鑰�" align="center" prop="donorname" width="120px" /> <el-table-column label="澶囨敞" align="center" prop="remark" /> <!--<el-table-column label="鎹愮尞缂栧彿" align="center" prop="donorno" /> <el-table-column label="璐㈠姟瀹℃牳" align="center" prop="financechecher" width="140" />--> - <el-table-column - label="鎿嶄綔" - fixed="right" - align="center" - class-name="small-padding fixed-width" - width="260px" - > + <el-table-column label="鎿嶄綔" fixed="right" align="center" class-name="small-padding fixed-width" width="260px"> <template slot-scope="scope"> - <el-button - size="mini" - type="text" - icon="el-icon-edit" - v-if="scope.row.checkFlag == 0" - @click="handleDetail(scope.row)" - >璇︽儏</el-button - > + <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.checkFlag == 0" + @click="handleDetail(scope.row)">璇︽儏</el-button> - <el-button - v-if="scope.row.checkFlag == 1" - size="mini" - type="text" - icon="el-icon-edit" - @click="handleCheck(scope.row)" - >瀹℃牳</el-button - > + <el-button v-if="scope.row.checkFlag == 1" size="mini" type="text" icon="el-icon-edit" + @click="handleCheck(scope.row)">瀹℃牳</el-button> <!-- v-hasPermi="['project:donateconsolationfund:edit']" --> - <el-button - size="mini" - type="text" - icon="el-icon-download" - @click="totaldayin(scope.row.id)" - >涓嬭浇</el-button - > + <el-button size="mini" type="text" icon="el-icon-download" + @click="totaldayin(scope.row.id)">涓嬭浇</el-button> </template> </el-table-column> </el-table> - <pagination - v-show="total > 0" - :total="total" - :page.sync="queryParams.pageNum" - :limit.sync="queryParams.pageSize" - @pagination="getlistbypower" - /> + <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" + :limit.sync="queryParams.pageSize" @pagination="getlistbypower" /> </el-row> </el-form> <!-- 娣诲姞鎴栦慨鏀硅垂鐢ㄧ敵璇峰崟 --> - <el-dialog - :visible.sync="dialogOpen" - width="1400px" - :title="title" - style="text-align: center" - > + <el-dialog :visible.sync="dialogOpen" width="1400px" :title="title" style="text-align: center"> <el-form ref="form" :model="form" label-width="120px" :rules="rules"> <!-- <el-form ref="applyForm" :model="applicationForm" label-width="120px"> --> <el-row> <el-col :span="5"> <el-form-item label="鐢宠鏃ユ湡" prop="createTime"> <!-- <el-input v-model="form.donorno" placeholder="璇疯緭鍏ョ敵璇锋棩鏈�" /> --> - <el-date-picker - clearable - style="width: 100%" - v-model="form.createTime" - type="date" - value-format="yyyy-MM-dd HH:mm:ss" - placeholder="鐢宠鏃ユ湡" - > + <el-date-picker clearable style="width: 100%" v-model="form.createTime" type="date" + value-format="yyyy-MM-dd HH:mm:ss" placeholder="鐢宠鏃ユ湡"> </el-date-picker> </el-form-item> </el-col> <el-col :span="5"> <el-form-item label="缁忓姙浜�" prop="username"> <!-- <el-input v-model="form.username" placeholder="璇疯緭鍏ョ敵璇蜂汉濮撳悕" clearable /> --> - <el-select - v-model="form.username" - placeholder="鐢宠浜哄鍚�" - clearable - filterable - allow-create - style="width: 100%" - > - <el-option - v-for="dict in userlist" - :key="dict.index" - :label="dict.nickname" - :value="dict.nickname" - ></el-option> + <el-select v-model="form.username" placeholder="鐢宠浜哄鍚�" clearable filterable allow-create + style="width: 100%"> + <el-option v-for="dict in userlist" :key="dict.index" :label="dict.nickname" + :value="dict.nickname"></el-option> </el-select> </el-form-item> </el-col> <el-col :span="5"> <el-form-item label="鎵�灞炵粍鍒�" prop="deptmentname"> - <el-input - disabled - v-model="form.deptmentname" - placeholder="璇疯緭鍏ユ墍灞炵粍鍒�" - clearable - /> + <el-input disabled v-model="form.deptmentname" placeholder="璇疯緭鍏ユ墍灞炵粍鍒�" clearable /> </el-form-item> </el-col> <el-col :span="5"> <el-form-item label="缁勯暱" prop="managername"> - <el-input - disabled - v-model="form.managername" - placeholder="璇疯緭鍏ョ粍闀�" - clearable - /> + <el-input disabled v-model="form.managername" placeholder="璇疯緭鍏ョ粍闀�" clearable /> </el-form-item> </el-col> </el-row> <el-row> <el-col :span="5"> <el-form-item label="鐢宠绫诲瀷"> - <el-radio-group - v-model="form.applytype" - @change="LoadItemTypeArr" - > + <el-radio-group v-model="form.applytype" @change="LoadItemTypeArr"> <!--<el-radio v-for="dict in dict.type.sys_financeitemtype" :key="dict.value" :label="dict.value" :disabled="form.id != null">{{ dict.label }}</el-radio>--> - <el-radio v-model="form.applytype" label="1" - >涓撳璐圭敤鐢宠</el-radio - > + <el-radio v-model="form.applytype" label="1">涓撳璐圭敤鐢宠</el-radio> </el-radio-group> - </el-form-item></el-col - > + </el-form-item></el-col> <el-col :span="10"> <el-form-item label="鐢宠璇存槑" prop="remark"> - <el-input - disabled - v-model="form.remark" - placeholder="璇疯緭鍏ョ敵璇疯鏄�" - clearable - /> + <el-input disabled v-model="form.remark" placeholder="璇疯緭鍏ョ敵璇疯鏄�" clearable /> </el-form-item> </el-col> <el-col :span="5"> <el-form-item label="鎹愮尞鑰�" prop="donorname"> - <el-input - disabled - v-model="form.donorname" - placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" - clearable - /> + <el-input disabled v-model="form.donorname" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" clearable /> </el-form-item> </el-col> <!-- @@ -429,8 +241,7 @@ <el-col :span="5"> <el-form-item label="绋庡悗鍚堣" prop="taxedcost"> <el-input v-model="form.taxedcost" placeholder="绋庡悗閲戦鍚堣" /> - </el-form-item> </el-col - ><!-- + </el-form-item> </el-col><!-- <el-col :span="5"> <el-form-item label="鐢宠鐘舵��" prop="recordstatus"> <el-select v-model="form.recordstatus" placeholder="璇烽�夋嫨瀹℃牳鐘舵��" clearable size="small" :disabled="true"> @@ -442,77 +253,32 @@ </el-row> <el-row> <el-col :span="4"> - <el-button - type="primary" - plain - icon="el-icon-plus" - size="mini" - @click="addRow" - v-if="show === 1" - >鏂板涓撳璐�</el-button - > + <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="addRow" + v-if="show === 1">鏂板涓撳璐�</el-button> </el-col> </el-row> <el-row style="margin-top: 5px; margin-bottom: 5px"> - <el-table - :data="fundDetailArr" - :summary-method="getSummaries" - border - highlight-current-row - v-loading="loading" - > - <el-table-column - prop="orderno" - align="center" - label="搴忓彿" - width="80" - > + <el-table :data="fundDetailArr" :summary-method="getSummaries" border highlight-current-row + v-loading="loading"> + <el-table-column prop="orderno" align="center" label="搴忓彿" width="80"> <template slot-scope="scope"> <el-input v-model="scope.row.orderno" placeholder="搴忓彿" /> </template> </el-table-column> - <el-table-column - prop="applytype" - align="center" - label="璐圭敤绫诲瀷" - width="220" - > + <el-table-column prop="applytype" align="center" label="璐圭敤绫诲瀷" width="220"> <template slot-scope="scope"> - <el-select - v-model="scope.row.applytype" - placeholder="璐圭敤绫诲瀷" - @change="LoadItemTypeArr(scope.row)" - > - <el-option - v-for="dict in fundtypeArr" - :key="dict.index" - :label="dict.label" - :value="dict.value" - ></el-option> + <el-select v-model="scope.row.applytype" placeholder="璐圭敤绫诲瀷" @change="LoadItemTypeArr(scope.row)"> + <el-option v-for="dict in fundtypeArr" :key="dict.index" :label="dict.label" + :value="dict.value"></el-option> </el-select> </template> </el-table-column> - <el-table-column - prop="itemtype" - align="center" - label="鏈嶅姟椤圭洰" - width="200" - > + <el-table-column prop="itemtype" align="center" label="鏈嶅姟椤圭洰" width="200"> <template slot-scope="scope"> - <el-select - v-model="scope.row.itemid" - placeholder="鏈嶅姟椤圭洰" - clearable - filterable - allow-create - > - <el-option - v-for="dict in scope.row.itemArr" - :key="dict.index" - :label="dict.itemName" - :value="dict.id" - ></el-option> + <el-select v-model="scope.row.itemid" placeholder="鏈嶅姟椤圭洰" clearable filterable allow-create> + <el-option v-for="dict in scope.row.itemArr" :key="dict.index" :label="dict.itemName" + :value="dict.id"></el-option> <!-- <el-option v-for="dict in itemArr" :key="dict.index" @@ -522,86 +288,36 @@ </el-select> </template> </el-table-column> - <el-table-column - v-if="show === 1" - prop="servicesscopename" - align="center" - label="璐圭敤璇存槑" - width="150" - > + <el-table-column v-if="show === 1" prop="servicesscopename" align="center" label="璐圭敤璇存槑" width="150"> <template slot-scope="scope"> - <el-input - v-model="scope.row.servicesscopename" - placeholder="璐圭敤璇存槑" - /> + <el-input v-model="scope.row.servicesscopename" placeholder="璐圭敤璇存槑" /> </template> </el-table-column> - <el-table-column - prop="beneficiaryno" - align="center" - label="濮撳悕" - width="120" - > + <el-table-column prop="beneficiaryno" align="center" label="濮撳悕" width="120"> <template slot-scope="scope"> - <el-select - filterable - allow-create - ref="getReportname" - default-first-option - @change="selectpersonmsg(scope.row)" - v-model="scope.row.beneficiaryname" - placeholder="璇烽�夋嫨" - > - <el-option - v-for="item in arrr3" - :key="item.reportNo" - :label="item.reportName" - :value="item.reportName" - > + <el-select filterable allow-create ref="getReportname" default-first-option + @change="selectpersonmsg(scope.row)" v-model="scope.row.beneficiaryname" placeholder="璇烽�夋嫨"> + <el-option v-for="item in arrr3" :key="item.reportNo" :label="item.reportName" + :value="item.reportName"> </el-option> </el-select> - </template> </el-table-column - ><el-table-column - prop="title" - align="center" - label="鑱岀О" - width="150" - > + </template> </el-table-column><el-table-column prop="title" align="center" label="鑱岀О" width="150"> <template slot-scope="scope"> <el-input v-model="scope.row.title" placeholder="鑱岀О" /> </template> </el-table-column> - <el-table-column - v-if="show === 1" - prop="amount" - align="center" - label="绋庡墠閲戦" - width="100" - > + <el-table-column v-if="show === 1" prop="amount" align="center" label="绋庡墠閲戦" width="100"> <template slot-scope="scope"> - <el-input - v-model="scope.row.amount" - v-on:input=" - val => { - change(scope.row); - } - " - placeholder="绋庡墠閲戦" - /> + <el-input v-model="scope.row.amount" v-on:input=" + val => { + change(scope.row); + } + " placeholder="绋庡墠閲戦" /> </template> </el-table-column> - <el-table-column - v-if="show === 1" - prop="taxedamount" - align="center" - label="绋庡悗閲戦" - width="100" - > + <el-table-column v-if="show === 1" prop="taxedamount" align="center" label="绋庡悗閲戦" width="100"> <template slot-scope="scope"> - <el-input - v-model="scope.row.taxedamount" - placeholder="绋庡悗閲戦" - /> + <el-input v-model="scope.row.taxedamount" placeholder="绋庡悗閲戦" /> </template> </el-table-column> <!-- @@ -611,76 +327,35 @@ </template> </el-table-column> --> - <el-table-column - prop="unitname" - align="center" - label="宸ヤ綔鍗曚綅" - width="180" - > + <el-table-column prop="unitname" align="center" label="宸ヤ綔鍗曚綅" width="180"> <template slot-scope="scope"> <el-input v-model="scope.row.unitname" placeholder="宸ヤ綔鍗曚綅" /> </template> </el-table-column> - <el-table-column - prop="idcardno" - align="center" - label="韬唤璇佸彿" - width="200" - > + <el-table-column prop="idcardno" align="center" label="韬唤璇佸彿" width="200"> <template slot-scope="scope"> <el-input v-model="scope.row.idcardno" placeholder="韬唤璇佸彿" /> </template> </el-table-column> - <el-table-column - prop="depositbank" - align="center" - label="寮�鎴烽摱琛�" - width="240" - > + <el-table-column prop="depositbank" align="center" label="寮�鎴烽摱琛�" width="240"> <template slot-scope="scope"> - <el-input - v-model="scope.row.depositbank" - placeholder="寮�鎴烽摱琛�" - /> + <el-input v-model="scope.row.depositbank" placeholder="寮�鎴烽摱琛�" /> </template> </el-table-column> - <el-table-column - prop="bankcardno" - align="center" - label="閾惰鍗″彿" - width="220" - > + <el-table-column prop="bankcardno" align="center" label="閾惰鍗″彿" width="220"> <template slot-scope="scope"> - <el-input - v-model="scope.row.bankcardno" - placeholder="閾惰鍗″彿" - /> + <el-input v-model="scope.row.bankcardno" placeholder="閾惰鍗″彿" /> </template> </el-table-column> - <el-table-column - fixed="right" - align="center" - label="鎿嶄綔" - width="200" - > + <el-table-column fixed="right" align="center" label="鎿嶄綔" width="200"> <template slot-scope="scope"> - <el-button - @click="saveRows(scope.row, scope.$index)" - type="text" - size="small" - v-if="show === 1" - > + <el-button @click="saveRows(scope.row, scope.$index)" type="text" size="small" v-if="show === 1"> 淇濆瓨 </el-button> - <el-button - @click.native.prevent=" - deleteRows(scope.row, scope.$index, fundDetailArr) - " - type="text" - size="small" - v-hasPermi="['project:expertFeeCheck:delete']" - > + <el-button @click.native.prevent=" + deleteRows(scope.row, scope.$index, fundDetailArr) + " type="text" size="small" v-hasPermi="['project:expertFeeCheck:delete']"> 鍒犻櫎 </el-button> </template> @@ -702,39 +377,17 @@ </el-row> <el-row style="margin-top: 5px; margin-bottom: 5px"> <el-table :data="fundflowList" border> - <el-table-column - label="瀹℃牳浜�" - align="center" - prop="checkusername" - /> - <el-table-column - label="瀹℃牳鏃ユ湡" - align="center" - prop="createTime" - /> - <el-table-column - label="瀹℃牳缁撴灉" - align="center" - prop="flowconclusion" - ><template slot-scope="scope" - ><span v-if="scope.row.flowconclusion == 1">閫氳繃</span - ><span v-if="scope.row.flowconclusion == 2" - >涓嶉�氳繃</span - ></template - > + <el-table-column label="瀹℃牳浜�" align="center" prop="checkusername" /> + <el-table-column label="瀹℃牳鏃ユ湡" align="center" prop="createTime" /> + <el-table-column label="瀹℃牳缁撴灉" align="center" prop="flowconclusion"><template slot-scope="scope"><span + v-if="scope.row.flowconclusion == 1">閫氳繃</span><span + v-if="scope.row.flowconclusion == 2">涓嶉�氳繃</span></template> </el-table-column> - <el-table-column - label="瀹℃牳澶囨敞" - align="center" - prop="flowcontent" - /> + <el-table-column label="瀹℃牳澶囨敞" align="center" prop="flowcontent" /> </el-table> </el-row> - <el-row - style="margin-top: 25px; margin-bottom: 5px" - v-if="dialogType == 'edit'" - > + <el-row style="margin-top: 25px; margin-bottom: 5px" v-if="dialogType == 'edit'"> <el-col :span="7"> <el-form-item label="瀹℃牳" align="left"> <el-radio-group v-model="newobj.flowlevelone" align="left"> @@ -745,18 +398,13 @@ </el-col> <el-col :span="12"> <el-form-item label="瀹℃牳澶囨敞"> - <el-input - v-model="newobj.flowconclusion" - placeholder="鐢虫姤璐圭敤" - /> + <el-input v-model="newobj.flowconclusion" placeholder="鐢虫姤璐圭敤" /> </el-form-item> </el-col> </el-row> </el-form> <div slot="footer" class="dialog-footer"> - <el-button type="primary" @click="dundcheck" v-if="dialogType == 'edit'" - >淇濆瓨</el-button - > + <el-button type="primary" @click="dundcheck" v-if="dialogType == 'edit'">淇濆瓨</el-button> <el-button @click="cancel">鍙栨秷</el-button> </div> </el-dialog> @@ -821,6 +469,7 @@ exportExternalperson } from "@/api/project/externalperson"; import { getUserProfile } from "@/api/system/user"; +import { listDept } from "@/api/system/dept"; import { listDonatebaseinfo, getDonatebaseinfo @@ -943,7 +592,9 @@ APPLICATIONENDTIME: null, CHECKFLAG: 1, APPLYTYPE: 1, - money: null + money: null, + donorname: null, + deptnos: null }, // 琛ㄥ崟鍙傛暟 form: {}, @@ -1024,6 +675,7 @@ //this.resetForm(); this.getCurFundType(); this.getUsermsg(); + this.listDept(); }, mounted() { if (grtItem("expertFeeCheck")) { @@ -1051,6 +703,12 @@ } else { this.show = 3; } + }); + }, + listDept() { + listDept({}).then(response => { + this.deptList = response.data; + this.loading = false; }); }, selectapplication() { @@ -1135,7 +793,7 @@ }, getlistOrganization() { - listOrganization().then(res => {}); + listOrganization().then(res => { }); }, totaldayin(e) { @@ -1183,7 +841,7 @@ username = res.data.username; this.$modal .confirm('鏄惁纭閫氳繃"' + username + '"鐨勮垂鐢ㄧ敵璇凤紵') - .then(function() { + .then(function () { getFund(e).then(res => { let data = res.data; let financechecher = "宸插鏍�"; @@ -1241,7 +899,7 @@ }); }, //鍔ㄦ�佽绠楃◣鍓嶉噾棰� - change(scope) {}, + change(scope) { }, autodonorno() { listDonatebaseinfo().then(res => { res.rows.forEach(data => { @@ -1559,7 +1217,7 @@ infoid: infoid, count: this.idss }; - listFunddetails(aaa).then(res => {}); + listFunddetails(aaa).then(res => { }); }, //鍒濆鍖栬垂鐢ㄧ敵璇疯〃鍗曠晫闈� @@ -1748,7 +1406,7 @@ type: "warning" }) .then(() => { - updateFunddetail(this.fundDetailArr).then(res => {}); + updateFunddetail(this.fundDetailArr).then(res => { }); }) .catch(() => { //鍑犵偣鍙栨秷鐨勬彁绀� @@ -1761,7 +1419,7 @@ let detailDataCorrect = true; for (let i = 0; i < this.applicationDetailArr.length; i++) { let tempData = this.applicationDetailArr[i]; - Object.keys(tempData).forEach(function(key) { + Object.keys(tempData).forEach(function (key) { if ( tempData[key] == null || tempData[key] == undefined || diff --git a/src/views/project/fundcheck/medicalCostCheck/index.vue b/src/views/project/fundcheck/medicalCostCheck/index.vue index 5572327..72419c6 100644 --- a/src/views/project/fundcheck/medicalCostCheck/index.vue +++ b/src/views/project/fundcheck/medicalCostCheck/index.vue @@ -1,127 +1,71 @@ <template> <div class="app-container"> - <el-form - :model="queryParams" - ref="queryForm" - :inline="true" - v-show="showSearch" - label-width="120px" - > + <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="120px"> <el-row align="left"> <el-col :span="5"> <el-form-item label="鎹愮尞妗堜緥" prop="donorname" style="float: left"> - <el-input - v-model="queryParams.donorname" - placeholder="璇疯緭鍏ョ敵璇蜂汉鎹愮尞鑰�" - clearable - size="small" - @keyup.enter.native="flowconclusion" - /> + <el-input v-model="queryParams.donorname" placeholder="璇疯緭鍏ョ敵璇蜂汉鎹愮尞鑰�" clearable size="small" + @keyup.enter.native="flowconclusion" /> </el-form-item> </el-col> <el-col :span="5"> - <el-form-item - label-width="120px" - label="棰勫鐘舵��" - prop="checkstatus" - style="float: left" - > - <el-select - v-model="queryParams.checkstatus" - placeholder="璇烽�夋嫨" - style="width: 100%" - > - <el-option - v-for="item in checkmaterials" - :key="item.value" - :label="item.label" - :value="item.value" - > + <el-form-item label-width="120px" label="棰勫鐘舵��" prop="checkstatus" style="float: left"> + <el-select v-model="queryParams.checkstatus" placeholder="璇烽�夋嫨" style="width: 100%"> + <el-option v-for="item in checkmaterials" :key="item.value" :label="item.label" :value="item.value"> </el-option> </el-select> </el-form-item> </el-col> <el-col :span="5"> <el-form-item label="瀹℃壒鐘舵��" prop="CHECKFLAG" style="float: left"> - <el-select - v-model="queryParams.CHECKFLAG" - placeholder="璇烽�夋嫨" - style="width: 100%" - > - <el-option - v-for="item in checkFlagOptions" - :key="item.value" - :label="item.label" - :value="item.value" - > + <el-select v-model="queryParams.CHECKFLAG" placeholder="璇烽�夋嫨" style="width: 100%"> + <el-option v-for="item in checkFlagOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option> </el-select> </el-form-item> </el-col> <el-col :span="5"> - <el-form-item label="缁忓姙浜�" prop="APPLICANT" style="float: left"> - <el-input - v-model="queryParams.APPLICANT" - placeholder="璇疯緭鍏ョ粡鍔炰汉" - clearable - size="small" - @keyup.enter.native="flowconclusion" - /> + <el-form-item align="left" label="涓氬姟缁�" prop="deptnos"> + <el-select v-model="queryParams.deptnos" placeholder="璇烽�夋嫨妗堜緥鐘舵��"> + <el-option v-for="item in deptList" :label="item.deptName" :value="item.deptId"> + </el-option> + </el-select> </el-form-item> </el-col> </el-row> <el-row> <el-col :span="5"> + <el-form-item label="缁忓姙浜�" prop="APPLICANT" style="float: left"> + <el-input v-model="queryParams.APPLICANT" placeholder="璇疯緭鍏ョ粡鍔炰汉" clearable size="small" + @keyup.enter.native="flowconclusion" /> + </el-form-item> + </el-col> + <el-col :span="5"> <el-form-item label="鎶ラ攢閲戦" prop="money" style="float: left"> - <el-input - v-model="queryParams.money" - placeholder="璇疯緭鍏ョ敵璇蜂汉閲戦" - clearable - size="small" - @keyup.enter.native="flowconclusion" - /> + <el-input v-model="queryParams.money" placeholder="璇疯緭鍏ョ敵璇蜂汉閲戦" clearable size="small" + @keyup.enter.native="flowconclusion" /> </el-form-item> </el-col> <el-col :span="8"> <el-form-item label="鐢宠鏃ユ湡" prop="createTime"> - <el-date-picker - format="yyyy-MM-dd" - @change="selectapplication" - value-format="yyyy-MM-dd" - v-model="createTime" - type="daterange" - range-separator="鑷�" - start-placeholder="鐢宠寮�濮嬫棩鏈�" - end-placeholder="鐢宠缁撴潫鏃ユ湡" - @keyup.enter.native="flowconclusion" - > + <el-date-picker format="yyyy-MM-dd" @change="selectapplication" value-format="yyyy-MM-dd" + v-model="createTime" type="daterange" range-separator="鑷�" start-placeholder="鐢宠寮�濮嬫棩鏈�" + end-placeholder="鐢宠缁撴潫鏃ユ湡" @keyup.enter.native="flowconclusion"> </el-date-picker> </el-form-item> </el-col> <el-col :span="6"> <div style="margin-bottom: 15px;"> - <el-button - type="primary" - icon="el-icon-search" - size="mini" - @click="flowconclusion" - >鎼滅储</el-button - > - <el-button icon="el-icon-refresh" size="mini" @click="resetQuery" - >閲嶇疆</el-button - > + <el-button type="primary" icon="el-icon-search" size="mini" @click="flowconclusion">鎼滅储</el-button> + <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button> </div> </el-col> </el-row> </el-form> <el-form ref="infoform" label-width="100px"> <el-row> - <el-table - v-loading="loading" - border - :data="donateconsolationfundList" - @selection-change="handleSelectionChange" - > + <el-table v-loading="loading" border :data="donateconsolationfundList" + @selection-change="handleSelectionChange"> <!-- <el-table-column label="瀹℃壒鐘舵��" width="120" align="center" prop="checkFlag"> <template slot-scope="scope"> @@ -129,36 +73,16 @@ style="color: #5fb878; font-weight: bold"></i></span> <span v-else>寰呭鏍�</span> </template> - </el-table-column> - --> - <el-table-column - label="鎶ラ攢鍗曞彿" - align="center" - prop="bh" - width="150px" - /> - <el-table-column - label="鐢宠鏃ユ湡" - width="180" - align="center" - prop="applyTime" - > +</el-table-column> +--> + <el-table-column label="鎶ラ攢鍗曞彿" align="center" prop="bh" width="150px" /> + <el-table-column label="鐢宠鏃ユ湡" width="180" align="center" prop="applyTime"> <template slot-scope="scope"> <span>{{ parseTime(scope.row.applyTime, "{y}-{m}-{d}") }}</span> </template> </el-table-column> - <el-table-column - label="鐢宠閲戦" - align="center" - prop="pretaxcost" - width="200px" - /> - <el-table-column - label="缁忓姙浜�" - align="center" - prop="username" - width="150px" - /> + <el-table-column label="鐢宠閲戦" align="center" prop="pretaxcost" width="200px" /> + <el-table-column label="缁忓姙浜�" align="center" prop="username" width="150px" /> <!--<el-table-column label="鎹愮尞缂栧彿" align="center" prop="donorno" />--> <!-- <el-table-column label="棰勬敮璐圭敤" align="center" prop="prepaidamount" width="120px" /> @@ -171,82 +95,28 @@ </el-table-column> <el-table-column label="璐㈠姟瀹℃牳" align="center" prop="financechecher" width="140" /> --> - <el-table-column - label="鐢宠鏉愭枡鐘舵��" - width="140" - align="center" - prop="checkstatus" - > + <el-table-column label="鐢宠鏉愭枡鐘舵��" width="140" align="center" prop="checkstatus"> <template slot-scope="scope"> - <dict-tag - :options="dict.type.sys_stage_type" - :value="scope.row.checkstatus" - /> + <dict-tag :options="dict.type.sys_stage_type" :value="scope.row.checkstatus" /> </template> </el-table-column> - <el-table-column - label="瀹℃壒鐘舵��" - align="center" - prop="recordstatus" - width="180" - > + <el-table-column label="瀹℃壒鐘舵��" align="center" prop="recordstatus" width="180"> <template slot-scope="scope"> - <dict-tag - :options="dict.type.sys_recordstatus" - :value="scope.row.recordstatus" - /> + <dict-tag :options="dict.type.sys_recordstatus" :value="scope.row.recordstatus" /> </template> </el-table-column> - <el-table-column - label="鎵�灞炵粍鍒�" - align="center" - prop="deptmentname" - width="200px" - /> - <el-table-column - label="缁勯暱" - align="center" - prop="managername" - width="150px" - /> - <el-table-column - label="鎹愮尞鑰�" - align="center" - prop="donorname" - width="150px" - /> + <el-table-column label="鎵�灞炵粍鍒�" align="center" prop="deptmentname" width="200px" /> + <el-table-column label="缁勯暱" align="center" prop="managername" width="150px" /> + <el-table-column label="鎹愮尞鑰�" align="center" prop="donorname" width="150px" /> <el-table-column label="澶囨敞" align="center" prop="remark" /> - <el-table-column - label="鎿嶄綔" - fixed="right" - align="center" - class-name="small-padding fixed-width" - width="260px" - > + <el-table-column label="鎿嶄綔" fixed="right" align="center" class-name="small-padding fixed-width" width="260px"> <template slot-scope="scope"> - <el-button - v-if="scope.row.checkFlag == 1" - size="mini" - type="text" - icon="el-icon-edit" - @click="handleCheck(scope.row)" - >瀹℃牳</el-button - > + <el-button v-if="scope.row.checkFlag == 1" size="mini" type="text" icon="el-icon-edit" + @click="handleCheck(scope.row)">瀹℃牳</el-button> <!-- v-hasPermi="['project:donateconsolationfund:edit']" --> - <el-button - size="mini" - type="text" - icon="el-icon-edit" - @click="handleDetail(scope.row)" - >璇︽儏</el-button - > - <el-button - size="mini" - type="text" - icon="el-icon-download" - @click="totaldayin(scope.row.id)" - >涓嬭浇</el-button - > + <el-button size="mini" type="text" icon="el-icon-edit" @click="handleDetail(scope.row)">璇︽儏</el-button> + <el-button size="mini" type="text" icon="el-icon-download" + @click="totaldayin(scope.row.id)">涓嬭浇</el-button> <!-- v-hasPermi="['project:donateconsolationfund:download']" --> <!-- 鏂板瀹℃牳椤甸潰 --> @@ -262,113 +132,61 @@ </el-table-column> </el-table> - <pagination - v-show="total > 0" - :total="total" - :page.sync="queryParams.pageNum" - :limit.sync="queryParams.pageSize" - @pagination="getlistbypower" - /> + <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" + :limit.sync="queryParams.pageSize" @pagination="getlistbypower" /> </el-row> </el-form> <!-- 娣诲姞鎴栦慨鏀硅垂鐢ㄧ敵璇峰崟 --> - <el-dialog - :visible.sync="dialogOpen" - width="1400px" - :title="title" - style="text-align: center" - > + <el-dialog :visible.sync="dialogOpen" width="1400px" :title="title" style="text-align: center"> <el-form ref="form" :model="form" label-width="120px" :rules="rules"> <!-- <el-form ref="applyForm" :model="applicationForm" label-width="120px"> --> <el-row> <el-col :span="5"> <el-form-item label="鐢宠鏃ユ湡" prop="createTime"> <!-- <el-input v-model="form.donorno" placeholder="璇疯緭鍏ョ敵璇锋棩鏈�" /> --> - <el-date-picker - clearable - style="width: 100%" - v-model="form.createTime" - type="date" - value-format="yyyy-MM-dd HH:mm:ss" - placeholder="鐢宠鏃ユ湡" - > + <el-date-picker clearable style="width: 100%" v-model="form.createTime" type="date" + value-format="yyyy-MM-dd HH:mm:ss" placeholder="鐢宠鏃ユ湡"> </el-date-picker> </el-form-item> </el-col> <el-col :span="5"> <el-form-item label="缁忔墜浜�" prop="username"> - <el-select - v-model="form.username" - placeholder="鐢宠浜哄鍚�" - clearable - filterable - allow-create - style="width: 100%" - > - <el-option - v-for="dict in userlist" - :key="dict.index" - :label="dict.nickname" - :value="dict.nickname" - ></el-option> + <el-select v-model="form.username" placeholder="鐢宠浜哄鍚�" clearable filterable allow-create + style="width: 100%"> + <el-option v-for="dict in userlist" :key="dict.index" :label="dict.nickname" + :value="dict.nickname"></el-option> </el-select> </el-form-item> </el-col> <el-col :span="5"> <el-form-item label="鎵�灞炵粍鍒�" prop="deptmentname"> - <el-input - v-model="form.deptmentname" - placeholder="璇疯緭鍏ユ墍灞炵粍鍒�" - clearable - :disabled="true" - /> + <el-input v-model="form.deptmentname" placeholder="璇疯緭鍏ユ墍灞炵粍鍒�" clearable :disabled="true" /> </el-form-item> </el-col> <el-col :span="5"> <el-form-item label="缁勯暱" prop="managername"> - <el-input - v-model="form.managername" - placeholder="璇疯緭鍏ョ粍闀�" - clearable - :disabled="true" - /> + <el-input v-model="form.managername" placeholder="璇疯緭鍏ョ粍闀�" clearable :disabled="true" /> </el-form-item> </el-col> </el-row> <el-row> - <el-col :span="5" - ><el-form-item label="鐢宠绫诲瀷"> - <el-radio-group - v-model="form.applytype" - @change="LoadItemTypeArr" - > + <el-col :span="5"><el-form-item label="鐢宠绫诲瀷"> + <el-radio-group v-model="form.applytype" @change="LoadItemTypeArr"> <!--<el-radio v-for="dict in dict.type.sys_financeitemtype" :key="dict.value" :label="dict.value" :disabled="form.id != null">{{ dict.label }}</el-radio>--> - <el-radio v-model="form.applytype" label="3" - >鍖诲鎴愭湰璐圭敤鐢宠</el-radio - > + <el-radio v-model="form.applytype" label="3">鍖诲鎴愭湰璐圭敤鐢宠</el-radio> </el-radio-group> </el-form-item> </el-col> <el-col :span="10"> <el-form-item label="鐢宠璇存槑" prop="remark"> - <el-input - v-model="form.remark" - placeholder="璇疯緭鍏ョ敵璇疯鏄�" - clearable - :disabled="true" - /> + <el-input v-model="form.remark" placeholder="璇疯緭鍏ョ敵璇疯鏄�" clearable :disabled="true" /> </el-form-item> </el-col> <el-col :span="5"> <el-form-item label="鎹愮尞鑰�" prop="donorname"> - <el-input - v-model="form.donorname" - placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" - clearable - :disabled="true" - /> + <el-input v-model="form.donorname" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" clearable :disabled="true" /> </el-form-item> </el-col> <!-- @@ -392,13 +210,8 @@ <el-row> <el-col :span="5"> <el-form-item label="鍚堣閲戦" prop="amountrequested"> - <el-input - v-model="form.amountrequested" - placeholder="鐢宠閲戦" - :disabled="true" - /> - </el-form-item> </el-col - ><!-- + <el-input v-model="form.amountrequested" placeholder="鐢宠閲戦" :disabled="true" /> + </el-form-item> </el-col><!-- <el-col :span="5"> <el-form-item label="绋庡墠閲戦" prop="amountrequested"> <el-input v-model="form.pretaxcost" placeholder="绋庡墠閲戦鍚堣" :disabled="true" /> @@ -420,92 +233,37 @@ </el-row> <el-row> <el-col :span="4"> - <el-button - type="primary" - plain - icon="el-icon-plus" - size="mini" - @click="addRow" - :disabled="true" - >鏂板涓撳璐�</el-button - > + <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="addRow" + :disabled="true">鏂板涓撳璐�</el-button> </el-col> </el-row> <el-row style="margin-top: 5px; margin-bottom: 5px"> - <el-table - :data="fundDetailArr" - :summary-method="getSummaries" - border - highlight-current-row - > - <el-table-column - prop="orderno" - align="center" - label="鎺掑簭" - width="80" - > + <el-table :data="fundDetailArr" :summary-method="getSummaries" border highlight-current-row> + <el-table-column prop="orderno" align="center" label="鎺掑簭" width="80"> <template slot-scope="scope"> <el-input v-model="scope.row.orderno" placeholder="鎺掑簭" /> </template> </el-table-column> - <el-table-column - prop="itemtype" - align="center" - label="璐圭敤绫诲瀷" - width="220" - > + <el-table-column prop="itemtype" align="center" label="璐圭敤绫诲瀷" width="220"> <template slot-scope="scope"> - <el-select - v-model="scope.row.applytype" - placeholder="璐圭敤绫诲瀷" - @change="LoadItemTypeArr(scope.row)" - > - <el-option - v-for="dict in fundtypeArr" - :key="dict.value" - :label="dict.label" - :value="dict.value" - ></el-option> + <el-select v-model="scope.row.applytype" placeholder="璐圭敤绫诲瀷" @change="LoadItemTypeArr(scope.row)"> + <el-option v-for="dict in fundtypeArr" :key="dict.value" :label="dict.label" + :value="dict.value"></el-option> </el-select> </template> </el-table-column> - <el-table-column - prop="itemtype" - align="center" - label="鏈嶅姟椤圭洰" - width="260" - > + <el-table-column prop="itemtype" align="center" label="鏈嶅姟椤圭洰" width="260"> <template slot-scope="scope"> - <el-select - v-model="scope.row.itemid" - placeholder="鏈嶅姟椤圭洰" - clearable - filterable - allow-create - @change="select(scope.row)" - :filter-method="val => SearchItem(val, scope)" - > - <el-option - v-for="dict in scope.row.itemArr" - :key="dict.id" - :label="dict.itemName" - :value="dict.id" - ></el-option> + <el-select v-model="scope.row.itemid" placeholder="鏈嶅姟椤圭洰" clearable filterable allow-create + @change="select(scope.row)" :filter-method="val => SearchItem(val, scope)"> + <el-option v-for="dict in scope.row.itemArr" :key="dict.id" :label="dict.itemName" + :value="dict.id"></el-option> </el-select> </template> </el-table-column> - <el-table-column - prop="beneficiaryno" - align="center" - label="濮撳悕" - width="120" - v-if="form.applytype != 3" - > + <el-table-column prop="beneficiaryno" align="center" label="濮撳悕" width="120" v-if="form.applytype != 3"> <template slot-scope="scope"> - <el-input - v-model="scope.row.beneficiaryname" - placeholder="濮撳悕" - /> + <el-input v-model="scope.row.beneficiaryname" placeholder="濮撳悕" /> </template> </el-table-column> <!-- @@ -518,234 +276,101 @@ </el-select> </template> </el-table-column>--> - <el-table-column - prop="amount" - align="center" - label="绋庡墠閲戦" - width="120" - v-if="form.applytype != 3" - > + <el-table-column prop="amount" align="center" label="绋庡墠閲戦" width="120" v-if="form.applytype != 3"> <template slot-scope="scope"> - <el-select - v-model="scope.row.amount" - placeholder="绋庡墠閲戦" - clearable - filterable - allow-create - @change="selectamount(scope.row)" - > - <el-option - v-for="dict in fundblock" - :key="dict.expensedescribe" - :label="dict.expense" - :value="dict.expense" - ></el-option> + <el-select v-model="scope.row.amount" placeholder="绋庡墠閲戦" clearable filterable allow-create + @change="selectamount(scope.row)"> + <el-option v-for="dict in fundblock" :key="dict.expensedescribe" :label="dict.expense" + :value="dict.expense"></el-option> </el-select> </template> </el-table-column> - <el-table-column - prop="taxamount" - align="center" - label="鎵g◣" - width="120" - v-if="form.applytype != '3'" - > + <el-table-column prop="taxamount" align="center" label="鎵g◣" width="120" v-if="form.applytype != '3'"> <template slot-scope="scope"> <el-input v-model="scope.row.taxamount" placeholder="鎵g◣" /> </template> </el-table-column> - <el-table-column - prop="taxedamount" - align="center" - label="绋庡悗閲戦" - width="120" - v-if="form.applytype != '3'" - > + <el-table-column prop="taxedamount" align="center" label="绋庡悗閲戦" width="120" v-if="form.applytype != '3'"> <template slot-scope="scope"> - <el-input - v-model="scope.row.taxedamount" - placeholder="绋庡悗閲戦" - /> + <el-input v-model="scope.row.taxedamount" placeholder="绋庡悗閲戦" /> </template> </el-table-column> - <el-table-column - prop="price" - align="center" - label="浠锋牸" - width="120" - v-if="form.applytype == '3'" - > + <el-table-column prop="price" align="center" label="浠锋牸" width="120" v-if="form.applytype == '3'"> <template slot-scope="scope"> - <el-input - v-model="scope.row.price" - placeholder="浠锋牸" - @blur=" - val => { - sumTotalFee(scope.row); - } - " - /> + <el-input v-model="scope.row.price" placeholder="浠锋牸" @blur=" + val => { + sumTotalFee(scope.row); + } + " /> </template> </el-table-column> - <el-table-column - prop="quantity" - align="center" - label="鏁伴噺" - width="80" - v-if="form.applytype == '3'" - > + <el-table-column prop="quantity" align="center" label="鏁伴噺" width="80" v-if="form.applytype == '3'"> <template slot-scope="scope"> - <el-input - v-model="scope.row.quantity" - placeholder="鏁伴噺" - @blur=" - val => { - sumTotalFee(scope.row); - } - " - /> + <el-input v-model="scope.row.quantity" placeholder="鏁伴噺" @blur=" + val => { + sumTotalFee(scope.row); + } + " /> </template> </el-table-column> - <el-table-column - prop="amount" - align="center" - label="閲戦" - width="120" - v-if="form.applytype == '3'" - > + <el-table-column prop="amount" align="center" label="閲戦" width="120" v-if="form.applytype == '3'"> <template slot-scope="scope"> <el-input v-model="scope.row.amount" placeholder="浠锋牸" /> </template> </el-table-column> - <el-table-column - prop="unitname" - align="center" - label="鍗曚綅" - width="220" - > + <el-table-column prop="unitname" align="center" label="鍗曚綅" width="220"> <template slot-scope="scope"> - <org-selecter - :ref="'unitSel' + scope.$index" - :org-type="'3'" - v-model="scope.row.unitno" - /> + <org-selecter :ref="'unitSel' + scope.$index" :org-type="'3'" v-model="scope.row.unitno" /> </template> </el-table-column> - <el-table-column - prop="depositbank" - align="center" - label="寮�鎴烽摱琛�" - width="200" - > + <el-table-column prop="depositbank" align="center" label="寮�鎴烽摱琛�" width="200"> <template slot-scope="scope"> - <el-input - v-model="scope.row.depositbank" - placeholder="寮�鎴烽摱琛�" - /> + <el-input v-model="scope.row.depositbank" placeholder="寮�鎴烽摱琛�" /> </template> </el-table-column> - <el-table-column - prop="bankcardno" - align="center" - label="閾惰鍗″彿" - width="210" - > + <el-table-column prop="bankcardno" align="center" label="閾惰鍗″彿" width="210"> <template slot-scope="scope"> - <el-input - v-model="scope.row.bankcardno" - placeholder="閾惰鍗″彿" - /> + <el-input v-model="scope.row.bankcardno" placeholder="閾惰鍗″彿" /> </template> </el-table-column> - <el-table-column - prop="remark" - align="center" - label="澶囨敞" - width="210" - v-if="form.applytype == '3'" - > + <el-table-column prop="remark" align="center" label="澶囨敞" width="210" v-if="form.applytype == '3'"> <template slot-scope="scope"> <el-input v-model="scope.row.remark" placeholder="澶囨敞" /> </template> </el-table-column> - <el-table-column - prop="title" - align="center" - label="鑱岀О" - width="120" - v-if="form.applytype != '3'" - > + <el-table-column prop="title" align="center" label="鑱岀О" width="120" v-if="form.applytype != '3'"> <template slot-scope="scope"> <el-input v-model="scope.row.title" placeholder="鑱岀О" /> </template> </el-table-column> - <el-table-column - prop="idcardno" - align="center" - label="韬唤璇佸彿" - width="200" - v-if="form.applytype != '3'" - > + <el-table-column prop="idcardno" align="center" label="韬唤璇佸彿" width="200" v-if="form.applytype != '3'"> <template slot-scope="scope"> <el-input v-model="scope.row.idcardno" placeholder="韬唤璇佸彿" /> </template> </el-table-column> - <el-table-column - prop="depositbank" - align="center" - label="寮�鎴烽摱琛�" - width="200" - v-if="form.applytype != '3'" - > + <el-table-column prop="depositbank" align="center" label="寮�鎴烽摱琛�" width="200" v-if="form.applytype != '3'"> <template slot-scope="scope"> - <el-input - v-model="scope.row.depositbank" - placeholder="寮�鎴烽摱琛�" - /> + <el-input v-model="scope.row.depositbank" placeholder="寮�鎴烽摱琛�" /> </template> </el-table-column> - <el-table-column - prop="bankcardno" - align="center" - label="閾惰鍗″彿" - width="210" - v-if="form.applytype != '3'" - > + <el-table-column prop="bankcardno" align="center" label="閾惰鍗″彿" width="210" v-if="form.applytype != '3'"> <template slot-scope="scope"> - <el-input - v-model="scope.row.bankcardno" - placeholder="閾惰鍗″彿" - /> + <el-input v-model="scope.row.bankcardno" placeholder="閾惰鍗″彿" /> </template> </el-table-column> - <el-table-column - fixed="right" - align="center" - label="鎿嶄綔" - width="200" - > + <el-table-column fixed="right" align="center" label="鎿嶄綔" width="200"> <template slot-scope="scope"> - <el-button - @click="saveRows(scope.row, scope.$index)" - type="text" - size="small" - v-if="show === 1" - > + <el-button @click="saveRows(scope.row, scope.$index)" type="text" size="small" v-if="show === 1"> 淇濆瓨 </el-button> - <el-button - @click.native.prevent=" - deleteRows(scope.row, scope.$index, fundDetailArr) - " - type="text" - size="small" - v-hasPermi="['project:costFeeCheck:delete']" - > + <el-button @click.native.prevent=" + deleteRows(scope.row, scope.$index, fundDetailArr) + " type="text" size="small" v-hasPermi="['project:costFeeCheck:delete']"> 鍒犻櫎 </el-button> </template> @@ -755,36 +380,13 @@ <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) => + <el-form-item label="璐圭敤鐢宠闄勪欢锛�" align="left" prop="annexbankcard"> + <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileList" multiple + :limit="20" :headers="headers" :on-success="(response, file, fileList) => uploadSccess(response, file, fileList) - " - :on-preview="downFile" - :disabled="dialogType == 'detail'" - :on-error="handleUploadError" - :on-exceed="handleExceed" - :on-remove="remove" - accept="image/*,.pdf" - > - <el-button - :disabled="dialogType == 'detail'" - size="small" - type="primary" - >涓婁紶</el-button - > + " :on-preview="downFile" :disabled="dialogType == 'detail'" :on-error="handleUploadError" + :on-exceed="handleExceed" :on-remove="remove" accept="image/*,.pdf"> + <el-button :disabled="dialogType == 'detail'" size="small" type="primary">涓婁紶</el-button> </el-upload> </el-form-item> </el-col> @@ -792,39 +394,17 @@ <el-row style="margin-top: 5px; margin-bottom: 5px"> <el-table :data="fundflowList" border> - <el-table-column - label="瀹℃牳浜�" - align="center" - prop="checkusername" - /> - <el-table-column - label="瀹℃牳鏃ユ湡" - align="center" - prop="createTime" - /> - <el-table-column - label="瀹℃牳缁撴灉" - align="center" - prop="flowconclusion" - ><template slot-scope="scope" - ><span v-if="scope.row.flowconclusion == 1">閫氳繃</span - ><span v-if="scope.row.flowconclusion == 2" - >涓嶉�氳繃</span - ></template - > + <el-table-column label="瀹℃牳浜�" align="center" prop="checkusername" /> + <el-table-column label="瀹℃牳鏃ユ湡" align="center" prop="createTime" /> + <el-table-column label="瀹℃牳缁撴灉" align="center" prop="flowconclusion"><template slot-scope="scope"><span + v-if="scope.row.flowconclusion == 1">閫氳繃</span><span + v-if="scope.row.flowconclusion == 2">涓嶉�氳繃</span></template> </el-table-column> - <el-table-column - label="瀹℃牳澶囨敞" - align="center" - prop="flowcontent" - /> + <el-table-column label="瀹℃牳澶囨敞" align="center" prop="flowcontent" /> </el-table> </el-row> - <el-row - style="margin-top: 25px; margin-bottom: 5px" - v-if="dialogType == 'edit'" - > + <el-row style="margin-top: 25px; margin-bottom: 5px" v-if="dialogType == 'edit'"> <el-col :span="7"> <el-form-item label="瀹℃牳" align="left"> <el-radio-group v-model="newobj.flowlevelone" align="left"> @@ -835,18 +415,13 @@ </el-col> <el-col :span="12"> <el-form-item label="瀹℃牳澶囨敞"> - <el-input - v-model="newobj.flowconclusion" - placeholder="鐢虫姤璐圭敤" - /> + <el-input v-model="newobj.flowconclusion" placeholder="鐢虫姤璐圭敤" /> </el-form-item> </el-col> </el-row> </el-form> <div slot="footer" class="dialog-footer"> - <el-button type="primary" @click="dundcheck" v-if="dialogType == 'edit'" - >纭</el-button - > + <el-button type="primary" @click="dundcheck" v-if="dialogType == 'edit'">纭</el-button> <el-button @click="cancel">鍙栨秷</el-button> </div> </el-dialog> @@ -918,6 +493,7 @@ import Li_area_select from "@/components/Address"; import OrgSelecter from "@/views/project/components/orgselect"; import { getUserProfile } from "@/api/system/user"; +import { listDept } from "@/api/system/dept"; import { getToken } from "@/utils/auth"; import { setItem, grtItem, removeItem } from "@/utils/storage.js"; @@ -1122,6 +698,7 @@ this.resetForm(); this.getCurFundType(); this.getUsermsg(); + this.listDept(); }, mounted() { if (grtItem("medicalCostCheck")) { @@ -1180,6 +757,12 @@ this.userlist = res.data; }); }, + listDept() { + listDept({}).then(response => { + this.deptList = response.data; + this.loading = false; + }); + }, getSummaries(param) { const { columns, data } = param; const sums = []; //澹版槑鍙橀噺 @@ -1208,7 +791,7 @@ }, getlistOrganization() { - listOrganization().then(res => {}); + listOrganization().then(res => { }); }, totaldayin(e) { @@ -1256,7 +839,7 @@ username = res.data.username; this.$modal .confirm('鏄惁纭閫氳繃"' + username + '"鐨勮垂鐢ㄧ敵璇凤紵') - .then(function() { + .then(function () { getFund(e).then(res => { let data = res.data; let financechecher = "宸插鏍�"; @@ -1314,7 +897,7 @@ }); }, //鍔ㄦ�佽绠楃◣鍓嶉噾棰� - change(scope) {}, + change(scope) { }, autodonorno() { listDonatebaseinfo().then(res => { res.rows.forEach(data => { @@ -1466,8 +1049,8 @@ //闄勪欢澶勭悊 this.fileList = this.form.annexbankcard ? this.form.annexbankcard - .split(",") - .map(item => ({ url: item, name: item })) + .split(",") + .map(item => ({ url: item, name: item })) : []; getownFundDetail(id).then(res => { @@ -1515,8 +1098,8 @@ //闄勪欢澶勭悊 this.fileList = this.form.annexbankcard ? this.form.annexbankcard - .split(",") - .map(item => ({ url: item, name: item })) + .split(",") + .map(item => ({ url: item, name: item })) : []; getownFundDetail(row.id).then(res => { @@ -1567,7 +1150,7 @@ infoid: infoid, count: this.idss }; - listFunddetails(aaa).then(res => {}); + listFunddetails(aaa).then(res => { }); }, //鍒濆鍖栬垂鐢ㄧ敵璇疯〃鍗曠晫闈� @@ -1812,7 +1395,7 @@ type: "warning" }) .then(() => { - updateFunddetail(this.fundDetailArr).then(res => {}); + updateFunddetail(this.fundDetailArr).then(res => { }); }) .catch(() => { //鍑犵偣鍙栨秷鐨勬彁绀� @@ -1825,7 +1408,7 @@ let detailDataCorrect = true; for (let i = 0; i < this.applicationDetailArr.length; i++) { let tempData = this.applicationDetailArr[i]; - Object.keys(tempData).forEach(function(key) { + Object.keys(tempData).forEach(function (key) { if ( tempData[key] == null || tempData[key] == undefined || @@ -2158,7 +1741,7 @@ }, //鏂囦欢涓婁紶 - handleUploadError() {}, + handleUploadError() { }, remove(file) { this.fileList.splice(this.fileList.indexOf(file), 1); }, diff --git a/src/views/project/fundcheck/officeExpenseCheck/index.vue b/src/views/project/fundcheck/officeExpenseCheck/index.vue index 245cc2b..98881e2 100644 --- a/src/views/project/fundcheck/officeExpenseCheck/index.vue +++ b/src/views/project/fundcheck/officeExpenseCheck/index.vue @@ -59,6 +59,23 @@ </el-form-item> </el-col> <el-col :span="5"> + <el-form-item align="left" label="涓氬姟缁�" prop="deptnos"> + <el-select + v-model="queryParams.deptnos" + placeholder="璇烽�夋嫨妗堜緥鐘舵��" + > + <el-option + v-for="item in deptList" + :label="item.deptName" + :value="item.deptId" + > + </el-option> + </el-select> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="5"> <el-form-item label="缁忓姙浜�" prop="APPLICANT" style="float: left"> <el-input v-model="queryParams.APPLICANT" @@ -69,8 +86,6 @@ /> </el-form-item> </el-col> - </el-row> - <el-row> <el-col :span="5"> <el-form-item label="鎶ラ攢閲戦" prop="money" style="float: left"> <el-input @@ -921,6 +936,7 @@ import Li_area_select from "@/components/Address"; import OrgSelecter from "@/views/project/components/orgselect"; import { getUserProfile } from "@/api/system/user"; +import { listDept } from "@/api/system/dept"; import { getToken } from "@/utils/auth"; import { setItem, grtItem, removeItem } from "@/utils/storage.js"; @@ -1040,8 +1056,8 @@ APPLICATIONENDTIME: null, CHECKFLAG: 1, APPLYTYPE: 4, - - money: null + money: null, + deptnos:null }, // 琛ㄥ崟鍙傛暟 form: {}, @@ -1125,6 +1141,7 @@ this.resetForm(); this.getCurFundType(); this.getUsermsg(); + this.listDept(); }, mounted() { @@ -1185,6 +1202,12 @@ this.userlist = res.data; }); }, + listDept() { + listDept({}).then(response => { + this.deptList = response.data; + this.loading = false; + }); + }, getSummaries(param) { const { columns, data } = param; const sums = []; //澹版槑鍙橀噺 diff --git a/src/views/project/travelexpensecheck/index.vue b/src/views/project/travelexpensecheck/index.vue index 0608b84..01916a5 100644 --- a/src/views/project/travelexpensecheck/index.vue +++ b/src/views/project/travelexpensecheck/index.vue @@ -5,7 +5,7 @@ ref="queryForm" :inline="true" v-show="showSearch" - label-width="68px" + label-width="80px" > <el-row> <el-col :span="5"> @@ -54,6 +54,23 @@ </el-form-item> </el-col> <el-col :span="5"> + <el-form-item align="left" label="涓氬姟缁�" prop="deptnos"> + <el-select + v-model="queryParams.deptnos" + placeholder="璇烽�夋嫨妗堜緥鐘舵��" + > + <el-option + v-for="item in deptList" + :label="item.deptName" + :value="item.deptId" + > + </el-option> + </el-select> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="5"> <el-form-item label="缁忓姙浜�" prop="username"> <el-input v-model="queryParams.username" @@ -63,9 +80,7 @@ @keyup.enter.native="handleQuery" /> </el-form-item> - </el-col> - </el-row> - <el-row> + </el-col> <el-col :span="5"> <el-form-item label="鎶ラ攢閲戦" prop="money" style="float: left"> <el-input @@ -1198,6 +1213,7 @@ listbypowerone, addShareData } from "@/api/project/reimbursement"; +import { listDept } from "@/api/system/dept"; import { provinceAndCityData, regionData, @@ -1322,8 +1338,11 @@ APPLICANT: null, APPLICATIONBEGTIME: null, APPLICATIONENDTIME: null, - CHECKFLAG: 1 - }, + CHECKFLAG: 1, + money: null, + deptnos: null + }, + deptList: [], //鏌ヨ浠樻 queryParamsPayee: { rbid: null @@ -1359,7 +1378,9 @@ dialogType: "show" }; }, - created() {}, + created() { + this.listDept(); + }, mounted() { if (grtItem("travelexpensecheck")) { this.queryParams = grtItem("travelexpensecheck"); @@ -1371,6 +1392,12 @@ selectapplication() { this.queryParams.APPLICATIONBEGTIME = this.applyTime[0]; this.queryParams.APPLICATIONENDTIME = this.applyTime[1]; + }, + listDept() { + listDept({}).then(response => { + this.deptList = response.data; + this.loading = false; + }); }, getList() { this.loading = true; @@ -1597,7 +1624,8 @@ APPLICANT: null, APPLICATIONBEGTIME: null, APPLICATIONENDTIME: null, - CHECKFLAG: 1 + CHECKFLAG: 1, + deptnos: null }), this.handleQuery(); }, diff --git a/vue.config.js b/vue.config.js index 10254cf..a8aeb72 100644 --- a/vue.config.js +++ b/vue.config.js @@ -5,7 +5,7 @@ return path.join(__dirname, dir) } -const name = process.env.VUE_APP_TITLE || '鑻ヤ緷绠$悊绯荤粺' // 缃戦〉鏍囬 +const name = process.env.VUE_APP_TITLE || '娴欐睙鐪丱PO鏁板瓧鍖栫鐞嗙郴缁�' // 缃戦〉鏍囬 const port = process.env.port || process.env.npm_config_port || 80 // 绔彛 @@ -34,7 +34,7 @@ // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { target:`http://localhost:8080`, - // target:`http://192.168.2.8:8080`, + // target:`http://192.168.1.10:8080`, // target:`http://116.62.18.175:8080`, // target:`https://slb.hospitalstar.com:9093`, changeOrigin: true, -- Gitblit v1.9.3