From 132c021523ccea2ea0c63e3013c47d116e14ab4b Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期一, 30 六月 2025 13:33:22 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- admin/src/components/business/OperaCompanyDocumentsWindow.vue | 133 ++++++++++++++++++++++++++++++++++++++----- 1 files changed, 116 insertions(+), 17 deletions(-) diff --git a/admin/src/components/business/OperaCompanyDocumentsWindow.vue b/admin/src/components/business/OperaCompanyDocumentsWindow.vue index 7e70f3a..84fb7ad 100644 --- a/admin/src/components/business/OperaCompanyDocumentsWindow.vue +++ b/admin/src/components/business/OperaCompanyDocumentsWindow.vue @@ -10,19 +10,32 @@ <el-input v-model="form.name" placeholder="璇疯緭鍏ヨ祫鏂欏悕绉�" v-trim/> </el-form-item> <el-form-item label="璧勬枡绫诲瀷" prop="categoryId"> - <el-input v-model="form.categoryId" placeholder="璇疯緭鍏ヨ矗浠婚儴闂ㄧ紪鐮�(鍏宠仈company)" v-trim/> + <el-select v-model="form.categoryId" clearable filterable placeholder="璇烽�夋嫨"> + <el-option v-for="item in cateList" :key="item.id" :label="item.name" :value="item.id"> + </el-option> + </el-select> </el-form-item> <el-form-item label="璐d换閮ㄩ棬" prop="companyId"> - <el-input v-model="form.companyId" placeholder="璇疯緭鍏ヨ矗浠婚儴闂ㄧ紪鐮�(鍏宠仈company)" v-trim/> - </el-form-item> - <el-form-item label="鎺掑簭鐮�" prop="sortnum"> - <el-input v-model="form.sortnum" placeholder="璇疯緭鍏ユ帓搴忕爜" v-trim/> + <treeselect + v-model="form.companyId" + placeholder="璇烽�夋嫨" + :options="companyList" + :normalizer="normalizeOptions" + :default-expand-level="1" + noChildrenText="娌℃湁瀛愰�夐」" + noOptionsText="娌℃湁鍙�夐」" + noResultsText="娌℃湁鍖归厤鐨勭粨鏋�" /> </el-form-item> <el-form-item label="闄勪欢鍦板潃" prop="fileurl"> - <el-input v-model="form.fileurl" placeholder="璇疯緭鍏ラ檮浠跺湴鍧�" v-trim/> + <UploadFile :uploadData="{ folder: 'company_documents',fileType:'' }" :fileList="fileList" @uploadSuccess="uploadFileBiz" /> + +<!-- <UploadFile width="100px" height="100px" :list="[]" folder="company_documents" @success="uploadFileBiz($event, 2)" />--> </el-form-item> <el-form-item label="闄勪欢鎻忚堪" prop="content"> <el-input type="textarea" v-model="form.content" placeholder="璇疯緭鍏ラ檮浠舵弿杩�" v-trim/> + </el-form-item> + <el-form-item label="鎺掑簭鐮侊紙闄嶅簭锛�" prop="sortnum"> + <el-input v-model="form.sortnum" placeholder="璇疯緭鍏ユ帓搴忕爜" v-trim/> </el-form-item> </el-form> </GlobalWindow> @@ -31,33 +44,38 @@ <script> import BaseOpera from '@/components/base/BaseOpera' import GlobalWindow from '@/components/common/GlobalWindow' +import { fetchList as companyList } from '@/api/business/company' +import UploadFile from '@/components/common/UploadFile' +import { fetchList } from '@/api/business/category' export default { name: 'OperaCompanyDocumentsWindow', extends: BaseOpera, - components: { GlobalWindow }, + components: { GlobalWindow, UploadFile }, data () { return { // 琛ㄥ崟鏁版嵁 form: { id: null, - creator: '', - createDate: '', - editor: '', - editDate: '', - isdeleted: '', name: '', - remark: '', - status: '', + status: '0', sortnum: '', fileurl: '', fileName: '', fileSize: '', - categoryId: '', - companyId: '', - content: '' + categoryId: null, + companyId: null, + content: '', + fileurlFull: '' }, + fileList:[], + cateList: [], + companyList: [], // 楠岃瘉瑙勫垯 rules: { + name: [{ required: true, message: '璇疯緭鍏ヨ祫鏂欏悕绉�', trigger: 'blur' }], + companyId: [{ required: true, message: '璇烽�夋嫨璐d换閮ㄩ棬' }], + categoryId: [{ required: true, message: '璇烽�夋嫨璧勬枡绫诲瀷' }], + fileurl: [{ required: true, message: '璇蜂笂浼犺祫鏂欐枃浠�' }] } } }, @@ -66,6 +84,87 @@ api: '/business/companyDocuments', 'field.id': 'id' }) + }, + methods: { + + // 瑙勮寖鍖栭�夐」鏁版嵁鐨勬柟娉� + normalizeOptions (node) { + // node: 鍘熷鐨勯�夐」鏁版嵁 + // 鍦ㄨ繖閲屾牴鎹渶瑕佽繘琛岄�夐」鏁版嵁鐨勮鑼冨寲鎿嶄綔锛屽苟杩斿洖瑙勮寖鍖栧悗鐨勯�夐」鏁版嵁 + // 渚嬪锛屽彲浠ュ皢鍘熷鐨勯�夐」鏁版嵁杞崲涓虹鍚堟彃浠惰姹傜殑缁撴瀯 + if (node.childList && !node.childList.length) { + // 鍘绘帀children=[]鐨刢hildren灞炴�� + delete node.childList + } + return { + id: node.id, + label: node.name, + children: node.childList + } + }, + open (title, target) { + this.title = title + this.visible = true + this.getCate() + this.getCompany() + // 鏂板缓缁勭粐 + if (target == null) { + this.$nextTick(() => { + this.$refs.form.resetFields() + this.form[this.configData['field.id']] = null + }) + return + } + // 缂栬緫 + this.$nextTick(() => { + for (const key in this.form) { + this.form[key] = target[key] + } + }) + }, + uploadFileBiz (file) { + // this.$emit('uploadSuccess', { fileurl: data.imgaddr, fileurlFull: data.url, name: data.originname }) + this.form.fileurl = file.fileurl + this.form.fileName = file.name + this.form.fileurlFull = file.fileurlFull + this.form.fileSize = file.fileSize + }, + getCate () { + fetchList({ + model: { type: 2 }, + capacity: 1000, + page: 1 + }).then(res => { + if (res && res.records && res.records.length > 0) { + this.cateList = res.records || [] + } + }) + }, + getCompany () { + companyList() + .then(res => { + if (res && res.length > 0) { + this.companyList = this.getDepartmentTree(res) + } + }) + }, + getDepartmentTree (tree) { + if (tree == null) { + return [] + } + return tree.map(item => { + const newItem = { ...item } + if (newItem) { + newItem.children = newItem.childList + } + if (item.children && item.children.length == 0) { + this.$delete(newItem, 'children') + } else { + newItem.children = this.getDepartmentTree(newItem.children) + } + return newItem + }) + } } } </script> -- Gitblit v1.9.3