From 1430e4abdac94e88aa339b279b68ab265df21eb0 Mon Sep 17 00:00:00 2001
From: zhouhy <zhouhy3@mesnac.com>
Date: Wed, 18 Oct 2023 09:02:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E6=A3=80=E9=A1=B9=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/base/qualityInspectionItem.js         |  51 +++
 src/router/index.js                           |  14 +
 src/views/base/monitorWorkUnit/index.vue      |  73 +++-
 .../base/qualityInspectionItem/childIndex.vue | 372 ++++++++++++++++
 .../base/qualityInspectionItem/index.vue      | 399 ++++++++++++++++++
 vue.config.js                                 |   4 +-
 6 files changed, 899 insertions(+), 14 deletions(-)
 create mode 100644 src/api/base/qualityInspectionItem.js
 create mode 100644 src/views/base/qualityInspectionItem/childIndex.vue
 create mode 100644 src/views/base/qualityInspectionItem/index.vue

diff --git a/src/api/base/qualityInspectionItem.js b/src/api/base/qualityInspectionItem.js
new file mode 100644
index 0000000..b6287b2
--- /dev/null
+++ b/src/api/base/qualityInspectionItem.js
@@ -0,0 +1,51 @@
+import request from '@/utils/request'
+
+// 查询质检项信息维护列表
+export function listQualityInspectionItem(query) {
+  return request({
+    url: '/base/qualityInspectionItem/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询质检项信息维护详细
+export function getQualityInspectionItem(objId) {
+  return request({
+    url: '/base/qualityInspectionItem/' + objId,
+    method: 'get'
+  })
+}
+
+// 新增质检项信息维护
+export function addQualityInspectionItem(data) {
+  return request({
+    url: '/base/qualityInspectionItem',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改质检项信息维护
+export function updateQualityInspectionItem(data) {
+  return request({
+    url: '/base/qualityInspectionItem',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除质检项信息维护
+export function delQualityInspectionItem(objId) {
+  return request({
+    url: '/base/qualityInspectionItem/' + objId,
+    method: 'delete'
+  })
+}
+//查询所有的父级
+export function getQualityInspectionItemParent(){
+  return request({
+    url:'/base/qualityInspectionItem/getParent',
+    method :'get'
+  })
+}
diff --git a/src/router/index.js b/src/router/index.js
index 8a907a2..c3396df 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -190,6 +190,20 @@ export const dynamicRoutes = [
       },
     ],
   },
+  {
+    path: "/base/qualityInspectionItemChild",
+    component: Layout,
+    hidden: true,
+    permissions: ["base:qualityInspectionItem:list"],
+    children: [
+      {
+        path:"index/:parentId(\\d+)",
+        component:() => import("@/views/base/qualityInspectionItem/childIndex"),
+        name:"childQuality",
+        meta: {title: "质检项缺陷信息",activeMenu: "/base/qualityInspectionItem"},
+      },
+    ],
+  },
 ]
 
 // 防止连续点击多次路由报错
diff --git a/src/views/base/monitorWorkUnit/index.vue b/src/views/base/monitorWorkUnit/index.vue
index 9fa6fb1..41ae96d 100644
--- a/src/views/base/monitorWorkUnit/index.vue
+++ b/src/views/base/monitorWorkUnit/index.vue
@@ -183,12 +183,18 @@
     <!-- 添加或修改统计计量信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="计量设备编号" prop="monitorCode">
-          <el-input v-model="form.monitorCode" placeholder="请输入计量设备编号" />
+        <el-form-item label="计量设备" prop="monitorCode">
+          <treeselect v-model="form.monitorCode" :options="monitorInfoOptions" :normalizer="normalizer" placeholder="请选择计量设备" />
         </el-form-item>
         <el-form-item label="统计单元编号" prop="workUnitCode">
-          <el-input v-model="form.workUnitCode" placeholder="请输入统计单元编号" />
+          <treeselect v-model="form.workUnitCode" :options="workUnitOptions" :normalizer="workUnitOptionsNormalizer" placeholder="请选择父级编号" />
         </el-form-item>
+<!--        <el-form-item label="计量设备编号" prop="monitorCode">-->
+<!--          <el-input v-model="form.monitorCode" placeholder="请输入计量设备编号" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="统计单元编号" prop="workUnitCode">-->
+<!--          <el-input v-model="form.workUnitCode" placeholder="请输入统计单元编号" />-->
+<!--        </el-form-item>-->
         <el-form-item label="计量设备状态" prop="monitorStatus">
           <el-radio-group v-model="form.monitorStatus">
             <el-radio
@@ -243,13 +249,19 @@
 <script>
 import { listMonitorWorkUnit, getMonitorWorkUnit, delMonitorWorkUnit, addMonitorWorkUnit, updateMonitorWorkUnit } from "@/api/base/monitorWorkUnit";
 import {getWorkUnitTrees} from '@/api/base/workUnit'
+import { listMonitorInfo } from '@/api/base/monitorInfo'
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "MonitorWorkUnit",
   dicts: ['monitor_type', 'formula_mode', 'is_flag'],
-  data() {
+  components: {
+    Treeselect
+  },data() {
     return {
-      workUnitOptions:undefined,
+      monitorInfoOptions:[],
+      workUnitOptions:[],
       workUnitName:undefined,
       // 遮罩层
       loading: true,
@@ -320,6 +332,7 @@ export default {
   },
   created() {
     this.getList();
+    this.getTreeselect();
     this.getDeptTrees();
   },
   watch: {
@@ -330,10 +343,43 @@ export default {
     }
   },
   methods: {
+    /** 查询计量设备信息下拉树结构 */
+    getTreeselect() {
+      listMonitorInfo().then(response => {
+        this.monitorInfoOptions = [];
+        const data = { objId: 0, monitorName: '顶级节点', children: [] };
+        data.children = this.handleTree(response.data, "objId", "parentId");
+        this.monitorInfoOptions.push(data);
+      });
+    },
+    /** 转换计量设备信息数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.objId,
+        label: node.monitorName,
+        children: node.children
+      };
+    },
+    /** 转换统计单元信息数据结构 */
+    workUnitOptionsNormalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id2: node.workUnitCode,
+        label2: node.workUnitName,
+        // workUnitCode:node.workUnitCode,
+        children2: node.children
+      };
+    },
     /** 查询计量设备下拉树结构 */
     getDeptTrees() {
       getWorkUnitTrees().then(response => {
         this.workUnitOptions = response.data;
+        console.log(this.workUnitOptions)
       });
     },
     // 筛选节点
@@ -343,8 +389,7 @@ export default {
     },
     // 节点单击事件
     handleNodeClick(data) {
-      console.log(data.code)
-      this.queryParams.monitorCode = data.code;
+      this.queryParams.workUnitCode = data.code;
       this.handleQuery();
     },
     /** 查询统计计量信息列表 */
@@ -364,15 +409,17 @@ export default {
     // 表单重置
     reset() {
       this.form = {
+        parentIds:null,
+        parentId: null,
         objId: null,
         monitorCode: null,
         workUnitCode: null,
-        monitorStatus: null,
-        monitorType: null,
-        formulaMode: null,
+        monitorStatus: 0,
+        monitorType: 1,
+        formulaMode: 0,
         proportion: null,
         remark: null,
-        isFlag: null,
+        isFlag: 0,
         createdBy: null,
         createdTime: null,
         updatedBy: null,
@@ -388,7 +435,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
-      this.queryParams.monitorCode = null;
+      this.queryParams.workUnitCode = null;
       this.handleQuery();
     },
     // 多选框选中数据
@@ -400,6 +447,7 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.getTreeselect();
       this.open = true;
       this.title = "添加统计计量信息";
     },
@@ -416,6 +464,7 @@ export default {
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
+        console.log(this.form.monitorCode)
         if (valid) {
           if (this.form.objId != null) {
             updateMonitorWorkUnit(this.form).then(response => {
diff --git a/src/views/base/qualityInspectionItem/childIndex.vue b/src/views/base/qualityInspectionItem/childIndex.vue
new file mode 100644
index 0000000..d8331bf
--- /dev/null
+++ b/src/views/base/qualityInspectionItem/childIndex.vue
@@ -0,0 +1,372 @@
+<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="qualityDefectName">
+        <el-input
+          v-model="queryParams.qualityDefectName"
+          placeholder="请输入质量缺陷描述"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item label="物料大类" prop="materialCategories">
+        <el-input
+          v-model="queryParams.materialCategories"
+          placeholder="请输入物料大类"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="物料小类" prop="materialSubclass">
+        <el-input
+          v-model="queryParams.materialSubclass"
+          placeholder="请输入物料小类"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="工厂编号" prop="plantCode">
+        <el-input
+          v-model="queryParams.plantCode"
+          placeholder="请输入工厂编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="启用标识" prop="isFlag">
+        <el-select v-model="queryParams.isFlag" placeholder="请选择启用标识" clearable>
+          <el-option
+            v-for="dict in dict.type.is_flag"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+
+
+
+
+      <el-form-item>
+        <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>
+      </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="handleAdd"
+          v-hasPermi="['base:qualityInspectionItem:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['base:qualityInspectionItem:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['base:qualityInspectionItem:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['base:qualityInspectionItem:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="qualityInspectionItemList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="质量缺陷编号" align="center" prop="qualityDefectCode" v-if="columns[1].visible"/>
+      <el-table-column label="质量缺陷描述" align="center" prop="qualityDefectName" v-if="columns[2].visible"/>
+      <el-table-column label="备注" align="center" prop="remark" v-if="columns[7].visible"/>
+      <el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[8].visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['base:qualityInspectionItem:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['base:qualityInspectionItem:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改质检项信息维护对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="质量缺陷编号" prop="qualityDefectCode">
+          <el-input v-model="form.qualityDefectCode" placeholder="请输入质检项/质量缺陷编号" />
+        </el-form-item>
+        <el-form-item label="质量缺陷描述" prop="qualityDefectName">
+          <el-input v-model="form.qualityDefectName" placeholder="请输入质检项/质量缺陷描述" />
+        </el-form-item>
+        <el-form-item label="父级编号" prop="parentId">
+
+        <el-select v-model="form.parentId" placeholder="请选择父">
+          <el-option
+            v-for="item in Parents"
+            :key="item.qualityDefectCode"
+            :label="item.qualityDefectName"
+            :value="item.qualityDefectCode">
+          </el-option>
+        </el-select>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+        <el-form-item label="启用标识" prop="isFlag">
+          <el-radio-group v-model="form.isFlag">
+            <el-radio
+              v-for="dict in dict.type.is_flag"
+              :key="dict.value"
+              :label="parseInt(dict.value)"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listQualityInspectionItem,
+  getQualityInspectionItem,
+  delQualityInspectionItem,
+  addQualityInspectionItem,
+  updateQualityInspectionItem,
+  getQualityInspectionItemParent
+} from '@/api/base/qualityInspectionItem'
+
+export default {
+  name: "QualityInspectionItem",
+  dicts: ['is_flag'],
+  data() {
+    return {
+      Parents:"",
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 质检项信息维护表格数据
+      qualityInspectionItemList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        qualityDefectCode: null,
+        qualityDefectName: null,
+        parentId: null,
+        materialCategories: null,
+        materialSubclass: null,
+        plantCode: null,
+        isFlag: null,
+        createdBy: null,
+        createdTime: null,
+        updatedBy: null,
+        updatedTime: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      },
+      columns: [
+        { key: 0, label: `主键标识`, visible: true },
+        { key: 1, label: `质检项/质量缺陷编号`, visible: true },
+        { key: 2, label: `质检项/质量缺陷描述`, visible: true },
+        { key: 3, label: `父级编号`, visible: true },
+        { key: 4, label: `物料大类`, visible: true },
+        { key: 5, label: `物料小类`, visible: true },
+        { key: 6, label: `工厂编号`, visible: true },
+        { key: 7, label: `备注`, visible: true },
+        { key: 8, label: `启用标识`, visible: true },
+        { key: 9, label: `创建人`, visible: true },
+        { key: 10, label: `创建时间`, visible: true },
+        { key: 11, label: `更新人`, visible: true },
+        { key: 12, label: `更新时间`, visible: true },
+      ]
+    };
+  },
+  created() {
+    this.queryParams.parentId = this.$route.params && this.$route.params.parentId;
+    // console.log( this.queryParams.parentId)
+    this.getList();
+    this.getParent();
+  },
+  methods: {
+    /** 查询所有的父级 */
+    getParent(){
+      getQualityInspectionItemParent(this.queryParams).then(response =>{
+        // console.log(response.data)
+        this.Parents = response.data;
+      })
+    },
+    /** 查询质检项信息维护列表 */
+    getList() {
+      this.loading = true;
+      listQualityInspectionItem(this.queryParams).then(response => {
+        this.qualityInspectionItemList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        objId: null,
+        qualityDefectCode: null,
+        qualityDefectName: null,
+        parentId: null,
+        materialCategories: null,
+        materialSubclass: null,
+        plantCode: null,
+        remark: null,
+        isFlag: 0,
+        createdBy: null,
+        createdTime: null,
+        updatedBy: null,
+        updatedTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.objId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加质检项信息维护";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const objId = row.objId || this.ids
+      getQualityInspectionItem(objId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改质检项信息维护";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.objId != null) {
+            updateQualityInspectionItem(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addQualityInspectionItem(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const objIds = row.objId || this.ids;
+      this.$modal.confirm('是否确认删除质检项信息维护编号为"' + objIds + '"的数据项？').then(function() {
+        return delQualityInspectionItem(objIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('base/qualityInspectionItem/export', {
+        ...this.queryParams
+      }, `qualityInspectionItem_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
diff --git a/src/views/base/qualityInspectionItem/index.vue b/src/views/base/qualityInspectionItem/index.vue
new file mode 100644
index 0000000..f160440
--- /dev/null
+++ b/src/views/base/qualityInspectionItem/index.vue
@@ -0,0 +1,399 @@
+<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="qualityDefectCode">
+        <el-input
+          v-model="queryParams.qualityDefectCode"
+          placeholder="请输入质检项编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="物料大类" prop="materialCategories">
+        <el-select v-model="queryParams.materialCategories" placeholder="请选择物料大类" clearable>
+          <el-option
+            v-for="dict in dict.type.material_categories"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="物料小类" prop="materialSubclass">
+        <el-select v-model="queryParams.materialSubclass" placeholder="请选择物料大类" clearable>
+          <el-option
+            v-for="dict in dict.type.material_subclass"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="工厂编号" prop="plantCode">
+        <el-input
+          v-model="queryParams.plantCode"
+          placeholder="请输入工厂编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="启用标识" prop="isFlag">
+        <el-select v-model="queryParams.isFlag" placeholder="请选择启用标识" clearable>
+          <el-option
+            v-for="dict in dict.type.is_flag"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item>
+        <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>
+      </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="handleAdd"
+          v-hasPermi="['base:qualityInspectionItem:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['base:qualityInspectionItem:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['base:qualityInspectionItem:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['base:qualityInspectionItem:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="qualityInspectionItemList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="质检项编码" align="center" prop="qualityDefectCode" v-if="columns[1].visible">
+        <template slot-scope="scope">
+          <router-link :to="'/base/qualityInspectionItemChild/index/' + scope.row.qualityDefectCode" class="link-type">
+            <span>{{ scope.row.qualityDefectCode}}</span>
+          </router-link>
+        </template>
+      </el-table-column>
+      <el-table-column label="质检项名称" align="center" prop="qualityDefectName" v-if="columns[2].visible"/>
+      <el-table-column label="物料大类" align="center" prop="materialCategories" v-if="columns[4].visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.material_categories" :value="scope.row.materialCategories"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="物料小类" align="center" prop="materialSubclass" v-if="columns[5].visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.material_subclass" :value="scope.row.materialSubclass"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="工厂编号" align="center" prop="plantCode" v-if="columns[6].visible"/>
+      <el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[8].visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建人" align="center" prop="createdBy" v-if="columns[9].visible"/>
+      <el-table-column label="创建时间" align="center" prop="createdTime" width="180" v-if="columns[10].visible">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+<!--      <el-table-column label="更新人" align="center" prop="updatedBy" v-if="columns[11].visible"/>-->
+<!--      <el-table-column label="更新时间" align="center" prop="updatedTime" width="180" v-if="columns[12].visible">-->
+<!--        <template slot-scope="scope">-->
+<!--          <span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['base:qualityInspectionItem:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['base:qualityInspectionItem:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改质检项信息维护对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="质检项编码" prop="qualityDefectCode">
+          <el-input v-model="form.qualityDefectCode" placeholder="请输入质检项编码" />
+        </el-form-item>
+        <el-form-item label="质检项名称" prop="qualityDefectName">
+          <el-input v-model="form.qualityDefectName" placeholder="请输入质检项名称" />
+        </el-form-item>
+        <el-form-item label="物料大类" prop="materialCategories">
+          <el-radio-group v-model="form.materialCategories">
+            <el-radio
+              v-for="dict in dict.type.material_categories"
+              :key="dict.value"
+              :label="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="物料小类" prop="materialSubclass">
+          <el-radio-group v-model="form.materialSubclass">
+            <el-radio
+              v-for="dict in dict.type.material_subclass"
+              :key="dict.value"
+              :label="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="工厂编号" prop="plantCode">
+          <el-input v-model="form.plantCode" placeholder="请输入工厂编号" />
+        </el-form-item>
+
+        <el-form-item label="启用标识" prop="isFlag">
+          <el-radio-group v-model="form.isFlag">
+            <el-radio
+              v-for="dict in dict.type.is_flag"
+              :key="dict.value"
+              :label="parseInt(dict.value)"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listQualityInspectionItem, getQualityInspectionItem, delQualityInspectionItem, addQualityInspectionItem, updateQualityInspectionItem } from "@/api/base/qualityInspectionItem";
+
+export default {
+  name: "QualityInspectionItem",
+  dicts: ['is_flag','material_categories','material_subclass'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 质检项信息维护表格数据
+      qualityInspectionItemList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        qualityDefectCode: null,
+        qualityDefectName: null,
+        parentId: 0,
+        materialCategories: null,
+        materialSubclass: null,
+        plantCode: null,
+        isFlag: null,
+        createdBy: null,
+        createdTime: null,
+        updatedBy: null,
+        updatedTime: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      },
+      columns: [
+            { key: 0, label: `主键标识`, visible: true },
+            { key: 1, label: `质检项编码`, visible: true },
+            { key: 2, label: `质检项名称`, visible: true },
+            { key: 3, label: `父级编号`, visible: true },
+            { key: 4, label: `物料大类`, visible: true },
+            { key: 5, label: `物料小类`, visible: true },
+            { key: 6, label: `工厂编号`, visible: true },
+            { key: 7, label: `备注`, visible: true },
+            { key: 8, label: `启用标识`, visible: true },
+            { key: 9, label: `创建人`, visible: true },
+            { key: 10, label: `创建时间`, visible: true },
+            { key: 11, label: `更新人`, visible: true },
+            { key: 12, label: `更新时间`, visible: true },
+        ]
+    };
+  },
+  created() {
+    this.getList();
+
+  },
+  methods: {
+
+    /** 查询质检项信息维护列表 */
+    getList() {
+
+      this.loading = true;
+      listQualityInspectionItem(this.queryParams).then(response => {
+        this.qualityInspectionItemList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        objId: null,
+        qualityDefectCode: null,
+        qualityDefectName: null,
+        parentId: null,
+        materialCategories: null,
+        materialSubclass: null,
+        plantCode: null,
+        remark: null,
+        isFlag: null,
+        createdBy: null,
+        createdTime: null,
+        updatedBy: null,
+        updatedTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.objId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.form.parentId = 0;
+      this.form.materialCategories = 0;
+      this.form.materialSubclass = 0;
+      this.form.isFlag = 0;
+      this.open = true;
+      this.title = "添加质检项信息维护";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const objId = row.objId || this.ids
+      getQualityInspectionItem(objId).then(response => {
+        console.log(response.data)
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改质检项信息维护";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.objId != null) {
+            updateQualityInspectionItem(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addQualityInspectionItem(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const objIds = row.objId || this.ids;
+      this.$modal.confirm('是否确认删除质检项信息维护编号为"' + objIds + '"的数据项？').then(function() {
+        return delQualityInspectionItem(objIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('base/qualityInspectionItem/export', {
+        ...this.queryParams
+      }, `qualityInspectionItem_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
diff --git a/vue.config.js b/vue.config.js
index afe0349..ab99287 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -35,8 +35,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://10.11.43.2:8080`,
-        // target: `http://localhost:8080`,
+        // target: `http://10.11.43.2:8080`,
+        target: `http://localhost:8080`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''