Merge remote-tracking branch 'origin/master'

fuliqi

2024-03-18 f18ff6df94830a0147f372f031fa94ab5402ead8

 src/views/system/check-template/index.vue

@@ -9,6 +9,14 @@
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="公司名" prop="unitName">
        <el-input
          v-model="queryParams.status"
          placeholder="请输入公司名"
          clearable
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="创建时间">
        <el-date-picker
          v-model="daterangeCreateTime"
@@ -34,7 +42,6 @@
          icon="el-icon-plus"
          size="mini"
          @click="handleAdd"
          v-hasPermi="['system:checkTemplate:add']"
        >新增</el-button>
      </el-col>
      <el-col :span="1.5">
@@ -45,7 +52,6 @@
          size="mini"
          :disabled="single"
          @click="handleUpdate"
          v-hasPermi="['system:checkTemplate:edit']"
        >修改</el-button>
      </el-col>
      <el-col :span="1.5">
@@ -56,7 +62,6 @@
          size="mini"
          :disabled="multiple"
          @click="handleDelete"
          v-hasPermi="['system:checkTemplate:remove']"
        >删除</el-button>
      </el-col>
      <el-col :span="1.5">
@@ -66,7 +71,6 @@
          icon="el-icon-download"
          size="mini"
          @click="handleExport"
          v-hasPermi="['system:checkTemplate:export']"
        >导出</el-button>
      </el-col>
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -75,8 +79,9 @@
    <el-table v-loading="loading" :data="checkTemplateList" @selection-change="handleSelectionChange">
      <el-table-column type="selection" width="55" align="center" />
      <el-table-column label="模板名称" align="center" prop="templateName" />
      <el-table-column label="公司名" align="center" prop="unitName" />
      <el-table-column label="调整系数" align="center" prop="adjustCoefficient" />
      <el-table-column label="调整计算方式" align="center" prop="adjustWay" />
      <el-table-column label="调整系数计算方式" align="center" prop="adjustWay" />
      <el-table-column label="状态" align="center" prop="status" />
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope">
@@ -85,14 +90,12 @@
            type="text"
            icon="el-icon-edit"
            @click="handleUpdate(scope.row)"
            v-hasPermi="['system:checkTemplate:edit']"
          >修改</el-button>
          <el-button
            size="mini"
            type="text"
            icon="el-icon-delete"
            @click="handleDelete(scope.row)"
            v-hasPermi="['system:checkTemplate:remove']"
          >删除</el-button>
        </template>
      </el-table-column>
@@ -109,10 +112,20 @@
    <!-- 添加或修改考核模板对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
        <el-form-item label="模板名称" prop="adjustCoefficient">
          <el-input v-model="form.tempalteName" placeholder="请输入模板名称" />
        <el-form-item label="模板名称" prop="templateName">
          <el-input v-model="form.templateName" placeholder="请输入模板名称" />
        </el-form-item>
        <el-form-item label="考核规则">
        <el-form-item label="公司名" prop="unitName">
          <el-select v-model="form.unitName" placeholder="请选择">
            <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="tempRuleFormList">
          <div class="row-warp">
            <div class="row" v-for="(form) in tempRuleFormList">
              <div class="row-left">
@@ -174,12 +187,14 @@
<script>
import { listCheckTemplate, getCheckTemplate, delCheckTemplate, addCheckTemplate, updateCheckTemplate } from "@/api/platform/check-template";
import { ruleSelect } from '../../../api/platform/check-rule'
import { unitSelect } from '../../../api/platform/unit'

export default {
  name: "CheckTemplate",
  data() {
    return {
      ruleList: [],
      unitList: [],
      // 临时规则表单
      tempRuleForm: {},
      // 临时规则表单列表
@@ -217,6 +232,9 @@
      form: {},
      // 表单校验
      rules: {
        templateName: [
          { required: true, message: "模板名称不能为空", trigger: "blur" }
        ],
        adjustCoefficient: [
          { required: true, message: "调整系数不能为空", trigger: "blur" }
        ],
@@ -229,6 +247,7 @@
  created() {
    this.getList();
    this.selectCheckRule();
    this.selectUnit();
  },
  methods: {
    removeRule(form) {
@@ -237,19 +256,25 @@
      this.tempRuleFormList = this.tempRuleFormList.filter(item => item !== form)
    },
    nextAdd() {
      if (this.tempRuleFormList.length === 0) {
        this.tempRuleFormList.push({"ruleId": null, "adjustCoefficient": null})
      } else {
        this.ruleFormList.push(this.tempRuleForm);
        this.tempRuleFormList.push(this.tempRuleForm);
        this.tempRuleForm = {};
      }

      // if (this.tempRuleFormList.length === 0) {
      //   this.tempRuleFormList.push({"ruleId": null, "weight": null})
      // } else {
      //   this.ruleFormList.push(this.tempRuleForm);
      //   this.tempRuleFormList.push(this.tempRuleForm);
      //   this.tempRuleForm = {};
      // }
      this.tempRuleFormList.push({"ruleId": null, "weight": null})
    },
    // 考核规则下拉数据
    selectCheckRule() {
      ruleSelect().then(res => {
        this.ruleList = res.data;
      })
    },
    // 运维公司下拉数据
    selectUnit() {
      unitSelect().then(res => {
        this.unitList = res.data;
      })
    },
    /** 查询考核模板列表 */
@@ -312,6 +337,8 @@
      const id = row.id || this.ids
      getCheckTemplate(id).then(response => {
        this.form = response.data;
        this.tempRuleFormList = this.form.ruleFormList;
        this.ruleFormList = this.form.ruleFormList;
        this.open = true;
        this.title = "修改考核模板";
      });
@@ -320,10 +347,13 @@
    submitForm() {
      this.$refs["form"].validate(valid => {
        if (valid) {
          this.form.ruleFormList = this.tempRuleFormList;
          if (this.form.id != null) {
            updateCheckTemplate(this.form).then(response => {
              this.$modal.msgSuccess("修改成功");
              this.open = false;
              this.tempRuleFormList = [];
              this.form = {};
              this.getList();
            });
          } else {