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

k94314517

2024-04-07 3e72240f9926463bba8d2d5cbec743dbcdcf9bd3

 company/src/components/business/modification.vue

@@ -7,7 +7,7 @@
        @confirm="confirm"
    >
        <el-button type="primary" style="margin-bottom: 15px;" @click="add">添加</el-button>
        <el-table
        <el-table v-if="form.solutionList && form.solutionList.length>0"
            :data="form.solutionList"
            border
            style="width: 100%">
@@ -38,7 +38,7 @@
              align="center"
              label="委托商户">
            <template slot-scope="scope">
              <el-select  v-model="scope.row.shopId" clearable="true" value-key="id" placeholder="请选择">
              <el-select :ref="'shopSelect'+scope.$index" :disabled="scope.row.solution.type ==1" v-model="scope.row.shopId" clearable value-key="id" placeholder="请选择">
                <el-option
                    v-for="item in shops"
                    :key="item.id"
@@ -52,8 +52,8 @@
                align="center"
                label="加减保功能">
                <template slot-scope="{row}">
                    <el-checkbox :true-label="1" :false-label="0" v-model="row.canAdd">加保</el-checkbox>
                    <el-checkbox :true-label="1" :false-label="0" v-model="row.canReduce">减保</el-checkbox>
                    <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
@@ -86,8 +86,9 @@
        id: null,
        solutionList: [
          {
            solution: { id: null, baseId: null },
            solution: { id: null, baseId: null,type:0 },
            canAdd: 0,
            shopId:null,
            canReduce: 0
          }
        ]
@@ -114,8 +115,13 @@
      this.programme.forEach(item => {
        if (item.id === e) {
          baseId = item.baseId
          this.form.solutionList[index].solution.type = item.type
          if(item.type == 1){
            this.form.solutionList[index].shopId =item.shopId
          }
        }
      })

      this.form.solutionList[index].solution.baseId = baseId
    },
    confirm () {
@@ -152,17 +158,18 @@
        this.form[key] = target[key]
      }
      this.getAll()
      this.form.solutionList=[]
      listForCompany({ companyId: target.id })
        .then(resa => {
          that.form.solutionList = resa.map(item => {
            return {
              solution: { id: item.solutionId, baseId: item.solutionBaseId },
          resa.forEach(item => {
            this.form.solutionList.push({
              solution: { id: item.solutionId, baseId: item.solutionBaseId,type:item.solutionType },
              shopId: item.shopId,
              canAdd: item.canAdd,
              canReduce: item.canReduce
            }
              canAdd: 1,
              canReduce: 1
            })
          })
          console.log(that.form.solutionList)
          console.log(this.form.solutionList)
          that.visible = true
        })
    },
@@ -170,8 +177,8 @@
      this.form.solutionList.push({
        solution: { id: null, baseId: null },
        shopId: null,
        canAdd: '',
        canReduce: ''
        canAdd: 1,
        canReduce: 1
      })
    },
    dele (index) {