From 4b778297de834536bcb5ccb313d367ed15dfdea3 Mon Sep 17 00:00:00 2001 From: wangting <675591594@qq.com> Date: 星期二, 20 六月 2023 17:00:54 +0800 Subject: [PATCH] 修改附件列表展示传参,按钮控制 --- Source/UBCS-WEB/src/components/file/main.vue | 108 ++++++++++++++++++++++------------- Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue | 14 +++- 2 files changed, 79 insertions(+), 43 deletions(-) diff --git a/Source/UBCS-WEB/src/components/file/main.vue b/Source/UBCS-WEB/src/components/file/main.vue index d3a2da1..7a9ba08 100644 --- a/Source/UBCS-WEB/src/components/file/main.vue +++ b/Source/UBCS-WEB/src/components/file/main.vue @@ -4,8 +4,8 @@ :table-loading="loading" :data="data" :page.sync="page" - :permission="permissionList" :before-open="beforeOpen" + :permission="permissionList" v-model="form" ref="crud" @row-del="rowDel" @@ -17,19 +17,25 @@ @refresh-change="refreshChange" @on-load="onLoad"> <template slot="menuLeft"> - <el-button type="primary" + <el-button v-if="hasUpload" type="primary" size="small" plain icon="el-icon-upload2" @click="handleUpload">涓� 浼� </el-button> - <el-button type="primary" + <el-button v-if="hasEdit" type="primary" size="small" plain icon="el-icon-edit" @click="handleEdit">淇� 鏀� </el-button> - <el-button type="danger" + <el-button v-if="hasDownload" type="primary" + size="small" + icon="el-icon-download" + plain + @click="handleDownload">涓� 杞� + </el-button> + <el-button v-if="hasDel" type="danger" size="small" icon="el-icon-delete" plain @@ -37,7 +43,7 @@ </el-button> </template> <template slot-scope="scope" slot="menu"> - <el-button type="text" + <el-button v-if="hasDownload" type="text" icon="el-icon-download" size="small" @click="handleDownload(scope.row)">涓嬭浇 @@ -58,6 +64,7 @@ import {getList, getFile,upload,update, remove,download} from "@/api/resource/file"; import {mapGetters} from "vuex"; import {dateFormat} from "@/util/date"; +import {validatenull} from "@/util/validate"; export default { props: ["options","visible"], @@ -74,8 +81,12 @@ }, attachBox: false, selectionList: [], + hasUpload:validatenull(this.options.hasUpload) ? true :this.options.hasUpload, + hasEdit:validatenull(this.options.hasEdit) ? true :this.options.hasEdit, + hasDel:validatenull(this.options.hasDel) ? true :this.options.hasDel, + hasDownload:validatenull(this.options.hasDownload) ? true :this.options.hasDownload, option: { - height: 'auto', + height:(this.options.tableHeight?this.options.tableHeight:'auto'), calcHeight: 30, tip: false, searchShow: true, @@ -150,25 +161,7 @@ date: "date", refer: "refer", }, - data: [{ - btmname: "fileobject", - createTime: "2023-06-14 16:08:50.002", - creator: "1", - fileDocClassify: "undefined", - fileDocClassifyName: null, - fileExtension: "png", - filePath: "VolumnFactoryService:/f87a4c92-ce6e-458b-aad0-0c76bd5eeb35\\54120082-76aa-4092-abbf-b13cb40606c5", - fileSize: 858, - id: "assignRole", - name: "assignRole", - nameOid: "9FF4C05D-4EFA-F00B-0080-5ABB50257D4E", - oid: "54120082-76aa-4092-abbf-b13cb40606c5", - ownBtmname: "wupin", - ownbizOid: "6EF696C3-CD87-0E7C-1EA1-8DE3913A95C9", - owner: "1", - secretGrade: null, - secretGradeText: null - }], + data: [], attachForm: {}, attachOption: { submitBtn: false, @@ -214,13 +207,13 @@ }; }, computed: { - ...mapGetters(["permission"]), + ...mapGetters([ "permission"]), permissionList() { return { addBtn: false, - editBtn: false, viewBtn: false, - delBtn: this.vaildData(this.permission.attach_delete, false) + delBtn: this.vaildData(this.permission.attach_delete, false), + editBtn: false }; }, oids() { @@ -231,9 +224,12 @@ return oids.join(","); } }, - mounted() { + created() { this.setFormItem(); this.setParams() + }, + mounted() { + }, methods: { setFormItem(){ @@ -312,16 +308,27 @@ } return []; }, - setParams(){ + setParams() { var queryMap = { - currentButtonKey:'VIEW', - ownbizOid:this.options.ownbizOid, - ownbizBtm:this.options.ownbizBtm + currentButtonKey: 'VIEW', + ownbizOid: this.options.ownbizOid, + ownbizBtm: this.options.ownbizBtm, + fileDocClassify: this.options.fileDocClassify, + fileDocClassifyName: this.options.fileDocClassifyName }; - if(this.options.where){ - Object.assign(queryMap,this.options.where); + if (this.options.where) { + Object.assign(queryMap, this.options.where); } - this.params=queryMap; + this.params = queryMap; + + if (!this.options.pageObject) { + this.options.pageObject = { + limit: 10, + page: 1 + }; + } + this.page.pageSize = this.options.pageObject.limit; + this.page.currentPage = this.options.pageObject.page; }, handleUpload() { this.attachOption.column[1].data.fileOid=''; @@ -331,10 +338,10 @@ }, handleEdit() { if(this.selectionList.length==0){ - this.$message.error('璇烽�夋嫨闇�瑕佷慨鏀圭殑鏂囦欢') + this.$message.warning('璇烽�夋嫨闇�瑕佷慨鏀圭殑鏂囦欢') return false; }else if(this.selectionList.length>1){ - this.$message.error('璇烽�夋嫨涓�鏉℃暟鎹�') + this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�') return false; } this.attachOption.column[1].data.fileOid=this.oids; @@ -360,7 +367,15 @@ }, handleDownload(row) { //window.open(`${row.link}`); - download(row.oid) + if(row && row.oid){ + download(row.oid) + }else{ + if (this.selectionList.length === 0) { + this.$message.warning("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�"); + return; + } + download(this.oids); + } }, rowDel(row) { this.$confirm("纭畾灏嗛�夋嫨鏂囦欢鍒犻櫎?", { @@ -446,9 +461,22 @@ getList(page.currentPage, page.pageSize, Object.assign(params,this.params, query,this.query)).then(res => { const data = res.data.data; this.page.total = data.total; - this.data = data.records; + if(data && data.records.length>0 && this.options.fileDocClassifyCombox){ + this.data = data.records.map(item => { + if(validatenull(item.fileDocClassifyName)&& !validatenull(item.fileDocClassify)){ + item.fileDocClassifyName = this.options.fileDocClassifyCombox[item.fileDocClassify] || ''; + } + return { + ...item + } + }) + } + //this.data = data.records; this.loading = false; this.selectionClear(); + }).catch(error=>{ + this.$message.error(error); + this.loading = false; }); } } diff --git a/Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue b/Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue index e7b5699..d10dae1 100644 --- a/Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue +++ b/Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue @@ -28,10 +28,10 @@ :downloadTemplateFun="downloadTemplateFun" :codeClassifyOid="codeClassifyOid" ></BatchImport> - <fileInHtml :options="{}"></fileInHtml> + <fileInHtml :options="fileOptions"></fileInHtml> <fileinDialog :visible="visible2" - :options="{}" + :options="fileOptions" @close="visible2 = false" ></fileinDialog> </div> @@ -59,6 +59,14 @@ codeClassifyOid: "535FC9B6-FE27-241F-5FCA-ED4DC17CF95B", codeRuleOid: "B95872A6-9CEA-D490-8F1B-9D26548CAF96", rowOid: "551FBA49-9A94-2F83-9126-9DD4F9BB14B5", + fileOptions:{ + ownbizOid:"6EF696C3-CD87-0E7C-1EA1-8DE3913A95C9", + ownbizBtm:"wupin", + fileDocClassify:'!=processAuditSuggest', + fileDocClassifyName:'', + hasDownload:true, + hasUpload:true + } }; }, methods: { @@ -66,7 +74,7 @@ console.log(data); }, downloadTemplateFun() { - + } }, }; -- Gitblit v1.9.3