From 10c2ee4be4508c62b5980cc7059b1e8e95f7a3cc Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 04 七月 2023 17:22:11 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue | 70 ++++++++++++++++++++---------------
1 files changed, 40 insertions(+), 30 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue b/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue
index cb2f4ff..ffa58b5 100644
--- a/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue
+++ b/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue
@@ -2,19 +2,10 @@
<div>
<avue-form v-model="loneTreeNewForm" :option="option" @submit="submit" v-if="flag == 'renonly'">
</avue-form>
- <avue-form v-model="loneTreeNewForm" :option="options" @submit="submit" v-else-if="flag == 'edit'">
+ <avue-form v-model="loneTreeNewForm" :option="options" @submit="submits" v-else-if="flag == 'edit'">
</avue-form>
<div>
<el-dialog :visible.sync="dialogVisible" title="涓恒�愮紪鐮佽鍒欍�戦�夊彇鍊�" append-to-body>
- <div>
- <el-input placeholder="璇烽�夋嫨鍐呭" v-model="masterInput" class="input-with-select">
- <el-select v-model="MasterSearchSelects" placeholder="璇烽�夋嫨">
- <el-option label="鑻辨枃鍚嶇О" value="0"></el-option>
- <el-option label="涓枃鍚嶇О" value="1"></el-option>
- </el-select>
- <el-button slot="append" icon="el-icon-search"></el-button>
- </el-input>
- </div>
<avue-crud :data="masterData" :option="masterOption" @select="masterSelect"></avue-crud>
<div style="padding-top: 10px;display: flex; justify-content: flex-end" >
<el-button type="primary" size="small" @click="MasterHandlerClick">纭畾</el-button>
@@ -26,30 +17,24 @@
</template>
<script>
+import {defaultReferDataGrid} from '@/api/MasterData/master'
+import {TreeEditSave} from '@/api/template/templateAttr'
export default {
name: "classifyTreeform.vue",
props: ['loneTreeNewForm','flag'],
data() {
return {
+ name:"",
+ oid:"",
masterInput:'',
MasterSearchSelects:"",
- masterData:[
- {
- id:'001',
- name:'001',
- description:'001'
- },
- {
- id:'002',
- name:'002',
- description:'002'
- }
- ],
+ masterData:[],
masterOption:{
addBtn:false,
index:true,
border:true,
selection:true,
+ menu:false,
height:380,
column:[
{
@@ -79,7 +64,7 @@
{
label: '涓婚搴�/鍒嗙被缂栧彿',
prop: 'btmtypeid',
- labelWidth:128,
+ labelWidth:135,
readonly: true,
rules: [{
required: true,
@@ -91,7 +76,7 @@
label: '涓婚搴�/鍒嗙被鍚嶇О',
prop: 'name',
readonly: true,
- labelWidth:128,
+ labelWidth:135,
rules: [{
required: true,
message: "涓婚搴�/鍒嗙被鍚嶇О",
@@ -136,8 +121,6 @@
]
},
options: {
- submitBtn:false,
- emptyBtn:false,
column: [
{
label: '涓婚搴�/鍒嗙被缂栧彿',
@@ -197,9 +180,17 @@
masterSelectList:[]
}
},
+ created() {
+ this.defaultRend()
+ },
methods: {
- submit(form, done) {
- this.$message.success(JSON.stringify(form));
+ submits(form,done){
+ console.log(this.loneTreeNewForm)
+ TreeEditSave(this.loneTreeNewForm).then(res=>{
+ this.$message.success('淇敼鎴愬姛');
+ }).catch(res=>{
+ this.$message.error(res)
+ })
done()
},
error(err) {
@@ -217,13 +208,29 @@
this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�')
}else {
this.dialogVisible=false;
- console.log(this.masterInput)
- console.log(this.MasterSearchSelect)
+ this.masterSelectList=[]
+ this.loneTreeNewForm.codeRuleOidName=this.name;
+ this.loneTreeNewForm.codeRuleOid=this.oid;
+ console.log(this.masterSelectList)
}
+ },
+ defaultRend(){
+ defaultReferDataGrid({
+ referType:'coderule',
+ isMuti:'false',
+ 'conditionMap["lcstatus"]':'Released'
+ }).then(res=>{
+ console.log('---',res)
+ this.masterData=res.data.records;
+
+ })
},
masterSelect(row){
console.log(row)
this.masterSelectList=row;
+ this.name=row[0].name;
+ this.oid=row[0].oid;
+ console.log('oid',this.oid)
}
}
}
@@ -232,3 +239,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-->
--
Gitblit v1.9.3