From e9f139bd71644a2cffdfbff44c12915a5780e56a Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 05 七月 2023 19:35:28 +0800
Subject: [PATCH] 主题库定义bug
---
Source/UBCS-WEB/src/components/Tree/classifyTrees.vue | 43 +-------
Source/UBCS-WEB/src/api/MasterData/master.js | 9 +
Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue | 6
Source/UBCS-WEB/src/components/template/SetPersonnel.vue | 2
Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue | 148 +++++++++++++++++++++++------
Source/UBCS-WEB/src/components/Tree/attrCrud.vue | 91 +++++++----------
6 files changed, 172 insertions(+), 127 deletions(-)
diff --git a/Source/UBCS-WEB/src/api/MasterData/master.js b/Source/UBCS-WEB/src/api/MasterData/master.js
index ac79efc..8cda791 100644
--- a/Source/UBCS-WEB/src/api/MasterData/master.js
+++ b/Source/UBCS-WEB/src/api/MasterData/master.js
@@ -19,3 +19,12 @@
}
})
}
+export const referDataGrid = (params) => {
+ return request({
+ url: '/api/ubcs-code/referBtmTypeController/referDataGrid',
+ method: 'get',
+ params:{
+ ...params
+ }
+ })
+}
diff --git a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
index c40df95..2c7f374 100644
--- a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
@@ -199,7 +199,9 @@
code: "",
type: "PUBLIC",
template: "",
- codeClassifyOid:""
+ vars:{
+ codeClassifyOid:""
+ }
},
visibleFlow: false,
transferData: [],
@@ -259,7 +261,7 @@
codeClassifyOid: {
handler(newval, oldval) {
this.codeClassifyOid = newval;
- this.parameter.codeClassifyOid=newval
+ this.parameter.vars.codeClassifyOid=newval
},
deep: true,
},
diff --git a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
index 069888e..57cc374 100644
--- a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
@@ -237,7 +237,6 @@
@select="selectHandle"
@selection-change="selectionChange"
v-if="this.crudArrayFlag"
- ref="referAttrCrud"
>
<el-table-column
type="selection"
@@ -248,17 +247,18 @@
:label="item.label"
:prop="item.prop"
:formatter="formAttr"
- :width="item.width||(item.label.length >=4 ?'150':item.label.length==3 ?'120':'90')"
+ :width="item.width||(item.label.length >=4 ?'160':item.label.length==3 ?'130':'100')"
:show-overflow-tooltip="true"
+ :sortable="item.sortable"
align="center"
>
<template slot-scope="{ row }">
- <el-input v-if="editingRows === row && editShows== item.prop && (item.edit == 'text' || item.edit == 'select' ||item.edit == 'refer')" v-model="row[item.prop]"
+ <el-input v-if="editingRows === row && editShows== item.prop && item.prop != 'codeDateFormat' && (item.edit == 'text' || item.edit == 'select' ||item.edit == 'refer' )" v-model="row[item.prop]"
@blur="saveRows"></el-input>
- <el-input-number size="small" controls-position="right" v-if="editingRows === row && editShows== item.prop && item.edit == 'number'" v-model="row[item.prop]"
- @blur="saveRows" :style="{width:(item.width-10)+'px'}"></el-input-number>
+ <el-input-number controls-position="right" v-if="editingRows === row && editShows== item.prop && item.edit == 'number'" v-model="row[item.prop]"
+ @blur="saveRows"></el-input-number>
<el-switch
- v-if="item.edit === 'switch'" v-model="row[item.prop]" active-value="true"
+ v-if="item.edit === 'switch'" v-model="row[item.sortableprop]" active-value="true"
inactive-value="false">
</el-switch>
<span v-else>{{ row[item.prop] }}</span>
@@ -267,7 +267,7 @@
<el-table-column
fixed="right"
label="鎿嶄綔"
- width="70">
+ width="120">
<template slot-scope="scope">
<el-button
size="small"
@@ -440,6 +440,8 @@
isShowformulaEdit: false,
// 绾ц仈鍗曢��
selectRow: '',
+ //绾ц仈鍗曢�夋暟缁�
+ selectRowArr:[],
// 绾ц仈data
CascadeData: [],
// 绾ц仈option
@@ -994,7 +996,7 @@
label: '鎺掑簭鍙�',
sortable: true,
edit: 'number',
- width: 100,
+ width: 90,
fixed: true
}, {
label: "灞炴�ц嫳鏂囩紪鍙�",
@@ -1010,7 +1012,7 @@
prop: "name",
fixed: true,
cell: false,
- width: 125,
+ width: 145,
edit: 'text',
sortable: true
},
@@ -1140,7 +1142,7 @@
label: "鏃堕棿鏍煎紡",
prop: "codeDateFormat",
sortable: true,
- width: 105,
+ width: 135,
edit: 'select',
cell: false,
},
@@ -1255,7 +1257,9 @@
VTInteger: "鏁村舰",
VTFilePath: "鏂囦欢",
VTString: "瀛楃涓�"
- }
+ },
+ //鏃堕棿鏍煎紡涓嬫媺妗�
+ codeDataFlag:false,
}
},
computed:{
@@ -1285,7 +1289,6 @@
},
//灞炴�у垎缁勬寜閽�
attrVisibleHandle() {
-
if (this.attrSelectList.length > 1) {
this.$message.warning('鍙兘閫夋嫨涓�鏉℃ā鏉垮睘鎬�')
} else if (this.attrSelectList < 1) {
@@ -1382,18 +1385,32 @@
'conditionMap[classifyTemplateOid]': this.Formlist[0].oid,
'conditionMap[oid_notequal]': this.attrOid
}).then(res => {
+ console.log(res)
this.CascadeData = res.data.data;
})
}
},
- // 鎺掑簭棰勮鎸夐挳
- orderHandle(){
- this.$refs.referAttrCrud.sort("orderNum");
+ //绾ц仈淇濆瓨
+ CascadeAddHandle() {
+ let CascadeString = "";
+ CascadeString = this.selectRowArr.id + (this.selectRowArr.name);
+ this.$set(this.attrRow, 'parentCode', CascadeString)
+ this.CascadeVisible = false;
+ },
+ //绾ц仈灞炴�ф竻闄�
+ casRemove() {
+ this.selectRow = ""
+ },
+ // 绾ц仈灞炴�ц鍗曢��
+ CascaderowClick(row) {
+ this.selectRow = row.$index;
+ this.selectRowArr=row
},
//琛ㄦ牸鍗曢��
selectHandle(selection, row) {
this.attrOid = row.oid;
this.attrRow = row;
+ console.log(row)
},
//琛ㄦ牸閫夋嫨
selectionChange(list) {
@@ -1405,26 +1422,16 @@
this.$message.success('淇濆瓨鎴愬姛')
})
},
- //绾ц仈淇濆瓨
- CascadeAddHandle() {
- let CascadeString = "";
- CascadeString = this.attrRow.id + (this.attrRow.name);
- this.$set(this.attrRow, 'parentCode', CascadeString)
- this.CascadeVisible = false;
- },
- //绾ц仈灞炴�ф竻闄�
- casRemove() {
- this.selectRow = ""
- },
- // 绾ц仈灞炴�ц鍗曢��
- CascaderowClick(row) {
- this.selectRow = row.$index
- },
+
//琛ㄦ牸琛岀紪杈�
handleCellClicks(row, column) {
this.editingRows = row;
this.editShows = column.property;
this.rowOid = row.oid;
+ console.log(row,column)
+ if(column.property == 'codeDateFormat' ){
+
+ }
},
saveRows() {
this.editingRows = null;
@@ -1518,35 +1525,13 @@
this.injectVisible = false
},
//灞炴�фā鏉胯〃鏍煎崟鍏冩牸鐐瑰嚮浜嬩欢
- handleRowClick(row, column, cell, event) {
- //鍒ゆ柇鐐瑰嚮涓嶆槸鎿嶄綔鏍忔墠鍙墽琛�
- if (column.property != "menu") {
- // 褰撳墠琛屽彉涓哄彲缂栬緫鐘舵��
- this.rowList = row
- row.$cellEdit = true
- // 姣忎竴涓崟鍏冩牸鍔犱笂cell涓簍rue鎵嶆槸缂栬緫鐘舵��
- //鎷垮埌姣忎釜columnKey锛岀偣鍑绘椂璁剧疆涓簍rue锛屽氨瀹炵幇鍗曞厓鏍肩紪杈戠姸鎬佷簡
- this.rowCellList = this.findObject(this.option.column, column.columnKey)
- this.rowCellList.cell = true
- if (this.List.indexOf(column.columnKey) == -1) {
- this.List.push(column.columnKey)
- }
- // if(this.List.length >= 2){
- // const cellName=this.List[0]
- //
- // }
- }
- },
//琛ㄦ牸鎿嶄綔鏍忓垹闄�
CrudRowDel(row) {
this.ProData.splice(row.$index, 1)
},
//琛ㄦ牸鍒犻櫎
CrudRemove() {
- this.attrSelectList.forEach((item)=>{
- this.ProData.splice(item.$index, 1)
- })
-
+ this.ProData.splice(this.attrRow.$index, 1)
},
//琛ㄦ牸閲嶇疆
reset() {
diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue b/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue
index a5dc3e3..593fc18 100644
--- a/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue
+++ b/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue
@@ -1,13 +1,14 @@
<template>
<div>
- <avue-form v-model="loneTreeNewForm" :option="option" @submit="submit" v-if="flag == 'renonly'">
+ <avue-form v-model="loneTreeNewForm" :option="option" v-if="flag == 'renonly'">
</avue-form>
<avue-form v-model="loneTreeNewForm" :option="options" @submit="submits" v-else-if="flag == 'edit'">
</avue-form>
<div>
-<!-- 涓恒�愮紪鐮佽鍒欍�戦�夊彇鍊�-->
- <el-dialog :visible.sync="MasterdialogVisible" title="涓恒�愮紪鐮佽鍒欍�戦�夊彇鍊�" append-to-body>
- <avue-crud :data="masterData" :option="masterOption" @select="masterSelect"></avue-crud>
+
+<!-- 瀛樺偍涓氬姟绫诲瀷-->
+ <el-dialog :visible.sync="BtmdialogVisible" title="涓恒�愬瓨鍌ㄤ笟鍔＄被鍨嬨�戦�夊彇鍊�" append-to-body>
+ <avue-crud :data="BtmData" :option="btmOption" @select="btmSelect"></avue-crud>
<div style="padding-top: 10px;display: flex; justify-content: flex-end" >
<el-button type="primary" size="small" @click="MasterHandlerClick">纭畾</el-button>
<el-button size="small" @click="MasterdialogVisible=false">鍙栨秷</el-button>
@@ -15,7 +16,7 @@
</el-dialog>
<!-- 鍏抽敭灞炴�ф煡璇㈣鍒�-->
<el-dialog :visible.sync="KeydialogVisible" title="涓恒�愬叧閿睘鎬ф煡璇㈣鍒欍�戦�夊彇鍊�" append-to-body>
- <avue-crud :data="KeyData" :option="masterOption" @select="masterSelect"></avue-crud>
+ <avue-crud :data="KeyData" :option="masterOption" @select="KeySelect"></avue-crud>
<div style="padding-top: 10px;display: flex; justify-content: flex-end" >
<el-button type="primary" size="small" @click="KeyHandlerClick">纭畾</el-button>
<el-button size="small" @click="KeydialogVisible=false">鍙栨秷</el-button>
@@ -23,7 +24,7 @@
</el-dialog>
<!-- 鐩镐技椤规煡璇㈣鍒�-->
<el-dialog :visible.sync="SimidialogVisible" title="涓恒�愮浉浼奸」鏌ヨ瑙勫垯銆戦�夊彇鍊�" append-to-body>
- <avue-crud :data="simData" :option="masterOption" @select="masterSelect"></avue-crud>
+ <avue-crud :data="simData" :option="masterOption" @select="simSelect"></avue-crud>
<div style="padding-top: 10px;display: flex; justify-content: flex-end" >
<el-button type="primary" size="small" @click="simHandlerClick">纭畾</el-button>
<el-button size="small" @click="SimidialogVisible=false">鍙栨秷</el-button>
@@ -34,20 +35,49 @@
</template>
<script>
-import {defaultReferDataGrid} from '@/api/MasterData/master'
+import {defaultReferDataGrid,referDataGrid} from '@/api/MasterData/master'
import {TreeEditSave} from '@/api/template/templateAttr'
export default {
name: "classifyTreeform.vue",
- props: ['loneTreeNewForm','flag'],
+ props: ['loneTreeNewForm','flag','Editclose'],
data() {
return {
- name:"",
- oid:"",
+ masterName:"",
+ masterOid:"",
+ KeyName:"",
+ KeyOid:"",
+ simName:"",
+ simOid:"",
+ btmName:"",
+ btmOid:"",
masterInput:'',
MasterSearchSelects:"",
masterData:[],
KeyData:[],
simData:[],
+ BtmData:[],
+ btmOption:{
+ addBtn:false,
+ index:true,
+ border:true,
+ selection:true,
+ menu:false,
+ height:380,
+ column:[
+ {
+ label:'涓氬姟绫诲瀷缂栧彿',
+ prop:'id'
+ },
+ {
+ label:'涓氬姟绫诲瀷鍚嶇О',
+ prop:'name'
+ },
+ {
+ label:'鎻忚堪',
+ prop:'description'
+ }
+ ]
+ },
masterOption:{
addBtn:false,
index:true,
@@ -73,6 +103,7 @@
MasterdialogVisible:false,
KeydialogVisible:false,
SimidialogVisible:false,
+ BtmdialogVisible:false,
form: {
name: "鍝堝搱",
sex: "鐢�"
@@ -172,6 +203,7 @@
label: '瀛樺偍鐨勪笟鍔＄被鍨�',
prop: 'btmtypename',
labelWidth:128,
+ focus:this.btmFoucus,
rules: [{
required: true,
message: "瀛樺偍鐨勪笟鍔＄被鍨�",
@@ -200,20 +232,21 @@
]
},
FormList: {},
- masterSelectList:[]
+ masterSelectList:[],
+ KeySelectLIst:[],
+ simSelectList:[],
+ btmSelectList:[]
}
},
created() {
},
methods: {
submits(form,done){
- console.log(this.loneTreeNewForm)
TreeEditSave(this.loneTreeNewForm).then(res=>{
this.$message.success('淇敼鎴愬姛');
- }).catch(res=>{
- this.$message.error(res)
+ this.Editclose()
+ done()
})
- done()
},
error(err) {
this.$message.success('璇锋煡鐪嬫帶鍒跺彴');
@@ -233,17 +266,17 @@
}else {
this.MasterdialogVisible=false;
this.masterSelectList=[]
- this.loneTreeNewForm.codeRuleOidName=this.name;
- this.loneTreeNewForm.codeRuleOid=this.oid;
- console.log(this.masterSelectList)
+ this.$set(this.loneTreeNewForm,'coderuleoidName',this.masterName)
+ this.$set(this.loneTreeNewForm,'coderuleOid',this.masterOid)
+ this.$emit('MasterHandler',this.loneTreeNewForm)
+ console.log(this.loneTreeNewForm)
}
},
//缂栫爜澶氶��
masterSelect(row){
- console.log(row)
this.masterSelectList=row;
- this.name=row[0].name;
- this.oid=row[0].oid;
+ this.masterName=row[0].name;
+ this.masterOid=row[0].oid;
console.log('oid',this.oid)
},
//缂栫爜鎺ュ彛
@@ -253,10 +286,7 @@
isMuti:'false',
'conditionMap["lcstatus"]':'Released'
}).then(res=>{
- console.log('---',res)
this.masterData=res.data.records;
- console.log('masterData',this.masterData)
-
})
},
// 鍏抽敭灞炴�уけ鐒�
@@ -266,31 +296,86 @@
},
//鍏抽敭灞炴�х‘瀹�
KeyHandlerClick(){
- if(this.masterSelectList.length>1){
+ if(this.KeySelectLIst.length>1){
this.$message.warning('鍙兘閫夋嫨涓�鏉℃暟鎹�')
- }else if(this.masterSelectList.length<=0){
+ }else if(this.KeySelectLIst.length<=0){
this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�')
}else {
-
+ this.KeydialogVisible=false;
+ this.KeySelectLIst=[]
+ this.$set(this.loneTreeNewForm,'codeResembleRuleOidName',this.simName)
+ this.$set(this.loneTreeNewForm,'codeResembleRuleOid',this.simOid)
+ this.$emit('MasterHandler',this.loneTreeNewForm)
}
},
+ //鍏抽敭灞炴�ф帴鍙�
KeydefaultRend(){
defaultReferDataGrid({
referType:'codekeyattrrepeat',
isMuti:'false',
'conditionMap["lcstatus"]':'Enabled'
}).then(res=>{
- this.keyData=res.data.records;
- console.log('key',this.keyData)
+ this.KeyData=res.data.records;
})
+ },
+ // 鍏抽敭澶氶��
+ KeySelect(row){
+ this.KeySelectLIst=row;
+ this.KeyName=row[0].name;
+ this.KeyOid=row[0].oid;
},
// 鐩镐技椤瑰け鐒�
simFouce(){
this.SimidialogVisible=true;
+ this.simdefaultRend()
},
//鐩镐技椤圭‘瀹�
simHandlerClick(){
-
+ if(this.simSelectList.length>1){
+ this.$message.warning('鍙兘閫夋嫨涓�鏉℃暟鎹�')
+ }else if(this.simSelectList.length<=0){
+ this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�')
+ }else {
+ this.SimidialogVisible=false;
+ this.simSelectList=[]
+ this.$set(this.loneTreeNewForm,'codeResembleRuleOidName',this.simName)
+ this.$set(this.loneTreeNewForm,'codeResembleRuleOid',this.simOid)
+ this.$emit('MasterHandler',this.loneTreeNewForm)
+ }
+ },
+ // 鐩镐技椤瑰閫�
+ simSelect(row){
+ this.simSelectList=row;
+ this.simName=row[0].name;
+ this.simOid=row[0].oid;
+ console.log('oid',this.oid)
+ },
+ //鐩镐技椤归」鎺ュ彛
+ simdefaultRend(){
+ defaultReferDataGrid({
+ referType:'coderesemblerule',
+ isMuti:'false',
+ 'conditionMap["lcstatus"]':'Enabled'
+ }).then(res=>{
+ this.simData=res.data.records;
+ })
+ },
+ //涓氬姟绫诲瀷澶辩劍
+ btmFoucus(){
+ this.BtmdialogVisible=true;
+ this.btmdefaultRend()
+ },
+ // 涓氬姟绫诲瀷澶氶��
+ btmSelect(row){
+ this.btmSelectList=row;
+ this.btmName=row[0].name;
+ this.btmOid=row[0].oid;
+ },
+ //涓氬姟绫诲瀷鎺ュ彛
+ btmdefaultRend(){
+ referDataGrid({valueField:'id',isMuti:'false'}).then(res=>{
+ console.log(res)
+ })
}
}
}
@@ -299,6 +384,3 @@
<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/src/components/Tree/classifyTrees.vue b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
index 8331068..18e84bf 100644
--- a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
@@ -29,9 +29,6 @@
<el-form-item label="鎻忚堪锛�" label-width="150px">
<el-input v-model="TreeAddform.description" autocomplete="off" style="width: 585px"></el-input>
</el-form-item>
- <el-form-item v-show="this.TreeFlag==false" label="瀛樺偍鐨勪笟鍔＄被鍨嬶細" label-width="150px">
- <el-input v-model="TreeAddform.btmtypename" autocomplete="off" style="width: 585px"></el-input>
- </el-form-item>
<el-form-item label="缂栫爜瑙勫垯锛�" label-width="150px">
<el-input v-model="TreeAddform.coderuleoidName" autocomplete="off" style="width: 585px"></el-input>
</el-form-item>
@@ -51,7 +48,7 @@
</el-dialog>
<!-- 淇敼瀵硅瘽妗�-->
<el-dialog :visible.sync="TreeEditFormVisible" append-to-body title="淇敼鍒嗙被">
- <classifyTreeform ref="childForm" :loneTreeNewForm="TreeList" :nodeList="nodeList" :flag="'edit'"></classifyTreeform>
+ <classifyTreeform ref="childForm" :loneTreeNewForm="TreeList" :nodeList="nodeList" :flag="'edit'" @MasterHandler="MasterHandler" :Editclose=" ()=>{TreeEditFormVisible=false}"></classifyTreeform>
</el-dialog>
<avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="CloneTreedata" :defaultExpandAll="false"
:option="Treeoption"
@@ -176,10 +173,6 @@
</el-container>
</template>
<script>
-//杩欓噷澹版槑涓�浜涜彍鍗曠粍浠剁敤娉曪細棣栧厛甯冨眬鍒嗕负宸︿晶鑿滃崟鍙充晶琛ㄦ牸锛屽彲鑳戒細鏈夊彸渚ab鏍忓姞琛ㄥ崟鐨勬儏鍐点�傛墍浠ュ彟澶栧紩鍏ヤ簡涓�涓彸渚ц〃鍗曠殑缁勪欢"classifyTreeform"銆�
-//棣栧厛鐖剁粍浠惰皟鐢ㄥ瓙缁勪欢鑿滃崟锛岄�氳繃provide浼犻�掑弬鏁般�傛湁Treeoption宸︿晶鏍戞柊澧炶〃鍗曢」 Treedata宸︿晶鏍戣妭鐐归厤缃」 crudTreeOption鍙充晶琛ㄦ牸閰嶇疆椤� crudTreeData鍙充晶琛ㄦ牸鏄剧ず鍐呭
-//鍏朵腑琛ㄦ牸鐨勯厤缃」鐩存帴鐖朵紶瀛愪紶閫掕繃鏉ュ氨琛岋紝鐩存帴:option=浼犻�掔殑鍙傛暟鍚嶏紝閲岄潰鏁版嵁鏄剧ず鐨勫唴瀹瑰洜涓烘槸鍜屽乏渚ц仈鍔ㄧ殑锛屾墍浠ラ噸鏂颁竴涓狥ormlist锛岄�氳繃鐐瑰嚮鏍戣妭鐐逛笅鏍囨潵鍔ㄦ�佹覆鏌撳彸渚ц〃鏍硷紝涓嬮潰鏂规硶閮芥湁鍏蜂綋娉ㄩ噴
-//鐒跺悗鍐嶈鍙充晶鐨勮〃鍗曪紝涓撻棬瀹氫箟浜嗕竴涓粍浠讹紝閫氳繃鐖朵紶瀛愬啀鎶婅〃鍗曟暟鎹甌reeList浼犻�掕繃鍘伙紝浼犻�掑墠鍦�10deCLi1ck鏂规硶閲岄潰渚夸簡澶勭悊涔熸槸涓�涓仈鍔ㄧ殑鏁堟灉锛岃〃鍗曠殑閰嶇疆椤瑰湪鍝釜瀛愮粍浠舵垨鑰呯埗缁勪欢鍐欓兘鍙互銆�
import {
getAtrrList,
TreeSave,
@@ -206,36 +199,6 @@
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:"",
@@ -470,6 +433,10 @@
}
},
methods: {
+ MasterHandler(val){
+ console.log('鐖朵翰',val)
+ this.TreeList=val
+ },
//琛屽崟閫変簨浠�
selectHandle(selection,row){
this.crudOid=row.oid;
diff --git a/Source/UBCS-WEB/src/components/template/SetPersonnel.vue b/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
index 60d037f..22644e7 100644
--- a/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
+++ b/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
@@ -135,7 +135,7 @@
return this.initFrom.findIndex(i => i.taskId === arr1)
},
async apiInit() {
- const response = await personnelInit({ type: this.parameter[this.parameterKeys.type], templateId: this.parameter[this.parameterKeys.code],ids:this.parameter.ids, codeClassifyOid:this.parameter.codeClassifyOid})
+ const response = await personnelInit({ type: this.parameter[this.parameterKeys.type], templateId: this.parameter[this.parameterKeys.code]})
if (response.status === 200) {
console.log(response)
this.initFrom = response.data.data.user
--
Gitblit v1.9.3