Merge branch 'master' into dev-threejs

ZhangXianQiang

2024-04-29 44d9a94ceafae734add7d09628fd2ac132f0ee83

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

@@ -49,7 +49,7 @@
      <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="createTime" />
      <el-table-column label="审核状态" align="center" prop="auditingStatus">
        <template slot-scope="scope">
          <el-tag
@@ -60,6 +60,7 @@
      <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-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>
          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
@@ -146,6 +147,31 @@
        <el-button @click="cancel">取 消</el-button>
      </div>
    </el-dialog>

    <!-- 详情 -->
    <el-dialog title="运维考核详情" :visible.sync="openView" width="800px" append-to-body>
      <el-form ref="form" :model="view" label-width="150px" size="mini">
        <el-row>
          <el-col>
            <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.score }} </el-form-item>
            <el-form-item label="创建人：">{{ view.createUser }} </el-form-item>
            <el-form-item label="创建时间：">{{ view.createTime }} </el-form-item>
            <el-form-item label="审核状态：">{{ view.auditingStatus }} </el-form-item>
            <el-form-item label="审核备注：">{{ view.remark }} </el-form-item>
            <el-form-item label="审核人：">{{ view.auditingUser }} </el-form-item>
            <el-form-item label="审核时间：">{{ view.auditingTime }} </el-form-item>
          </el-col>
        </el-row>
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button @click="openView = false">关 闭</el-button>
      </div>
    </el-dialog>

  </div>
</template>

@@ -158,6 +184,8 @@
  name: "Auditing",
  data() {
    return {
      view: {},
      openView: false,
      needNum: false,
      options: [],
      auditingOpen: false,
@@ -241,6 +269,11 @@
    this.getUnitSelect();
  },
  methods: {
    /** 详细按钮操作 */
    handleView(row) {
      this.openView = true;
      this.view = row;
    },
    /**
     * 选择规则
     */