From 70fb56a9fb61f70ccc55fcbc085b470e9423858a Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期一, 05 六月 2023 16:16:35 +0800
Subject: [PATCH] 解决冲突
---
Source/UBCS-WEB/src/views/modeling/original.vue | 693 ++++++++++++++++++++++++---------------------------------
1 files changed, 289 insertions(+), 404 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/modeling/original.vue b/Source/UBCS-WEB/src/views/modeling/original.vue
index f21eb03..9757875 100644
--- a/Source/UBCS-WEB/src/views/modeling/original.vue
+++ b/Source/UBCS-WEB/src/views/modeling/original.vue
@@ -1,479 +1,364 @@
<template>
- <basic-container>
- <avue-crud v-model="form" :option="option" :data="data" ref="crud" :before-open="beforeOpen" @on-load="onLoad" @row-save="rowSave" @row-update="rowUpdate" @row-del="rowDel" :page.sync="page">
- <template slot-scope="{row,index,type}" slot="selInputForm">
- <div style="margin-left: 75px">
- <el-input v-model="form.text" :size="size"
- style="width: 210px" :readonly="true"></el-input>
- <el-button type="primary" style="margin-left: 10px" @click="addHandle">閫夋嫨</el-button>
- <el-button type="info">鍙栨秷</el-button>
- </div>
- </template>
- </avue-crud>
- <el-dialog :visible.sync="packageBox"
- append-to-body
- title="鏌ョ湅涓氬姟绫诲瀷"
- width="1000px">
- <original-range @rowchange="rowchange"></original-range>
- <span slot="footer" class="dialog-footer">
- <el-button @click="dialoghandelfalse">鍙� 娑�</el-button>
- <el-button type="primary" @click="dialoghandeltrue">纭� 瀹�</el-button>
- </span>
- </el-dialog>
- <el-dialog :visible.sync="packageLinkBox"
- append-to-body
- title="鏌ョ湅閾炬帴绫诲瀷"
- width="1000px">
- <original-link @rowLinkchange="rowLinkchange"></original-link>
- <span slot="footer" class="dialog-footer">
- <el-button @click="Linkdialoghandelfalse">鍙� 娑�</el-button>
- <el-button type="primary" @click="Linkdialoghandeltrue">纭� 瀹�</el-button>
- </span>
- </el-dialog>
- </basic-container>
+ <el-container>
+ <el-main>
+ <basic-container>
+ <avue-crud v-model="form"
+ ref="crud"
+ :option="option"
+ :data="data"
+ @on-load="onLoad"
+ :page.sync="page"
+ @refresh-change="refreshChange"
+ @row-click="rowClick">
+ <template slot="radio"
+ slot-scope="{row}">
+ <el-radio v-model="selectRow"
+ :label="row.$index">
+ </el-radio>
+ </template>
+ <template slot="menu">
+ <el-button icon="el-icon-edit" size="small" type="text" @click="updateSave">缂栬緫</el-button>
+ <el-button icon="el-icon-delete" size="small" type="text" @click="deleteSave">鍒犻櫎</el-button>
+ </template>
+ <template slot="menuLeft">
+ <el-button size="small"
+ type="primary"
+ icon="el-icon-plus"
+ @click="addSave">鏂� 澧�
+ </el-button>
+ <el-button size="small"
+ plain
+ type="primary"
+ icon="el-icon-zoom-in"
+ @click="applyRangeOpen">鏌ョ湅浣跨敤鑼冨洿
+ </el-button>
+ </template>
+ </avue-crud>
+ <el-dialog :visible.sync="applyRange.display" append-to-body :title="applyRange.title" width="600px"
+ @close="applyRangeClose">
+ <avue-crud v-model="applyRange.model" :option="applyRange.option" :data="applyRange.data" class="applyRangeTable"
+ ></avue-crud>
+ </el-dialog>
+ </basic-container>
+ </el-main>
+ <el-aside>
+ <basic-container class="itemForm">
+ <el-descriptions class="margin-top" :column="1" size="medium" border title="灞炴�ч」">
+ <el-descriptions-item>
+ <template slot="label">
+ 灞炴�х紪鍙�
+ </template>
+ {{ itemForm.itemData.id }}
+ </el-descriptions-item>
+ <el-descriptions-item>
+ <template slot="label">
+ 灞炴�у悕绉�
+ </template>
+ {{ itemForm.itemData.name }}
+ </el-descriptions-item>
+ <el-descriptions-item>
+ <template slot="label">
+ 灞炴�х被鍨�
+ </template>
+ {{ itemForm.itemData.typeValue }}
+ </el-descriptions-item>
+ <el-descriptions-item>
+ <template slot="label">
+ 鏍囩
+ </template>
+ {{ itemForm.itemData.hashtag }}
+ </el-descriptions-item>
+ <el-descriptions-item>
+ <template slot="label">
+ 榛樿鍊�
+ </template>
+ {{ itemForm.itemData.defaultValue }}
+ </el-descriptions-item>
+ <el-descriptions-item>
+ <template slot="label">
+ 鍏佽涓虹┖
+ </template>
+ {{ itemForm.itemData.nullable }}
+ </el-descriptions-item>
+ <el-descriptions-item>
+ <template slot="label">
+ 闀垮害
+ </template>
+ {{ itemForm.itemData.maxLength }}
+ </el-descriptions-item>
+ <el-descriptions-item>
+ <template slot="label">
+ 鎻忚堪
+ </template>
+ {{ itemForm.itemData.description }}
+ </el-descriptions-item>
+ </el-descriptions>
+ <div style="height:15px"></div>
+ <el-descriptions class="margin-top" :column="1" size="medium" border title="灞炴�ч厤缃�"></el-descriptions>
+ <el-tabs v-model="itemForm.activeName" @tab-click="handleClick" stretch="true" style="height:235px">
+ <el-tab-pane label="鍙傜収" name="referTab">
+ <el-descriptions class="margin-top" :column="1" size="medium" border>
+ <el-descriptions-item>
+ <template slot="label">
+ 浣跨敤鍙傜収
+ </template>
+ {{ itemForm.itemData.referTypeValue ? '鏄�' : '鍚�' }}
+ </el-descriptions-item>
+ <el-descriptions-item>
+ <template slot="label">
+ 鍙傜収绫诲瀷
+ </template>
+ {{ itemForm.itemData.referTypeValue }}
+ </el-descriptions-item>
+ <el-descriptions-item>
+ <template slot="label">
+ 鍙傜収鍚嶇О
+ </template>
+ {{ itemForm.itemData.referToName }}
+ </el-descriptions-item>
+ </el-descriptions>
+ </el-tab-pane>
+ <el-tab-pane label="鏋氫妇" name="enumTab">
+ <el-descriptions class="margin-top" :column="1" :size="small" border>
+ <el-descriptions-item>
+ <template slot="label">
+ 浣跨敤鏋氫妇
+ </template>
+ {{ itemForm.itemData.usingDict ? '鏄�' : '鍚�' }}
+ </el-descriptions-item>
+ <el-descriptions-item>
+ <template slot="label">
+ 鏋氫妇绫诲瀷
+ </template>
+ {{ itemForm.itemData.dictCode }}
+ </el-descriptions-item>
+ </el-descriptions>
+ </el-tab-pane>
+ </el-tabs>
+ </basic-container>
+ </el-aside>
+ <originalAdd ref="originalAdd" :attribute="attribute" @refreshTable="refreshChange"></originalAdd>
+ </el-container>
</template>
<script>
+import {
+ getList,
+ remove,
+ add,
+ update, getPage, getApplyRange
+} from "@/api/omd/OmdAttribute";
+
export default {
- name: "passwords.vue",
+ name: "original",
data() {
- return {
- rouname:"",
- // 涓氬姟绫诲瀷瀵硅瘽妗�
- packageBox:false,
- //閾炬帴绫诲瀷瀵硅瘽妗�
- packageLinkBox:false,
- //鍊煎煙涓嬫媺妗嗘暟鎹�
- Typelist:[],
- //鐗堟湰鏁版嵁
- banList:[],
- form:{
- text:""
- },
+ return {
page: {
pageSize: 10,
currentPage: 1,
total: 100
},
- data: [
- {
- name:"a",
- prop:"VTstring",
- admin:"榛樿",
- desc:"娴嬭瘯A"
- },
- {
- name:"b",
- prop:"VTstring",
- admin:"榛樿",
- desc:"娴嬭瘯B"
- },
- {
- name:"c",
- prop:"VTstring",
- admin:"榛樿",
- desc:"娴嬭瘯C"
- },
- {
- name:"d",
- prop:"VTstring",
- admin:"榛樿",
- desc:"娴嬭瘯D"
- }
- ],
- option:{
- selection: true,
+ selectRow: '',
+ data: [],
+ form:{},
+ attribute: {
+ nullable: true
+ },
+ option: {
+ height: "550px",
headerAlign: 'center',
border: true,
index: true,
- rowKey:'id',
+ rowKey: 'id',
tabs: true,
- column:[
+ stripe:true,
+ indexFixed: false,
+ menuWidth: 150,
+ highlightCurrentRow: true,
+ addBtn:false,
+ editBtn:false,
+ delBtn:false,
+ column: [{
+ label: '閫夋嫨',
+ prop: 'radio',
+ width: 60,
+ hide: false,
+ display: false
+ },
{
- label: '灞炴�у悕',
+ label: '灞炴�х紪鍙�',
+ prop: 'id',
+ align: 'left',
+ display: false,
+ width: 200,
+ required: true
+ }, {
+ label: '灞炴�у悕绉�',
prop: 'name',
align: 'left',
- display:false
+ display: false
},
{
label: '鏍囩',
- prop: 'tag',
- hide:true,
+ prop: 'hashtag',
+ // hide: true,
display: false
},
{
label: '鏄惁浣跨敤鏋氫妇',
- prop: 'isnot',
+ prop: 'usingDict',
type: 'switch',
- hide:true,
+ hide: true,
labelWidth: 132,
display: false,
- dicData:[{
- label:'鏄�',
- value:0
- },{
- label:'鍚�',
- value:1
+ dicData: [{
+ label: '鏄�',
+ value: 'true'
+ }, {
+ label: '鍚�',
+ value: 'false'
}]
},
{
label: '灞炴�х被鍨�',
- prop: 'prop',
- type:"select",
+ prop: 'typeValue',
display: false,
- dicData:[
- {
- label:"娴嬭瘯1",
- value:0
- },
- {
- label:"娴嬭瘯2",
- value:1
- },
- {
- label:"娴嬭瘯3",
- value:2
- }
- ]
+ // hide: true
},
{
label: '榛樿鍊�',
- prop: 'admin',
+ prop: 'defaultValue',
display: false
},
{
label: '鍏佽涓虹┖',
- prop: 'isDefault',
+ prop: 'nullable',
type: 'switch',
display: false,
- hide:true,
+ hide: true,
labelWidth: 132,
- dicData:[{
- label:'涓嶅厑璁�',
- value:0
- },{
- label:'鍏佽',
- value:1
+ dicData: [{
+ label: '鍚�',
+ value: 'false'
+ }, {
+ label: '鏄�',
+ value: 'true'
}]
},
{
label: "闀垮害",
- prop: "length",
+ prop: "maxLength",
hide: true,
display: false
},
{
label: '鎻忚堪',
- prop: 'desc',
- type:"textarea",
+ prop: 'description',
+ type: "textarea",
display: false
},
- ],
- group:[
- {
- label: '灞炴�ч」',
- prop:"index",
- column: [
- {
- label: '灞炴�у悕',
- prop: 'name',
+ ]
+ },
+ applyRange: {
+ model: "",
+ title: "搴旂敤鐨勪笟鍔＄被鍨�",
+ option: {
+ height: 360,
+ addBtn: false,
+ refreshBtn: false,
+ columnBtn: false,
+ menu: false,
+ border: true,
+ reserveSelection: true,
+ searchMenuSpan:8,
+ searchShowBtn: false,
+ highlightCurrentRow: true,
+ column: [
+ {
+ label: '涓氬姟绫诲瀷缂栧彿',
+ prop: 'id',
align: 'left',
},
{
- label: '鏍囩',
- prop: 'tag',
- hide:true
+ label: '涓氬姟绫诲瀷鍚嶇О',
+ prop: 'name',
+ align: 'left',
},
- {
- label: '灞炴�х被鍨�',
- prop: 'prop',
- type:"select",
- dicData:[
- {
- label:"娴嬭瘯1",
- value:0
- },
- {
- label:"娴嬭瘯2",
- value:1
- },
- {
- label:"娴嬭瘯3",
- value:2
- }
- ]
- },
- {
- label: '榛樿鍊�',
- prop: 'admin',
- },
- {
- label: '鍏佽涓虹┖',
- prop: 'isDefault',
- type: 'switch',
- hide:true,
- labelWidth: 132,
- dicData:[{
- label:'涓嶅厑璁�',
- value:0
- },{
- label:'鍏佽',
- value:1
- }]
- },
- {
- label: "闀垮害",
- prop: "length",
- hide: true
- },
- {
- label: '鎻忚堪',
- prop: 'desc',
- type:"textarea"
- },
- ]
- },
- {
- label: '鍊煎煙',
- column:[
- {
- placeholder:"璇烽�夋嫨鍊煎煙",
- span:12,
- label: '鍊煎煙',
- prop: 'range',
- value:0,
- type:"select",
- change:this.selectChange,
- dicData:[
- {
- label:"涓氬姟绫诲瀷",
- value:0
- },
- {
- label:"閾炬帴绫诲瀷",
- value:1
- },
- ]},
- {
- prop:"selInput",
- placeholder: false,
- readonly:true,
- display: true,
- formslot: true,
- },
- {
- label: "閫夋嫨鐗堟湰",
- prop:"banben",
- type:'select',
- value:0,
- change: this.selchange,
- display: true,
- dicData: [
- {
- label: '褰撳墠鐗堟湰娆�',
- value:0
- },
- {
- label: '鏈�鏂扮増鏈',
- value:1
- }
- ]
- },
- {
- //榛樿琛ㄦ牸鎻掓Ы
- prop:"default",
- span:24,
- display: false
- }
- ]
- },
- {
- label: '鏋氫妇',
- column: [
- {
- label: '鏄惁浣跨敤鏋氫妇',
- prop: 'isnot',
- type: 'switch',
- hide:true,
- labelWidth: 132,
- span:8,
- dicData:[{
- label:'鏄�',
- value:0
- },{
- label:'鍚�',
- value:1
- }]
- },
- {
- prop:'text',
- type:'input',
- placeholder:'璇疯緭鍏ュ唴瀹�',
- hide:true,
- display:false
- },
- {
- prop: 'enumerationSelect',
- type: 'select',
- placeholder: '璇烽�夋嫨',
- hide: true,
- span:12,
- dicData: [
- {
- label: 'a',
- value: 0
- },
- {
- label: 'b',
- value: 1
- },
- {
- label: 'c',
- value: 2
- }
- ]
- },
- {
- label: '鎻忚堪',
- prop: 'endesc',
- type:"textarea",
- labelWidth: 132,
- },
- ]
- }
- ]
+ ]
+ },
+ data: [],
+ display: false,
},
-
+ itemForm:{
+ itemData: {},
+ activeName: 'referTab',
+ form:{}
+ }
}
},
-
-
created() {
+
},
- methods:{
- rowLinkchange(row){
- this.form.text=row.name
+ methods: {
+ refreshChange() {
+ this.onLoad(this.pageParent, this.query);
},
- rowchange(row){
- this.form.text=row.name
+ addSave(){
+ this.$refs.originalAdd.showSubmitDialog = true;
+ this.$refs.originalAdd.attribute = {};
},
- //鍊煎煙绫诲瀷閫夋嫨
- addHandle() {
- this.packageBox=true
- if(this.Typelist.value == 0){
- this.packageBox=true
- this.packageLinkBox=false
- }else if(this.Typelist.value == 1){
- this.packageBox=false
- this.packageLinkBox=true
- }
+ updateSave(){
+ this.$refs.originalAdd.showSubmitDialog = true;
+ this.$refs.originalAdd.attribute = this.attribute;
},
- // 鍊煎煙涓氬姟绫诲瀷瀵硅瘽妗嗗彇娑�
- dialoghandelfalse() {
- this.packageBox=false;
- this.form.text=""
+ deleteSave(){
+ remove(this.itemForm.itemData).then(res => {
+ this.$message.success("鍒犻櫎鎴愬姛");
+ })
},
- //鍊煎煙涓氬姟绫诲瀷瀵硅瘽妗嗙‘瀹�
- dialoghandeltrue(){
- this.packageBox=false
+ onLoad(page, params = {}) {
+ this.loading = true;
+ getPage(this.page.currentPage, this.page.pageSize, Object.assign(params, this.query)).then(res => {
+ const data = res.data.data;
+ this.page.total = data.total;
+ this.data = data.records;
+ this.loading = false;
+ this.data = res.data.data.records
+ this.itemData = this.data[0];
+ })
},
- // 鍊煎煙閾炬帴绫诲瀷瀵硅瘽妗嗗彇娑�
- Linkdialoghandelfalse(){
- this.packageLinkBox=false;
- this.form.text=""
+ rowClick(row) {
+ this.itemForm.itemData = row;
+ this.selectRow = row.$index;
+ this.attribute = row;
+ }
+ ,selectBtmType(){
+ this.referType.display = true;
+ this.referType.title = "璇烽�夋嫨" + this.referType.value
},
- //鍊煎煙閾炬帴绫诲瀷瀵硅瘽妗嗙‘瀹�
- Linkdialoghandeltrue(){
- this.packageLinkBox=false
+ applyRangeOpen(){
+ if (!this.selectRow){
+ this.$message({
+ type:"warning",
+ message: "璇峰厛閫夋嫨灞炴��"
+ })
+ }
+ var oid = this.data[this.selectRow].oid;
+ getApplyRange(oid).then(res => {
+ this.applyRange.data = res.data.data;
+ })
+ this.applyRange.display = true;
},
- selectChange(val){
- this.Typelist=val
-
- if(val.value == 0 ){
- this.option.group[1].column[2].display=false
- }else if(val .value == 1 ){
- this.option.group[1].column[2].display=true
- }else if(val.column.value == 0){
- this.option.group[1].column[2].display=false
- }
- },
- selchange(val){
- this.banList=val
- },
- // beforeOpen (done, type) {
- // if (['view', 'edit'].includes(type)) {
- // // 鏌ョ湅鍜岀紪杈戦�昏緫
- // console.log("缂栬緫")
- // } else {
- // //鏂板閫昏緫
- // console.log(this.Typelist)
- // console.log(this.banList)
- //
- // console.log("鏂板")
- // }
- // done();
- //
- // }
- },
-
- // rowDel(row){
- // this.$confirm("纭畾灏嗛�夋嫨鏁版嵁鍒犻櫎?", {
- // confirmButtonText: "纭畾",
- // cancelButtonText: "鍙栨秷",
- // type: "warning"
- // })
- // .then(() => {
- // return getremove(row.id);
- // })
- // .then(() => {
- // this.$message({
- // type: "success",
- // message: "鎿嶄綔鎴愬姛!"
- // });
- // this.onLoad();
- // });
- // },
- // rowSave(row,done){
- // getadd(row).then(()=>{
- // this.$message({
- // type: "success",
- // message: "鎿嶄綔鎴愬姛!"
- // });
- // done(row)
- // this.onLoad()
- // }).catch((res)=>{
- // this.$message({
- // type: "success",
- // message:res
- // });
- // })
- // },
- // rowUpdate(row,index,done){
- // getupdata(row).then(()=>{
- // this.onLoad()
- // this.$message({
- // type: "success",
- // message: "淇敼鎴愬姛!"
- // });
- // done(row)
- // })
- // },
- // onLoad(page, params = {}) {
- // // this.loading = true;
- // // getPage(this.page.currentPage, this.page.pageSize, Object.assign(params, this.query)).then(res => {
- // // // const data = res.data.data;
- // // // this.page.total = data.total;
- // // // this.data = data.records;
- // // // this.loading = false;
- // // // this.selectionClear();
- // // this.data=res.data.data.records
- // // })
- // }
- // }
-
+ applyRangeClose(){
+ this.applyRange.data = [];
+ this.applyRange.display = false;
+ }
+ },
}
</script>
<style lang="scss">
-
+.applyRangeTable > .el-card:nth-of-type(2) > .el-card__body > .avue-crud__menu{
+ display: none !important;
+}
</style>
--
Gitblit v1.9.3