WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
wangzhijiang
2023-04-07 10:28:17 +08:00
parent 2c0f12a0eb c1be8a6ea8
commit 6c9cb24c21
2 changed files with 346 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/components/tableCollection/index.vue
+174 -88
View File
@@ -780,6 +780,7 @@
flag: '7' flag: '7'
} }
let paramscm = { let paramscm = {
paramsManifestId: paramsManifestid,
moduleFlag:'参数项收集清单' moduleFlag:'参数项收集清单'
} }
var jsonHead = [] var jsonHead = []
@@ -787,98 +788,183 @@
if (res.success) { if (res.success) {
if(res.result && res.result.length > 0){ if(res.result && res.result.length > 0){
jsonHead = res.result jsonHead = res.result
this.columns = []
let num = 0
this.content = []
let checkedList = []
jsonHead.forEach((res, index) => {
// console.log(res)
// 配置列
checkedList.push(res.dataIndex)
if (res.type) {
// console.log('配置')
this.columns.push({
dataIndex: res.db_field_name,
align: 'left',
ellipsis: true,
sorter: res.sort,
width: 600
})
num++
this.content.push(res)
this.columns[index].scopedSlots = {
customRender: 'detailClick',
title: 'titleName' + num
}
console.log( this.content," this.content this.content this.content this.content this.content")
// 非配置列
} else {
this.columns.push({
title: res.db_field_txt,
dataIndex: res.db_field_name,
align: 'left',
// ellipsis: true,
fixed: res.click5 ? 'left' : '',
sorter: res.sort,
width: 160
})
this.columns[index].scopedSlots = {
customRender: 'titleName'
}
if (res.db_field_name == 'nioNumber') {
this.columns[index].width = 120
}
if (res.click1) {
this.columns[index].scopedSlots = {
customRender: 'operationzr'
}
}
if (res.click2) {
this.columns[index].scopedSlots = {
customRender: 'ParameterDescription'
}
}
if (res.click3) {
this.columns[index].scopedSlots = {
customRender: 'paramsNameDescription'
}
}
if (res.click6) {
this.columns[index].scopedSlots = {
customRender: 'Operation'
}
}
if (res.click) {
// 工程接口人列表修改
this.columns[index].scopedSlots = {
customRender: 'operationbtn'
}
}
if (res.db_field_name == 'paramsName') {
this.columns[index].width = 300
this.columns[index].scopedSlots = {
customRender: 'paramsName'
}
}
}
if(res.isLock && res.isLock === '0'){
this.colIndexs.push(index)
}
})
this.columns = [...this.columns]
this.colIndexs.forEach((item)=>{
this.minWidthColumns.push([this.columns[item],500])
})
this.$emit('getcustomizeList',checkedList)
this.$forceUpdate()
}else{ }else{
getAction(this.url.tableHeader, params).then((val) => { getAction(this.url.tableHeader, params).then((val) => {
if (val.success) { if (val.success) {
jsonHead = val.result jsonHead = val.result
this.columns = []
let num = 0
this.content = []
let checkedList = []
jsonHead.forEach((res, index) => {
// console.log(res)
// 配置列
checkedList.push(res.dataIndex)
if (res.type) {
// console.log('配置')
this.columns.push({
dataIndex: res.db_field_name,
align: 'left',
ellipsis: true,
sorter: res.sort,
width: 600
})
num++
this.content.push(res)
this.columns[index].scopedSlots = {
customRender: 'detailClick',
title: 'titleName' + num
}
console.log( this.content," this.content this.content this.content this.content this.content")
// 非配置列
} else {
this.columns.push({
title: res.db_field_txt,
dataIndex: res.db_field_name,
align: 'left',
// ellipsis: true,
fixed: res.click5 ? 'left' : '',
sorter: res.sort,
width: 160
})
this.columns[index].scopedSlots = {
customRender: 'titleName'
}
if (res.db_field_name == 'nioNumber') {
this.columns[index].width = 120
}
if (res.click1) {
this.columns[index].scopedSlots = {
customRender: 'operationzr'
}
}
if (res.click2) {
this.columns[index].scopedSlots = {
customRender: 'ParameterDescription'
}
}
if (res.click3) {
this.columns[index].scopedSlots = {
customRender: 'paramsNameDescription'
}
}
if (res.click6) {
this.columns[index].scopedSlots = {
customRender: 'Operation'
}
}
if (res.click) {
// 工程接口人列表修改
this.columns[index].scopedSlots = {
customRender: 'operationbtn'
}
}
if (res.db_field_name == 'paramsName') {
this.columns[index].width = 300
this.columns[index].scopedSlots = {
customRender: 'paramsName'
}
}
}
if(res.isLock && res.isLock === '0'){
this.colIndexs.push(index)
}
})
this.columns = [...this.columns]
this.colIndexs.forEach((item)=>{
this.minWidthColumns.push([this.columns[item],500])
})
this.$emit('getcustomizeList',checkedList)
this.$forceUpdate()
} }
}) })
} }
this.columns = []
let num = 0
this.content = []
let checkedList = []
jsonHead.forEach((res, index) => {
// console.log(res)
// 配置列
checkedList.push(res.dataIndex)
if (res.type) {
// console.log('配置')
this.columns.push({
dataIndex: res.db_field_name,
align: 'left',
ellipsis: true,
sorter: res.sort,
width: 600
})
num++
this.content.push(res)
this.columns[index].scopedSlots = {
customRender: 'detailClick',
title: 'titleName' + num
}
console.log( this.content," this.content this.content this.content this.content this.content")
// 非配置列
} else {
this.columns.push({
title: res.db_field_txt,
dataIndex: res.db_field_name,
align: 'left',
// ellipsis: true,
fixed: res.click5 ? 'left' : '',
sorter: res.sort,
width: 160
})
this.columns[index].scopedSlots = {
customRender: 'titleName'
}
if (res.db_field_name == 'nioNumber') {
this.columns[index].width = 120
}
if (res.click1) {
this.columns[index].scopedSlots = {
customRender: 'operationzr'
}
}
if (res.click2) {
this.columns[index].scopedSlots = {
customRender: 'ParameterDescription'
}
}
if (res.click3) {
this.columns[index].scopedSlots = {
customRender: 'paramsNameDescription'
}
}
if (res.click6) {
this.columns[index].scopedSlots = {
customRender: 'Operation'
}
}
if (res.click) {
// 工程接口人列表修改
this.columns[index].scopedSlots = {
customRender: 'operationbtn'
}
}
if (res.db_field_name == 'paramsName') {
this.columns[index].width = 300
this.columns[index].scopedSlots = {
customRender: 'paramsName'
}
}
}
if(res.isLock && res.isLock === '0'){
this.colIndexs.push(index)
}
})
this.columns = [...this.columns]
this.colIndexs.forEach((item)=>{
this.minWidthColumns.push([this.columns[item],500])
})
this.$emit('getcustomizeList',checkedList)
this.$forceUpdate()
} }
}) })
}, },
@@ -1043,8 +1129,8 @@
if (Obj[item] instanceof Object && Obj[item].controlType !== undefined) { if (Obj[item] instanceof Object && Obj[item].controlType !== undefined) {
for (const key in Obj[item].paramsConfigData){ for (const key in Obj[item].paramsConfigData){
Obj[item].paramsConfigData[key].forEach((itemLi) => { Obj[item].paramsConfigData[key].forEach((itemLi) => {
console.log(item) // console.log(item)
console.log(this.currentPersonRole) // console.log(this.currentPersonRole)
if((this.currentPersonRole == 'homo' || this.currentPersonRole == 'admin') && item == 'referencesCol'){ if((this.currentPersonRole == 'homo' || this.currentPersonRole == 'admin') && item == 'referencesCol'){
itemLi.isLock = 0 itemLi.isLock = 0
}else{ }else{
jero-web/src/components/tableCollection/index1.vue
+172 -85
View File
@@ -573,101 +573,188 @@
paramsManifestId: paramsManifestid, paramsManifestId: paramsManifestid,
flag: '8' flag: '8'
} }
let paramscm = {
paramsManifestId: paramsManifestid,
moduleFlag:'上报库管理'
}
var jsonHead = [] var jsonHead = []
getAction(url, params).then((res) => { getAction(url, paramscm).then((res) => {
if (res.success) { if (res.success) {
if(res.result && res.result.length > 0){ if(res.result && res.result.length > 0){
jsonHead = res.result jsonHead = res.result
this.columns = []
let num = 0
this.content = []
let checkedList = []
jsonHead.forEach((res, index) => {
checkedList.push(res.dataIndex)
// 配置列
if (res.type) {
this.columns.push({
dataIndex: res.db_field_name,
align: 'left',
ellipsis: true,
sorter: res.sort,
width: 500
})
num++
this.content.push(res)
this.columns[index].scopedSlots = {
customRender: 'detailClick',
title: 'titleName' + num
}
// 非配置列
} else {
this.columns.push({
title: res.db_field_txt,
dataIndex: res.db_field_name,
align: 'left',
// ellipsis: true,
fixed: res.fixedLeft ? 'left' : '',
sorter: res.sort,
width: 160
})
this.columns[index].scopedSlots = {
customRender: 'titleName'
}
if (res.db_field_name == 'nioNumber') {
this.columns[index].width = 120
}
if (res.click) {
// 工程接口人列表修改
this.columns[index].scopedSlots = {
customRender: 'operationbtn'
}
}
if (res.click2) {
this.columns[index].scopedSlots = {
customRender: 'ParameterDescription'
}
}
if (res.click3) {
this.columns[index].scopedSlots = {
customRender: 'RemarkDescription'
}
}
if (res.click4) {
this.columns[index].scopedSlots = {
customRender: 'Operation'
}
}
if (res.db_field_name == 'paramsName') {
this.columns[index].width = 300
this.columns[index].ellipsis = false
this.columns[index].scopedSlots = {
customRender: 'paramsName'
}
}
}
if(res.type){
this.colIndexs.push(index)
}
})
this.isTrue = false
setTimeout(()=>{
this.isTrue = true
this.columns = [...this.columns]
this.colIndexs.forEach((item)=>{
this.minWidthColumns.push([this.columns[item],500])
this.$emit('getcustomizeList',checkedList)
})
},300)
console.log(this.columns)
}else{ }else{
getAction(this.url.tableHeader, params).then((val) => { getAction(this.url.tableHeader, params).then((val) => {
if (val.success) { if (val.success) {
jsonHead = val.result jsonHead = val.result
} this.columns = []
}) let num = 0
} this.content = []
this.columns = [] let checkedList = []
let num = 0 jsonHead.forEach((res, index) => {
this.content = [] checkedList.push(res.dataIndex)
let checkedList = [] // 配置列
jsonHead.forEach((res, index) => { if (res.type) {
checkedList.push(res.dataIndex) this.columns.push({
// 配置列 dataIndex: res.db_field_name,
if (res.type) { align: 'left',
this.columns.push({ ellipsis: true,
dataIndex: res.db_field_name, sorter: res.sort,
align: 'left', width: 500
ellipsis: true, })
sorter: res.sort, num++
width: 500 this.content.push(res)
}) this.columns[index].scopedSlots = {
num++ customRender: 'detailClick',
this.content.push(res) title: 'titleName' + num
this.columns[index].scopedSlots = { }
customRender: 'detailClick', // 非配置列
title: 'titleName' + num } else {
} this.columns.push({
// 非配置列 title: res.db_field_txt,
} else { dataIndex: res.db_field_name,
this.columns.push({ align: 'left',
title: res.db_field_txt, // ellipsis: true,
dataIndex: res.db_field_name, fixed: res.fixedLeft ? 'left' : '',
align: 'left', sorter: res.sort,
// ellipsis: true, width: 160
fixed: res.fixedLeft ? 'left' : '', })
sorter: res.sort, this.columns[index].scopedSlots = {
width: 160 customRender: 'titleName'
}) }
this.columns[index].scopedSlots = { if (res.db_field_name == 'nioNumber') {
customRender: 'titleName' this.columns[index].width = 120
} }
if (res.db_field_name == 'nioNumber') { if (res.click) {
this.columns[index].width = 120 // 工程接口人列表修改
} this.columns[index].scopedSlots = {
if (res.click) { customRender: 'operationbtn'
// 工程接口人列表修改 }
this.columns[index].scopedSlots = { }
customRender: 'operationbtn' if (res.click2) {
} this.columns[index].scopedSlots = {
} customRender: 'ParameterDescription'
if (res.click2) { }
this.columns[index].scopedSlots = { }
customRender: 'ParameterDescription' if (res.click3) {
} this.columns[index].scopedSlots = {
} customRender: 'RemarkDescription'
if (res.click3) { }
this.columns[index].scopedSlots = { }
customRender: 'RemarkDescription' if (res.click4) {
} this.columns[index].scopedSlots = {
} customRender: 'Operation'
if (res.click4) { }
this.columns[index].scopedSlots = { }
customRender: 'Operation' if (res.db_field_name == 'paramsName') {
} this.columns[index].width = 300
} this.columns[index].ellipsis = false
if (res.db_field_name == 'paramsName') { this.columns[index].scopedSlots = {
this.columns[index].width = 300 customRender: 'paramsName'
this.columns[index].ellipsis = false }
this.columns[index].scopedSlots = { }
customRender: 'paramsName' }
}
}
}
if(res.type){ if(res.type){
this.colIndexs.push(index) this.colIndexs.push(index)
} }
}) })
this.isTrue = false this.isTrue = false
setTimeout(()=>{ setTimeout(()=>{
this.isTrue = true this.isTrue = true
this.columns = [...this.columns] this.columns = [...this.columns]
this.colIndexs.forEach((item)=>{ this.colIndexs.forEach((item)=>{
this.minWidthColumns.push([this.columns[item],500]) this.minWidthColumns.push([this.columns[item],500])
this.$emit('getcustomizeList',checkedList) this.$emit('getcustomizeList',checkedList)
}) })
},300) },300)
console.log(this.columns) console.log(this.columns)
}
})
}
} }
}) })
}, },