Merge remote-tracking branch 'origin/master'

fuliqi

2024-04-28 5208ae16a508a42be2e4b50ef299389fb556a67e

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

@@ -3,36 +3,18 @@
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
      <el-form-item label="运维考核单位" prop="belongUnit">
        <el-select v-model="queryParams.unitId" @change="handleQuery" clearable placeholder="运维考核单位">
          <el-option
            v-for="item in unitList"
            :key="item.id"
            :label="item.value"
            :value="item.id">
          <el-option v-for="item in unitList" :key="item.id" :label="item.value" :value="item.id">
          </el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="审核时间">
        <el-date-picker
          v-model="daterangeAuditingTime"
          style="width: 240px"
          value-format="yyyy-MM-dd HH:mm:ss"
          type="daterange"
          range-separator="-"
          start-placeholder="开始日期"
          end-placeholder="结束日期"
        ></el-date-picker>
        <el-date-picker v-model="daterangeAuditingTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
      </el-form-item>

      <el-form-item label="创建时间">
        <el-date-picker
          v-model="daterangeCreateTime"
          style="width: 240px"
          value-format="yyyy-MM-dd HH:mm:ss"
          type="daterange"
          range-separator="-"
          start-placeholder="开始日期"
          end-placeholder="结束日期"
        ></el-date-picker>
        <el-date-picker v-model="daterangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
      </el-form-item>
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -42,119 +24,76 @@

    <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="['system:template:add']"
        >新增</el-button>
        <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="['system:template:edit']"
        >修改</el-button>
        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
          v-hasPermi="['platform:score:edit']">修改</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="['system:template:remove']"
        >删除</el-button>
        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
          v-hasPermi="['platform: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="['system:template:export']"
        >导出</el-button>
        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
          v-hasPermi="['platform:score:export']">导出</el-button>
      </el-col>
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>

    <el-table v-loading="loading" :data="auditingList" @selection-change="handleSelectionChange">
      <el-table-column type="selection" width="55" align="center" />
      <el-table-column label="运维考核单位" align="center" prop="unitName" width="180"/>
      <el-table-column label="考核名" align="center" prop="checkPublishId" width="180">
      <el-table-column label="考核单位" align="center" prop="unitName" width="180" />
      <el-table-column label="考核合同" align="center" prop="contractName" width="180" />
      <el-table-column label="考核规则" align="center" prop="ruleName" width="120" :show-overflow-tooltip="true" />
      <el-table-column label="考核指标" align="center" prop="num" width="120" />
      <el-table-column label="考核扣分" align="center" prop="score" width="120" />
      <el-table-column label="创建人" align="center" prop="createUser" />
      <el-table-column label="审核状态" align="center" prop="auditingStatus">
        <template slot-scope="scope">
          <div v-if="scope.row.checkPublishId === 5">视频考核</div>
          <el-tag
            :type="scope.row.auditingStatus === '通过' ? 'success' : scope.row.auditingStatus === '未通过' ? 'danger' : 'primary'"
            disable-transitions>{{ scope.row.auditingStatus }}</el-tag>
        </template>
      </el-table-column>
      <el-table-column label="运维考核规则" align="center" prop="defaultRuleName" width="180" />
      <el-table-column label="运维考核扣分" align="center" prop="score" width="120" />
      <el-table-column label="创建人" align="center" prop="createBy" />
      <el-table-column label="审核人" align="center" prop="auditingUserName" />
      <el-table-column label="审核状态" align="center" prop="auditingStatus" />
      <el-table-column label="审核说明" align="center" prop="remark" width="180"/>
      <el-table-column label="审核时间" align="center" prop="auditingTime" width="180"/>
      <el-table-column label="创建时间" align="center" prop="createTime" width="180"/>
      <el-table-column label="审核人" align="center" prop="auditingUser" />
      <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <el-button
            size="mini"
            type="text"
            icon="el-icon-s-check"
            @click="handleAuditing(scope.row)"
            v-hasPermi="['default:audit']"
          >审核</el-button>
