Merge remote-tracking branch 'origin/master'

lohir

2024-10-23 d95b36a88357d018f76d926e9074c521eb8335a7

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

@@ -6,7 +6,6 @@
      size="small"
      :inline="true"
      v-show="showSearch"
      label-width="100px"
    >
      <el-form-item label="考核对象" prop="unitId">
        <el-select
@@ -50,11 +49,11 @@
        <el-button
          type="primary"
          icon="el-icon-search"
          size="mini"
          size="small"
          @click="handleQuery"
          >搜索</el-button
        >
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
        <el-button icon="el-icon-refresh" size="small" @click="resetQuery"
          >重置</el-button
        >
      </el-form-item>
@@ -71,7 +70,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 +81,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,14 +92,14 @@
          @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">
    <el-row v-if="checkResultList && checkResultList.length > 0" v-loading="loading">
      <el-col
        :xl="8"
        :lg="8"
@@ -135,7 +134,7 @@
              style="float: right"
              @click="handlePublish(item)"
              v-show="item.publish != 1"
              v-hasPermi="['result:contract:publish']"
              v-hasPermi="['contract:result:publish']"
              >确认发布</el-button
            >
            <el-button
@@ -144,13 +143,14 @@
              style="float: right"
              disabled
              v-show="item.publish == 1"
              v-hasPermi="['result:contract:publish']"
              v-hasPermi="['contract:result:publish']"
              >已发布</el-button
            >
          </div>
        </el-card>
      </el-col>
    </el-row>
    <el-empty v-else description="暂无数据"></el-empty>

    <pagination
      v-show="total > 0"
@@ -172,8 +172,8 @@
        placeholder="请为该单位打分"
      />
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitManualScore">确 定</el-button>
        <el-button @click="cancelManualScore">取 消</el-button>
        <el-button type="primary" @click="submitManualScore">确 定</el-button>
      </div>
    </el-dialog>

@@ -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>
@@ -231,8 +224,8 @@
      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
        <el-button type="primary" @click="submitForm">确 定</el-button>
      </div>
    </el-dialog>
  </div>
@@ -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;