Merge remote-tracking branch 'origin/master'

fuliqi

2024-09-06 9e8d1bd0b6fb495920921214775b84d490e032a3

 src/views/system/contract/score/index.vue

@@ -25,19 +25,15 @@
    <el-row :gutter="10" class="mb8">
      <el-col :span="1.5">
        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
          v-hasPermi="['platform:score:add']">新增</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
          v-hasPermi="['platform:score:edit']">修改</el-button>
          v-hasPermi="['contract:score:add']">新增</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
          v-hasPermi="['platform:score:remove']">删除</el-button>
          v-hasPermi="['contract:score:remove']">删除</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
          v-hasPermi="['platform:score:export']">导出</el-button>
          v-hasPermi="['contract:score:export']">导出</el-button>
      </el-col>
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>
@@ -48,7 +44,7 @@
      <el-table-column label="考核合同" align="center" prop="contractName"/>
      <el-table-column label="考核规则" align="center" prop="ruleName" :show-overflow-tooltip="true" />
      <el-table-column label="扣减方式" align="center" prop="deductCategory"/>
      <el-table-column label="考核指标" align="center" prop="num"/>
      <el-table-column label="超期量值" align="center" prop="num"/>
      <el-table-column label="考核扣分" align="center" prop="score"/>
      <el-table-column label="创建时间" align="center" prop="createTime" width="180px"/>
      <el-table-column label="审核状态" align="center" prop="auditingStatus">
@@ -63,10 +59,10 @@
        <template slot-scope="scope">
          <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)">详情</el-button>
          <el-button size="mini" type="text" icon="el-icon-s-check" @click="handleAuditing(scope.row)"
            v-hasPermi="['default:audit']" v-if="scope.row.auditingStatus === '待审核'">审核</el-button>
            v-hasPermi="['contract:score:audit']" v-if="scope.row.auditingStatus === '待审核'">审核</el-button>
          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
            v-if="scope.row.auditingStatus === '待审核'" v-hasPermi="['system:auditing:edit']">修改</el-button>
          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
             v-hasPermi="['contract:score:edit']">修改</el-button>
          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['contract:score:remove']">删除</el-button>
        </template>
      </el-table-column>
    </el-table>
@@ -84,7 +80,7 @@
        <el-form-item label="运维考核规则">
          <el-input v-model="auditingForm.ruleName" type="textarea" autosize disabled />
        </el-form-item>
        <el-form-item label="运维考核指标">
        <el-form-item label="运维超期量值">
          <el-input v-model="auditingForm.num" disabled />
        </el-form-item>
        <el-form-item label="运维考核扣分">
@@ -99,8 +95,8 @@
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitAuditing">确 定</el-button>
        <el-button @click="closeAuditing">取 消</el-button>
        <el-button type="primary" @click="submitAuditing">确 定</el-button>
      </div>
    </el-dialog>

@@ -151,8 +147,8 @@
        </el-form-item>
      </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>

@@ -164,7 +160,7 @@
            <el-form-item label="考核单位：">{{ view.unitName }}</el-form-item>
            <el-form-item label="考核合同：">{{ view.contractName }} </el-form-item>
            <el-form-item label="考核规则：">{{ view.ruleName }} </el-form-item>
            <el-form-item label="考核指标：">{{ view.num }} </el-form-item>
            <el-form-item label="超期量值：">{{ view.num }} </el-form-item>
            <el-form-item label="考核扣分：">{{ view.score }} </el-form-item>
            <el-form-item label="创建人：">{{ view.createUser }} </el-form-item>
            <el-form-item label="创建时间：">{{ view.createTime }} </el-form-item>
@@ -289,6 +285,7 @@
      let item = this.$refs['cascader'].getCheckedNodes()[0].data;
      this.calcObj = item;
      this.form.contractId = item.contractId;
      this.form.ruleName = item.ruleName + " / " + item.label;
      this.form.deductCategory = item.deductCategory == '分数乘以数量' ? '扣' + item.calcFraction  + '分*数量 ' : item.deductCategory == '除以数量后乘以分数' ? '扣' + item.calcFraction + '分/' +  item.calcUnit + '小时' : '扣' + item.calcFraction + '分';
      if (item.deductCategory == "扣指定分数") {
        this.needNum = false;
@@ -369,12 +366,17 @@
      if (null != this.daterangeAuditingTime && '' != this.daterangeAuditingTime) {
        this.queryParams["auditingStartTime"] = this.daterangeAuditingTime[0];
        this.queryParams["auditingEndTime"] = this.daterangeAuditingTime[1];
      } else {
        this.queryParams["auditingStartTime"] = null;
        this.queryParams["auditingEndTime"] = null;
      }
      if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
        this.queryParams["createStartTime"] = this.daterangeCreateTime[0];
        this.queryParams["createEndTime"] = this.daterangeCreateTime[1];
      } else {
        this.queryParams["createStartTime"] = null;
        this.queryParams["createEndTime"] = null;
      }
      console.log("this.queryParams", this.queryParams)
      listAuditing(this.queryParams).then(response => {
        this.auditingList = response.rows;
        this.total = response.total;
@@ -427,10 +429,6 @@
    handleUpdate(row) {
      this.reset();
      const id = row.id || this.ids
      if (row.auditingStatus != '待审核') {
        this.$message.warning("该记录已审核，不能修改");
        return;
      }
      getAuditing(id).then(response => {
        this.form = { ...response.data };
        this.open = true;