From 6196fc48d9a22add90e600e2d3a9ed8bacad3dd7 Mon Sep 17 00:00:00 2001 From: WXL <1785969728@qq.com> Date: 星期三, 25 十月 2023 14:20:00 +0800 Subject: [PATCH] 11 --- src/views/project/travelexpensecheck/index.vue | 27 + src/views/project/donationdetails/index.vue | 956 +++++++++++++++++++++++++++++++++--------- src/views/project/fund/applyDetail/index.vue | 188 ++------ src/views/project/fund/expertFeeApply/index.vue | 4 src/views/project/fundcheck/medicalCostCheck/index.vue | 12 src/views/project/fund/medicalCostApply/index.vue | 108 ++-- src/views/project/travelexpenseapply/travelexpensedetail/index.vue | 13 7 files changed, 870 insertions(+), 438 deletions(-) diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue index 1f5e948..90b3b72 100644 --- a/src/views/project/donationdetails/index.vue +++ b/src/views/project/donationdetails/index.vue @@ -296,6 +296,11 @@ ></el-step> </el-steps> </div> + <div class="Ticket-button"> + <el-button @click.native.prevent="Filepopup" type="success" + >鍑瘉鏂囦欢</el-button + > + </div> <!-- 娼滃湪鎹愮尞 --> <div class="boxdiv" style="margin: 30px 0 66px 0;" v-show="actives == 0"> <el-form @@ -627,10 +632,16 @@ @click="Terminationcase" >缁堟妗堜緥</el-button > - <el-button v-show="Reportforreview" type="primary" @click="ReviewFn" + <el-button + v-show="Reportforreview" + type="primary" + @click="Reportforreview" >涓婃姤瀹℃牳</el-button > - <el-button v-show="makeastepforward" type="primary" @click="ReviewFn" + <el-button + v-show="makeastepforward" + type="primary" + @click="makeastepforward" >涓嬩竴姝�</el-button > <el-button @click="cancel">鍙� 娑�</el-button> @@ -850,7 +861,10 @@ @click="Terminationcase" >缁堟妗堜緥</el-button > - <el-button v-show="makeastepforward" type="primary" @click="ReviewFn" + <el-button + v-show="makeastepforward" + type="primary" + @click="makeastepforward" >涓嬩竴姝�</el-button > <el-button @click="cancel">鍙� 娑�</el-button> @@ -866,24 +880,6 @@ label-position="right" > <el-row> - <el-col :span="12"> - <el-form-item - label="浜插睘鍏崇郴" - prop="kinship" - class="relation" - align="left" - > - <el-checkbox-group v-model="affirmform.kinship"> - <el-checkbox - v-for="dict in dict.type.sys_Kinship" - :key="dict.value" - :label="dict.value" - > - {{ dict.label }} - </el-checkbox> - </el-checkbox-group> - </el-form-item> - </el-col> <el-col :span="6"> <el-form-item label="瀛愬コ鏁伴噺" prop="kinshipChildrennum"> <el-input @@ -1063,7 +1059,10 @@ @click="Terminationcase" >缁堟妗堜緥</el-button > - <el-button v-show="makeastepforward" type="primary" @click="ReviewFn" + <el-button + v-show="makeastepforward" + type="primary" + @click="makeastepforward" >涓嬩竴姝�</el-button > <el-button @click="cancel">鍙� 娑�</el-button> @@ -1126,7 +1125,10 @@ @click="Terminationcase" >缁堟妗堜緥</el-button > - <el-button v-show="makeastepforward" type="primary" @click="ReviewFn" + <el-button + v-show="makeastepforward" + type="primary" + @click="makeastepforward" >涓嬩竴姝�</el-button > <el-button @click="cancel">鍙� 娑�</el-button> @@ -1138,115 +1140,146 @@ ref="allocationform" :model="allocationform" :rules="allocationrules" - label-width="100px" label-position="right" > - <el-row> - <el-col :span="8"> - <el-form-item label="鍒嗛厤鐘舵��" prop="organstate"> - <el-select - v-model="allocationform.organstate" - placeholder="璇烽�夋嫨鍣ㄥ畼鐘舵��" - > - <el-option - v-for="dict in dict.type.sys_organstate" - :key="dict.value" - :label="dict.label" - :value="dict.value" - ></el-option> - </el-select> - </el-form-item> - </el-col> - </el-row> - <el-row> - <el-col :span="8"> - <el-form-item label="鎹愮尞濮撳悕" prop="curdonorname"> - <el-input - v-model="curdonorname" - placeholder="鎹愮尞鑰呭鍚�" - disabled - /> - </el-form-item> - </el-col> - <el-col :span="8"> - <el-form-item label="鍣ㄥ畼鍚嶇О" prop="organnumber"> - <el-select - ref="organNameSelect" - v-model="allocationform.organnumber" - placeholder="璇烽�夋嫨鍣ㄥ畼缂栧彿" - clearable - size="small" - disabled - > - <el-option - v-for="dict in dict.type.sys_Organ" - :key="dict.value" - :label="dict.label" - :value="dict.value" + <el-form-item label-width="100px" label="閫夋嫨鍣ㄥ畼"> + <el-checkbox-group v-model="organalForm.organname"> + <el-checkbox + v-for="dict in dict.type.sys_Organ" + :key="dict.value" + :label="dict.value" + @change="changeorganState(dict.value)" + > + {{ dict.label }} + </el-checkbox> + </el-checkbox-group> + </el-form-item> + <el-form-item> + <el-table v-loading="loading" border :data="allocationform"> + <el-table-column + label="鍣ㄥ畼鍚嶇О" + align="center" + width="70" + prop="organname" + /> + <el-table-column + label="鍣ㄥ畼缂栧彿" + align="center" + width="70" + prop="organno" + /> + <el-table-column + label="鍒嗛厤鐘舵��" + align="center" + width="120" + prop="organstate" + > + <template slot-scope="scope"> + <el-select + v-model="scope.row.organstate" + placeholder="璇烽�夋嫨鍣ㄥ畼鐘舵��" + > + <el-option + v-for="dict in dict.type.sys_organstate" + :key="dict.value" + :label="dict.label" + :value="dict.value" + ></el-option> + </el-select> + </template> + </el-table-column> + <el-table-column + label="绉绘鍖婚櫌" + align="center" + width="230" + prop="transplanthospitalname" + > + <template slot-scope="scope"> + <org-selecter + ref="tranHosSelect" + :org-type="'4'" + v-model="scope.row.transplanthospitalno" + style="width: 100%" /> - </el-select> - </el-form-item> </el-col - ><el-col :span="8"> - <el-form-item label="绯荤粺缂栧彿" prop="ageunit"> - <el-input - v-model="allocationform.ageunit" - placeholder="璇疯緭鍏ョ郴缁熺紪鍙�" - /> - </el-form-item> - </el-col> - </el-row> - <el-row - ><el-col :span="8"> - <el-form-item label="鎺ユ敹鏃堕棿" prop="applicanttime"> - <el-date-picker - clearable - size="small" - style="width: 100%" - v-model="allocationform.applicanttime" - type="datetime" - value-format="yyyy-MM-dd HH:mm:ss" - placeholder="閫夋嫨鎺ユ敹鏃堕棿" - > - </el-date-picker> - </el-form-item> </el-col - ><el-col :span="16"> - <el-form-item label="绉绘鍖婚櫌" prop="treatmenthospitalno"> - <org-selecter - ref="tranHosSelect" - :org-type="'4'" - v-model="allocationform.transplanthospitalno" - style="width: 100%" - /> - </el-form-item> </el-col></el-row - ><el-row> - <el-col :span="8"> - <el-form-item label="鍙椾綋濮撳悕" prop="name"> - <el-input v-model="allocationform.name" placeholder="濮撳悕" /> - </el-form-item> - </el-col> - <el-col :span="8"> - <el-form-item label="璇佷欢绫诲瀷" prop="idcardtype"> - <el-select - v-model="allocationform.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="8"> - <el-form-item label="璇佷欢鍙风爜" prop="idcardno"> - <el-input - v-model="allocationform.idcardno" - placeholder="璇疯緭鍏ョЩ妞嶄汉璇佷欢鍙风爜" - /> - </el-form-item> - </el-col> - </el-row> + </template> + </el-table-column> + <el-table-column + label="绯荤粺缂栧彿" + align="center" + width="120" + prop="ageunit" + > + <template slot-scope="scope"> + <el-input + v-model="scope.row.ageunit" + placeholder="绯荤粺缂栧彿" + /> + </template> + </el-table-column> + <el-table-column + label="鎺ユ敹鏃堕棿" + align="center" + width="200" + prop="applicanttime" + > + <template slot-scope="scope"> + <el-date-picker + clearable + size="small" + style="width: 100%" + v-model="scope.row.applicanttime" + type="datetime" + value-format="yyyy-MM-dd HH:mm:ss" + placeholder="閫夋嫨鎺ユ敹鏃堕棿" + > + </el-date-picker> + </template> + </el-table-column> + <el-table-column + label="鍙椾綋濮撳悕" + align="center" + width="120" + prop="name" + > + <template slot-scope="scope"> + <el-input v-model="scope.row.name" placeholder="鍙椾綋濮撳悕" /> + </template> + </el-table-column> + <el-table-column + label="璇佷欢绫诲瀷" + align="center" + width="150" + prop="idcardtype" + > + <template slot-scope="scope"> + <el-select + v-model="scope.row.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> + </template> + </el-table-column> + <el-table-column + label="璇佷欢鍙风爜" + align="center" + width="200" + prop="idcardno" + > + <template slot-scope="scope"> + <el-input + v-model="scope.row.idcardno" + placeholder="璇佷欢鍙风爜" + /> + </template> + </el-table-column> + </el-table> + </el-form-item> </el-form> <div class="dialog-footer"> <el-button v-show="showSaveBtn" type="primary" @click="Savethedetails" @@ -1258,7 +1291,10 @@ @click="Terminationcase" >缁堟妗堜緥</el-button > - <el-button v-show="makeastepforward" type="primary" @click="ReviewFn" + <el-button + v-show="makeastepforward" + type="primary" + @click="makeastepforward" >涓嬩竴姝�</el-button > <el-button @click="cancel">鍙� 娑�</el-button> @@ -1704,7 +1740,10 @@ @click="Terminationcase" >缁堟妗堜緥</el-button > - <el-button v-show="makeastepforward" type="primary" @click="ReviewFn" + <el-button + v-show="makeastepforward" + type="primary" + @click="makeastepforward" >涓嬩竴姝�</el-button > <el-button @click="cancel">鍙� 娑�</el-button> @@ -1934,13 +1973,132 @@ @click="Terminationcase" >缁堟妗堜緥</el-button > - <el-button v-show="Reportforreview" type="primary" @click="ReviewFn" + <el-button + v-show="Reportforreview" + type="primary" + @click="Reportforreview" >涓婃姤瀹℃牳</el-button > <el-button @click="cancel">鍙� 娑�</el-button> </div> </div> </div> + <el-dialog + v-dialogDrags + :modal="false" + :close-on-click-modal="false" + :title="pdftitle" + :visible.sync="pdfVisible" + width="60%" + > + <el-tabs + style="margin-top: 20px;" + v-model="activeName" + type="card" + @tab-click="handleClick" + > + <el-tab-pane label="娼滃湪鎹愮尞" :name="0"> </el-tab-pane> + <el-tab-pane label="鍖诲璇勪及" :name="1"> </el-tab-pane> + <el-tab-pane label="鎹愮尞纭" :name="2"> </el-tab-pane> + <el-tab-pane label="浼︾悊瀹℃煡" :name="3"> </el-tab-pane> + <el-tab-pane label="瀹屾垚鐧昏" :name="6"> </el-tab-pane> + </el-tabs> + <div class="pdfimg"> + <div class="box-pdf"> + <div> + <el-upload + size="mini" + class="upload-demo" + :action="uploadFileUrl" + :file-list="invoicefileList" + :show-file-list="false" + multiple + drag + :headers="headers" + :on-success=" + (response, file, fileList) => + uploadSccess(response, file, fileList) + " + :on-preview="downFile" + :disabled="operationType == 'detail'" + :on-error="handleUploadError" + :on-remove="remove" + accept="image/*,.pdf" + > + <i class="el-icon-upload"></i> + <div class="el-upload__text"> + 灏嗗彂绁ㄦ枃浠舵嫋鍒版澶勶紝鎴� + <em + ><el-button + :disabled="operationType == 'detail'" + size="small" + type="primary" + >鐐瑰嚮涓婁紶</el-button + ></em + > + </div> + </el-upload> + <el-table + :data="invoicefileListto" + @row-click="downFile" + style="width: 100%" + height="400" + > + <el-table-column + prop="name" + :show-overflow-tooltip="true" + label="鍚嶇О" + > + <template slot-scope="scope"> + <i style="color:#409EFF" class=" el-icon-s-order" />{{ + scope.row.name + }} + </template> + </el-table-column> + + <el-table-column + prop="name" + width="180" + :show-overflow-tooltip="true" + label="鍔熻兘" + > + <template slot-scope="scope"> + <el-button + type="primary" + size="mini" + @click.native.prevent.stop="deletedowfile(scope.row)" + >鍒犻櫎</el-button + > + <el-button + type="primary" + size="mini" + @click.native.prevent.stop="moveupdowfile(scope.row)" + >涓婄Щ</el-button + > + </template> + </el-table-column> + </el-table> + </div> + </div> + + <div + v-if="this.previewpdf && invoicepdfimgsrcList.length" + class="pdfimgmin" + > + <!-- <img :src="pdfimg" /> --> + <el-image + style="width: 95%; height: 90%" + :src="invoicepdfimg" + :preview-src-list="invoicepdfimgsrcList" + > + <!-- <div slot="error" class="image-slot"> + <i class="el-icon-picture-outline"></i> + </div> --> + </el-image> + </div> + <div v-else class="pdfimgmins">{{ hintitle }}</div> + </div> + </el-dialog> </div> </template> @@ -1971,10 +2129,18 @@ delDonateorgan, updateDonateorgan } from "@/api/project/donateorgan"; +import { + listRelativesconfirmation, + getRelativesconfirmation, + addRelativesconfirmation, + updateRelativesconfirmation +} from "@/api/project/relativesconfirmation"; import Li_area_select from "@/components/Address"; import OrgSelecter from "@/views/project/components/orgselect"; import AnnexUpload from "@/views/project/components/annexupload"; import ReportName from "@/views/project/components/organizationUser"; +import { getToken } from "@/utils/auth"; + export default { name: "donationdetails", components: { @@ -2005,23 +2171,32 @@ "sys_FamilyRelation", "sys_OrganDecision", "sys_CoreAssessConclusion", - "sys_BaseAssessConclusion" + "sys_BaseAssessConclusion", + "sys_EthicalReview" ], data() { return { - id: 736, + infoid: 734, form: {}, medicineform: {}, - affirmform: {}, + affirmform: { + organdecision: [] + }, ethicform: {}, allocationform: {}, witnessform: {}, accomplishform: {}, - tableData:[], + tableData: [], actives: 0, + loading: false, // 淇濆瓨銆佺粓姝㈡寜閽‘璁� showSaveBtn: true, showTerminationBtn: true, + //閫夋嫨鍣ㄥ畼琛ㄥ崟 + organalForm: { + //鍣ㄥ畼鍒楄〃 + organname: [] + }, //鐪佸競鍖洪粯璁ゅ�艰缃紝鍙负绌� searchAddress: { sheng: "", @@ -2030,6 +2205,11 @@ organizationname: null }, residenceAddresss: { + sheng: "娴欐睙鐪�", + shi: "", + qu: "" + }, + defultAddresss: { sheng: "娴欐睙鐪�", shi: "", qu: "" @@ -2111,17 +2291,41 @@ { required: true, message: "璇疯緭鍏ユ姤鍛婁汉鑱旂郴鐢佃瘽", trigger: "blur" } ] }, - medicinerules: {}, affirmrules: {}, ethicrules: {}, allocationrules: {}, witnessrules: {}, - accomplishrules: {} + accomplishrules: {}, + //闄勪欢鍒楄〃 + fileList: [], + fileListto: [], + invoicefileList: [], + invoicefileListto: [], + invoicepdfimg: "", + invoicepdfimgsrcList: [], + invoDatatop: [], + activeName: 1, //鏂囦欢绫诲瀷 + //涓婁紶闄勪欢璺緞 + uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", + //鏂囦欢涓婁紶token + headers: { + Authorization: "Bearer " + getToken() + }, + // 缃戠粶璇锋眰澶� + Networkheader: null, + //绁ㄦ嵁鏂囦欢 + pdftitle: "", + pdfimg: "", + pdfimgsrcList: [], + pdfVisible: false, + previewpdf: false, + hintitle: "璇蜂笂浼犳枃浠跺悗鏌ョ湅", + atpresent: "" }; }, - created() { + mounted() { // this.id = this.$route.query.id; this.Getbasicinformation(); }, @@ -2129,7 +2333,9 @@ methods: { // 鑾峰彇涓昏〃鏁版嵁 Getbasicinformation() { - getDonatebaseinfo(this.id).then(response => { + console.log(this.infoid); + console.log(this.hintitle); + getDonatebaseinfo(this.infoid).then(response => { this.form = response.data; response.data.sex = parseInt(response.data.sex); this.form.id = response.data.id; @@ -2153,11 +2359,11 @@ // 鑾峰彇浜岀骇琛ㄦ暟鎹� GetAttacheddata() { let searchParam = { - id: this.form.id + infoid: this.form.id }; - if (this.actives == 2) { + if (this.actives == 1) { listMedicalevaluation(searchParam).then(response => { - if (response.code == 200 && response.rows.length == 1) { + if (response.code == 200) { this.medicineform = response.rows[0]; } else { this.$modal.msgError( @@ -2165,25 +2371,16 @@ ); } }); - } else if (this.actives == 3) { + } else if (this.actives == 2) { listRelativesconfirmation(searchParam).then(response => { - if (response.code == 200 && response.rows.length == 1) { + if (response.code == 200) { this.affirmform = response.rows[0]; - this.affirmform.donorno = row.donorno; - this.affirmform.doname = row.name; - this.affirmform.dosex = row.sex; - // 鍑虹敓鏃ユ湡 - this.affirmform.dobirthday = row.birthday; - // 姘戞棌 - this.affirmform.donationality = row.nationality; - // 瀛﹀巻 - this.affirmform.doeducation = row.education; - // 鑱屼笟 - this.affirmform.dooccupation = row.occupation; - this.affirmform.donation = row.nation; - this.affirmform.doidcardtype = row.idcardtype; - this.affirmform.doidcardno = row.idcardno; - this.affirmform.donativeplace = row.nativeplace; + if (!this.affirmform) { + this.affirmform = {}; + this.affirmform.residenceprovincename = ""; + this.affirmform.residencecityname = ""; + this.affirmform.residencetownname = ""; + } this.defultAddresss.sheng = this.affirmform.residenceprovincename; this.defultAddresss.shi = this.affirmform.residencecityname; this.defultAddresss.qu = this.affirmform.residencetownname; @@ -2201,45 +2398,45 @@ ); } }); - } else if (this.actives == 4) { + } else if (this.actives == 3) { listDonateflowchart(searchParam).then(response => { if (response.code == 200 && response.rows.length == 1) { - this.form = response.rows[0]; - } else if (response.rows.length == 0) { - this.$modal.msgError("鏈壘鍒版湰妗堜緥鐨勪鸡鐞嗗鏌ヨ褰曪紝璇疯仈绯荤鐞嗗憳锛�"); + this.ethicform = response.rows[0]; } else { - this.$modal.msgError("鏁版嵁閲嶅"); + console.log("浼︾悊瀹℃煡鏁版嵁涓虹┖"); } }); - } else if (this.actives == 5) { - listOrganallocation(searchParam).then(response => { - if (response.code == 200 && response.rows.length == 1) { - this.form = response.rows[0]; - this.form.infoid = data.id; - this.open = true; + } else if (this.actives == 4) { + listDonateorgan(searchParam).then(response => { + if (response.code == 200) { + this.allocationform = response.rows; + this.allocationform.infoid = this.form.id; + this.organalForm.organname = []; + for (let i = 0; i < response.rows.length; i++) { + this.organalForm.organname.push(response.rows[i].organno); + } } else { this.$modal.msgError( "鑾峰彇鍣ㄥ畼鍒嗛厤淇℃伅澶辫触锛�" + JSON.stringify(response) ); } }); - } else if (this.actives == 6) { + } else if (this.actives == 5) { listMedicalevaluation(searchParam).then(response => { - if (response.code == 200 && response.rows.length == 1) { - this.form = response.rows[0]; - this.form.infoid = data.id; - this.open = true; + if (response.code == 200) { + this.witnessform = response.rows[0]; + this.witnessform.infoid = this.form.id; } else { this.$modal.msgError( "鑾峰彇鍖诲璇勪及璁板綍澶辫触锛�" + JSON.stringify(response) ); } }); - } else if (this.actives == 7) { + } else if (this.actives == 6) { listMedicalevaluation(searchParam).then(response => { - if (response.code == 200 && response.rows.length == 1) { - this.form = response.rows[0]; - this.form.infoid = data.id; + if (response.code == 200) { + this.accomplishform = response.rows[0]; + this.accomplishform.infoid = this.form.id; this.open = true; } else { this.$modal.msgError( @@ -2308,7 +2505,7 @@ if (this.form.id != null) { updateDonatebaseinfo(this.form).then(response => { - this.$modal.msgSuccess("淇敼鎴愬姛"); + this.$modal.msgSuccess("淇濆瓨鎴愬姛"); this.Getbasicinformation(); this.open = false; }); @@ -2326,54 +2523,53 @@ } }); }, - // 淇濆瓨鏄庣粏琛� + // 淇濆瓨浜岀骇琛ㄦ寜閽� Savethedetails() { - if (this.actives == 2) { + if (this.actives == 1) { + this.medicineform.infoid = this.form.id; this.$refs["medicineform"].validate(valid => { if (valid) { if (this.medicineform.id != null) { - updateMedicalevaluation(this.medicineform).then(response => { - this.$modal.msgSuccess("淇敼鎴愬姛"); - }); + updateMedicalevaluation(this.medicineform).then(response => {}); } else { addMedicalevaluation(this.medicineform).then(response => { - this.$modal.msgSuccess("鏂板鎴愬姛"); + this.$modal.msgSuccess("鍖诲璇勪及淇℃伅鏂板鎴愬姛"); + }); + } + this.submitForm(); + } + }); + } else if (this.actives == 2) { + this.affirmform.infoid = this.form.id; + + this.$refs["affirmform"].validate(valid => { + if (valid) { + if (this.affirmform.id != null) { + updateRelativesconfirmation(this.affirmform).then(response => {}); + } else { + addRelativesconfirmation(this.affirmform).then(response => { + this.$modal.msgSuccess("鎹愮尞纭淇℃伅鏂板鎴愬姛"); }); } this.submitForm(); } }); } else if (this.actives == 3) { - this.$refs["affirmform"].validate(valid => { + this.ethicform.infoid = this.form.id; + this.$refs["ethicform"].validate(valid => { if (valid) { - if (this.affirmform.id != null) { - updateMedicalevaluation(this.affirmform).then(response => { - this.$modal.msgSuccess("淇敼鎴愬姛"); - }); + if (this.ethicform.id != null) { + updateDonateflowchart(this.ethicform).then(response => {}); } else { - addMedicalevaluation(this.affirmform).then(response => { - this.$modal.msgSuccess("鏂板鎴愬姛"); + addDonateflowchart(this.ethicform).then(response => { + this.$modal.msgSuccess("浼︾悊瀹℃煡淇℃伅鏂板鎴愬姛"); }); } this.submitForm(); } }); } else if (this.actives == 4) { - this.$refs["ethicform"].validate(valid => { - if (valid) { - if (this.ethicform.id != null) { - updateDonateflowchart(this.ethicform).then(response => { - this.$modal.msgSuccess("淇敼鎴愬姛"); - }); - } else { - addDonateflowchart(this.ethicform).then(response => { - this.$modal.msgSuccess("鏂板鎴愬姛"); - }); - } - this.submitForm(); - } - }); - } else if (this.actives == 5) { + this.allocationform.infoid = this.form.id; this.$refs["allocationform"].validate(valid => { if (valid) { if (this.allocationform.id != null) { @@ -2388,7 +2584,8 @@ this.submitForm(); } }); - } else if (this.actives == 6) { + } else if (this.actives == 5) { + this.witnessform.infoid = this.form.id; this.$refs["witnessform"].validate(valid => { if (valid) { if (this.witnessform.id != null) { @@ -2426,7 +2623,6 @@ } }); // 鑾峰彇淇℃伅 - } else { addMedicalevaluation(this.witnessform).then(response => { this.$modal.msgSuccess("鏂板鎴愬姛"); @@ -2435,7 +2631,8 @@ this.submitForm(); } }); - } else if (this.actives == 7) { + } else if (this.actives == 6) { + this.accomplishform.infoid = this.form.id; this.$refs["accomplishform"].validate(valid => { if (valid) { if (this.accomplishform.id != null) { @@ -2455,19 +2652,295 @@ // 鍒囨崲tab on_click(e) { console.log(e); - if (e != "" || e != null) { - this.actives = e; + // if (e != "" || e != null) { + this.actives = e; + // } + this.GetAttacheddata(); + }, + changeorganState(value) { + let organIndex = this.allocationform.findIndex( + item => item.organno == value + ); + if (organIndex == -1) { + //鑾峰彇鍣ㄥ畼鍚嶇О + let temporganname = ""; + for (let i = 0; i < this.dict.type.sys_Organ.length; i++) { + if (value == this.dict.type.sys_Organ[i].value) { + temporganname = this.dict.type.sys_Organ[i].label; + break; + } + } + if (temporganname != "") { + this.allocationform.push({ + organname: temporganname, + organno: value, + id: null, + transplanthospitalname: null, + transplanthospitalno: null, + organstate: "2" + }); + } + } else { + this.$confirm("鏄惁纭鍒犻櫎鍣ㄥ畼鍒嗛厤璁板綍", "鎻愮ず", { + confirmButtonText: "纭畾", + cancelButtonText: "鍙栨秷", + type: "warning" + }) + .then(() => { + if (organIndex != -1) { + let tempOrgan = this.allocationform[organIndex]; + console.log(tempOrgan); + if (tempOrgan.organstate != 1 && tempOrgan.id > 0) { + this.$modal.msgWarning("鍙湁鏈垎閰嶅櫒瀹樺彲杩涜鍒犻櫎锛�"); + this.organalForm.organname.push(value); + return; + } + if (tempOrgan.id > 0) { + //鏌ユ壘鍣ㄥ畼琛ㄨ褰曪紝鍒ゆ柇鍣ㄥ畼鐘舵�� + this.loading = true; + delDonateorgan(tempOrgan.id).then(delLocationRes => { + this.loading = false; + this.$modal.msgSuccess("鍒犻櫎鎴愬姛"); + }); + } else { + this.allocationform.splice(deleteIndex, 1); + } + } + }) + .catch(() => {}); } }, - // 鍓嶈繘姝ラ - makeastepforward() {}, + makeastepforward() { + console.log(this.actives); + if (this.actives <= 6) { + this.actives++; + this.GetAttacheddata(); + } else { + console.log("宸插埌杈炬渶澶у��"); + } + }, // 涓婃姤瀹℃牳 Reportforreview() {}, // 缁堟妗堜緥 Terminationcase() {}, // 杩斿洖涓婁竴椤� - cancel() {} + cancel() {}, + // ------------------------绁ㄦ嵁 + // 鑾峰彇璇锋眰澶� + Getnetworkheader() { + let string = window.location.href; + if (string.includes("9091")) { + const index = string.indexOf("9091"); + this.Networkheader = string.slice(0, index + 4); // 鎴彇9091鍙婂叾鍓嶉儴瀛楃 + } else { + const index = string.indexOf("8032"); + this.Networkheader = string.slice(0, index + 4); // 鎴彇8032鍙婂叾鍓嶉儴瀛楃 + } + }, + //鏂囦欢涓婁紶 + handleUploadError() {}, + remove(file, fileList) { + const rbDetails = [...this.rbDetails]; + if (this.activeName == 1) { + this.fileListto.splice(this.fileListto.indexOf(file), 1); + rbDetails[this.atpresent].annexfilesList = this.fileListto; + } else { + this.invoicefileListto.splice(this.invoicefileListto.indexOf(file), 1); + rbDetails[this.atpresent].invoicefilesList = this.invoicefileListto; + } + }, + + uploadSccess(response, file, fileList) { + this.rbDetails; + //鑾峰彇绁ㄦ嵁淇℃伅浣嶇疆 + if (this.activeName == 1) { + if (response.code == 200) { + // this.form.filename = file.raw.name; + this.previewpdf = true; + this.$modal.msgSuccess(response.msg); + this.fileListto.push({ + name: file.name, + url: response.fileName + }); + this.pdfimgsrcList.push( + this.Networkheader + "/prod-api" + response.fileName + ); + console.log(this.pdfimgsrcList); + this.pdftitle = "鍏�" + this.pdfimgsrcList.length + "椤�"; + this.pdfimg = this.Networkheader + "/prod-api" + response.fileName; + this.rbDetails[this.atpresent].annexfilesList = this.fileListto; + } else { + console.log(response.msg); + } + } else { + if (response.code == 200) { + // this.form.filename = file.raw.name; + this.previewpdf = true; + this.$modal.msgSuccess(response.msg); + this.invoicefileListto.push({ + name: file.name, + url: response.fileName + }); + this.invoicepdfimgsrcList.push( + this.Networkheader + "/prod-api" + response.fileName + ); + console.log(this.invoicepdfimgsrcList); + this.pdftitle = "鍏�" + this.invoicepdfimgsrcList.length + "椤�"; + this.pdfimg = this.Networkheader + "/prod-api" + response.fileName; + this.rbDetails[ + this.atpresent + ].invoicefilesList = this.invoicefileListto; + console.log(this.rbDetails[this.atpresent]); + } else { + console.log(response.msg); + } + } + }, + + // 鐐瑰嚮绁ㄦ嵁 + Filepopup(index, rows, row) { + this.tableDatatop = []; + this.pdfimgsrcList = []; + this.invoDatatop = []; + this.invoicepdfimgsrcList = []; + this.invoDatatop.push(row); + this.tableDatatop.push(row); + this.atpresent = index; + this.pdfVisible = true; + console.log(this.rbDetails[index]); + if (this.rbDetails[index].annexfilesList) { + this.previewpdf = true; + this.fileListto = this.rbDetails[index].annexfilesList; + console.log(this.fileListto); + this.pdfimg = this.Networkheader + "/prod-api" + this.fileListto[0].url; + this.fileListto.forEach(item => { + this.pdfimgsrcList.push(this.Networkheader + "/prod-api" + item.url); + }); + } else { + this.fileListto = []; + this.pdfimg = ""; + this.pdftitle = ""; + } + // -鍙戠エ鏂囦欢 + if (this.rbDetails[index].invoicefilesList) { + this.previewpdf = true; + this.invoicefileListto = this.rbDetails[index].invoicefilesList; + console.log(this.invoicefileListto); + this.invoicepdfimg = + this.Networkheader + "/prod-api" + this.invoicefileListto[0].url; + this.invoicefileListto.forEach(item => { + this.invoicepdfimgsrcList.push( + this.Networkheader + "/prod-api" + item.url + ); + }); + console.log(this.invoicepdfimgsrcList); + console.log(this.invoicepdfimg); + } else { + this.invoicefileListto = []; + this.invoicepdfimg = ""; + this.pdftitle = ""; + } + + if (this.activeName == 1) { + this.pdftitle = "鍏�" + this.pdfimgsrcList.length + "椤�"; + } else { + this.pdftitle = "鍏�" + this.invoicepdfimgsrcList.length + "椤�"; + } + }, + + // 鐐瑰嚮宸蹭笂浼犳枃浠� + downFile(item) { + if (this.activeName == 1) { + console.log(item, "鐐瑰嚮鏂囦欢鎷縤tem"); + this.pdftitle = + "鍏�" + this.pdfimgsrcList.length + "椤癸紝褰撳墠閫変腑" + item.name; + let name = item.name.split("."); + if (name[1] == "pdf") { + this.$modal.msgWarning("褰撳墠鏂囦欢鏆備笉鏀寔棰勮"); + this.previewpdf = false; + this.hintitle = "褰撳墠鏂囦欢鏆備笉鏀寔棰勮"; + } else if (name[1] == "jpg" || "png") { + this.previewpdf = true; + if (item.url) { + this.pdfimg = this.Networkheader + "/prod-api" + item.url; + } else { + this.pdfimg = this.Networkheader + "/prod-api" + item.response.url; + } + } else { + this.hintitle = "褰撳墠鏂囦欢鏆備笉鏀寔棰勮"; + this.$modal.msgWarning("褰撳墠鏂囦欢鏆備笉鏀寔棰勮"); + this.previewpdf = false; + } + } else { + console.log(item, "鐐瑰嚮鏂囦欢鎷縤tem"); + this.pdftitle = + "鍏�" + this.invoicepdfimgsrcList.length + "椤癸紝褰撳墠閫変腑" + item.name; + let name = item.name.split("."); + if (name[1] == "pdf") { + this.$modal.msgWarning("褰撳墠鏂囦欢鏆備笉鏀寔棰勮"); + this.previewpdf = false; + this.hintitle = "褰撳墠鏂囦欢鏆備笉鏀寔棰勮"; + } else if (name[1] == "jpg" || "png") { + this.previewpdf = true; + if (item.url) { + this.invoicepdfimg = this.Networkheader + "/prod-api" + item.url; + console.log(this.invoicepdfimg, "pdfimg"); + console.log(this.invoicepdfimgsrcList, "imglist"); + } else { + this.invoicepdfimg = + this.Networkheader + "/prod-api" + item.response.url; + } + } else { + this.hintitle = "褰撳墠鏂囦欢鏆備笉鏀寔棰勮"; + this.$modal.msgWarning("褰撳墠鏂囦欢鏆備笉鏀寔棰勮"); + this.previewpdf = false; + } + } + }, + getIndexInArray(arr, obj) { + return arr.indexOf(obj); + }, + // 鍙戠エ鍒囨崲 + handleClick(tab, event) { + if (this.activeName == 1) { + this.pdftitle = "鍏�" + this.pdfimgsrcList.length + "椤�"; + } else { + this.pdftitle = "鍏�" + this.invoicepdfimgsrcList.length + "椤�"; + } + }, + // 鐐瑰嚮鍒犻櫎 + deletedowfile(row) { + if (this.activeName == 1) { + const indexlist = this.getIndexInArray( + this.pdfimgsrcList, + this.Networkheader + "/prod-api" + row.url + ); + this.pdfimgsrcList.splice(indexlist, 1); + const index = this.getIndexInArray(this.fileListto, row); + this.fileListto.splice(index, 1); + } else { + const indexlist = this.getIndexInArray( + this.invoicepdfimgsrcList, + this.Networkheader + "/prod-api" + row.url + ); + this.invoicepdfimgsrcList.splice(indexlist, 1); + const index = this.getIndexInArray(this.invoicefileListto, row); + this.invoicefileListto.splice(index, 1); + } + }, + // 鐐瑰嚮涓婄Щ + moveupdowfile(row) { + if (this.activeName == 1) { + const index = this.getIndexInArray(this.fileListto, row); + const item = this.fileListto.splice(index, 1)[0]; // 绉婚櫎鎸囧畾绱㈠紩澶勭殑鍏冪礌锛屽苟淇濆瓨鍒癷tem鍙橀噺涓� + this.fileListto.splice(index - 1, 0, item); // 灏唅tem鎻掑叆鍒扮储寮曚綅缃殑鍓嶄竴浣� + } else { + const index = this.getIndexInArray(this.invoicefileListto, row); + const item = this.invoicefileListto.splice(index, 1)[0]; // 绉婚櫎鎸囧畾绱㈠紩澶勭殑鍏冪礌锛屽苟淇濆瓨鍒癷tem鍙橀噺涓� + this.invoicefileListto.splice(index - 1, 0, item); // 灏唅tem鎻掑叆鍒扮储寮曚綅缃殑鍓嶄竴浣� + } + } } }; </script> @@ -2504,11 +2977,58 @@ } } } +.upload-demo { + text-align: center; +} +.pdfimg { + display: flex; // text-align: center; + width: 100%; + height: 600px; + + .box-pdf { + width: 400px; + padding-top: 20px; + margin-right: 30px; + border: 1px solid #dcdfe6; + -webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.12), + 0 0 6px 0 rgba(0, 0, 0, 0.04); + box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.1); // <- Add this to fix. + } + + .pdftit { + width: 200px; + padding: 20px; + font-size: 18px; + } + + .pdftit:hover { + background: #c0cef7; + } + + .pdfimgmin { + width: 60%; + + img { + width: 100%; + } + } + + .pdfimgmins { + font-size: 28px; + width: 60%; + text-align: center; + } +} +.Ticket-button { + margin-top: 10px; + text-align: right; + padding-right: 66px; +} .boxdiv { font-size: 18px; padding: 0 30px; padding-bottom: 10px; - margin-top: 20px; + margin-top: 10px; .top-text { text-align: center; diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue index 1f25e4a..c4f8e17 100644 --- a/src/views/project/fund/applyDetail/index.vue +++ b/src/views/project/fund/applyDetail/index.vue @@ -87,7 +87,7 @@ /> </el-form-item> </el-col> - <el-col :span="5"> + <el-col :span="5" v-if="ismanager == true"> <el-form-item label="鐢宠閲戦" prop="pretaxcost"> <el-input v-model="form.pretaxcost" @@ -498,6 +498,12 @@ align="center" width="330" label="澶囨敞" + v-if=" + businessType == 2 || + businessType == 3 || + businessType == 4 || + ismanager == true + " > <template slot-scope="scope"> <el-input @@ -2123,26 +2129,7 @@ return; } } - - // //鍒ゆ柇鍗曚綅 unitSel - // try { - // let unitIndex = this.unitList.findIndex( - // (item) => tempDetail.unitno == item.organizationid - // ); - // if (unitIndex > -1) { - // tempDetail.unitname = this.unitList[unitIndex].organizationname; - // } else { - // tempDetail.unitname = tempDetail.unitno; - // } - // } catch { - // tempDetail.unitname = tempDetail.unitno; - // } } - - //闄勪欢澶勭悊 - // if (list.length > 0) { - // this.form.annexfiles = list.map(item => item.url).join(","); - // } //澶勭悊鏄庣粏 for (let i = 0; i < this.rbDetails.length; i++) { @@ -2267,20 +2254,22 @@ console.log(this.form); console.log(response, "淇濆瓨杩斿弬"); if (response.code === 200) { - if (this.userprofile.nickName != "闄堟厱鍗�") { + if (this.form.id) { + this.$modal.msgSuccess("鐢宠鍗曚慨鏀规垚鍔燂紒"); + this.$router.go(-1); + } else { this.$modal.msgSuccess("鐢宠鍗曚繚瀛樻垚鍔燂紒"); + this.$store.dispatch("tagsView/delView", this.$route); + this.$router.push({ + path: "/finance/applyDetail/", + query: { + id: response.data, + businessType: "2", + operationType: "update", + curCase: this.curCase + } + }); } - this.$store.dispatch("tagsView/delView", this.$route); - this.$router.push({ - path: "/finance/applyDetail/", - query: { - id: response.data, - businessType: "2", - operationType: "update", - curCase: this.curCase - } - }); - this.Routinglevel++; } else { this.$modal.msgError("鐢宠鍗曚繚瀛樺け璐ワ細" + response.msg); } @@ -2303,31 +2292,15 @@ this.$modal.msgError("璇烽�夌‘璁ゆ潗鏂欑姸鎬佸凡鏀跺埌锛�"); return; } - let checkFundObj = { - // fundid: this.checkObj.fundid, - fundid: this.curId, - flowconclusion: this.checkObj.flowlevelone, - flowcontent: this.checkObj.flowconclusion - }; - if (this.userprofile.nickName == "闄堟厱鍗�") { this.Savenow(); - console.log("淇濆瓨"); - } - checkfund(checkFundObj).then(res => { - //鍏抽棴绐楀彛 - this.$modal.msgSuccess("瀹℃牳瀹屾垚!"); + console.log("淇濆瓨骞跺鎵�"); - this.$store.dispatch("tagsView/delView", this.$route); - this.$router.go(-1); - }); }, // 鍙栨秷鎸夐挳 cancel() { - // this.reset(); - console.log(-this.Routinglevel); this.$store.dispatch("tagsView/delView", this.$route); - this.$router.go(-this.Routinglevel); + this.$router.go(-1); }, //鑾峰彇褰撳墠鐢ㄦ埛淇℃伅 @@ -2744,20 +2717,6 @@ return; } } - - // //鍒ゆ柇鍗曚綅 unitSel - // try { - // let unitIndex = this.unitList.findIndex( - // (item) => tempDetail.unitno == item.organizationid - // ); - // if (unitIndex > -1) { - // tempDetail.unitname = this.unitList[unitIndex].organizationname; - // } else { - // tempDetail.unitname = tempDetail.unitno; - // } - // } catch { - // tempDetail.unitname = tempDetail.unitno; - // } } //澶勭悊鏄庣粏 @@ -2789,44 +2748,6 @@ ].subjecttypename; } this.rbDetails[i] = tempDetail; - /* - //璁$畻涓◣ - //if (isNaN(parseFloat(tempDetail.taxedamount))) - //鑾峰彇鍙傛暟 - this.taxParam.beneficiaryNo = tempDetail.beneficiaryno; - this.taxParam.startTime = this.form.createTime.substring(0, 10); - // 璁$畻绋庡悗閲戦 - if (tempDetail.taxedamount == undefined || tempDetail.taxedamount == null || tempDetail.taxedamount == 0 || tempDetail.taxedamount == '') { - //鑾峰彇鍙傛暟 - this.taxParam.money = tempDetail.amount.toString(); - getTaxByBeneFiciaryNo(this.taxParam).then((res) => { - if (res.code == 200) { - tempDetail.taxamount = res.data; - tempDetail.taxedamount = tempDetail.amount - tempDetail.taxamount; - this.rbDetails[k] = tempDetail; - - this.totalAfterTaxAmount += parseFloat(tempDetail.taxedamount); - this.totalAmount += parseFloat(tempDetail.amount); - } - }); - } - - // 璁$畻绋庡墠銆佺◣璐广�佺◣鍚庨噾棰� - if (tempDetail.amount == undefined || tempDetail.amount == null || tempDetail.amount == 0 || tempDetail.amount == '') { - //鑾峰彇鍙傛暟 - this.taxParam.money = tempDetail.taxedamount.toString(); - getTaxBeforeByAfterMoney(this.taxParam).then((res) => { - if (res.code == 200) { - tempDetail.taxamount = res.data.nowTax; - tempDetail.amount = parseFloat(res.data.nowTaxBeforeMoney); - this.rbDetails[k] = tempDetail; - - this.totalAfterTaxAmount += parseFloat(tempDetail.taxedamount); - this.totalAmount += parseFloat(tempDetail.amount); - } - }); - } - */ } //璁$畻褰撳墠琛屾姤閿�鍐呭璐圭敤鍚堣锛岀◣鍓嶉噾棰濓紙amount锛夈�佹墸绋庨噾棰濓紙taxamount锛夈�佺◣鍚庨噾棰濓紙taxedamount锛� if (this.businessType == "2") { @@ -2871,11 +2792,6 @@ } } - //璐圭敤鍚堣 - // this.form.pretaxcost = parseFloat(this.totalPreTaxAmount).toFixed(2); - // this.form.taxedcost = parseFloat(this.totalAfterTaxAmount).toFixed(2); - // this.form.amountrequested = this.totalAmount.toFixed(2); - //淇濆瓨鏁版嵁 this.loading = true; this.form.serviceFunddetails = 0; @@ -2885,36 +2801,28 @@ this.form.serviceFunddetails = this.rbDetails; if (this.form.id != null) { - // updateFund(this.form).then((response) => { - // if (response.code === 200) { - // this.loading = false; - // for (let m = 0; m < this.rbDetails.length; m++) { - // if (this.rbDetails[m].id > 0) { - // updateFunddetail(this.rbDetails[m]).then((response2) => { if (response.code != 200) { this.$modal.msgError("涓撳鍔冲姟璐逛繚瀛樺け璐�1锛�" + response.msg); } }); - // } else { - // addFunddetail(this.rbDetails[m]).then((response2) => { if (response.code != 200) { this.$modal.msgError("涓撳鍔冲姟璐逛繚瀛樺け璐�2锛�" + response.msg); } }); - // } - // } - // this.$modal.msgSuccess("涓撳鍔冲姟璐逛繚瀛樻垚鍔燂紒"); - // } else { - // this.$modal.msgError("涓撳鍔冲姟璐逛繚瀛樺け璐ワ細" + response.msg); - // } - // }); } else { this.form.recordstatus = -1; - - // addorupdateFund(this.form).then((response) => { - // if (response.code === 200) { - // this.selectDonotor(this.curCase); - // } else { - // this.$modal.msgError("涓撳鍔冲姟璐逛繚瀛樺け璐ワ細" + response.msg); - // } - // }); } addorupdateFund(this.form).then(response => { if (response.code === 200) { this.$modal.msgSuccess("鐢宠鍗曚繚瀛樻垚鍔燂紒"); + // 闈炴彁閱掔姸鎬佷笅鎵ц瀹℃壒瑙e喅寮傛璋冪敤寤惰繜闂 + if (!this.Savereminder) { + let checkFundObj = { + // fundid: this.checkObj.fundid, + fundid: this.curId, + flowconclusion: this.checkObj.flowlevelone, + flowcontent: this.checkObj.flowconclusion + }; + checkfund(checkFundObj).then(res => { + //鍏抽棴绐楀彛 + this.$modal.msgSuccess("瀹℃牳瀹屾垚!"); + this.$store.dispatch("tagsView/delView", this.$route); + this.$router.go(-1); + }); + } this.Getnetworkheader(); this.getroute(); this.getExternalList(); @@ -2953,7 +2861,16 @@ JSON.stringify(this.rbDetails) ); sessionStorage.setItem("apiform", JSON.stringify(this.form)); - this.$router.go(0); + // this.$router.go(0); + this.$router.push({ + path: "/finance/applyDetail/", + query: { + id: this.curId, + businessType: this.businessType, + operationType: this.operationType, + curCase: this.curCase + } + }); } else { // this.$message({ // type: "error", @@ -3440,10 +3357,7 @@ if (this.businessType == 4 || this.businessType == 3 || !showType) { this.selectionType = this.experthear; } - // if (!showType) { - // this.selectionType = this.experthear; - // } this.expertfrom = "1"; console.log(spoce); this.funddetailForm.index = spoce.$index; @@ -3625,7 +3539,11 @@ // this.getFeeUnitList(); }, - + beforeRouteLeave(to, from, next) { + // 鎵ц閿�姣佹搷浣� + this.$destroy(); + next(); + }, beforeCreate() {}, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠 beforeMount() {}, //鐢熷懡鍛ㄦ湡 - 鎸傝浇涔嬪墠 beforeUpdate() {}, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪墠 diff --git a/src/views/project/fund/expertFeeApply/index.vue b/src/views/project/fund/expertFeeApply/index.vue index 3a785f3..8f4ae13 100644 --- a/src/views/project/fund/expertFeeApply/index.vue +++ b/src/views/project/fund/expertFeeApply/index.vue @@ -152,12 +152,12 @@ prop="username" width="120px" /> - <el-table-column + <!-- <el-table-column label="鐢宠閲戦" align="center" prop="pretaxcost" width="200px" - /> + /> --> <el-table-column label="鎹愮尞浜�" align="center" diff --git a/src/views/project/fund/medicalCostApply/index.vue b/src/views/project/fund/medicalCostApply/index.vue index 25b3387..49fabfa 100644 --- a/src/views/project/fund/medicalCostApply/index.vue +++ b/src/views/project/fund/medicalCostApply/index.vue @@ -1,66 +1,6 @@ <!-- --> <template> <div class="app-container"> - <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-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> - </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-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-col> - </el-row> - </el-form> <el-row> <el-col :span="6"> <el-card shadow="never"> @@ -71,6 +11,54 @@ </el-row> </el-col> </el-row> + <div> + <el-form + :model="queryParams" + ref="queryForm" + :inline="true" + label-width="70px" + > + <el-form-item label="濮撳悕" prop="name"> + <el-input + v-model="queryParams.name" + placeholder="璇疯緭鍏ュ鍚�" + clearable + size="small" + @keyup.enter.native="handleQuery" + /> + </el-form-item> + <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> + </el-form-item> + <div style="float: right; margin-bottom: 10px;"> + <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 + > + </div> + </el-form> + </div> <el-table v-loading="loading" border diff --git a/src/views/project/fundcheck/medicalCostCheck/index.vue b/src/views/project/fundcheck/medicalCostCheck/index.vue index c3f8099..c23c0c7 100644 --- a/src/views/project/fundcheck/medicalCostCheck/index.vue +++ b/src/views/project/fundcheck/medicalCostCheck/index.vue @@ -46,17 +46,7 @@ /> </el-form-item> </el-col> - <el-col :span="5"> - <el-form-item label="鎹愮尞浜�" prop="APPLICANT" style="float: left"> - <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="CHECKFLAG" style="float: left"> <el-select diff --git a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue index bf7c385..f866229 100644 --- a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue +++ b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue @@ -2354,16 +2354,15 @@ this.$modal.msgError("璇烽�夋嫨瀹℃牳缁撹鍚庡啀鎻愪氦瀹℃壒缁撴灉!"); return; } - if (this.userprofile.nickName == "闄堟厱鍗�") { - this.Savenow(); - console.log("淇濆瓨"); - } + if (this.userprofile.nickName == "闄堟厱鍗�") { + this.Savenow(); + console.log("淇濆瓨"); + } checkfund(checkfundobj).then(res => { this.$modal.msgSuccess("鎻愪氦瀹℃牳鎴愬姛!"); // 鍏抽棴绐楀彛 - this.$store.dispatch("tagsView/delView", this.$route); - this.$router.go(-1); - + this.$store.dispatch("tagsView/delView", this.$route); + this.$router.go(-1); }); }, diff --git a/src/views/project/travelexpensecheck/index.vue b/src/views/project/travelexpensecheck/index.vue index 3a74a43..a88d203 100644 --- a/src/views/project/travelexpensecheck/index.vue +++ b/src/views/project/travelexpensecheck/index.vue @@ -53,7 +53,7 @@ </el-form-item> </el-col> <el-col :span="5"> - <el-form-item label="瀹℃壒鐘舵��" prop="CHECKFLAG" style="float: left"> + <el-form-item label="瀹℃壒鐘舵��" prop="CHECKFLAG" style="float: left"> <el-select v-model="queryParams.CHECKFLAG" placeholder="璇烽�夋嫨" @@ -73,7 +73,7 @@ <el-row> <el-col :span="5"> <el-form-item - label-width="120px" + label-width="120px" label="鐢宠鏉愭枡鐘舵��" prop="checkstatus" style="float: left" @@ -91,6 +91,17 @@ > </el-option> </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-form-item> </el-col> <el-col :span="6"> @@ -238,7 +249,6 @@ width="270" > <template slot-scope="scope"> - <el-button size="mini" type="text" @@ -1568,8 +1578,15 @@ }, /** 閲嶇疆鎸夐挳鎿嶄綔 */ resetQuery() { - this.resetForm("queryForm"); - this.handleQuery(); + (this.queryParams = { + pageNum: 1, + pageSize: 10, + APPLICANT: null, + APPLICATIONBEGTIME: null, + APPLICATIONENDTIME: null, + CHECKFLAG: 1 + }), + this.handleQuery(); }, // 澶氶�夋閫変腑鏁版嵁 handleSelectionChange(selection) { -- Gitblit v1.9.3