From 859a64b36d107b147f44eccd0c0a76471c5e49ea Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 15 六月 2023 18:20:39 +0800
Subject: [PATCH] 优化bug
---
Source/UBCS-WEB/src/components/Tree/classifyTrees.vue | 108 +++++--
Source/UBCS-WEB/src/components/Crud/Crud.vue | 52 ++-
Source/UBCS-WEB/src/views/system/PasswordManagement/passwords.vue | 53 +--
Source/UBCS-WEB/src/api/GetItem.js | 4
Source/UBCS-WEB/src/views/MasterData/items.vue | 22 +
Source/UBCS-WEB/vue.config.js | 8
Source/UBCS-WEB/src/components/template/Stage.vue | 3
Source/UBCS-WEB/src/api/system/passwords.js | 7
Source/UBCS-WEB/src/views/system/dept.vue | 12
Source/UBCS-WEB/src/api/system/dept.js | 6
Source/UBCS-WEB/src/components/Master/MasterTree.vue | 55 +--
Source/UBCS-WEB/src/components/Tree/TemplatePro.vue | 316 ----------------------
Source/UBCS-WEB/src/components/Tree/attrCrud.vue | 147 +++++++++
13 files changed, 340 insertions(+), 453 deletions(-)
diff --git a/Source/UBCS-WEB/src/api/GetItem.js b/Source/UBCS-WEB/src/api/GetItem.js
index 6f4b1ac..38823e7 100644
--- a/Source/UBCS-WEB/src/api/GetItem.js
+++ b/Source/UBCS-WEB/src/api/GetItem.js
@@ -2,7 +2,7 @@
export const MasterTable =(params)=>{
return request({
- url: 'api/ubcs-code/ubcs-code/mdmEngineController/getUIInfoByClassifyOid',
+ url: 'api/ubcs-code/mdmEngineController/getUIInfoByClassifyOid',
method: 'get',
params:{
...params
@@ -12,7 +12,7 @@
export const TableData =(params)=>{
return request({
- url: 'api/ubcs-code/ubcs-code/mdmEngineController/gridTableDataByClassifyOid',
+ url: 'api/ubcs-code/mdmEngineController/gridTableDataByClassifyOid',
method: 'get',
params:{
...params
diff --git a/Source/UBCS-WEB/src/api/system/dept.js b/Source/UBCS-WEB/src/api/system/dept.js
index d05c15d..9f41441 100644
--- a/Source/UBCS-WEB/src/api/system/dept.js
+++ b/Source/UBCS-WEB/src/api/system/dept.js
@@ -12,13 +12,15 @@
})
}
-export const getLazyList = (parentId, params) => {
+export const getLazyList = (parentId, params,current, size,) => {
return request({
url: '/api/ubcs-system/dept/lazy-list',
method: 'get',
params: {
...params,
- parentId
+ parentId,
+ current,
+ size
}
})
}
diff --git a/Source/UBCS-WEB/src/api/system/passwords.js b/Source/UBCS-WEB/src/api/system/passwords.js
index 7ad9fa1..3e3bc37 100644
--- a/Source/UBCS-WEB/src/api/system/passwords.js
+++ b/Source/UBCS-WEB/src/api/system/passwords.js
@@ -49,3 +49,10 @@
}
})
}
+
+export const combination = () => {
+ return request({
+ url: '/api/ubcs-system/combination/select',
+ method: 'get',
+ })
+}
diff --git a/Source/UBCS-WEB/src/components/Crud/Crud.vue b/Source/UBCS-WEB/src/components/Crud/Crud.vue
index c0be479..2f90814 100644
--- a/Source/UBCS-WEB/src/components/Crud/Crud.vue
+++ b/Source/UBCS-WEB/src/components/Crud/Crud.vue
@@ -6,7 +6,7 @@
<FormTemplateDialog
:visible.sync="addvisible"
:type="add"
- :templateOid="this.templateOid"
+ :templateOid="templateOid"
:codeClassifyOid="this.codeClassifyOid"
:codeRuleOid="this.codeRuleOid"
:disabledProp="disabledProp"
@@ -16,7 +16,7 @@
<FormTemplateDialog
:visible.sync="editvisible"
:type="edit"
- :templateOid="this.templateOids"
+ :templateOid="templateOid"
:codeClassifyOid="this.codeClassifyOid"
:codeRuleOid="this.codeRuleOid"
:disabledProp="disabledProp"
@@ -30,20 +30,20 @@
<el-button size="small" type="primary" plain>鍒犻櫎</el-button>
<el-button size="small" type="primary" plain>鍙戝竷</el-button>
<el-button size="small" type="primary" plain>鏁版嵁鏇存敼</el-button>
- <el-button size="small" type="primary" plain>鍥炴敹</el-button>
+ <el-button size="small" type="primary" plain @click="huishouHandler">鍥炴敹</el-button>
<el-button size="small" type="primary" plain @click="openD">瀵煎嚭
<integration-transfer :visible.sync="dialogPush" :data="transferData"
:props="transferProps" @save="handelTransferSave"></integration-transfer>
</el-button>
<el-button size="small" type="primary" plain @click="findvisible=true">鏌ヨ
- <advancedQuery :visible.sync="findvisible" :options="this.options"></advancedQuery>
+ <advanced-query :visible.sync="findvisible" :options="this.options"></advanced-query>
</el-button>
<el-button size="small" type="primary" plain>鐩镐技椤规煡璇�</el-button>
<el-button size="small" type="primary" plain style="margin-left: 1px;margin-top:10px">鍒锋柊</el-button>
<el-input placeholder="璇疯緭鍏ュ叧閿瓧鎸夊洖杞︽煡璇�" style="width: 180px;margin-left: 5px;margin-top:10px" size="small"></el-input>
</div>
<el-row style="height: 700px;width: 100%">
- <el-table :data="tableData" style="" @cell-click="handleCellClick" max-height="700" @selection-change="handleSelectionChange" @sort-change="sortChange">
+ <el-table :data="tableData" style="" @cell-click="handleCellClick" max-height="700" v-loading="isLoading" @selection-change="handleSelectionChange" @sort-change="sortChange">
<el-table-column
type="selection"
fixed
@@ -113,15 +113,20 @@
},
tableDataArray:{
type:Array,
- default:[]
},
total:{
type:String,
default:""
},
+ templateOid:{
+ type:String,
+ },
tableHeadDataFateher:{
type:Array,
- default:[]
+ },
+ isLoading:{
+ type:Boolean,
+ default:false
}
},
data() {
@@ -141,7 +146,6 @@
editingRow:null,
editShow: "",
editAttr:"",
- loading: false,
data: [],
options:{},
option: {
@@ -157,7 +161,6 @@
},
tableData:[],
tableHeadData:[],
- tableHeadDataFateher:[],
items:{},
seniorQueryColumns:[]
}
@@ -193,13 +196,30 @@
this.page.total=newval;
}
},
- tableHeadData:{
+ tableHeadDataFateher:{
handler(newval,oldval){
- this.tableHeadDataFateher=newval
+ 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.option.column.push(columnItem);
+ this.option.column=this.tableHeadData;
+ })
}
}
},
methods: {
+ 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()
@@ -219,25 +239,20 @@
this.page.pageSize=val
this.$emit('pageSize',val)
this.CrudRend()
- console.log(this.tableData)
},
handleCurrentChange(val){
this.page.currentPage=val
this.$emit('currentPage',val)
this.CrudRend()
- console.log(val)
- console.log(this.tableData)
},
// 鐩戝惉鍗曞厓鏍肩偣鍑讳簨浠跺苟瀛樺偍姝ｅ湪缂栬緫鐨勮
handleCellClick(row, column) {
this.editingRow = row;
this.editShow = column.property;
- console.log(row)
this.rowOid=row.oid
},
//鍒犻櫎
enumDeleteRow(row) {
- console.log(row)
this.tableData.splice(row, 1)
},
// 灏嗘鍦ㄧ紪杈戠殑琛岀殑鐘舵�佸彉涓� null 锛屽嵆閫�鍑虹紪杈戠姸鎬�
@@ -285,7 +300,6 @@
this.option.column=this.tableHeadData;
this.templateOid=res.data.tableDefineVO.oid
this.$emit('templateOid',this.templateOid)
- console.log(this.templateOid)
})
})
}
@@ -305,7 +319,7 @@
},
// 鎺掑簭
sortChange(val) {
- this.loading = true;
+ this.isLoading = true;
let order = ""
if (val.order == "ascending") {
order = "asc";
@@ -322,7 +336,7 @@
}).then(res => {
setTimeout(() => {
this.data = res.data.data;
- this.loading = false;
+ this.isLoading = false;
}, 100);
})
},
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
index c24335f..4664a76 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTree.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
@@ -82,7 +82,6 @@
this.coderuleoid=res.data[0].attributes.coderuleoid;
this.$emit("codeClassifyOid", this.codeClassifyOid )
this.$emit("coderuleoid", this.coderuleoid )
- this.TableHeadRends()
}).catch(res=>{
console.log(res)
})
@@ -108,44 +107,40 @@
page: this.currentPage,
limit: this.pageSize,
}).then(res => {
- // this.page.total = res.data.total;
- // this.data = res.data.data;
this.tableDataArray=res.data.data;
this.$emit('tableDataArray',this.tableDataArray)
this.$emit('total',res.data.total)
+ console.log('table',this.tableDataArray)
})
},
//琛ㄦ牸澶撮儴
- TableHeadRend(){
- MasterTable({
- codeClassifyOid:this.nodeClickList.oid,
- functionId: 5,
- }).then(res=>{
- this.tableHeadDataFateher=res.data;
- this.templateOids=res.data.tableDefineVO.oid
- this.$emit("tableHeadDataFateher",this.tableHeadDataFateher)
- console.log("123",res)
- })
- },
- TableHeadRends(){
- MasterTable({
- codeClassifyOid:this.codeClassifyOid,
- functionId: 5,
- }).then(res=>{
- this.tableHeadDataFateher=res.data;
- this.templateOids=res.data.tableDefineVO.oid
- this.$emit("tableHeadDataFateher",this.tableHeadDataFateher)
- console.log("123",res)
+ TableHeadRend() {
+ return new Promise((resolve,reject)=>{
+ MasterTable({
+ codeClassifyOid: this.nodeClickList.oid,
+ functionId: 5,
+ }).then(res => {
+ this.tableHeadDataFateher = res.data;
+ this.templateOids = res.data.tableDefineVO.oid;
+ this.$emit('tableHeadDataFateher', this.tableHeadDataFateher);
+ resolve();
+ }).catch(err=>{
+ reject(err)
+ })
})
},
//鏍戠偣鍑讳簨浠�
- nodeClick(data){
- this.nodeClickList = data;
- this.TableHeadRend()
- this.TableRend()
- console.log('code',this.nodeClickList.oid)
- console.log('teoid',this.templateOids)
- console.log()
+ async nodeClick(data) {
+ try {
+ this.nodeClickList = data;
+ await this.TableHeadRend(); // 鍏堟墽琛� TableHeadRend()
+ this.TableRend(); // TableHeadRend() 鏂规硶瀹屾垚鍚庡啀鎵ц TableRend()
+ this.$emit('nodeClick',this.templateOids)
+ console.log(this.templateOids)
+ } catch (error) {
+ // 澶勭悊閿欒
+ this.$message.error(error)
+ }
}
}
}
diff --git a/Source/UBCS-WEB/src/components/Tree/TemplatePro.vue b/Source/UBCS-WEB/src/components/Tree/TemplatePro.vue
index 116aa50..6d4bd9e 100644
--- a/Source/UBCS-WEB/src/components/Tree/TemplatePro.vue
+++ b/Source/UBCS-WEB/src/components/Tree/TemplatePro.vue
@@ -5,11 +5,11 @@
<attrCrud :ProData="ProData" :crudOid="crudOid" :crudArray="crudArray" :Formlist="Formlist" :codeClassifyOid="codeClassifyOid"></attrCrud>
</span>
<span v-else-if="type.prop==='tab2'">
- <FlowPath code="8b5e2017-990f-454a-9c39-4c4eeeb57553"></FlowPath>
+ <FlowPath :code="this.codeClassifyOid"></FlowPath>
</span>
<span v-else-if="type.prop==='tab3'">
-<!-- <stage :visible.sync="visibleStage" code="8b5e2017-990f-454a-9c39-4c4eeeb57553"></stage>-->
+ <stage :code="this.codeClassifyOid"></stage>
</span>
</basic-container>
@@ -51,318 +51,6 @@
}
}
</script>
-
-
-<!--<template>-->
-<!-- <!– 浣跨敤 Element UI 鐨勮〃鏍肩粍浠跺睍绀烘暟鎹� –>-->
-<!-- <!– 瀵规瘡琛屾暟鎹覆鏌撲竴涓〃鏍艰缁勪欢 –>-->
-<!-- <el-table :data="data">-->
-<!-- <el-table-column v-for="column in columns" :key="column.prop" :label="column.label">-->
-<!-- <template slot-scope="scope">-->
-<!-- <template v-if="isEditing(scope.$index, column.prop)">-->
-<!-- <!– 浣跨敤鑷畾涔夎緭鍏ユ锛岀粦瀹氭暟鎹苟鐩戝惉 blur 浜嬩欢 –>-->
-<!-- <el-input v-model="editorModel[scope.$index][column.prop]" ref="editor"-->
-<!-- @blur="onEditorBlur(scope.$index, column.prop)">-->
-<!-- </el-input>-->
-<!-- </template>-->
-<!-- <template v-else>-->
-<!-- <!– 灏嗘暟鎹覆鏌撲负琛ㄦ牸鍗曞厓鏍硷紝缁戝畾 click 浜嬩欢 –>-->
-<!-- <div @click="onCellClick(scope.$index, column.prop)"-->
-<!-- :style="{cursor: 'pointer', backgroundColor: isEditing(scope.$index, column.prop) ? '#F0F0F0' : 'transparent'}">-->
-<!-- {{ scope.row[column.prop] === "" ? '' : scope.row[column.prop] }}-->
-<!-- </div>-->
-<!-- </template>-->
-<!-- </template>-->
-<!-- </el-table-column>-->
-<!-- </el-table>-->
-<!--</template>-->
-
-<!--<script>-->
-<!--export default {-->
-<!-- data() {-->
-<!-- // 缁勪欢鐨勬暟鎹紝鍖呮嫭琛ㄦ牸鐨勬暟鎹�佸垪瀹氫箟鍜屽綋鍓嶆鍦ㄧ紪杈戠殑琛屽拰鍒�-->
-<!-- return {-->
-<!-- data: [-->
-<!-- { id: 1, name: '寮犱笁', age: 18, attributegroup: '鐢�', attributeDataTypeText: '骞夸笢鐪佹繁鍦冲競' },-->
-<!-- { id: 2, name: '鏉庡洓', age: 20, attributegroup: '濂�', attributeDataTypeText: '鍖椾含甯傛捣娣�鍖�' },-->
-<!-- { id: 3, name: '鐜嬩簲', age: 22, attributegroup: '鐢�', attributeDataTypeText: '涓婃捣甯傛郸涓滄柊鍖�' },-->
-<!-- { id: 4, name: '璧靛叚', age: 24, attributegroup: '濂�', attributeDataTypeText: '骞夸笢鐪佸箍宸炲競' }-->
-<!-- ],-->
-<!-- columns: [ // 瀹氫箟琛ㄦ牸鐨勫垪-->
-<!-- {-->
-<!-- label: "灞炴�ц嫳鏂囩紪鍙�",-->
-<!-- prop: "id",-->
-<!-- fixed: true,-->
-<!-- cell: false,-->
-<!-- labelWidth: 110,-->
-<!-- width: 125,-->
-<!-- sortable: true,-->
-<!-- },-->
-<!-- {-->
-<!-- label: "灞炴�т腑鏂囧悕绉�",-->
-<!-- prop: "name",-->
-<!-- fixed: true,-->
-<!-- cell: false,-->
-<!-- width: 125,-->
-<!-- sortable: true-->
-<!-- },-->
-<!-- {-->
-<!-- label: "灞炴�у垎缁�",-->
-<!-- prop: "attributegroup",-->
-<!-- cell: false,-->
-<!-- sortable: true,-->
-<!-- width: 125,-->
-<!-- },-->
-<!-- {-->
-<!-- label: "绫诲瀷",-->
-<!-- prop: "attributeDataTypeText",-->
-<!-- cell: false,-->
-<!-- sortable: true,-->
-<!-- },-->
-<!-- {-->
-<!-- label: "鍒楄〃瀹藉害",-->
-<!-- prop: "attrTableWidth",-->
-<!-- cell: false,-->
-<!-- sortable: true,-->
-<!-- width: 105,-->
-<!-- },-->
-<!-- {-->
-<!-- label: "鍏抽敭灞炴��",-->
-<!-- prop: "keyattrflag",-->
-<!-- cell: false,-->
-<!-- },-->
-<!-- {-->
-<!-- label: "鏌ヨ灞炴��",-->
-<!-- prop: "queryattrflag",-->
-<!-- cell: false,-->
-<!-- },-->
-<!-- {-->
-<!-- label: "楂樼骇鏌ヨ灞炴��",-->
-<!-- prop: "seniorqueryattrflag",-->
-<!-- width: 95,-->
-<!-- cell: false,-->
-<!-- },-->
-<!-- {-->
-<!-- label: "鐩镐技鏌ヨ灞炴��",-->
-<!-- prop: "samerepeatattrflag",-->
-<!-- width: 95,-->
-<!-- cell: false,-->
-<!-- },-->
-<!-- {-->
-<!-- label: "蹇呰緭",-->
-<!-- prop: "requireflag",-->
-<!-- cell: false,-->
-<!-- },-->
-<!-- {-->
-<!-- label: "琛ㄥ崟鏄剧ず",-->
-<!-- prop: "formdisplayflag",-->
-<!-- cell: false,-->
-<!-- },-->
-<!-- {-->
-<!-- label: "鍒楄〃鏄剧ず",-->
-<!-- prop: "tabledisplayflag",-->
-<!-- cell: false,-->
-<!-- },-->
-<!-- {-->
-<!-- label: "鍙",-->
-<!-- prop: "readonlyflag",-->
-<!-- cell: false,-->
-<!-- },-->
-<!-- {-->
-<!-- label: "鍒楄〃鎺掑簭",-->
-<!-- prop: "sortattrflag",-->
-<!-- cell: false,-->
-<!-- },-->
-
-<!-- {-->
-<!-- label: "澶氳鏂囨湰",-->
-<!-- prop: "textareaflag",-->
-<!-- cell: false,-->
-<!-- },-->
-<!-- {-->
-<!-- label: "榛樿鍊�",-->
-<!-- prop: "defaultvalue",-->
-<!-- sortable: true,-->
-<!-- cell: false,-->
-<!-- width: 95,-->
-<!-- },-->
-<!-- {-->
-<!-- label: "鍓嶇紑",-->
-<!-- prop: "prefixvalue",-->
-<!-- sortable: true,-->
-<!-- cell: false,-->
-<!-- },-->
-<!-- {-->
-<!-- label: "鍚庣紑",-->
-<!-- prop: "suffixvalue",-->
-<!-- sortable: true,-->
-<!-- cell: false,-->
-<!-- },-->
-<!-- {-->
-<!-- label: "缁勫悎瑙勫垯",-->
-<!-- prop: "componentrule",-->
-<!-- sortable: true,-->
-<!-- cell: false,-->
-<!-- width: 105,-->
-<!-- },-->
-<!-- {-->
-<!-- label: "楠岃瘉瑙勫垯",-->
-<!-- prop: "verifyrule",-->
-<!-- sortable: true,-->
-<!-- cell: false,-->
-<!-- width: 105,-->
-<!-- },-->
-<!-- {-->
-<!-- label: "鏃堕棿鏍煎紡",-->
-<!-- prop: "codedateformat",-->
-<!-- sortable: true,-->
-<!-- width: 105,-->
-<!-- cell: false,-->
-<!-- },-->
-<!-- {-->
-<!-- label: "鍒嗙被娉ㄥ叆",-->
-<!-- prop: "classifyinvokelevel",-->
-<!-- cell: false,-->
-<!-- },-->
-<!-- {-->
-<!-- label: "鏋氫妇娉ㄥ叆",-->
-<!-- prop: "enumString",-->
-<!-- cell: false,-->
-<!-- },-->
-<!-- {-->
-<!-- label: "绾ц仈灞炴��",-->
-<!-- prop: "parentCode",-->
-<!-- cell: false,-->
-<!-- },-->
-<!-- {-->
-<!-- label: "鍙傜収閰嶇疆",-->
-<!-- prop: "referConfig",-->
-<!-- cell: false,-->
-<!-- },-->
-<!-- {-->
-<!-- label: "绾ц仈鏌ヨ灞炴��",-->
-<!-- prop: "parentQueryAttr",-->
-<!-- width: 105,-->
-<!-- cell: false,-->
-<!-- },-->
-<!-- {-->
-<!-- label: "閫夋嫨搴撴爣璇�",-->
-<!-- prop: "libraryIdentification",-->
-<!-- width: 105,-->
-<!-- cell: false,-->
-<!-- },-->
-<!-- {-->
-<!-- label: "濉啓鎻愮ず",-->
-<!-- prop: "explain",-->
-<!-- cell: false,-->
-<!-- },-->
-<!-- {-->
-<!-- label: "琛ㄥ崟鏄剧ず鏍峰紡",-->
-<!-- prop: "formdisplaystyle",-->
-<!-- width: 105,-->
-<!-- cell: false,-->
-<!-- },-->
-<!-- {-->
-<!-- label: "琛ㄦ牸鏄剧ず鏍峰紡",-->
-<!-- prop: "tabledisplaystyle",-->
-<!-- width: 105,-->
-<!-- cell: false,-->
-<!-- },-->
-<!-- {-->
-<!-- label: "琛ㄥ崟瓒呴摼鎺�",-->
-<!-- prop: "formhref",-->
-<!-- width: 95,-->
-<!-- cell: false,-->
-<!-- },-->
-<!-- {-->
-<!-- label: "琛ㄦ牸瓒呴摼鎺�",-->
-<!-- prop: "tablehref",-->
-<!-- width: 95,-->
-<!-- cell: false,-->
-<!-- },-->
-<!-- {-->
-<!-- label: "琛ㄦ牸鏄剧ずjs",-->
-<!-- prop: "tabledisplayjs",-->
-<!-- width: 95,-->
-<!-- cell: false,-->
-<!-- },-->
-<!-- {-->
-<!-- label: "闀垮害",-->
-<!-- prop: "controllength",-->
-<!-- cell: false,-->
-<!-- },-->
-<!-- {-->
-<!-- label: "灏忔暟绮惧害",-->
-<!-- prop: "precisionlength",-->
-<!-- cell: false,-->
-<!-- },-->
-<!-- {-->
-<!-- label: "鍙栧�艰寖鍥�",-->
-<!-- prop: "valuearea",-->
-<!-- sortable: true,-->
-<!-- cell: false,-->
-<!-- width: 105,-->
-<!-- },-->
-
-<!-- ],-->
-<!-- editingIndex: -1, // 褰撳墠姝ｅ湪缂栬緫鐨勮鐨勭储寮�-->
-<!-- editingColumn: '', // 褰撳墠姝ｅ湪缂栬緫鐨勫垪鐨勫睘鎬у悕-->
-<!-- editorModel: [] // 缂栬緫妗嗙殑鏁版嵁锛屼娇鐢ㄦ暟缁勪繚瀛樻瘡涓崟鍏冩牸鐨勬暟鎹�-->
-<!-- };-->
-<!-- },-->
-<!-- created() {-->
-<!-- // 鍦ㄧ粍浠跺垱寤烘椂锛屽垵濮嬪寲缂栬緫妗嗙殑鏁版嵁-->
-<!-- this.editorModel = this.data.map(row => {-->
-<!-- const editorRow = {};-->
-<!-- this.columns.forEach(column => {-->
-<!-- editorRow[column.prop] = row[column.prop];-->
-<!-- });-->
-<!-- return editorRow;-->
-<!-- });-->
-<!-- },-->
-<!-- methods: {-->
-<!-- // 鍗曞厓鏍肩偣鍑讳簨浠跺鐞嗗嚱鏁�-->
-<!-- onCellClick(rowIndex, columnProp) {-->
-<!-- if (this.editingIndex >= 0 && this.editingColumn) {-->
-<!-- this.onEditorBlur(this.editingIndex, this.editingColumn);-->
-<!-- return;-->
-<!-- }-->
-
-<!-- const cellValue = this.data[rowIndex][columnProp];-->
-<!-- if (cellValue === undefined || cellValue === null) {-->
-<!-- this.data[rowIndex][columnProp] = '';-->
-<!-- }-->
-
-<!-- this.editingIndex = rowIndex;-->
-<!-- this.editingColumn = columnProp;-->
-
-<!-- this.$nextTick(() => {-->
-<!-- this.$refs.editor.focus();-->
-<!-- });-->
-<!-- },-->
-
-<!-- // 缂栬緫妗嗗け鐒︿簨浠跺鐞嗗嚱鏁�-->
-<!-- onEditorBlur(rowIndex, columnProp) {-->
-<!-- // 灏嗗綋鍓嶇紪杈戞鐨勬暟鎹繚瀛樺埌琛ㄦ牸鏁版嵁涓�-->
-<!-- const editorValue = this.editorModel[rowIndex][columnProp];-->
-<!-- if (editorValue === '') {-->
-<!-- this.data[rowIndex][columnProp] = undefined;-->
-<!-- } else {-->
-<!-- this.data[rowIndex][columnProp] = editorValue;-->
-<!-- }-->
-
-<!-- this.editingIndex = -1;-->
-<!-- this.editingColumn = '';-->
-<!-- },-->
-<!-- // 鍒ゆ柇鎸囧畾鍗曞厓鏍兼槸鍚﹀湪缂栬緫鐘舵��-->
-<!-- isEditing(rowIndex, columnProp) {-->
-<!-- return rowIndex === this.editingIndex && columnProp === this.editingColumn;-->
-<!-- }-->
-<!-- }-->
-<!--};-->
-<!--</script>-->
-
-
<style lang="scss">
//淇敼鍒嗙被娉ㄥ叆瀵硅瘽妗嗗叕鍏辨牱寮�
.mydialog .el-dialog__body {
diff --git a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
index 6f7f758..0bf7a8a 100644
--- a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
@@ -33,8 +33,12 @@
</template>
<!-- 缁勫悎瑙勫垯-->
<template slot="menuLeft">
- <el-button size="small" @click="isShowformulaEdit=true">缁勫悎瑙勫垯</el-button>
- <formula-editor :visible.sync="isShowformulaEdit" :systemVariableTableData="systemVariableTableData" :thisSceneTableData="thisSceneTableData"></formula-editor>
+ <el-button size="small" @click="isShowHandler">缁勫悎瑙勫垯</el-button>
+ <formula-editor :visible.sync="isShowformulaEdit"
+ :systemVariableTableData="systemVariableTableData"
+ :thisSceneTableData="thisSceneTableData"
+ @updateFormulaContent="updataFormlaContent"
+ ></formula-editor>
</template>
<!-- 楠岃瘉瑙勫垯-->
@@ -266,6 +270,7 @@
type:Boolean,
default:false
},
+
},
data() {
return {
@@ -696,20 +701,130 @@
},
{
label: "浣跨敤璇存槑",
- prop: "shiyong"
+ prop: "description"
}
]
},
//灞炴�ч獙璇佽鍒檇ata
rulesData: [
- {
- bds: "娴嬭瘯涓�",
- shiyong: "娴嬭瘯涓�"
- },
+ {bds: '[\u3000\uff01-\uff5f]+', description: '鍏ㄨ绗﹀彿'},
+ {bds: '[^\u3000\uff01-\uff5f]+', description: '鍗婅绗﹀彿'},
+ {bds: '(([-|+]{1}[\\d]+鈩冿綖[-|+]{1}[\\d]+鈩�)|鏃�)', description: '娓╁害鑼冨洿锛岀ず渚� -55鈩冿綖+125鈩�'},
+ {bds: '[\\d]{15}|[\\d]{18}|[\\d]{17}X', description: '韬唤璇佸彿鐮�(15鎴�18浣嶆暟瀛椼��17浣嶆暟瀛梄) '},
+ {bds: '鐢穦濂硘鐢锋�濂虫��', description: '涓枃鎬у埆'},
+ {bds: '[\\d]+', description: '鏁板瓧'},
+ {bds: '[a-zA-Z]+', description: '瀛楁瘝'},
+ {bds: '[A-Z]+', description: '澶у啓瀛楁瘝'},
+ {bds: '[a-z]+', description: '灏忓啓瀛楁瘝'},
+ {bds: '[0-9a-zA-Z]+', description: '瀛楁瘝銆佹暟瀛楃粍鍚�'},
+ {bds: '((0[\\d]{3}-[\\d]{7})|(0[\\d]{2}-[\\d]{8})|([\\d]{7,8}))', description: '鐢佃瘽鍙风爜'},
+ {bds: '-?[1-9]\\d*', description: '鏁存暟'},
+ {bds: '[1-9]\\d*', description: '姝ｆ暣鏁�'},
+ {bds: '-[1-9]\\d*', description: '璐熸暣鏁�'},
+ {bds: '-[1-9]\\d*|0', description: '闈炴鏁存暟(璐熸暣鏁�+0)'},
+ {bds: '[1-9]\\d*|0', description: '闈炶礋鏁存暟(姝ｆ暣鏁�+0)'},
+ {bds: '-?([1-9]\\d*\\.\\d*|0\\.\\d*[1-9]\\d*|0?\\.0+|0)', description: '娴偣鏁�'},
+ {bds: '[1-9]\\d*\\.\\d*|0\\.\\d*[1-9]\\d*', description: '姝ｆ诞鐐规暟'},
+ {bds: '-[1-9]\\d*\\.\\d*|0\\.\\d*[1-9]\\d*', description: '璐熸诞鐐规暟'},
+ {bds: '[(-([1-9]\\d*\\.\\d*|0\\.\\d*[1-9]\\d*))|0?\\.0+|0', description: '闈炴娴偣鏁帮紙璐熸诞鐐规暟 + 0锛�'},
+ {bds: '[1-9]\\d*\\.\\d*|0\\.\\d*[1-9]\\d*|0?\\.0+|0', description: '闈炶礋娴偣鏁帮紙姝ｆ诞鐐规暟 + 0锛�'},
+ {bds: 'x', description: '瀛楃 x'},
+ {bds: '\\\\', description: '鍙嶆枩绾垮瓧绗�'},
+ {bds: '\\0n', description: '甯︽湁鍏繘鍒跺�� 0 鐨勫瓧绗� n (0 <= n <= 7)'},
+ {bds: '\\0nn', description: '甯︽湁鍏繘鍒跺�� 0 鐨勫瓧绗� nn (0 <= n <= 7)'},
+ {bds: '\\0mnn', description: '甯︽湁鍏繘鍒跺�� 0 鐨勫瓧绗� mnn锛�0 <= m <= 3銆�0 <= n <= 7锛�'},
+ {bds: '\\xhh', description: '甯︽湁鍗佸叚杩涘埗鍊� 0x 鐨勫瓧绗� hh'},
+ {bds: '\\uhhhh', description: '甯︽湁鍗佸叚杩涘埗鍊� 0x 鐨勫瓧绗� hhhh'},
+ {bds: '\\t', description: '鍒惰〃绗� (\'\u0009\')'},
+ {bds: '\\n', description: '鏂拌锛堟崲琛岋級绗� (\'\u000A\')'},
+ {bds: '\\r', description: '鍥炶溅绗� (\'\u000D\')'},
+ {bds: '\\f', description: '鎹㈤〉绗� (\'\u000C\')'},
+ {bds: '\\a', description: '鎶ヨ (bell) 绗� (\'\u0007\')'},
+ {bds: '\\e', description: '杞箟绗� (\'\u001B\')'},
+ {bds: '\\cx', description: '瀵瑰簲浜� x 鐨勬帶鍒剁'},
+ {bds: '[abc]', description: 'a銆乥 鎴� c锛堢畝鍗曠被锛�'},
+ {bds: '[^abc]', description: '浠讳綍瀛楃锛岄櫎浜� a銆乥 鎴� c锛堝惁瀹氾級'},
+ {bds: '[a-zA-Z]', description: 'a 鍒� z 鎴� A 鍒� Z锛屼袱澶寸殑瀛楁瘝鍖呮嫭鍦ㄥ唴锛堣寖鍥达級'},
+ {bds: '[a-d[m-p]]', description: 'a 鍒� d 鎴� m 鍒� p锛歔a-dm-p]锛堝苟闆嗭級'},
+ {bds: '[a-z&&[def]]', description: '\td銆乪 鎴� f锛堜氦闆嗭級'},
+ {bds: '[a-z&&[^bc]]', description: 'a 鍒� z锛岄櫎浜� b 鍜� c锛歔ad-z]锛堝噺鍘伙級'},
+ {bds: '[a-z&&[^m-p]]', description: 'a 鍒� z锛岃�岄潪 m 鍒� p锛歔a-lq-z]锛堝噺鍘伙級'},
+ {bds: '.', description: '浠讳綍瀛楃锛堜笌琛岀粨鏉熺鍙兘鍖归厤涔熷彲鑳戒笉鍖归厤锛�'},
+ {bds: '\\d', description: '鏁板瓧锛歔0-9]'},
+ {bds: '\\D', description: '闈炴暟瀛楋細 [^0-9]'},
+ {bds: '\\s', description: '绌虹櫧瀛楃锛歔 \\t\\n\x0B\\f\\r]'},
+ {bds: '\\S', description: '闈炵┖鐧藉瓧绗︼細[^\\s]'},
+ {bds: '\\w', description: '鍗曡瘝瀛楃锛歔a-zA-Z_0-9]'},
+ {bds: '\\W', description: '闈炲崟璇嶅瓧绗︼細[^\\w]'},
+ {bds: '\\p{Lower}', description: '灏忓啓瀛楁瘝瀛楃锛歔a-z]'},
+ {bds: '\\p{Upper}', description: '澶у啓瀛楁瘝瀛楃锛歔A-Z]'},
+ {bds: '\\p{ASCII}', description: '鎵�鏈� ASCII锛歔\x00-\x7F]'},
+ {bds: '\\p{Alpha}', description: '瀛楁瘝瀛楃锛歔\\p{Lower}\\p{Upper}]'},
+ {bds: '\\p{Digit}', description: '鍗佽繘鍒舵暟瀛楋細[0-9]'},
+ {bds: '\\p{Alnum}', description: '瀛楁瘝鏁板瓧瀛楃锛歔\\p{Alpha}\\p{Digit}]'},
+ {bds: '\\p{Punct}', description: '鏍囩偣绗﹀彿锛�!"#$%&\'()*+,-./:;<=>?@[\\]^_`{|}~'},
+ {bds: '\\p{Graph}', description: '鍙瀛楃锛歔\\p{Alnum}\\p{Punct}]'},
+ {bds: '\\p{Print}', description: '鍙墦鍗板瓧绗︼細[\\p{Graph}\x20]'},
+ {bds: '\\p{Blank}', description: '绌烘牸鎴栧埗琛ㄧ锛歔 \\t]'},
+ {bds: '\\p{Cntrl}', description: '鎺у埗瀛楃锛歔\x00-\x1F\x7F]'},
+ {bds: '\\p{XDigit}', description: '鍗佸叚杩涘埗鏁板瓧锛歔0-9a-fA-F]'},
+ {bds: '\\p{Space}', description: '绌虹櫧瀛楃锛歔 \\t\\n\x0B\\f\\r]'},
+ {bds: '\\p{javaLowerCase}', description: '绛夋晥浜� java.lang.Character.isLowerCase()'},
+ {bds: '\\p{javaUpperCase}', description: '绛夋晥浜� java.lang.Character.isUpperCase()'},
+ {bds: '\\p{javaWhitespace}', description: '绛夋晥浜� java.lang.Character.isWhitespace()'},
+ {bds: '\\p{javaMirrored}', description: '绛夋晥浜� java.lang.Character.isMirrored()'},
+ {bds: '\\p{InGreek}', description: 'Greek 鍧楋紙绠�鍗曞潡锛変腑鐨勫瓧绗�'},
+ {bds: '\\p{Lu}', description: '澶у啓瀛楁瘝锛堢畝鍗曠被鍒級'},
+ {bds: '\\p{Sc}', description: '璐у竵绗﹀彿'},
+ {bds: '\\P{InGreek}', description: '鎵�鏈夊瓧绗︼紝Greek 鍧椾腑鐨勯櫎澶栵紙鍚﹀畾锛�'},
+ {bds: '[\\p{L}&&[^\\p{Lu}]]', description: '鎵�鏈夊瓧姣嶏紝澶у啓瀛楁瘝闄ゅ锛堝噺鍘伙級'},
+ {bds: '^', description: '琛岀殑寮�澶�'},
+ {bds: '$', description: '琛岀殑缁撳熬'},
+ {bds: '\\b', description: '鍗曡瘝杈圭晫'},
+ {bds: '\\B', description: '闈炲崟璇嶈竟鐣�'},
+ {bds: '\\A', description: '杈撳叆鐨勫紑澶�'},
+ {bds: '\\G', description: '涓婁竴涓尮閰嶇殑缁撳熬'},
+ {bds: '\\Z', description: '杈撳叆鐨勭粨灏撅紝浠呯敤浜庢渶鍚庣殑缁撴潫绗︼紙濡傛灉鏈夌殑璇濓級'},
+ {bds: '\\z', description: '杈撳叆鐨勭粨灏�'},
+ {bds: 'X ?', description: 'X锛屼竴娆℃垨涓�娆′篃娌℃湁'},
+ {bds: 'X *', description: 'X锛岄浂娆℃垨澶氭'},
+ {bds: 'X +', description: 'X锛屼竴娆℃垨澶氭'},
+ {bds: 'X {n }', description: 'X锛屾伆濂� n 娆�'},
+ {bds: 'X {n ,}', description: 'X锛岃嚦灏� n 娆�'},
+ {bds: 'X {n ,m }', description: 'X锛岃嚦灏� n 娆★紝浣嗘槸涓嶈秴杩� m 娆�'},
+ {bds: 'X ??', description: 'X锛屼竴娆℃垨涓�娆′篃娌℃湁'},
+ {bds: 'X *?', description: 'X锛岄浂娆℃垨澶氭'},
+ {bds: 'X +?', description: 'X锛屼竴娆℃垨澶氭'},
+ {bds: 'X {n }?', description: 'X锛屾伆濂� n 娆�'},
+ {bds: 'X {n ,}?', description: 'X锛岃嚦灏� n 娆�'},
+ {bds: 'X {n ,m }?', description: 'X锛岃嚦灏� n 娆★紝浣嗘槸涓嶈秴杩� m 娆�'},
+ {bds: 'X ?+', description: 'X锛屼竴娆℃垨涓�娆′篃娌℃湁'},
+ {bds: 'X *+', description: 'X锛岄浂娆℃垨澶氭'},
+ {bds: 'X ++', description: 'X锛屼竴娆℃垨澶氭'},
+ {bds: 'X {n }+', description: 'X锛屾伆濂� n 娆�'},
+ {bds: 'X {n ,}+', description: 'X锛岃嚦灏� n 娆�'},
+ {bds: 'X {n ,m }+', description: 'X锛岃嚦灏� n 娆★紝浣嗘槸涓嶈秴杩� m 娆�'},
+ {bds: 'XY', description: 'X 鍚庤窡 Y'},
+ {bds: 'X |Y', description: 'X 鎴� Y'},
+ {bds: '(X )', description: 'X锛屼綔涓烘崟鑾风粍'},
+ {bds: '\\n', description: '浠讳綍鍖归厤鐨� n<sup>th</sup> 鎹曡幏缁�'},
+ {bds: '\\', description: 'Nothing锛屼絾鏄紩鐢ㄤ互涓嬪瓧绗�'},
+ {bds: '\\Q', description: 'Nothing锛屼絾鏄紩鐢ㄦ墍鏈夊瓧绗︼紝鐩村埌 \\E'},
+ {bds: '\\E', description: 'Nothing锛屼絾鏄粨鏉熶粠 \\Q 寮�濮嬬殑寮曠敤'},
+ {bds: '(?:X )', description: 'X锛屼綔涓洪潪鎹曡幏缁�'},
+ {bds: '(?idmsux-idmsux)', description: 'Nothing锛屼絾鏄皢鍖归厤鏍囧織鐢� on 杞负 off'},
+ {bds: '(?idmsux-idmsux:X )', description: 'X锛屼綔涓哄甫鏈夌粰瀹氭爣蹇� on - off 鐨勯潪鎹曡幏缁�'},
+ {bds: '(?=X )', description: 'X锛岄�氳繃闆跺搴︾殑姝� lookahead'},
+ {bds: '(?!X )', description: 'X锛岄�氳繃闆跺搴︾殑璐� lookahead'},
+ {bds: '(?<=X )', description: 'X锛岄�氳繃闆跺搴︾殑姝� lookbehind'},
+ {bds: '(?<!X )', description: 'X锛岄�氳繃闆跺搴︾殑璐� lookbehind'},
+ {bds: '(?>X )', description: 'X锛屼綔涓虹嫭绔嬬殑闈炴崟鑾风粍'}
],
// 鏂板涓氬姟绫诲瀷
businessData: [],
businessOption: {
+ indexClassName:"搴忓彿",
+ indexLabelClassName:'搴忓彿',
index: true,
border: true,
addBtn: false,
@@ -1178,7 +1293,9 @@
},
//楠岃瘉瑙勫垯妫�鏌�
rulesExamine() {
-
+ if(this.RulesForm.expressionText.test(this.RulesForm.TestContent)){
+ this.$message.success('鏍￠獙鎴愬姛')
+ }
},
//鐐瑰嚮鍒嗙被娉ㄥ叆鎸夐挳
injectBtn(){
@@ -1273,6 +1390,16 @@
// console.log(res)
// })
},
+ //缁勫悎瑙勫垯
+ isShowHandler(){
+ if(this.CrudSelect.length>1){
+ this.$message.warning('鍙兘閫夋嫨涓�鏉℃ā鏉垮睘鎬ф暟鎹�')
+ }else if(this.CrudSelect.length<1){
+ this.$message.warning('璇烽�夋嫨涓�鏉℃ā鏉垮睘鎬ф暟鎹�')
+ }else if(this.CrudSelect.length === 1){
+ this.isShowformulaEdit=true;
+ }
+ },
//鍏ㄥ睆缂栬緫
fullscreenHandle(){
if(this.crudArray.length<1){
@@ -1290,6 +1417,10 @@
this.attrEditVisible=false;
console.log(this.attrEditVisible)
},
+ updataFormlaContent(val){
+ console.log(val)
+ this.$set(this.attrRow,'componentRule',val)
+ },
// 鎺掑簭
sortChange(val) {
console.log(val)
diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
index 9048526..624ebf8 100644
--- a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
@@ -77,7 +77,7 @@
@select="selectHandle"
>
<template slot="menuLeft">
- <el-button plain size="small" type="primary" @click="FindFormVisible = true;">鏌ヨ</el-button>
+ <el-button plain size="small" type="primary" @click="FindeHanler">鏌ヨ</el-button>
<el-button plain size="small" type="primary" @click="TemRefresh">鍒锋柊</el-button>
<el-button plain size="small" type="primary" @click="TreeEdit">淇敼</el-button>
<el-button plain size="small" type="primary" @click="TreeDel">鍒犻櫎</el-button>
@@ -206,36 +206,36 @@
inject: [, "crudTreeData"],
data() {
return {
- //琛ㄦ牸option閰嶇疆椤�
- crudTreeOption: {
- index: true,
- border: true,
- height:180,
- selection:true,
- addBtn:this.addFlag,
- column: [
- {
- label: "妯℃澘缂栧彿",
- prop: "id"
- },
- {
- label:"妯℃澘鍚嶇О",
- prop:"name"
- },
- {
- label: "妯℃澘鎻忚堪",
- prop:"description"
- },
- {
- label:"鐗堟湰鍙�",
- prop:"revisionSeq"
- },
- {
- label:"鐘舵��",
- prop:"lcStatusText"
- }
- ]
- },
+ // //琛ㄦ牸option閰嶇疆椤�
+ // crudTreeOption: {
+ // index: true,
+ // border: true,
+ // height:180,
+ // selection:true,
+ // addBtn:this.addFlag,
+ // column: [
+ // {
+ // label: "妯℃澘缂栧彿",
+ // prop: "id"
+ // },
+ // {
+ // label:"妯℃澘鍚嶇О",
+ // prop:"name"
+ // },
+ // {
+ // label: "妯℃澘鎻忚堪",
+ // prop:"description"
+ // },
+ // {
+ // label:"鐗堟湰鍙�",
+ // prop:"revisionSeq"
+ // },
+ // {
+ // label:"鐘舵��",
+ // prop:"lcStatusText"
+ // }
+ // ]
+ // },
addFlag:false,
// 琛ㄦ牸褰撳墠琛宨d
crudOid:"",
@@ -433,6 +433,42 @@
mounted() {
this.type = this.tabOption.column[0];
this.getAttr();
+ console.log('11',this.nodeClickList)
+ },
+ computed:{
+ crudTreeOption(){
+ return{
+ index: true,
+ indexClassName:"搴忓彿",
+ indexLabelClassName:'搴忓彿',
+ border: true,
+ height:180,
+ selection:true,
+ addBtn:this.Formlist.length<=0 && this.nodeClickList != "",
+ column: [
+ {
+ label: "妯℃澘缂栧彿",
+ prop: "id"
+ },
+ {
+ label:"妯℃澘鍚嶇О",
+ prop:"name"
+ },
+ {
+ label: "妯℃澘鎻忚堪",
+ prop:"description"
+ },
+ {
+ label:"鐗堟湰鍙�",
+ prop:"revisionSeq"
+ },
+ {
+ label:"鐘舵��",
+ prop:"lcStatusText"
+ }
+ ]
+ }
+ }
},
methods: {
//琛屽崟閫変簨浠�
@@ -639,7 +675,7 @@
async nodeClick(data) {
//瀹氫箟涓�涓ā鏉垮睘鎬d锛屾暟鎹槸妯℃澘绠＄悊琛ㄦ牸閲岄潰鐨刼id
this.nodeClickList = data
- console.log(data.oid)
+ console.log(data)
this.ProData=[]
try {
await TreeObjcet(data.oid).then(res => {
@@ -827,6 +863,14 @@
})
})
},
+ // 鏌ヨ
+ FindeHanler(){
+ if(this.nodeClickList != ""){
+ this.FindFormVisible=true
+ }else {
+ this.$message.warning('璇蜂粠鏍戜笂閫夋嫨涓�鏉℃暟鎹�')
+ }
+ },
//鍏嬮殕妯℃澘閫夋嫨纭畾
Clonehandler(){
if(this.CloneSelect.length <= 0){
diff --git a/Source/UBCS-WEB/src/components/template/Stage.vue b/Source/UBCS-WEB/src/components/template/Stage.vue
index 31ee7b5..3959152 100644
--- a/Source/UBCS-WEB/src/components/template/Stage.vue
+++ b/Source/UBCS-WEB/src/components/template/Stage.vue
@@ -8,7 +8,7 @@
@click="handleMaintenance(row, index)">缁存姢</el-button>
</template>
</avue-crud>
- <el-dialog title="妯℃澘闃舵" width="50%" append-to-body="true" :visible.sync="dialogNode">
+ <el-dialog title="妯℃澘闃舵" width="50%" append-to-body="true" :visible.sync="dialogNode">
<avue-crud ref="crud" :table-loading="loading" :data="stageData" :option="stageOption" @on-load="getStagelist"
@row-click="handleRowStageClick">
<template slot-scope="{type,size,row,index}" slot="menu">
@@ -106,6 +106,7 @@
},
stageOption: {
...options,
+ height:620,
column: [
{ label: '闃舵缂栧彿', prop: 'taskId' },
{ label: '闃舵鍚嶇О', prop: 'taskName' },
diff --git a/Source/UBCS-WEB/src/views/MasterData/items.vue b/Source/UBCS-WEB/src/views/MasterData/items.vue
index 33241d3..850693c 100644
--- a/Source/UBCS-WEB/src/views/MasterData/items.vue
+++ b/Source/UBCS-WEB/src/views/MasterData/items.vue
@@ -7,10 +7,10 @@
@coderuleoid="coderuleoidList"
:pageSize="this.pageSize"
:currentPage="this.currentPage"
- :templateOid="this.templateOid"
@tableDataArray="tableDataArrays"
@tableHeadDataFateher="tableHeadDatas"
@total="totals"
+ @nodeClick="nodeClick"
></master-tree>
</basic-container>
</el-aside>
@@ -21,10 +21,11 @@
:coderuleoid="this.coderuleoid"
@pageSize="pageSizes"
@currentPage="currentPages"
- @templateOid="templateOids"
:tableDataArray="tableDataArray"
:total="this.total"
:tableHeadDataFateher="this.tableHeadDataFateher"
+ :isLoading="isLoading"
+ :templateOid="templateOid"
></TableCrud>
</el-main>
</el-container>
@@ -49,7 +50,9 @@
templateOid:"",
tableDataArray:[],
tableHeadDataFateher:[],
- total:""
+ total:"",
+ isLoading: false,
+
}
},
created() {
@@ -68,9 +71,6 @@
currentPages(val){
this.currentPage=val
},
- templateOids(val){
- this.templateOid=val
- },
tableDataArrays(val){
this.tableDataArray=val
},
@@ -79,7 +79,15 @@
},
tableHeadDatas(val){
this.tableHeadDataFateher=val
- }
+ },
+ nodeClick(val){
+ this.templateOid=val;
+ console.log('val',val)
+ this.isLoading=true;
+ setTimeout(() => {
+ this.isLoading = false;
+ }, 2000);
+}
}
}
</script>
diff --git a/Source/UBCS-WEB/src/views/system/PasswordManagement/passwords.vue b/Source/UBCS-WEB/src/views/system/PasswordManagement/passwords.vue
index 8724503..64471d3 100644
--- a/Source/UBCS-WEB/src/views/system/PasswordManagement/passwords.vue
+++ b/Source/UBCS-WEB/src/views/system/PasswordManagement/passwords.vue
@@ -33,7 +33,8 @@
// getOnesearch,
getadd,
getupdata,
- getremove
+ getremove,
+ combination
} from "@/api/system/passwords";
export default {
name: "passwords.vue",
@@ -189,24 +190,12 @@
message: "璇烽�夋嫨缁勫悎鏂规硶",
trigger: "blur"
}],
- dicData: [
- {
- label: "鏁板瓧",
- value: '1638024706425188354'
- },
- {
- label: "绗﹀彿",
- value: '1638097837516926977'
- },
- {
- label: "灏忓啓瀛楁瘝",
- value: '1638097772983365634'
- },
- {
- label: "澶у啓瀛楁瘝",
- value: '1638097733707902977'
- },
- ],
+ dicUrl: '/api/ubcs-system/combination/select',
+ dicMethod: 'get',
+ props: {
+ value: "ID",
+ label: "NAME",
+ },
},
{
label: '蹇呭～绉嶇被',
@@ -222,22 +211,22 @@
}],
dicData:[{
label:'1绉�',
- value:0,
+ value:1,
disabled:false
},
{
label:'2绉�',
- value:1,
- disabled:false
- },
- {
- label:'3绉�',
value:2,
disabled:false
},
{
- label:'4绉�',
+ label:'3绉�',
value:3,
+ disabled:false
+ },
+ {
+ label:'4绉�',
+ value:4,
disabled:false
}
]
@@ -334,6 +323,9 @@
},
created() {
this.onLoad()
+ combination().then(res=>{
+ console.log("111",res)
+ })
},
mount() {
},
@@ -497,9 +489,8 @@
});
done(row)
this.onLoad()
- console.log(res)
}).catch((res)=>{
- console.log(res)
+ this.$message.warning(res)
})
},
rowEdit(row){
@@ -544,8 +535,8 @@
// this.loading = false;
// this.selectionClear();
console.log(res)
- this.page.total=res.data.data.totalElements
- this.data=res.data.data.content
+ this.page.total=res.data.data.total
+ this.data=res.data.data.records
});
}
}
@@ -553,5 +544,5 @@
}
</script>
-<style lang="scss">
+<style lang="scss" scoped>
</style>
diff --git a/Source/UBCS-WEB/src/views/system/dept.vue b/Source/UBCS-WEB/src/views/system/dept.vue
index 02063bd..41936f8 100644
--- a/Source/UBCS-WEB/src/views/system/dept.vue
+++ b/Source/UBCS-WEB/src/views/system/dept.vue
@@ -1,6 +1,7 @@
<template>
<basic-container>
<avue-crud :option="option"
+ :page.sync="page"
:table-loading="loading"
:data="data"
ref="crud"
@@ -75,7 +76,9 @@
option: {
lazy: true,
tip: false,
- simplePage: true,
+ height:'auto',
+ maxHeight:600,
+ // simplePage: true,
searchShow: true,
searchMenuSpan: 6,
tree: true,
@@ -352,8 +355,9 @@
},
onLoad(page, params = {}) {
this.loading = true;
- getLazyList(this.parentId, Object.assign(params, this.query)).then(res => {
- this.data = res.data.data;
+ getLazyList(this.parentId,Object.assign(params, this.query),this.page.currentPage, this.page.pageSize).then(res => {
+ this.data = res.data.data.records;
+ this.page.total=res.data.data.total
this.loading = false;
this.selectionClear();
});
@@ -361,7 +365,7 @@
treeLoad(tree, treeNode, resolve) {
const parentId = tree.id;
getLazyList(parentId).then(res => {
- resolve(res.data.data);
+ resolve(res.data.data.records);
});
}
}
diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js
index 95d7151..d1b2950 100644
--- a/Source/UBCS-WEB/vue.config.js
+++ b/Source/UBCS-WEB/vue.config.js
@@ -27,15 +27,17 @@
'/api': {
//鏈湴鏈嶅姟鎺ュ彛鍦板潃
// target: 'http://localhost:37000',
+ // target: 'http://localhost:37000',
// target: 'http://192.168.1.51:37000',
- // target: 'http://192.168.1.46:37000',
+ target: 'http://192.168.1.46:37000',
// target: 'http://dev.vci-tech.com:37000',
// target: 'http://192.168.1.51:37000/',
- target: 'http://192.168.1.104:37000',
+ // target: 'http://localhost:37000',
// target: 'http://192.168.1.63:37000',
//target: 'http://192.168.3.7: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: 'https://saber.bladex.vip/api',
ws: true,
--
Gitblit v1.9.3