From 41fca7bd7311d8f925ee38c81af220ec0a8b26d9 Mon Sep 17 00:00:00 2001
From: shaoyong <yorkshao@163.com>
Date: Tue, 24 Oct 2023 18:08:42 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E6=A3=80=E9=AA=8C=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/quality/checkTypeProject.js           |  44 ++
 src/api/quality/materialGroup.js              |  52 ++
 src/api/quality/materialGroupDetail.js        |  44 ++
 .../checkTypeProject/MaterialGroupAdd.vue     | 344 ++++++++++++
 src/views/quality/checkTypeProject/index.vue  | 498 ++++++++++++++++++
 src/views/quality/material/index.vue          |   4 +-
 src/views/quality/project/index.vue           |   2 +-
 7 files changed, 985 insertions(+), 3 deletions(-)
 create mode 100644 src/api/quality/checkTypeProject.js
 create mode 100644 src/api/quality/materialGroup.js
 create mode 100644 src/api/quality/materialGroupDetail.js
 create mode 100644 src/views/quality/checkTypeProject/MaterialGroupAdd.vue
 create mode 100644 src/views/quality/checkTypeProject/index.vue

diff --git a/src/api/quality/checkTypeProject.js b/src/api/quality/checkTypeProject.js
new file mode 100644
index 0000000..69dc482
--- /dev/null
+++ b/src/api/quality/checkTypeProject.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询物料检验项目维护列表
+export function listCheckTypeProject(query) {
+	return request({
+		url: '/quality/checkTypeProject/list',
+		method: 'get',
+		params: query
+	});
+}
+
+// 查询物料检验项目维护详细
+export function getCheckTypeProject(id) {
+	return request({
+		url: '/quality/checkTypeProject/' + id,
+		method: 'get'
+		});
+}
+
+// 新增物料检验项目维护
+export function addCheckTypeProject(data) {
+	return request({
+		url: '/quality/checkTypeProject',
+		method: 'post',
+		data: data
+	});
+}
+
+// 修改物料检验项目维护
+export function updateCheckTypeProject(data) {
+	return request({
+		url: '/quality/checkTypeProject',
+		method: 'put',
+		data: data
+	});
+}
+
+// 删除物料检验项目维护
+export function delCheckTypeProject(id) {
+	return request({
+		url: '/quality/checkTypeProject/' + id,
+		method: 'delete'
+	});
+}
diff --git a/src/api/quality/materialGroup.js b/src/api/quality/materialGroup.js
new file mode 100644
index 0000000..0c63965
--- /dev/null
+++ b/src/api/quality/materialGroup.js
@@ -0,0 +1,52 @@
+import request from '@/utils/request'
+
+// 查询物料组列表
+export function listMaterialGroup(query) {
+	return request({
+		url: '/quality/materialGroup/list',
+		method: 'get',
+		params: query
+	});
+}
+
+// 查询物料树
+export function materialTreeSelect() {
+	return request({
+		url: '/quality/materialGroup/materialTree',
+		method: 'get'
+	});
+}
+
+// 查询物料组详细
+export function getMaterialGroup(id) {
+	return request({
+		url: '/quality/materialGroup/' + id,
+		method: 'get'
+		});
+}
+
+// 新增物料组
+export function addMaterialGroup(data) {
+	return request({
+		url: '/quality/materialGroup',
+		method: 'post',
+		data: data
+	});
+}
+
+// 修改物料组
+export function updateMaterialGroup(data) {
+	return request({
+		url: '/quality/materialGroup',
+		method: 'put',
+		data: data
+	});
+}
+
+// 删除物料组
+export function delMaterialGroup(id) {
+	return request({
+		url: '/quality/materialGroup/' + id,
+		method: 'delete'
+	});
+}
diff --git a/src/api/quality/materialGroupDetail.js b/src/api/quality/materialGroupDetail.js
new file mode 100644
index 0000000..55d8053
--- /dev/null
+++ b/src/api/quality/materialGroupDetail.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询物料组成员列表
+export function listMaterialGroupDetail(query) {
+	return request({
+		url: '/quality/materialGroupDetail/list',
+		method: 'get',
+		params: query
+	});
+}
+
+// 查询物料组成员详细
+export function getMaterialGroupDetail(id) {
+	return request({
+		url: '/quality/materialGroupDetail/' + id,
+		method: 'get'
+		});
+}
+
+// 新增物料组成员
+export function addMaterialGroupDetail(data) {
+	return request({
+		url: '/quality/materialGroupDetail',
+		method: 'post',
+		data: data
+	});
+}
+
+// 修改物料组成员
+export function updateMaterialGroupDetail(data) {
+	return request({
+		url: '/quality/materialGroupDetail',
+		method: 'put',
+		data: data
+	});
+}
+
+// 删除物料组成员
+export function delMaterialGroupDetail(id) {
+	return request({
+		url: '/quality/materialGroupDetail/' + id,
+		method: 'delete'
+	});
+}
diff --git a/src/views/quality/checkTypeProject/MaterialGroupAdd.vue b/src/views/quality/checkTypeProject/MaterialGroupAdd.vue
new file mode 100644
index 0000000..ff09cb1
--- /dev/null
+++ b/src/views/quality/checkTypeProject/MaterialGroupAdd.vue
@@ -0,0 +1,344 @@
+<template>
+  <div>
+    <el-col :span="4" :xs="24">
+      <!-- 新增按钮 -->
+      <el-button class="groupAdd" type="primary" @click="handleAdd"
+      >新增物料组</el-button>
+      <div class="head-container">
+        <el-input
+          v-model="groupName"
+          placeholder="请输入部门名称"
+          clearable
+          size="small"
+          prefix-icon="el-icon-search"
+          style="margin-bottom: 20px"
+        />
+      </div>
+      <div class="head-container">
+        <el-tree
+          :data="materialOptions"
+          :props="defaultProps"
+          :expand-on-click-node="false"
+          :filter-node-method="filterNode"
+          ref="tree"
+          node-key="id"
+          default-expand-all
+          highlight-current
+          @node-click="handleNodeClick"
+        >
+        <span class="custom-tree-node" slot-scope="{ node, data }">
+          <span>{{ node.label }}</span>
+          <span>
+            <el-button
+              class="btn-tree"
+              type="text"
+              size="medium"
+              @click="() => remove(node, data)">
+              －
+            </el-button>
+            <el-button
+              v-if="node.level == 1"
+              class="btn-tree"
+              type="text"
+              size="medium"
+              @click="() => append(data)">
+              ＋
+            </el-button>
+          </span>
+        </span>
+      </el-tree>
+      </div>
+    </el-col>
+    <!-- 新增物料组窗口 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="物料组名称" prop="groupName">
+          <el-input v-model="form.groupName" placeholder="请输入物料组名称" />
+        </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>
+    <!-- 新增物料窗口 -->
+    <!--产品物料选择弹窗-->
+			<ItemSelectMaterial
+				ref="itemSelectMaterial"
+				@onSelected="onSelectMaterial"
+			></ItemSelectMaterial>
+  </div>
+</template>
+
+<script>
+import {
+  addMaterialGroup,
+  delMaterialGroup,
+  updateMaterialGroup,
+  materialTreeSelect,
+} from "@/api/quality/materialGroup";
+import {
+  addMaterialGroupDetail,
+  listMaterialGroupDetail,
+  delMaterialGroupDetail,
+} from "@/api/quality/materialGroupDetail";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import ItemSelectMaterial from "../qcIncome/selectMaterial.vue";
+
+export default {
+  name: "MaterialGroupAdd",
+  comments: { Treeselect},
+  components: {ItemSelectMaterial},
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 物料树选项
+      materialOptions: undefined,
+      // 物料组名称
+      groupName: undefined,
+      // 物料组表格数据
+      materialGroupList: [],
+      //当前点击的节点数据
+      nodeData: {},
+      // 弹出层标题
+      title: "",
+      materialTitle: "",
+      // 是否显示弹出层
+      open: false,
+      materialOpen: false,
+      defaultProps: {
+        children: "children",
+        label: "label",
+        isLeaf: "isLeaf",
+      },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        groupName: null,
+        attr1: null,
+        factoryCode: null,
+      },
+      //表单参数
+      form: {},
+      //表单校验
+      rules: {},
+    };
+  },
+  watch: {
+    // 根据名称筛选部门树
+    groupName(val) {
+      this.$refs.tree.filter(val);
+    },
+  },
+  created() {
+    this.getMaterialTree();
+  },
+  methods: {
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        groupName: null,
+        attr1: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        factoryCode: null,
+        delFlag: null,
+        groupId: null,
+        materialCode: null,
+        materialName: null,
+      };
+      this.resetForm("form");
+    },
+    /** 查询部门下拉树结构 */
+    getMaterialTree() {
+      materialTreeSelect().then((response) => {
+        this.materialOptions = response.data;
+        this.treeInit();
+      });
+      
+
+    },
+    // 筛选节点
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
+    },
+    //将默认的树节点数据传递给父组件
+    treeInit() {
+      const firstTreeNode = this.materialOptions[0];
+      firstTreeNode.level = 1;
+      this.$emit('child-event', firstTreeNode); // 触发事件并传递数据给父组件 
+    },
+    //树节点点击事件
+    handleNodeClick(data,node) {
+        this.nodeData.id = data.id;
+        this.nodeData.name = data.label;
+        this.nodeData.level = node.level;
+        if(node.level == 2) {
+          listMaterialGroupDetail(this.queryParams).then((response) => {
+            this.materialGroupList = response.rows;
+            const temp = this.materialGroupList.find(obj => obj.id === data.id);
+            console.log(temp.materialCode);
+            this.nodeData.materialCode = temp.materialCode;
+            this.$emit('onNodeClick', this.nodeData);
+          });
+        }else{
+          this.$emit('onNodeClick', this.nodeData);
+        }
+ 
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加物料组";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids;
+      getMaterialGroup(id).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改物料组";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateMaterialGroup(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getMaterialTree();
+            });
+          } else {
+            addMaterialGroup(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getMaterialTree();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal
+        .confirm('是否确认删除物料组编号为"' + ids + '"的数据项？')
+        .then(function () {
+          return delMaterialGroup(ids);
+        })
+        .then(() => {
+          this.getMaterialTree();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "quality/materialGroup/export",
+        {
+          ...this.queryParams,
+        },
+        `materialGroup_${new Date().getTime()}.xlsx`
+      );
+    },
+    /**添加树节点 */
+    append(data) {
+      this.reset();
+      this.form.groupId = data.id;
+      this.$refs.itemSelectMaterial.showFlag = true;
+      },
+     /**删除树节点 */
+    remove(node, data) {
+      const id = data.id;
+      console.log(node);
+      if(node.level == 1) {
+        this.$modal
+        .confirm('是否确认删除物料组名称为"' + data.label + '"的数据项？')
+        .then(function () {
+          //删除物料组
+          return delMaterialGroup(id);
+        })
+        .then(() => {
+          this.getMaterialTree();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+       }else{
+        this.$modal
+        .confirm('是否确认删除物料名称为"' + data.label + '"的数据项？')
+        .then(function () {
+          //删除物料
+          return delMaterialGroupDetail(id);
+        })
+        .then(() => {
+          this.getMaterialTree();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+       }
+    },
+     //物料选择确认
+		onSelectMaterial(obj) {
+       this.form.materialCode = obj.code[0];
+		   this.form.materialName = obj.name[0];
+       console.log(this.form.groupId);
+       if(this.form.materialCode != null) {
+        addMaterialGroupDetail(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getMaterialTree();
+            });
+       }
+		}
+  },
+};
+</script>
+
+<style>
+.groupAdd {
+  margin: 10px auto;
+  width: 100%;
+  
+}
+.custom-tree-node {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-size: 16px;
+  font: bolder;
+  padding-right: 8px;
+}
+.custom-tree-node .btn-tree {
+  margin: 0 8px;
+  font-size: 20px;
+  font: bolder;
+}
+</style>
diff --git a/src/views/quality/checkTypeProject/index.vue b/src/views/quality/checkTypeProject/index.vue
new file mode 100644
index 0000000..04a5d88
--- /dev/null
+++ b/src/views/quality/checkTypeProject/index.vue
@@ -0,0 +1,498 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <MaterialGroupAdd ref="MaterialGroupAdd" @onNodeClick="onNodeClick" @child-event="getCheckTypeList"></MaterialGroupAdd>
+      <el-col :span="20" :xs="24"> 
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="23" :xs="24">
+            <el-tabs v-model="editableTabsValue" type="card" @tab-click="handleClick">
+              <el-tab-pane
+                :key="item.id"
+                v-for="(item) in editableTabs"
+                :label="item.checkName"
+                :name="item.id"
+              >
+              </el-tab-pane>
+            </el-tabs>
+          </el-col>
+        </el-row>
+        <el-form
+          :model="queryParams"
+          ref="queryForm"
+          size="small"
+          :inline="true"
+          v-show="showSearch"
+          label-width="100px"
+        >
+          <el-form-item label="预留字段1" prop="attr1">
+            <el-input
+              v-model="queryParams.attr1"
+              placeholder="请输入预留字段1"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="工厂编码" prop="factoryCode">
+            <el-input
+              v-model="queryParams.factoryCode"
+              placeholder="请输入工厂编码"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </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="['quality:checkTypeProject: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="['quality:checkTypeProject: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="['quality:checkTypeProject: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="['quality:checkTypeProject:export']"
+              >导出</el-button
+            >
+          </el-col>
+          <right-toolbar
+            :showSearch.sync="showSearch"
+            @queryTable="getList"
+          ></right-toolbar>
+        </el-row>
+
+        <el-table
+          v-loading="loading"
+          :data="checkTypeProjectList"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="检验规则名称" align="center" prop="ruleName" />
+          <el-table-column label="标准值" align="center" prop="standardValue" />
+          <el-table-column label="上差值" align="center" prop="upperDiff" />
+          <el-table-column label="下差值" align="center" prop="downDiff" />
+          <el-table-column label="抽样比例" align="center" prop="sample" />
+          <el-table-column label="抽样数量" align="center" prop="sampleNum" />
+          <el-table-column
+            label="是否启用,0是1否"
+            align="center"
+            prop="status"
+          /> 
+          <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="['quality:checkTypeProject:edit']"
+                >修改</el-button
+              >
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['quality:checkTypeProject: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-col>
+    </el-row>
+
+    <!-- 添加或修改物料检验项目维护对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="规则名称" prop="projectId">
+          <el-select v-model="form.projectId" @change="handleChange" placeholder="请选择检验规则属性" >
+						<el-option
+							v-for="item in checkRuleList"
+							:key="item.id"
+							:label="item.ruleName"
+							:value="item.id"
+						></el-option>
+					</el-select>
+        </el-form-item>
+        <el-form-item label="抽样比例" prop="sample">
+          <el-input v-model="form.sample" placeholder="请输入抽样比例" />
+        </el-form-item>
+        <el-form-item label="抽样数量" prop="sampleNum">
+          <el-input v-model="form.sampleNum" placeholder="请输入抽样数量" />
+        </el-form-item>
+        <el-form-item label="规则方式" prop="propertyCode">
+          <el-select v-model="form.propertyCode" disabled placeholder="请选择检验规则属性"  >
+						<el-option
+							v-for="dict in dict.type.qc_rule_prop"
+							:key="dict.value"
+							:label="dict.label"
+							:value="dict.value"
+						></el-option>
+					</el-select>
+        </el-form-item>
+        <div v-if="form.propertyCode === '1'">
+          <el-form-item label="标准值" prop="standardValue">
+            <el-input v-model="form.standardValue" placeholder="请输入标准值" />
+          </el-form-item>
+          <el-form-item label="上差值" prop="upperDiff">
+            <el-input v-model="form.upperDiff" placeholder="请输入上差值" />
+          </el-form-item>
+          <el-form-item label="下差值" prop="downDiff">
+            <el-input v-model="form.downDiff" placeholder="请输入下差值" />
+          </el-form-item>
+        </div>
+        
+      </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 {
+  listCheckTypeProject,
+  getCheckTypeProject,
+  delCheckTypeProject,
+  addCheckTypeProject,
+  updateCheckTypeProject,
+} from "@/api/quality/checkTypeProject";
+import MaterialGroupAdd from "./MaterialGroupAdd.vue";
+import {listCheckType} from "@/api/quality/checkType";
+import {listProject} from "@/api/quality/project";
+
+export default {
+  name: "CheckTypeProject",
+  dicts: ["qc_rule_prop"],
+  components: {MaterialGroupAdd,},
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      groupId: null,
+      materialCode: null,
+      // 总条数
+      total: 0,
+      // 物料检验项目维护表格数据
+      checkTypeProjectList: [],
+      checkRuleList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      editableTabsValue: '',
+      editableTabs: [/* {
+        title: 'Tab 1',
+        name: '1',
+        content: 'Tab 1 content'
+      }, {
+        title: 'Tab 2',
+        name: '2',
+        content: 'Tab 2 content'
+      } */],
+      tabIndex: null,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        projectId: null,
+        ruleName: null,
+        typeId: null,
+        standardValue: null,
+        upperDiff: null,
+        downDiff: null,
+        sample: null,
+        sampleNum: null,
+        status: null,
+        attr1: null,
+        factoryCode: null,
+        groupName: null,
+        groupId: null,
+        materialCode: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        projectId: [
+          { required: true, message: "检验项目id不能为空", trigger: "blur" },
+        ],
+        factoryCode: [
+          { required: true, message: "工厂编码不能为空", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  created() {
+    //this.getList();
+  },
+  methods: {
+    /** 查询物料检验项目维护列表 */
+    getList() {
+      this.loading = true;
+      console.log(this.queryParams);
+      listCheckTypeProject(this.queryParams).then((response) => {
+        this.checkTypeProjectList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    /**初始化表格信息 */
+    
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        projectId: null,
+        ruleName: null,
+        propertyCode: null,
+        typeId: null,
+        standardValue: null,
+        upperDiff: null,
+        downDiff: null,
+        sample: null,
+        sampleNum: null,
+        status: null,
+        attr1: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        factoryCode: null,
+        delFlag: null,
+        groupId: null,
+        materialCode: null,
+        projectNo: null,
+      };
+      this.resetForm("form");
+    },
+    /**物料树点击 */
+    onNodeClick(obj) {
+      if(obj.level == 1) {
+        this.queryParams.groupId = obj.id;
+        this.groupId = obj.id;
+        this.queryParams.materialCode = null;
+        this.materialCode = null;
+      }else{
+        this.queryParams.materialCode = obj.materialCode;
+        this.materialCode = obj.materialCode;
+        this.queryParams.groupId = null;
+        this.groupId = null;
+      }
+      this.queryParams.typeId = this.editableTabsValue;
+      this.handleQuery();
+
+    },
+    /**获取检测节点*/
+    getCheckTypeList(obj) {
+      listCheckType().then((response) => {
+        this.editableTabs = response.rows;
+        this.editableTabsValue = response.rows[0].id;
+        this.tabIndex = response.rows.length;
+        this.queryParams.groupId = obj.id;
+        this.queryParams.typeId = this.editableTabsValue;
+        this.getList();
+      });
+
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /**检验规则改变事件 */
+    handleChange() {
+      const obj = this.checkRuleList.find(obj => obj.id === this.form.projectId);
+      console.log(obj);
+      this.form.propertyCode = obj.propertyCode;
+      this.form.standardValue = obj.checkStandard;
+      this.form.projectNo = obj.orderNum;
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加物料检验项目维护";
+      this.form.groupId = this.groupId;
+      this.form.materialCode = this.materialCode;
+      this.form.typeId = this.editableTabsValue;
+      listProject().then((response) => {
+          this.checkRuleList = response.rows;
+      });
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids;
+      getCheckTypeProject(id).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改物料检验项目维护";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateCheckTypeProject(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addCheckTypeProject(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            }); 
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal
+        .confirm('是否确认删除物料检验项目维护编码为"' + ids + '"的数据项？')
+        .then(function () {
+          return delCheckTypeProject(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "quality/checkTypeProject/export",
+        {
+          ...this.queryParams,
+        },
+        `checkTypeProject_${new Date().getTime()}.xlsx`
+      );
+    },
+    /**标签编辑事件 */
+    handleTabsEdit(targetName, action) {
+      if (action === 'add') {
+        let newTabName = ++this.tabIndex + '';
+        this.editableTabs.push({
+          title: 'New Tab',
+          name: newTabName,
+          content: 'New Tab content'
+        });
+        this.editableTabsValue = newTabName;
+      }
+      if (action === 'remove') {
+        let tabs = this.editableTabs;
+        let activeName = this.editableTabsValue;
+        if (activeName === targetName) {
+          tabs.forEach((tab, index) => {
+            if (tab.name === targetName) {
+              let nextTab = tabs[index + 1] || tabs[index - 1];
+              if (nextTab) {
+                activeName = nextTab.name;
+              }
+            }
+          });
+        }
+        
+        this.editableTabsValue = activeName;
+        this.editableTabs = tabs.filter(tab => tab.name !== targetName);
+      }
+    },
+    /**标签点击事件 */
+    handleClick(tab, event) {
+      this.queryParams.typeId = tab.name;
+      this.handleQuery();
+    },
+  },
+};
+</script>
diff --git a/src/views/quality/material/index.vue b/src/views/quality/material/index.vue
index 5dd1810..4c54cc3 100644
--- a/src/views/quality/material/index.vue
+++ b/src/views/quality/material/index.vue
@@ -88,7 +88,7 @@
 			</el-form>
 			<el-tabs type="border-card" v-if="form.userCodes != null">
 				<el-tab-pane label="关联物料">
-					<Userbind v-if="form.userCodes !=null" :optType="optType" :userCodes="form.userCodes"></Userbind>
+					<UserBind v-if="form.userCodes !=null" :optType="optType" :userCodes="form.userCodes"></UserBind>
 				</el-tab-pane>
 			</el-tabs>
 			<div slot="footer" class="dialog-footer">
@@ -101,7 +101,7 @@
 
 <script>
 import { listMaterial, getMaterial, delMaterial, addMaterial, updateMaterial } from "@/api/quality/material";
-import Userbind from "./userbind.vue";
+import Userbind from "./UserBind.vue";
 
 export default {
 	name: "Material",
diff --git a/src/views/quality/project/index.vue b/src/views/quality/project/index.vue
index f6e804d..46b2468 100644
--- a/src/views/quality/project/index.vue
+++ b/src/views/quality/project/index.vue
@@ -92,7 +92,7 @@
 
 		<el-table v-loading="loading" :data="projectList" @selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="55" align="center" />
-			<el-table-column label="检验规则编号" align="center" type="index" width="100"/>
+			<el-table-column label="检验规则编号" align="center" prop="orderNum" width="100"/>
 			<el-table-column label="检验规则名称" align="center" prop="ruleName" />
 			<el-table-column label="检验规则属性" align="center" prop="propertyCode" >
 				<template slot-scope="scope">