From 9675f1491ef23c4c6f69cb83cbf6de3fd6dac61b Mon Sep 17 00:00:00 2001 From: 田源 <lastanimals@163.com> Date: 星期三, 26 七月 2023 17:40:58 +0800 Subject: [PATCH] 主数据导出 --- Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue | 419 +++++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 358 insertions(+), 61 deletions(-) diff --git a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue index 85fc5f0..1449f62 100644 --- a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue +++ b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue @@ -2,7 +2,7 @@ <basic-container> <div class="main"> <div class="top"> - <div class="testbox"> + <div class="testbox" style=""> <div> <!-- <el-button plain size="small" type="primary" @click="addvisible = true">澧炲姞 </el-button> @@ -27,22 +27,30 @@ style="width: 180px; margin-left: 5px; margin-top: 10px"></el-input> --> </div> - <el-row style="height: 700px; width: 100%"> + <el-row style="width: 100%;margin-bottom: 20px"> <div> - <el-button v-for="(item, index) in masterVrBtnList" :key="index" plain size="small" type="primary" v-if="!['PREVIEW', 'DELETEFILE', 'revisefile', 'DOWNLOADFILE', 'UPLOADFILE'].includes(item.uniqueFlag)" + <el-button v-for="(item, index) in masterVrBtnList" + v-if="!['PREVIEW', 'DELETEFILE', 'revisefile', 'DOWNLOADFILE', 'UPLOADFILE'].includes(item.uniqueFlag)" + :key="index" plain size="small" + type="primary" @click="handelBtnClick(item)">{{ item.name }} </el-button> <el-input v-model="WupinFindValue" placeholder="璇疯緭鍏ュ叧閿瓧鎸夊洖杞︽煡璇�" - size="small" style="width: 180px; margin-left: 5px; margin-top: 10px"></el-input> + size="small" style="width: 180px; margin-left: 5px; margin-top: 10px" + @keyup.enter.native="tableFindInp" v-if="tableData.length != 0"></el-input> </div> - <el-table v-if="tableData.length != 0" v-loading="isLoading" :data="tableData" max-height="700" style="" - @cell-click="handleCellClick" @row-click="handleRowClick" @selection="handleSelection" @selection-change="handleSelectionChange" @sort-change="sortChange"> - <el-table-column fixed type="selection" width="55"></el-table-column> - <el-table-column fixed label="搴忓彿" type="index" width="55"> + <el-table ref="dataTable" v-loading="isLoading" :data="tableData" + :height="tableHeight" + @select="handleSelection" @cell-click="handleCellClick" @row-click="handleRowClick" + @select-all="handleSelectionAll" @selection-change="handleSelectionChange" + @sort-change="sortChange"> + <el-table-column fixed type="selection" width="55" v-if="tableData.length != 0"></el-table-column> + <el-table-column fixed label="搴忓彿" type="index" width="55" v-if="tableData.length != 0"> </el-table-column> - <el-table-column v-for="item in this.tableHeadFindData" :key="item.id" :formatter="item.formatter" :label="item.label" + <el-table-column v-for="item in this.tableHeadFindData" :key="item.id" :formatter="item.formatter" + :label="item.label" :prop="item.prop" :show-overflow-tooltip="true" :sortable="item.sortable" :width="item.label.length >= 4 ? '150' : item.label.length == 3 ? '120' : '90'" @@ -50,38 +58,55 @@ </el-table-column> </el-table> </el-row> + <!-- 鏂板--> <FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid" - :disabledProp="disabledProp" :templateOid="templateOid" :visible.sync="addvisible" type="add" + :disabledProp="disabledProp" :templateOid="templateOid" :visible.sync="addvisible" + type="add" @submit="AddSumbit"> </FormTemplateDialog> + <!-- 淇敼--> <FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid" :disabledProp="disabledProp" :rowOid="rowOid" :templateOid="templateOid" :title="'淇敼缂栫爜淇℃伅'" :visible.sync="editvisible" type="edit" @submit="EditSumbit"></FormTemplateDialog> + <!-- 宸插彂甯冩暟鎹慨鏀�--> <FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid" - :disabledProp="disabledProp" :rowOid="rowOid" :templateOid="templateOid" :title="'宸插彂甯冩暟鎹洿鏀�'" + :disabledProp="disabledProp" :rowOid="rowOid" :templateOid="templateOid" + :title="'宸插彂甯冩暟鎹洿鏀�'" :type="edit" :visible.sync="DataVisible"></FormTemplateDialog> - <set-personnel :parameter="this.parameter" :visible.sync="visibleFlow"></set-personnel> - <advanced-query :options="this.options" :visible.sync="findvisible" @echoContion="echoContion"></advanced-query> - <integration-transfer :data="transferData" :props="transferProps" :visible.sync="dialogPush" - @save="handelTransferSave"></integration-transfer> + <!-- 鍙戝竷--> + <set-personnel :parameter="this.parameter" :title="title" :visible.sync="visibleFlow"></set-personnel> + <!-- 鍋滅敤--> + <set-personnel :parameter="this.parameter" :title="title" :visible.sync="visibleDeactivate"></set-personnel> + <!-- 鍚敤--> + <set-personnel :parameter="this.parameter" :title="title" :visible.sync="visibleEnable"></set-personnel> + <!-- 鍥炴敹--> + <set-personnel :parameter="this.parameter" :title="title" :visible.sync="visibleRecovery"></set-personnel> + <!-- 楂樼骇鏌ヨ--> + <advanced-query :options="this.options" :visible.sync="findvisible" + @echoContion="echoContion"></advanced-query> + <!-- 瀵煎嚭--> + <MasterTransfer :codeClassifyOid="codeClassifyOid" :selectRow="selectRow" + :tableData="tableData" :tableHeadData="tableHeadFindData" + :visible.sync="dialogPush"></MasterTransfer> + <!-- 鐩镐技椤�--> <ResembleQueryDialog :codeClassifyOid="codeClassifyOid" :codeRuleOid="this.codeRuleOid" :rowOid="rowOid" :templateOid="templateOid" :visible.sync="similarVisible"></ResembleQueryDialog> - </div> - <div class="block" style="display: flex; justify-content: flex-end"> - <el-pagination :current-page="page.currentPage" :page-size="page.pageSizes" :page-sizes="page.pageSizes" - :total="page.total" layout="total, sizes, prev, pager, next, jumper" - @size-change="handleSizeChange" - @current-change="handleCurrentChange"> - </el-pagination> + <div class="block" style="display: flex; justify-content: flex-end"> + <el-pagination :current-page="page.currentPage" :page-size="page.pageSizes" :page-sizes="page.pageSizes" + :total="page.total" layout="total, sizes, prev, pager, next, jumper" + @size-change="handleSizeChange" + @current-change="handleCurrentChange"> + </el-pagination> + </div> </div> <BatchImport v-if="batchImportData.visible" v-bind="batchImportData" :visible.sync="batchImportData.visible"> </BatchImport> </div> <div class="bottom"> - <el-collapse v-model="visibleNames"> - <el-collapse-item title="闄勪欢鍒楄〃" name="1"> + <el-collapse v-model="visibleNames" @change="handleCollapse"> + <el-collapse-item name="1" title="闄勪欢鍒楄〃"> <fileInHtml :options="fileOptions"></fileInHtml> </el-collapse-item> </el-collapse> @@ -90,7 +115,8 @@ </basic-container> </template> <script> -import {MasterTable, TableData, FindData,addSaveCode,editSaveCode} from "@/api/GetItem"; +import {MasterTable, TableData, FindData, addSaveCode, editSaveCode} from "@/api/GetItem"; +import {processTS,changeStatus} from "@/api/template/setPersonnel" import {listCodeAttributeByClassId} from "@/api/integration/integration.js"; import integrationTransfer from "@/views/integration/integrationTransfer"; import SetPersonnel from "@/components/template/SetPersonnel"; @@ -150,6 +176,7 @@ }, data() { return { + searchResults: [], //棣栭〉鍙充晶鎼滅储 WupinFindValue: "", //鐩镐技椤规煡璇� @@ -158,15 +185,24 @@ parameter: { ids: [], code: "", - type: "PUBLIC", + type: '', + // this.visibleDeactivate ?'ENABLE':this.visibleEnable ? 'DISABLE' :this.visibleRecovery ? 'ROLLBACK' :'PUBLIC' template: "", vars: { codeClassifyOid: "", - templateOid:"" + templateOid: "" } }, - visibleNames:[], + visibleNames: [], + //鍙戝竷 visibleFlow: false, + //鍋滅敤 + visibleDeactivate: false, + //鍚敤 + visibleEnable: false, + //鍥炴敹 + visibleRecovery: false, + title: '', transferData: [], transferProps: { key: "oid", @@ -196,6 +232,7 @@ datetime: "datetime", }, tableData: [], + tableHeight: 'calc(100vh - 330px)', DataVisible: false, tableHeadData: [], items: {}, @@ -209,13 +246,14 @@ }, // 涓绘暟鎹寜閽� masterVrBtnList: [], - fileOptions:{ - ownbizOid:"0", - ownbizBtm:"0", - fileDocClassify:'!=processAuditSuggest', - fileDocClassifyName:'', - hasDownload:true, - hasUpload:true + fileOptions: { + ownbizOid: "0", + ownbizBtm: "0", + fileDocClassify: '!=processAuditSuggest', + fileDocClassifyName: '', + hasDownload: true, + hasUpload: true, + height: 100 } }; }, @@ -223,9 +261,13 @@ created() { }, mounted() { + }, activated() { // this.doLayout(); + this.$nextTick(() => { + this.$refs.dataTable.doLayout() + }) }, watch: { tableHeadDataFateher: { @@ -243,6 +285,7 @@ tableDataArray: { handler(newval, oldval) { this.tableData = newval; + this.searchResults = newval }, }, tableHeadFindData: { @@ -273,7 +316,7 @@ templateOid: { handler(newval, oldval) { this.parameter.code = newval; - this.fileOptions.ownbizOid="0"; + this.fileOptions.ownbizOid = "0"; this.parameter.vars.templateOid = newval }, deep: true, @@ -288,18 +331,17 @@ } }, methods: { - // 鍙戝竷 - setHandler() { - if (this.selectRow.length <= 0) { - this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�"); + //灞曞紑闄勪欢 + handleCollapse(activeNames) { + if (activeNames.length > 0) { + this.tableHeight = 'calc(100vh - 630px)'; + this.$refs.dataTable.doLayout() } else { - this.userName = localStorage.getItem("username"); - this.parameter.template = this.userName + "-鍙戝竷" + "[鐗╁搧]"; - this.visibleFlow = true; + this.tableHeight = 'calc(100vh - 330px)'; + this.$refs.dataTable.doLayout() } }, openVis(visible) { - console.log(visible) this[visible] = true }, handelBtnClick(event) { @@ -309,13 +351,19 @@ if (uniqueFlag === 'CODEEDIT') return this.editHandler() if (uniqueFlag === 'CODEBATCHADD') return this.openBatchImport('batchImportApply') if (uniqueFlag === 'CODEIMPORTHISTORY') return this.openBatchImport('historyImport') + if (uniqueFlag === 'batchApplyCode') return this.openBatchImport('batchApplyCode') // 鎵归噺鐢宠缂栫爜 // if(uniqueFlag === 'CODEEDIT') return this.openBatchImport('batchApplyCode') if (uniqueFlag === 'CODESTARTPROCESS') return this.setHandler() if (uniqueFlag === 'CODEUPREVISION') return this.DataChange() - if (uniqueFlag === 'CODERECYCLE') return this.huishouHandler() if (uniqueFlag === 'CODEEXPORT') return this.openD() if (uniqueFlag === 'CODEQUERY') return this.findHandler() + //鍋滅敤 + if (uniqueFlag === 'CODEDISABLE') return this.Deactivate() + //鍚敤 + if (uniqueFlag === 'CODEENABLE') return this.Enable() + //鍥炴敹 + if (uniqueFlag === 'CODERECYCLE') return this.Recovery() // 鐩镐技椤规煡璇� // if(uniqueFlag === 'CODEEDIT') return this.similarHandler() }); @@ -324,6 +372,7 @@ this.getListCodeByClassId(); }, async getListCodeByClassId() { + this.dialogPush = true; this.transferData = []; const response = await listCodeAttributeByClassId({ codeClassifyId: this.codeClassifyOid, @@ -333,8 +382,227 @@ this.transferData = data; } }, + handelTransferSave(val) { + console.log('鍙戝竷', val) + }, rend() { this.tableData = this.tableHeadData; + }, + // 鍙戝竷 + setHandler() { + if (this.selectRow.length > 0) { + let hasEditing = this.selectRow.some(item => item.lcstatus !== 'Editing'); + let showMessage = true; + this.selectRow.forEach(item => { + if (this.selectRow.length === 1 && item.lcstatus !== "Editing" && showMessage) { + this.$message.warning('鍙湁鐘舵�佹槸銆愮紪杈戜腑銆戠殑鏁版嵁鎵嶅彲浠ュ彂璧锋祦绋�'); + showMessage = false; + } else if (hasEditing && showMessage) { + this.$message.warning('鎮ㄩ�夋嫨鐨勬暟鎹叏閮ㄤ负銆愮紪杈戜腑銆戞墠鍙互鍙戣捣娴佺▼'); + showMessage = false; + } else if (showMessage) { + processTS({templateId: this.templateOid, buttonTypeKey: 'PUBLIC'}).then(res => { + if (res.data.records != [] && res.data.code != 200) { + this.userName = localStorage.getItem("username"); + this.parameter.template = this.userName + "-鍙戝竷" + "[鐗╁搧]"; + this.parameter.type = 'PUBLIC' + this.title = '娴佺▼瀹℃壒' + this.visibleFlow = true; + this.onLoad() + } else { + this.$confirm('褰撳墠鍒嗙被娌℃湁娣诲姞娴佺▼妯℃澘锛屾槸鍚︿笉鐢ㄦ祦绋嬪鎵圭洿鎺ユ墽琛�?', '鎻愮ず', { + confirmButtonText: '纭畾', + cancelButtonText: '鍙栨秷', + type: 'warning' + }).then(() => { + this.userName = localStorage.getItem("username"); + this.parameter.template = this.userName + "-鍙戝竷" + "[鐗╁搧]"; + this.parameter.type = 'PUBLIC' + this.title = '娴佺▼瀹℃壒' + this.visibleFlow = true; + this.onLoad() + }).catch(() => { + this.$message({ + type: 'info', + message: '宸插彇娑�' + }); + }) + } + }) + } + }); + } else { + this.$message.warning('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�') + } + }, + //鍋滅敤 + Deactivate() { + if (this.selectRow.length <= 0) { + this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�"); + } else { + let hasEditing = this.selectRow.every(item => item.lcstatus == 'Released'); + let showMessage = true; + this.selectRow.forEach(item => { + if (this.selectRow.length === 1 && item.lcstatus === "Disabled" && showMessage) { + this.$message.warning('閫夋嫨鐨勬暟鎹腑鐘舵�佹棤闇�鍐嶆墽琛屽綋鍓嶆搷浣�'); + showMessage = false; + } else if (this.selectRow.length >=1 && !hasEditing && showMessage) { + this.$message.warning('鎮ㄩ�夋嫨鐨勬暟鎹叏閮ㄤ负銆愬彂甯冪姸鎬併�戞墠鍙互鍙戣捣娴佺▼'); + showMessage = false; + } else if (this.selectRow.length > 1 && hasEditing && showMessage) { + processTS({ templateId: this.templateOid, buttonTypeKey: 'PUBLIC' }).then(res => { + if (res.data.records != [] && res.data.code != 200) { + this.userName = localStorage.getItem("username"); + this.parameter.template = this.userName + "鍋滅敤" + "[鐗╁搧]"; + this.parameter.type = 'DISABLE' + this.title = '鍋滅敤锛堝喕缁擄級缂栫爜鏁版嵁' + this.visibleDeactivate = true; + } else { + if (showMessage) { + showMessage = false; // 鏍囪宸叉墽琛岃繃鎿嶄綔 + this.$confirm('褰撳墠鍒嗙被娌℃湁娣诲姞娴佺▼妯℃澘锛屾槸鍚︿笉鐢ㄦ祦绋嬪鎵圭洿鎺ユ墽琛�?', '鎻愮ず', { + confirmButtonText: '纭畾', + cancelButtonText: '鍙栨秷', + type: 'warning' + }).then(() => { + const index = this.$route.query.id.indexOf('@'); + const result = this.$route.query.id.substring(0, index); + const oid = this.selectRow.map(obj => obj.oid).join(","); + changeStatus({ oid: oid, btmname: result, lcStatus: 'Disabled' }).then(res => { + console.log(res); + if(res.data.code == 200 ){ + this.$message.success('鍋滅敤鎴愬姛') + this.onLoad() + } + }); + }).catch(() => { + this.$message({ + type: 'info', + message: '宸插彇娑�' + }); + }); + } + } + }); + }else { + this.$message.warning('鎮ㄩ�夋嫨鐨勬暟鎹负銆愬彂甯冪姸鎬併�戞墠鍙互鍙戣捣娴佺▼') + } + }); + } + }, + //鍚敤 + Enable() { + if (this.selectRow.length <= 0) { + this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�"); + } else { + let hasEditing = this.selectRow.every(item => item.lcstatus == 'Disabled'); + console.log('hasEditing',hasEditing) + let showMessage = true; + this.selectRow.forEach(item => { + if (this.selectRow.length === 1 && item.lcstatus !== "Disabled" && showMessage) { + this.$message.warning('閫夋嫨鐨勬暟鎹腑鐘舵�佹棤闇�鍐嶆墽琛屽綋鍓嶆搷浣�'); + showMessage = false; + } else if (this.selectRow.length >=1 && hasEditing && showMessage) { + processTS({ templateId: this.templateOid, buttonTypeKey: 'PUBLIC' }).then(res => { + if (res.data.records != [] && res.data.code != 200) { + this.userName = localStorage.getItem("username"); + this.parameter.template = this.userName + "鍚敤" + "[鐗╁搧]"; + this.parameter.type = 'Released' + this.title = '鍚敤缂栫爜鏁版嵁' + this.visibleDeactivate = true; + } else { + if (showMessage) { + showMessage = false; // 鏍囪宸叉墽琛岃繃鎿嶄綔 + this.$confirm('褰撳墠鍒嗙被娌℃湁娣诲姞娴佺▼妯℃澘锛屾槸鍚︿笉鐢ㄦ祦绋嬪鎵圭洿鎺ユ墽琛�?', '鎻愮ず', { + confirmButtonText: '纭畾', + cancelButtonText: '鍙栨秷', + type: 'warning' + }).then(() => { + const index = this.$route.query.id.indexOf('@'); + const result = this.$route.query.id.substring(0, index); + const oid = this.selectRow.map(obj => obj.oid).join(","); + changeStatus({ oid: oid, btmname: result, lcStatus: 'Released' }).then(res => { + console.log(res); + if(res.data.code == 200 ){ + this.$message.success('鍚敤鎴愬姛') + this.onLoad() + } + }); + }).catch(() => { + this.$message({ + type: 'info', + message: '宸插彇娑�' + }); + }); + } + } + }); + } else if (this.selectRow.length >1 && !hasEditing && showMessage) { + this.$message.warning('鎮ㄩ�夋嫨鐨勬暟鎹叏閮ㄤ负銆愬仠鐢ㄧ姸鎬併�戞墠鍙互鍙戣捣娴佺▼'); + showMessage = false; + } + }); + } + }, + //鍥炴敹 + Recovery() { + if (this.selectRow.length <= 0) { + this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�"); + } else { + // 缂栬緫涓�-鍙兘鍙戝竷锛屼笉鑳藉洖鏀� + // 瀹℃牳涓�-浠�涔堥兘涓嶈兘鍋� + // 宸插彂甯�-鍋滅敤銆佸洖鏀� + // 鍋滅敤-鍙兘鍚敤銆佸洖鏀� + const disabledCount = this.selectRow.filter(item => item.lcstatus === 'Disabled').length; + const releasedCount = this.selectRow.filter(item => item.lcstatus === 'Released').length; + console.log('hasEditing',disabledCount,releasedCount) + let showMessage = true; + this.selectRow.forEach(item => { + if (this.selectRow.length === 1 && item.lcstatus == "TakeBack" && showMessage) { + this.$message.warning('閫夋嫨鐨勬暟鎹腑鐘舵�佹棤闇�鍐嶆墽琛屽綋鍓嶆搷浣�'); + showMessage = false; + } else if (this.selectRow.length >=1 && (disabledCount === this.selectRow.length || releasedCount === this.selectRow.length) || (disabledCount > 0 && releasedCount > 0) && showMessage) { + //disabledCount 鍜� releasedCount 涓换鎰忎竴涓瓑浜� this.selectRow 鏁扮粍鐨勯暱搴﹀垯琛ㄧず鍏ㄩ儴鏄悓涓�绉嶇姸鎬侊紝杩斿洖 true 濡傛灉disabledCount 鍜� releasedCount 閮藉ぇ浜�0锛屽垯琛ㄧず鏃㈡湁Disabled涔熸湁Released杩斿洖 true + processTS({ templateId: this.templateOid, buttonTypeKey: 'PUBLIC' }).then(res => { + if (res.data.records != [] && res.data.code != 200) { + this.userName = localStorage.getItem("username"); + this.parameter.template = this.userName + "鍥炴敹" + "[鐗╁搧]"; + this.parameter.type = 'TakeBack' + this.title = '鍥炴敹缂栫爜鏁版嵁' + this.visibleDeactivate = true; + } else { + if (showMessage) { + showMessage = false; // 鏍囪宸叉墽琛岃繃鎿嶄綔 + this.$confirm('褰撳墠鍒嗙被娌℃湁娣诲姞娴佺▼妯℃澘锛屾槸鍚︿笉鐢ㄦ祦绋嬪鎵圭洿鎺ユ墽琛�?', '鎻愮ず', { + confirmButtonText: '纭畾', + cancelButtonText: '鍙栨秷', + type: 'warning' + }).then(() => { + const index = this.$route.query.id.indexOf('@'); + const result = this.$route.query.id.substring(0, index); + const oid = this.selectRow.map(obj => obj.oid).join(","); + changeStatus({ oid: oid, btmname: result, lcStatus: 'TakeBack' }).then(res => { + console.log(res); + if(res.data.code == 200 ){ + this.$message.success('鍥炴敹鎴愬姛') + this.onLoad() + } + }); + }).catch(() => { + this.$message({ + type: 'info', + message: '宸插彇娑�' + }); + }); + } + } + }); + } else if (this.selectRow.length >=1 && !(disabledCount === this.selectRow.length || releasedCount === this.selectRow.length) || (disabledCount > 0 && releasedCount > 0) && showMessage) { + this.$message.warning('鎮ㄩ�夋嫨鐨勬暟鎹叏閮ㄤ负銆愬仠鐢ㄧ姸鎬佹垨鍙戝竷鐘舵�併�戞墠鍙互鍙戣捣娴佺▼'); + showMessage = false; + } + }); + } }, handleSizeChange(val) { this.isLoading = true; @@ -358,10 +626,10 @@ this.editShow = column.property; this.rowOid = row.oid; }, - handleRowClick(row,column){ - this.fileOptions.ownbizOid= row.oid; - this.fileOptions.ownbizBtm=row.btmname; - this.$refs.crud.toggleRowSelection(row); + handleRowClick(row, column) { + this.fileOptions.ownbizOid = row.oid; + this.fileOptions.ownbizBtm = row.btmname; + this.$refs.dataTable.toggleRowSelection(row); }, //鍒犻櫎 enumDeleteRow(row) { @@ -442,10 +710,10 @@ await TableData({ templateOid: this.templateOid, codeClassifyOid: this.codeClassifyOid, - page: val.currentPage, - limit: val.pageSize, + page: this.page.currentPage, + limit: this.page.pageSize, }).then((res) => { - this.data = res.data.data; + this.tableData = res.data.data; }); }, //澶氶�� @@ -455,12 +723,18 @@ list.forEach((item) => { this.parameter.ids.push(item.oid); }); + console.log(this.selectRow) }, //閫夋嫨 - handleSelection(list,row) { - this.fileOptions.ownbizOid= row.oid; - this.fileOptions.ownbizBtm=row.btmname; + handleSelection(list, row) { + this.fileOptions.ownbizOid = row.oid; + this.fileOptions.ownbizBtm = row.btmname; + }, + //閫夋嫨鍏ㄩ儴 + handleSelectionAll() { + this.fileOptions.ownbizOid = '0'; + this.fileOptions.ownbizBtm = '0'; }, //缂栬緫 editHandler() { @@ -517,25 +791,44 @@ AddSumbit(val) { this.addvisible = false; console.log(val) - addSaveCode(val).then(res=>{ + addSaveCode(val).then(res => { console.log(res) - this.onLoad() + this.$nextTick(() => { + this.onLoad() + }) }) }, EditSumbit(val) { this.editvisible = false; console.log(val) - editSaveCode(val).then(res=>{ + editSaveCode(val).then(res => { console.log(res) - this.onLoad() + this.$nextTick(() => { + this.onLoad() + }) }) }, openBatchImport(type) { this.batchImportData.visible = true this.batchImportData.type = type this.batchImportData.codeClassifyOid = this.codeClassifyOid + }, + //杈撳叆鍥炶溅鎼滅储 + tableFindInp() { + if (this.WupinFindValue.trim() === '') { + this.$message.warning('杈撳叆鍊间笉鑳戒负绌�') + return; + } + this.tableData = this.searchResults.filter(item => { + if (typeof item.name === 'string') { + return item.name.includes(this.WupinFindValue); + } else { + return false; // item.name涓嶆槸瀛楃涓茬被鍨嬶紝杩斿洖false + } + }); } - }, + + } }; </script> @@ -560,6 +853,7 @@ height: calc(100vh - 150px); min-height: 400px; } + .top { overflow-y: scroll; min-height: 55%; @@ -567,7 +861,10 @@ .bottom { margin-top: 20px; - max-height: 43%; overflow-y: scroll; } + +.el-collapse-item__content { + padding-bottom: 0; +} </style> -- Gitblit v1.9.3