Merge remote-tracking branch 'origin/master'

懒羊羊

2024-03-13 16036dcbf43937482895a36126bc943939f2891b

 jcdm-ui/src/views/main/em/inspectionItems/index.vue

@@ -18,26 +18,16 @@
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
<!--          <el-form-item label="项目类型" prop="itemsType">-->
<!--            <el-select v-model="queryParams.itemsType" placeholder="请选择项目类型" clearable>-->
<!--              <el-option-->
<!--                v-for="dict in dict.type.${dictType}"-->
<!--                :key="dict.value"-->
<!--                :label="dict.label"-->
<!--                :value="dict.value"-->
<!--              />-->
<!--            </el-select>-->
<!--          </el-form-item>-->
<!--          <el-form-item label="是否启用" prop="status">-->
<!--            <el-select v-model="queryParams.status" placeholder="请选择是否启用" clearable>-->
<!--              <el-option-->
<!--                v-for="dict in dict.type.${dictType}"-->
<!--                :key="dict.value"-->
<!--                :label="dict.label"-->
<!--                :value="dict.value"-->
<!--              />-->
<!--            </el-select>-->
<!--          </el-form-item>-->
          <el-form-item label="项目类型" prop="itemsType">
            <el-select v-model="queryParams.itemsType" placeholder="请选择项目类型" clearable>
              <el-option
                v-for="dict in dict.type.spotmaintenance"
                :key="dict.value"
                :label="dict.label"
                :value="dict.value"
              />
            </el-select>
          </el-form-item>
          <el-form-item style="float: right">
            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -94,20 +84,23 @@

        <el-table border v-loading="loading" :data="inspectionItemsList" @selection-change="handleSelectionChange">
          <el-table-column type="selection" width="55" align="center" />
          <el-table-column label="ID" align="center" prop="id" />
          <el-table-column label="项目编号" align="center" prop="itemsCode">
          </el-table-column>
          <el-table-column label="项目名称" align="center" prop="itemsName">
          </el-table-column>
          <el-table-column label="项目编号" align="center" prop="itemsCode">
          </el-table-column>
          <el-table-column label="项目类型" align="center" prop="itemsType">
            <template slot-scope="scope">
              <dict-tag :options="dict.type.spotmaintenance" :value="scope.row.itemsType"/>
            </template>
          </el-table-column>
          <el-table-column label="是否启用" align="center" prop="status">
          </el-table-column>
          <el-table-column label="标准" align="center" prop="standard">
            <template slot-scope="scope">
              <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.status"/>
            </template>
          </el-table-column>
          <el-table-column label="项目内容" align="center" prop="itemsContent">
          </el-table-column>
          <el-table-column label="备注" align="center" prop="remark">
          <el-table-column label="标准" align="center" prop="standard">
          </el-table-column>
          <el-table-column label="创建人" align="center" prop="createUser">
          </el-table-column>
@@ -116,28 +109,6 @@
          <el-table-column label="更新人" align="center" prop="updateUser">
          </el-table-column>
          <el-table-column label="更新时间" align="center" prop="updateTime">
          </el-table-column>
          <el-table-column fixed="right" width="200" label="操作" align="center" class-name="small-padding fixed-width">
            <template slot-scope="scope">
              <el-button
                size="mini"
                type="success"
                plain
                style="width: 72px"
                icon="el-icon-edit"
                @click="handleUpdate(scope.row)"
                v-hasPermi="['em:inspectionItems:edit']"
              >修改</el-button>
              <el-button
                size="mini"
                type="danger"
                plain
                style="width: 72px"
                icon="el-icon-delete"
                @click="handleDelete(scope.row)"
                v-hasPermi="['em:inspectionItems:remove']"
              >删除</el-button>
            </template>
          </el-table-column>
        </el-table>
    </el-card>
@@ -157,39 +128,35 @@
        {{titleName}}
      </span>
      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
        <el-form-item label="项目编号" prop="itemsCode">
          <el-input v-model="form.itemsCode" placeholder="请输入项目编号" />
        </el-form-item>
        <el-form-item label="项目名称" prop="itemsName">
          <el-input v-model="form.itemsName" placeholder="请输入项目名称" />
        </el-form-item>
        <el-form-item label="项目编号" prop="itemsCode">
          <el-input v-model="form.itemsCode" placeholder="请输入项目编号" />
        </el-form-item>
        <el-form-item label="项目类型" prop="itemsType">
<!--          <el-select v-model="form.itemsType" placeholder="请选择项目类型">-->
<!--            <el-option-->
<!--              v-for="dict in dict.type.${dictType}"-->
<!--              :key="dict.value"-->
<!--              :label="dict.label"-->
<!--              :value="dict.value"-->
<!--            ></el-option>-->
<!--          </el-select>-->
          <el-radio-group v-model="form.itemsType">
            <el-radio
              v-for="dict in dict.type.spotmaintenance"
              :key="dict.value"
              :label="dict.value"
            >{{dict.label}}</el-radio>
          </el-radio-group>
        </el-form-item>
        <el-form-item label="是否启用" prop="status">
<!--          <el-radio-group v-model="form.status">-->
<!--            <el-radio-->
<!--              v-for="dict in dict.type.${dictType}"-->
<!--              :key="dict.value"-->
<!--              :label="dict.value"-->
<!--            >{{dict.label}}</el-radio>-->
<!--          </el-radio-group>-->
          <el-radio-group v-model="form.status">
            <el-radio
              v-for="dict in dict.type.sys_yes_no"
              :key="dict.value"
              :label="dict.value"
            >{{dict.label}}</el-radio>
          </el-radio-group>
        </el-form-item>
        <el-form-item label="项目内容"prop="itemsContent"  >
          <el-input v-model="form.itemsContent" placeholder="请输入项目内容"/>
        </el-form-item>
        <el-form-item label="标准" prop="standard">
          <el-input v-model="form.standard" placeholder="请输入标准" />
        </el-form-item>
        <el-form-item label="项目内容">
          <editor v-model="form.itemsContent" :min-height="192"/>
        </el-form-item>
        <el-form-item label="备注" prop="remark">
          <el-input v-model="form.remark" placeholder="请输入备注" />
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
@@ -205,6 +172,7 @@

export default {
  name: "InspectionItems",
  dicts: ['sys_yes_no','spotmaintenance'],
  data() {
    return {
      // 遮罩层