From 9c622c05702484fa4942647099cdbdbb3bec50bc Mon Sep 17 00:00:00 2001 From: fujunling <2984387807@qq.com> Date: 星期一, 19 六月 2023 10:19:56 +0800 Subject: [PATCH] 解决proxy冲突 --- Source/UBCS-WEB/src/components/Crud/Crud.vue | 495 +++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 408 insertions(+), 87 deletions(-) diff --git a/Source/UBCS-WEB/src/components/Crud/Crud.vue b/Source/UBCS-WEB/src/components/Crud/Crud.vue index 4e4eda7..53cd177 100644 --- a/Source/UBCS-WEB/src/components/Crud/Crud.vue +++ b/Source/UBCS-WEB/src/components/Crud/Crud.vue @@ -1,140 +1,461 @@ <template> -<basic-container> - <avue-crud ref="crud" - :data="data" - :option="option" - @sort-change="sortChange" - v-loading="loading" - :page="page" - @selection-change="selectionChange" - @on-load="onLoad"> - <template slot="menu"> - <el-button type="text">鏂囧瓧鎸夐挳</el-button> - </template> - </avue-crud> -</basic-container> + <basic-container> + <div class="testbox"> + <div style="margin-top: 10px;display: flex;flex-wrap: wrap;width: 100%;"> + <el-button plain size="small" type="primary" @click="addvisible=true">澧炲姞 + </el-button> + <FormTemplateDialog + :codeClassifyOid="this.codeClassifyOid" + :codeRuleOid="this.codeRuleOid" + :disabledProp="disabledProp" + :templateOid="templateOid" + :type="add" + :visible.sync="addvisible" + > + </FormTemplateDialog> + <el-button plain size="small" type="primary" @click="editHandler">缂栬緫 + </el-button> + <FormTemplateDialog + :codeClassifyOid="this.codeClassifyOid" + :codeRuleOid="this.codeRuleOid" + :disabledProp="disabledProp" + :rowOid="rowOid" + :templateOid="templateOid" + :type="edit" + :title="'淇敼缂栫爜淇℃伅'" + :visible.sync="editvisible" + ></FormTemplateDialog> + <el-button plain size="small" type="primary">鎵归噺瀵煎叆鐢宠</el-button> + <el-button plain size="small" type="primary">鍘嗗彶鏁版嵁瀵煎叆</el-button> + <el-button plain size="small" type="primary">鎵归噺鐢宠缂栫爜</el-button> + <el-button plain size="small" type="primary">鎵归噺鍙戝竷</el-button> + <el-button plain size="small" type="primary">鏌ョ湅娴佺▼鍘嗗彶</el-button> + <el-button plain size="small" type="primary">鍒犻櫎</el-button> + <el-button plain size="small" type="primary" @click="setHandler">鍙戝竷</el-button> + <set-personnel :visible.sync="visibleFlow" :parameter="parameter" + type="PUBLIC"></set-personnel> + <el-button plain size="small" type="primary" @click="DataChange">鏁版嵁鏇存敼</el-button> + <FormTemplateDialog + :codeClassifyOid="this.codeClassifyOid" + :codeRuleOid="this.codeRuleOid" + :disabledProp="disabledProp" + :rowOid="rowOid" + :templateOid="templateOid" + :type="edit" + :title="'宸插彂甯冩暟鎹洿鏀�'" + :visible.sync="DataVisible" + ></FormTemplateDialog> + <el-button plain size="small" type="primary" @click="huishouHandler">鍥炴敹</el-button> + <el-button plain size="small" type="primary" @click="openD">瀵煎嚭 + <integration-transfer :data="transferData" :props="transferProps" + :visible.sync="dialogPush" @save="handelTransferSave"></integration-transfer> + </el-button> + <el-button plain size="small" type="primary" @click="findHandler">鏌ヨ + <advanced-query :options="this.options" :visible.sync="findvisible" + @echoContion="echoContion"></advanced-query> + </el-button> + <el-button plain size="small" type="primary">鐩镐技椤规煡璇�</el-button> + <el-button plain size="small" style="margin-left: 1px;margin-top:10px" type="primary">鍒锋柊</el-button> + <el-input placeholder="璇疯緭鍏ュ叧閿瓧鎸夊洖杞︽煡璇�" size="small" + style="width: 180px;margin-left: 5px;margin-top:10px"></el-input> + </div> + <el-row style="height: 700px;width: 100%"> + <el-table v-loading="isLoading" :data="tableData" max-height="700" style="" @cell-click="handleCellClick" + @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-column> +<!-- <div>--> + <el-table-column v-for="(item,index) in this.tableHeadFindData" :key="item.id" :label="item.label" :prop="item.prop" :sortable="item.sortable" > + <!-- 缂栬緫鍜屽睍绀洪�昏緫 --> + <!-- <template slot-scope="{ row }">--> + <!-- <el-input v-if="editingRow === row && editShow== item.prop" v-model="row[item.prop]" @blur="saveRow"></el-input>--> + <!-- <span v-else>{{row[item.prop]}}</span>--> + <!-- <el-switch--> + <!-- v-if="editShow === 'true'"--> + <!-- v-model="row[item.prop]"--> + <!-- active-color="#13ce66"--> + <!-- inactive-color="#ff4949">--> + <!-- </el-switch>--> + <!-- </template>--> + </el-table-column> +<!-- </div>--> + </el-table> + </el-row> + </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> + </basic-container> </template> - <script> -import { MasterTable,TableData } from "@/api/GetItem"; +import {MasterTable, TableData,FindData} from "@/api/GetItem"; +import {listCodeAttributeByClassId} from '@/api/integration/integration.js' +import integrationTransfer from '@/views/integration/integrationTransfer' +import SetPersonnel from '@/components/template/SetPersonnel' + export default { + components: { + integrationTransfer, + SetPersonnel + }, name: "Crud.vue", - data(){ - return{ - loading:false, - data:[], - option:{ - //榛樿楂樺害, - align:'center', - menuAlign:'center', - addBtn:false, - editBtn:false, - selection:true, - selectionFixed:false, - index:true, - column:[] + props: { + page: { + type: Object, + default: () => { + return {} + } + }, + codeClassifyOid: { + type: String, + default: "" + }, + coderuleoid: { + type: String, + default: "" + }, + tableDataArray: { + type: Array, + }, + total: { + type: String, + default: "" + }, + templateOid: { + type: String, + }, + tableHeadDataFateher: { + type: Array, + }, + isLoading: { + type: Boolean, + default: false + }, + tableHeadFindData:{ + type:Array, + } + }, + data() { + return { + //鍙戝竷 + parameter:{ + ids:['0000','22222222'], + code:'8b5e2017-990f-454a-9c39-4c4eeeb57553', + type:'PUBLIC', + name:'妯℃澘name', + template:'妯℃澘template' }, - List:[], + visibleFlow: false, + transferData: [], + transferProps: { + key: 'oid', + label: 'name' + }, + tableHeadFindDatas:[], + templateOid: "", + addvisible: false, + editvisible: false, + findvisible: false, + dialogPush: false, + rowOid: '', + disabledProp: ["id"], + editingRow: null, + editShow: "", + editAttr: "", + data: [], + options: {}, + option: { + column: [] + }, + List: [], columnType: { text: "input", combox: "select", truefalse: "switch", number: "number", - datetime:"datetime", + datetime: "datetime", }, - page:{ - total: 0, - currentPage: 1, - pageSize: 10, - pageSizes: [10, 30, 50, 100, 200], - }, + tableData: [], + DataVisible:false, + tableHeadData: [], + items: {}, + seniorQueryColumns: [], + selectRow: [] } }, + computed: {}, created() { - this.CrudHeaderRend(); - this.CrudRend() + // this.CrudHeaderRend(); + // this.tableHeadHandle() + }, + mounted() { + }, activated() { this.doLayout() }, - methods:{ + watch: { + codeClassifyOid: { + handler(newval, oldval) { + this.codeClassifyOid = newval; + this.CrudHeaderRend() + }, + deep: true + }, + tableDataArray: { + handler(newval, oldval) { + this.tableData = newval; + } + }, + tableHeadFindData:{ + handler(newval, oldval) { + this.tableHeadFindDatas = newval; + } + }, + total: { + handler(newval, oldval) { + this.page.total = newval; + } + }, + // tableHeadDataFateher: { + // handler(newval, oldval) { + // let List = newval.tableDefineVO.cols[0]; + // List.forEach(item => { + // let columnItem = { + // label: item.title, + // prop: item.field, + // type: this.columnType[item.type], + // sortable: item.sort, + // width: item.minWidth + // }; + // this.tableHeadData.push(columnItem); + // console.log('table',this.tableHeadData) + // }) + // } + // } + }, + methods: { + setHandler() { + this.visibleFlow = true + }, + huishouHandler() { + console.log('tem', this.templateOid) + console.log('table', this.tableData) + console.log('tabheadle', this.tableHeadData) + console.log('tableFather', this.tableHeadDataFateher) + }, + openD() { + this.dialogPush = true; + this.getListCodeByClassId() + }, + async getListCodeByClassId() { + this.transferData = [] + const response = await listCodeAttributeByClassId({codeClassifyId: this.codeClassifyOid}) + if (response.status === 200) { + const data = response.data.data + this.transferData = data + } + }, + rend() { + this.tableData = this.tableHeadData + }, + handleSizeChange(val) { + this.isLoading = true; + setTimeout(() => { + this.page.pageSize = val + this.$emit('pageSize', val) + this.CrudRend() + }, 3000); + + }, + handleCurrentChange(val) { + this.isLoading = true; + setTimeout(() => { + this.page.currentPage = val + this.$emit('currentPage', val) + this.CrudRend() + }, 3000); + }, + // 鐩戝惉鍗曞厓鏍肩偣鍑讳簨浠跺苟瀛樺偍姝e湪缂栬緫鐨勮 + handleCellClick(row, column) { + this.editingRow = row; + this.editShow = column.property; + this.rowOid = row.oid + }, + //鍒犻櫎 + enumDeleteRow(row) { + this.tableData.splice(row, 1) + }, + // 灏嗘鍦ㄧ紪杈戠殑琛岀殑鐘舵�佸彉涓� null 锛屽嵆閫�鍑虹紪杈戠姸鎬� + saveRow() { + this.editingRow = null; + }, doLayout() { this.$nextTick(() => { this.$refs.crud.doLayout(); }); }, - //琛ㄦ牸澶存覆鏌� - CrudHeaderRend(){ - MasterTable({codeClassifyOid:"D9CF223F-317D-71EB-BD11-433A94CAD9F3",functionId: 5,_: 1685067339479}).then(res=>{ - this.List=res.data.tableDefineVO.cols[0]; - this.List.forEach(item=>{ - let columnItem={ - label:item.title, - prop:item.field, - type:this.columnType[item.type], - sortable:item.sort, - width:item.minWidth - }; - this.option.column.push(columnItem); - - }) + tableHeadHandle() { + this.options = this.tableHeadDataFateher.tableDefineVO.seniorQueryColumns + this.List = this.tableHeadDataFateher.tableDefineVO.cols[0]; + this.List.forEach(item => { + let columnItem = { + label: item.title, + prop: item.field, + type: this.columnType[item.type], + sortable: item.sort, + width: item.minWidth + }; + this.option.column.push(columnItem); + this.option.column = this.tableHeadData; }) }, + //琛ㄦ牸澶存覆鏌� + CrudHeaderRend() { + if (this.codeClassifyOid != "") { + MasterTable({ + codeClassifyOid: this.codeClassifyOid, + functionId: 5, + }).then(res => { + this.options = res.data.tableDefineVO.seniorQueryColumns + this.List = res.data.tableDefineVO.cols[0]; + this.List.forEach(item => { + let columnItem = { + label: item.title, + prop: item.field, + type: this.columnType[item.type], + sortable: item.sort, + width: item.minWidth + }; + this.option.column.push(columnItem); + this.option.column = this.tableHeadData; + this.templateOid = res.data.tableDefineVO.oid + this.$emit('templateOid', this.templateOid) + }) + }) + } + }, //琛ㄦ牸鏁版嵁 - CrudRend(){ - TableData({templateOid: "A12826E4-2B66-6D56-DE30-92BB1D7F607F", - codeClassifyOid: "D9CF223F-317D-71EB-BD11-433A94CAD9F3", + CrudRend() { + TableData({ + templateOid: this.templateOid, + codeClassifyOid: this.codeClassifyOid, page: this.page.currentPage, limit: this.page.pageSize, - _: 1685089123575 - }).then(res=>{ - this.page.total=res.data.total; - this.data=res.data.data; + }).then(res => { + this.page.total = res.data.total; + this.data = res.data.data; + this.tableData = res.data.data; }) }, // 鎺掑簭 - sortChange(val){ - this.loading=true; - let order="" - if(val.order == "ascending"){ - order="asc"; - }else { - order="desc"; + sortChange(val) { + this.isLoading = true; + let order = "" + if (val.order == "ascending") { + order = "asc"; + } else { + order = "desc"; } - TableData( { - templateOid: "A12826E4-2B66-6D56-DE30-92BB1D7F607F", - codeClassifyOid: "D9CF223F-317D-71EB-BD11-433A94CAD9F3", - order:order, - sort:val.prop, + TableData({ + templateOid: this.templateOid, + codeClassifyOid: this.codeClassifyOid, + order: order, + sort: val.prop, page: this.page.currentPage, limit: this.page.pageSize, - }).then(res=>{ + }).then(res => { setTimeout(() => { - this.data=res.data.data; - this.loading=false; + this.data = res.data.data; + this.isLoading = false; }, 100); }) }, //鍒嗛〉鍒锋柊 - async onLoad(val){ - console.log(val) - await TableData({templateOid: "A12826E4-2B66-6D56-DE30-92BB1D7F607F", - codeClassifyOid: "D9CF223F-317D-71EB-BD11-433A94CAD9F3", + async onLoad(val) { + console.log('鍒嗛〉', this.templateOid) + await TableData({ + templateOid: this.templateOid, + codeClassifyOid: this.codeClassifyOid, page: val.currentPage, limit: val.pageSize, - _: 1685089123575 - }).then(res=>{ - this.data=res.data.data; + }).then(res => { + this.data = res.data.data; }) }, //澶氶�� - selectionChange(row){ + handleSelectionChange(row) { console.log(row) + this.rowOid = row.oid + this.selectRow = row + }, + //缂栬緫 + editHandler() { + if (this.selectRow.length <= 0) { + this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�') + } else if (this.selectRow.length > 1) { + this.$message.warning('鍙兘閫夋嫨涓�鏉℃暟鎹�') + } else if (this.selectRow[0].lcstatus != 'Editing') { + this.$message.warning('缂栫爜鐘舵�佷笉鏄�滅紪杈戜腑鈥�,涓嶅彲缂栬緫') + } else { + this.editvisible = true + } + }, + //楂樼骇鏌ヨ鎸夐挳 + findHandler(){ + this.findvisible=true + }, + // 楂樼骇鏌ヨ + echoContion(val) { + console.log(val) + FindData({templateOid:this.templateOid, + codeClassifyOid: this.codeClassifyOid, + ...val + }).then(res=>{ + console.log(res) + }) + }, + //鏁版嵁鏇存敼 + DataChange(){ + if (this.selectRow.length <= 0) { + this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�') + } else if (this.selectRow.length > 1) { + this.$message.warning('鍙兘閫夋嫨涓�鏉℃暟鎹�') + } else if (this.selectRow[0].lcstatus != 'Released') { + this.$message.warning('鍙湁鐘舵�佷负宸插彂甯冪殑鏁版嵁鎵嶈兘杩涜鏁版嵁鏇存敼') + } else { + this.DataVisible = true + } } } } </script> -<style scoped> +<style lang="scss" scoped> +.testbox { + .el-table--scrollable-x .el-table__body-wrapper { + overflow: auto !important; + } + .el-table__fixed-right-patch { + background-color: #f5f7fa !important; + } +} </style> -- Gitblit v1.9.3