Merge remote-tracking branch 'origin/master'

zhouwenxuan

2024-03-05 1ab9ca0de32696403b383a91008fa4656162b4dd

 src/views/notCoalMine/nViolationRegistration/index.vue

@@ -47,7 +47,7 @@
          size="mini"
          @click="openViolation({},'add')"
          v-hasPermi="['system:experts:add']"
        >新增填报</el-button>
        >处罚记录填报</el-button>
      </el-col>
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>
@@ -68,19 +68,25 @@
          <el-button
            size="mini"
            type="text"
            icon="el-icon-view"
            @click="openViolation(scope.row,'view')"
          >查看违规详情</el-button>
<!--          <el-button-->
<!--            size="mini"-->
<!--            type="text"-->
<!--            icon="el-icon-edit"-->
<!--            @click="openViolation(scope.row,'edit')"-->
<!--            v-hasPermi="['system:experts:remove']"-->
<!--          >编辑</el-button>-->
            icon="el-icon-edit"
            @click="open('核准')"
          >核准</el-button>
          <el-button
            size="mini"
            type="text"
            icon="el-icon-edit"
            @click="open('撤销')"
          >撤销</el-button>
          <el-button
            size="mini"
            type="text"
            icon="el-icon-view"
            @click="openViolation(scope.row,'view')"
          >查看详情</el-button>
          <el-button
            size="mini"
            type="text"
            style="color: red;"
            icon="el-icon-delete"
            @click="handleDelete(scope.row)"
            v-hasPermi="['system:experts:remove']"
@@ -135,6 +141,23 @@
    this.getTypeList()
  },
  methods: {
    open(val) {
            this.$confirm('确认'+val+'该项处罚?', '提示', {
              confirmButtonText: '确定',
              cancelButtonText: '取消',
              type: 'warning'
            }).then(() => {
              this.$message({
                type: 'success',
                message: val+'成功!'
              });
            }).catch(() => {
              this.$message({
                type: 'info',
                message: '已取消'+val
              });
            });
          },
    async getList(){
      const t = this
      t.loading = true