From 61ad2570a6c16f71cfcd9d9160c559c63ec7b063 Mon Sep 17 00:00:00 2001
From: Yangwl <1726150332@qq.com>
Date: Tue, 29 Jul 2025 16:35:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E5=A2=9E=E5=8A=A0=E6=8A=BD?=
 =?UTF-8?q?=E6=A0=B7=E6=96=B9=E6=A1=88=E5=92=8C=E7=BC=BA=E9=99=B7=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E7=BB=B4=E6=8A=A4=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Yangwl <1726150332@qq.com>
---
 src/views/kanban/Packagingline/index2.vue    | 10 -------
 src/views/quality/checkTypeProject/index.vue | 28 +++++++++++++++++++-
 src/views/quality/qcProjectType/index.vue    |  1 +
 3 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/src/views/kanban/Packagingline/index2.vue b/src/views/kanban/Packagingline/index2.vue
index 09d8ce9..0636115 100644
--- a/src/views/kanban/Packagingline/index2.vue
+++ b/src/views/kanban/Packagingline/index2.vue
@@ -367,13 +367,6 @@
 <script>
 import {
   getBoardFactory,
-  getProduceStaticInfo,
-  getProduceNoOkList,
-  getCheckProjectsPie,
-  getProMonthNoOk,
-  getLineDayNoOk,
-  getMonthOfYearContrast,
-
 } from "@/api/kanban/quality";
 import {
   getDictData,
@@ -382,11 +375,8 @@ import {
   getPorOrderList,
   getProductionNumberPLC
 } from "@/api/kanban/Packagingline";
-import { getDeviceRefreshTime } from "@/api/kanban/equipment";
 import * as echarts from "echarts";
 import moment from "moment";
-// import Echarts3D from "./echarts3d.vue";
-// import Echarts3D2 from "./echarts3d2.vue";
 export default {
   name: "Index",
   components: {},
diff --git a/src/views/quality/checkTypeProject/index.vue b/src/views/quality/checkTypeProject/index.vue
index 7642a73..0701f65 100644
--- a/src/views/quality/checkTypeProject/index.vue
+++ b/src/views/quality/checkTypeProject/index.vue
@@ -232,6 +232,32 @@
               ></el-option>
             </el-select>
         </el-form-item>
+        <el-row>
+          <el-col>
+            <el-form-item label="抽样方案" prop="samplingPlan">
+              <el-select v-model="form.samplingPlan" placeholder="请选择抽样方案" style="width:100%">
+                <el-option
+                  v-for="dict in dict.type.sampling_plan"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col>
+            <el-form-item label="缺陷类别" prop="defectCategory">
+              <el-select v-model="form.defectCategory" placeholder="请选择缺陷类别" style="width:100%">
+                <el-option
+                  v-for="dict in dict.type.defect_category"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -263,7 +289,7 @@ import {getProjectList} from "@/api/quality/project";
 import SelectProject from "./selectProject.vue";
 export default {
   name: "CheckTypeProject",
-  dicts: ["qc_rule_prop",'unit'],
+  dicts: ["qc_rule_prop",'unit',"sampling_plan","defect_category"],
   components: {MaterialGroupAdd,SelectProject},
   data() {
     return {
diff --git a/src/views/quality/qcProjectType/index.vue b/src/views/quality/qcProjectType/index.vue
index 36ccf32..b9c1f3a 100644
--- a/src/views/quality/qcProjectType/index.vue
+++ b/src/views/quality/qcProjectType/index.vue
@@ -287,6 +287,7 @@
 						</el-form-item>
 					</el-col>
 				</el-row>
+
 				<!--
 				<el-row>
 					<el-col>