From 8bedcf7c849eb0d5b87d0da1cbfa3beb0f7caf45 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期四, 06 七月 2023 16:21:36 +0800
Subject: [PATCH] 1、主要增加可输可选查询数据接口。 2、可输可选保存接口测试与改动。
---
Source/UBCS-WEB/src/components/Tree/attrCrud.vue | 164 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 108 insertions(+), 56 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
index cdf2b52..ee2e28e 100644
--- a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
@@ -21,7 +21,7 @@
<!-- 绾ц仈灞炴��-->
<el-button size="small" @click="CascadeHandle">绾ц仈灞炴��</el-button>
<!-- 棰勮鎺掑簭-->
- <el-button size="small" icon="el-icon-arrow-down">棰勮鎺掑簭</el-button>
+ <el-button size="small" @click="orderHandle" icon="el-icon-arrow-down">棰勮鎺掑簭</el-button>
</el-button-group>
<el-button-group>
<!-- 淇濆瓨-->
@@ -229,32 +229,49 @@
<el-button size="small" type="primary" @click="addVisible=false">鍙栨秷</el-button>
</div>
</el-dialog>
+ <!-- 鍙傜収閰嶇疆-->
+ <refer-config-form-dialog
+ ref="referConfigFormDialog"
+ @echoReferConfig="echoReferConfig"
+ ></refer-config-form-dialog>
</div>
<el-table :data="ProData"
style="width: 100%"
+ height="280"
@cell-click="handleCellClicks"
@select="selectHandle"
@selection-change="selectionChange"
v-if="this.crudArrayFlag"
+ ref="referAttrCrud"
>
<el-table-column
type="selection"
- width="55">
+ width="55" fixed>
</el-table-column>
<!--<el-table-column fixed label="搴忓彿" type="index" width="55"></el-table-column>-->
- <el-table-column v-for="item in this.option.column" :key="item.id"
+ <el-table-column v-for="(item,index) in this.option.column" :key="item.id"
: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"
+ :fixed="item.fixed"
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 == 'refer' )" v-model="row[item.prop]"
@blur="saveRows"></el-input>
- <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-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-select v-model="row[item.prop]" filterable allow-create default-first-option slot="prepend" v-if="editingRows === row && editShows== item.prop && item.edit == 'select' " @focus="DataChangeHandler(item.editConfig,index)">
+ <el-option
+ v-for="optionItem in item.data"
+ :key="optionItem.key"
+ :label="optionItem.value"
+ :value="optionItem.key">
+ </el-option>
+ </el-select>
<el-switch
v-if="item.edit === 'switch'" v-model="row[item.prop]" active-value="true"
inactive-value="false">
@@ -265,7 +282,7 @@
<el-table-column
fixed="right"
label="鎿嶄綔"
- width="120">
+ width="70">
<template slot-scope="scope">
<el-button
size="small"
@@ -277,11 +294,10 @@
</el-table-column>
</el-table>
</div>
- <!-- </avue-crud>-->
</template>
<script>
-import {AttrByBtm, gridCodeClassifyTemplateAttr, batchAddSave, copyto} from '@/api/template/templateAttr'
+import {AttrByBtm, gridCodeClassifyTemplateAttr, batchAddSave, copyto,listByFlag} from '@/api/template/templateAttr'
export default {
name: "attrCrud .vue",
@@ -329,6 +345,8 @@
},
data() {
return {
+ //鍙傜収
+ referVisible:false,
crudArrayFlag:false,
editingRows: null,
editShows:"",
@@ -438,6 +456,8 @@
isShowformulaEdit: false,
// 绾ц仈鍗曢��
selectRow: '',
+ //绾ц仈鍗曢�夋暟缁�
+ selectRowArr:[],
// 绾ц仈data
CascadeData: [],
// 绾ц仈option
@@ -992,7 +1012,7 @@
label: '鎺掑簭鍙�',
sortable: true,
edit: 'number',
- width: 70,
+ width: 90,
fixed: true
}, {
label: "灞炴�ц嫳鏂囩紪鍙�",
@@ -1008,7 +1028,7 @@
prop: "name",
fixed: true,
cell: false,
- width: 125,
+ width: 145,
edit: 'text',
sortable: true
},
@@ -1109,6 +1129,13 @@
prop: "prefixValue",
sortable: true,
edit: 'select',
+ width: 110,
+ editConfig: {
+ extraParams: {
+ code: 'codeclstempattr',
+ dictKey: 'prefix'
+ }
+ },
cell: false,
},
{
@@ -1116,6 +1143,13 @@
prop: "suffixValue",
sortable: true,
edit: 'select',
+ width: 110,
+ editConfig: {
+ extraParams: {
+ code: 'codeclstempattr',
+ dictKey: 'suffix'
+ }
+ },
cell: false,
},
{
@@ -1138,8 +1172,14 @@
label: "鏃堕棿鏍煎紡",
prop: "codeDateFormat",
sortable: true,
- width: 105,
+ width: 135,
edit: 'select',
+ editConfig: {
+ extraParams: {
+ code: 'codeclstempattr',
+ dictKey: 'dateFormates'
+ }
+ },
cell: false,
},
{
@@ -1253,7 +1293,9 @@
VTInteger: "鏁村舰",
VTFilePath: "鏂囦欢",
VTString: "瀛楃涓�"
- }
+ },
+ //鏃堕棿鏍煎紡涓嬫媺妗�
+ codeDataFlag:false,
}
},
computed:{
@@ -1281,9 +1323,19 @@
formAttr(row, column) {
console.log(row,column)
},
+ //鍙傜収閰嶇疆瀛愮粍浠�
+ echoReferConfig(val){
+ console.log(val)
+ },
+ //鏃堕棿涓嬫媺鏍煎紡
+ DataChangeHandler(editConfig,index){
+ listByFlag(editConfig.extraParams).then(res=>{
+ console.log(res);
+ this.option.column[index].data=res;
+ })
+ },
//灞炴�у垎缁勬寜閽�
attrVisibleHandle() {
-
if (this.attrSelectList.length > 1) {
this.$message.warning('鍙兘閫夋嫨涓�鏉℃ā鏉垮睘鎬�')
} else if (this.attrSelectList < 1) {
@@ -1342,11 +1394,11 @@
precisionLength: (citem.precisionLength ? citem.precisionLength : '') + (citem.scaleLength ? '(' + citem.scaleLength + ')' : ''),
classifyTemplateOid: this.crudOid,
classifytemplateoid: this.crudOid,
- formDisplayFlag: true,
- tableDisplayFlag: true,
- sortAttrFlag: false,
- queryAttrFlag: true,
- seniorQueryAttrFlag: true,
+ formDisplayFlag: 'true',
+ tableDisplayFlag: 'true',
+ sortAttrFlag: 'false',
+ queryAttrFlag: 'true',
+ seniorQueryAttrFlag: 'true',
attrTableWidth: 120
})
this.ProData.push(JSON.parse(JSON.stringify(this.busineAddList)))
@@ -1380,14 +1432,36 @@
'conditionMap[classifyTemplateOid]': this.Formlist[0].oid,
'conditionMap[oid_notequal]': this.attrOid
}).then(res => {
+ console.log(res)
this.CascadeData = res.data.data;
})
}
+ },
+ //绾ц仈淇濆瓨
+ 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
+ },
+ // 鎺掑簭棰勮鎸夐挳
+ orderHandle(){
+ this.$refs.referAttrCrud.sort("orderNum");
},
//琛ㄦ牸鍗曢��
selectHandle(selection, row) {
this.attrOid = row.oid;
this.attrRow = row;
+ console.log(row)
},
//琛ㄦ牸閫夋嫨
selectionChange(list) {
@@ -1399,29 +1473,20 @@
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 == 'referConfig' ){
+ this.$refs.referConfigFormDialog.isShowReferConfigForm = true;
+ }
},
saveRows() {
this.editingRows = null;
+ console.log('1321')
},
// 鏋氫妇娉ㄥ叆娣诲姞涓�琛岀┖鏁版嵁
addRow() {
@@ -1497,7 +1562,14 @@
},
//鍒嗙被娉ㄥ叆淇濆瓨
injectAddHandle() {
- this.$set(this.attrRow, 'classifyInvokeLevel', this.injectOption);
+ let data = {
+ "娉ㄥ叆绫诲瀷": this.injectOption.type,
+ "娉ㄥ叆绫诲瀷鍚嶇О": this.injectOption.set,
+ "灞傜骇璁剧疆": this.injectOption.injectNum,
+ "鏄惁鍙慨鏀�": this.injectOption.change
+ }
+ console.log(this.injectOption)
+ this.$set(this.attrRow, 'classifyInvokeLevel', data);
this.injectVisible = false
},
//鍒嗙被娉ㄥ叆娓呯┖
@@ -1512,25 +1584,6 @@
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)
@@ -1540,7 +1593,6 @@
this.attrSelectList.forEach((item)=>{
this.ProData.splice(item.$index, 1)
})
-
},
//琛ㄦ牸閲嶇疆
reset() {
--
Gitblit v1.9.3