新增检测项目管理

src/api/inspection/project/index.js

@@ -0,0 +1,63 @@
+import request from '@/utils/request'
+
+// 创建检测项目
+export function createDlInspectionProject(data) {
+  return request({
+    url: '/inspection/dl-inspection-project/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新检测项目
+export function updateDlInspectionProject(data) {
+  return request({
+    url: '/inspection/dl-inspection-project/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除检测项目
+export function deleteDlInspectionProject(id) {
+  return request({
+    url: '/inspection/dl-inspection-project/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得检测项目
+export function getDlInspectionProject(id) {
+  return request({
+    url: '/inspection/dl-inspection-project/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得检测项目分页
+export function getDlInspectionProjectPage(params) {
+  return request({
+    url: '/inspection/dl-inspection-project/page',
+    method: 'get',
+    params
+  })
+}
+// 导出检测项目 Excel
+export function exportDlInspectionProjectExcel(params) {
+  return request({
+    url: '/inspection/dl-inspection-project/export-excel',
+    method: 'get',
+    params,
+    responseType: 'blob'
+  })
+}
+// 获取检测的角色 Excel
+export function getRole(params) {
+  return request({
+    url: '/system/role/pageByQuery',
+    method: 'get',
+    params:{
+      servicePackageId:'jiance'
+    },
+  })
+}

src/views/inspection/project/DlInspectionProjectForm.vue

@@ -0,0 +1,124 @@
+<template>
+  <div class="app-container">
+    <!-- 对话框(添加 / 修改) -->
+    <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="45%" v-dialogDrag append-to-body>
+      <el-form ref="formRef" :model="formData" :rules="formRules" v-loading="formLoading" label-width="100px">
+        <el-form-item label="检测项目名称" prop="projectName">
+          <el-input v-model="formData.projectName" placeholder="请输入检测项目名称"/>
+        </el-form-item>
+        <el-form-item label="角色" prop="roleId">
+          <el-select v-model="formData.roleId" placeholder="请选择角色">
+            <el-option
+              v-for="role in roleList"
+              :key="role.id"
+              :label="role.name"
+              :value="role.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="formData.remark" placeholder="请输入备注"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm" :disabled="formLoading">确 定</el-button>
+        <el-button @click="dialogVisible = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import * as DlInspectionProjectApi from '@/api/inspection/project';
+import {getRole} from "@/api/inspection/project";
+
+export default {
+  name: "DlInspectionProjectForm",
+  components: {},
+  data() {
+    return {
+      // 弹出层标题
+      dialogTitle: "",
+      // 是否显示弹出层
+      dialogVisible: false,
+      // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+      formLoading: false,
+      // 表单参数
+      formData: {
+        projectName: undefined,
+        roleId: undefined,
+        remark: undefined,
+      },
+      // 表单校验
+      formRules: {
+        projectName: [
+          {required: true, message: '检测项目名称不能为空', trigger: 'blur'}
+        ],
+        roleId: [
+          {required: true, message: '角色不能为空', trigger: 'change'}
+        ]
+      },
+      roleList: [],
+    };
+  },
+  methods: {
+    /** 打开弹窗 */
+    async open(id) {
+      this.getRole()
+      this.dialogVisible = true;
+      this.reset();
+      // 修改时，设置数据
+      if (id) {
+        this.formLoading = true;
+        try {
+          const res = await DlInspectionProjectApi.getDlInspectionProject(id);
+          this.formData = res.data;
+          this.title = "修改检测项目";
+        } finally {
+          this.formLoading = false;
+        }
+      }
+      this.title = "新增检测项目";
+    },
+    /** 提交按钮 */
+    async submitForm() {
+      // 校验主表
+      await this.$refs["formRef"].validate();
+      this.formLoading = true;
+      try {
+        const data = this.formData;
+        // 修改的提交
+        if (data.id) {
+          await DlInspectionProjectApi.updateDlInspectionProject(data);
+          this.$modal.msgSuccess("修改成功");
+          this.dialogVisible = false;
+          this.$emit('success');
+          return;
+        }
+        // 添加的提交
+        await DlInspectionProjectApi.createDlInspectionProject(data);
+        this.$modal.msgSuccess("新增成功");
+        this.dialogVisible = false;
+        this.$emit('success');
+      } finally {
+        this.formLoading = false;
+      }
+    },
+    /** 表单重置 */
+    reset() {
+      this.formData = {
+        projectName: undefined,
+        roleId: undefined,
+        remark: undefined,
+      };
+      this.resetForm("formRef");
+    },
+    /** 获取角色下拉框数据 */
+    async getRole() {
+      const res = await getRole();
+      console.log("角色的集合", res.data)
+      this.roleList = res.data
+    },
+  }
+};
+</script>

src/views/inspection/project/index.vue

@@ -0,0 +1,182 @@
+<template>
+  <div class="app-container">
+    <!-- 搜索工作栏 -->
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="检测项目" prop="projectName">
+        <el-input v-model="queryParams.projectName" placeholder="请输入检测项目名称" clearable
+                  @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="角色" prop="roleId">
+        <el-select v-model="queryParams.roleId" placeholder="请选择角色" clearable>
+          <el-option
+            v-for="role in roleList"
+            :key="role.id"
+            :label="role.name"
+            :value="role.id"
+          />
+        </el-select>
+      </el-form-item>
+<!--      <el-form-item label="创建时间" prop="createTime">-->
+<!--        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"-->
+<!--                        type="daterange"-->
+<!--                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"-->
+<!--                        :default-time="['00:00:00', '23:59:59']"/>-->
+<!--      </el-form-item>-->
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 操作工具栏 -->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="openForm(undefined)"
+                   v-hasPermi="['inspection:dl-inspection-project:create']">新增
+        </el-button>
+      </el-col>
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"-->
+      <!--                   v-hasPermi="['inspection:dl-inspection-project:export']">导出</el-button>-->
+      <!--      </el-col>-->
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="检测项目名称" align="center" prop="projectName"/>
+      <el-table-column label="角色" align="center" prop="roleId">
+        <template slot-scope="scope">
+          {{ getRoleName(scope.row.roleId) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark"/>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template v-slot="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"
+                     v-hasPermi="['inspection:dl-inspection-project:update']">修改
+          </el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                     v-hasPermi="['inspection:dl-inspection-project:delete']">删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页组件 -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+                @pagination="getList"/>
+    <!-- 对话框(添加 / 修改) -->
+    <DlInspectionProjectForm ref="formRef" @success="getList"/>
+  </div>
+</template>
+
+<script>
+import * as DlInspectionProjectApi from '@/api/inspection/project';
+import DlInspectionProjectForm from './DlInspectionProjectForm.vue';
+import {getRole} from "@/api/inspection/project";
+
+export default {
+  name: "DlInspectionProject",
+  components: {
+    DlInspectionProjectForm,
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 检测项目列表
+      list: [],
+      // 是否展开，默认全部展开
+      isExpandAll: true,
+      // 重新渲染表格状态
+      refreshTable: true,
+      // 选中行
+      currentRow: {},
+      roleList: [],
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        projectName: null,
+        roleId: null,
+        remark: null,
+        createTime: [],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    async getList() {
+      try {
+        this.loading = true;
+        const res = await DlInspectionProjectApi.getDlInspectionProjectPage(this.queryParams);
+        this.list = res.data.records;
+        this.total = res.data.total;
+        this.getRole()
+      } finally {
+        this.loading = false;
+      }
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 添加/修改操作 */
+    openForm(id) {
+      this.$refs["formRef"].open(id);
+    },
+    /** 删除按钮操作 */
+    async handleDelete(row) {
+      const id = row.id;
+      await this.$modal.confirm('是否确认删除检测项目编号为"' + id + '"的数据项?')
+      try {
+        await DlInspectionProjectApi.deleteDlInspectionProject(id);
+        await this.getList();
+        this.$modal.msgSuccess("删除成功");
+      } catch {
+      }
+    },
+    /** 导出按钮操作 */
+    async handleExport() {
+      await this.$modal.confirm('是否确认导出所有检测项目数据项?');
+      try {
+        this.exportLoading = true;
+        const data = await DlInspectionProjectApi.exportDlInspectionProjectExcel(this.queryParams);
+        this.$download.excel(data, '检测项目.xls');
+      } catch {
+      } finally {
+        this.exportLoading = false;
+      }
+    },
+    /** 获取角色下拉框数据 */
+    async getRole() {
+      const res = await getRole();
+      console.log("角色的集合", res.data)
+      this.roleList = res.data
+    },
+    getRoleName(id) {
+      const role = this.roleList.find(item => item.id === id);
+      return role ? role.name : '';
+    }
+  }
+};
+</script>

src/views/system/role/index.vue

@@ -84,6 +84,16 @@
         <el-form-item label="角色标识" prop="code">
           <el-input v-model="form.code" placeholder="请输入角色标识" />
         </el-form-item>
+        <el-form-item label="所属服务" prop="servicePackageId">
+          <el-select v-model="form.servicePackageId" placeholder="请选择服务">
+            <el-option
+              v-for="item in servicePackages"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item label="角色顺序" prop="sort">
           <el-input-number v-model="form.sort" controls-position="right" :min="0" />
         </el-form-item>
@@ -178,6 +188,7 @@ import {assignRoleMenu, listRoleMenus, assignRoleDataScope} from "@/api/system/p
 import {listSimpleDepts} from "@/api/system/dept";
 import {CommonStatusEnum, SystemDataScopeEnum} from "@/utils/constants";
 import {DICT_TYPE, getDictDatas} from "@/utils/dict";
+import {getServicePackagePage} from "@/api/system/servicePackage";
 
 export default {
   name: "SystemRole",
@@ -205,6 +216,11 @@ export default {
       menuNodeAll: false,
       deptExpand: true,
       deptNodeAll: false,
+      servicePackages: [
+        // { id: 1, name: '服务包1' },
+        // { id: 2, name: '服务包2' },
+        // { id: 3, name: '服务包3' }
+      ],
       // 菜单列表
       menuOptions: [],
       // 部门列表
@@ -235,7 +251,8 @@ export default {
         ],
         sort: [
           { required: true, message: "角色顺序不能为空", trigger: "blur" }
-        ]
+        ],
+        servicePackageId: [{ required: true, message: '所属服务不能为空', trigger: 'change' }]
       },
 
       // 枚举
@@ -357,6 +374,7 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
+      this.getServicePackage()
       this.reset();
       this.open = true;
       this.title = "添加角色";
@@ -490,6 +508,17 @@ export default {
       }).finally(() => {
         this.exportLoading = false;
       });
+    },
+    /** 获取服务套餐 */
+    getServicePackage() {
+      console.log('看看执行')
+      const query = {
+        pageNo: 1,
+        pageSize: 100
+      }
+      getServicePackagePage(query).then(response => {
+        this.servicePackages = response.data.list;
+      });
     }
   }
 };