<!--          <el-button-->
<!--            size="mini"-->
<!--            type="text"-->
<!--            icon="el-icon-edit"-->
<!--            @click="handleUpdate(scope.row)"-->
<!--            v-hasPermi="['system:auditing:edit']"-->
<!--          >修改</el-button>-->
          <el-button
            size="mini"
            type="text"
            icon="el-icon-delete"
            @click="handleDelete(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>
          <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>
        </template>
      </el-table-column>
    </el-table>

    <pagination
      v-show="total>0"
      :total="total"
      :page.sync="queryParams.pageNum"
      :limit.sync="queryParams.pageSize"
      @pagination="getList"
    />
    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
      @pagination="getList" />

    <!-- 审核 -->
    <el-dialog title="运维考核审核" :visible.sync="auditingOpen" width="500px" append-to-body>
      <el-form ref="auditingForm" :model="auditingForm" :rules="auditingRules" label-width="120px">
        <el-form-item label="运维考核单位">
          <el-input v-model="auditingForm.unitName" disabled/>
          <el-input v-model="auditingForm.unitName" disabled />
        </el-form-item>

        <el-form-item label="运维考核规则">
          <el-input v-model="auditingForm.defaultRuleName" disabled/>
          <el-input v-model="auditingForm.ruleName" type="textarea" autosize disabled />
        </el-form-item>
        <el-form-item label="运维考核指标">
          <el-input v-model="auditingForm.num" disabled />
        </el-form-item>
        <el-form-item label="运维考核扣分">
          <el-input v-model="auditingForm.score" disabled/>
          <el-input v-model="auditingForm.score" disabled />
        </el-form-item>
        <el-form-item label="审核结果" prop="auditingStatus">
          <el-radio v-model="auditingForm.auditingResult" label="pass">通过</el-radio>
          <el-radio v-model="auditingForm.auditingResult" label="return">驳回</el-radio>
          <el-radio v-model="auditingForm.auditingStatus" label="通过">通过</el-radio>
          <el-radio v-model="auditingForm.auditingStatus" label="未通过">驳回</el-radio>
        </el-form-item>
        <el-form-item label="审核说明" prop="remark">
          <el-input v-model="auditingForm.remark" type="textarea" show-word-limit maxlength="100"/>
          <el-input v-model="auditingForm.remark" type="textarea" show-word-limit maxlength="100" />
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
@@ -164,63 +103,46 @@
    </el-dialog>

    <!-- 新增或修改 -->
    <el-dialog title="运维积分审核" :visible.sync="open" width="700px"append-to-body>
      <el-form ref="auditingForm" :model="auditingForm" :rules="auditingRules" label-width="120px">
        <el-form-item label="运维考核单位" prop="unitName">
          <el-select v-model="form.unitNameList" placeholder="运维考核单位">
            <el-option
              v-for="item in unitNameList"
              :key="item.id"
              :label="item.value"
              :value="item.id">
    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
        <el-form-item label="运维考核单位" prop="unitId">
          <el-select v-model="form.unitId" placeholder="运维考核单位" @change="handleChangeUnit">
            <el-option v-for="item in unitList" :key="item.id" :label="item.value" :value="item.id">
            </el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="考核名" prop="examineId">
          <el-select v-model="form.examineId" placeholder="考核名" >
            <el-option
              v-for="item in examineList"
              :key="item.id"
              :label="item.value"
              :value="item.id">
            </el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="运维考核规则" prop="tempRuleFormList">
        <el-form-item label="运维考核规则" prop="ruleIdsArray">
          <div class="row-warp">
            <div class="row" v-for="(form) in tempRuleFormList">
            <div class="row">
              <div class="row-left">
                <div>规则</div>
                <div class="block">
                  <span class="demonstration"></span>
                  <el-cascader
                    v-model="value"
                    :options="options"
                    :props = "props"
                    @change="handleChange"></el-cascader>
                  <el-cascader ref="cascader" v-model="form.ruleIdsArray" :options="options" @change="handleChange">
                    <template slot-scope="{ data }">
                      <el-tooltip class="item" :disabled="data.label.length < 16 && !data.deductCategory" effect="dark"
                        :content="data.label.length < 16 ? data.deductCategory ? data.deductCategory + ' ' + data.calcFraction + (data.calcUnit ? '/' + data.calcUnit : '') : '' : (data.deductCategory ? data.label + ' ' + data.deductCategory + ' ' + data.calcFraction + (data.calcUnit ? '/' + data.calcUnit : '') : data.label)"
                        placement="left">
                        <span>{{ data.label }}</span>
                      </el-tooltip>
                    </template>
                  </el-cascader>
                </div>
              </div>
              <div class="row-right">
              <div class="row-right" v-if="needNum">
                <div>指标</div>
                <div class="margin-5">
                  <el-input type="number" v-model="form.weight"/>
                  <el-input placeholder="请输入" v-model="form.num" @input="handleChangeNum" />
                </div>
              </div>
              <div class="item-op">
                <el-button @click="removeRule(form)" type="danger" icon="el-icon-delete" circle></el-button>
              </div>
            </div>
            <div style="margin-top: 25px">
              <el-button type="success" @click="nextAdd" size="mini" plain>添加</el-button>
            </div>
          </div>
        </el-form-item>
        <el-form-item label="运维考核扣分"  style="width: 20%">
          <el-input v-model="auditingForm.score"></el-input>
        <el-form-item label="运维考核扣分" style="width: 51%" prop="score">
          <el-input v-model="form.score"></el-input>
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitAuditing">确 定</el-button>
        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
      </div>
    </el-dialog>
