Merge remote-tracking branch 'origin/master'

k94314517

2024-10-17 e93b1dddf4f99f83d05688baceeb59cacdd82ec8

 admin/src/views/operation/serviceCar/apprConfig.vue

@@ -154,7 +154,7 @@
                <span>部门主管</span>
              </div>
              <div class="config_data_item_reviewed_r">
                <span>被访人的</span>
                <span>申请人的</span>
                <el-select
                  v-model="apprList[activeIndex].objLevel"
                  placeholder="请选择"
@@ -349,6 +349,8 @@
                  companyName: i.companyName
                }
              })
            }else{
              item.objIds = []
            }
          })
          this.apprList = arr
@@ -387,7 +389,7 @@
      this.activeIndex = 0
    },
    handleAddAppr () {
      this.apprList.splice(this.apprList.length - 1, 0, { remark: '审批人', active: false, type: 0, objIds: [] })
      this.apprList.splice(this.apprList.length - 1, 0, { remark: '审批人',approveType: 0, active: false, type: 0, objIds: [] })
      // this.apprList.push({ remark: '审批人', active: false, type: '0' })
    },

@@ -689,9 +691,18 @@
  }
  .transfer {
    height: 600px;
    width: 100%;
    display: flex;
    justify-content: center;
    align-items: center;
    ::v-deep .el-transfer-panel{
      flex: 1;
      height: 100%;
    }
    ::v-deep .el-transfer-panel__body {
      height: 500px;
    }

    ::v-deep .el-transfer-panel__list.is-filterable {
      height: 480px;
    }