From a79582f0c67ddc681d2804669455ae13c64de8f9 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 26 十二月 2023 20:20:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue | 321 ++++++++++++++++++++++++++++------------------------
1 files changed, 172 insertions(+), 149 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
index 7f49775..bbf5e3b 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
@@ -1,18 +1,19 @@
<template>
<div>
- <el-dialog :title="title"
- v-dialogDrag append-to-body="true"
+ <el-dialog v-dialogDrag
+ :height="options.height|| 'auto'" :title="title"
:visible.sync="visible"
- top="0"
- class="avue-dialog avue-dialog--top"
:width="options.width|| '80%'"
- :height="options.height|| 'auto'">
- <avue-crud :option="option"
- :table-loading="loading"
- :data="data"
- :page.sync="page"
+ append-to-body="true"
+ class="avue-dialog avue-dialog--top"
+ top="0"
+ @close="dialogClose">
+ <avue-crud ref="referCrud"
v-model="value"
- ref="referCrud"
+ :data="data"
+ :option="option"
+ :page.sync="page"
+ :table-loading="loading"
@search-change="searchChange"
@search-reset="searchReset"
@selection-change="selectionChange"
@@ -26,22 +27,24 @@
</template>
</avue-crud>
<div class="avue-dialog__footer">
- <div class="avue-dialog__footer--left valueInfo">{{ valueInfo }} </div>
- <el-button @click="visible=false">鍙� 娑�</el-button>
- <el-button @click="setValue" type="primary">纭� 瀹�</el-button>
+ <div class="avue-dialog__footer--left valueInfo">{{ valueInfo }}</div>
+ <el-button @click="escHandler">鍙� 娑�</el-button>
+ <el-button type="primary" @click="setValue">纭� 瀹�</el-button>
</div>
</el-dialog>
- <avue-input v-model="text" :disabled="disabled" :readonly="true" :placeholder="title" @click="!disabled && (visible=true)"></avue-input>
+ <avue-input v-model="text" :disabled="disabled" :placeholder="title" :readonly="true"
+ @click="!disabled && (visible=true)"></avue-input>
</div>
</template>
<script>
-import { validatenull } from "@/util/validate";
-import {getList,getLazyList,getTableDefinedUrl} from "@/api/refer/table";
+import {validatenull} from "@/util/validate";
+import {getList, getLazyList, getTableDefinedUrl} from "@/api/refer/table";
+
export default {
name: "vciWebReferTable",
- props:["referConfig","value","text","title","disabled"],
+ props: ["referConfig", "value", "text", "title", "disabled", "referType"],
data() {
return {
visible: false,
@@ -52,35 +55,36 @@
label: this.referConfig.textField || this.referConfig.options.textField || "name"
},
url: this.referConfig.options.url || '/api/ubcs-code/mdmEngineController/defaultReferDataGrid',
- tableDefinedUrl:'',//骞冲彴琛ㄦ牸鍦板潃
- copyParam: ['referBo', 'textField', 'valueField', 'displayTable', 'whereSql', 'queryScheme'],
+ tableDefinedUrl: '',//骞冲彴琛ㄦ牸鍦板潃
+ copyParam: ['referBo', 'textField', 'valueField', 'displayTable', 'whereSql', 'queryScheme'],
query: {},
loading: false,
page: {
+ layout: this.referType === "master" ? "total,pager,prev, next,jumper" : "total,pager,prev, next,jumper,sizes",
pageSize: 10,
currentPage: 1,
- total: this.referConfig.options.data?this.referConfig.options.data.length :0
+ total: this.referConfig.options.data ? this.referConfig.options.data.length : 0
},
- data:this.referConfig.options.data || [],
+ data: this.referConfig.options.data || [],
selectionList: [],
option: {
addBtn: false,
- columnBtn:false,
+ columnBtn: false,
height: this.referConfig.options.height ? this.referConfig.options.height : 475,
calcHeight: 30,
tip: false,
- menu:false,
+ menu: false,
searchShow: true,
searchMenuSpan: 6,
searchLabelWidth: 90,
border: true,
index: true,
selection: true,
- reserveSelection:true,
+ reserveSelection: true,
dialogClickModal: false,
highlightCurrentRow: true,
- rowKey:'oid',
- rowParentKey:'parentSaleProduct',
+ rowKey: 'oid',
+ rowParentKey: 'parentSaleProduct',
column: []
}
};
@@ -89,56 +93,64 @@
this.getParams();
},
mounted() {
- if(this.referConfig.options.page){
- this.page.pageSize=this.referConfig.options.tableConfig.page.limit || this.referConfig.options.tableConfig.page.pageSize;
- this.page.currentPage=this.referConfig.options.tableConfig.page.page || this.referConfig.options.tableConfig.page.currentPage;
- }else if(!validatenull(this.referConfig.options.limit)){
- this.page.pageSize=this.referConfig.options.limit
- }else if(!validatenull(this.referConfig.options.tableConfig.limit)){
- this.page.pageSize=this.referConfig.options.tableConfig.limit
+ if (this.referConfig.options.tableConfig && this.referConfig.options.tableConfig.page) {
+ this.page.pageSize = this.referConfig.options.tableConfig.page.limit || this.referConfig.options.tableConfig.page.pageSize;
+ this.page.currentPage = this.referConfig.options.tableConfig.page.page || this.referConfig.options.tableConfig.page.currentPage;
+ } else if (!validatenull(this.referConfig.options.limit)) {
+ this.page.pageSize = this.referConfig.options.limit;
+ } else if (this.referConfig.options.tableConfig && !validatenull(this.referConfig.options.tableConfig.limit)) {
+ this.page.pageSize = this.referConfig.options.tableConfig.limit;
}
this.$nextTick(() => {
this.$refs.referCrud.doLayout()
})
},
- computed:{
- valueInfo:function (){
- return this.text ? ("宸茶缃殑鍊间负[" + this.text + "]"): '鏈缃��'
+ computed: {
+ valueInfo: function () {
+ return this.text ? ("宸茶缃殑鍊间负[" + this.text + "]") : '鏈缃��'
}
},
methods: {
- getParams:function (){
+ escHandler() {
+ this.visible = false;
+ this.$refs.referDefalutCrud.refreshTable()
+ },
+ dialogClose() {
+ this.visible = false;
+ this.$refs.referDefalutCrud.refreshTable()
+ },
+ getParams: function () {
var queryParams = {};
- if(this.options.extraParams){
+ if (this.options.extraParams) {
queryParams = this.options.extraParams;
}
- if(this.options.useFormKey && this.options.formValues){
+ if (this.options.useFormKey && this.options.formValues) {
//浣跨敤琛ㄥ崟涓婄殑瀛楁鏉ヨ繃婊�
- queryParams['conditionMap["' + (this.options.paramForFormKey?this.options.paramForFormKey:this.options.useFormKey) + '"]'] = this.options.formValues[this.options.useFormKey];
+ queryParams['conditionMap["' + (this.options.paramForFormKey ? this.options.paramForFormKey : this.options.useFormKey) + '"]'] = this.options.formValues[this.options.useFormKey];
}
- if(this.options.where ) {
+ if (this.options.where) {
for (var key in this.options.where) {
queryParams['conditionMap["' + key + '"]'] = this.options.where[key];//鏂�
}
}
- for(var i= 0 ; i < this.copyParam.length ; i ++){
+ for (var i = 0; i < this.copyParam.length; i++) {
queryParams[this.copyParam[i]] = this.options[this.copyParam[i]];
}
- queryParams["isMuti"]=this.isMuti;
- queryParams.muti =this.isMuti;
- if(!queryParams['referBo']){
+ queryParams["isMuti"] = this.isMuti;
+ queryParams.muti = this.isMuti;
+ if (!queryParams['referBo']) {
queryParams['referBo'] = this.options['referBo'] || this.options['referType'];
}
- queryParams['referType']= queryParams['referBo']
+ queryParams['referType'] = queryParams['referBo']
if (this.options.initSort) {
queryParams['order'] = this.options.initSort.type;//鏂规硶
queryParams['sort'] = this.options.initSort.field;//瀛楁
}
- if(this.options.sortField){
+ if (this.options.sortField) {
queryParams['sort'] = this.options.sortField;//瀛楁
}
- if(this.options.sortType){
+ if (this.options.sortType) {
queryParams['order'] = this.options.sortType;//鏂规硶
}
if (this.options.conditionParams) {
@@ -163,36 +175,40 @@
}
var paramsData = {};
//涓轰簡澶勭悊鍗曞紩鍙峰拰鍙屽紩鍙风殑
- if(queryParams){
- for (var key in queryParams){
+ if (queryParams) {
+ for (var key in queryParams) {
paramsData[key.replace(/"/g, "'")] = queryParams[key];
}
}
- if(this.options.displayTable){
+ if (this.options.displayTable) {
//璇存槑鏄娇鐢ㄥ钩鍙扮殑琛ㄦ牸
- getTableDefinedUrl({btmType:(this.options.referBo||this.options.referType),code:this.options.displayTable,isMuti:this.isMuti},this.tableDefinedUrl).then(result => {
- console.log('result',result)
- if(result.success){
+ getTableDefinedUrl({
+ btmType: (this.options.referBo || this.options.referType),
+ code: this.options.displayTable,
+ isMuti: this.isMuti
+ }, this.tableDefinedUrl).then(result => {
+ console.log('result', result)
+ if (result.success) {
var queryScheme = result.querySchema;
- if(!validatenull(queryScheme) && validatenull(this.options.queryScheme)){
+ if (!validatenull(queryScheme) && validatenull(this.options.queryScheme)) {
this.options.queryScheme = queryScheme;
}
paramsData['queryScheme'] = this.options.queryScheme;
- if(result.showIndex){
+ if (result.showIndex) {
this.option.index = true;
}
- if(result.showCheckbox){
+ if (result.showCheckbox) {
this.option.selection = true
}
var referColumn = "";
- if(result.columns){
- this.option.column= result.columns.map(item => {
- if(item.field.indexOf(".")>-1){
+ if (result.columns) {
+ this.option.column = result.columns.map(item => {
+ if (item.field.indexOf(".") > -1) {
referColumn += item.field + ",";
- item.field = item.field.replace(".","_");
+ item.field = item.field.replace(".", "_");
}
- if(!validatenull(item.enumCode)) {
+ if (!validatenull(item.enumCode)) {
//鏄灇涓剧殑鍐呭
item.type = 'select';
item.dicUrl = "/api/ubcs-omd/enum/dictionary?code=" + item.enumCode;
@@ -209,12 +225,12 @@
trigger: "blur"
}];
}
- item.formatter=function(d){
- if(d[item.field]!=undefined){
+ item.formatter = function (d) {
+ if (d[item.field] != undefined) {
return d[item.field]
- }else if(d.data[item.field] !=undefined){
+ } else if (d.data[item.field] != undefined) {
return d.data[item.field]
- }else {
+ } else {
return ''
}
};
@@ -227,48 +243,48 @@
})
}
paramsData['referColumn'] = referColumn;
- if(result.limit>0){
+ if (result.limit > 0) {
this.page.pageSize = result.limit;
- this.page.currentPage=1
+ this.page.currentPage = 1
}
- if(this.options.isTreeGrid){
+ if (this.options.isTreeGrid) {
//琛ㄦ牸鏍戝姞涓婇厤缃�
}
- this.params=paramsData;
- }else{
+ this.params = paramsData;
+ } else {
this.$message.error(result.msg);
}
});
- }else{
+ } else {
//璇存槑鏄嚜瀹氫箟鐨勮〃鏍�
var tableConfig = this.options.tableConfig;
- if(!tableConfig){
- this.$message.error( '娌℃湁瀹氫箟鍙傜収鐨勮〃鏍奸厤缃�');
+ if (!tableConfig) {
+ this.$message.error('娌℃湁瀹氫箟鍙傜収鐨勮〃鏍奸厤缃�');
}
- if(!paramsData){
+ if (!paramsData) {
paramsData = {
- currentUserReferModelKey:this.options.currentUserReferModelKey,
- currentUserReferMethodKey:this.options.currentUserReferMethodKey
+ currentUserReferModelKey: this.options.currentUserReferModelKey,
+ currentUserReferMethodKey: this.options.currentUserReferMethodKey
};
- }else{
+ } else {
paramsData['currentUserReferModelKey'] = this.options.currentUserReferModelKey;
paramsData['currentUserReferMethodKey'] = this.options.currentUserReferMethodKey;
}
- if(this.options.tableConfig && this.options.tableConfig.cols && this.options.tableConfig.cols.length>0) {
+ if (this.options.tableConfig && this.options.tableConfig.cols && this.options.tableConfig.cols.length > 0) {
//璇存槑浼犻�掍簡鐨�
- this.option.column= this.options.tableConfig.cols.map(item => {
+ this.option.column = this.options.tableConfig.cols.map(item => {
if (item.field != 'LAY_TABLE_INDEX' && item.field != 'LAY_CHECKED') {
- let formatter=item.template || item.templet;
- if(typeof formatter == "string" && formatter !=''){
- formatter=eval("(" + formatter + ")")
- }else{
- formatter=function (d){
- if(d[item.field]!=undefined){
+ let formatter = item.template || item.templet;
+ if (typeof formatter == "string" && formatter != '') {
+ formatter = eval("(" + formatter + ")")
+ } else {
+ formatter = function (d) {
+ if (d[item.field] != undefined) {
return d[item.field]
- }else if(d.data[item.field] !=undefined){
+ } else if (d.data[item.field] != undefined) {
return d.data[item.field]
- }else {
+ } else {
return ''
}
}
@@ -277,82 +293,89 @@
...item,
label: item.title,
prop: item.field,
- formatter:formatter,
- sortable:item.sort,
- hide:item.hidden,
- search: this.options.tableConfig.queryColumns.some(qItem=>{
- return qItem.field==item.field
+ formatter: formatter,
+ sortable: item.sort,
+ hide: item.hidden,
+ search: this.options.tableConfig.queryColumns.some(qItem => {
+ return qItem.field == item.field
})
}
}
})
}
- if(this.options.isTreeGrid){
+ if (this.options.isTreeGrid) {
//琛ㄦ牸鏍戝姞涓婇厤缃�
}
}
- this.params=paramsData;
+ this.params = paramsData;
},
- setValue(){
- if(this.selectionList.length==0){
- this.$message.warning( '娌℃湁閫夋嫨鏁版嵁');
+ setValue() {
+ if (this.selectionList.length == 0) {
+ this.$message.warning('娌℃湁閫夋嫨鏁版嵁');
return false;
- }else if(this.selectionList.length>1 && !this.isMuti){
- this.$message.warning( '姣忔鍙兘閫夋嫨涓�鏉℃暟鎹�');
+ } else if (this.selectionList.length > 1 && !this.isMuti) {
+ this.$message.warning('姣忔鍙兘閫夋嫨涓�鏉℃暟鎹�');
return false;
}
var value = [];
var text = [];
- var isMutiValue = (this.props.value.indexOf(",")>-1);
- var isMutiRaw = (this.props.label.indexOf(",")>-1);
- var _that=this
- this.selectionList.forEach((item,_index) =>{
- if(isMutiValue){
+ var isMutiValue = (this.props.value.indexOf(",") > -1);
+ var isMutiRaw = (this.props.label.indexOf(",") > -1);
+ var _that = this
+ this.selectionList.forEach((item, _index) => {
+ if (isMutiValue) {
var valueFieldArray = _that.props.value.split(",");
- valueFieldArray.forEach((_itemField,_indexField)=>{
- let itemValue=item[_itemField];
- if(itemValue==undefined || itemValue == null){
- itemValue=item['data'][_itemField]
+ valueFieldArray.forEach((_itemField, _indexField) => {
+ let itemValue = item[_itemField];
+ if (itemValue == undefined || itemValue == null) {
+ itemValue = item['data'][_itemField]
}
- value.push( itemValue + (_that.referConfig.valueSep?_that.referConfig.valueSep:' '));
+ value.push(itemValue + (_that.referConfig.valueSep ? _that.referConfig.valueSep : ' '));
})
- }else {
- let itemValue=item[_that.props.value];
- if(itemValue==undefined || itemValue == null){
- itemValue=item['data'][_that.props.value]
+ } else {
+ let itemValue = item[_that.props.value];
+ if (itemValue == undefined || itemValue == null) {
+ itemValue = item['data'][_that.props.value]
}
value.push(itemValue);
}
- if(isMutiRaw) {
+ if (isMutiRaw) {
var rawFieldArray = _that.props.label.split(",");
- rawFieldArray.forEach((_itemField,_indexField)=>{
- let itemText=item[_itemField];
- if(itemText==undefined || itemText == null){
- itemText=item['data'][_itemField]
+ rawFieldArray.forEach((_itemField, _indexField) => {
+ let itemText = item[_itemField];
+ if (itemText == undefined || itemText == null) {
+ itemText = item['data'][_itemField]
}
- text.push(itemText + (_that.referConfig.textSep?_that.referConfig.textSep:' ')) ;
+ text.push(itemText + (_that.referConfig.textSep ? _that.referConfig.textSep : ' '));
})
- }else{
- let itemText=item[_that.props.label];
- if(itemText==undefined || itemText == null){
- itemText=item['data'][_that.props.label]
+ } else {
+ let itemText = item[_that.props.label];
+ if (itemText == undefined || itemText == null) {
+ itemText = item['data'][_that.props.label]
}
text.push(itemText);
}
})
- let mapFields =this.referConfig.fieldMap || {};
+ let mapFields = this.referConfig.fieldMap || {};
try {
- if(!validatenull(this.options.mapFields)){
- mapFields =Object.assign(this.referConfig.fieldMap,JSON.parse(this.options.mapFields)) ;
+ if (!validatenull(this.options.mapFields)) {
+ mapFields = Object.assign(this.referConfig.fieldMap, JSON.parse(this.options.mapFields));
}
- }catch (e) {
+ } catch (e) {
}
- this.value=value.join(',');
- this.text=text.join(',')
- this.$emit("setValue", {field:this.referConfig.field,showField:this.referConfig.showField,value:this.value,text:this.text,rawData:this.selectionList,fieldMap:mapFields});
- this.visible=false;
+ this.value = value.join(',');
+ this.text = text.join(',')
+ this.$emit("setValue", {
+ field: this.referConfig.field,
+ showField: this.referConfig.showField,
+ value: this.value,
+ text: this.text,
+ rawData: this.selectionList,
+ fieldMap: mapFields
+ });
+ this.visible = false;
},
searchReset() {
this.query = {};
@@ -364,16 +387,16 @@
this.onLoad(this.page);
done();
},
- currentChange(currentPage){
+ currentChange(currentPage) {
this.page.currentPage = currentPage;
},
- sizeChange(pageSize){
+ sizeChange(pageSize) {
this.page.pageSize = pageSize;
},
- rowClick (row) {
+ rowClick(row) {
this.$refs.referCrud.toggleSelection();
this.$refs.referCrud.toggleRowSelection(row); //閫変腑褰撳墠琛�
- this.selectionList=[row]
+ this.selectionList = [row]
},
selectionChange(list) {
if (!this.isMuti && list.length > 1) {
@@ -389,33 +412,33 @@
refreshChange() {
this.onLoad(this.page, this.query);
},
- onLoad(page, params={}) {
- if(this.url){
+ onLoad(page, params = {}) {
+ if (this.url) {
this.loading = true;
- var query={}
+ var query = {}
if (this.query) {
for (var key in this.query) {
query['conditionMap["' + key + '"]'] = this.query[key];
}
}
- getList(Object.assign(params,this.params,this.query, query),page.currentPage, page.pageSize, this.url).then(res => {
- let data=[]
- if(res.data.records){
+ getList(Object.assign(params, this.params, this.query, query), page.currentPage, page.pageSize, this.url).then(res => {
+ let data = []
+ if (res.data.records) {
data = res.data.records
- this.page.total=res.data.total ;
- }else{
+ this.page.total = res.data.total;
+ } else {
data = res.data.data.records;
- this.page.total=res.data.data.total;
+ this.page.total = res.data.data.total;
}
- this.data=data.map(item => {
- item.data=item.data || {}
+ this.data = data.map(item => {
+ item.data = item.data || {}
return {
...item
}
})
this.loading = false;
this.selectionClear();
- }).catch(error=>{
+ }).catch(error => {
this.$message.error(error);
this.loading = false;
});
@@ -427,7 +450,7 @@
</script>
<style scoped>
-.valueInfo{
+.valueInfo {
float: left;
border: 1px solid #E9E7E7;
display: inline-block;
--
Gitblit v1.9.3