@@ -228,44 +150,24 @@
</template>

<script>
import { listAuditing, getAuditing, delAuditing, addAuditing, updateAuditing,auditing } from "@/api/platform/contract-score";
import { listAuditing, getAuditing, delAuditing, addAuditing, updateAuditing, auditing } from "@/api/platform/contract-score";
import { unitSelect } from "@/api/platform/unit";
import { getRuleListByUnitId, getRule } from "@/api/platform/calculate-rule";

export default {
  name: "Auditing",
  data() {
    return {
      options: [{
        value: 'city',
        label: '前端感知源治理工作',
        children: [{
          value: 'fushun',
          label: '时钟同步',
        }, {
          value: 'rong',
          label: 'OSD标识未修复',
        }, {
          value: 'rong',
          label: '一机一档不合格',
        }
        ]
      },
      ],
      needNum: false,
      options: [],
      auditingOpen: false,
      auditingForm: {},
      unitList: [],
      unitNameList: [
        {id:2 , value:"成都x运维"}
        ],
      // 考核模板
      examineList: [
        {id:1 , value:"车辆考核"},
        {id:2 , value:"视频考核"}
        { id: 1, value: "车辆考核" },
        { id: 2, value: "视频考核" }
      ],
      // 临时规则表单
      tempRuleForm: {},
      // 临时规则表单列表
      tempRuleFormList: [{"ruleId": null, "adjustCoefficient": null}],
      // 遮罩层
      loading: true,
      // 选中数组
@@ -293,20 +195,45 @@
      queryParams: {
        pageNum: 1,
        pageSize: 10,
        defaultId: null,
        unitId: null,
        auditingStatus: null,
        auditingTime: null,
        auditingUser: null,
        createTime: null,
      },
      // 表单参数
      form: {},
      form: {
        score: '',
        temp: ''
      },
      // 表单校验
      auditingRules: {
        auditingStatus: [
          { required: true, message: "请先完成审核结果", trigger: "blur" }
          { required: true, message: "请先完成审核结果", trigger: "blur", },
          {
            validator: (rule, value, callback) => {
              if (value === '待审核') {
                callback(new Error("请先完成审核结果"));
              } else {
                callback();
              }
            },
            trigger: 'blur'
          }
        ],
      }
      },
      rules: {
        unitId: [
          { required: true, message: "请选择运维考核单位", trigger: "blur" }
        ],
        ruleIdsArray: [
          { required: true, message: "请选择运维考核规则", trigger: "blur" }
        ],
        score: [
          { required: true, message: "分数不能为空", trigger: "blur" }
        ]
      },
      calcObj: {}
    };
  },
  created() {
@@ -314,8 +241,51 @@
    this.getUnitSelect();
  },
  methods: {
    handleChange(value) {
      console.log(value);
    /**
     * 选择规则
     */
    handleChange() {
      let item = this.$refs['cascader'].getCheckedNodes()[0].data;
      this.calcObj = item;
      this.form.contractId = item.contractId;
      if (item.deductCategory == "扣指定分数") {
        this.needNum = false;
        this.form.score = item.calcFraction;
      } else {
        this.needNum = true;
        this.form.score = '';
      }
      if (this.form.num != null && this.needNum) {
        this.handleChangeNum();
      }
    },
    /**
     * 输入指标
     */
    handleChangeNum() {
      if (this.calcObj.deductCategory == "分数乘以数量") {
        this.form.score = Math.floor(this.calcObj.calcFraction * this.form.num * 100) / 100;
      } else if (this.calcObj.deductCategory == "除以数量后乘以分数") {
        this.form.score = Math.floor(Math.ceil(this.form.num / this.calcObj.calcUnit) * this.calcObj.calcFraction * 100) / 100;
      }
    },

    handleChangeUnit(value) {
      getRuleListByUnitId(value).then((res) => {
        this.options = this.getTreeData(res.data);
      })
    },
    getTreeData(data) {
      for (var i = 0; i < data.length; i++) {
        if (data[i].children.length < 1) {
          // children若为空数组，则将children设为undefined
          data[i].children = undefined;
        } else {
          // children若不为空数组，则继续 递归调用 本方法
          this.getTreeData(data[i].children);
        }
      }
      return data;
    },
    // 提交审核
    submitAuditing() {
@@ -336,8 +306,7 @@
    // 打开审核
    handleAuditing(row) {
      this.auditingOpen = true;
      this.auditingForm = row;
      this.auditingForm.auditingStatus = this.auditingForm.auditingStatus ? this.auditingForm.auditingStatus : null
      this.auditingForm = { ...row };
    },
    // 关闭审核
    closeAuditing() {
@@ -363,8 +332,9 @@
        this.queryParams["createStartTime"] = this.daterangeCreateTime[0];
        this.queryParams["createEndTime"] = this.daterangeCreateTime[1];
      }
      console.log("this.queryParams", this.queryParams)
      listAuditing(this.queryParams).then(response => {
        this.auditingList = response.data;
        this.auditingList = response.rows;
        this.total = response.total;
        this.loading = false;
      });
@@ -379,20 +349,16 @@
    reset() {
      this.form = {
        id: null,
        defaultId: null,
        auditingStatus: null,
        remark: null,
        auditingTime: null,
        auditingUser: null,
        createTime: null,
        updateTime: null,
        deleted: null
        score: ''
      };
      this.resetForm("form");
    },
    /** 搜索按钮操作 */
    handleQuery() {
      this.queryParams.pageNum = 1;
      this.getList();
    },
    /** 重置按钮操作 */
@@ -405,7 +371,7 @@
    // 多选框选中数据
    handleSelectionChange(selection) {
      this.ids = selection.map(item => item.id)
      this.single = selection.length!==1
      this.single = selection.length !== 1
      this.multiple = !selection.length
    },
    /** 新增按钮操作 */
@@ -418,14 +384,26 @@
    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.form = { ...response.data };
        this.open = true;
        this.title = "修改运维考核审核";
        this.title = "修改运维考核积分";
        this.handleChangeUnit(this.form.unitId);
        getRule(this.form.ruleId).then(res => {
          this.calcObj = res.data;
          if (this.calcObj.deductCategory != "扣指定分数") {
            this.needNum = true;
          }
        })
      });
    },
    /** 提交按钮 */
    submitForm() {
      this.form.ruleId = this.calcObj.id;
      this.$refs["form"].validate(valid => {
        if (valid) {
          if (this.form.id != null) {
@@ -447,18 +425,18 @@
    /** 删除按钮操作 */
    handleDelete(row) {
      const ids = row.id || this.ids;
      this.$modal.confirm('是否确认删除运维考核审核编号为"' + ids + '"的数据项？').then(function() {
      this.$modal.confirm('是否确认删除运维考核审核编号为"' + ids + '"的数据项？').then(function () {
        return delAuditing(ids);
      }).then(() => {
        this.getList();
        this.$modal.msgSuccess("删除成功");
      }).catch(() => {});
      }).catch(() => { });
    },
    /** 导出按钮操作 */
    handleExport() {
      this.download('/default-auditing/export', {
      this.download('/contract/score/export', {
        ...this.queryParams
      }, `auditing_${new Date().getTime()}.xlsx`)
      }, `合同考核积分_${new Date().getTime()}.xlsx`)
    }
  }
};
@@ -467,10 +445,12 @@
.margin-5 {
  margin-left: 5px;
}

.row-warp {
  display: flex;
  flex-direction: column;
}

.row {
  display: flex;
  flex-direction: row;
@@ -478,15 +458,21 @@
  justify-content: center;
  margin: 5px 0;
}

.row-left {
  flex: 1;
  display: flex;
  flex-direction: row;
}

.row-right {
  flex: 1;
  display: flex;
  flex-direction: row;
}
</style>

<style>
.el-cascader-node {
  max-width: 300px;
}
</style>