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

jiangping

2024-12-27 5506edbe54883b31db3cc8e4a1d9d0795a18a3c9

 company/src/components/business/modification.vue

@@ -10,6 +10,7 @@
        <el-table v-if="form.solutionList && form.solutionList.length>0"
            :data="form.solutionList"
            border
            border
            style="width: 100%">
            <el-table-column
                label="序号"
@@ -23,8 +24,7 @@
                align="center"
                label="保险方案">
                <template slot-scope="scope">
<!--                    :value="{ id:item.id, baseId: item.baseId }"-->
                    <el-select v-model="scope.row.solution.id" @change="changeSolution($event, scope.$index)" placeholder="请选择">
                    <el-select v-model="scope.row.solution.id" :disabled="scope.row.disabled" filterable @change="changeSolution($event, scope.$index)" placeholder="请选择">
                        <el-option
                            v-for="item in programme"
                            :key="item.id"
@@ -38,7 +38,7 @@
              align="center"
              label="委托商户">
            <template slot-scope="scope">
              <el-select :ref="'shopSelect'+scope.$index" :disabled="scope.row.solution.type ==1" v-model="scope.row.shopId" clearable value-key="id" placeholder="请选择">
              <el-select :ref="'shopSelect'+scope.$index" disabled v-model="scope.row.shopId" clearable value-key="id" placeholder="请选择">
                <el-option
                    v-for="item in shops"
                    :key="item.id"
@@ -54,6 +54,14 @@
                <template slot-scope="{row}">
                    <el-checkbox :true-label="1" :false-label="0" disabled  v-model="row.canAdd">加保</el-checkbox>
                    <el-checkbox :true-label="1" :false-label="0"  disabled   v-model="row.canReduce">减保</el-checkbox>
                </template>
            </el-table-column>
            <el-table-column
                align="center"
                label="签署状态">
                <template slot-scope="{row}">
                    <template v-if="row.signStatus === 0">待签章</template>
                    <template v-else-if="row.signStatus === 1">已签章</template>
                </template>
            </el-table-column>
            <el-table-column
@@ -116,9 +124,10 @@
        if (item.id === e) {
          baseId = item.baseId
          this.form.solutionList[index].solution.type = item.type
          if(item.type == 1){
          // console.log(item.type)
          // if(item.type == 1){
            this.form.solutionList[index].shopId =item.shopId
          }
          // }
        }
      })

@@ -163,18 +172,20 @@
        .then(resa => {
          resa.forEach(item => {
            this.form.solutionList.push({
              disabled: true,
              solution: { id: item.solutionId, baseId: item.solutionBaseId,type:item.solutionType },
              shopId: item.shopId,
              canAdd: 1,
              canReduce: 1
              canReduce: 1,
              signStatus: item.signStatus
            })
          })
          console.log(this.form.solutionList)
          that.visible = true
        })
    },
    add () {
      this.form.solutionList.push({
        disabled: false,
        solution: { id: null, baseId: null },
        shopId: null,
        canAdd: 1,