From f7e33d69713a5145d19fde5792b422826bc14107 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 09 六月 2023 18:10:12 +0800
Subject: [PATCH] 完善主题库定义
---
Source/UBCS-WEB/src/components/Tree/classifyTrees.vue | 62 ++++
Source/UBCS-WEB/src/components/Crud/Crud.vue | 89 +++++-
Source/UBCS-WEB/src/api/GetItem.js | 2
Source/UBCS-WEB/src/components/code-dialog-page/formulaEditor.vue | 21
Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue | 1
Source/UBCS-WEB/src/views/MasterData/items.vue | 15 +
Source/UBCS-WEB/vue.config.js | 9
Source/UBCS-WEB/src/components/Master/MasterTree.vue | 54 +++
Source/UBCS-WEB/src/api/template/templateAttr.js | 10
Source/UBCS-WEB/src/components/Tree/TemplatePro.vue | 4
Source/UBCS-WEB/src/components/Tree/attrCrud.vue | 476 ++++++++++++++++++++++++++++-------
Source/UBCS-WEB/src/views/modeling/classifyTree.vue | 30 --
12 files changed, 588 insertions(+), 185 deletions(-)
diff --git a/Source/UBCS-WEB/src/api/GetItem.js b/Source/UBCS-WEB/src/api/GetItem.js
index 91f6755..6f4b1ac 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/ubcs-code/mdmEngineController/getUIInfoByClassifyOid',
method: 'get',
params:{
...params
diff --git a/Source/UBCS-WEB/src/api/template/templateAttr.js b/Source/UBCS-WEB/src/api/template/templateAttr.js
index 225cc20..d58256e 100644
--- a/Source/UBCS-WEB/src/api/template/templateAttr.js
+++ b/Source/UBCS-WEB/src/api/template/templateAttr.js
@@ -138,3 +138,13 @@
data:data
})
}
+//浠庝笟鍔＄被鍨嬩腑閫夋嫨鏁版嵁
+export const AttrByBtm = (params) =>{
+ return request({
+ url:'/api/ubcs-code/codeClassifyTempAttrController/codeClassifyTemplateAttrByBtm',
+ method: 'get',
+ params:{
+ ...params
+ }
+ })
+}
diff --git a/Source/UBCS-WEB/src/components/Crud/Crud.vue b/Source/UBCS-WEB/src/components/Crud/Crud.vue
index 6d66a84..c0be479 100644
--- a/Source/UBCS-WEB/src/components/Crud/Crud.vue
+++ b/Source/UBCS-WEB/src/components/Crud/Crud.vue
@@ -6,11 +6,10 @@
<FormTemplateDialog
:visible.sync="addvisible"
:type="add"
- :templateOid="this.templateOids"
- :codeClassifyOid="this.codeClassifyOids"
+ :templateOid="this.templateOid"
+ :codeClassifyOid="this.codeClassifyOid"
:codeRuleOid="this.codeRuleOid"
:disabledProp="disabledProp"
- :rowOid="rowOid"
>
</FormTemplateDialog></el-button>
<el-button size="small" type="primary" plain @click="editvisible=true">缂栬緫
@@ -18,7 +17,7 @@
:visible.sync="editvisible"
:type="edit"
:templateOid="this.templateOids"
- :codeClassifyOid="this.codeClassifyOids"
+ :codeClassifyOid="this.codeClassifyOid"
:codeRuleOid="this.codeRuleOid"
:disabledProp="disabledProp"
:rowOid="rowOid"
@@ -32,8 +31,9 @@
<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>瀵煎嚭
- <transfer filter-placeholder="璇疯緭鍏ユ嫾闊冲叏鎷兼垨鑰呮嫾闊崇缉鍐�" ></transfer>
+ <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>
@@ -88,7 +88,13 @@
</template>
<script>
import {MasterTable, TableData} from "@/api/GetItem";
+import {listCodeAttributeByClassId} from '@/api/integration/integration.js'
+import integrationTransfer from '@/views/integration/integrationTransfer'
+import pinyin from "js-pinyin";
export default {
+ components: {
+ integrationTransfer
+ },
name: "Crud.vue",
props:{
page:{
@@ -108,17 +114,28 @@
tableDataArray:{
type:Array,
default:[]
+ },
+ total:{
+ type:String,
+ default:""
+ },
+ tableHeadDataFateher:{
+ type:Array,
+ default:[]
}
},
data() {
return {
+ transferData:[],
+ transferProps: {
+ key: 'oid',
+ label: 'name'
+ },
templateOid:"",
addvisible:false,
editvisible:false,
findvisible:false,
- templateOids: "78B8C7C5-A042-0B96-FE6D-65421451782A",
- codeClassifyOids: "4524E801-6CC6-92E8-1AC3-2AB9604E8F96",
- codeRuleOid: "B95872A6-9CEA-D490-8F1B-9D26548CAF96",
+ dialogPush:false,
rowOid: '6EF696C3-CD87-0E7C-1EA1-8DE3913A95C9',
disabledProp: ["id"],
editingRow:null,
@@ -140,15 +157,16 @@
},
tableData:[],
tableHeadData:[],
+ tableHeadDataFateher:[],
items:{},
- aaa:""
+ seniorQueryColumns:[]
}
},
computed:{
},
created() {
- this.CrudHeaderRend();
- this.$emit('tableData',this.tableData)
+ // this.CrudHeaderRend();
+ // this.tableHeadHandle()
},
mounted() {
@@ -167,11 +185,33 @@
tableDataArray:{
handler(newval,oldval){
this.tableData=newval;
- this.CrudRend()
+ //
+ }
+ },
+ total:{
+ handler(newval,oldval){
+ this.page.total=newval;
+ }
+ },
+ tableHeadData:{
+ handler(newval,oldval){
+ this.tableHeadDataFateher=newval
}
}
},
methods: {
+ 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
},
@@ -179,16 +219,21 @@
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) {
@@ -203,6 +248,21 @@
this.$nextTick(() => {
this.$refs.crud.doLayout();
});
+ },
+ 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() {
@@ -225,6 +285,7 @@
this.option.column=this.tableHeadData;
this.templateOid=res.data.tableDefineVO.oid
this.$emit('templateOid',this.templateOid)
+ console.log(this.templateOid)
})
})
}
@@ -235,7 +296,7 @@
templateOid: this.templateOid,
codeClassifyOid: this.codeClassifyOid,
page: this.page.currentPage,
- limit:this.page.pageSize,
+ limit: this.page.pageSize,
}).then(res => {
this.page.total = res.data.total;
this.data = res.data.data;
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
index e6f5bd5..c24335f 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTree.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
@@ -9,7 +9,7 @@
<script>
import {getTreeList} from "@/api/MasterData/master";
import {mapMutations, mapState} from "vuex";
-import {TableData} from "@/api/GetItem";
+import {TableData,MasterTable} from "@/api/GetItem";
export default {
name: "MasterTree",
@@ -29,6 +29,8 @@
},
data(){
return{
+ tableHeadDataFateher:[],
+ templateOids:"",
tableDataArray:[],
codeClassifyOid:"",
coderuleoid:"",
@@ -80,6 +82,7 @@
this.coderuleoid=res.data[0].attributes.coderuleoid;
this.$emit("codeClassifyOid", this.codeClassifyOid )
this.$emit("coderuleoid", this.coderuleoid )
+ this.TableHeadRends()
}).catch(res=>{
console.log(res)
})
@@ -97,23 +100,52 @@
}
}
},
- //鏍戠偣鍑讳簨浠�
- nodeClick(data){
- this.nodeClickList = data;
- console.log(this.currentPage,this.pageSize)
+ //琛ㄦ牸鍒锋柊
+ TableRend(){
TableData({
- templateOid: this.templateOid,
- codeClassifyOid: this.codeClassifyOid,
- page: this.pageSize,
- limit:this.currentPage,
+ templateOid: this.templateOids,
+ codeClassifyOid: this.nodeClickList.oid,
+ page: this.currentPage,
+ limit: this.pageSize,
}).then(res => {
- console.log(res)
// this.page.total = res.data.total;
// this.data = res.data.data;
this.tableDataArray=res.data.data;
this.$emit('tableDataArray',this.tableDataArray)
- console.log(this.tableDataArray)
+ this.$emit('total',res.data.total)
})
+ },
+ //琛ㄦ牸澶撮儴
+ 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)
+ })
+ },
+ //鏍戠偣鍑讳簨浠�
+ nodeClick(data){
+ this.nodeClickList = data;
+ this.TableHeadRend()
+ this.TableRend()
+ console.log('code',this.nodeClickList.oid)
+ console.log('teoid',this.templateOids)
+ console.log()
}
}
}
diff --git a/Source/UBCS-WEB/src/components/Tree/TemplatePro.vue b/Source/UBCS-WEB/src/components/Tree/TemplatePro.vue
index 67047ed..0649477 100644
--- a/Source/UBCS-WEB/src/components/Tree/TemplatePro.vue
+++ b/Source/UBCS-WEB/src/components/Tree/TemplatePro.vue
@@ -2,7 +2,7 @@
<basic-container>
<avue-tabs :option="Taboption" @change="handleChange"></avue-tabs>
<span v-if="type.prop==='tab1'">
- <attrCrud :ProData="ProData"></attrCrud>
+ <attrCrud :ProData="ProData" :crudOid="crudOid" :crudArray="crudArray" :Formlist="Formlist"></attrCrud>
</span>
<span v-else-if="type.prop==='tab2'">妯℃澘娴佺▼</span>
<span v-else-if="type.prop==='tab3'">妯℃澘闃舵</span>
@@ -13,7 +13,7 @@
<script>
export default {
name: "TemplatePro.vue",
- props: ['ProData'],
+ props: ['ProData','crudOid','crudArray','Formlist'],
data: function () {
return {
type: {},
diff --git a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
index 4121adf..9f9fca4 100644
--- a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
@@ -1,10 +1,26 @@
<template>
<avue-crud :data="ProData" :option="option" @sort-change="sortChange" @row-update="addUpdate"
- @cell-click="handleRowClick">
+ @cell-click="handleRowClick" @select="selectHandle">
<template slot="menuLeft">
- <el-button v-if="attrEditVisible == false" size="small" type="primary" @click="addVisible=true">锛� 娣诲姞 {{msg}}</el-button>
+ <el-button v-if="attrEditVisible == false" size="small" type="primary" @click="busineHandle">锛� 娣诲姞 {{msg}}</el-button>
<el-dialog :visible.sync="addVisible" append-to-body title="浠庝笟鍔＄被鍨嬩腑閫夋嫨灞炴��">
- <avue-crud :data="businessData" :option="businessOption"></avue-crud>
+ <avue-crud :data="businessData" :option="businessOption">
+ <template slot="menuLeft">
+ <div style="display: flex;">
+ <el-select>
+ <el-option>灞炴�ц嫳鏂囧悕绉�</el-option>
+ <el-option>灞炴�т腑鏂囧悕绉�</el-option>
+ </el-select>
+ <el-input style="width: 300px;margin-left: 20px"></el-input>
+ <el-button size="small" style="margin-left: 10px">鏌ヨ</el-button>
+ </div>
+
+ </template>
+ </avue-crud>
+ <div style="display: flex;justify-content: flex-end;margin-top: 15px">
+ <el-button size="small" type="primary">淇濆瓨</el-button>
+ <el-button size="small" type="primary">鍙栨秷</el-button>
+ </div>
</el-dialog>
</template>
<!-- 鍏ㄥ睆缂栬緫-->
@@ -14,6 +30,12 @@
<el-dialog :visible.sync="attrEditVisible" append-to-body fullscreen="true">
<attrCrud></attrCrud>
</el-dialog>
+ </template>
+<!-- 缁勫悎瑙勫垯-->
+ <template slot="menuLeft">
+ <el-button size="small" @click="isShowformulaEdit=true">缁勫悎瑙勫垯</el-button>
+ <formula-editor :visible="isShowformulaEdit" :systemVariableTableData="systemVariableTableData" :thisSceneTableData="thisSceneTableData"></formula-editor>
+
</template>
<!-- 楠岃瘉瑙勫垯-->
<template slot="menuLeft">
@@ -133,7 +155,7 @@
</template>
<!-- 绾ц仈灞炴��-->
<template slot="menuLeft">
- <el-button size="small" @click="CascadeVisible=true">绾ц仈灞炴��</el-button>
+ <el-button size="small" @click="CascadeHandle">绾ц仈灞炴��</el-button>
<el-dialog :visible.sync="CascadeVisible" append-to-body title="璇烽�夋嫨绾ц仈灞炴��">
<avue-crud ref="crud" :data="CascadeData" :option="CascadeOption" @row-click="CascaderowClick">
<template slot="radio"
@@ -168,31 +190,115 @@
</template>
<!-- 鍚屾鍒板叾浠栨ā鏉�-->
<template slot="menuLeft">
- <el-button size="small">鍚屾鍒板叾浠栨ā鏉�</el-button>
+ <el-button size="small" style="margin-top: 10px">鍚屾鍒板叾浠栨ā鏉�</el-button>
</template>
</avue-crud>
</template>
<script>
+import {AttrByBtm,gridCodeClassifyTemplateAttr} from '@/api/template/templateAttr'
export default {
name: "attrCrud .vue",
- props: ['ProData'],
+ props: ['ProData','crudOid','crudArray','Formlist'],
data() {
return {
+ //琛ㄦ牸鍗曢�夋暟缁�
+ CrudSelect:[],
+ //琛ㄦ牸oid
+ CrudOid:"",
+ //鍦烘櫙鍙橀噺
+ thisSceneTableData:[
+ {
+ formula: "lcstatus",
+ desc: "鐘舵��",
+ },
+ {
+ formula: "name",
+ desc: "闆嗗洟鐮�",
+ },
+ {
+ formula: "materialname",
+ desc: "閮ㄩ棬鍚嶇О",
+ },
+ {
+ formula: "parentcode",
+ desc: "涓婄骇閮ㄩ棬缂栧彿",
+ },
+ {
+ formula: "parentname",
+ desc: "涓婄骇閮ㄩ棬鍚嶇О",
+ },
+ {
+ formula: "description",
+ desc: "鎻忚堪",
+ },
+ ],
+ // 绯荤粺鍙橀噺
+ systemVariableTableData:[
+ {
+ formula: "#CURRENTUSER.OID#",
+ desc: "褰撳墠鐢ㄦ埛鐨勪富閿�",
+ },
+ {
+ formula:"#CURRENTUSER.ID",
+ desc:"褰撳墠鐢ㄦ埛鐨勮处鎴�"
+ },
+ {
+ formula:"#CURRENTTIME#",
+ desc:"褰撳墠鏃堕棿"
+ },
+ {
+ formula:"#CURRENTDATE#",
+ desc:"褰撳墠鏃ユ湡"
+ },
+ {
+ formula:"#CURRENTDATETIME#",
+ desc:"褰撳墠鏃ユ湡鏃堕棿"
+ },
+ {
+ formula:"#CURRENTUSER_NAME#",
+ desc:"褰撳墠鐢ㄦ埛鐨勫鍚�"
+ },
+ {
+ formula:"#CURRENTUSER.SECRETGRADE#",
+ desc:"褰撳墠鐢ㄦ埛瀵嗙骇"
+ },
+ {
+ formula:"#CURRENTUSER.IPSECRET#",
+ desc:"褰撳墠鐢ㄦ埛鐨処P瀵嗙骇"
+ },
+ {
+ formula:"#CURRENTUSER.BUSINESSUNIT#",
+ desc:"褰撳墠鐢ㄦ埛鎵�灞炰笟鍔″崟鍏�"
+ },
+ {
+ formula:"#CURRENTUSER.BUSINESSUNITNAME#",
+ desc:"褰撳墠鐢ㄦ埛鎵�灞炰笟鍔″崟鍏冨悕绉�"
+ },
+ {
+ formula:"#CURRENTUSER.GROUPOID#",
+ desc:"褰撳墠鐢ㄦ埛鐨勯儴闂ㄤ富閿�"
+ },
+ {
+ formula:"#CURRENTUSER.GROUPNAME#",
+ desc:"褰撳墠鐢ㄦ埛鎵�灞為儴闂ㄥ悕绉�"
+ },
+ {
+ formula:"#CURRENTUSER.EMAIL#",
+ desc:"褰撳墠鐢ㄦ埛閭欢鍦板潃"
+ },
+ {
+ formula:"#CURRENTUSER.ROLENAME#",
+ desc:"褰撳墠鐢ㄦ埛鎵�灞炶鑹插悕绉� "
+ },
+ ],
CascadeVisible: false,
attrEditVisible: false,
+ isShowformulaEdit:false,
// 绾ц仈鍗曢��
selectRow: '',
// 绾ц仈data
- CascadeData: [{
- id: 1,
- name: '寮犱笁',
- attrIn: '娴嬭瘯涓�'
- }, {
- id: 2,
- name: '鏉庡洓',
- attrIn: '娴嬭瘯浜�'
- }],
+ CascadeData: [],
// 绾ц仈option
CascadeOption: {
menu: false,
@@ -208,18 +314,19 @@
},
{
label: '灞炴�ц嫳鏂囩紪鍙�',
- prop: 'nid'
- }, {
- label: '鎬у埆',
+ prop: 'id'
+ },
+ {
+ label: '灞炴�т腑鏂囧悕绉�',
prop: 'name'
},
{
label: '灞炴�у垎缁�',
- prop: 'attrIn'
+ prop: 'attributeGroup'
},
{
label: '绫诲瀷',
- prop: 'type'
+ prop: 'attributeDataTypeText'
},
{
label: '鍒楄〃瀹藉害',
@@ -227,19 +334,63 @@
},
{
label: '鍏抽敭灞炴��',
- prop: 'keyattrflag'
+ prop: 'keyAttrFlag',
+ type:'text',
+ dicData:[
+ {
+ label:"鏄�",
+ value:'true'
+ },
+ {
+ label:"鍚�",
+ value:'false'
+ }
+ ]
},
{
label: '鏌ヨ灞炴��',
- prop: 'queryattrflag'
+ prop: 'queryAttrFlag',
+ type:'text',
+ dicData:[
+ {
+ label:"鏄�",
+ value:'true'
+ },
+ {
+ label:"鍚�",
+ value:'false'
+ }
+ ]
},
{
label: '楂樼骇鏌ヨ灞炴��',
- prop: 'seniorqueryattrflag'
+ prop: 'seniorQueryAttrFlag',
+ type:'text',
+ dicData:[
+ {
+ label:"鏄�",
+ value:'true'
+ },
+ {
+ label:"鍚�",
+ value:'false'
+ }
+ ]
},
{
label: '鐩镐技鏌ラ噸灞炴��',
- prop: 'samerepeatattrflag'
+ prop: 'sameRepeatAttrFlag',
+ type:'text',
+ dicData:[
+ {
+ label:"鏄�",
+ value:'true'
+ },
+ {
+ label:"鍚�",
+ value:'false'
+ }
+ ]
},
{
label: '涓�缁寸爜',
@@ -248,6 +399,170 @@
{
label: '浜岀淮鐮�',
prop: 'TwoDimensional'
+ },
+ {
+ label: '蹇呰緭',
+ prop: 'requireFlag',
+ type:'text',
+ dicData:[
+ {
+ label:"鏄�",
+ value:'true'
+ },
+ {
+ label:"鍚�",
+ value:'false'
+ }
+ ]
+ },
+ {
+ label: "琛ㄥ崟鏄剧ず",
+ prop: "formDisplayFlag",
+ type:'text',
+ dicData:[
+ {
+ label:"鏄�",
+ value:'true'
+ },
+ {
+ label:"鍚�",
+ value:'false'
+ }
+ ]
+ },
+ {
+ label: "鍒楄〃鏄剧ず",
+ prop: "tableDisplayFlag",
+ type:'text',
+ dicData:[
+ {
+ label:"鏄�",
+ value:'true'
+ },
+ {
+ label:"鍚�",
+ value:'false'
+ }
+ ]
+ },
+ {
+ label: "鍙",
+ prop: "readonlyFlag",
+ },
+ {
+ label: "鍒楄〃鎺掑簭",
+ prop: "sortAttrFlag",
+ type:'text',
+ dicData:[
+ {
+ label:"鏄�",
+ value:'true'
+ },
+ {
+ label:"鍚�",
+ value:'false'
+ }
+ ]
+ },
+
+ {
+ label: "澶氳鏂囨湰",
+ prop: "textAreaFlag",
+ type:'text',
+ dicData:[
+ {
+ label:"鏄�",
+ value:'true'
+ },
+ {
+ label:"鍚�",
+ value:'false'
+ }
+ ]
+ },
+ {
+ label: "榛樿鍊�",
+ prop: "defaultValue",
+ },
+ {
+ label: "鍓嶇紑",
+ prop: "prefixValue",
+ },
+ {
+ label: "鍚庣紑",
+ prop: "suffixValue",
+ },
+ {
+ label: "缁勫悎瑙勫垯",
+ prop: "componentRule",
+ },
+ {
+ label: "楠岃瘉瑙勫垯",
+ prop: "verifyRule",
+ },
+ {
+ label: "鏃堕棿鏍煎紡",
+ prop: "codeDateFormat",
+ },
+ {
+ label: "鍒嗙被娉ㄥ叆",
+ prop: "classifyInvokeLevel",
+ },
+ {
+ label: "鏋氫妇娉ㄥ叆",
+ prop: "enumString",
+ },
+ {
+ label: "绾ц仈灞炴��",
+ prop: "parentCode",
+ },
+ {
+ label: "鍙傜収閰嶇疆",
+ prop: "referConfig",
+ },
+ {
+ label: "绾ц仈鏌ヨ灞炴��",
+ prop: "parentQueryAttr",
+ },
+ {
+ label: "閫夋嫨搴撴爣璇�",
+ prop: "libraryIdentification",
+ },
+ {
+ label: "濉啓鎻愮ず",
+ prop: "explain",
+ },
+ {
+ label: "琛ㄥ崟鏄剧ず鏍峰紡",
+ prop: "formDisplayStyle",
+ },
+ {
+ label: "琛ㄦ牸鏄剧ず鏍峰紡",
+ prop: "tableDisplayStyle",
+ },
+ {
+ label: "琛ㄥ崟瓒呴摼鎺�",
+ prop: "formHref",
+ },
+ {
+ label: "琛ㄦ牸瓒呴摼鎺�",
+ prop: "tableHref",
+ },
+ {
+ label: "琛ㄦ牸鏄剧ずjs",
+ prop: "tableDisplayJs",
+ },
+ {
+ label: "闀垮害",
+ prop: "controlLength",
+ },
+ {
+ label: "灏忔暟绮惧害",
+ prop: "precisionLength",
+ },
+ {
+ label: "鍙栧�艰寖鍥�",
+ prop: "valueArea",
},
]
},
@@ -359,90 +674,14 @@
bds: "娴嬭瘯涓�",
shiyong: "娴嬭瘯涓�"
},
- {
- bds: "娴嬭瘯浜�",
- shiyong: "娴嬭瘯浜�"
- },
- {
- bds: "娴嬭瘯浜�",
- shiyong: "娴嬭瘯浜�"
- },
- {
- bds: "娴嬭瘯浜�",
- shiyong: "娴嬭瘯浜�"
- },
- {
- bds: "娴嬭瘯浜�",
- shiyong: "娴嬭瘯浜�"
- },
- {
- bds: "娴嬭瘯浜�",
- shiyong: "娴嬭瘯浜�"
- },
- {
- bds: "娴嬭瘯浜�",
- shiyong: "娴嬭瘯浜�"
- },
- {
- bds: "娴嬭瘯浜�",
- shiyong: "娴嬭瘯浜�"
- },
- {
- bds: "娴嬭瘯浜�",
- shiyong: "娴嬭瘯浜�"
- },
- {
- bds: "娴嬭瘯浜�",
- shiyong: "娴嬭瘯浜�"
- },
- {
- bds: "娴嬭瘯浜�",
- shiyong: "娴嬭瘯浜�"
- },
- {
- bds: "娴嬭瘯浜�",
- shiyong: "娴嬭瘯浜�"
- },
- {
- bds: "娴嬭瘯浜�",
- shiyong: "娴嬭瘯浜�"
- },
- {
- bds: "娴嬭瘯浜�",
- shiyong: "娴嬭瘯浜�"
- }
],
// 鏂板涓氬姟绫诲瀷
- businessData: [
- {
- id: "娴嬭瘯涓�",
- name: "娴嬭瘯涓�",
- attributeLength: "娴嬭瘯涓�",
- attrDataType: "娴嬭瘯涓�"
- },
- {
- id: "娴嬭瘯浜�",
- name: "娴嬭瘯浜�",
- attributeLength: "娴嬭瘯浜�",
- attrDataType: "娴嬭瘯浜�"
- },
- {
- id: "娴嬭瘯涓�",
- name: "娴嬭瘯涓�",
- attributeLength: "娴嬭瘯涓�",
- attrDataType: "娴嬭瘯涓�",
- },
- {
- id: "娴嬭瘯涓�",
- name: "娴嬭瘯涓�",
- attributeLength: "娴嬭瘯涓�",
- attrDataType: "娴嬭瘯涓�",
- }
- ],
+ businessData: [],
businessOption: {
index: true,
border: true,
- addBtn: true,
+ addBtn: false,
+ menu:false,
column: [
{
label: "灞炴�ц嫳鏂囧悕绉�",
@@ -522,6 +761,7 @@
index: true,
border: true,
editBtn: false,
+ selection:true,
labelWidth: 110,
cellBtn: true,
cancelBtn: false,
@@ -756,6 +996,36 @@
console.log(this.ProData)
},
methods: {
+ // 浠庝笟鍔＄被鍨嬩腑閫夋嫨鏁版嵁
+ busineHandle(){
+ if(this.crudArray.length<1){
+ this.$message.error('璇烽�夋嫨涓�鏉℃ā鏉�')
+ }else {
+ this.addVisible=true;
+ AttrByBtm({'conditionMap[oid]': this.crudOid}).then(res=>{
+ this.businessData=res.data.data;
+ console.log(res.data)
+ })
+ }
+ },
+ // 绾ц仈灞炴��
+ CascadeHandle(){
+ if(this.CrudSelect.length >0){
+ this.CascadeVisible=true;
+ gridCodeClassifyTemplateAttr({'conditionMap[classifyTemplateOid]': this.Formlist[0].oid,
+ 'conditionMap[oid_notequal]':this.CrudOid
+ }).then(res=>{
+ this.CascadeData=res.data.data
+ })
+ }else {
+ this.$message.warning('璇烽�夋嫨涓�鏉℃ā鏉垮睘鎬�')
+ }
+ },
+ //琛ㄦ牸鍗曢��
+ selectHandle(selection,row){
+ this.CrudOid=row.oid;
+ this.CrudSelect=selection
+ },
addsHandler(){
},
diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue b/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue
index 5ff1791..e0a2f86 100644
--- a/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue
+++ b/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue
@@ -17,6 +17,7 @@
option: {
submitBtn:false,
emptyBtn:false,
+
column: [
{
label: '涓婚搴�/鍒嗙被缂栧彿',
diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
index 71747d3..13cd051 100644
--- a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
@@ -74,6 +74,7 @@
@row-del="CrudRowDel"
@row-update="CrudRowUpdata"
:before-close="beforeClose"
+ @select="selectHandle"
>
<template slot="menuLeft">
<el-button plain size="small" type="primary" @click="FindFormVisible = true;">鏌ヨ</el-button>
@@ -168,7 +169,7 @@
</avue-crud>
</basic-container>
- <templatePro :ProData="this.ProData"></templatePro>
+ <templatePro :ProData="this.ProData" :crudOid="this.crudOid" :crudArray="this.crudArray" :Formlist="this.Formlist"></templatePro>
</span>
</basic-container>
</el-main>
@@ -202,9 +203,44 @@
//浣跨敤inject鎺ユ敹鍙傛暟
//Treeoption宸︿晶鏍戞柊澧炶〃鍗曢」 Treedata宸︿晶鏍戣妭鐐� 閰嶇疆椤� crudTreeOption鍙充晶琛ㄦ牸閰嶇疆椤� crudTreeData鍙充晶琛ㄦ牸鏄剧ず鍐呭
//Treeform鍙充晶琛ㄥ崟閰嶇疆椤�
- inject: ['crudTreeOption', "crudTreeData"],
+ 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"
+ }
+ ]
+ },
+ addFlag:false,
+ // 琛ㄦ牸褰撳墠琛宨d
+ crudOid:"",
+ //琛ㄦ牸褰撳墠閫夋嫨鏁扮粍
+ crudArray:[],
//妯℃澘灞炴�у睍绀哄唴瀹�
ProData: [],
//鍥炶溅閿悳绱㈢粦瀹氬��
@@ -399,6 +435,11 @@
this.getAttr();
},
methods: {
+ //琛屽崟閫変簨浠�
+ selectHandle(selection,row){
+ this.crudOid=row.oid
+ this.crudArray=selection
+ },
//鍒嗙被鏍戞暟鎹鐞�
getAttr() {
getAtrrList().then(res => {
@@ -607,19 +648,20 @@
return item.codeclassifyoid == this.nodeClickList.oid
}
})
- gridCodeClassifyTemplateAttr({'conditionMap[classifyTemplateOid]': this.Formlist[0].oid}).then(res => {
- this.ProData = res.data.data
- console.log(this.ProData)
- }).catch(res => {
- this.$message.error(res)
- })
+ if(this.Formlist.length >0){
+ gridCodeClassifyTemplateAttr({'conditionMap[classifyTemplateOid]': this.Formlist[0].oid}).then(res => {
+ this.ProData = res.data.data;
+ console.log(this.ProData)
+ }).catch(res => {
+ this.$message.error(res)
+ })
+ }
}).catch(res => {
console.log(res)
})
// 鍩烘湰淇℃伅琛ㄥ崟鏁版嵁
await getObjectByOid(this.nodeClickList.oid).then(res => {
- this.TreeList = res.data.data
- // eslint-disable-next-line no-const-assig
+ this.TreeList = res.data.data;
}).catch(res => {
this.$message.error(res)
})
diff --git a/Source/UBCS-WEB/src/components/code-dialog-page/formulaEditor.vue b/Source/UBCS-WEB/src/components/code-dialog-page/formulaEditor.vue
index dc5648d..2bfd2cc 100644
--- a/Source/UBCS-WEB/src/components/code-dialog-page/formulaEditor.vue
+++ b/Source/UBCS-WEB/src/components/code-dialog-page/formulaEditor.vue
@@ -312,9 +312,9 @@
:show-header="false"
style="width: 100%"
>
- <el-table-column prop="formula" width="40">
+ <el-table-column prop="formula" width="120">
</el-table-column>
- <el-table-column prop="desc" width="100"> </el-table-column>
+ <el-table-column prop="desc" width="200"> </el-table-column>
</el-table>
</el-tab-pane>
<el-tab-pane label="绯荤粺鍙橀噺" name="second">
@@ -324,9 +324,9 @@
:show-header="false"
style="width: 100%"
>
- <el-table-column prop="formula" width="150">
+ <el-table-column prop="formula" width="200">
</el-table-column>
- <el-table-column prop="desc" width="150"> </el-table-column>
+ <el-table-column prop="desc" width="200"> </el-table-column>
</el-table>
</el-tab-pane>
</el-tabs>
@@ -338,7 +338,7 @@
</el-dialog>
</template>
-
+
<script>
export default {
name: "formulaEditor",
@@ -675,14 +675,14 @@
}
//鍏紡鍐呭鍥炴樉
// 瑙﹀彂update:data灏嗗瓙缁勪欢鍊间紶閫掔粰鐖剁粍浠�
- this.$emit('updateFormulaContent', this.formulaContent)
- this.isShowformulaEdit = false;
+ this.$emit('updateFormulaContent', this.formulaContent)
+ this.isShowformulaEdit = false;
},
},
};
</script>
-
+
<style scoped>
.formula-box-card >>> .el-card__body {
@@ -690,7 +690,7 @@
height: 85%;
width: 100%;
}
-
+
.formula-editor-total {
/* margin-top: 3px; */
height: 100%;
@@ -718,7 +718,7 @@
height: auto;
justify-content: space-between;
align-items: center;
- }
+ }
.formula-editor-btn-sm {
width: 4.5vw;
@@ -732,4 +732,3 @@
}
</style>
-
\ No newline at end of file
diff --git a/Source/UBCS-WEB/src/views/MasterData/items.vue b/Source/UBCS-WEB/src/views/MasterData/items.vue
index 02ff88b..33241d3 100644
--- a/Source/UBCS-WEB/src/views/MasterData/items.vue
+++ b/Source/UBCS-WEB/src/views/MasterData/items.vue
@@ -9,7 +9,8 @@
:currentPage="this.currentPage"
:templateOid="this.templateOid"
@tableDataArray="tableDataArrays"
-
+ @tableHeadDataFateher="tableHeadDatas"
+ @total="totals"
></master-tree>
</basic-container>
</el-aside>
@@ -22,6 +23,8 @@
@currentPage="currentPages"
@templateOid="templateOids"
:tableDataArray="tableDataArray"
+ :total="this.total"
+ :tableHeadDataFateher="this.tableHeadDataFateher"
></TableCrud>
</el-main>
</el-container>
@@ -44,7 +47,9 @@
codeClassifyOid:"",
coderuleoid:"",
templateOid:"",
- tableDataArray:[]
+ tableDataArray:[],
+ tableHeadDataFateher:[],
+ total:""
}
},
created() {
@@ -68,6 +73,12 @@
},
tableDataArrays(val){
this.tableDataArray=val
+ },
+ totals(val){
+ this.total=val
+ },
+ tableHeadDatas(val){
+ this.tableHeadDataFateher=val
}
}
}
diff --git a/Source/UBCS-WEB/src/views/modeling/classifyTree.vue b/Source/UBCS-WEB/src/views/modeling/classifyTree.vue
index d3596ee..621ad5b 100644
--- a/Source/UBCS-WEB/src/views/modeling/classifyTree.vue
+++ b/Source/UBCS-WEB/src/views/modeling/classifyTree.vue
@@ -1,6 +1,5 @@
<template>
- <classifyTrees :crudData="crudTreeData" :crudoption="crudTreeOption" :data="Treedata"
- :option="Treeoption"
+ <classifyTrees :crudData="crudTreeData"
></classifyTrees>
</template>
@@ -12,33 +11,6 @@
//鐖朵紶瀛愭湁闂锛屾殏鏃舵病瑙ｅ喅锛岀敤provide浠ｆ浛鐖朵紶瀛愶紝瀛愪紶鐖惰繕鏄敤$emit浼犻�掞紝娉ㄦ剰锛侊紒锛佸叾浠栫粍浠朵笉鑳戒娇鐢ㄥ悓鏍风殑绫诲悕鍚﹀垯浼氭姤閿欍��
provide() {
return {
- crudTreeOption: {
- index: true,
- border: true,
- height:180,
- column: [
- {
- label: "妯℃澘缂栧彿",
- prop: "id"
- },
- {
- label:"妯℃澘鍚嶇О",
- prop:"name"
- },
- {
- label: "妯℃澘鎻忚堪",
- prop:"description"
- },
- {
- label:"鐗堟湰鍙�",
- prop:"revisionSeq"
- },
- {
- label:"鐘舵��",
- prop:"lcStatusText"
- }
- ]
- },
crudTreeData: this.crudTreeData,
}
diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js
index 18858ab..d206271 100644
--- a/Source/UBCS-WEB/vue.config.js
+++ b/Source/UBCS-WEB/vue.config.js
@@ -27,10 +27,15 @@
'/api': {
//鏈湴鏈嶅姟鎺ュ彛鍦板潃
// target: 'http://localhost:37000',
- //target: 'http://192.168.1.51:37000',
+ // 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://192.168.1.51: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: 'https://saber.bladex.vip/api',
--
Gitblit v1.9.3