修改参数收集增加数据

2023-02-01 16:12:21 +08:00
parent 53c16e9bf0
commit 7e606d48f5
3 changed files with 46 additions and 16 deletions
@@ -98,14 +98,16 @@
              </div>
            </div>
          </div>
+          <span v-if="currentPersonRole == 'dre'">
          <div @click="addconfig" class='addicon'
               v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
            <a-icon type="plus"/>
          </div>
          <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"/>
          </div>
+          </span>
        </div>
      </div>
      <!--      默认值-->
@@ -134,14 +136,16 @@
              </div>
            </div>
          </div>
+          <span v-if="currentPersonRole == 'dre'">
          <div @click="addconfig" class='addicon'
               v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
            <a-icon type="plus"/>
          </div>
          <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"/>
          </div>
+          </span>
        </div>
      </div>
      <!--      纯下拉单选-->
@@ -162,14 +166,16 @@
              </a-select>
            </div>
          </div>
+          <span v-if="currentPersonRole == 'dre'">
          <div @click="addconfig" class='addicon'
               v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
            <a-icon type="plus"/>
          </div>
          <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"/>
          </div>
+          </span>
        </div>
      </div>
      <!--      纯下拉多选-->
@@ -192,14 +198,16 @@
              </a-select>
            </div>
          </div>
+          <span v-if="currentPersonRole == 'dre'">
          <div @click="addconfig" class='addicon'
               v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
            <a-icon type="plus"/>
          </div>
          <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"/>
          </div>
+          </span>
        </div>
      </div>
      <!--      纯附件-->
@@ -216,14 +224,16 @@
              </a-button>
            </div>
          </div>
+          <span v-if="currentPersonRole == 'dre'">
          <div @click="addconfig" class='addicon'
               v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
            <a-icon type="plus"/>
          </div>
          <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"/>
          </div>
+          </span>
        </div>
      </div>
      <!--      文本+下拉单选-->
@@ -335,14 +345,16 @@
              </div>
            </div>
          </div>
+          <span v-if="currentPersonRole == 'dre'">
          <div @click="addconfig" class='addicon'
               v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
            <a-icon type="plus"/>
          </div>
          <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"/>
          </div>
+          </span>
        </div>
      </div>
      <!--      文本+下拉多选-->
@@ -456,14 +468,16 @@
              </div>
            </div>
          </div>
+          <span v-if="currentPersonRole == 'dre'">
          <div @click="addconfig" class='addicon'
               v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
            <a-icon type="plus"/>
          </div>
          <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"/>
          </div>
+          </span>
        </div>
      </div>
      <!--      文本+附件-->
@@ -570,14 +584,16 @@
              </a-button>
            </div>
          </div>
+          <span v-if="currentPersonRole == 'dre'">
          <div @click="addconfig" class='addicon'
               v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
            <a-icon type="plus"/>
          </div>
          <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"/>
          </div>
+          </span>
        </div>
      </div>
      <!--      下拉单选+附件-->
@@ -607,14 +623,16 @@
            </div>
            <!--            </div>-->
          </div>
+          <span v-if="currentPersonRole == 'dre'">
          <div @click="addconfig" class='addicon'
               v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
            <a-icon type="plus"/>
          </div>
          <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"/>
          </div>
+          </span>
        </div>
      </div>
      <!--      下拉多选+附件-->
@@ -646,14 +664,16 @@
            </div>
            <!--            </div>-->
          </div>
+          <span v-if="currentPersonRole == 'dre'">
          <div @click="addconfig" class='addicon'
               v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
            <a-icon type="plus"/>
          </div>
          <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"/>
          </div>
+          </span>
        </div>
      </div>
      <!--      文本+下拉单选+附件-->
@@ -774,14 +794,17 @@
              </a-button>
            </div>
          </div>
-          <div @click="addconfig" class='addicon'
-               v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
+          <span v-if="currentPersonRole == 'dre'">
+            <div @click="addconfig" class='addicon'
+                 v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
            <a-icon type="plus"/>
          </div>
          <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"/>
          </div>
+          </span>
+
        </div>
      </div>

@@ -816,6 +839,10 @@
        type: Array,
        default: [],
        require: true
+      },
+      currentPersonRole: {
+        type: String,
+        default: ''
      }
    },
    data() {
@@ -839,6 +866,7 @@
      this.paramsConfigData = this.detailDate.paramsConfigData
      let name = []
      console.log(this.detailDate)
+      console.log(this.currentPersonRole)
      // this.columName.forEach(item => {
      //   if (item.db_field_name && item.db_field_name != '') {
      //     name.push(item.db_field_name)
@@ -1091,12 +1119,13 @@
    display: inline-block;
    //margin-left: -34px;
    margin-top: 8px;
+    margin-right: 5px;
    cursor: pointer;
  }

  .delicon {
    display: inline-block;
-    margin-left: 5px;
+    /*margin-left: 5px;*/
    margin-top: 8px;
    cursor: pointer;
  }
@@ -75,6 +75,7 @@

        <span slot="detailClick" slot-scope="text,record">
          <collection-type :detailDate='text' :recordList = 'record' :columName='content'
+                           :currentPersonRole="currentPersonRole"
                           @consolidateData="consolidateData"
                           @collectionForm='collectionForm'/>
        </span>
@@ -1408,10 +1408,10 @@
      },
      Updateparametercolumn() {
        let data = JSON.parse(JSON.stringify(this.$refs.CollectionTabel.dataSource))
-        console.log(data)
        let referencesCol = []
        let postDate = []
        let colunmnFlag = ''
+        this.colunmnFlag = false
        data.forEach((item, index) => {
          if (!item.referencesCol) {
            this.colunmnFlag = true
@@ -1433,7 +1433,7 @@
              if (referencesCol[i][itemIn[j]] instanceof Object && !(referencesCol[i][itemIn[j]] instanceof Array)) {
                postDateobj[itemIn[j]] = referencesCol[i][itemIn[j]]
                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(',')
                  }
                  if (referencesCol[i][itemIn[j]].list[k].type == 'text' && referencesCol[i][itemIn[j]].list[k].dataValue !== null) {