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

修改参数收集增加数据

Browse Source
This commit is contained in:
sunFlower
2023-02-01 16:12:21 +08:00
parent 53c16e9bf0
commit 7e606d48f5
3 changed files with 46 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/components/CollectionType/index.vue
+43 -14
View File
@@ -98,14 +98,16 @@
</div> </div>
</div> </div>
</div> </div>
<span v-if="currentPersonRole == 'dre'">
<div @click="addconfig" class='addicon' <div @click="addconfig" class='addicon'
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9"> v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
<a-icon type="plus"/> <a-icon type="plus"/>
</div> </div>
<div @click="delconfig(item)" class='delicon' <div @click="delconfig(item)" class='delicon'
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0"> v-if="Object.keys(detailDate.paramsConfigData).length > 1">
<a-icon type="minus"/> <a-icon type="minus"/>
</div> </div>
</span>
</div> </div>
</div> </div>
<!-- 默认值--> <!-- 默认值-->
@@ -134,14 +136,16 @@
</div> </div>
</div> </div>
</div> </div>
<span v-if="currentPersonRole == 'dre'">
<div @click="addconfig" class='addicon' <div @click="addconfig" class='addicon'
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9"> v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
<a-icon type="plus"/> <a-icon type="plus"/>
</div> </div>
<div @click="delconfig(item)" class='delicon' <div @click="delconfig(item)" class='delicon'
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0"> v-if="Object.keys(detailDate.paramsConfigData).length > 1">
<a-icon type="minus"/> <a-icon type="minus"/>
</div> </div>
</span>
</div> </div>
</div> </div>
<!-- 纯下拉单选--> <!-- 纯下拉单选-->
@@ -162,14 +166,16 @@
</a-select> </a-select>
</div> </div>
</div> </div>
<span v-if="currentPersonRole == 'dre'">
<div @click="addconfig" class='addicon' <div @click="addconfig" class='addicon'
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9"> v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
<a-icon type="plus"/> <a-icon type="plus"/>
</div> </div>
<div @click="delconfig(item)" class='delicon' <div @click="delconfig(item)" class='delicon'
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0"> v-if="Object.keys(detailDate.paramsConfigData).length > 1">
<a-icon type="minus"/> <a-icon type="minus"/>
</div> </div>
</span>
</div> </div>
</div> </div>
<!-- 纯下拉多选--> <!-- 纯下拉多选-->
@@ -192,14 +198,16 @@
</a-select> </a-select>
</div> </div>
</div> </div>
<span v-if="currentPersonRole == 'dre'">
<div @click="addconfig" class='addicon' <div @click="addconfig" class='addicon'
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9"> v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
<a-icon type="plus"/> <a-icon type="plus"/>
</div> </div>
<div @click="delconfig(item)" class='delicon' <div @click="delconfig(item)" class='delicon'
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0"> v-if="Object.keys(detailDate.paramsConfigData).length > 1">
<a-icon type="minus"/> <a-icon type="minus"/>
</div> </div>
</span>
</div> </div>
</div> </div>
<!-- 纯附件--> <!-- 纯附件-->
@@ -216,14 +224,16 @@
</a-button> </a-button>
</div> </div>
</div> </div>
<span v-if="currentPersonRole == 'dre'">
<div @click="addconfig" class='addicon' <div @click="addconfig" class='addicon'
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9"> v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
<a-icon type="plus"/> <a-icon type="plus"/>
</div> </div>
<div @click="delconfig(item)" class='delicon' <div @click="delconfig(item)" class='delicon'
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0"> v-if="Object.keys(detailDate.paramsConfigData).length > 1">
<a-icon type="minus"/> <a-icon type="minus"/>
</div> </div>
</span>
</div> </div>
</div> </div>
<!-- 文本+下拉单选--> <!-- 文本+下拉单选-->
@@ -335,14 +345,16 @@
</div> </div>
</div> </div>
</div> </div>
<span v-if="currentPersonRole == 'dre'">
<div @click="addconfig" class='addicon' <div @click="addconfig" class='addicon'
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9"> v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
<a-icon type="plus"/> <a-icon type="plus"/>
</div> </div>
<div @click="delconfig(item)" class='delicon' <div @click="delconfig(item)" class='delicon'
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0"> v-if="Object.keys(detailDate.paramsConfigData).length > 1">
<a-icon type="minus"/> <a-icon type="minus"/>
</div> </div>
</span>
</div> </div>
</div> </div>
<!-- 文本+下拉多选--> <!-- 文本+下拉多选-->
@@ -456,14 +468,16 @@
</div> </div>
</div> </div>
</div> </div>
<span v-if="currentPersonRole == 'dre'">
<div @click="addconfig" class='addicon' <div @click="addconfig" class='addicon'
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9"> v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
<a-icon type="plus"/> <a-icon type="plus"/>
</div> </div>
<div @click="delconfig(item)" class='delicon' <div @click="delconfig(item)" class='delicon'
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0"> v-if="Object.keys(detailDate.paramsConfigData).length > 1">
<a-icon type="minus"/> <a-icon type="minus"/>
</div> </div>
</span>
</div> </div>
</div> </div>
<!-- 文本+附件--> <!-- 文本+附件-->
@@ -570,14 +584,16 @@
</a-button> </a-button>
</div> </div>
</div> </div>
<span v-if="currentPersonRole == 'dre'">
<div @click="addconfig" class='addicon' <div @click="addconfig" class='addicon'
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9"> v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
<a-icon type="plus"/> <a-icon type="plus"/>
</div> </div>
<div @click="delconfig(item)" class='delicon' <div @click="delconfig(item)" class='delicon'
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0"> v-if="Object.keys(detailDate.paramsConfigData).length > 1">
<a-icon type="minus"/> <a-icon type="minus"/>
</div> </div>
</span>
</div> </div>
</div> </div>
<!-- 下拉单选+附件--> <!-- 下拉单选+附件-->
@@ -607,14 +623,16 @@
</div> </div>
<!-- </div>--> <!-- </div>-->
</div> </div>
<span v-if="currentPersonRole == 'dre'">
<div @click="addconfig" class='addicon' <div @click="addconfig" class='addicon'
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9"> v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
<a-icon type="plus"/> <a-icon type="plus"/>
</div> </div>
<div @click="delconfig(item)" class='delicon' <div @click="delconfig(item)" class='delicon'
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0"> v-if="Object.keys(detailDate.paramsConfigData).length > 1">
<a-icon type="minus"/> <a-icon type="minus"/>
</div> </div>
</span>
</div> </div>
</div> </div>
<!-- 下拉多选+附件--> <!-- 下拉多选+附件-->
@@ -646,14 +664,16 @@
</div> </div>
<!-- </div>--> <!-- </div>-->
</div> </div>
<span v-if="currentPersonRole == 'dre'">
<div @click="addconfig" class='addicon' <div @click="addconfig" class='addicon'
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9"> v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
<a-icon type="plus"/> <a-icon type="plus"/>
</div> </div>
<div @click="delconfig(item)" class='delicon' <div @click="delconfig(item)" class='delicon'
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0"> v-if="Object.keys(detailDate.paramsConfigData).length > 1">
<a-icon type="minus"/> <a-icon type="minus"/>
</div> </div>
</span>
</div> </div>
</div> </div>
<!-- 文本+下拉单选+附件--> <!-- 文本+下拉单选+附件-->
@@ -774,14 +794,17 @@
</a-button> </a-button>
</div> </div>
</div> </div>
<div @click="addconfig" class='addicon' <span v-if="currentPersonRole == 'dre'">
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9"> <div @click="addconfig" class='addicon'
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
<a-icon type="plus"/> <a-icon type="plus"/>
</div> </div>
<div @click="delconfig(item)" class='delicon' <div @click="delconfig(item)" class='delicon'
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0"> v-if="Object.keys(detailDate.paramsConfigData).length > 1">
<a-icon type="minus"/> <a-icon type="minus"/>
</div> </div>
</span>
</div> </div>
</div> </div>
@@ -816,6 +839,10 @@
type: Array, type: Array,
default: [], default: [],
require: true require: true
},
currentPersonRole: {
type: String,
default: ''
} }
}, },
data() { data() {
@@ -839,6 +866,7 @@
this.paramsConfigData = this.detailDate.paramsConfigData this.paramsConfigData = this.detailDate.paramsConfigData
let name = [] let name = []
console.log(this.detailDate) console.log(this.detailDate)
console.log(this.currentPersonRole)
// this.columName.forEach(item => { // this.columName.forEach(item => {
// if (item.db_field_name && item.db_field_name != '') { // if (item.db_field_name && item.db_field_name != '') {
// name.push(item.db_field_name) // name.push(item.db_field_name)
@@ -1091,12 +1119,13 @@
display: inline-block; display: inline-block;
//margin-left: -34px; //margin-left: -34px;
margin-top: 8px; margin-top: 8px;
margin-right: 5px;
cursor: pointer; cursor: pointer;
} }
.delicon { .delicon {
display: inline-block; display: inline-block;
margin-left: 5px; /*margin-left: 5px;*/
margin-top: 8px; margin-top: 8px;
cursor: pointer; cursor: pointer;
} }
jero-web/src/components/tableCollection/index.vue
+1
View File
@@ -75,6 +75,7 @@
<span slot="detailClick" slot-scope="text,record"> <span slot="detailClick" slot-scope="text,record">
<collection-type :detailDate='text' :recordList = 'record' :columName='content' <collection-type :detailDate='text' :recordList = 'record' :columName='content'
:currentPersonRole="currentPersonRole"
@consolidateData="consolidateData" @consolidateData="consolidateData"
@collectionForm='collectionForm'/> @collectionForm='collectionForm'/>
</span> </span>
jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+2 -2
View File
@@ -1408,10 +1408,10 @@
}, },
Updateparametercolumn() { Updateparametercolumn() {
let data = JSON.parse(JSON.stringify(this.$refs.CollectionTabel.dataSource)) let data = JSON.parse(JSON.stringify(this.$refs.CollectionTabel.dataSource))
console.log(data)
let referencesCol = [] let referencesCol = []
let postDate = [] let postDate = []
let colunmnFlag = '' let colunmnFlag = ''
this.colunmnFlag = false
data.forEach((item, index) => { data.forEach((item, index) => {
if (!item.referencesCol) { if (!item.referencesCol) {
this.colunmnFlag = true this.colunmnFlag = true
@@ -1433,7 +1433,7 @@
if (referencesCol[i][itemIn[j]] instanceof Object && !(referencesCol[i][itemIn[j]] instanceof Array)) { if (referencesCol[i][itemIn[j]] instanceof Object && !(referencesCol[i][itemIn[j]] instanceof Array)) {
postDateobj[itemIn[j]] = referencesCol[i][itemIn[j]] postDateobj[itemIn[j]] = referencesCol[i][itemIn[j]]
for (let k = 0; k < referencesCol[i][itemIn[j]].list.length; k++) { for (let k = 0; k < referencesCol[i][itemIn[j]].list.length; k++) {
if (referencesCol[i][itemIn[j]].list[k].type == 'pull_more') { if (referencesCol[i][itemIn[j]].list[k].type == 'pull_more' && referencesCol[i][itemIn[j]].list[k].dataValue instanceof Array) {
referencesCol[i][itemIn[j]].list[k].dataValue = referencesCol[i][itemIn[j]].list[k].dataValue.join(',') referencesCol[i][itemIn[j]].list[k].dataValue = referencesCol[i][itemIn[j]].list[k].dataValue.join(',')
} }
if (referencesCol[i][itemIn[j]].list[k].type == 'text' && referencesCol[i][itemIn[j]].list[k].dataValue !== null) { if (referencesCol[i][itemIn[j]].list[k].type == 'text' && referencesCol[i][itemIn[j]].list[k].dataValue !== null) {