From abf8822cfc6fe397d1f7216620f8ba5d3b4d0aab Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 12 十二月 2023 10:49:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Theme/ThemeClassifyTreeform.vue | 45 +++++++++++++++++++++++++++++++++------------
1 files changed, 33 insertions(+), 12 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTreeform.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTreeform.vue
index f21526d..5882a33 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTreeform.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTreeform.vue
@@ -20,14 +20,14 @@
<el-input style="width: 260px;margin-left: 15px" placeholder="杈撳叆鍊煎悗杩涜妯＄硦鏌ヨ" v-model="SelectFInd"></el-input>
<el-button size="small" type="primary" plain @click="SelectFindeHandler" style="margin-left: 20px">鏌ヨ</el-button>
</template>
- <avue-crud :data="masterData" :option="Option" @row-click="masterSelect">
+ <avue-crud :data="masterData" :option="attrOption" @row-click="masterSelect">
<template slot="radio" slot-scope="{row}">
<el-radio v-model="masterRow" :label="row.$index" style="padding-left: 10px !important;">{{ '' }}
</el-radio>
</template>
</avue-crud>
<div style="height: 30px">
- <div style="display: inline-block;float: left;border: 1px solid #eee;padding: 5px;margin-top: 5px;font-size: 14px " >宸茶缃殑鍊间负:[{{this.loneTreeNewForm.coderuleoidName}}]</div>
+ <div style="display: inline-block;float: left;border: 1px solid #eee;padding: 5px;margin-top: 5px;font-size: 14px " >宸茶缃殑鍊间负:[{{this.loneTreeNewForm.codeRuleOidName}}]</div>
<div style="padding-top: 10px;display: flex; justify-content: flex-end;float: right;overflow: hidden" >
<el-button type="primary" size="small" @click="MasterHandlerClick">纭畾</el-button>
<el-button size="small" @click="masterEscHandler">鍙栨秷</el-button>
@@ -49,14 +49,14 @@
<el-input style="width: 260px;margin-left: 15px" placeholder="杈撳叆鍊煎悗杩涜妯＄硦鏌ヨ" v-model="SelectFInd"></el-input>
<el-button size="small" type="primary" plain @click="KeySelectFindeHandler" style="margin-left: 20px">鏌ヨ</el-button>
</template>
- <avue-crud :data="KeyData" :option="Option" @row-click="KeySelect">
+ <avue-crud :data="KeyData" :option="attrOption" @row-click="KeySelect">
<template slot="radio" slot-scope="{row}">
<el-radio v-model="masterRow" :label="row.$index" style="padding-left: 10px !important;">{{ '' }}
</el-radio>
</template>
</avue-crud>
<div style="height: 30px">
- <div style="display: inline-block;float: left;border: 1px solid #eee;padding: 5px;margin-top: 5px;font-size: 14px " >宸茶缃殑鍊间负:[{{this.loneTreeNewForm.codekeyattrrepeatoidName}}]</div>
+ <div style="display: inline-block;float: left;border: 1px solid #eee;padding: 5px;margin-top: 5px;font-size: 14px " >宸茶缃殑鍊间负:[{{this.loneTreeNewForm.codeKeyAttrRepeatOidName}}]</div>
<div style="padding-top: 10px;display: flex; justify-content: flex-end;float: right;overflow: hidden" >
<el-button type="primary" size="small" @click="KeyHandlerClick">纭畾</el-button>
<el-button size="small" @click="KeyEscHandler">鍙栨秷</el-button>
@@ -78,7 +78,7 @@
<el-input style="width: 260px;margin-left: 15px" placeholder="杈撳叆鍊煎悗杩涜妯＄硦鏌ヨ" v-model="SelectFInd"></el-input>
<el-button size="small" type="primary" plain @click="SimSelectFindeHandler" style="margin-left: 20px">鏌ヨ</el-button>
</template>
- <avue-crud :data="simData" :option="Option"@row-click="simSelect">
+ <avue-crud :data="simData" :option="attrOption"@row-click="simSelect">
<template slot="radio" slot-scope="{row}">
<el-radio v-model="masterRow" :label="row.$index" style="padding-left: 10px !important;">{{ '' }}
</el-radio>
@@ -172,7 +172,8 @@
],
SelectValue:'id',
btmOption:{
- columnBtn:false,
+ columnBtn: false,
+ refreshBtn:false,
addBtn:false,
index:true,
border:true,
@@ -194,9 +195,10 @@
}
]
},
- Option:{
+ attrOption:{
addBtn:false,
- columnBtn:false,
+ columnBtn: false,
+ refreshBtn:false,
index:true,
border:true,
menu:false,
@@ -223,6 +225,8 @@
]
},
masterOption:{
+ columnBtn: false,
+ refreshBtn:false,
addBtn:false,
index:true,
border:true,
@@ -309,7 +313,7 @@
},
{
label:"鍏抽敭灞炴�ф煡璇㈣鍒�",
- prop:"codekeyattrrepeatoidName",
+ prop:"codeKeyAttrRepeatOidName",
labelWidth:128,
disabled: true,
},
@@ -319,6 +323,23 @@
labelWidth:128,
disabled: true,
},
+ {
+ label: '鏄惁鍙備笌鍏抽敭灞炴�ф牎楠�',
+ prop: 'isParticipateCheck',
+ type: 'switch',
+ activeColor: "#13ce66",
+ inactiveColor: "#ff4949",
+ labelWidth:160,
+ disabled: true,
+ dicData: [{
+ label: '鍚�',
+ value: 0
+ }, {
+ label: '鏄�',
+ value: 1
+ }
+ ]
+ }
]
},
@@ -380,7 +401,7 @@
},
{
label:"鍏抽敭灞炴�ф煡璇㈣鍒�",
- prop:"codekeyattrrepeatoidName",
+ prop:"codeKeyAttrRepeatOidName",
labelWidth:128,
focus:this.Keyfouce,
readonly: true,
@@ -533,8 +554,8 @@
}else {
this.KeydialogVisible=false;
this.KeySelectLIst=[]
- this.$set(this.loneTreeNewForm,'codekeyattrrepeatoidName',this.KeyName)
- this.$set(this.loneTreeNewForm,'codekeyattrrepeatoid',this.KeyOid)
+ this.$set(this.loneTreeNewForm,'codeKeyAttrRepeatOidName',this.KeyName)
+ this.$set(this.loneTreeNewForm,'codeKeyAttrRepeatOid',this.KeyOid)
this.$emit('MasterHandler',this.loneTreeNewForm)
}
},
--
Gitblit v1.9.3