From 6afb98b81fa4b4b3223d53d42a891fb89862d38b Mon Sep 17 00:00:00 2001 From: Tcsm <1377977403@qq.com> Date: 星期一, 14 八月 2023 16:36:29 +0800 Subject: [PATCH] 新增家谱图,完善各模块新增时的电子文件上传功能,在上传期间显示正在上传 --- ruoyi-ui/src/views/honor/index.vue | 119 +++++++++++++++-------------------------------------------- 1 files changed, 30 insertions(+), 89 deletions(-) diff --git a/ruoyi-ui/src/views/honor/index.vue b/ruoyi-ui/src/views/honor/index.vue index 7dfa5f6..96ba9d9 100644 --- a/ruoyi-ui/src/views/honor/index.vue +++ b/ruoyi-ui/src/views/honor/index.vue @@ -15,39 +15,7 @@ @keyup.enter.native="handleQuery"> <i slot="prefix" class="el-input__icon el-icon-search"></i> </el-input> - <!-- <el-input - v-model="searchVal" - placeholder="鍦ㄢ�滈�氳褰曗�濅腑鎼滅储" - clearable - style="width: 240px" - @input="inputChange"> - <i slot="prefix" class="el-input__icon el-icon-search"></i> - </el-input> - <div class="outer-table"> - 姝ょ埗缁勪欢寮曠敤瀛愮粍浠秚ablemax - <tablemax label="myLabel" :tableData="contactList"> - <template v-slot:table> - <el-table-column label="鎿嶄綔" width="180"> - <template slot-scope="scope"> - <el-button @click="handleCheck(scope.row)" type="text" size="small" - >璋冪敤</el-button - > - </template> - </el-table-column> - </template> - </tablemax> - </div>--> - <!-- v-model="queryParams.id" - - v-model:phone="queryParams.phone" - v-model:wx="queryParams.wx" - v-model:qq="queryParams.qq" - v-model:twitter="queryParams.twitter" - v-model:isAlways="queryParams.isAlways" - v-model:remark="queryParams.remark" - @keyup.enter.native="handleQuery" - --> </el-form-item> <el-form-item label="鍚嶇О" prop="name"> @@ -103,15 +71,6 @@ </el-form-item> </el-form> <div> -<!-- <div style="width: 171px;--> -<!-- height: 28px;--> -<!-- font-size: 21px;--> -<!-- font-family: Microsoft YaHei-Regular, Microsoft YaHei;--> -<!-- font-weight: 400;--> -<!-- color: #000000;--> -<!-- line-height: 25px;--> -<!-- ">璇佷欢銆佽崳瑾夈�佽祫璐�</div>--> - <el-row :gutter="10" class="mb8"> <el-col :span="1.5"> <el-button @@ -177,29 +136,11 @@ <el-table v-loading="loading" :data="honorList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;"> <el-table-column type="selection" :reserve-selection="true" width="55" align="center" /> <el-table-column fixed label="搴忓彿" sortable type="index" align="center" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/> -<!-- <el-table-column label="鏃堕棿" prop="createTime" sortable width="120" align="center">--> - -<!-- <template slot-scope="scope">{{scope.row.createTime? scope.row.createTime: '鈥斺�斺�斺��'}}</template>--> -<!-- </el-table-column>--> <el-table-column label="绫诲埆" prop="type" sortable :show-overflow-tooltip="true" width="120" align="center" > <!-- <template slot-scope="scope">{{scope.row.type? scope.row.type: '鈥斺�斺�斺��'}}</template>--> <template slot-scope="scope">{{ getSrc1(scope.row.type) }}</template> </el-table-column> - <el-table-column label="鍚嶇О" prop="name" sortable :show-overflow-tooltip="true" width="120" align="center" > -<!-- <template slot-scope="scope">{{scope.row.name? scope.row.name: '鈥斺�斺�斺��'}}</template>--> -<!-- <template slot-scope="scope">--> -<!-- <template v-if="formDat.name===1">{{ getSrc(scope.row.name) }}</template>--> -<!-- <template v-if="scope.row.name == 1">鍑虹敓璇�</template>--> -<!-- <template v-else-if="scope.row.name == 2">瀛︾敓璇�</template>--> -<!-- <template v-else-if="scope.row.name == 3">姣曚笟璇�</template>--> -<!-- <template v-else-if="scope.row.name == 4">缁撳璇�</template>--> -<!-- <template v-else-if="scope.row.name == 5">鎴峰彛绨�</template>--> -<!-- <template v-else-if="scope.row.name == 6">鐙敓瀛愬コ璇�</template>--> -<!-- <template v-else-if="scope.row.name == 7">楂樼骇鑱岀О</template>--> -<!-- <template v-else-if="scope.row.name == 8">鎶ょ収</template>--> -<!-- <template v-else-if="scope.row.name == 9">閫氳璇�</template>--> -<!-- <template v-else>{{ scope.row.name }}</template>--> -<!-- </template>--> + <el-table-column label="鍚嶇О" prop="name" sortable width="120" align="center" > <template slot-scope="scope">{{scope.row.name? scope.row.name: '鈥斺�斺�斺��'}}</template> </el-table-column> <el-table-column label="璇佸彿/涓撲笟" prop="idNo" sortable width="170" align="center" > @@ -282,14 +223,6 @@ <!-- 娣诲姞璇佷功銆佽崳瑾夈�佽祫璐ㄩ厤缃璇濇 --> <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body> <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px"> - -<!-- <el-form-item label="鏃堕棿" prop="createTime">--> -<!-- <el-input v-model="formDat.createTime" type='date' placeholder='閫夋嫨鏃ユ湡' clearable :style="{width: '100%'}" >--> -<!-- </el-input>--> -<!-- </el-form-item>--> -<!-- <el-form-item label="鑾峰緱鏃堕棿" prop="happenTime">--> -<!-- <el-date-picker v-model='formDat.happenTime' type='date' placeholder='閫夋嫨鏃ユ湡'></el-date-picker>--> -<!-- </el-form-item>--> <el-form-item label="绫诲埆" prop="type"> <el-select v-model="formDat.type" placeholder="璇烽�夋嫨绫诲埆" clearable :style="{width: '100%'}" > <el-option v-for="(item, index) in typeOption" :key="index" :label="item.label" :value="item.value" @@ -338,7 +271,8 @@ :http-request="requestUpload" :file-list="fileList" > - <i slot="default" class="el-icon-plus"></i> + <div v-if="uploading" class="upload-status">姝e湪涓婁紶...</div> + <i v-if="!uploading" slot="default" class="el-icon-plus"></i> <div slot="file" slot-scope="{file}"> <img class="el-upload-list__item-thumbnail" @@ -456,7 +390,7 @@ dsb:true, btn:false, fit:['fill'], - + uploading: false, formDat: { //鑽h獕璇佷功璁板綍 id:undefined, @@ -554,9 +488,6 @@ created() { this.getList(); this.getTypeOptions(); - // for (let i = 0; i < this.contactList.length; i++) { - // this.formDat[i] = this.contactList[i]; - // } }, methods: { // 鍙栨秷鎸夐挳 @@ -625,20 +556,20 @@ }, /** 鏌ヨ绫诲埆淇℃伅 */ - getCateInfor() - { - let _this = this - getCategory().then(response=>{ - - // response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{ - // _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]}) - response.data.itemValues.replace("{", "").replace("}", "").split(",").map(elem => { - const label = elem.split(":")[0].trim(); - const value = parseInt(elem.split(":")[1].trim()); - _this.typeOptions.push({ "label": label, "value": value }); - }) - }) - }, + // getCateInfor() + // { + // let _this = this + // getCategory().then(response=>{ + // + // // response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{ + // // _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]}) + // response.data.itemValues.replace("{", "").replace("}", "").split(",").map(elem => { + // const label = elem.split(":")[0].trim(); + // const value = parseInt(elem.split(":")[1].trim()); + // _this.typeOptions.push({ "label": label, "value": value }); + // }) + // }) + // }, //绫诲埆閫夋嫨 getSrc1(type){ if(type===0){ @@ -821,10 +752,11 @@ var formData = new FormData(); formData.append('uploadFile', file); let _this = this - + this.uploading = true; uploadPic(formData).then(response => { let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length) - + this.uploading = false; + this.$modal.msgSuccess("涓婁紶鎴愬姛"); if(_this.fot.includes(pth) === true) { _this.fileList.push({name:response.data.fileName, "url":response.data.url}) @@ -883,6 +815,15 @@ }).catch(() => { Message({ message: "瀵煎叆澶辫触", type: 'error' })}); } + }, + watch: { + type(value) { + if (value === '') { + this.showInput = true; + } else { + this.showInput = false; + } + } } }; </script> -- Gitblit v1.9.1