From 188777688de73a27e3913eb773062ddfb1a9bf58 Mon Sep 17 00:00:00 2001 From: 田源 <lastanimals@163.com> Date: 星期二, 27 六月 2023 15:14:22 +0800 Subject: [PATCH] 更新 --- Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue | 364 ++++++++++++++++++++++++++++----------------------- Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue | 32 +++- Source/UBCS-WEB/vue.config.js | 6 Source/UBCS-WEB/src/components/Master/MasterTree.vue | 11 4 files changed, 233 insertions(+), 180 deletions(-) diff --git a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue index fe309bf..0992b9c 100644 --- a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue +++ b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue @@ -2,9 +2,11 @@ <basic-container> <div class="testbox"> <div> - <el-button plain size="small" type="primary" @click="addvisible=true">澧炲姞 + <el-button plain size="small" type="primary" @click="addvisible = true" + >澧炲姞 </el-button> - <el-button plain size="small" type="primary" @click="editHandler">缂栬緫 + <el-button plain size="small" type="primary" @click="editHandler" + >缂栬緫 </el-button> <el-button plain size="small" type="primary">鎵归噺瀵煎叆鐢宠</el-button> <el-button plain size="small" type="primary">鍘嗗彶鏁版嵁瀵煎叆</el-button> @@ -12,47 +14,65 @@ <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> - <el-button plain size="small" type="primary" @click="DataChange">鏁版嵁鏇存敼</el-button> - <el-button plain size="small" type="primary" @click="huishouHandler">鍥炴敹</el-button> - <el-button plain size="small" type="primary" @click="openD">瀵煎嚭 + <el-button plain size="small" type="primary" @click="setHandler" + >鍙戝竷</el-button + > + <el-button plain size="small" type="primary" @click="DataChange" + >鏁版嵁鏇存敼</el-button + > + <el-button plain size="small" type="primary" @click="huishouHandler" + >鍥炴敹</el-button + > + <el-button plain size="small" type="primary" @click="openD" + >瀵煎嚭 </el-button> - <el-button plain size="small" type="primary" @click="findHandler">鏌ヨ + <el-button plain size="small" type="primary" @click="findHandler" + >鏌ヨ </el-button> - <el-button plain size="small" type="primary" @click="similarHandler">鐩镐技椤规煡璇�</el-button> + <el-button plain size="small" type="primary" @click="similarHandler" + >鐩镐技椤规煡璇�</el-button + > <el-button plain size="small" type="primary">鍒锋柊</el-button> - <el-input placeholder="璇疯緭鍏ュ叧閿瓧鎸夊洖杞︽煡璇�" size="small" - style="width: 180px;margin-left: 5px;margin-top:10px"></el-input> + <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" v-if="tableData.length != 0"> - <el-table-column - fixed - type="selection" - width="55"> + <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" + v-if="tableData.length != 0" + > + <el-table-column fixed type="selection" width="55"> </el-table-column> + <el-table-column fixed label="搴忓彿" type="index" width="55"> </el-table-column> <el-table-column - fixed - label="搴忓彿" - type="index" - width="55"> + v-for="item in this.tableHeadFindData" + :key="item.id" + :label="item.label" + :prop="item.prop" + :sortable="item.sortable" + :formatter="formatBoolean" + > + <!-- 缂栬緫鍜屽睍绀洪�昏緫 --> + <!-- <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-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> <FormTemplateDialog @@ -86,12 +106,21 @@ :title="'宸插彂甯冩暟鎹洿鏀�'" :visible.sync="DataVisible" ></FormTemplateDialog> - <set-personnel :visible.sync="visibleFlow" :parameter="this.parameter" + <set-personnel + :visible.sync="visibleFlow" + :parameter="this.parameter" ></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> + <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> <ResembleQueryDialog :visible.sync="similarVisible" :templateOid="templateOid" @@ -100,7 +129,7 @@ :codeRuleOid="this.codeRuleOid" ></ResembleQueryDialog> </div> - <div class="block" style="display: flex;justify-content: flex-end"> + <div class="block" style="display: flex; justify-content: flex-end"> <el-pagination :current-page="page.currentPage" :page-size="page.pageSizes" @@ -108,84 +137,85 @@ :total="page.total" layout="total, sizes, prev, pager, next, jumper" @size-change="handleSizeChange" - @current-change="handleCurrentChange"> + @current-change="handleCurrentChange" + > </el-pagination> </div> </basic-container> </template> <script> -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' +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"; import ResembleQueryDialog from "@/components/FormTemplate/ResembleQueryDialog.vue"; export default { components: { integrationTransfer, SetPersonnel, - ResembleQueryDialog + ResembleQueryDialog, }, name: "Crud.vue", props: { page: { type: Object, default: () => { - return {} - } + return {}; + }, }, codeClassifyOid: { type: String, - default: "" + default: "", }, coderuleoid: { type: String, - default: "" + default: "", }, tableDataArray: { type: Array, }, total: { type: String, - default: "" + default: "", }, templateOid: { type: String, - default:'' + default: "", }, tableHeadDataFateher: { type: Array, }, isLoading: { type: Boolean, - default: false + default: false, }, - tableHeadFindData:{ - type:Array, - } + tableHeadFindData: { + type: Array, + }, }, data() { return { //鐩镐技椤规煡璇� - similarVisible:false, + similarVisible: false, //鍙戝竷 - parameter:{ - ids:[], - code:'', - type:'PUBLIC', - template:'' + parameter: { + ids: [], + code: "", + type: "PUBLIC", + template: "", }, visibleFlow: false, transferData: [], transferProps: { - key: 'oid', - label: 'name' + key: "oid", + label: "name", }, - tableHeadFindDatas:[], + tableHeadFindDatas: [], addvisible: false, editvisible: false, findvisible: false, dialogPush: false, - rowOid: '', + rowOid: "", disabledProp: ["id"], editingRow: null, editShow: "", @@ -193,7 +223,7 @@ data: [], options: {}, option: { - column: [] + column: [], }, List: [], columnType: { @@ -204,106 +234,115 @@ datetime: "datetime", }, tableData: [], - DataVisible:false, + DataVisible: false, tableHeadData: [], items: {}, seniorQueryColumns: [], selectRow: [], - userName:"" - } + userName: "", + }; }, computed: {}, - created() { - - }, - mounted() { - }, + created() {}, + mounted() {}, activated() { - this.doLayout() + this.doLayout(); }, watch: { codeClassifyOid: { handler(newval, oldval) { this.codeClassifyOid = newval; - }, - deep: true + deep: true, }, tableDataArray: { handler(newval, oldval) { this.tableData = newval; - } + }, }, - tableHeadFindData:{ + tableHeadFindData: { handler(newval, oldval) { this.tableHeadFindDatas = newval; - } + }, }, total: { handler(newval, oldval) { this.page.total = newval; - } - }, - templateOid:{ - handler(newval,oldval) { - this.parameter.code=newval; }, - deep:true - } + }, + templateOid: { + handler(newval, oldval) { + this.parameter.code = newval; + }, + deep: true, + }, }, methods: { + // 杞崲鏁版嵁true鍜宖alse + formatBoolean(row, column) { + if (column.property === "xiaoshouwl" + ||column.property === "shifoupihaoguanli" + ||column.property === "caigouwl" + ||column.property === "kucunwl" + ||column.property === "passing") { + return row[column.property] =='true'? "鏄�" : "鍚�"; + } + return row[column.property]; + }, + // 鍙戝竷 setHandler() { - console.log('1111') - console.log('鐖�',this.parameter) + console.log("1111"); + console.log("鐖�", this.parameter); if (this.selectRow.length <= 0) { - this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�') - } else { - this.userName=localStorage.getItem('username') - this.parameter.template=this.userName+'-鍙戝竷'+'[鐗╁搧]' + this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�"); + } else { + this.userName = localStorage.getItem("username"); + this.parameter.template = this.userName + "-鍙戝竷" + "[鐗╁搧]"; this.visibleFlow = true; } }, openD() { - this.getListCodeByClassId() + this.getListCodeByClassId(); }, async getListCodeByClassId() { - this.transferData = [] - const response = await listCodeAttributeByClassId({codeClassifyId: this.codeClassifyOid}) + this.transferData = []; + const response = await listCodeAttributeByClassId({ + codeClassifyId: this.codeClassifyOid, + }); if (response.status === 200) { - const data = response.data.data - this.transferData = data + const data = response.data.data; + this.transferData = data; } }, rend() { - this.tableData = this.tableHeadData + this.tableData = this.tableHeadData; }, handleSizeChange(val) { this.isLoading = true; setTimeout(() => { - this.page.pageSize = val - this.$emit('pageSize', val) - this.CrudRend() + 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() + 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 + this.rowOid = row.oid; }, //鍒犻櫎 enumDeleteRow(row) { - this.tableData.splice(row, 1) + this.tableData.splice(row, 1); }, // 灏嗘鍦ㄧ紪杈戠殑琛岀殑鐘舵�佸彉涓� null 锛屽嵆閫�鍑虹紪杈戠姸鎬� saveRow() { @@ -320,23 +359,23 @@ MasterTable({ codeClassifyOid: this.codeClassifyOid, functionId: 5, - }).then(res => { - this.options = res.data.tableDefineVO.seniorQueryColumns + }).then((res) => { + this.options = res.data.tableDefineVO.seniorQueryColumns; this.List = res.data.tableDefineVO.cols[0]; - this.List.forEach(item => { + this.List.forEach((item) => { let columnItem = { label: item.title, prop: item.field, type: this.columnType[item.type], sortable: item.sort, - width: item.minWidth + width: item.minWidth, }; this.option.column.push(columnItem); this.option.column = this.tableHeadData; - this.templateOid = res.data.tableDefineVO.oid - this.$emit('templateOid', this.templateOid) - }) - }) + this.templateOid = res.data.tableDefineVO.oid; + this.$emit("templateOid", this.templateOid); + }); + }); } }, //琛ㄦ牸鏁版嵁 @@ -346,16 +385,16 @@ codeClassifyOid: this.codeClassifyOid, page: this.page.currentPage, limit: this.page.pageSize, - }).then(res => { + }).then((res) => { this.page.total = res.data.total; this.data = res.data.data; this.tableData = res.data.data; - }) + }); }, // 鎺掑簭 sortChange(val) { this.isLoading = true; - let order = "" + let order = ""; if (val.order == "ascending") { order = "asc"; } else { @@ -368,12 +407,12 @@ sort: val.prop, page: this.page.currentPage, limit: this.page.pageSize, - }).then(res => { + }).then((res) => { setTimeout(() => { this.data = res.data.data; this.isLoading = false; }, 100); - }) + }); }, //鍒嗛〉鍒锋柊 async onLoad(val) { @@ -382,78 +421,79 @@ codeClassifyOid: this.codeClassifyOid, page: val.currentPage, limit: val.pageSize, - }).then(res => { + }).then((res) => { this.data = res.data.data; - }) + }); }, //澶氶�� handleSelectionChange(row) { - if(this.row){ + if (this.row) { this.rowOid = row[0].oid; - }else { - this.rowOid='' + } else { + this.rowOid = ""; } this.selectRow = row; - row.forEach(item=>{ - this.parameter.ids.push(item.oid) - }) + row.forEach((item) => { + this.parameter.ids.push(item.oid); + }); }, //缂栬緫 editHandler() { if (this.selectRow.length <= 0) { - this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�') + this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�"); } else if (this.selectRow.length > 1) { - this.$message.warning('鍙兘閫夋嫨涓�鏉℃暟鎹�') - } else if (this.selectRow[0].lcstatus != 'Editing') { - this.$message.warning('缂栫爜鐘舵�佷笉鏄�滅紪杈戜腑鈥�,涓嶅彲缂栬緫') + this.$message.warning("鍙兘閫夋嫨涓�鏉℃暟鎹�"); + } else if (this.selectRow[0].lcstatus != "Editing") { + this.$message.warning("缂栫爜鐘舵�佷笉鏄�滅紪杈戜腑鈥�,涓嶅彲缂栬緫"); } else { - this.editvisible = true + this.editvisible = true; } }, //楂樼骇鏌ヨ鎸夐挳 - findHandler(){ - this.findvisible=true; + findHandler() { + this.findvisible = true; }, // 楂樼骇鏌ヨ echoContion(val) { - FindData({templateOid:this.templateOid, + FindData({ + templateOid: this.templateOid, codeClassifyOid: this.codeClassifyOid, - ...val - }).then(res=>{ - }) + ...val, + }).then((res) => { + console.log(res); + }); }, //鐩镐技椤规煡璇� - similarHandler(){ + similarHandler() { if (this.selectRow.length <= 0) { - this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�') + this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�"); } else if (this.selectRow.length > 1) { - this.$message.warning('鍙兘閫夋嫨涓�鏉℃暟鎹�') - } else { - this.similarVisible=true; + this.$message.warning("鍙兘閫夋嫨涓�鏉℃暟鎹�"); + } else { + this.similarVisible = true; } - }, //鏁版嵁鏇存敼 - DataChange(){ + DataChange() { if (this.selectRow.length <= 0) { - this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�') + this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�"); } else if (this.selectRow.length > 1) { - this.$message.warning('鍙兘閫夋嫨涓�鏉℃暟鎹�') - } else if (this.selectRow[0].lcstatus != 'Released') { - this.$message.warning('鍙湁鐘舵�佷负宸插彂甯冪殑鏁版嵁鎵嶈兘杩涜鏁版嵁鏇存敼') + this.$message.warning("鍙兘閫夋嫨涓�鏉℃暟鎹�"); + } else if (this.selectRow[0].lcstatus != "Released") { + this.$message.warning("鍙湁鐘舵�佷负宸插彂甯冪殑鏁版嵁鎵嶈兘杩涜鏁版嵁鏇存敼"); } else { - this.DataVisible = true + this.DataVisible = true; } }, //澧炲姞淇濆瓨 - AddSumbit(val){ - this.addvisible=false + AddSumbit() { + this.addvisible = false; }, - EditSumbit(val){ - this.editvisible=false - } - } -} + EditSumbit(val) { + this.editvisible = false; + }, + }, +}; </script> <style lang="scss" scoped> diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue index 3163e4a..4d63d27 100644 --- a/Source/UBCS-WEB/src/components/Master/MasterTree.vue +++ b/Source/UBCS-WEB/src/components/Master/MasterTree.vue @@ -68,14 +68,14 @@ } }, created() { - this.getTreeList() + this.getTreeLists() }, computed:{ }, methods:{ //鑾峰彇鏁版嵁 - getTreeList(){ + getTreeLists(){ getTreeList({'conditionMap[id]': 'wupin'}).then(res=>{ this.Treedata=res.data this.ModifyProperties(this.Treedata, 'text', 'label'); @@ -146,14 +146,13 @@ async nodeClick(data) { try { this.nodeClickList = data; + this.tableHeadDataFateher=[] + this.tableHeadFindData=[] await this.TableHeadRend(); // 鍏堟墽琛� TableHeadRend() this.TableRend(); // TableHeadRend() 鏂规硶瀹屾垚鍚庡啀鎵ц TableRend() this.$emit('nodeClick',this.templateOids) this.$emit("codeClassifyOid", this.nodeClickList.oid ) - // console.log('鍏冩暟鎹�',this.templateOids) - // console.log('鍏冩暟鎹甤od',this.codeClassifyOid) - // console.log('鍏冩暟鎹畁odeclick', this.nodeClickList.oid) - // console.log(this.tableHeadFindData) + } catch (error) { // 澶勭悊閿欒 this.$message.error(error) diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue b/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue index cb2f4ff..d0270c8 100644 --- a/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue +++ b/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue @@ -26,6 +26,7 @@ </template> <script> +import {defaultReferDataGrid} from '@/api/MasterData/master' export default { name: "classifyTreeform.vue", props: ['loneTreeNewForm','flag'], @@ -197,6 +198,9 @@ masterSelectList:[] } }, + created() { + + }, methods: { submit(form, done) { this.$message.success(JSON.stringify(form)); @@ -211,15 +215,22 @@ console.log(this.dialogVisible) }, MasterHandlerClick(){ - if(this.masterSelectList.length>1){ - this.$message.warning('鍙兘閫夋嫨涓�鏉℃暟鎹�') - }else if(this.masterSelectList.length<=0){ - this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�') - }else { - this.dialogVisible=false; - console.log(this.masterInput) - console.log(this.MasterSearchSelect) - } + defaultReferDataGrid({ + referType:'coderule', + isMuti:'false', + 'conditionMap["lcstatus"]':'Released' + }).then(res=>{ + console.log('---',res) + }) + // if(this.masterSelectList.length>1){ + // this.$message.warning('鍙兘閫夋嫨涓�鏉℃暟鎹�') + // }else if(this.masterSelectList.length<=0){ + // this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�') + // }else { + // this.dialogVisible=false; + // console.log(this.masterInput) + // console.log(this.MasterSearchSelect) + // } }, masterSelect(row){ console.log(row) @@ -232,3 +243,6 @@ <style scoped> </style> + +<!--uiDataController/defaultReferDataGrid?referBo=coderule&isMuti=false&conditionMap%5B%22lcstatus%22%5D=Released--> +<!--uiDataController/defaultReferDataGrid?conditionMap%5B%22lcstatus%22%5D=Released&referBo=coderule&isMuti=false&_=1687831291212--> diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js index 7b531e2..36148eb 100644 --- a/Source/UBCS-WEB/vue.config.js +++ b/Source/UBCS-WEB/vue.config.js @@ -29,13 +29,13 @@ // target: 'http://localhost:37000', // target: 'http://192.168.1.51:37000', // target: 'http://192.168.1.46:37000', - target: 'http://dev.vci-tech.com:37000', + // target: 'http://dev.vci-tech.com:37000', // target: 'http://192.168.1.51:37000/', // target: 'http://192.168.1.104:37000', // target: 'http://192.168.1.63:37000', //target: 'http://192.168.3.7:37000', - // target: 'http://dev.vci-tech.com:37000', - //target: 'http://192.168.1.51:37000/', + target: 'http://dev.vci-tech.com:37000', + // target: 'http://192.168.1.51:37000/', // target:'http://192.168.1.104:37000', //杩滅▼婕旂ず鏈嶅姟鍦板潃,鍙敤浜庣洿鎺ュ惎鍔ㄩ」鐩� // target: 'https://saber.bladex.vip/api', -- Gitblit v1.9.3