java_project
/
logpm_page
4
1
Fork 0
Code Issues Pull Requests Activity
Browse Source

Merge remote-tracking branch 'origin/dev' into dev

dev-warehouse
caoyizhong 2 years ago
parent
3fa538e3c5 d8277529e1
commit
73e04b4844
4 changed files with 663 additions and 426 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      src/views/basic/property/basicProperty.vue
  2. 918
      src/views/basic/property/basicPropertyDetails.vue
  3. 39
      src/views/basic/property/basicPropertyDetailsfrom.vue
  4. 127
      src/views/basic/property/basicPropertyform.vue

5
src/views/basic/property/basicProperty.vue
Unescape View File

@ -94,7 +94,7 @@ export default {
this.$router.push({
path: '/basic/property/basicPropertyform',
query: {
data: row.id,
data: encodeURIComponent(JSON.stringify(row)),
edt: false,
name: row.assetName + '-字段编辑'
}
@ -237,11 +237,8 @@ export default {
},
onLoad(page, params = {}) {
this.loading = true;
const {} = this.query;
let values = {};
getList(page.currentPage, page.pageSize, values).then(res => {
const data = res.data.data;
this.page.total = data.total;

918
src/views/basic/property/basicPropertyDetails.vue
Unescape View File

@ -1,10 +1,10 @@
<template>
<div class="avue-tags" @click="contextmenuFlag = false">
<el-tabs v-model= "activeTab" type="border-card" @tab-click="handleTabClick" >
<el-tab-pane v-for="(item, index) in tabs" :key="index" :label="item.assetName" :name="item.id">
<div class="avue-tags" @click="contextmenuFlag = false">
<el-tabs v-model="activeTab" type="border-card" @tab-click="handleTabClick">
<el-tab-pane v-for="(item, index) in tabs" :key="index" :label="item.assetName" :name="item.id">
<basic-container>
<avue-crud v-if="edit"
:option="option"
:option="option"
v-model:search="search"
v-model:page="page"
v-model="form"
@ -34,462 +34,592 @@
<el-button type="primary" text icon="el-icon-view" @click="handleview(row)">查 看</el-button>
</template>
</avue-crud>
<basic-property-detailsform v-if="!edit" @returnproperty ="returnproperty" :propertyformdata="propertyformdata" :propertyoptiondata="propertyoptiondata" />
<basic-property-detailsform v-if="!edit" @returnproperty="returnproperty" :propertyformdata="propertyformdata"
:propertyoptiondata="propertyoptiondata" />
</basic-container>
</el-tab-pane>
</el-tabs>
</el-tab-pane>
</el-tabs>
</div>
</template>
<script>
import {getList, getDetail, add, update, remove} from "@/api/basic/basicProperty";
import {getList as getListvalue, getDetail as getDetailvalue, add as addvalue, update as updatevalue, remove as valueremove} from "@/api/basic/basicPropertyvalue";
import {getList as getListField} from "@/api/basic/basicPropertyfield";
import {mapGetters} from "vuex";
import {exportBlob} from "@/api/common";
import {getToken} from '@/utils/auth';
import {downloadXls} from "@/utils/util";
import {dateNow} from "@/utils/date";
import NProgress from 'nprogress';
import 'nprogress/nprogress.css';
import { getDictionaryBiz } from '@/api/system/dict';
import BasicPropertyDetailsform from '@/views/basic/property/basicPropertyDetailsfrom.vue';
import { getList, getDetail, add, update, remove } from '@/api/basic/basicProperty';
import {
getList as getListvalue,
getDetail as getDetailvalue,
add as addvalue,
update as updatevalue,
remove as valueremove
} from '@/api/basic/basicPropertyvalue';
import { getList as getListField } from '@/api/basic/basicPropertyfield';
import { mapGetters } from 'vuex';
import { exportBlob } from '@/api/common';
import { getToken } from '@/utils/auth';
import { downloadXls } from '@/utils/util';
import { dateNow } from '@/utils/date';
import NProgress from 'nprogress';
import 'nprogress/nprogress.css';
import { getDictionaryBiz } from '@/api/system/dict';
import BasicPropertyDetailsform from '@/views/basic/property/basicPropertyDetailsfrom.vue';
export default {
components: { BasicPropertyDetailsform },
data() {
export default {
components: { BasicPropertyDetailsform },
data() {
return {
form: {},
tabPosition: 'right',
active: '',
activeTab: '',
department:'',
query: {},
search: {},
propertyformdata: {},
propertyoptiondata: {},
loading: true,
inputTypeData: [],
edit: true,
tabs: [
{ assetName: '加载资产...' }
],
page: {
pageSize: 10,
currentPage: 1,
total: 0
},
selectionList: [],
option: {
height: 'auto',
calcHeight: 30,
tip: false,
searchShow: true,
searchMenuSpan: 6,
border: true,
index: true,
viewBtn: false,
editBtn: false,
selection: false,
dialogClickModal: false,
column: []
}
,
data: []
};
},
mounted() {
},
created() {
this.queryDictionary();
},
computed: {
...mapGetters(['permission']),
permissionList() {
return {
form: {},
tabPosition:'right',
active:'',
activeTab: '',
query: {},
search: {},
propertyformdata:{},
propertyoptiondata:{},
loading: true,
inputTypeData:[],
edit:true,
tabs: [
{ assetName: '加载资产...'},
],
page: {
pageSize: 10,
currentPage: 1,
total: 0
},
selectionList: [],
option: {
height:'auto',
calcHeight: 30,
tip: false,
searchShow: true,
searchMenuSpan: 6,
border: true,
index: true,
viewBtn: false,
editBtn: false,
selection: false,
dialogClickModal: false,
column: [
]
}
,
data: [],
addBtn: this.validData(this.permission.basicProperty_add, false),
viewBtn: this.validData(this.permission.basicProperty_view, false),
delBtn: this.validData(this.permission.basicProperty_delete, false),
editBtn: this.validData(this.permission.basicProperty_edit, false)
};
},
mounted() {
ids() {
let ids = [];
this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(',');
}
},
methods: {
handleTabClick(tab) {
//清空搜索
this.search = {},
this.query = {},
this.emptycolumn();
this.edit = true,
this.activeTab = tab.props.name;
let masterId = {
masterId_equal: this.activeTab
};
this.getListfrom(masterId);
},
created() {
this.queryDictionary()
//查询字典
queryDictionary() {
// getDictionaryBiz('yes_no').then(res => {
// this.isDepositData = res.data.data;
// });
getDictionaryBiz('basic_in_type').then(res => {
this.inputTypeData = res.data.data;
});
},
computed: {
...mapGetters(["permission"]),
permissionList() {
return {
addBtn: this.validData(this.permission.basicProperty_add, false),
viewBtn: this.validData(this.permission.basicProperty_view, false),
delBtn: this.validData(this.permission.basicProperty_delete, false),
editBtn: this.validData(this.permission.basicProperty_edit, false)
};
},
ids() {
let ids = [];
this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
}
//编辑
handleEdit(row) {
console.log("row>>>>>>>>>>>>>>",row);
this.propertyformdata = row;
//挑选value
let value = this.option; value.disabled=false,
this.propertyoptiondata = value;
this.propertyformdata.view = false;
this.propertyformdata.activeTab = this.activeTab;
this.edit = false;
},
methods: {
handleTabClick(tab) {
//清空搜索
this.search ={},
this.query={},
this.emptycolumn();
this.edit = true,
this.activeTab = tab.props.name;
let masterId={
masterId_equal: this.activeTab
}
this.getListfrom(masterId);
},
//查询字典
queryDictionary() {
// getDictionaryBiz('yes_no').then(res => {
// this.isDepositData = res.data.data;
// });
getDictionaryBiz('basic_in_type').then(res => {
this.inputTypeData = res.data.data;
//数据返回
returnproperty(str) {
// this.emptycolumn();
this.activeTab = str.val;
this.edit = true;
this.getListvalues(this.page, this.query);
},
//查看全部维修记录
viewrepairs() {
this.$router.push({
path: '/basic/property/basicrecordslist',
query: {}
});
},
//查看
handleview(row) {
//挑选value
let value = this.option;
value.disabled=true,
this.propertyoptiondata = value;
this.propertyformdata = row;
this.propertyformdata.view = true;
this.edit = false;
},
rowSave(row, done, loading) {
console.log("row>>>>>>",row);
loading();
//转换json
const filteredKeys = Object.keys(row).filter(key => key.includes('value')); // ["name", "address", "email"]
filteredKeys.push('department');
filteredKeys.push('owmment');
console.log("filteredKeys>>>>>>",filteredKeys);
const filteredObj = filteredKeys.reduce((result, key) => {
result[key] = row[key];
return result;
}, {});
const jsonString = JSON.stringify(filteredObj);
console.log('jsonString>>>>>>>>>', jsonString);
row.stringValue = jsonString;
row.masterId = this.activeTab;
console.log('row>>>>>>', row);
addvalue(row).then(() => {
this.getListvalues(this.page);
this.$message({
type: 'success',
message: '操作成功!'
});
},
//编辑
handleEdit(row) {
this.propertyformdata = row;
//挑选value
let value = this.option
this.propertyoptiondata = value;
this.propertyformdata.view =false;
this.propertyformdata.activeTab =this.activeTab;
this.edit =false;
},
//数据返回
returnproperty(str){
// this.emptycolumn();
this.activeTab = str.val;
this.edit = true;
this.getListvalues(this.page, this.query);
},
//查看全部维修记录
viewrepairs(){
this.$router.push({
path: '/basic/property/basicrecordslist',
query: {
}
done();
}, error => {
loading();
window.console.log(error);
});
},
rowUpdate(row, index, done, loading) {
//转换json
const filteredKeys = Object.keys(row).filter(key => key.includes('value'));
filteredKeys.push('department');
filteredKeys.push('owmment');
console.log("filteredKeys>>>>>>",filteredKeys);
const filteredObj = filteredKeys.reduce((result, key) => {
result[key] = row[key];
return result;
}, {});
const jsonString = JSON.stringify(filteredObj);
row.stringValue = jsonString;
row.masterId = this.activeTab;
updatevalue(row).then(() => {
this.getListvalues(this.page);
this.$message({
type: 'success',
message: '操作成功!'
});
},
//查看
handleview(row) {
this.propertyformdata = row;
this.propertyformdata.view = true ;
this.edit =false;
},
rowSave(row, done, loading) {
//转换json
const filteredKeys = Object.keys(row).filter(key => key.includes('value')); // ["name", "address", "email"]
const filteredObj = filteredKeys.reduce((result, key) => {
result[key] = row[key];
return result;
}, {});
const jsonString = JSON.stringify(filteredObj);
console.log("jsonString>>>>>>>>>",jsonString);
row.stringValue =jsonString;
row.masterId = this.activeTab
console.log("row>>>>>>",row);
addvalue(row).then(() => {
done();
}, error => {
loading();
console.log(error);
});
},
rowDel(row) {
this.$confirm('确定将选择数据删除?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
})
.then(() => {
return valueremove(row.id);
})
.then(() => {
this.getListvalues(this.page);
this.$message({
type: "success",
message: "操作成功!"
type: 'success',
message: '操作成功!'
});
done();
}, error => {
loading();
window.console.log(error);
});
},
rowUpdate(row, index, done, loading) {
//转换json
const filteredKeys = Object.keys(row).filter(key => key.includes('value'));
const filteredObj = filteredKeys.reduce((result, key) => {
result[key] = row[key];
return result;
}, {});
const jsonString = JSON.stringify(filteredObj);
row.stringValue =jsonString;
row.masterId = this.activeTab
updatevalue(row).then(() => {
},
handleDelete() {
if (this.selectionList.length === 0) {
this.$message.warning('请选择至少一条数据');
return;
}
this.$confirm('确定将选择数据删除?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
})
.then(() => {
return valueremove(this.ids);
})
.then(() => {
this.getListvalues(this.page);
this.$message({
type: "success",
message: "操作成功!"
type: 'success',
message: '操作成功!'
});
done();
}, error => {
loading();
console.log(error);
this.$refs.crud.toggleSelection();
});
},
rowDel(row) {
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
return valueremove(row.id);
})
.then(() => {
this.getListvalues(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
});
},
handleDelete() {
if (this.selectionList.length === 0) {
this.$message.warning("请选择至少一条数据");
return;
}
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
return valueremove(this.ids);
})
.then(() => {
this.getListvalues(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
this.$refs.crud.toggleSelection();
});
},
handleExport() {
let downloadUrl = `/basicProperty/basicProperty/export-basicProperty?${this.website.tokenHeader}=${getToken()}`;
const {
} = this.query;
let values = {
};
this.$confirm("是否导出数据?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
NProgress.start();
exportBlob(downloadUrl, values).then(res => {
downloadXls(res.data, `资产${dateNow()}.xlsx`);
NProgress.done();
})
},
handleExport() {
let downloadUrl = `/basicProperty/basicProperty/export-basicProperty?${this.website.tokenHeader}=${getToken()}`;
const {} = this.query;
let values = {};
this.$confirm('是否导出数据?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
NProgress.start();
exportBlob(downloadUrl, values).then(res => {
downloadXls(res.data, `资产${dateNow()}.xlsx`);
NProgress.done();
});
},
beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
getDetail(this.form.id).then(res => {
this.form = res.data.data;
});
}
done();
},
searchReset() {
this.query = {};
this.getListvalues(this.page);
},
searchChange(params, done) {
console.log("进来了>>>>>>>>",params);
console.log("tabthis.search>>>>>>>>>>>进来没有",this.search);
console.log("tabthis.query>>>>>>>>>>>进来没有",this.query);
this.query = params;
this.page.currentPage = 1;
this.getListvalues(this.page, params);
done();
},
selectionChange(list) {
this.selectionList = list;
},
selectionClear() {
this.selectionList = [];
this.$refs.crud.toggleSelection();
},
currentChange(currentPage){
this.page.currentPage = currentPage;
this.getListvalues(this.page, this.query);
},
sizeChange(pageSize){
this.page.pageSize = pageSize;
this.getListvalues(this.page, this.query);
},
refreshChange() {
this.getListvalues(this.page, this.query);
},
onLoad(page, params = {}) {
console.log("进来>>>>>>>>",this.tabs.length);
if (this.tabs.length>1) {
return;
}
this.loading = true;
const {
} = this.query;
let values = {
};
});
},
beforeOpen(done, type) {
if (['edit', 'view'].includes(type)) {
getDetail(this.form.id).then(res => {
this.form = res.data.data;
});
}
done();
},
searchReset() {
this.query = {};
this.getListvalues(this.page);
},
searchChange(params, done) {
console.log('进来了>>>>>>>>', params);
console.log('tabthis.search>>>>>>>>>>>进来没有', this.search);
console.log('tabthis.query>>>>>>>>>>>进来没有', this.query);
this.query = params;
this.page.currentPage = 1;
this.getListvalues(this.page, params);
done();
},
selectionChange(list) {
this.selectionList = list;
},
selectionClear() {
this.selectionList = [];
this.$refs.crud.toggleSelection();
},
currentChange(currentPage) {
this.page.currentPage = currentPage;
this.getListvalues(this.page, this.query);
},
sizeChange(pageSize) {
this.page.pageSize = pageSize;
this.getListvalues(this.page, this.query);
},
refreshChange() {
this.getListvalues(this.page, this.query);
},
onLoad(page, params = {}) {
console.log('进来>>>>>>>>', this.tabs.length);
if (this.tabs.length > 1) {
return;
}
this.loading = true;
const {} = this.query;
let values = {};
getList(1, 50, values).then(res => {
const data = res.data.data;
// this.page.total = data.total;
let activeTabId = data.records[0].id
if (!!this.activeTab){activeTabId = this.activeTab}
if (!!data){
const data = res.data.data;
// this.page.total = data.total;
let activeTabId = data.records[0].id;
if (!!this.activeTab) {
activeTabId = this.activeTab;
}
if (!!data) {
let Fieldvalues = {
masterId_equal: activeTabId
};
this.getListfrom(Fieldvalues);
//查询值
this.getListvalues(page);
}
this.tabs = data.records;
this.activeTab = activeTabId;
this.loading = false;
// this.selectionClear();
});
},
this.getListvalues(page);
}
this.tabs = data.records;
this.activeTab = activeTabId;
this.loading = false;
// this.selectionClear();
});
},
//查询字段
getListfrom(masterId){
getListField(1,100,masterId).then(res=>{
const data = res.data.data;
if (!!data){
//清空数据
this.emptycolumn();
// this.option.column =[]
Promise.all( data.records.map(item=>{
//查询字段
getListfrom(masterId) {
getListField(1, 100, masterId).then(res => {
const data = res.data.data;
if (!!data) {
//清空数据
this.emptycolumn();
// this.option.column =[]
Promise.all(data.records.map(item => {
let isSearch = false;
if (item.isSearch =='2'){
isSearch =true;
}
let value ={
if (item.isSearch == '2') {
isSearch = true;
}
let value = {
label: item.fieldName,
prop: item.property,
type: "input",
type: 'input',
search: isSearch,
addDisplay: true,
editDisplay: true,
viewDisplay: true,
labelWidth:'150',
align:'center',
span:11,
labelWidth: '150',
align: 'center',
span: 11,
sort: item.sort
};
if (item.isput == '2') {
value.rules = [{ required: true, message: '请填写必填项!', trigger: 'blur' }];
}
if (item.isput =='2'){
value.rules = [{ required: true, message: '请填写必填项!',trigger: 'blur'}]
}
//匹配类型
switch (item.inputType){
switch (item.inputType) {
case '1':
value.type = "input"
value.type = 'input';
break;
case '2':
//查询字典
return getDictionaryBiz(item.dictionaryCode).then(res => {
value.type = "select";
return getDictionaryBiz(item.dictionaryCode).then(res => {
value.type = 'select';
value.dicData = res.data.data;
value.props = { label: 'dictValue', value: 'dictKey' };
this.option.column.push(value)
this.option.column.push(value);
});
break;
case '3':
value.type = "date"
value.format="YYYY-MM-DD"
value.valueFormat="YYYY-MM-DD"
break
case '4':
value.type = 'upload'
value.align='center'
value.dataType='string'
value.listType='picture-img'
value.width='250px'
value.action='/blade-resource/oss/endpoint/put-file',
value.propsHttp= { res: 'data', url: 'link'}
break
case '5':
value.type = 'upload'
value.align='center'
value.dataType='string'
value.listType='picture-card'
value.width='250px'
value.limit= 3,
value.action='/blade-resource/oss/endpoint/put-file',
value.propsHttp= { res: 'data', url: 'link'}
break
value.type = 'date';
value.format = 'YYYY-MM-DD';
value.valueFormat = 'YYYY-MM-DD';
break;
case '4':
value.type = 'upload';
value.align = 'center';
value.dataType = 'string';
value.listType = 'picture-img';
value.width = '250px';
value.action = '/blade-resource/oss/endpoint/put-file',
value.propsHttp = { res: 'data', url: 'link' };
break;
case '5':
value.type = 'upload';
value.align = 'center';
value.dataType = 'string';
value.listType = 'picture-card';
value.width = '250px';
value.limit = 3,
value.action = '/blade-resource/oss/endpoint/put-file',
value.propsHttp = { res: 'data', url: 'link' };
break;
case '6':
value.type = 'upload'
value.align='center'
value.dataType='string'
value.width='250px'
value.action='/blade-resource/oss/endpoint/put-file',
value.propsHttp= { res: 'data', url: 'link'}
break
value.type = 'upload';
value.align = 'center';
value.dataType = 'string';
value.width = '250px';
value.action = '/blade-resource/oss/endpoint/put-file',
value.propsHttp = { res: 'data', url: 'link' };
break;
}
this.getListvalues(masterId);
this.option.column.push(value)
this.option.column.push(value);
})
).then(() => {
//去重
this.option.column = this.option.column.filter((item, index, self) => {
return index === self.findIndex((t) => (
t.prop === item.prop
));
});
this.loading = false;
console.log('所有 Promise 都已完成>>>>>',this.option.column);
// 执行后续操作，例如更新页面显示、关闭加载提示等
// ...
}).catch(error => {
console.error('请求出错：', error);
// 执行后续操作，例如显示错误提示、重试等
// ...
).then(() => {
this.option.column.sort((a, b) => a.sort - b.sort);
let department = {
label: '采购部门',
prop: 'department',
search: true,
type: 'tree',
span: 11,
labelWidth: '150',
checkStrictly: true,
slot: true,
dicUrl: '/api/blade-system/dept/lazy-tree?parentId=0',
props: {
label: 'title',
value: 'title'
},
lazy: true,
treeLoad: (node, resolve) => {
// console.log(">>>>>>>>>>",node);
let stop_level = 3;
let level = node.level; // 0
let data = node.data || {};
let code = data.id;
let list = [];
let callback = () => {
resolve((list || []).map(ele => {
return Object.assign(ele, {
leaf: level >= stop_level
});
}));
};
if (level == 0) {
axios.get(`/api/blade-system/dept/lazy-tree?parentId=0`).then(res => {
list = res.data.data;
callback();
});
}
if (level == 1) {
axios.get(`/api/blade-system/dept/lazy-tree?parentId=${code}`).then(res => {
list = res.data.data;
callback();
});
} else if (level == 2) {
axios.get(`/api/blade-system/dept/lazy-tree?parentId=${code}`).then(res => {
list = res.data.data;
callback();
});
} else if (level == 3) {
axios.get(`/api/blade-system/dept/lazy-tree?parentId=${code}`).then(res => {
list = res.data.data;
callback();
});
} else {
list = [];
callback();
}
}
};
let owmment = {
label: '所属部门',
prop: 'owmment',
search: true,
type: 'tree',
span: 11,
labelWidth: '150',
dicUrl: '/api/blade-system/dept/lazy-tree?parentId=0',
props: {
label: 'title',
value: 'title'
},
lazy: true,
treeLoad: (node, resolve) => {
// console.log(">>>>>>>>>>",node);
let stop_level = 3;
let level = node.level; // 0
let data = node.data || {};
let code = data.id;
let list = [];
let callback = () => {
resolve((list || []).map(ele => {
return Object.assign(ele, {
leaf: level >= stop_level
});
}));
};
if (level == 0) {
axios.get(`/api/blade-system/dept/lazy-tree?parentId=0`).then(res => {
list = res.data.data;
callback();
});
}
if (level == 1) {
axios.get(`/api/blade-system/dept/lazy-tree?parentId=${code}`).then(res => {
list = res.data.data;
callback();
});
} else if (level == 2) {
axios.get(`/api/blade-system/dept/lazy-tree?parentId=${code}`).then(res => {
list = res.data.data;
callback();
});
} else if (level == 3) {
axios.get(`/api/blade-system/dept/lazy-tree?parentId=${code}`).then(res => {
list = res.data.data;
callback();
});
} else {
list = [];
callback();
}
}
};
this.option.column.push(department);
this.option.column.push(owmment);
//去重
this.option.column = this.option.column.filter((item, index, self) => {
return index === self.findIndex((t) => (
t.prop === item.prop
));
});
}
this.loading = false;
console.log('所有 Promise 都已完成>>>>>', this.option.column);
// 执行后续操作，例如更新页面显示、关闭加载提示等
// ...
}).catch(error => {
console.error('请求出错：', error);
// 执行后续操作，例如显示错误提示、重试等
// ...
});
}
})
},
//获取值
getListvalues(page,params){
this.loading = true;
console.log("params>>>>>>",params);
// this.loading = true;
let jsonString = null
const {
} = this.query;
let values = {
masterId_equal: this.activeTab
};
if (!!params){
});
},
//获取值
getListvalues(page, params) {
this.loading = true;
console.log('params>>>>>>', params);
// this.loading = true;
let jsonString = null;
const {} = this.query;
let values = {
masterId_equal: this.activeTab
};
if (!!params) {
//转换json
const filteredKeys = Object.keys(params).filter(key => key.includes('value'));
filteredKeys.push('department');
filteredKeys.push('owmment');
console.log("filteredKeys>>>>>>",filteredKeys);
const filteredObj = filteredKeys.reduce((result, key) => {
result[key] = params[key];
return result;
}, {});
jsonString = JSON.stringify(filteredObj);
values.stringValue_like=jsonString.replace('{','').replace('}','');
}
getListvalue(page.currentPage, page.pageSize, values).then(res=>{
const data = res.data.data;
//处理对象
if (!!data.records){
for (let i = 0; i < data.records.length; i++) {
let obj = JSON.parse(data.records[i].stringValue);
data.records[i]=(Object.assign(data.records[i],obj))
}
this.page.total = data.total;
this.data = data.records;
}
this.loading = false;
})
},
emptycolumn(){
this.option.column =[
]
values.stringValue_like = jsonString.replace('{', '').replace('}', '');
}
getListvalue(page.currentPage, page.pageSize, values).then(res => {
const data = res.data.data;
//处理对象
if (!!data.records) {
for (let i = 0; i < data.records.length; i++) {
let obj = JSON.parse(data.records[i].stringValue);
data.records[i] = (Object.assign(data.records[i], obj));
}
this.page.total = data.total;
this.data = data.records;
}
this.loading = false;
});
},
emptycolumn() {
this.option.column = [];
}
};
}
};
</script>
<style>

39
src/views/basic/property/basicPropertyDetailsfrom.vue
Unescape View File

@ -290,6 +290,18 @@ export default {
methods: {
//修改
rowUpdate() {
console.log("this.dataFormlll>>>>>>>",this.dataForm);
//转换json
const filteredKeys = Object.keys(this.dataForm).filter(key => key.includes('value'));
filteredKeys.push('department');
filteredKeys.push('owmment');
const filteredObj = filteredKeys.reduce((result, key) => {
result[key] = this.dataForm[key];
return result;
}, {});
const jsonString = JSON.stringify(filteredObj);
this.dataForm.stringValue =jsonString;
console.log("this.dataFormlllxx>>>>>>>",this.dataForm);
this.$refs.myForm.validate(valid => {
if (valid) {
let row = this.dataForm
@ -298,10 +310,10 @@ export default {
type: "success",
message: "操作成功!"
});
let str = {
val: true
}
this.$emit("returnpda", str);
let str = {
val: false
}
this.$emit("returnproperty", str);
}, error => {
console.log(error);
});
@ -342,13 +354,15 @@ export default {
this.$refs.form.validate(valid => {
if (valid) {
//转换json
const filteredKeys = Object.keys(this.form).filter(key => key.includes('value'));
const filteredObj = filteredKeys.reduce((result, key) => {
result[key] = this.form[key];
return result;
}, {});
const jsonString = JSON.stringify(filteredObj);
this.form.stringValue =jsonString;
// const filteredKeys = Object.keys(this.form).filter(key => key.includes('value'));
// filteredKeys.push('department');
// filteredKeys.push('owmment');
// const filteredObj = filteredKeys.reduce((result, key) => {
// result[key] = this.form[key];
// return result;
// }, {});
// const jsonString = JSON.stringify(filteredObj);
// this.form.stringValue =jsonString;
if (!this.form.id) {
this.form.masterId = this.propertyformdata.id;
add(this.form).then(() => {
@ -365,12 +379,14 @@ export default {
});
} else {
update(this.form).then(() => {
console.log("操作成功>>>>>>>>>>>");
this.box = false;
this.onLoad(this.page);
this.$message({
type: 'success',
message: '操作成功!'
});
let str = {
val: false
}
@ -495,6 +511,7 @@ export default {
console.log('this.edt>>>>>>>>>>>>>>',this.edt);
this.dataForm = this.propertyformdata;
console.log("xx>>>>>>>>>", this.dataForm);
this.propertyoption = this.propertyoptiondata;
this.propertyoption.emptyBtn = false,//清空按钮
this.propertyoption.submitBtn = false //隐藏提交按钮

127
src/views/basic/property/basicPropertyform.vue
Unescape View File

@ -27,6 +27,7 @@ import { add, getDetail, update } from '@/api/basic/basicProperty';
import {getList} from '@/api/basic/basicPropertyfield'
import { getList as carrierData } from '@/api/basicdata/basicdataCarrier';
import { getDetail as getDetailfield } from '@/api/basic/basicPropertyfield';
import { getDeptLazyTree } from '@/api/system/dept';
export default {
name: "basicPropertyform",
// props: {
@ -49,6 +50,35 @@ name: "basicPropertyform",
},
data() {
return {
//部门树
treeDeptId: '',
treeData: [],
treeOption: {
nodeKey: 'id',
lazy: true,
treeLoad: function (node, resolve) {
const parentId = node.level === 0 ? 0 : node.data.id;
getDeptLazyTree(parentId).then(res => {
resolve(
res.data.data.map(item => {
return {
...item,
leaf: !item.hasChildren,
};
})
);
});
},
addBtn: false,
menu: false,
size: 'small',
props: {
labelText: '标题',
label: 'title',
value: 'value',
children: 'children',
},
},
//防止重复点击
isDis:false,
nodequery:{},
@ -190,13 +220,13 @@ name: "basicPropertyform",
},
rules: [{ required: true, message: '请选择填写类型!',trigger: 'blur'}],
change: (val) => {
console.log("this.option.column[5].children.column[3]>>",val);
console.log("this.option.column[5].children.column[3]>>xx",this.option.column[5].children);
this.option.column[5].children.column[3].disabled = true
if (!!val.value && val.value=='2'){
console.log("option>>>>>>",this.option);
this.option.column[5].children.column[3].disabled = false
}
// console.log("this.option.column[5].children.column[3]>>",val);
// console.log("this.option.column[5].children.column[3]>>xx",this.option.column[5].children);
// this.option.column[5].children.column[3].disabled = true
// if (!!val.value && val.value=='2'){
// console.log("option>>>>>>",this.option);
// this.option.column[5].children.column[3].disabled = false
// }
// console.log("this.option.column[5].children.column[3].disabled>>>>>>",this.option.column[5].children.column[3].disabled);
},
},
@ -218,7 +248,7 @@ name: "basicPropertyform",
label: '字典',
prop: "dictionaryCode",
type: 'select',
disabled:true,
disabled:false,
filterable: true,
dicUrl: '/api/blade-system/dict-biz/list',
props: {
@ -231,10 +261,13 @@ name: "basicPropertyform",
// value: 'dictKey',
// },
change: (val) => {
console.log("val>>>>>>>>x",val);
if (!!val.value){
console.log("val>>>>>>>>",val);
}
// console.log("this.option.column[5].children.column[3]>>",val);
// console.log("this.option.column[5].children.column[3]>>xx",this.option.column[5].children);
// this.option.column[5].children.column[3].disabled = false
// if (!!val.value && val.value!='2'){
// console.log("option>>>>>>",this.option);
// this.option.column[5].children.column[3].disabled = true
// }
},
},
{
@ -279,6 +312,61 @@ name: "basicPropertyform",
code: '2'
}]
},
// {
// width: 200,
// label: "所属部门",
// prop: "department",
// search: true,
// type: "tree",
// span:12,
// labelWidth:'120',
// dicUrl: '/api/blade-system/dept/lazy-tree?parentId=0',
// props:{
// label: "title",
// value: "id"
// },
// lazy: true,
// treeLoad: (node, resolve) => {
// // console.log(">>>>>>>>>>",node);
// let stop_level = 3;
// let level = node.level; // 0
// let data = node.data || {}
// let code = data.id;
// let list = [];
// let callback = () => {
// resolve((list || []).map(ele => {
// return Object.assign(ele, {
// leaf: level >= stop_level
// })
// }));
// }
// if (level == 0) {
// axios.get(`/api/blade-system/dept/lazy-tree?parentId=0`).then(res => {
// list = res.data.data;
// callback()
// })
// }
// if (level == 1) {
// axios.get(`/api/blade-system/dept/lazy-tree?parentId=${code}`).then(res => {
// list = res.data.data;
// callback()
// })
// } else if (level == 2) {
// axios.get(`/api/blade-system/dept/lazy-tree?parentId=${code}`).then(res => {
// list = res.data.data;
// callback()
// })
// } else if (level == 3) {
// axios.get(`/api/blade-system/dept/lazy-tree?parentId=${code}`).then(res => {
// list = res.data.data;
// callback()
// })
// } else {
// list = []
// callback()
// }
// }
// },
]
}
},
@ -296,18 +384,23 @@ name: "basicPropertyform",
done();
},
initData(){
let id = this.$route.query.data
// let id = this.$route.query.data
const data2 = decodeURIComponent(this.$route.query.data);
const data1 = JSON.parse(data2);
this.form = data1;
console.log("data>>>>>",data1);
let id =data1.id
//查询子表
let params ={
masterId: id
}
getDetail(id).then(res => {
const data = res.data.data;
this.form = data;
// getDetail(id).then(res => {
// const data = res.data.data;
// this.form = data;
getList(this.page.currentPage, this.page.pageSize,Object.assign(params, this.nodequery)).then(res => {
this.form.field = res.data.data.records;
});
});
//});
},
cancellation(){
this.$router.push({

Write Preview
Loading…
Cancel
Save