Merge remote-tracking branch 'origin/master'

xiangpei

2024-08-24 d196157ca3ca298c70a0bfe62fb2ea67e0200ccf

Merge remote-tracking branch 'origin/master'

 src/api/platform/contract-result.js

@@ -10,9 +10,9 @@
}

// 查询考核结果详情
export function resultRecord(id) {
export function resultRecord(id, contractId) {
  return request({
    url: '/contract/result/record/list?resultId=' + id,
    url: '/contract/result/record/list?resultId=' + id + '&contractId=' + contractId,
    method: 'get'
  })
}

 src/views/system/contract/contract-result/index.vue

@@ -71,7 +71,7 @@
      <!--          v-hasPermi="['system:checkResult:add']"-->
      <!--        >新增</el-button>-->
      <!--      </el-col>-->
      <el-col :span="1.5">
      <!-- <el-col :span="1.5">
        <el-button
          type="danger"
          plain
@@ -82,8 +82,8 @@
          @click="handleDelete"
          >删除</el-button
        >
      </el-col>
      <el-col :span="1.5">
      </el-col> -->
      <!-- <el-col :span="1.5">
        <el-button
          type="warning"
          plain
@@ -93,11 +93,11 @@
          @click="handleExport"
          >导出</el-button
        >
      </el-col>
      <right-toolbar
      </el-col> -->
      <!-- <right-toolbar
        :showSearch.sync="showSearch"
        @queryTable="getList"
      ></right-toolbar>
      ></right-toolbar> -->
    </el-row>

    <el-row v-loading="loading">
@@ -214,14 +214,7 @@
          width="300"
        >
        </el-table-column>
        <el-table-column
          label="扣减方式"
          align="center"
          prop="deductCategory"
          width="180px"
        >
        </el-table-column>
        <el-table-column prop="num" label="量值"> </el-table-column>
        <el-table-column prop="num" label="次数"> </el-table-column>
        <el-table-column prop="score" label="扣分"> </el-table-column>
      </el-table>
    </el-dialog>
@@ -365,7 +358,7 @@
      this.manualScoreOpen = true;
    },
    handleDetail(row) {
      resultRecord(row.id).then((res) => {
      resultRecord(row.id, row.contractId).then((res) => {
        this.tableData = res.rows;
      });
      this.detail = row;