From 762c774804338ae96dec912630c738a856e70145 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 11 八月 2023 17:17:47 +0800
Subject: [PATCH] 修改业务数据保存
---
Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue | 846 +++++++++++++++-----------------------------------------
1 files changed, 228 insertions(+), 618 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue b/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue
index 24293a2..b575e34 100644
--- a/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue
+++ b/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue
@@ -6,6 +6,7 @@
:visible.sync="isShowReferConfigForm"
width="90%"
id="refer-config-form"
+ destroy-on-close
@close="recoveryDataAndForm('initData')"
style="height: 115vh; margin-top: -14vh; overflow-y: hidden">
<div style="width: 100%; overflow-y: auto; height: 70vh">
@@ -15,7 +16,7 @@
<el-input :disabled="disabled"
:size="size"
v-model="form.referTypeName"
- ref="referTypeName"
+ ref="referTypeName"
placeholder="璇烽�夋嫨 鍙傜収鐨勪笟鍔＄被鍨�"
prefix-icon="el-icon-search"
readonly="true"
@@ -27,7 +28,7 @@
<el-input :disabled="disabled"
:size="size"
v-model="form.sortField"
- ref="sortField"
+ ref="sortField"
placeholder="璇烽�夋嫨 鎺掑簭瀛楁"
prefix-icon="el-icon-search"
readonly="true"
@@ -47,7 +48,7 @@
<el-input :disabled="disabled"
:size="size"
v-model="form.sortField"
- ref="sortField"
+ ref="sortField"
placeholder="璇烽�夋嫨 鎺掑簭瀛楁"
prefix-icon="el-icon-search"
readonly="true"
@@ -108,7 +109,7 @@
<span slot="label"><i class="el-icon-search"></i>娣诲姞鏌ヨ鏉′欢</span>
<avue-crud
ref="crudAddCondition"
- :option="addSearchCondtionOption"
+ :option="addSearchCondtionOption"
@cell-click="clickAddSearchCondtionEdit"
:data="form.codeSrchCondConfigVOS">
<!-- 琛ㄦ牸鍐呮搷浣滄寜閽� -->
@@ -141,38 +142,14 @@
<el-button @click="isShowReferConfigForm = false">鍙� 娑�</el-button>
</div>
- <el-dialog title="涓恒�愬弬鐓х殑涓氬姟绫诲瀷銆戦�夊彇鍊�"
- append-to-body
- :visible.sync="isShowReferBtmType"
- width="70%"
- destroy-on-close
- @close="clearTableRowSelection('referType')"
- style="height: 110vh; margin-top: -12vh; overflow-y: hidden">
- <avue-crud :option="selectionReferBtmTypeOption"
- :table-loading="selectReferBtmTypeLoading"
- :data="selectReferBtmTypeData"
- :page.sync="selectReferBtmTypePage"
- ref="selectReferBtmTypeCrud"
- class="referBtmType-crud"
- @row-click="referBtmTypeRowClick"
- @search-change="referBtmTypeSearchChange"
- @search-reset="referBtmTypeSearchReset"
- @current-change="referBtmTypeCurrentChange"
- @size-change="referBtmTypeSizeChange">
- <template #radio="{row}">
- <el-radio v-model="referBtmTypeSelectRow"
- :label="row.$index">
-
- </el-radio>
- </template>
- </avue-crud>
- <div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="selectedReferBtmType">纭� 瀹�</el-button>
- <el-button @click="isShowReferBtmType = false">鍙� 娑�</el-button>
- </div>
- </el-dialog>
+ <!-- 瀵硅瘽妗�,涓恒�愬弬鐓у紩鐢ㄧ殑涓氬姟绫诲瀷銆戦�夊彇鍊煎璇濇 -->
+ <refer-btm-type-crud-dialog
+ :visible.sync="referBtmDialogParams.selectReferBtmSettingBox"
+ :ref="referBtmDialogParams.ref"
+ @echoReferBtmType="echoReferBtmType">
+ </refer-btm-type-crud-dialog>
- <el-dialog title="涓恒�愭帓搴忓瓧娈点�戦�夊彇鍊�"
+ <!-- <el-dialog title="涓恒�愭帓搴忓瓧娈点�戦�夊彇鍊�"
append-to-body
:visible.sync="isShowSortField"
width="70%"
@@ -200,7 +177,14 @@
<el-button type="primary" @click="selectedSortField">纭� 瀹�</el-button>
<el-button @click="isShowSortField = false">鍙� 娑�</el-button>
</div>
- </el-dialog>
+ </el-dialog> -->
+
+ <refer-select-btm-attr-dialog
+ title="涓恒�愭帓搴忓瓧娈点�戦�夊彇鍊�"
+ :visible.sync="selectedBtmTypeAttrParams.selectedBtmTypeAttrSettingBox"
+ :ref="selectedBtmTypeAttrParams.ref"
+ @echoSelectedAttr="echoSelectedAttr">
+ </refer-select-btm-attr-dialog>
<el-dialog title="閫夋嫨鏄剧ず瀛楁"
append-to-body
@@ -247,12 +231,13 @@
</el-dialog>
</template>
-
+
<script>
import func from "@/util/func";
export default {
- name: "referConfigDialog",
+ name: "referConfigFormDialog",
props: {
+
},
data() {
let element = '';
@@ -261,6 +246,7 @@
labelWidth: '150', // 鏍囬瀹藉害
isShowReferConfigForm: false, // 绗竴灞傚璇濇鏄剧ず闅愯棌鎺у埗
referTypeIsReadOnly: false,
+
// 琛ㄥ崟瀵硅薄
form: {
referTypeName: '', //鏄剧ず鐨勫��
@@ -281,7 +267,7 @@
isPersistence: true, // 鏄惁鎸佷箙鍖�
id: '',
name: '',
- // 鏌ヨ鏉′欢鍒楄〃
+ // 鏌ヨ鏉′欢鍒楄〃
// limit: '15',
// sortField: '',
// sortType: 'asc',
@@ -326,20 +312,20 @@
dialogClickModal: false,
highlightCurrentRow: true,
indexFixed: false,
- menuFixed: false,
+ menuFixed: false,
column: [
{
label: "鍒楀瓧娈�(*)",
prop: "field",
cell: true,
clearable: false,
- blur: (value) => this.updateAttrBlur(value),
+ // blur: (value) => this.updateAttrBlur(value),
},{
label: "鍒楀悕(*)",
prop: "title",
cell: true,
clearable: false,
- blur: (value) => this.updateAttrBlur(value),
+ // blur: (value) => this.updateAttrBlur(value),
},{
label: "瀛楁绫诲瀷(*)",
prop: "fieldTypeText",
@@ -360,7 +346,7 @@
}, {
value: 'textarea', label: '鏂囨湰鍩�'
}],
- blur: (value) => this.updateAttrBlur(value),
+ // blur: (value) => this.updateAttrBlur(value),
},{
label: "鍒楄〃鍙帓搴�",
prop: "sort",
@@ -369,19 +355,19 @@
type:"switch",
width: '80px',
value: true,
- blur: (value) => this.updateAttrBlur(value),
+ // blur: (value) => this.updateAttrBlur(value),
},{
label: "鎺掑簭瀛楁",
prop: "attrSortField",
cell: true,
clearable: false,
- blur: (value) => this.updateAttrBlur(value),
+ // blur: (value) => this.updateAttrBlur(value),
},{
label: "瀛楁瀹藉害",
prop: "width",
cell: true,
clearable: false,
- blur: (value) => this.updateAttrBlur(value),
+ // blur: (value) => this.updateAttrBlur(value),
},{
label: "鍒楀浐瀹氫綅缃�",
prop: "fixedPosition",
@@ -390,13 +376,13 @@
clearable: false,
value: 'noFixed',
dicData: [{value: 'noFixed', label: '涓嶅浐瀹�'}, {value: 'left', label: '宸﹁竟'}, {value: 'right', label: '鍙宠竟'}],
- blur: (value) => this.updateAttrBlur(value),
+ // blur: (value) => this.updateAttrBlur(value),
},{
label: "js鏄剧ず浠ｇ爜",
prop: "templet",
cell: true,
clearable: false,
- blur: (value) => this.updateAttrBlur(value),
+ // blur: (value) => this.updateAttrBlur(value),
},
]
},
@@ -430,21 +416,21 @@
type: "select",
cell: true,
clearable: false,
- dicData: [{
- value: 'like', label: '鍖呭惈'
- }, {
- value: '=', label: '绛変簬'
- }, {
- value: '>', label: '澶т簬'
- }, {
- value: '<', label: '灏忎簬'
- }, {
- value: '!=', label: '涓嶇瓑浜�'
- }, {
- value: '>=', label: '澶т簬绛変簬'
- }, {
- value: '<=', label: '灏忎簬绛変簬'
- }]
+ dicData: [
+ {
+ value: '_like', label: '鍖呭惈'
+ },{
+ value: "_notlike", label: "涓嶅寘鍚�",
+ }, {
+ value: '_equal', label: '绛変簬'
+ }, {
+ value: '_notequal', label: '涓嶇瓑浜�'
+ }, {
+ value: '_ge', label: '澶т簬'
+ }, {
+ value: '_le', label: '灏忎簬'
+ }
+ ]
},{
label: "绛涢�夊��",
prop: "filterValue",
@@ -461,212 +447,21 @@
activeName: 'first', //褰撳墠娲诲姩鐨則abs
- //涓恒�愬弬鐓х殑涓氬姟绫诲瀷銆戦�夊彇鍊煎璇濇
- selectionReferBtmTypeOption: {
- border: true,
- height: '260',
- tip: false,
- //searchShow: false,
- index: true,
- selection: false,
- menu: false,
- addBtn: false,
- refreshBtn: false,
- searchShowBtn: false,
- columnBtn: false,
- dialogClickModal: false,
- highlightCurrentRow: true,
- align: 'center',
- menuAlign: 'center',
- column: [{
- label: '-',
- prop: 'radio',
- width: 60,
- hide: false
- },{
- label: '涓氬姟绫诲瀷缂栧彿',
- width: 120,
- search: true,
- searchSpan: 8,
- searchLabelWidth: 100,
- prop: 'id'
- },{
- label: '涓氬姟绫诲瀷鍚嶇О',
- search: true,
- searchSpan: 8,
- searchLabelWidth: 100,
- prop: 'name'
- },{
- label: '鎻忚堪',
- search: false,
- prop: 'description'
- }],
+ /** 鍙傜収寮曠敤鐨勪笟鍔＄被鍨嬪璇濇鐩稿叧鍙傛暟 */
+ referBtmDialogParams: {
+ ref: 'crudReferBtm',
+ selectReferBtmSettingBox: false,
},
- selectReferBtmTypeLoading: false,
- selectReferBtmTypeData: [],
- selectReferBtmTypePage: {
- pageSize: 10,
- currentPage: 1,
- total: 0
+ /** 閫夋嫨鍏宠仈鐨勪笟鍔＄被鍨嬪睘鎬х浉鍏崇殑瀵硅瘽妗嗙浉鍏冲弬鏁� */
+ selectedBtmTypeAttrParams: {
+ ref: 'selectedBtmTypeAttrCrud',
+ selectedBtmTypeAttrSettingBox: false,
},
- referBtmTypeQuery: {},
- isShowReferBtmType: false,
- referBtmTypeSelectRowData: '',
- referBtmTypeSelectRow: '',
-
-
- // 涓恒�愭帓搴忓瓧娈点�戦�夊彇鍊煎璇濇
- isShowSortField: false,
- selectionSortFieldOption: {
- border: true,
- height: '220px',
- tip: false,
- //searchShow: false,
- index: true,
- selection: false,
- addBtn: false,
- menu: false,
- refreshBtn: false,
- searchShowBtn: false,
- columnBtn: false,
- dialogClickModal: false,
- highlightCurrentRow: true,
- align: 'center',
- menuAlign: 'center',
- border: true,
- column: [{
- label: '-',
- prop: 'radio',
- width: 60,
- hide: false
- },{
- label: '灞炴�ц嫳鏂囩紪鍙�',
- width: 120,
- search: true,
- searchSpan: 8,
- searchLabelWidth: 100,
- prop: 'id'
- },{
- label: '灞炴�т腑鏂囧悕绉�',
- search: true,
- searchSpan: 8,
- searchLabelWidth: 100,
- prop: 'name'
- },{
- label: '灞炴�ч暱搴�',
- search: false,
- prop: 'attrLength'
- },{
- label: '灞炴�х被鍨�',
- search: false,
- prop: 'attrType'
- }],
+ seletedBtmTypeAttrOptions: {
+ title: '', //瀵硅瘽妗嗘樉绀虹殑鏍囬
+ condition: '', //褰撳墠鎵撳紑瀵硅瘽妗嗙殑绫诲瀷
+ btmTypeId: '', //鏌ヨ鏉′欢锛屼笟鍔＄被鍨媔d
},
- selectSortFieldLoading: false,
- selectSortFieldData: [],
- selectSortFieldPage: {
- pageSize: 10,
- currentPage: 1,
- total: 0
- },
- sortFieldQuery: {},
- sortFieldSelectRow: '',
- sortFieldSelectRowData: '',
-
-
- //閫夋嫨鏄剧ず瀛楁
- isShowShowField: false,
- selectionShowFieldOption: {
- border: true,
- height: '220px',
- tip: false,
- //searchShow: false,
- index: true,
- selection: true,
- addBtn: false,
- menu: false,
- refreshBtn: false,
- searchShowBtn: false,
- columnBtn: false,
- dialogClickModal: false,
- highlightCurrentRow: true,
- align: 'center',
- menuAlign: 'center',
- border: true,
- column: [{
- label: '灞炴�ц嫳鏂囩紪鍙�',
- width: 120,
- search: true,
- searchSpan: 8,
- searchLabelWidth: 100,
- prop: 'id'
- },{
- label: '灞炴�т腑鏂囧悕绉�',
- search: true,
- searchSpan: 8,
- searchLabelWidth: 100,
- prop: 'name'
- },{
- label: '灞炴�ч暱搴�',
- search: false,
- prop: 'attrLength'
- },{
- label: '灞炴�х被鍨�',
- search: false,
- prop: 'attrType'
- }],
- },
- showFieldQuery: {},
- selectShowFieldLoading: false,
- selectShowFieldData: [],
- showFieldSelectList: [],
-
- //娣诲姞鏌ヨ鏉′欢
- isShowSearchCondition: false,
- selectionSearchConditionOption: {
- border: true,
- height: '220px',
- tip: false,
- //searchShow: false,
- index: true,
- selection: true,
- addBtn: false,
- menu: false,
- refreshBtn: false,
- searchShowBtn: false,
- columnBtn: false,
- dialogClickModal: false,
- highlightCurrentRow: true,
- align: 'center',
- menuAlign: 'center',
- border: true,
- column: [{
- label: '灞炴�ц嫳鏂囩紪鍙�',
- width: 120,
- search: true,
- searchSpan: 8,
- searchLabelWidth: 100,
- prop: 'id'
- },{
- label: '灞炴�т腑鏂囧悕绉�',
- search: true,
- searchSpan: 8,
- searchLabelWidth: 100,
- prop: 'name'
- },{
- label: '灞炴�ч暱搴�',
- search: false,
- prop: 'attrLength'
- },{
- label: '灞炴�х被鍨�',
- search: false,
- prop: 'attrType'
- }],
- },
- selectSearchConditionLoading: false,
- selectSearchConditionData: [],
- searchConditionQuery: {},
- searchConditionSelectList: [],
//涓婁竴娆＄偣鍑荤殑琛岀紪杈戞暟鎹�
preClickAttrRow: '',
@@ -691,7 +486,7 @@
emptyBtn: false,
labelWidth: '145', //榛樿鏍囩瀹藉害
group: [
- {
+ {
// 鍩虹琛ㄥ崟淇℃伅灞曠ず鍖哄煙
//display: this.form.type=='default'||this.form.type=='grid',
icon: 'el-icon-info',
@@ -791,7 +586,7 @@
change: ({ value, column }) => {
// console.log("start",value);
// 澶嶅師琛ㄥ崟,鍥犱负鍏朵粬鍒嗙粍涓鏋滃瓨鍦ㄥ�硷紝鍦ㄥ垏鎹㈡椂,浼氫繚鐣欒緭鍏ョ殑瀛楁鍊兼墍浠ラ渶瑕佽繕鍘�
- let addFrom = {};
+ let addFrom = {};
this.activeName = 'first'; // 榛樿鍒囨崲鑷崇涓�涓猼ab
//鏍规嵁绫诲瀷瀵筬orm琛ㄥ崟灞炴�ц繘琛岃皟鏁�
if(value == 'stand'){
@@ -802,7 +597,7 @@
this.isDisabledTabs = false;
} else if(value == 'default' || value == 'grid'){
addFrom = {
- limit: '15',
+ limit: 15,
sortField: '',
sortType: 'asc',
};
@@ -833,40 +628,43 @@
// 鍚堝苟涓や釜琛ㄥ崟
this.form = Object.assign(addFrom,this.form);
// console.log("endFilter",this.form.type);
- //console.log(this.form);
+ // console.log(this.form);
},
},{
- label: '鏄惁寮�鍚寔涔呭寲',
+ label: '鏄惁鎸佷箙鍖栧弬鐓ч厤缃�',
prop: 'isPersistence',
+ labelWidth: '142',
tip: 'true:寮�鍚寔涔呭寲锛屽褰撳墠瀹氫箟鐨勫弬鐓ч厤缃繘琛屾寔涔呭寲瀛樺偍锛屼笅娆″彲鐩存帴閫夊彇锛沠alse:浠呭褰撳墠娆＄爜娈垫柊澧炵敓鏁堛��',
tipPlacement: 'bottom',
span: 6,
type: 'switch',
},{
- display: this.form.isPersistence | this.form.isPersistence=='true',
- label: '缂栧彿',
+ display: this.form.isPersistence || this.form.isPersistence=='true',
+ label: '鍙傜収閰嶇疆缂栧彿',
prop: 'id',
+ tip: '璁剧疆璇ュ弬鐓ч厤缃寔涔呭寲瀛樺偍鏃剁殑缂栧彿銆�',
rules: [{
required: true,
- message: "(寮�濮嬫寔涔呭寲鏃剁紪鍙�)蹇呭～椤逛笉鑳戒负绌�",
+ message: "(寮�鍚寔涔呭寲鏃剁紪鍙�)蹇呭～椤逛笉鑳戒负绌�",
trigger: "blur",
}],
span: 6,
},{
- display: this.form.isPersistence | this.form.isPersistence=='true',
- label: '鍚嶇О',
+ display: this.form.isPersistence || this.form.isPersistence=='true',
+ label: '鍙傜収閰嶇疆鍚嶇О',
prop: 'name',
+ tip: '璁剧疆璇ュ弬鐓ч厤缃寔涔呭寲瀛樺偍鏃剁殑鍚嶇О銆�',
rules: [{
required: true,
- message: "(寮�濮嬫寔涔呭寲鏃跺悕绉�)蹇呭～椤逛笉鑳戒负绌�",
+ message: "(寮�鍚寔涔呭寲鏃跺悕绉�)蹇呭～椤逛笉鑳戒负绌�",
trigger: "blur",
}],
span: 6,
}
-
+
]
},
- {
+ {
icon: 'el-icon-info',
label: '椤甸潰鍙傛暟閰嶇疆',
collapse: false,
@@ -918,7 +716,7 @@
}
]
},
- {
+ {
icon: 'el-icon-info',
label: '鍚庡彴鍙傛暟閰嶇疆',
collapse: false,
@@ -927,7 +725,7 @@
{
label: '鑷畾涔夌殑鍚庡彴璺緞',
prop: 'url',
- tip: '閫氬父涓虹┖;濡傛灉鏄垪琛紝鍚庡彴蹇呴』杩斿洖DataGrid锛屽鏋滄槸鏍戯紝鍚庡彴蹇呴』杩斿洖List<Tree>',
+ tip: '閫氬父涓虹┖;濡傛灉鏄垪琛紝鍚庡彴蹇呴』杩斿洖DataGrid锛屽鏋滄槸鏍戯紝鍚庡彴蹇呴』杩斿洖List<Theme>',
tipPlacement: 'right',
span: 7,
},{
@@ -965,7 +763,7 @@
emptyBtn: false,
labelWidth: '145', //榛樿鏍囩瀹藉害
group: [
- {
+ {
display: this.form.type=='default'||this.form.type=='grid',
icon: 'el-icon-info',
label: this.form.type=='default' ? '榛樿鍙傜収鐨勯厤缃�(涓嬫柟鍒楄〃)':'鍒楄〃鍙傜収鐨勯厤缃紙涓嬫柟鍒楄〃)',
@@ -977,7 +775,7 @@
prop: 'limit',
span: 8,
tip: '鍒嗛〉鏃舵瘡椤垫樉绀虹殑鏁伴噺锛屼笉鍒嗛〉濉�-1',
- //value: 15,
+ value: 15,
tipPlacement: 'right',
},{
label: '鎺掑簭瀛楁',
@@ -1002,7 +800,7 @@
}
]
},
- {
+ {
display: this.form.type=='stand',
icon: 'el-icon-info',
label: 'stand(骞冲彴閰嶇疆)鍙傜収',
@@ -1025,7 +823,7 @@
},
]
},
- {
+ {
display: this.form.type=='tree',
icon: 'el-icon-info',
label: '鏍戝舰鍙傜収淇℃伅',
@@ -1100,19 +898,15 @@
},
},
mounted() {
- // 楹荤殑杩欎釜鍦版柟璋冩鎴戜簡
+ // 浜嬩欢鐩戝惉锛屽疄鐜拌〃鏍艰缂栬緫鐐瑰嚮琛ㄦ牸鍖哄煙澶栧唴瀹规椂閫�鍑虹紪杈戠姸鎬�
this.element = document.getElementById('refer-config-form');
this.element.addEventListener("click", (e) => {
//<table cellspacing="0" cellpadding="0" border="0" class="el-table__body" style="width: 911px;">
- //console.log(e.target);
- // console.log(this.$refs.crudAttr);
- // console.log(this.$refs.crudAttr.$el.contains(e.target));
- //console.log(!this.$refs.crudAttr.$el.contains(e.target) && this.preClickAttrRow != null);
- if (!this.$refs.crudAttr.$el.contains(e.target) &&
+ if (!this.$refs.crudAttr.$el.contains(e.target) &&
this.preClickAttrRow != '') {
this.preClickAttrRow.$cellEdit = false;
}
- if (!this.$refs.crudAddCondition.$el.contains(e.target) &&
+ if (!this.$refs.crudAddCondition.$el.contains(e.target) &&
this.preClickAddSearchConditionRow != '') {
this.preClickAddSearchConditionRow.$cellEdit = false;
}
@@ -1122,56 +916,16 @@
// 璐煎潙锛屽垏鎹㈢被鍨嬫椂琛ㄦ牸锛岄殣钘忓啀鏄剧ず灏变細鍑虹幇琛ㄦ牸閿欎綅闂锛�
'form.type'(value) {
this.onloadAttrData();
+ },
+ // 鐩戝惉鐖剁粍浠朵紶鐨勭獥鍙ｆ樉绀洪殣钘忕殑鍊�
+ isShowReferConfigForm (){
+ if(this.isShowReferConfigForm && this.codeShowFieldConfigVOS.length <= 0){
+ this.onloadAttrData();
+ }
}
},
methods: {
- // 鍗曞嚮琛ㄦ牸瀹炵幇琛ㄦ牸琛岀紪杈�
- clickAttrEdit(row, column, event){
- if(this.preClickAttrRow && this.preClickAttrRow != row){
- //console.log(this.codeShowFieldConfigVOS[this.preClickAttrRow.$index]);
- this.codeShowFieldConfigVOS[this.preClickAttrRow.$index].$cellEdit = false;
- }
- row.$cellEdit = true;
- this.preClickAttrRow = row;
- },
- // 灞炴�ц〃鏍艰缂栬緫澶卞幓鐒︾偣鏃朵繚瀛樻柟娉�
- // updateAttrBlur(value){
- //console.log(this.codeShowFieldConfigVOS[0]);
-
- // },
-
- // 鍗曞嚮琛ㄦ牸瀹炵幇琛ㄦ牸琛岀紪杈�
- clickAddSearchCondtionEdit(row, column, event){
- if(this.preClickAddSearchConditionRow && this.preClickAddSearchConditionRow != row){
- //console.log(this.codeShowFieldConfigVOS[this.preClickAttrRow.$index]);
- this.form.codeSrchCondConfigVOS[this.preClickAddSearchConditionRow.$index].$cellEdit = false;
- }
- row.$cellEdit = true;
- this.preClickAddSearchConditionRow = row;
- },
- //涓婁竴涓〉闈㈠凡缁忛�変腑鍙傜収搴旂敤鐨勪笟鍔＄被鍨嬬殑鎯呭喌锛屽拰涓婁竴娆″凡缁忛厤缃繃鍙傜収閰嶇疆鐨勬儏鍐典笅杩涜椤甸潰鍒濆鍖栨覆鏌�
- initPageData(val){
- //console.log(val);
- if(func.notEmpty(val.referConfig)){
- this.form = JSON.parse(val.referConfig);
- // console.log(this.form);
- this.form.isPersistence = this.form.isPersistence == 'true' ? true:false;
- // 鍙傜収寮曠敤鐨勪笟鍔＄被鍨嬩笉鍙��
- this.referTypeIsReadOnly = true;
- if((this.form.type == 'default' || this.form.type == 'grid') && (this.form.codeShowFieldConfigVOS != undefined && this.form.codeShowFieldConfigVOS.length > 0)){
- this.codeShowFieldConfigVOS = this.form.codeShowFieldConfigVOS;
- }
- return;
- }
- if(func.notEmpty(val.referType)){
- this.form.referTypeName = val.referTypeName;
- this.form.referType = val.referType;
- this.referTypeIsReadOnly = true;
- return;
- }
- //console.log(localStorage.getItem("userId"));
- },
// 閫夋嫨瀹屽弬鐓ч厤缃箣鍚庣偣鍑讳繚瀛樻寜閽Е鍙�
async selectedListReferConfig(){
// 鏍囪鎵�鏈夎〃鍗曟槸鍚﹂�氳繃鏍￠獙鐨勫彉閲�
@@ -1186,7 +940,7 @@
}
isValid = false;
//console.log(valid);
- }
+ }
done();
})
})
@@ -1198,6 +952,53 @@
this.$emit('echoReferConfig', submitForm) // 瑙﹀彂update:data灏嗗瓙缁勪欢鍊间紶閫掔粰鐖剁粍浠�
this.isShowReferConfigForm = false;
}
+ },
+ // 鍗曞嚮琛ㄦ牸瀹炵幇琛ㄦ牸琛岀紪杈�
+ clickAttrEdit(row, column, event){
+ if(this.preClickAttrRow && this.preClickAttrRow != row){
+ //console.log(this.codeShowFieldConfigVOS[this.preClickAttrRow.$index]);
+ this.codeShowFieldConfigVOS[this.preClickAttrRow.$index].$cellEdit = false;
+ }
+ row.$cellEdit = true;
+ this.preClickAttrRow = row;
+ },
+ // 灞炴�ц〃鏍艰缂栬緫澶卞幓鐒︾偣鏃朵繚瀛樻柟娉�
+ // updateAttrBlur(value){
+ //console.log(this.codeShowFieldConfigVOS[0]);
+
+ // },
+
+ // 鍗曞嚮琛ㄦ牸瀹炵幇琛ㄦ牸琛岀紪杈�
+ clickAddSearchCondtionEdit(row, column, event){
+ if(this.preClickAddSearchConditionRow && this.preClickAddSearchConditionRow != row){
+ //console.log(this.codeShowFieldConfigVOS[this.preClickAttrRow.$index]);
+ this.form.codeSrchCondConfigVOS[this.preClickAddSearchConditionRow.$index].$cellEdit = false;
+ }
+ row.$cellEdit = true;
+ this.preClickAddSearchConditionRow = row;
+ },
+ //涓婁竴涓〉闈㈠凡缁忛�変腑鍙傜収搴旂敤鐨勪笟鍔＄被鍨嬬殑鎯呭喌锛屽拰涓婁竴娆″凡缁忛厤缃繃鍙傜収閰嶇疆鐨勬儏鍐典笅杩涜椤甸潰鍒濆鍖栨覆鏌�
+ initPageData(val){
+ // console.log(val.referConfig);
+ if(func.notEmpty(val.referConfig)){
+ this.form = JSON.parse(val.referConfig);
+ this.form.isPersistence = this.form.isPersistence == 'true'||this.form.isPersistence ? true:false;
+ // 鍙傜収寮曠敤鐨勪笟鍔＄被鍨嬩笉鍙��
+ // this.referTypeIsReadOnly = true;
+ if((this.form.type == 'default' || this.form.type == 'grid') && (this.form.codeShowFieldConfigVOS != undefined && this.form.codeShowFieldConfigVOS.length > 0)){
+ this.codeShowFieldConfigVOS = this.form.codeShowFieldConfigVOS;
+ }
+ return;
+ }else {
+ this.onloadAttrData()
+ }
+ if(func.notEmpty(val.referType)){
+ this.form.referTypeName = val.referTypeName;
+ this.form.referType = val.referType;
+ this.referTypeIsReadOnly = true;
+ return;
+ }
+ //console.log(localStorage.getItem("userId"));
},
/** 鍏跺疄閫夊彇灞炴�ц〃鏍肩殑榛樿鏁版嵁涓嶉渶瑕佸姞杞斤紝
浣嗘槸寮圭獥鎵撳紑浼氭湁琛ㄦ牸閿欒闂鎵�浠ラ渶瑕佸湪杩欒皟鐢╠oLayout鏂规硶*/
@@ -1225,9 +1026,9 @@
$cellEdit: false
}
];
- this.$nextTick(() => {
- this.$refs.crudAttr.doLayout()
- })
+ // this.$nextTick(() => {
+ // this.$refs.crudAttr.doLayout()
+ // })
},
// 灞炴�ч�夋嫨琛ㄦ牸涓殑绉婚櫎鎸夐挳鍔熻兘
removeCurrentRow(row,condition){
@@ -1248,11 +1049,11 @@
// this.form.displayTable = '';
return;
}
- Object.assign(this.$data,this.$options.data());
+ Object.assign(this.$data,this.$options.data());
// 绉婚櫎缁戝畾鍦ㄨ椤甸潰瀵硅瘽妗嗕笂鐨勫叏灞�鐩戝惉浜嬩欢
if(this.element != ''){
let te = window.removeEventListener('click', this.element)
- }
+ }
},
// 鎻愪氦琛ㄥ崟涔嬪墠杩囨护鎺夌┖鎴栦笉闇�瑕佺殑琛ㄥ崟鏁版嵁
filterForm(){
@@ -1270,8 +1071,8 @@
'useFormKey',
'paramForFormKey',
'isMuti',
- 'mapFields',
- 'codeSrchCondConfigVOS',
+ 'mapFields',
+ 'codeSrchCondConfigVOS',
'isOpenGlobal', //鏄惁寮�鍚叏灞�
'isPersistence',
];
@@ -1284,9 +1085,9 @@
addArray = ['limit', 'sortField', 'sortType'];
} else if(oldForm.type == 'tree'){
addArray = [
- "parentFieldName",
+ "parentFieldName",
'parentUsedField',
- 'parentValue',
+ 'parentValue',
'loadType',
'onlyLeaf',
'sortField',
@@ -1294,7 +1095,7 @@
];
}
// 寮�鍚寔涔呭寲鍙傜収閰嶇疆
- if(oldForm.isPersistence=='true' | oldForm.isPersistence){
+ if(oldForm.isPersistence=='true' || oldForm.isPersistence){
submittDefaultForm = submittDefaultForm.concat(['id','name'])
}
submittDefaultForm = submittDefaultForm.concat(addArray);
@@ -1311,7 +1112,7 @@
// console.log(!this.checkStringIsEmpty(oldForm[item]) || !this.checkArrayIsUndefined(oldForm[item]));
if((item == 'isMuti' || item == 'onlyLeaf') || (!this.checkStringIsEmpty(oldForm[item]) || !this.checkArrayIsUndefined(oldForm[item]))){
//console.log(item,oldForm[item]);
- newForm = Object.assign(newForm,{[item]:oldForm[item]});
+ newForm = Object.assign(newForm,{[item]:oldForm[item]});
}
});
//console.log(newForm);
@@ -1340,28 +1141,7 @@
checkArrayIsUndefined(val){
return typeof val === 'array' && (val.length === 0 ||val === null || typeof val === 'undefined');
},
- // 鎵撳紑琛ㄦ牸閫夋嫨妗�
- openSelectionTable(condition){
- if (condition == 'referType'){
- this.isShowReferBtmType = true;
- this.referBtmTypeOnLoad();
- }else if (condition == 'sortField'){
- this.isShowSortField = true;
- this.sortFieldOnLoad();
- }else {
- if(this.form.referType == '' || this.form.referType == null){
- this.$message.warning("璇疯緭鍏ュ弬鐓х殑涓氬姟绫诲瀷")
- return;
- }
- if(condition == 'addSearchCondition'){
- this.isShowSearchCondition = true;
- this.selectSearchConditionDataOnload();
- }else {
- this.isShowShowField = true;
- this.selectShowFieldDataOnload();
- }
- }
- },
+
// 娓呯┖琛ㄦ牸閫夋嫨妗�
clearSelectionTable(condition){
if(condition == 'referType'){
@@ -1371,257 +1151,87 @@
this.form.sortField = '';
}
},
- // 鍏抽棴瀵硅瘽妗嗘椂瀵归�変腑鍐呭杩涜娓呯┖锛屽苟瑙ｇ粦鍏ㄥ眬鐩戝惉浜嬩欢
- clearTableRowSelection(condition){
+ // 鎵撳紑琛ㄦ牸閫夋嫨妗�
+ openSelectionTable(condition){
+ // 鎵撳紑閫夋嫨鍙傜収寮曠敤瀵硅瘽妗�
+ if (condition == 'referType'){
+ this.referBtmDialogParams.selectReferBtmSettingBox = true;
+ // console.log(this.referBtmDialogParams.ref);
+ // 璋冪敤瀛愮粍浠跺埛鏂拌〃鏍兼暟鎹�
+ this.$refs[this.referBtmDialogParams.ref].referBtmOnLoad();
+ return;
+ }
+ // 鎻愮ず
+ if(this.form.referType == '' || this.form.referType == null){
+ this.$message.warning("璇疯緭鍏ュ弬鐓х殑涓氬姟绫诲瀷")
+ return;
+ }
+ let params = this.seletedBtmTypeAttrOptions;
+ params.btmTypeId = this.form.referType
+ // 閫夋嫨鎺掑簭瀛楁
if(condition == 'sortField'){
- this.sortFieldSelectRow = '';
- this.sortFieldSelectRowData = '';
- }else if(condition == 'referType'){
- this.referBtmTypeSelectRow='';
- this.referBtmTypeSelectRowData = '';
+ params.title = '涓恒�愭帓搴忓瓧娈点�戦�夊彇鍊煎璇濇';
+ params.condition = 'sortField';
+ }else if(condition == 'addSearchCondition'){
+ // 閫夋嫨鏌ヨ鏉′欢
+ params.title = '閫夋嫨鏌ヨ鏉′欢';
+ params.condition = 'addSearchCondition';
+ }else{
+ // 閫夋嫨灞炴��
+ params.title = '閫夋嫨鏄剧ず瀛楁';
+ params.condition = 'selectAttr';
}
-
+ this.$refs[this.selectedBtmTypeAttrParams.ref].selectedBtmTypeAttrOnLoad(params);
+ this.selectedBtmTypeAttrParams.selectedBtmTypeAttrSettingBox = true;
},
- // 涓恒�愬弬鐓х殑涓氬姟绫诲瀷銆戦�夊彇鍊�
- referBtmTypeOnLoad(page, params = {}){
- this.selectReferBtmTypeLoading = true;
- // 璋冪敤api璇锋眰
- const data = {
- total: 2,
- data: [{
- id: 't2',
- name: 'test2',
- description: 'test2',
- }, {
- id: 't3',
- name: 'test3',
- description: 'test3',
- }]
+ /** 涓恒�愬弬鐓у紩鐢ㄧ殑涓氬姟绫诲瀷銆戦�夊彇鍊间箣鍚庣殑鍐呭鍥炴樉鏃惰皟鐢� */
+ echoReferBtmType(content){
+ // 瀹炵幇鍥炴樉
+ this.form.referTypeName = content.name || content.id;
+ this.form.referType = content.id || '';
+ },
+ /** 鎺掑簭瀛楁銆佹樉绀虹殑灞炴�с�佹煡璇㈡潯浠剁殑琛ㄦ牸琛岄�夋嫨涔嬪悗鍥炴樉 */
+ echoSelectedAttr(data){
+ // console.log(data);
+ // 涓恒�愭帓搴忓瓧娈点�戦�夊彇鍊�
+ if(data.condition === 'sortField'){
+ this.form.sortField = data.selectedArrary[0].id;
+ }else if(data.condition === 'addSearchCondition') {
+ data.selectedArrary.forEach(item => {
+ this.form.codeSrchCondConfigVOS.push(
+ {
+ filterField: item.id,
+ filterType: '_equal',
+ filterTypeText: item.name,
+ filterValue: '',
+ $cellEdit: false
+ }
+ )
+ })
+ }else{
+ // 閫夋嫨鏄剧ず瀛楁
+ data.selectedArrary.forEach(item => {
+ // console.log(item);
+ this.codeShowFieldConfigVOS.push(
+ {
+ field: item.id,
+ title: item.name,
+ // fieldType: item.attrType,
+ // fieldTypeText: item.attrTypeText,
+ fieldType: 'text',
+ fieldTypeText: '鏂囨湰妗�',
+ sort: false,
+ attrSortField: item.id,
+ width: item.attributeLength,
+ isquery: false,
+ $cellEdit: false
+ }
+ )
+ })
}
- this.selectReferBtmTypeData = data.data;
- this.selectReferBtmTypePage.total = data.total;
- this.selectReferBtmTypeLoading = false;
- },
- referBtmTypeSizeChange(pageSize){
- this.selectReferBtmTypePage.pageSize = pageSize;
- },
- referBtmTypeSearchChange(params, done){
- this.referBtmTypeQuery = params;
- this.selectReferBtmTypePage.currentPage = 1;
- this.referBtmTypeOnLoad(this.page, params);
- done();
- },
- referBtmTypeSearchReset(){
- this.referBtmTypeQuery = {};
- this.referBtmTypeOnLoad(this.selectReferBtmTypePage);
- },
- referBtmTypeRowClick(row){
- this.referBtmTypeSelectRowData = row;
- this.referBtmTypeSelectRow = row.$index
- //console.log( this.referBtmTypeSelectRowData);
- },
- referBtmTypeCurrentChange(currentPage){
- this.selectReferBtmTypePage.currentPage = currentPage;
- },
- selectedReferBtmType(){
- if(!this.referBtmTypeSelectRowData) {
- this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�");
- return;
- }
- this.form.referTypeName = this.referBtmTypeSelectRowData.name;
- this.form.referType = this.referBtmTypeSelectRowData.id;
- this.isShowReferBtmType = false;
},
- // 涓恒�愭帓搴忓瓧娈点�戦�夊彇鍊�
- sortFieldOnLoad(page, params = {}){
- this.selectSortFieldLoading = true;
- // 璋冪敤api璇锋眰
- const data = {
- total: 2,
- data: [{
- id: 'test',
- name: '娴嬭瘯',
- attrLength: 11,
- attrType: '瀛楃涓�'
- }, {
- id: 'test1',
- name: '娴嬭瘯1',
- attrLength: 12,
- attrType: '鏁板瓧'
- }]
- }
- this.selectSortFieldData = data.data;
- this.selectSortFieldPage.total = data.total;
- this.selectSortFieldLoading = false;
- },
- sortFieldSizeChange(pageSize){
- this.selectSortFieldPage.pageSize = pageSize;
- },
- sortFieldSearchChange(params, done){
- this.sortFieldQuery = params;
- this.selectSortFieldPage.currentPage = 1;
- this.sortFieldOnLoad(this.page, params);
- done();
- },
- sortFieldSearchReset(){
- this.sortFieldQuery = {};
- this.sortFieldOnLoad(this.selectSortFieldPage);
- },
- sortFieldRowClick(row){
- this.sortFieldSelectRowData = row;
- this.sortFieldSelectRow = row.$index
- //console.log( this.sortFieldSelectRowData);
- },
- sortFieldCurrentChange(currentPage){
- this.selectReferBtmTypePage.currentPage = currentPage;
- },
- selectedSortField(){
- if(!this.sortFieldSelectRowData) {
- this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�");
- return;
- }
- this.form.sortField = this.sortFieldSelectRowData.id;
- this.isShowSortField = false;
- },
-
- // 閫夋嫨鏄剧ず瀛楁
- selectShowFieldDataOnload(params = {}){
- this.selectShowFieldLoading = true;
- // 璋冪敤api璇锋眰
- const data = {
- total: 2,
- data: [{
- id: 'test',
- name: '娴嬭瘯',
- attrLength: 11,
- attrType: 'text',
- attrTypeText: '鏂囨湰妗�'
- }, {
- id: 'test1',
- name: '娴嬭瘯1',
- attrLength: 12,
- attrType: 'number',
- attrTypeText: '鏁板瓧'
- }, {
- id: 'test2',
- name: '娴嬭瘯2',
- attrLength: 13,
- attrType: 'date',
- attrTypeText: '鏃ユ湡'
- }]
- }
- this.selectShowFieldData = data.data;
- this.selectShowFieldLoading = false;
- },
- selectionShowFieldDataChange(list){
- this.showFieldSelectList = list;
- this.$refs.selectShowFieldCrud.setCurrentRow(this.showFieldSelectList[list.length-1]);
- },
- showFieldRowClick(row){
- //this.showFieldSelectList.push(row);
- this.$refs.selectShowFieldCrud.setCurrentRow(row);
- this.$refs.selectShowFieldCrud.toggleRowSelection(row); //閫変腑褰撳墠琛�
- },
- showFieldSearchChange(params, done){
- this.showFieldQuery = params;
- this.selectShowFieldDataOnload(params);
- done();
- },
- showFieldSearchReset(){
- this.showFieldQuery = {};
- this.sortFieldOnLoad();
- },
- selectedShowField(){
- //console.log(this.showFieldSelectList);
- if(this.showFieldSelectList.length <= 0) {
- this.$message.warning("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�");
- return;
- }
- //this.showFieldSelectList;
- this.showFieldSelectList.forEach(item => {
- this.codeShowFieldConfigVOS.push(
- {
- field: item.id,
- title: item.id,
- fieldType: item.attrType,
- fieldTypeText: item.attrTypeText,
- sort: false,
- attrSortField: item.id,
- width: item.attrLength,
- isquery: false,
- $cellEdit: false
- }
- )
-
- })
- this.isShowShowField = false;
- },
-
-
- // 閫夋嫨鏌ヨ鏉′欢
- selectSearchConditionDataOnload(params = {}){
- this.selectSearchConditionLoading = true;
- // 璋冪敤api璇锋眰
- this.selectSearchConditionData = [{
- id: 'test',
- name: '娴嬭瘯',
- attrLength: 11,
- attrType: '瀛楃涓�',
- $cellEdit: false,
- }, {
- id: 'test1',
- name: '娴嬭瘯1',
- attrLength: 12,
- attrType: '鏁板瓧',
- $cellEdit: false,
- }, {
- id: 'test2',
- name: '娴嬭瘯2',
- attrLength: 13,
- attrType: '鏃ユ湡',
- $cellEdit: false,
- }];
- this.selectSearchConditionLoading = false;
- },
- searchConditionRowClick(row){
- this.$refs.selectSearchConditionCrud.setCurrentRow(row);
- this.$refs.selectSearchConditionCrud.toggleRowSelection(row); //閫変腑褰撳墠琛�
- },
- searchConditionDataChange(list){
- this.searchConditionSelectList = list;
- this.$refs.selectSearchConditionCrud.setCurrentRow(this.searchConditionSelectList[list.length-1]);
- },
- searchConditionSearchChange(params, done){
- this.searchConditionQuery = params;
- this.selectSearchConditionDataOnload(params);
- done();
- },
- searchConditionSearchReset(){
- this.searchConditionQuery = {};
- this.sortFieldOnLoad();
- },
- selectedSearchCondition(){
- // console.log(this.searchConditionSelectList);
- if(this.searchConditionSelectList.length <= 0) {
- this.$message.warning("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�");
- return;
- }
- this.searchConditionSelectList.forEach(item => {
- this.form.codeSrchCondConfigVOS.push(
- {
- filterField: item.id,
- filterType: '=',
- filterTypeText: item.name,
- filterValue: '',
- $cellEdit: false
- }
- )
-
- })
- this.isShowSearchCondition = false;
- },
}
};
@@ -1644,5 +1254,5 @@
-webkit-transition:opacity .0s !important;
transition:opacity .0s !important;
}
-
-</style>
\ No newline at end of file
+
+</style>
--
Gitblit v1.9.3