From 633f26d8e772b2441fb3fab72ecab0a047def74c Mon Sep 17 00:00:00 2001 From: WXL <1785969728@qq.com> Date: 星期三, 21 二月 2024 15:06:42 +0800 Subject: [PATCH] 11 --- src/views/project/donationdetails/index.vue | 1 src/views/project/fund/medicalCostApply/index.vue | 30 src/views/project/travelexpenseapply/travelexpensedetail/index.vue | 3 src/views/project/donatebaseinfo/index.vue | 588 ++++++++++++++--- src/views/project/fund/performanceApply/index.vue | 270 ++++++- src/views/project/medicalevaluation/index.vue | 7 src/views/project/donateannex/index.vue | 225 +++--- src/views/project/fund/performancedetails/index.vue | 2 src/views/project/relativesconfirmation/index.vue | 8 src/views/project/fund/applyDetail/index.vue | 2 src/views/project/fund/expertFeeApply/index.vue | 12 src/views/project/fund/ethicalExpertFeeApply/index.vue | 796 +++++++++++++++++++---- src/views/project/fund/officeExpenseApply/index.vue | 13 src/views/project/travelexpenseapply/index.vue | 13 14 files changed, 1,506 insertions(+), 464 deletions(-) diff --git a/src/views/project/donateannex/index.vue b/src/views/project/donateannex/index.vue index 35b88b9..a212994 100644 --- a/src/views/project/donateannex/index.vue +++ b/src/views/project/donateannex/index.vue @@ -135,7 +135,7 @@ @selection-change="handleSelectionChange" > <el-table-column type="selection" width="55" align="center" /> - <el-table-column + <el-table-column label="鎹愮尞缂栧彿" align="center" prop="donorno" @@ -148,36 +148,29 @@ width="120" > <template slot-scope="scope"> - <dict-tag - :options="dict.type.sys_DonationStatus" - :value="scope.row.recordstate" - /> + <div v-if="!scope.terminationCase"> + <dict-tag + :options="dict.type.sys_DonationStatus" + :value="scope.row.recordstate" + /> + </div> + <div v-else>浠诲姟涓</div> </template> </el-table-column> - <el-table-column - label="濮撳悕" - align="center" - prop="name" - width="120" - /> - <el-table-column label="鎬у埆" align="center" prop="sex" width="120"> + <el-table-column label="濮撳悕" align="center" prop="name" width="120" /> + <el-table-column label="鎬у埆" align="center" prop="sex" width="120"> <template slot-scope="scope"> <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex" /> </template> </el-table-column> + <el-table-column label="骞撮緞" align="center" prop="age" width="120" /> <el-table-column - label="骞撮緞" - align="center" - prop="age" - width="120" - /> - <el-table-column label="鍖荤枟鏈烘瀯" align="center" prop="treatmenthospitalname" width="180" /> - + <el-table-column label="鎶ュ憡浜�" align="center" @@ -267,11 +260,14 @@ <el-input v-model="form.donorno" placeholder="璇疯緭鍏ユ崘鐚�呯紪鍙�" /> </el-form-item> - <el-form-item label="濮撳悕" prop="name"> - <el-input disabled v-model="form.name" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" /> - </el-form-item> + <el-form-item label="濮撳悕" prop="name"> + <el-input + disabled + v-model="form.name" + placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" + /> + </el-form-item> - <el-table :data="attachmentTableData" style="width: 100%; margin-bottom: 20px" @@ -334,7 +330,7 @@ delDonateannex, addDonateannex, updateDonateannex, - exportDonateannex, + exportDonateannex } from "@/api/project/donateannex"; import Li_area_select from "@/components/Address"; import OrgSelecter from "@/views/project/components/orgselect"; @@ -350,7 +346,7 @@ // exportProvincemessage, } from "@/api/project/donatebaseinfo"; export default { - components: { + components: { Li_area_select, OrgSelecter, AnnexUpload @@ -377,7 +373,7 @@ "sys_SelfWill", "sys_FamilyRelation", "sys_Organ", - "sys_organstate", + "sys_organstate" ], data() { return { @@ -401,14 +397,14 @@ title: "", // 鏄惁鏄剧ず寮瑰嚭灞� open: false, - donorno:"", + donorno: "", // 鏌ヨ鍙傛暟 queryParams: { pageNum: 1, pageSize: 10, donorno: null, annexname: null, - annexno: null, + annexno: null }, // 琛ㄥ崟鍙傛暟 form: {}, @@ -426,45 +422,45 @@ annexname: "鎹愮尞鑰呰韩浠借瘉鏄�", annexno: "0001", annexurl: "", - fileList: [], + fileList: [] }, { annexname: "鎹愮尞鑰呬翰灞炶韩浠借瘉鏄�", annexno: "0002", annexurl: "", - fileList: [], - }, - ], + fileList: [] + } + ] }, { annexname: "鎹愮尞鑰呭強浜插睘鍏崇郴璇佹槑", annexno: "002", annexurl: "", - fileList: [], + fileList: [] }, { annexname: "鎹愮尞鑰呯梾鎯呯畝浠�", annexno: "003", annexurl: "", - fileList: [], + fileList: [] }, { annexname: "鎹愮尞纭鐧昏琛�", annexno: "004", annexurl: "", - fileList: [], + fileList: [] }, { annexname: "浜轰綋鍣ㄥ畼鎹愮尞浜哄憳璇勪及璧勮川锛堝彲閫夛級", annexno: "005", annexurl: "", - fileList: [], + fileList: [] }, { annexname: "鍏皯閫濅笘鍚庝汉浣撳櫒瀹樻崘鐚憡鐭ヤ功", annexno: "006", annexurl: "", - fileList: [], + fileList: [] }, { annexname: "DBD/DCD鍙鎬ц瘎浼版姤鍛�", @@ -482,7 +478,7 @@ annexname: "浜轰綋鍣ㄥ畼鎹愮尞鐥呮儏璇勪及琛�(DBD)", annexno: "00711", annexurl: "", - fileList: [], + fileList: [] }, { annexname: "鑴戞浜″垽瀹氱鍚堟姤鍛�:绗﹀悎鍏朵腑涓ら」鍗冲彲", @@ -494,29 +490,29 @@ annexname: "鑴戠數鍥炬姤鍛�", annexno: "007121", annexurl: "", - fileList: [], + fileList: [] }, { annexname: "鐭綔浼忔湡浣撴劅璇卞彂鐢典綅", annexno: "007122", annexurl: "", - fileList: [], + fileList: [] }, { annexname: "缁忛澶氭櫘鍕掕秴澹版姤鍛�", annexno: "007123", annexurl: "", - fileList: [], - }, - ], + fileList: [] + } + ] }, { annexname: "浜轰綋鍣ㄥ畼鎹愮尞鐥呮儏璇勪及鎰忚(DBD)", annexno: "00713", annexurl: "", - fileList: [], - }, - ], + fileList: [] + } + ] }, { annexname: "锛堜簩锛塂CD鍙鎬ц瘎浼版姤鍛�", @@ -528,29 +524,29 @@ annexname: "浜轰綋鍣ㄥ畼鎹愮尞鐥呮儏璇勪及琛�(DCD)", annexno: "00721", annexurl: "", - fileList: [], + fileList: [] }, { annexname: "鎾ら櫎蹇冭偤鏀寔60鍒嗛挓鍐呮浜¢闄╄瘎浼板崟", annexno: "00722", annexurl: "", - fileList: [], + fileList: [] }, { annexname: "浜轰綋鍣ㄥ畼鎹愮尞鐥呮儏璇勪及鎰忚(DCD)", annexno: "00723", annexurl: "", - fileList: [], - }, - ], - }, - ], - }, + fileList: [] + } + ] + } + ] + } ], // 涓婁紶鐨勫浘鐗囨湇鍔″櫒鍦板潃 uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", headers: { - Authorization: "Bearer " + getToken(), + Authorization: "Bearer " + getToken() }, //鍚勪唤闄勪欢鎵�鍦╝ttachmentTableData鏁扮粍涓殑浣嶇疆 attachJsonPosition: [ @@ -560,7 +556,7 @@ annexno: "001", annexurl: "", level: 2, - position: [0, 0], + position: [0, 0] }, { id: null, @@ -568,7 +564,7 @@ annexno: "002", annexurl: "", level: 2, - position: [0, 1], + position: [0, 1] }, { id: null, @@ -576,7 +572,7 @@ annexno: "001", annexurl: "", level: 1, - position: [1], + position: [1] }, { id: null, @@ -584,7 +580,7 @@ annexno: "001", annexurl: "", level: 1, - position: [2], + position: [2] }, { id: null, @@ -592,7 +588,7 @@ annexno: "001", annexurl: "", level: 1, - position: [3], + position: [3] }, { id: null, @@ -600,7 +596,7 @@ annexno: "001", annexurl: "", level: 1, - position: [4], + position: [4] }, { id: null, @@ -608,7 +604,7 @@ annexno: "001", annexurl: "", level: 1, - position: [5], + position: [5] }, { id: null, @@ -616,7 +612,7 @@ annexno: "001", annexurl: "", level: 3, - position: [6, 0, 0], + position: [6, 0, 0] }, { id: null, @@ -624,7 +620,7 @@ annexno: "001", annexurl: "", level: 4, - position: [6, 0, 1, 0], + position: [6, 0, 1, 0] }, { id: null, @@ -632,7 +628,7 @@ annexno: "001", annexurl: "", level: 4, - position: [6, 0, 1, 1], + position: [6, 0, 1, 1] }, { id: null, @@ -640,7 +636,7 @@ annexno: "001", annexurl: "", level: 4, - position: [6, 0, 1, 2], + position: [6, 0, 1, 2] }, { id: null, @@ -648,7 +644,7 @@ annexno: "001", annexurl: "", level: 3, - position: [6, 0, 2], + position: [6, 0, 2] }, { id: null, @@ -656,7 +652,7 @@ annexno: "001", annexurl: "", level: 3, - position: [6, 1, 0], + position: [6, 1, 0] }, { id: null, @@ -664,7 +660,7 @@ annexno: "001", annexurl: "", level: 3, - position: [6, 1, 1], + position: [6, 1, 1] }, { id: null, @@ -672,13 +668,13 @@ annexno: "001", annexurl: "", level: 3, - position: [6, 1, 2], - }, + position: [6, 1, 2] + } ], //鎹愯禒缂栧彿 donorno: "0001", infoid: "8", - openType: "edit", + openType: "edit" }; }, created() { @@ -688,8 +684,8 @@ /** 鏌ヨ鎹愮尞闄勪欢鍒楄〃 */ getList() { this.loading = true; - listnewDonateannex(this.queryParams).then((response) => { - console.log("鏂版暟鎹�",response); + listnewDonateannex(this.queryParams).then(response => { + console.log("鏂版暟鎹�", response); this.donateannexList = response.rows; console.log(this.donateannexList.donorNo); this.total = response.total; @@ -700,12 +696,13 @@ cancel() { this.open = false; this.reset(); - }, curCase: { - donorno: "", - name: "", - registerAddresss:"", - infoid: "", - }, + }, + curCase: { + donorno: "", + name: "", + registerAddresss: "", + infoid: "" + }, // 琛ㄥ崟閲嶇疆 reset() { this.form = { @@ -785,7 +782,7 @@ majorrelatives: null, familyrelations: null, acquisitiontissueno: null, - acquisitiontissuename: null, + acquisitiontissuename: null }; this.resetForm("form"); }, @@ -801,7 +798,7 @@ }, // 澶氶�夋閫変腑鏁版嵁 handleSelectionChange(selection) { - this.ids = selection.map((item) => item.id); + this.ids = selection.map(item => item.id); this.single = selection.length !== 1; this.multiple = !selection.length; }, @@ -815,10 +812,10 @@ let searchParam = { donorno: this.donorno, infoid: this.infoid, - isdel: 0, + isdel: 0 }; this.loading = true; - listDonateannex(searchParam).then((response) => { + listDonateannex(searchParam).then(response => { //this.donateannexList = response.rows; this.loading = false; let dataList = response.rows; @@ -837,7 +834,7 @@ const list = Array.isArray(tempUrl) ? tempUrl : tempUrl.split(","); - tempfileList = list.map((item) => { + tempfileList = list.map(item => { if (typeof item === "string") { item = { name: item, url: item }; } @@ -849,10 +846,12 @@ let tempPositionArr = this.attachJsonPosition[k].position; let tempData; if (this.attachJsonPosition[k].level == 1) { - this.attachmentTableData[tempPositionArr[0]].fileList = - tempfileList; - this.attachmentTableData[tempPositionArr[0]].annexurl = - tempUrl; + this.attachmentTableData[ + tempPositionArr[0] + ].fileList = tempfileList; + this.attachmentTableData[ + tempPositionArr[0] + ].annexurl = tempUrl; tempData = this.attachmentTableData[tempPositionArr[0]]; } else if (this.attachJsonPosition[k].level == 2) { this.attachmentTableData[tempPositionArr[0]].children[ @@ -861,10 +860,8 @@ this.attachmentTableData[tempPositionArr[0]].children[ tempPositionArr[1] ].annexurl = tempUrl; - tempData = - this.attachmentTableData[tempPositionArr[0]].children[ - tempPositionArr[1] - ]; + tempData = this.attachmentTableData[tempPositionArr[0]] + .children[tempPositionArr[1]]; } else if (this.attachJsonPosition[k].level == 3) { this.attachmentTableData[tempPositionArr[0]].children[ tempPositionArr[1] @@ -872,10 +869,8 @@ this.attachmentTableData[tempPositionArr[0]].children[ tempPositionArr[1] ].children[tempPositionArr[2]].annexurl = tempUrl; - tempData = - this.attachmentTableData[tempPositionArr[0]].children[ - tempPositionArr[1] - ].children[tempPositionArr[2]]; + tempData = this.attachmentTableData[tempPositionArr[0]] + .children[tempPositionArr[1]].children[tempPositionArr[2]]; } else if (this.attachJsonPosition[k].level == 4) { this.attachmentTableData[tempPositionArr[0]].children[ tempPositionArr[1] @@ -887,10 +882,9 @@ ].children[tempPositionArr[2]].children[ tempPositionArr[3] ].annexurl = tempUrl; - tempData = - this.attachmentTableData[tempPositionArr[0]].children[ - tempPositionArr[1] - ].children[tempPositionArr[2]].children[tempPositionArr[3]]; + tempData = this.attachmentTableData[tempPositionArr[0]] + .children[tempPositionArr[1]].children[tempPositionArr[2]] + .children[tempPositionArr[3]]; } } } @@ -905,9 +899,9 @@ handleUpdate(row) { this.reset(); const id = row.id || this.ids; - getDonatebaseinfo(id).then((response) => { + getDonatebaseinfo(id).then(response => { this.form = response.data; - console.log("form:",this.form); + console.log("form:", this.form); // this.form.diseasetype = this.form.diseasetype.split(","); // this.form.infectious = this.form.infectious.split(","); // this.form.selfwill = this.form.selfwill.split(","); @@ -924,16 +918,16 @@ if (this.openType == "edit") { //寰幆鏁扮粍锛屽崟涓笂浼狅紝鍚庣画鏀逛负鎵归噺涓婁紶 for (let i = 0; i < this.attachJsonPosition.length; i++) { - let updateParam = { + let updateParam = { id: this.attachJsonPosition[i].id, infoid: this.infoid, donorno: this.donorno, delFlag: 0, annexname: this.attachJsonPosition[i].annexname, annexno: this.attachJsonPosition[i].annexno, - annexurl: this.attachJsonPosition[i].annexurl, + annexurl: this.attachJsonPosition[i].annexurl }; - updateDonateannex(updateParam).then((response) => { + updateDonateannex(updateParam).then(response => { this.$modal.msgSuccess("淇敼鎴愬姛"); }); } @@ -946,9 +940,9 @@ delFlag: 0, annexname: this.attachJsonPosition[i].annexname, annexno: this.attachJsonPosition[i].annexno, - annexurl: this.attachJsonPosition[i].annexurl, + annexurl: this.attachJsonPosition[i].annexurl }; - addDonateannex(addParam).then((response) => { + addDonateannex(addParam).then(response => { this.$modal.msgSuccess("鏂板鎴愬姛"); //this.open = false; }); @@ -961,7 +955,7 @@ const ids = row.id || this.ids; this.$modal .confirm('鏄惁纭鍒犻櫎鎹愮尞鍩虹缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�') - .then(function () { + .then(function() { return delDonatebaseinfo(ids); }) .then(() => { @@ -979,7 +973,7 @@ this.exportLoading = true; return exportDonatebaseinfo(queryParams); }) - .then((response) => { + .then(response => { this.$download.name(response.msg); this.exportLoading = false; }) @@ -1044,7 +1038,7 @@ } } } else { - console.log(response.msg);; + console.log(response.msg); } }, @@ -1080,8 +1074,9 @@ this.attachJsonPosition[positionIndex].annexurl = attachmentFileInfo.annexurl; } else if (position.level == 2) { - this.attachmentTableData[positionArr[0]].children[positionArr[1]] = - attachmentFileInfo; + this.attachmentTableData[positionArr[0]].children[ + positionArr[1] + ] = attachmentFileInfo; this.attachJsonPosition[positionIndex].annexurl = attachmentFileInfo.annexurl; } else if (position.level == 3) { @@ -1108,7 +1103,7 @@ strs += list[i].url + separator; } return strs != "" ? strs.substr(0, strs.length - 1) : ""; - }, - }, + } + } }; </script> diff --git a/src/views/project/donatebaseinfo/index.vue b/src/views/project/donatebaseinfo/index.vue index e21d946..39be021 100644 --- a/src/views/project/donatebaseinfo/index.vue +++ b/src/views/project/donatebaseinfo/index.vue @@ -1,31 +1,63 @@ <template> <div class="app-container"> - <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="70px"> + <el-form + :model="queryParams" + ref="queryForm" + :inline="true" + v-show="showSearch" + label-width="70px" + > <el-row :gutter="8"> <el-col :span="5"> <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="5"> - <el-form-item align="left" label="鍖荤枟鏈烘瀯" prop="treatmenthospitalname"> - <org-selecter ref="orgSelecter" :org-type="'3'" v-model="queryParams.treatmenthospitalno" - @keyup.enter.native="handleQuery" /> + <el-form-item + align="left" + label="鍖荤枟鏈烘瀯" + prop="treatmenthospitalname" + > + <org-selecter + ref="orgSelecter" + :org-type="'3'" + v-model="queryParams.treatmenthospitalno" + @keyup.enter.native="handleQuery" + /> </el-form-item> </el-col> <el-col :span="5"> <el-form-item label="鎹愮尞鍦板競"> <el-select v-model="queryParams.city" placeholder="璇烽�夋嫨鍦板競"> - <el-option v-for="item in provinceData" :key="item.value" :label="item.label" :value="item.value"> + <el-option + v-for="item in provinceData" + :key="item.value" + :label="item.label" + :value="item.value" + > </el-option> </el-select> </el-form-item> </el-col> <el-col :span="9"> <el-form-item label="鏃ユ湡"> - <el-date-picker style="width: 100%" v-model="selecttime" type="monthrange" range-separator="鑷�" - start-placeholder="寮�濮嬫湀浠�" end-placeholder="缁撴潫鏈堜唤" value-format="yyyy-MM-dd" @change="getTimeList"> + <el-date-picker + style="width: 100%" + v-model="selecttime" + type="monthrange" + range-separator="鑷�" + start-placeholder="寮�濮嬫湀浠�" + end-placeholder="缁撴潫鏈堜唤" + value-format="yyyy-MM-dd" + @change="getTimeList" + > </el-date-picker> </el-form-item> </el-col> @@ -33,16 +65,33 @@ <el-row :gutter="8"> <el-col :span="5"> <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="5"> <el-form-item label="鎶ュ憡浜�"> - <el-select v-model="queryParams.reporterno" placeholder="璇烽�夋嫨鎶ュ憡浜�"> - <el-option v-for="item in reportlist" :key="item.index" :label="item.reportername" :value="item.reporterno"> + <el-select + v-model="queryParams.reporterno" + placeholder="璇烽�夋嫨鎶ュ憡浜�" + > + <el-option + v-for="item in reportlist" + :key="item.index" + :label="item.reportername" + :value="item.reporterno" + > </el-option> </el-select> </el-form-item> @@ -50,22 +99,40 @@ <el-col :span="9"> <el-form-item label="绫嶈疮"> <div> - <li_area_select ref="areaSelect" v-model="searchAddress"></li_area_select> + <li_area_select + ref="areaSelect" + v-model="searchAddress" + ></li_area_select> </div> </el-form-item> </el-col> <el-col :span="4"> <el-form-item> - <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-form-item> </el-col> </el-row> </el-form> <el-row :gutter="10" class="mb8"> <el-col :span="1.5"> - <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" - v-hasPermi="['project:donatebaseinfo:add']">鏂板</el-button> + <el-button + type="primary" + plain + icon="el-icon-plus" + size="mini" + @click="handleAdd" + v-hasPermi="['project:donatebaseinfo:add']" + >鏂板</el-button + > </el-col> <!-- <el-col :span="1.5"> <el-button @@ -81,42 +148,91 @@ </el-col> --> <el-col :span="1.5"> - <el-button type="warning" plain icon="el-icon-download" size="mini" :loading="exportLoading" @click="handleExport" - v-hasPermi="['project:donatebaseinfo:export']">瀵煎嚭</el-button> + <el-button + type="warning" + plain + icon="el-icon-download" + size="mini" + :loading="exportLoading" + @click="handleExport" + v-hasPermi="['project:donatebaseinfo:export']" + >瀵煎嚭</el-button + > </el-col> - <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> + <right-toolbar + :showSearch.sync="showSearch" + @queryTable="getList" + ></right-toolbar> </el-row> - <el-table v-loading="loading" :data="donatebaseinfoList" @selection-change="handleSelectionChange" border - :default-sort="{ prop: 'donatetime', order: 'descending' }"> + <el-table + v-loading="loading" + :data="donatebaseinfoList" + @selection-change="handleSelectionChange" + border + :default-sort="{ prop: 'donatetime', order: 'descending' }" + > <!-- <el-table-column label="鎶ュ憡鏃堕棿" align="center" prop="id" /> --> <!-- <el-table-column type="selection" width="55" align="center" /> --> - <el-table-column label="妗堜緥鏃堕棿" align="center" prop="donatetime" width="100"> + <el-table-column + label="妗堜緥鏃堕棿" + align="center" + prop="donatetime" + width="100" + > <template slot-scope="scope"> <span>{{ parseTime(scope.row.donatetime, "{y}-{m}-{d}") }}</span> </template> </el-table-column> - <el-table-column label="鎹愮尞缂栧彿" align="center" prop="donorno" width="200" /> + <el-table-column + label="鎹愮尞缂栧彿" + align="center" + prop="donorno" + width="200" + /> <el-table-column label="濮撳悕" align="center" prop="name" width="100" /> <el-table-column label="鎬у埆" align="center" prop="sex" width="100"> <template slot-scope="scope"> - <dict-tag :options="dict.type.sys_user_sex" :value="parseInt(scope.row.sex)" /> + <dict-tag + :options="dict.type.sys_user_sex" + :value="parseInt(scope.row.sex)" + /> </template> </el-table-column> <el-table-column label="骞撮緞" align="center" prop="age" width="100" /> - <el-table-column label="鍖荤枟鏈烘瀯" align="center" prop="treatmenthospitalname" /> + <el-table-column + label="鍖荤枟鏈烘瀯" + align="center" + prop="treatmenthospitalname" + /> <el-table-column label="琛�鍨�" align="center" prop="bloodtype" width="100"> <template slot-scope="scope"> - <dict-tag :options="dict.type.sys_BloodType" :value="scope.row.bloodtype" /> + <dict-tag + :options="dict.type.sys_BloodType" + :value="scope.row.bloodtype" + /> </template> </el-table-column> - <el-table-column label="鎹愮尞绫诲埆" align="center" prop="donationcategory" width="150"> + <el-table-column + label="鎹愮尞绫诲埆" + align="center" + prop="donationcategory" + width="150" + > <template slot-scope="scope"> - <dict-tag :options="dict.type.sys_DonationCategory" :value="scope.row.donationcategory" /> + <dict-tag + :options="dict.type.sys_DonationCategory" + :value="scope.row.donationcategory" + /> </template> </el-table-column> - <el-table-column label="鎶ュ憡浜�" align="center" prop="reportername" width="100" /> + <el-table-column + label="鎶ュ憡浜�" + align="center" + prop="reportername" + width="100" + /> <!-- <el-table-column label="鐜版墍鍦ㄥ湴甯�" @@ -138,22 +254,57 @@ </template> </el-table-column> --> - <el-table-column label="鎹愮尞杩涘害" align="center" prop="workflow" width="120"> + <el-table-column + label="鎹愮尞杩涘害" + align="center" + prop="workflow" + width="120" + > <template slot-scope="scope"> - <dict-tag :options="dict.type.sys_donornode" :value="scope.row.workflow" /> + <div v-if="!scope.row.terminationCase"> + <dict-tag + :options="dict.type.sys_donornode" + :value="scope.row.workflow" + /> + </div> + <div v-else>浠诲姟涓</div> </template> </el-table-column> - <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width" fixed="right"> + <el-table-column + label="鎿嶄綔" + align="center" + class-name="small-padding fixed-width" + fixed="right" + > <template slot-scope="scope"> - <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" - v-hasPermi="['project:donatebaseinfo:edit']">璇︽儏</el-button> - <el-button v-if="scope.row.recordstate == 0" size="mini" type="text" icon="el-icon-delete" - @click="handleDelete(scope.row)" v-hasPermi="['project:donatebaseinfo:remove']">鍒犻櫎</el-button> + <el-button + size="mini" + type="text" + icon="el-icon-edit" + @click="handleUpdate(scope.row)" + v-hasPermi="['project:donatebaseinfo:edit']" + >璇︽儏</el-button + > + <el-button + v-if="scope.row.recordstate == 0" + size="mini" + type="text" + icon="el-icon-delete" + @click="handleDelete(scope.row)" + v-hasPermi="['project:donatebaseinfo:remove']" + >鍒犻櫎</el-button + > <!-- <el-button v-if="scope.row.recordstate == 0 || scope.row.recordstate == 3" size="mini" type="text" icon="el-icon-thumb" @click="handleapproval(scope.row)">鎻愪氦</el-button> --> - <el-button size="mini" type="text" icon="el-icon-refrigerator" @click="handledownload(scope.row)">涓嬭浇</el-button> + <el-button + size="mini" + type="text" + icon="el-icon-refrigerator" + @click="handledownload(scope.row)" + >涓嬭浇</el-button + > <!-- <el-button size="mini" type="text" icon="el-icon-edit" @click="handletermination(scope.row)" v-hasPermi="['project:donatebaseinfo:edit']">{{ scope.row.recordstate == 99 ? "鎭㈠": "缁堟" }}</el-button> @@ -161,16 +312,35 @@ </template> </el-table-column> </el-table> - <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" - @pagination="getList" /> + <pagination + v-show="total > 0" + :total="total" + :page.sync="queryParams.pageNum" + :limit.sync="queryParams.pageSize" + @pagination="getList" + /> <!-- 娣诲姞鎴栦慨鏀规崘鐚熀纭�瀵硅瘽妗� --> - <el-dialog :title="title" align="center" :visible.sync="open" :close-on-click-modal="false" width="1100px"> - <el-form ref="form" :model="form" :rules="rules" label-width="130px" label-position="right"> - <div style=" + <el-dialog + :title="title" + align="center" + :visible.sync="open" + :close-on-click-modal="false" + width="1100px" + > + <el-form + ref="form" + :model="form" + :rules="rules" + label-width="130px" + label-position="right" + > + <div + style=" border-bottom: 1px solid #ddd; border-top: 1px solid #ddd; padding-right: 60px; - "> + " + > <el-row style="margin-top: 40px"> <el-col :span="8"> <el-form-item label="鎹愮尞缂栧彿" prop="donorno"> @@ -178,13 +348,24 @@ </el-form-item> </el-col> <el-col :span="8"> - <el-form-item align="left" label="鍖荤枟鏈烘瀯" prop="treatmenthospitalno"> - <org-selecter ref="addOrgSelect" :org-type="'3'" v-model="form.treatmenthospitalno" /> + <el-form-item + align="left" + label="鍖荤枟鏈烘瀯" + prop="treatmenthospitalno" + > + <org-selecter + ref="addOrgSelect" + :org-type="'3'" + v-model="form.treatmenthospitalno" + /> </el-form-item> </el-col> <el-col :span="8"> <el-form-item label="绉戝" prop="treatmentdeptno"> - <el-input v-model="form.treatmentdeptname" placeholder="璇疯緭鍏ョ瀹�" /> + <el-input + v-model="form.treatmentdeptname" + placeholder="璇疯緭鍏ョ瀹�" + /> </el-form-item> </el-col> </el-row> @@ -197,8 +378,12 @@ <el-col :span="6"> <el-form-item label="姘戞棌" prop="nation"> <el-select v-model="form.nation" placeholder="璇烽�夋嫨姘戞棌"> - <el-option v-for="dict in dict.type.sys_nation" :key="dict.value" :label="dict.label" - :value="dict.value"></el-option> + <el-option + v-for="dict in dict.type.sys_nation" + :key="dict.value" + :label="dict.label" + :value="dict.value" + ></el-option> </el-select> </el-form-item> </el-col> @@ -216,23 +401,40 @@ <el-row> <el-col :span="6"> <el-form-item label="璇佷欢绫诲瀷" prop="idcardtype"> - <el-select v-model="form.idcardtype" placeholder="璇烽�夋嫨璇佷欢绫诲瀷"> - <el-option v-for="dict in dict.type.sys_IDType" :key="dict.value" :label="dict.label" - :value="parseInt(dict.value)"></el-option> + <el-select + v-model="form.idcardtype" + placeholder="璇烽�夋嫨璇佷欢绫诲瀷" + > + <el-option + v-for="dict in dict.type.sys_IDType" + :key="dict.value" + :label="dict.label" + :value="parseInt(dict.value)" + ></el-option> </el-select> </el-form-item> </el-col> <el-col :span="6"> <el-form-item label="璇佷欢鍙风爜" prop="idcardno"> - <el-input style="width: 174px" ref="updateBSvalue" class="sfzcode" v-model="form.idcardno" - placeholder="璇疯緭鍏ヨ瘉浠跺彿鐮�" @blur="updateMessage" /> + <el-input + style="width: 174px" + ref="updateBSvalue" + class="sfzcode" + v-model="form.idcardno" + placeholder="璇疯緭鍏ヨ瘉浠跺彿鐮�" + @blur="updateMessage" + /> </el-form-item> </el-col> <el-col :span="6"> <el-form-item label="鎬у埆" prop="sex"> <el-select v-model="form.sex" placeholder="璇疯緭鍏ユ�у埆"> - <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.label" :label="dict.label" - :value="parseInt(dict.value)"></el-option> + <el-option + v-for="dict in dict.type.sys_user_sex" + :key="dict.label" + :label="dict.label" + :value="parseInt(dict.value)" + ></el-option> </el-select> </el-form-item> </el-col> @@ -245,24 +447,39 @@ <el-row> <el-col :span="6"> <el-form-item label="鍑虹敓鏃ユ湡" prop="birthday"> - <el-date-picker clearable size="small" v-model="form.birthday" type="date" style="width: 174px" - value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨鍑虹敓鏃ユ湡"> + <el-date-picker + clearable + size="small" + v-model="form.birthday" + type="date" + style="width: 174px" + value-format="yyyy-MM-dd HH:mm:ss" + placeholder="閫夋嫨鍑虹敓鏃ユ湡" + > </el-date-picker> </el-form-item> </el-col> <el-col :span="6"> <el-form-item label="鑱屼笟" prop="occupation"> <el-select v-model="form.occupation" placeholder="璇烽�夋嫨鑱屼笟"> - <el-option v-for="dict in dict.type.sys_occupation" :key="dict.value" :label="dict.label" - :value="dict.value"></el-option> + <el-option + v-for="dict in dict.type.sys_occupation" + :key="dict.value" + :label="dict.label" + :value="dict.value" + ></el-option> </el-select> </el-form-item> </el-col> <el-col :span="6"> <el-form-item label="瀛﹀巻" prop="education"> <el-select v-model="form.education" placeholder="璇烽�夋嫨瀛﹀巻"> - <el-option v-for="dict in dict.type.sys_education" :key="dict.value" :label="dict.label" - :value="dict.value"></el-option> + <el-option + v-for="dict in dict.type.sys_education" + :key="dict.value" + :label="dict.label" + :value="dict.value" + ></el-option> </el-select> </el-form-item> </el-col> @@ -271,13 +488,19 @@ <el-col :span="12"> <el-form-item label="浣忓潃" prop="residenceaddress"> <div> - <li_area_select ref="residenceSelect" v-model="residenceAddresss"></li_area_select> + <li_area_select + ref="residenceSelect" + v-model="residenceAddresss" + ></li_area_select> <!-- <div>{{defultAddress}}</div> --> </div> </el-form-item> </el-col> <el-col :span="11" :push="1"> - <el-input v-model="form.residenceaddress" placeholder="璇疯緭鍏ュ唴瀹�" /> + <el-input + v-model="form.residenceaddress" + placeholder="璇疯緭鍏ュ唴瀹�" + /> </el-col> </el-row> @@ -285,22 +508,30 @@ <el-col :span="12"> <el-form-item label="鐜版墍鍦ㄥ湴" prop="registeraddress"> <div> - <li_area_select ref="registerSelect" v-model="registerAddresss"></li_area_select> + <li_area_select + ref="registerSelect" + v-model="registerAddresss" + ></li_area_select> <!-- <div>{{defultAddress}}</div> --> </div> </el-form-item> </el-col> <el-col :span="11" :push="1"> - <el-input v-model="form.registeraddress" placeholder="璇疯緭鍏ュ唴瀹�" /> + <el-input + v-model="form.registeraddress" + placeholder="璇疯緭鍏ュ唴瀹�" + /> </el-col> </el-row> </div> - <div style=" + <div + style=" border-bottom: 1px solid #ddd; margin-top: 20px; padding-right: 60px; - "> + " + > <el-row> <el-col :span="8"> <el-form-item label="浣忛櫌鍙�" prop="inpatientno"> @@ -309,7 +540,10 @@ </el-col> <el-col :span="16"> <el-form-item label="鐤剧梾璇婃柇" prop="diagnosisname"> - <el-input v-model="form.diagnosisname" placeholder="璇疯緭鍏ョ柧鐥呰瘖鏂悕绉�" /> + <el-input + v-model="form.diagnosisname" + placeholder="璇疯緭鍏ョ柧鐥呰瘖鏂悕绉�" + /> </el-form-item> </el-col> </el-row> @@ -317,16 +551,24 @@ <el-col :span="12"> <el-form-item align="left" label="琛�鍨�" prop="bloodtype"> <el-radio-group v-model="form.bloodtype"> - <el-radio v-for="dict in dict.type.sys_BloodType" :key="dict.value" :label="dict.value">{{ dict.label - }}</el-radio> + <el-radio + v-for="dict in dict.type.sys_BloodType" + :key="dict.value" + :label="dict.value" + >{{ dict.label }}</el-radio + > </el-radio-group> </el-form-item> </el-col> <el-col :span="12" :pull="1"> <el-form-item label="Rh(D)" align="left" prop="rhyin"> <el-radio-group v-model="form.rhyin"> - <el-radio v-for="dict in dict.type.sys_bloodtype_rhd" :key="dict.value" :label="dict.value">{{ - dict.label }}</el-radio> + <el-radio + v-for="dict in dict.type.sys_bloodtype_rhd" + :key="dict.value" + :label="dict.value" + >{{ dict.label }}</el-radio + > </el-radio-group> </el-form-item> </el-col> @@ -334,20 +576,31 @@ <el-row> <el-form-item label="鐤剧梾绫诲瀷" align="left"> <el-checkbox-group v-model="form.diseasetype"> - <el-checkbox v-for="dict in dict.type.sys_DiseaseType" :key="dict.value" :label="dict.value"> + <el-checkbox + v-for="dict in dict.type.sys_DiseaseType" + :key="dict.value" + :label="dict.value" + > {{ dict.label }} </el-checkbox> </el-checkbox-group> </el-form-item> <el-form-item label="鍏朵粬" prop="diseasetypeOther"> - <el-input v-model="form.diseasetypeOther" placeholder="璇疯緭鍏ュ叾浠�" /> + <el-input + v-model="form.diseasetypeOther" + placeholder="璇疯緭鍏ュ叾浠�" + /> </el-form-item> </el-row> <el-row> <el-col :span="12"> <el-form-item align="left" label="浼犳煋鐥�"> <el-checkbox-group v-model="form.infectious"> - <el-checkbox v-for="dict in dict.type.sys_Infectious" :key="dict.value" :label="dict.value"> + <el-checkbox + v-for="dict in dict.type.sys_Infectious" + :key="dict.value" + :label="dict.value" + > {{ dict.label }} </el-checkbox> </el-checkbox-group> @@ -355,7 +608,10 @@ </el-col> <el-col :span="12"> <el-form-item align="left" label="鍏朵粬" prop="infectiousOther"> - <el-input v-model="form.infectiousOther" placeholder="璇疯緭鍏ュ叾浠�" /> + <el-input + v-model="form.infectiousOther" + placeholder="璇疯緭鍏ュ叾浠�" + /> </el-form-item> </el-col> </el-row> @@ -363,7 +619,11 @@ <el-col :span="9"> <el-form-item align="left" label="鐥呬汉鐘跺喌"> <el-checkbox-group v-model="form.patientstate"> - <el-checkbox v-for="dict in dict.type.sys_patientstate" :key="dict.value" :label="dict.value"> + <el-checkbox + v-for="dict in dict.type.sys_patientstate" + :key="dict.value" + :label="dict.value" + > {{ dict.label }} </el-checkbox> </el-checkbox-group> @@ -372,7 +632,11 @@ <el-col :span="15" align="left"> <el-form-item label="鍏朵粬鎯呭喌"> <el-checkbox-group v-model="form.othercases"> - <el-checkbox v-for="dict in dict.type.sys_OtherCases" :key="dict.value" :label="dict.value"> + <el-checkbox + v-for="dict in dict.type.sys_OtherCases" + :key="dict.value" + :label="dict.value" + > {{ dict.label }} </el-checkbox> </el-checkbox-group> @@ -381,18 +645,29 @@ </el-row> </div> - <div style=" + <div + style=" border-bottom: 1px solid #ddd; padding-right: 60px; margin-top: 20px; - "> + " + > <el-row> <div display="flex"> <el-row> <el-col :span="12"> - <el-form-item label="浜插睘鐘跺喌" prop="kinship" class="relation" align="left"> + <el-form-item + label="浜插睘鐘跺喌" + prop="kinship" + class="relation" + align="left" + > <el-checkbox-group v-model="form.kinship"> - <el-checkbox v-for="dict in dict.type.sys_Kinship" :key="dict.value" :label="dict.value"> + <el-checkbox + v-for="dict in dict.type.sys_Kinship" + :key="dict.value" + :label="dict.value" + > {{ dict.label }} </el-checkbox> </el-checkbox-group> @@ -400,7 +675,10 @@ </el-col> <el-col :span="12"> <el-form-item label="鍏朵粬" prop="kinshipOther"> - <el-input v-model="form.kinshipOther" placeholder="璇疯緭鍏ュ叾浠�" /> + <el-input + v-model="form.kinshipOther" + placeholder="璇疯緭鍏ュ叾浠�" + /> </el-form-item> </el-col> </el-row> @@ -410,7 +688,11 @@ <el-col :span="24"> <el-form-item align="left" label="鏈汉鎰忔効 "> <el-checkbox-group v-model="form.selfwill"> - <el-checkbox v-for="dict in dict.type.sys_SelfWill" :key="dict.value" :label="dict.value"> + <el-checkbox + v-for="dict in dict.type.sys_SelfWill" + :key="dict.value" + :label="dict.value" + > {{ dict.label }} </el-checkbox> </el-checkbox-group> @@ -420,14 +702,24 @@ <el-row> <el-col :span="12"> <el-form-item label="涓昏浜插睘" prop="majorrelatives"> - <el-input v-model="form.majorrelatives" placeholder="璇疯緭鍏ヤ富瑕佷翰灞�" /> + <el-input + v-model="form.majorrelatives" + placeholder="璇疯緭鍏ヤ富瑕佷翰灞�" + /> </el-form-item> </el-col> <el-col :span="8"> <el-form-item label="涓庢崘璧犺�呭叧绯�" prop="familyrelations"> - <el-select v-model="form.familyrelations" placeholder="璇烽�夋嫨涓庢崘璧犺�呭叧绯�"> - <el-option v-for="dict in dict.type.sys_FamilyRelation" :key="dict.value" :label="dict.label" - :value="dict.value"></el-option> + <el-select + v-model="form.familyrelations" + placeholder="璇烽�夋嫨涓庢崘璧犺�呭叧绯�" + > + <el-option + v-for="dict in dict.type.sys_FamilyRelation" + :key="dict.value" + :label="dict.label" + :value="dict.value" + ></el-option> </el-select> </el-form-item> </el-col> @@ -436,7 +728,11 @@ <el-col :span="12"> <el-form-item align="left" label="淇℃伅鏉ユ簮"> <el-checkbox-group v-model="form.infosources"> - <el-checkbox v-for="dict in dict.type.sys_InfoSources" :key="dict.value" :label="dict.value"> + <el-checkbox + v-for="dict in dict.type.sys_InfoSources" + :key="dict.value" + :label="dict.value" + > {{ dict.label }} </el-checkbox> </el-checkbox-group> @@ -444,7 +740,10 @@ </el-col> <el-col :span="8"> <el-form-item label="鍏朵粬" prop="infosourcesOther"> - <el-input v-model="form.infosourcesOther" placeholder="璇疯緭鍏ヤ俊鎭潵婧愬叾浠�" /> + <el-input + v-model="form.infosourcesOther" + placeholder="璇疯緭鍏ヤ俊鎭潵婧愬叾浠�" + /> </el-form-item> </el-col> </el-row> @@ -456,55 +755,99 @@ </el-col> <el-col :span="8"> <el-form-item label="鑱旂郴鐢佃瘽" prop="infophone"> - <el-input v-model="form.infophone" placeholder="璇疯緭鍏ヤ俊鎭憳鑱旂郴鐢佃瘽" /> + <el-input + v-model="form.infophone" + placeholder="璇疯緭鍏ヤ俊鎭憳鑱旂郴鐢佃瘽" + /> </el-form-item> </el-col> </el-row> <el-row> <el-col :span="8"> <el-form-item align="left" label="绾㈠崄瀛椾細" prop="redorganno"> - <org-selecter ref="addCrossOrgSelect" :org-type="'2'" v-model="form.redorganno" /> + <org-selecter + ref="addCrossOrgSelect" + :org-type="'2'" + v-model="form.redorganno" + /> </el-form-item> </el-col> <el-col :span="8"> <el-form-item label="鑱旂郴浜�" prop="contactperson"> - <el-input v-model="form.contactperson" placeholder="璇疯緭鍏ヨ仈绯讳汉" /> + <el-input + v-model="form.contactperson" + placeholder="璇疯緭鍏ヨ仈绯讳汉" + /> </el-form-item> </el-col> <el-col :span="8"> <el-form-item label="鑱旂郴鏃堕棿" prop="contacttime"> - <el-date-picker clearable size="small" style="width: 190px" v-model="form.contacttime" type="datetime" - value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨鎶ュ憡鏃堕棿"> + <el-date-picker + clearable + size="small" + style="width: 190px" + v-model="form.contacttime" + type="datetime" + value-format="yyyy-MM-dd HH:mm:ss" + placeholder="閫夋嫨鎶ュ憡鏃堕棿" + > </el-date-picker> </el-form-item> </el-col> </el-row> <el-row> <el-col :span="24"> - <el-form-item align="left" label="鑾峰彇缁勭粐" prop="acquisitiontissuename"> - <org-selecter style="width: 260px" ref="orgSelecter" :org-type="'1'" v-model="form.acquisitiontissueno" /> + <el-form-item + align="left" + label="鑾峰彇缁勭粐" + prop="acquisitiontissuename" + > + <org-selecter + style="width: 260px" + ref="orgSelecter" + :org-type="'1'" + v-model="form.acquisitiontissueno" + /> </el-form-item> </el-col> </el-row> <el-row> <el-col :span="8"> <el-form-item label="鎶ュ憡浜�" prop="reporterno"> - <el-select ref="getReportname" v-model="form.reporterno" placeholder="璇烽�夋嫨"> - <el-option v-for="item in reporters" :key="item.reportNo" :label="item.reportName" - :value="item.reportNo"> + <el-select + ref="getReportname" + v-model="form.reporterno" + placeholder="璇烽�夋嫨" + > + <el-option + v-for="item in reporters" + :key="item.reportNo" + :label="item.reportName" + :value="item.reportNo" + > </el-option> </el-select> </el-form-item> </el-col> <el-col :span="8"> <el-form-item label="鑱旂郴鐢佃瘽" prop="reporterphone"> - <el-input v-model="form.reporterphone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" /> + <el-input + v-model="form.reporterphone" + placeholder="璇疯緭鍏ヨ仈绯荤數璇�" + /> </el-form-item> </el-col> <el-col :span="8"> <el-form-item label="鎶ュ憡鏃堕棿" align="left" prop="reporttime"> - <el-date-picker clearable size="small" style="width: 190px" v-model="form.reporttime" type="datetime" - value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨鎶ュ憡鏃堕棿"> + <el-date-picker + clearable + size="small" + style="width: 190px" + v-model="form.reporttime" + type="datetime" + value-format="yyyy-MM-dd HH:mm:ss" + placeholder="閫夋嫨鎶ュ憡鏃堕棿" + > </el-date-picker> </el-form-item> </el-col> @@ -520,8 +863,15 @@ </div> --> </el-form> <div slot="footer" class="dialog-footer"> - <el-button v-show="showSaveBtn" type="primary" @click="submitForm">淇濆瓨骞跺墠寰�妗堜緥宸ヤ綔鍙�</el-button> - <el-button v-show="showTerminationBtn" type="primary" @click="submitForm">缁堟妗堜緥</el-button> + <el-button v-show="showSaveBtn" type="primary" @click="submitForm" + >淇濆瓨骞跺墠寰�妗堜緥宸ヤ綔鍙�</el-button + > + <el-button + v-show="showTerminationBtn" + type="primary" + @click="submitForm" + >缁堟妗堜緥</el-button + > <el-button @click="cancel">鍙� 娑�</el-button> <!-- <el-button @click="handleapproval">鎻愪氦瀹℃牳</el-button> --> </div> @@ -773,7 +1123,7 @@ ] }; }, - created() { }, + created() {}, mounted(e) { // let idd = this.$route.query.userid @@ -854,7 +1204,7 @@ resetArr(Arr) { var hash = {}; - Arr = Arr.reduce(function (arr, current) { + Arr = Arr.reduce(function(arr, current) { hash[current.reporterno] ? "" : (hash[current.reporterno] = true && arr.push(current)); @@ -988,8 +1338,8 @@ d.getFullYear() - birthdays.getFullYear() - (d.getMonth() < birthdays.getMonth() || - (d.getMonth() == birthdays.getMonth() && - d.getDate() < birthdays.getDate()) + (d.getMonth() == birthdays.getMonth() && + d.getDate() < birthdays.getDate()) ? 1 : 0); // 璧嬪�肩粰琛ㄦ牸 @@ -998,7 +1348,7 @@ this.form.age = age; } else { } - } catch { } + } catch {} }, // sheng: '娴欐睙鐪�', // shi: '', @@ -1223,7 +1573,7 @@ this.showSaveBtn = true; //this.$refs.annex.getAnnexList(); this.open = true; - this.$nextTick(function () { + this.$nextTick(function() { this.$refs.annex.getAnnexList(); }); @@ -1294,7 +1644,7 @@ this.open = true; this.title = "浜轰綋鍣ㄥ畼娼滃湪鎹愮尞鑰呯櫥璁拌〃"; this.form.recordstate = 99; - this.$nextTick(function () { + this.$nextTick(function() { this.$refs.annex.getAnnexList(); }); }); @@ -1390,14 +1740,14 @@ const ids = row.id || this.ids; this.$modal .confirm('鏄惁纭鍒犻櫎鎹愮尞鍩虹缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�') - .then(function () { + .then(function() { return delDonatebaseinfo(ids); }) .then(() => { this.getList(); this.$modal.msgSuccess("鍒犻櫎鎴愬姛"); }) - .catch(() => { }); + .catch(() => {}); }, /** 瀵煎嚭鎸夐挳鎿嶄綔 */ @@ -1413,7 +1763,7 @@ this.$download.name(response.msg); this.exportLoading = false; }) - .catch(() => { }); + .catch(() => {}); }, // 瀵硅薄杞垚鎸囧畾瀛楃涓插垎闅� @@ -1463,7 +1813,7 @@ console.log(url); const link = document.createElement("a"); link.href = url; - const name=fileUrl["downloadName"] + const name = fileUrl["downloadName"]; link.setAttribute("download", name); // 鏇挎崲file.pdf涓哄疄闄呯殑鏂囦欢鍚� document.body.appendChild(link); link.click(); diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue index bca7b46..0352f06 100644 --- a/src/views/project/donationdetails/index.vue +++ b/src/views/project/donationdetails/index.vue @@ -1918,7 +1918,6 @@ }); } else { this.form.workflow = 0; - this.form.recordstate = 0; addDonatebaseinfo(this.form).then(response => { if (response.code == 200) { this.$modal.msgSuccess("鏂板鎴愬姛"); diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue index 8b17f43..46b670c 100644 --- a/src/views/project/fund/applyDetail/index.vue +++ b/src/views/project/fund/applyDetail/index.vue @@ -2188,8 +2188,10 @@ flowconclusion: this.checkObj.flowlevelone, flowcontent: this.checkObj.flowconclusion }; + this.$modal.loading("姝e湪鎻愪氦瀹℃牳锛岃绋嶅�欙紒"); checkfund(checkFundObj).then(res => { //鍏抽棴绐楀彛 + this.$modal.closeLoading(); this.$modal.msgSuccess("瀹℃牳瀹屾垚!"); this.$store.dispatch("tagsView/delView", this.$route); this.$router.go(-1); diff --git a/src/views/project/fund/ethicalExpertFeeApply/index.vue b/src/views/project/fund/ethicalExpertFeeApply/index.vue index 176db36..e2fd234 100644 --- a/src/views/project/fund/ethicalExpertFeeApply/index.vue +++ b/src/views/project/fund/ethicalExpertFeeApply/index.vue @@ -1,31 +1,63 @@ <!-- --> <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-form-item label="鎹愮尞鑰�" prop="name"> - <el-input v-model="queryParams.donorname" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" clearable size="small" - @keyup.enter.native="handleQuery" /> + <el-input + v-model="queryParams.donorname" + placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" + clearable + size="small" + @keyup.enter.native="handleQuery" + /> </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> @@ -39,18 +71,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"> @@ -59,7 +105,10 @@ <el-row :gutter="4" align="right" class="mb8"> <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"> @@ -70,54 +119,147 @@ </el-row> <el-row :gutter="10" class="mb8"> <el-col :span="1.5"> - <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" - v-hasPermi="['project:ethicalfund:add']">鏂板鐢宠鍗�</el-button> + <el-button + type="primary" + plain + icon="el-icon-plus" + size="mini" + @click="handleAdd" + v-hasPermi="['project:ethicalfund:add']" + >鏂板鐢宠鍗�</el-button + > </el-col> </el-row> <el-row> - <el-table v-loading="loading" border :data="donateconsolationfundList"> - <el-table-column label="鐢宠鏃ユ湡" align="center" prop="applyTime" width="150px"> + <el-table + v-loading="loading" + border + :data="donateconsolationfundList" + :row-class-name="rowClassName" + > + <el-table-column + label="鐢宠鏃ユ湡" + align="center" + prop="applyTime" + width="150px" + > <template slot-scope="scope"> <span>{{ parseTime(scope.row.applyTime, "{y}-{m}-{d}") }}</span> </template> </el-table-column> - <el-table-column label="鐢宠浜�" align="center" prop="username" width="120px" /> - <el-table-column label="鐢宠閲戦" align="center" prop="pretaxcost" width="200px" /> - <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="recordstatus"> + <el-table-column + label="鐢宠浜�" + align="center" + prop="username" + width="120px" + /> + <el-table-column + label="鐢宠閲戦" + align="center" + prop="pretaxcost" + width="200px" + /> + <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="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="鐢宠鏉愭枡鐘舵��" 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="phone" width="150px" /> <el-table-column label="宸ヤ綔鍗曚綅" align="center" prop="unitname" width="220px" /> --> - <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:ethicalfund:edit']">淇敼</el-button> - <el-button size="mini" type="text" icon="el-icon-view" @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:ethicalfund:delete']">鍒犻櫎</el-button> - <el-button size="mini" type="text" icon="el-icon-download" @click="mixExport(scope.row.id)" - v-hasPermi="['project:ethicalfund: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:ethicalfund:edit']" + >淇敼</el-button + > + <el-button + size="mini" + type="text" + icon="el-icon-view" + @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:ethicalfund:delete']" + >鍒犻櫎</el-button + > + <el-button + size="mini" + type="text" + icon="el-icon-download" + @click="mixExport(scope.row.id)" + v-hasPermi="['project:ethicalfund:download']" + >涓嬭浇</el-button + > </template> </el-table-column> </el-table> @@ -128,72 +270,134 @@ </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="applyTime"> - <el-date-picker clearable style="width: 100%" v-model="form.applyTime" type="date" - value-format="yyyy-MM-dd HH:mm:ss" placeholder="鐢宠鏃ユ湡"> + <el-date-picker + clearable + style="width: 100%" + v-model="form.applyTime" + type="date" + value-format="yyyy-MM-dd HH:mm:ss" + placeholder="鐢宠鏃ユ湡" + > </el-date-picker> </el-form-item> </el-col> <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="2">浼︾悊瀹℃煡涓撳璐圭敵璇�</el-radio> - </el-form-item> </el-col><el-col :span="10"> + <el-radio v-model="form.applytype" label="2" + >浼︾悊瀹℃煡涓撳璐圭敵璇�</el-radio + > + </el-form-item> </el-col + ><el-col :span="10"> <el-form-item label="鐢宠璇存槑" prop="remark"> <el-input v-model="form.remark" placeholder="鐢宠璇存槑" /> </el-form-item> </el-col> <el-col :span="5"> <el-form-item label="鎹愮尞鑰�" prop="donorname"> - <el-input :disabled="true" v-model="form.donorname" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" clearable /> + <el-input + :disabled="true" + v-model="form.donorname" + placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" + clearable + /> </el-form-item> </el-col> </el-row> - <el-row style="text-align: left"><el-col :span="5"> + <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-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="pretaxcost"> - <el-input v-model="form.taxedcost" placeholder="绋庡悗閲戦鍚堣" :disabled="true" /> + <el-input + v-model="form.taxedcost" + placeholder="绋庡悗閲戦鍚堣" + :disabled="true" + /> </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> @@ -212,130 +416,294 @@ </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="fundDetailArr" 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="鏈嶅姟椤圭洰" @change="select(scope.row)" clearable filterable - allow-create :filter-method="val => SearchItem(val, scope)"> - <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="鏈嶅姟椤圭洰" + @change="select(scope.row)" + clearable + filterable + allow-create + :filter-method="val => SearchItem(val, scope)" + > + <el-option + v-for="dict in scope.row.itemArr" + :key="dict.index" + :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 + > <!-- <el-input v-model="scope.row.beneficiaryname" placeholder="濮撳悕" /> --> </template> </el-table-column> - <el-table-column prop="servicesscopename" align="center" label="璐圭敤璇存槑" width="180"> + <el-table-column + prop="servicesscopename" + align="center" + label="璐圭敤璇存槑" + width="180" + > <template slot-scope="scope"> - <el-select v-model="scope.row.servicesscopename" placeholder="璐圭敤璇存槑" clearable allow-create filterable - @change="selectremark(scope.row)"> - <el-option v-for="dict in fundblock" :key="dict.expensedescribe" :label="dict.expensedescribe" - :value="dict.expensedescribe"></el-option> + <el-select + v-model="scope.row.servicesscopename" + placeholder="璐圭敤璇存槑" + clearable + allow-create + filterable + @change="selectremark(scope.row)" + > + <el-option + v-for="dict in fundblock" + :key="dict.expensedescribe" + :label="dict.expensedescribe" + :value="dict.expensedescribe" + ></el-option> </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-input v-model="scope.row.amount" placeholder="绋庡墠閲戦" @blur="val => { - sumTotalFee(); - } - " /> + <el-input + v-model="scope.row.amount" + placeholder="绋庡墠閲戦" + @blur=" + val => { + sumTotalFee(); + } + " + /> </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="绋庡悗閲戦" @blur="val => { - sumTotalFee(); - } - " /> + <el-input + v-model="scope.row.taxedamount" + placeholder="绋庡悗閲戦" + @blur=" + val => { + sumTotalFee(); + } + " + /> </template> </el-table-column> - <el-table-column prop="unitno" align="center" label="鍗曚綅" width="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="quantity" align="center" label="鏁伴噺" width="120" v-if="form.applytype == '3'"> + <el-table-column + prop="quantity" + align="center" + label="鏁伴噺" + width="120" + v-if="form.applytype == '3'" + > <template slot-scope="scope"> - <el-input v-model="scope.row.quantity" placeholder="鏁伴噺" @blur="val => { - sumTotalFee(); - } - " /> + <el-input + v-model="scope.row.quantity" + placeholder="鏁伴噺" + @blur=" + val => { + sumTotalFee(); + } + " + /> </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(); - } - " /> + <el-input + v-model="scope.row.price" + placeholder="浠锋牸" + @blur=" + val => { + sumTotalFee(); + } + " + /> </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, fundDetailArr) - " 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, fundDetailArr) + " + type="text" + size="small" + > 鍒犻櫎 </el-button> </template> @@ -385,55 +753,139 @@ <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-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> </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="(spec, index) in unitList" :key="index" :label="spec.organizationname" - :value="spec.organizationid"></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="(spec, index) in unitList" + :key="index" + :label="spec.organizationname" + :value="spec.organizationid" + ></el-option> </el-select> </el-form-item> </el-col> @@ -441,7 +893,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> </div> @@ -724,8 +1178,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(async res => { @@ -768,8 +1222,8 @@ //闄勪欢澶勭悊 this.fileList = this.form.annexbankcard ? this.form.annexbankcard - .split(",") - .map(item => ({ url: item, name: item })) + .split(",") + .map(item => ({ url: item, name: item })) : []; listFundflow(listFundflowparams).then(res => { @@ -797,7 +1251,7 @@ const ids = row.id || this.ids; this.$modal .confirm("鏄惁纭鍒犻櫎璇ヨ褰曪紵") - .then(function () { + .then(function() { return delFund(ids); }) .then(() => { @@ -811,7 +1265,7 @@ this.getfundList(); this.$modal.msgSuccess("鍒犻櫎鎴愬姛"); }) - .catch(() => { }); + .catch(() => {}); }, /** 涓婃姤鎸夐挳鎿嶄綔 */ handleup(row) { @@ -825,7 +1279,18 @@ //鍒ゆ柇鏄惁瀛樺湪涓婃姤璁板綍 row.recordstatus = "0"; var currenttime = new Date(); - row.applyTime = currenttime.getFullYear() + "-" + (currenttime.getMonth()+1) + "-" + currenttime.getDate() + " " + currenttime.getHours() + ":" + currenttime.getMinutes() + ":" + currenttime.getSeconds(); + row.applyTime = + currenttime.getFullYear() + + "-" + + (currenttime.getMonth() + 1) + + "-" + + currenttime.getDate() + + " " + + currenttime.getHours() + + ":" + + currenttime.getMinutes() + + ":" + + currenttime.getSeconds(); updateFund(row).then(response => { if (response.code == 200) { @@ -863,7 +1328,7 @@ this.$download.name(response.msg); this.exportLoading = false; }) - .catch(() => { }); + .catch(() => {}); }, /** 鎻愪氦鎸夐挳 */ @@ -943,9 +1408,9 @@ 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 => {}); } } }); @@ -1374,7 +1839,7 @@ console.log(url); const link = document.createElement("a"); link.href = url; - const name=fileUrl["downloadName"] + const name = fileUrl["downloadName"]; link.setAttribute("download", name); // 鏇挎崲file.pdf涓哄疄闄呯殑鏂囦欢鍚� document.body.appendChild(link); link.click(); @@ -1509,7 +1974,7 @@ }, //鏂囦欢涓婁紶 - handleUploadError() { }, + handleUploadError() {}, remove(file) { this.fileList.splice(this.fileList.indexOf(file), 1); }, @@ -1587,6 +2052,12 @@ } this.fundDetailArr[tempIndex] = singleDetail; this.detailInfoDialogShow = false; + }, + rowClassName({ row, column, rowIndex, columnIndex }) { + if (row.recordstatus == -1 && row.backflowlevel != 0) { + return "error-row"; + } + return ""; } }, @@ -1604,15 +2075,18 @@ this.getUsermsg(); this.getlistExternalperson(); }, - beforeCreate() { }, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠 - beforeMount() { }, //鐢熷懡鍛ㄦ湡 - 鎸傝浇涔嬪墠 - beforeUpdate() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪墠 - updated() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗 - beforeDestroy() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓� - destroyed() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴� - activated() { } //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂 + beforeCreate() {}, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠 + beforeMount() {}, //鐢熷懡鍛ㄦ湡 - 鎸傝浇涔嬪墠 + beforeUpdate() {}, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪墠 + updated() {}, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗 + beforeDestroy() {}, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓� + destroyed() {}, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴� + activated() {} //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂 }; </script> -<style scoped> +<style lang="scss" scoped> /* @import url(); 寮曞叆鍏叡css绫� */ +::v-deep.el-table .error-row { + background: #fcebeb; +} </style> diff --git a/src/views/project/fund/expertFeeApply/index.vue b/src/views/project/fund/expertFeeApply/index.vue index 6e3084b..749303c 100644 --- a/src/views/project/fund/expertFeeApply/index.vue +++ b/src/views/project/fund/expertFeeApply/index.vue @@ -133,6 +133,7 @@ v-loading="loading" border :data="donateconsolationfundList" + :row-class-name="rowClassName" > <el-table-column label="鐢宠鏃ユ湡" @@ -2570,10 +2571,19 @@ } else { console.log(response.msg); } + }, + rowClassName({ row, column, rowIndex, columnIndex }) { + if (row.recordstatus == -1 && row.backflowlevel != 0) { + return "error-row"; + } + return ""; } } }; </script> -<style scoped> +<style lang="scss" scoped> /* @import url(); 寮曞叆鍏叡css绫� */ +::v-deep.el-table .error-row { + background: #fcebeb; +} </style> diff --git a/src/views/project/fund/medicalCostApply/index.vue b/src/views/project/fund/medicalCostApply/index.vue index 944deeb..f137c5d 100644 --- a/src/views/project/fund/medicalCostApply/index.vue +++ b/src/views/project/fund/medicalCostApply/index.vue @@ -124,6 +124,7 @@ v-loading="loading" border :data="donateconsolationfundList" + :row-class-name="rowClassName" > <el-table-column label="鐢宠鏃ユ湡" @@ -689,8 +690,20 @@ .then(() => { //鏌ユ壘鏄惁瀛樺湪鐧昏瀹屾垚璁板綍 //鍒ゆ柇鏄惁瀛樺湪涓婃姤璁板綍 - row.recordstatus = 0;var currenttime = new Date(); - row.applyTime = currenttime.getFullYear() + "-" + (currenttime.getMonth()+1) + "-" + currenttime.getDate() + " " + currenttime.getHours() + ":" + currenttime.getMinutes() + ":" + currenttime.getSeconds(); + row.recordstatus = 0; + var currenttime = new Date(); + row.applyTime = + currenttime.getFullYear() + + "-" + + (currenttime.getMonth() + 1) + + "-" + + currenttime.getDate() + + " " + + currenttime.getHours() + + ":" + + currenttime.getMinutes() + + ":" + + currenttime.getSeconds(); updateFund(row).then(response => { if (response.code == 200) { this.$message({ @@ -1297,7 +1310,7 @@ console.log(url); const link = document.createElement("a"); link.href = url; - const name=fileUrl["downloadName"] + const name = fileUrl["downloadName"]; link.setAttribute("download", name); // 鏇挎崲file.pdf涓哄疄闄呯殑鏂囦欢鍚� document.body.appendChild(link); link.click(); @@ -1423,10 +1436,19 @@ this.$modal.msgWarning("褰撳墠鏂囦欢鏆備笉鏀寔棰勮"); this.previewpdf = false; } + }, + rowClassName({ row, column, rowIndex, columnIndex }) { + if (row.recordstatus == -1 && row.backflowlevel != 0) { + return "error-row"; + } + return ""; } } }; </script> -<style scoped> +<style lang="scss" scoped> /* @import url(); 寮曞叆鍏叡css绫� */ +::v-deep.el-table .error-row { + background: #fcebeb; +} </style> diff --git a/src/views/project/fund/officeExpenseApply/index.vue b/src/views/project/fund/officeExpenseApply/index.vue index 6395376..18c2188 100644 --- a/src/views/project/fund/officeExpenseApply/index.vue +++ b/src/views/project/fund/officeExpenseApply/index.vue @@ -87,7 +87,9 @@ <!-- v-hasPermi="['project:medicalfund:export']" --> <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> --> </el-row> - <el-table v-loading="loading" border :data="donateconsolationfundList"> + <el-table v-loading="loading" border :data="donateconsolationfundList" + :row-class-name="rowClassName" + > <el-table-column label="鐢宠鏃ユ湡" align="center" @@ -1925,6 +1927,12 @@ a.download = item.name; a.href = url; a.dispatchEvent(event); + }, + rowClassName({ row, column, rowIndex, columnIndex }) { + //姝ゅ垽鏂负鏈�鍚庝笁琛� + if (row.recordstatus == -1 && row.backflowlevel != 0) { + return "error-row"; + } } }, @@ -1967,4 +1975,7 @@ </script> <style scoped> /* @import url(); 寮曞叆鍏叡css绫� */ +::v-deep.el-table .error-row { + background: #FCEBEB; +} </style> diff --git a/src/views/project/fund/performanceApply/index.vue b/src/views/project/fund/performanceApply/index.vue index dd9ac12..fa5963d 100644 --- a/src/views/project/fund/performanceApply/index.vue +++ b/src/views/project/fund/performanceApply/index.vue @@ -1,95 +1,236 @@ <!-- --> <template> <div class="app-container"> - <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="70px"> - <el-row align="left"> + <el-form + :model="queryParams" + ref="queryForm" + :inline="true" + label-width="70px" + > + <el-row align="left"> <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="money" style="float: left"> - <el-input v-model="queryParams.money" placeholder="璇疯緭鍏ョ敵璇蜂汉閲戦" clearable size="small" - @keyup.enter.native="handleQuery" /> + <el-input + v-model="queryParams.money" + placeholder="璇疯緭鍏ョ敵璇蜂汉閲戦" + clearable + size="small" + @keyup.enter.native="handleQuery" + /> </el-form-item> </el-col> <el-col :span="5"> <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-row> - <el-row> + <el-row> <el-col :span="7"> <el-form-item label="鐢宠鏃ユ湡" prop="applyTime"> - <el-date-picker format="yyyy-MM-dd" value-format="yyyy-MM-dd" v-model="value1" type="daterange" @blur="onpick" - range-separator="鑷�" start-placeholder="鎶ラ攢鐢宠寮�濮嬫棩鏈�" end-placeholder="鎶ラ攢鐢宠缁撴潫鏃ユ湡" - @keyup.enter.native="handleQuery"> + <el-date-picker + format="yyyy-MM-dd" + value-format="yyyy-MM-dd" + v-model="value1" + type="daterange" + @blur="onpick" + range-separator="鑷�" + start-placeholder="鎶ラ攢鐢宠寮�濮嬫棩鏈�" + end-placeholder="鎶ラ攢鐢宠缁撴潫鏃ユ湡" + @keyup.enter.native="handleQuery" + > </el-date-picker> </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> <el-row :gutter="10" class="mb8"> <el-col :span="1.5"> - <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">鏂板</el-button> + <el-button + type="primary" + plain + icon="el-icon-plus" + size="mini" + @click="handleAdd" + >鏂板</el-button + > <!-- v-hasPermi="['project:medicalfund:add']" --> </el-col> <el-col :span="1.5"> - <el-button type="warning" plain icon="el-icon-download" size="mini" :loading="exportLoading" - @click="handleExport">瀵煎嚭</el-button> + <el-button + type="warning" + plain + icon="el-icon-download" + size="mini" + :loading="exportLoading" + @click="handleExport" + >瀵煎嚭</el-button + > </el-col> <!-- v-hasPermi="['project:medicalfund:export']" --> <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> --> </el-row> - <el-table v-loading="loading" border :data="donateconsolationfundList"> - <el-table-column label="鐢宠鏃ユ湡" align="center" prop="applyTime" width="180px"> + <el-table + v-loading="loading" + border + :data="donateconsolationfundList" + :row-class-name="rowClassName" + > + <el-table-column + label="鐢宠鏃ユ湡" + align="center" + prop="applyTime" + width="180px" + > <template slot-scope="scope"> <span>{{ parseTime(scope.row.applyTime, "{y}-{m}-{d}") }}</span> </template> </el-table-column> - <el-table-column label="鐢宠浜�" align="center" prop="username" width="150px" /> - <el-table-column label="鐢宠閲戦" align="center" prop="pretaxcost" width="150px" /> + <el-table-column + label="鐢宠浜�" + align="center" + prop="username" + width="150px" + /> + <el-table-column + label="鐢宠閲戦" + align="center" + prop="pretaxcost" + width="150px" + /> - <el-table-column label="瀹℃牳鐘舵��" width="150" align="center" prop="recordstatus"> + <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="鐢宠鏉愭枡鐘舵��" 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="缁╂晥绫诲瀷" width="150" align="center" prop="performancetype"> + <el-table-column + label="缁╂晥绫诲瀷" + width="150" + align="center" + prop="performancetype" + > <template slot-scope="scope"> - <dict-tag :options="dict.type.sys_performance_type" :value="scope.row.performancetype" /> + <dict-tag + :options="dict.type.sys_performance_type" + :value="scope.row.performancetype" + /> </template> </el-table-column> <el-table-column label="澶囨敞" align="center" prop="remark" /> - <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 + 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-view" @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 size="mini" type="text" icon="el-icon-edit" @click="duplicationfn(scope.row)">澶嶅埗</el-button> + <el-button + size="mini" + type="text" + icon="el-icon-view" + @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 + size="mini" + type="text" + icon="el-icon-edit" + @click="duplicationfn(scope.row)" + >澶嶅埗</el-button + > </template> </el-table-column> </el-table> @@ -265,8 +406,20 @@ .then(() => { //鏌ユ壘鏄惁瀛樺湪鐧昏瀹屾垚璁板綍 //鍒ゆ柇鏄惁瀛樺湪涓婃姤璁板綍 - row.recordstatus = 0; var currenttime = new Date(); - row.applyTime = currenttime.getFullYear() + "-" + (currenttime.getMonth() + 1) + "-" + currenttime.getDate() + " " + currenttime.getHours() + ":" + currenttime.getMinutes() + ":" + currenttime.getSeconds(); + row.recordstatus = 0; + var currenttime = new Date(); + row.applyTime = + currenttime.getFullYear() + + "-" + + (currenttime.getMonth() + 1) + + "-" + + currenttime.getDate() + + " " + + currenttime.getHours() + + ":" + + currenttime.getMinutes() + + ":" + + currenttime.getSeconds(); updateFund(row).then(response => { if (response.code == 200) { this.$message({ @@ -347,14 +500,14 @@ this.$download.name(response.msg); this.exportLoading = false; }) - .catch(() => { }); + .catch(() => {}); }, handleDelete(row) { const ids = row.id || this.ids; this.$modal .confirm("鏄惁纭鍒犻櫎璇ヨ褰曪紵") - .then(function () { + .then(function() { return delFund(ids); }) .then(() => { @@ -367,7 +520,7 @@ this.getList(); this.$modal.msgSuccess("鍒犻櫎鎴愬姛"); }) - .catch(() => { }); + .catch(() => {}); }, /** 鏌ヨ鍒楄〃 */ @@ -407,7 +560,7 @@ console.log(url); const link = document.createElement("a"); link.href = url; - const name=fileUrl["downloadName"] + const name = fileUrl["downloadName"]; link.setAttribute("download", name); // 鏇挎崲file.pdf涓哄疄闄呯殑鏂囦欢鍚� document.body.appendChild(link); link.click(); @@ -442,6 +595,12 @@ mixExport(id) { this.dayin2(id); //this.totaldayin(id); + }, + rowClassName({ row, column, rowIndex, columnIndex }) { + if (row.recordstatus == -1 && row.backflowlevel != 0) { + return "error-row"; + } + return ""; } }, //鐢熷懡鍛ㄦ湡 - 鍒涘缓瀹屾垚锛堝彲浠ヨ闂綋鍓峵his瀹炰緥锛� @@ -450,17 +609,20 @@ }, //鐢熷懡鍛ㄦ湡 - 鎸傝浇瀹屾垚锛堝彲浠ヨ闂瓺OM鍏冪礌锛� - mounted() { }, + mounted() {}, - beforeCreate() { }, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠 - beforeMount() { }, //鐢熷懡鍛ㄦ湡 - 鎸傝浇涔嬪墠 - beforeUpdate() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪墠 - updated() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗 - beforeDestroy() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓� - destroyed() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴� - activated() { } //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂 + beforeCreate() {}, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠 + beforeMount() {}, //鐢熷懡鍛ㄦ湡 - 鎸傝浇涔嬪墠 + beforeUpdate() {}, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪墠 + updated() {}, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗 + beforeDestroy() {}, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓� + destroyed() {}, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴� + activated() {} //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂 }; </script> -<style scoped> +<style lang="scss" scoped> /* @import url(); 寮曞叆鍏叡css绫� */ +::v-deep.el-table .error-row { + background: #fcebeb; +} </style> diff --git a/src/views/project/fund/performancedetails/index.vue b/src/views/project/fund/performancedetails/index.vue index bd41f99..c154f59 100644 --- a/src/views/project/fund/performancedetails/index.vue +++ b/src/views/project/fund/performancedetails/index.vue @@ -1719,9 +1719,11 @@ flowconclusion: this.checkObj.flowlevelone, flowcontent: this.checkObj.flowconclusion }; + this.$modal.loading("姝e湪鎻愪氦瀹℃牳锛岃绋嶅�欙紒"); checkfund(checkFundObj).then(res => { //鍏抽棴绐楀彛 this.reset(); + this.$modal.closeLoading(); this.$modal.msgSuccess("瀹℃牳瀹屾垚!"); this.$store.dispatch("tagsView/delView", this.$route); this.$router.go(-1); diff --git a/src/views/project/medicalevaluation/index.vue b/src/views/project/medicalevaluation/index.vue index c9f1365..d851c61 100644 --- a/src/views/project/medicalevaluation/index.vue +++ b/src/views/project/medicalevaluation/index.vue @@ -200,10 +200,13 @@ width="120" > <template slot-scope="scope"> - <dict-tag + <div v-if="!scope.row.terminationCase"> + <dict-tag :options="dict.type.sys_DonationStatus" :value="scope.row.recordstate" - /> + /> + </div> + <div v-else>浠诲姟涓</div> </template> </el-table-column> diff --git a/src/views/project/relativesconfirmation/index.vue b/src/views/project/relativesconfirmation/index.vue index bed18d3..38e5b68 100644 --- a/src/views/project/relativesconfirmation/index.vue +++ b/src/views/project/relativesconfirmation/index.vue @@ -157,10 +157,14 @@ prop="recordstate" > <template slot-scope="scope"> - <dict-tag + + <div v-if="!scope.row.terminationCase"> + <dict-tag :options="dict.type.sys_DonationStatus" :value="scope.row.recordstate" - /> + /> + </div> + <div v-else>浠诲姟涓</div> </template> </el-table-column> diff --git a/src/views/project/travelexpenseapply/index.vue b/src/views/project/travelexpenseapply/index.vue index 5ea02c2..569e708 100644 --- a/src/views/project/travelexpenseapply/index.vue +++ b/src/views/project/travelexpenseapply/index.vue @@ -1754,7 +1754,7 @@ console.log(url); const link = document.createElement("a"); link.href = url; - const name=fileUrl["downloadName"] + const name = fileUrl["downloadName"]; link.setAttribute("download", name); // 鏇挎崲file.pdf涓哄疄闄呯殑鏂囦欢鍚� document.body.appendChild(link); link.click(); @@ -2579,19 +2579,24 @@ //鏄庢樉鎻愮ず瀹℃壒閫�鍥炶褰� rowClassName({ row, column, rowIndex, columnIndex }) { //姝ゅ垽鏂负鏈�鍚庝笁琛� - if (row.backflowlevel == 199) { - return "addClassva"; + if (row.recordstatus == -1 && row.backflowlevel != 0) { + console.log("涓婅壊"); + return "error-row"; } + return ""; } } }; </script> <!-- <style scoped> --> <!-- 涓嶅彲鍔爏coped,浼氱嫭绔嬫牱寮廵lement璁块棶涓嶅埌 --> -<style> +<style lang="scss" scoped> .addClassva { /* background: #10aec2; */ background: #e8f4ff !important; /* color:whitesmoke; */ } +::v-deep.el-table .error-row { + background: #FCEBEB; +} </style> diff --git a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue index be304e3..d5631d1 100644 --- a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue +++ b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue @@ -2431,7 +2431,10 @@ this.Savenow(); console.log("淇濆瓨"); } + this.$modal.loading("姝e湪鎻愪氦瀹℃牳锛岃绋嶅�欙紒"); + checkfund(checkfundobj).then(res => { + this.$modal.closeLoading(); this.$modal.msgSuccess("鎻愪氦瀹℃牳鎴愬姛!"); // 鍏抽棴绐楀彛 this.$store.dispatch("tagsView/delView", this.$route); -- Gitblit v1.9.3