From 9ebd4558594dcdcf4321b2d7be6bc3fe3036da5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Wed, 21 Jun 2023 16:56:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/index.html                             |   5 +-
 src/i18n/zh-CN.js                             | 116 +++-
 src/utils/request.js                          |   4 +-
 src/views/modules/basic/qmsControlMode.vue    |   3 +-
 src/views/modules/basic/qmsCustomer.vue       |   3 +-
 src/views/modules/basic/qmsCustomerType.vue   |   4 +-
 src/views/modules/basic/qmsFailureType.vue    |   6 +-
 src/views/modules/basic/qmsProduct.vue        |   4 +-
 src/views/modules/basic/qmsProductType.vue    |   6 +-
 src/views/modules/basic/qmsTeam.vue           |   6 +-
 .../modules/code/components/available.vue     |  41 ++
 .../components/deliveryInspection-add.vue     | 427 ++++++++++++
 .../components/deliveryInspectionSearch.vue   | 321 +++++++++
 .../code/components/eightDiscipline-add.vue   | 172 +++++
 .../code/components/productInspection-add.vue | 428 ++++++++++++
 .../components/productInspectionSearch.vue    | 321 +++++++++
 .../components/productRegistration-add.vue    | 634 ++++++++++++++++++
 .../components/productRegistrationSearch.vue  | 366 ++++++++++
 src/views/modules/code/components/radio.vue   |  49 ++
 .../components/shipmentRegistration-add.vue   | 634 ++++++++++++++++++
 .../components/shipmentRegistrationSearch.vue | 366 ++++++++++
 .../components/startEightDiscipline-add.vue   | 359 ++++++++++
 src/views/modules/code/deliveryInspection.vue | 322 +++++++++
 src/views/modules/code/eightDiscipline.vue    | 197 ++++++
 src/views/modules/code/examineAndApprove.vue  | 214 ++++++
 src/views/modules/code/productInspection.vue  | 321 +++++++++
 .../modules/code/productRegistration.vue      | 338 ++++++++++
 .../modules/code/shipmentRegistration.vue     | 338 ++++++++++
 .../modules/code/startEightDiscipline.vue     | 221 ++++++
 .../code/startEightDisciplineCreateTeam.vue   | 207 ++++++
 ...tDisciplineDescriptionCorrectiveAction.vue | 205 ++++++
 ...tartEightDisciplinePreliminaryAnalysis.vue | 213 ++++++
 .../startEightDisciplinePreventRecurrence.vue | 205 ++++++
 .../startEightDisciplineRootCauseAnalysis.vue | 204 ++++++
 .../startEightDisciplineSummaryExperience.vue | 205 ++++++
 ...htDisciplineTemporaryTreatmentMeasures.vue | 212 ++++++
 .../code/startEightDisciplineValidation.vue   | 204 ++++++
 src/views/modules/finishproduct/CDiagram.vue  | 311 +++++++++
 src/views/modules/finishproduct/NPDiagram.vue | 317 +++++++++
 src/views/modules/finishproduct/UDiagram.vue  | 328 +++++++++
 src/views/modules/finishproduct/boxplot.vue   | 370 ++++++++++
 .../components/meanMovingRangeRange.vue       | 254 +++++++
 .../meanMovingRangeStandardDeviation.vue      | 254 +++++++
 .../finishproduct/components/meanRange.vue    | 264 ++++++++
 .../finishproduct/components/meanStandard.vue | 264 ++++++++
 .../finishproduct/components/medianRange.vue  | 271 ++++++++
 .../components/singleValueMovingRange.vue     | 264 ++++++++
 .../modules/finishproduct/controlDiagram.vue  | 442 ++++++++++++
 .../modules/finishproduct/paretoDiagram.vue   | 312 +++++++++
 .../modules/finishproduct/scatterPlot.vue     | 303 +++++++++
 .../modules/finishproduct/stageDiagram.vue    | 298 ++++++++
 .../modules/finishproduct/trendChart.vue      | 319 +++++++++
 .../modules/gage/components/gageType-add.vue  |   4 +-
 .../gage/components/parameter-show.vue        |   4 +-
 .../modules/gage/components/verify-show.vue   |   4 +-
 src/views/modules/gage/qmsGage.vue            |   5 +-
 src/views/modules/gage/qmsGageGrr.vue         | 115 +++-
 src/views/modules/gage/qmsGageResume.vue      |   5 +-
 src/views/modules/gage/qmsGageType.vue        |   5 +-
 .../gage/qmsGageTypeDifferenceParameter.vue   |   5 +-
 .../modules/gage/qmsGageVerification.vue      |   5 +-
 .../gage/qmsStationDeviationAnalysis.vue      |   8 +-
 src/views/modules/incoming/CDiagram.vue       | 311 +++++++++
 src/views/modules/incoming/NPDiagram.vue      | 317 +++++++++
 src/views/modules/incoming/UDiagram.vue       | 328 +++++++++
 src/views/modules/incoming/boxplot.vue        | 370 ++++++++++
 .../modules/incoming/components/available.vue |  43 ++
 .../components/incomingInspection-add.vue     | 427 ++++++++++++
 .../components/incomingInspectionSearch.vue   | 321 +++++++++
 .../components/meanMovingRangeRange.vue       | 254 +++++++
 .../meanMovingRangeStandardDeviation.vue      | 254 +++++++
 .../modules/incoming/components/meanRange.vue | 264 ++++++++
 .../incoming/components/meanStandard.vue      | 264 ++++++++
 .../incoming/components/medianRange.vue       | 271 ++++++++
 .../modules/incoming/components/planBtn.vue   |  68 ++
 .../components/purchaseRegistration-add.vue   | 634 ++++++++++++++++++
 .../components/purchaseRegistrationSearch.vue | 366 ++++++++++
 .../modules/incoming/components/radio.vue     |  49 ++
 .../components/singleValueMovingRange.vue     | 264 ++++++++
 src/views/modules/incoming/controlChart.vue   | 442 ++++++++++++
 .../modules/incoming/incomingInspection.vue   | 312 +++++++++
 src/views/modules/incoming/paretoDiagram.vue  | 312 +++++++++
 .../modules/incoming/purchaseRegistration.vue | 337 ++++++++++
 src/views/modules/incoming/scatterPlot.vue    | 303 +++++++++
 src/views/modules/incoming/stageDiagram.vue   | 298 ++++++++
 src/views/modules/incoming/trendChart.vue     | 319 +++++++++
 .../qmsLaboratoryEmployeeResume.vue           |   4 +-
 .../laboratory/qmsLaboratoryTester.vue        |   3 +-
 ...aboratoryTesterInspectionQualification.vue |   4 +-
 .../qmsLaboratoryTrainExperience.vue          |   4 +-
 .../modules/mutual/qmsApprovalProcess.vue     |   3 +-
 .../qmsApprovalProcessConfiguration.vue       |   3 +-
 .../modules/mutual/qmsDataDictionary.vue      |   3 +-
 .../mutual/qmsDataDictionaryDetail.vue        |   4 +-
 .../mutual/qmsModuleDataDictionary.vue        |   3 +-
 ...msApprovalDispositionTeamConfiguration.vue |   3 +-
 .../qmsNonconformityReviewSheet.vue           |   3 +-
 .../quality/components/transferScheme-add.vue |  26 +-
 .../modules/quality/qmsCustomSampling.vue     |   4 +-
 .../modules/quality/qmsDisposalMethod.vue     |   4 +-
 .../modules/quality/qmsInspectionPosition.vue |   4 +-
 src/views/modules/quality/qmsSamplingPlan.vue |   4 +-
 .../modules/quality/qmsTransferRecords.vue    |   4 +-
 .../modules/quality/qmsTransferScheme.vue     |   4 +-
 src/views/modules/shipment/CDiagram.vue       | 311 +++++++++
 src/views/modules/shipment/NPDiagram.vue      | 317 +++++++++
 src/views/modules/shipment/UDiagram.vue       | 328 +++++++++
 src/views/modules/shipment/boxplot.vue        | 370 ++++++++++
 .../components/meanMovingRangeRange.vue       | 254 +++++++
 .../meanMovingRangeStandardDeviation.vue      | 254 +++++++
 .../modules/shipment/components/meanRange.vue | 264 ++++++++
 .../shipment/components/meanStandard.vue      | 264 ++++++++
 .../shipment/components/medianRange.vue       | 271 ++++++++
 .../components/singleValueMovingRange.vue     | 264 ++++++++
 src/views/modules/shipment/controlDiagram.vue | 442 ++++++++++++
 src/views/modules/shipment/paretoDiagram.vue  | 312 +++++++++
 src/views/modules/shipment/scatterPlot.vue    | 303 +++++++++
 src/views/modules/shipment/stageDiagram.vue   | 298 ++++++++
 src/views/modules/shipment/trendChart.vue     | 319 +++++++++
 .../components/evaluationItemList-add.vue     | 205 ++++++
 .../supplier/components/levelSetting-add.vue  | 171 +++++
 .../components/levelSettingSearch.vue         | 129 ++++
 .../supplier/components/projectType-add.vue   | 177 +++++
 .../supplier/components/projectTypeSearch.vue | 129 ++++
 .../supplier/qmsEvaluationItemList.vue        | 294 ++++++++
 .../supplier/qmsEvaluationItemListTag.vue     |   6 +-
 .../modules/supplier/qmsEvaluationPlan.vue    | 302 +++++++++
 .../modules/supplier/qmsEvaluationTask.vue    |   6 +-
 .../modules/supplier/qmsLevelSetting.vue      | 287 ++++++++
 src/views/modules/supplier/qmsPoorLaunch.vue  |   6 +-
 src/views/modules/supplier/qmsProjectType.vue | 269 ++++++++
 .../modules/supplier/qmsQualityAccident.vue   |   6 +-
 src/views/modules/supplier/qmsSupplier.vue    |   6 +-
 .../modules/supplier/qmsSupplierProduct.vue   |   6 +-
 .../modules/supplier/qmsSupplierType.vue      |   4 +-
 src/views/modules/sys/dict-data.vue           |  45 +-
 src/views/modules/sys/dict-type.vue           |  36 +-
 src/views/pages/login.vue                     |  14 +-
 vue.config.js                                 |   2 +-
 139 files changed, 26302 insertions(+), 196 deletions(-)
 create mode 100644 src/views/modules/code/components/available.vue
 create mode 100644 src/views/modules/code/components/deliveryInspection-add.vue
 create mode 100644 src/views/modules/code/components/deliveryInspectionSearch.vue
 create mode 100644 src/views/modules/code/components/eightDiscipline-add.vue
 create mode 100644 src/views/modules/code/components/productInspection-add.vue
 create mode 100644 src/views/modules/code/components/productInspectionSearch.vue
 create mode 100644 src/views/modules/code/components/productRegistration-add.vue
 create mode 100644 src/views/modules/code/components/productRegistrationSearch.vue
 create mode 100644 src/views/modules/code/components/radio.vue
 create mode 100644 src/views/modules/code/components/shipmentRegistration-add.vue
 create mode 100644 src/views/modules/code/components/shipmentRegistrationSearch.vue
 create mode 100644 src/views/modules/code/components/startEightDiscipline-add.vue
 create mode 100644 src/views/modules/code/deliveryInspection.vue
 create mode 100644 src/views/modules/code/eightDiscipline.vue
 create mode 100644 src/views/modules/code/examineAndApprove.vue
 create mode 100644 src/views/modules/code/productInspection.vue
 create mode 100644 src/views/modules/code/productRegistration.vue
 create mode 100644 src/views/modules/code/shipmentRegistration.vue
 create mode 100644 src/views/modules/code/startEightDiscipline.vue
 create mode 100644 src/views/modules/code/startEightDisciplineCreateTeam.vue
 create mode 100644 src/views/modules/code/startEightDisciplineDescriptionCorrectiveAction.vue
 create mode 100644 src/views/modules/code/startEightDisciplinePreliminaryAnalysis.vue
 create mode 100644 src/views/modules/code/startEightDisciplinePreventRecurrence.vue
 create mode 100644 src/views/modules/code/startEightDisciplineRootCauseAnalysis.vue
 create mode 100644 src/views/modules/code/startEightDisciplineSummaryExperience.vue
 create mode 100644 src/views/modules/code/startEightDisciplineTemporaryTreatmentMeasures.vue
 create mode 100644 src/views/modules/code/startEightDisciplineValidation.vue
 create mode 100644 src/views/modules/finishproduct/CDiagram.vue
 create mode 100644 src/views/modules/finishproduct/NPDiagram.vue
 create mode 100644 src/views/modules/finishproduct/UDiagram.vue
 create mode 100644 src/views/modules/finishproduct/boxplot.vue
 create mode 100644 src/views/modules/finishproduct/components/meanMovingRangeRange.vue
 create mode 100644 src/views/modules/finishproduct/components/meanMovingRangeStandardDeviation.vue
 create mode 100644 src/views/modules/finishproduct/components/meanRange.vue
 create mode 100644 src/views/modules/finishproduct/components/meanStandard.vue
 create mode 100644 src/views/modules/finishproduct/components/medianRange.vue
 create mode 100644 src/views/modules/finishproduct/components/singleValueMovingRange.vue
 create mode 100644 src/views/modules/finishproduct/controlDiagram.vue
 create mode 100644 src/views/modules/finishproduct/paretoDiagram.vue
 create mode 100644 src/views/modules/finishproduct/scatterPlot.vue
 create mode 100644 src/views/modules/finishproduct/stageDiagram.vue
 create mode 100644 src/views/modules/finishproduct/trendChart.vue
 create mode 100644 src/views/modules/incoming/CDiagram.vue
 create mode 100644 src/views/modules/incoming/NPDiagram.vue
 create mode 100644 src/views/modules/incoming/UDiagram.vue
 create mode 100644 src/views/modules/incoming/boxplot.vue
 create mode 100644 src/views/modules/incoming/components/available.vue
 create mode 100644 src/views/modules/incoming/components/incomingInspection-add.vue
 create mode 100644 src/views/modules/incoming/components/incomingInspectionSearch.vue
 create mode 100644 src/views/modules/incoming/components/meanMovingRangeRange.vue
 create mode 100644 src/views/modules/incoming/components/meanMovingRangeStandardDeviation.vue
 create mode 100644 src/views/modules/incoming/components/meanRange.vue
 create mode 100644 src/views/modules/incoming/components/meanStandard.vue
 create mode 100644 src/views/modules/incoming/components/medianRange.vue
 create mode 100644 src/views/modules/incoming/components/planBtn.vue
 create mode 100644 src/views/modules/incoming/components/purchaseRegistration-add.vue
 create mode 100644 src/views/modules/incoming/components/purchaseRegistrationSearch.vue
 create mode 100644 src/views/modules/incoming/components/radio.vue
 create mode 100644 src/views/modules/incoming/components/singleValueMovingRange.vue
 create mode 100644 src/views/modules/incoming/controlChart.vue
 create mode 100644 src/views/modules/incoming/incomingInspection.vue
 create mode 100644 src/views/modules/incoming/paretoDiagram.vue
 create mode 100644 src/views/modules/incoming/purchaseRegistration.vue
 create mode 100644 src/views/modules/incoming/scatterPlot.vue
 create mode 100644 src/views/modules/incoming/stageDiagram.vue
 create mode 100644 src/views/modules/incoming/trendChart.vue
 create mode 100644 src/views/modules/shipment/CDiagram.vue
 create mode 100644 src/views/modules/shipment/NPDiagram.vue
 create mode 100644 src/views/modules/shipment/UDiagram.vue
 create mode 100644 src/views/modules/shipment/boxplot.vue
 create mode 100644 src/views/modules/shipment/components/meanMovingRangeRange.vue
 create mode 100644 src/views/modules/shipment/components/meanMovingRangeStandardDeviation.vue
 create mode 100644 src/views/modules/shipment/components/meanRange.vue
 create mode 100644 src/views/modules/shipment/components/meanStandard.vue
 create mode 100644 src/views/modules/shipment/components/medianRange.vue
 create mode 100644 src/views/modules/shipment/components/singleValueMovingRange.vue
 create mode 100644 src/views/modules/shipment/controlDiagram.vue
 create mode 100644 src/views/modules/shipment/paretoDiagram.vue
 create mode 100644 src/views/modules/shipment/scatterPlot.vue
 create mode 100644 src/views/modules/shipment/stageDiagram.vue
 create mode 100644 src/views/modules/shipment/trendChart.vue
 create mode 100644 src/views/modules/supplier/components/evaluationItemList-add.vue
 create mode 100644 src/views/modules/supplier/components/levelSetting-add.vue
 create mode 100644 src/views/modules/supplier/components/levelSettingSearch.vue
 create mode 100644 src/views/modules/supplier/components/projectType-add.vue
 create mode 100644 src/views/modules/supplier/components/projectTypeSearch.vue
 create mode 100644 src/views/modules/supplier/qmsEvaluationItemList.vue
 create mode 100644 src/views/modules/supplier/qmsEvaluationPlan.vue
 create mode 100644 src/views/modules/supplier/qmsLevelSetting.vue
 create mode 100644 src/views/modules/supplier/qmsProjectType.vue

diff --git a/public/index.html b/public/index.html
index 0805fba..57e2576 100644
--- a/public/index.html
+++ b/public/index.html
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2022-08-22 14:57:50
  * @LastEditors: zhp
- * @LastEditTime: 2023-05-12 14:03:44
+ * @LastEditTime: 2023-06-21 13:55:38
  * @Description: 
 -->
 <!DOCTYPE html>
@@ -38,7 +38,8 @@
   <!-- 开发环境 -->
   <% if (process.env.VUE_APP_NODE_ENV==='dev' ) { %>
     <script>
-      window.SITE_CONFIG['apiURL'] = 'http://192.168.1.23:8080';
+      // window.SITE_CONFIG['apiURL'] = 'http://192.168.1.76:8080/ym-pass';
+      window.SITE_CONFIG['apiURL'] = 'http://192.168.1.23:8080/';
     </script>
     <% } %>
       <!-- 集成测试环境 -->
diff --git a/src/i18n/zh-CN.js b/src/i18n/zh-CN.js
index 11422a3..9e7c6b1 100644
--- a/src/i18n/zh-CN.js
+++ b/src/i18n/zh-CN.js
@@ -418,7 +418,26 @@ t.supplier.description = '说明'
 t.supplier.evaluationPeriod	= '评估时间段'		
 t.supplier.evaluationType = '评估类型'
 t.supplier.reminder	= '提醒人'	
-t.supplier.title	= '标题'
+t.supplier.title = '标题'
+t.supplier.projectTypeName	= '类别'
+t.supplier.requirement = '要求'
+t.supplier.statisticalValue = '是否统计值'
+t.supplier.evaluationTemplateName = '评估模板'
+t.supplier.lastStartTime = '上次启动时间段'
+t.supplier.lastStartEvaluationPeriod = '上次启动评估时间段'
+t.supplier.estimatedNextStartTime = '预计下次启动时间'
+t.supplier.offline = '下限'
+t.supplier.online = '上限'
+
+
+
+	
+
+
+
+
+
+
 
 t.gage = {}
 t.gage.name = '名称'
@@ -503,6 +522,10 @@ t.gage.verifyLog = '校验记录'
 t.gage.insideVerify = '内部校验'
 t.gage.outsideVerify = '外部校验'
 t.gage.verificationFee = '校验费用'
+t.gage.report = '量具重复性及再现性分析报告'
+t.gage.model = '型号'
+
+
 
 
 
@@ -541,6 +564,84 @@ t.laboratory.trainDuration = '培训时长'
 t.laboratory.trainType	= '培训类型'
 
 
+t.code = {}
+t.code.name = '名称'
+t.code.code = '编码'
+t.code.description = '描述'
+t.code.eightDisciplineType = '8D类型'
+t.code.problemStatus = '状态'
+t.code.eightDisciplineStatus = '状态'
+t.code.actualResponsePeriod = '实际响应周期'
+t.code.batchNumber = '批次数'
+t.code.customName = '客户'
+t.code.defectSource = '缺陷来源'
+t.code.eightDisciplineId = '8D来源id'
+t.code.eightDisciplineStatus = '8D类型'
+t.code.productName = '产品名'
+t.code.orderNo  = '订单号'
+t.code.productType = '产品类型'
+t.code.requestResponseCycle = '要求响应周期'
+t.code.responsibilityAttribution = '责任归属'
+t.code.sampleAcceptanceTime = '样品接收时间'
+t.code.supportProducts = '配套产品/系统'
+t.code.title = '标题'
+t.code.userId = '启动人'
+t.code.examineStatus = '审核状态'
+t.code.finalCompletionDate = '最终完成日期  '
+t.code.occurrenceDate = '发生日期'
+t.code.eightDTeam = '通知8D小组'
+t.code.inspectionStatus = '报检状态'
+t.code.batchNo = '批号'
+t.code.batchQuantity = '批次数量'
+t.code.batchSize = '批规格'
+t.code.checkoutTime = '检验时间'
+t.code.companyName = '单位'
+t.code.inspectionQuantity = '报检数量'
+t.code.inspectionStatus = '报检状态'
+t.code.inspectionType = '检验类型'
+t.code.orderNumber = '订单号'
+t.code.productCode = '产品编码'
+t.code.productName = '产品'
+t.code.recheck = '复检'
+t.code.remark = '备注'
+t.code.samplesQuantity = '抽样数'
+t.code.source = '来源'
+t.code.supplierName = '供应商'
+t.code.username = '检验人员'
+t.code.factoryName = '工厂'
+t.code.inspectionPlan = '报检计划'
+t.code.inspectionTime = '报检时间'
+t.code.customSampling = '抽样方案'
+t.code.task = '任务'
+t.code.upload = '上传'
+t.code.judgmentResult = '判断结果'
+t.code.defectiveQuantity = '不良数量'
+t.code.defectsNumber = '缺陷数量'
+t.code.submit = '提交'
+t.code.processingMethod = '处理方法'
+t.code.processingResults = '处理结果'
+t.code.characteristics = '特性'
+t.code.sampleSize = '样本大小'
+t.code.grouping = '分组'
+t.code.grouping = '分组'
+t.code.meanRange = '均值极差图'
+t.code.meanStandard = '均值标准差图'
+t.code.medianRange = '中位数极差图'
+t.code.singleValueMovingRange = '单值移动极差图'
+t.code.meanMovingRangeRange = '均值移动极差极差极'
+t.code.meanMovingRangeStandardDeviation = '均值移动极差标准差图'
+t.code.originalData = '原始数据'
+t.code.inspectionNumber = '检验单号'
+t.code.locationNo = '	样品/位置号'
+t.code.groupNo = '组号'
+t.code.parsingTime = '分析时间'
+t.code.assayValue = '分析值'
+t.code.status = '状态'
+t.code.approval = '审批中'
+t.code.approvalComplete = '审批完成'
+t.code.uploaded = '已上传'
+t.code.notUploaded = '未上传'
+t.code.Examiner = '检验人'
 
 
 
@@ -550,6 +651,19 @@ t.laboratory.trainType	= '培训类型'
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+	
 
 
 
diff --git a/src/utils/request.js b/src/utils/request.js
index cd1dcdb..17a395b 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -1,8 +1,8 @@
 /*
  * @Author: zhp
  * @Date: 2023-01-06 10:13:07
- * @LastEditTime: 2023-05-12 12:42:15
- * @LastEditors: zwq
+ * @LastEditTime: 2023-05-31 10:11:32
+ * @LastEditors: zhp
  * @Description: 
  */
 import axios from 'axios'
diff --git a/src/views/modules/basic/qmsControlMode.vue b/src/views/modules/basic/qmsControlMode.vue
index bf017bd..0a851a0 100644
--- a/src/views/modules/basic/qmsControlMode.vue
+++ b/src/views/modules/basic/qmsControlMode.vue
@@ -223,7 +223,8 @@ export default {
           })
           .catch(() => { });
       } else if (val.type === 'edit') {
-        this.addOrUpdateVisible = true;
+        this.addOrUpdateVisible = true
+        this.addOrEditTitle = this.$t('edit')
         this.$nextTick(() => {
           this.$refs.addOrUpdate.init(val.data.id);
         });
diff --git a/src/views/modules/basic/qmsCustomer.vue b/src/views/modules/basic/qmsCustomer.vue
index 9f48ec4..5747d1f 100644
--- a/src/views/modules/basic/qmsCustomer.vue
+++ b/src/views/modules/basic/qmsCustomer.vue
@@ -192,7 +192,8 @@ export default {
           })
           .catch(() => { });
       } else if (val.type === 'edit') {
-        this.addOrUpdateVisible = true;
+        this.addOrUpdateVisible = true
+        this.addOrEditTitle = this.$t('edit')
         this.$nextTick(() => {
           this.$refs.addOrUpdate.init(val.data.id);
         });
diff --git a/src/views/modules/basic/qmsCustomerType.vue b/src/views/modules/basic/qmsCustomerType.vue
index 63939cd..a3765c1 100644
--- a/src/views/modules/basic/qmsCustomerType.vue
+++ b/src/views/modules/basic/qmsCustomerType.vue
@@ -221,8 +221,8 @@ export default {
           })
           .catch(() => { });
       } else if (val.type === 'edit') {
-        this.addOrEditTitle = "修改"
-        this.addOrUpdateVisible = true;
+        this.addOrUpdateVisible = true
+        this.addOrEditTitle = this.$t('edit')
         this.$nextTick(() => {
           this.$refs.addOrUpdate.init(val.data.id);
         });
diff --git a/src/views/modules/basic/qmsFailureType.vue b/src/views/modules/basic/qmsFailureType.vue
index 2627be4..918f03b 100644
--- a/src/views/modules/basic/qmsFailureType.vue
+++ b/src/views/modules/basic/qmsFailureType.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-04-17 11:03:23
+ * @LastEditTime: 2023-06-20 15:37:39
  * @LastEditors: zhp
  * @Description: 
 -->
@@ -178,8 +178,8 @@ export default {
           })
           .catch(() => { });
       } else if (val.type === 'edit') {
-        this.addOrEditTitle = "修改"
-        this.addOrUpdateVisible = true;
+        this.addOrUpdateVisible = true
+        this.addOrEditTitle = this.$t('edit')
         this.$nextTick(() => {
           this.$refs.addOrUpdate.init(val.data.id);
         });
diff --git a/src/views/modules/basic/qmsProduct.vue b/src/views/modules/basic/qmsProduct.vue
index b185ad6..02a74f2 100644
--- a/src/views/modules/basic/qmsProduct.vue
+++ b/src/views/modules/basic/qmsProduct.vue
@@ -201,8 +201,8 @@ export default {
           })
           .catch(() => { });
       } else if (val.type === 'edit') {
-        this.addOrEditTitle = "修改"
-        this.addOrUpdateVisible = true;
+        this.addOrUpdateVisible = true
+        this.addOrEditTitle = this.$t('edit')
         this.$nextTick(() => {
           this.$refs.addOrUpdate.init(val.data.id);
         });
diff --git a/src/views/modules/basic/qmsProductType.vue b/src/views/modules/basic/qmsProductType.vue
index eed5bf8..09c94c2 100644
--- a/src/views/modules/basic/qmsProductType.vue
+++ b/src/views/modules/basic/qmsProductType.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-02-21 14:30:17
- * @LastEditTime: 2023-04-17 11:03:48
+ * @LastEditTime: 2023-06-20 15:37:24
  * @LastEditors: zhp
  * @Description: 
 -->
@@ -242,8 +242,8 @@ export default {
           })
           .catch(() => { });
       } else if (val.type === 'edit') {
-        this.addOrEditTitle = "修改"
-        this.addOrUpdateVisible = true;
+        this.addOrUpdateVisible = true
+        this.addOrEditTitle = this.$t('edit')
         this.$nextTick(() => {
           this.$refs.addOrUpdate.init(val.data.id);
         });
diff --git a/src/views/modules/basic/qmsTeam.vue b/src/views/modules/basic/qmsTeam.vue
index 5bb856d..47b3dc1 100644
--- a/src/views/modules/basic/qmsTeam.vue
+++ b/src/views/modules/basic/qmsTeam.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-02-21 14:30:17
- * @LastEditTime: 2023-04-17 11:04:00
+ * @LastEditTime: 2023-06-20 15:37:17
  * @LastEditors: zhp
  * @Description: 
 -->
@@ -272,8 +272,8 @@ export default {
           })
           .catch(() => { });
       } else if (val.type === 'edit') {
-        this.addOrEditTitle = "修改"
-        this.addOrUpdateVisible = true;
+        this.addOrUpdateVisible = true
+        this.addOrEditTitle = this.$t('edit')
         this.$nextTick(() => {
           this.$refs.addOrUpdate.init(val.data.id);
         });
diff --git a/src/views/modules/code/components/available.vue b/src/views/modules/code/components/available.vue
new file mode 100644
index 0000000..eabbfa0
--- /dev/null
+++ b/src/views/modules/code/components/available.vue
@@ -0,0 +1,41 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-01-31 09:49:36
+ * @LastEditTime: 2023-05-31 15:50:02
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <span>
+    <el-tag v-if="injectData.problemStatus === 1" type="success">可用</el-tag>
+    <el-tag v-else type="warning">不可用</el-tag>
+  </span>
+</template>
+
+<script>
+// import { addDynamicRoute } from '@/router'
+export default {
+  props: {
+    injectData: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  methods: {
+    // 子级
+    // emitClick () {
+    //   // 路由参数
+    //   const routeParams = {
+    //     routeName: `${this.$route.name}__${this.injectData.id}`,
+    //     title: `${this.$route.meta.title} - ${this.injectData.dictType}`,
+    //     path: 'sys/dict-data',
+    //     params: {
+    //       dictTypeId: this.injectData.id
+    //     }
+    //   }
+    //   // 动态路由
+    //   addDynamicRoute(routeParams, this.$router)
+    // }
+  }
+}
+</script>
diff --git a/src/views/modules/code/components/deliveryInspection-add.vue b/src/views/modules/code/components/deliveryInspection-add.vue
new file mode 100644
index 0000000..e7beea4
--- /dev/null
+++ b/src/views/modules/code/components/deliveryInspection-add.vue
@@ -0,0 +1,427 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-02-14 15:02:26
+ * @LastEditTime: 2023-06-20 15:04:28
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
+    <el-row :gutter="24">
+      <el-col :span="8">
+        <el-form-item prop="factoryId" :label="$t('code.factoryName')">
+          <el-select v-model="dataForm.factoryId" :placeholder="$t('code.factoryName')">
+            <el-option v-for="item in factoryList" :key="item.id" :label="item.factoryName" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item prop="inspectionTime" :label="$t('code.inspectionTime')">
+          <el-date-picker v-model="dataForm.inspectionTime" type="datetime" :placeholder="$t('code.inspectionTime')"
+            format='yyyy-MM-dd HH:mm:ss' valueFormat='yyyy-MM-ddTHH:mm:ss'>
+          </el-date-picker>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item prop="orderNumber" :label="$t('code.orderNumber')">
+          <el-input v-model="dataForm.orderNumber" :placeholder="$t('code.orderNumber')"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="24">
+      <el-col :span="8">
+        <el-form-item prop="batchNo" :label="$t('code.batchNo')">
+          <el-input v-model="dataForm.batchNo" :placeholder="$t('code.batchNo')"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item prop="inspectionType" :label="$t('code.inspectionType')">
+          <el-select v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')">
+            <el-option v-for="item in inspectionTypeList" :key="item.value" :label="item.label" :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item prop="recheck" :label="$t('code.recheck')">
+          <el-switch v-model="dataForm.recheck" :active-value="1" :inactive-value="0">
+          </el-switch>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="24">
+      <el-col :span="8">
+        <el-form-item prop="productId" :label="$t('code.productName')">
+          <el-select v-model="dataForm.productId" :placeholder="$t('code.productName')">
+            <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item prop="supplierId" :label="$t('code.supplierName')">
+          <el-select v-model="dataForm.supplierId" :placeholder="$t('code.supplierName')">
+            <el-option v-for="item in supplierList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item prop="batchQuantity" :label="$t('code.batchQuantity')">
+          <el-input v-model="dataForm.batchQuantity" :placeholder="$t('code.batchQuantity')"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="24">
+      <el-col :span="8">
+        <el-form-item prop="inspectionQuantity" :label="$t('code.inspectionQuantity')">
+          <el-input v-model="dataForm.inspectionQuantity" :placeholder="$t('code.inspectionQuantity')"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item prop="batchSize" :label="$t('code.batchSize')">
+          <el-input v-model="dataForm.batchSize" :placeholder="$t('code.batchSize')"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item prop="samplesQuantity" :label="$t('code.samplesQuantity')">
+          <el-input v-model="dataForm.samplesQuantity" :placeholder="$t('code.samplesQuantity')"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="24">
+      <el-col :span="8">
+        <el-form-item prop="companyId" :label="$t('code.companyName')">
+          <el-select v-model="dataForm.companyId" :placeholder="$t('code.companyName')">
+            <el-option v-for="item in unitList" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item prop="userId" :label="$t('code.username')">
+          <el-select v-model="dataForm.userId" :placeholder="$t('code.username')">
+            <el-option v-for="item in unitList" :key="item.id" :label="item.realName" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item prop="inspectionStatus" :label="$t('code.inspectionStatus')">
+          <el-select v-model="dataForm.inspectionStatus" :placeholder="$t('code.inspectionStatus')">
+            <el-option v-for="item in inspectionStatusList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="24">
+      <el-col :span="8">
+        <el-form-item prop="customSamplingId" :label="$t('code.customSampling')">
+          <el-select v-model="dataForm.customSamplingId" :placeholder="$t('code.customSampling')">
+            <el-option v-for="item in samplingPlanList" :key="item.id" :label="item.sampleRange" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form>
+</template>
+
+<script>
+import debounce from "lodash/debounce";
+import basicAdd from "@/mixins/basic-add";
+export default {
+  mixins: [basicAdd],
+  data() {
+    return {
+      urlOptions: {
+        submitURL: "/code/deliveryInspection",
+        infoURL: "/code/deliveryInspection/{id}",
+        getFactoryURL: '/code/factory/page',
+        getProductURL: '/basic/product/page',
+        getSupplierURL: '/supplier/qmsSupplier/page',
+        getDictDataList: '/sys/dict/data/page',
+        getUserURL: '/sys/user/page',
+        getSamplingPlanURL: '/quality/qmsSamplingPlan/page'
+      },
+      supplierList: [],
+      userList: [],
+      samplingPlanList:[],
+      inspectionStatusList: [
+        {
+          id: 0,
+          name: '未登记'
+        },
+        {
+          id: 1,
+          name: '已登记'
+        }
+      ],
+      unitList:[],
+      productList: [],
+      factoryList:[],
+      visible: false,
+      listQuery: {
+        limit: 999,
+        page:1
+      },
+      inspectionTypeList: [{
+        value: 0,
+        label: '监控'
+      },
+      {
+        value: 1,
+        label: '电芯来料检验'
+      },
+      {
+        value: 2,
+        label: 'IQC抽检'
+      },
+      {
+        value: 3,
+        label: 'IQC抽检2'
+      },
+      {
+        value: 4,
+        label: '原料抽检'
+      },
+      {
+        value: 5,
+        label: '进货外观检验'
+      },
+      {
+        value: 6,
+        label: '库内原料检验'
+      },
+      {
+        value: 7,
+        label: '来料检验'
+      },
+      {
+        value: 8,
+        label: '胶片'
+      },
+      {
+        value: 9,
+        label: '抽检'
+      },
+      {
+        value: 10,
+        label: '巡检'
+      }, {
+        value: 11,
+        label: '首检'
+      },
+      {
+        value: 12,
+        label: '末检'
+      },
+      {
+        value: 13,
+        label: '实时监测'
+      },
+      {
+        value: 14,
+        label: 'FQC抽检'
+      },
+      {
+        value: 15,
+        label: 'OQC抽检'
+      },
+      ],
+      dataForm: {
+        id:null,
+        batchNo: null,
+        batchSize: null,
+        checkoutTime: null,
+        companyId: null,
+        factoryId: null,
+        inspectionPlan: null,
+        inspectionQuantity: null,
+        inspectionStatus: null,
+        inspectionTime: null,
+        inspectionType: null,
+        orderNumber: null,
+        productCode: null,
+        productId: null,
+        recheck: null,
+        remark: null,
+        samplesQuantity: null,
+        shiftId: null,
+        source: null,
+        supplierId: null,
+        teamId: null,
+        userId: null,
+      },
+    };
+  },
+  computed: {
+    dataRule() {
+      return {
+        dictLabel: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+        dictValue: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+        sort: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+      };
+    },
+  },
+  created() {
+    this.getDict()
+  },
+  methods: {
+    init(id, ) {
+      this.dataForm.id = id || ""
+      // this.dataForm.dictTypeId = dictTypeId || "";
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs["dataForm"].resetFields();
+        if (this.dataForm.id) {
+          this.getInfo();
+        }
+      });
+    },
+    // 获取信息
+    getInfo() {
+      this.$http
+        .get(`/code/deliveryInspection/${this.dataForm.id}`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          }
+          this.dataForm = {
+            ...this.dataForm,
+            ...res.data,
+          };
+        })
+        .catch(() => {})
+    },
+    getDict() {
+      this.$http
+        .get(this.urlOptions.getSamplingPlanURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.samplingPlanList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      this.$http
+        .get(this.urlOptions.getUserURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.userList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      this.$http
+        .get(this.urlOptions.getProductURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.productList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      this.$http
+        .get(this.urlOptions.getDictDataList, {
+          params: {
+            limit: 999,
+            page: 1,
+            dictTypeId: '1665966021935190018'
+          }
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.unitList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      this.$http
+        .get(this.urlOptions.getSupplierURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.supplierList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      this.$http
+        .get(this.urlOptions.getFactoryURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.factoryList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      // console.log(111111);
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(
+      function () {
+        this.$refs["dataForm"].validate((valid) => {
+          if (!valid) {
+            return false;
+          }
+          this.$http[!this.dataForm.id ? "post" : "put"](this.urlOptions.submitURL, this.dataForm)
+            .then(({ data: res }) => {
+              if (res.code !== 0) {
+                return this.$message.error(res.msg);
+              }
+              this.$message({
+                message: this.$t("prompt.success"),
+                type: "success",
+                duration: 500,
+                onClose: () => {
+                  this.visible = false;
+                  console.log(1111);
+                  this.$emit("successSubmit");
+                },
+              });
+            })
+            .catch(() => {});
+        });
+      },
+      1000,
+      { leading: true, trailing: false }
+    ),
+  },
+};
+</script>
diff --git a/src/views/modules/code/components/deliveryInspectionSearch.vue b/src/views/modules/code/components/deliveryInspectionSearch.vue
new file mode 100644
index 0000000..2ab7fe0
--- /dev/null
+++ b/src/views/modules/code/components/deliveryInspectionSearch.vue
@@ -0,0 +1,321 @@
+<!--
+ * @Author: zwq
+ * @Date: 2023-01-04 10:29:40
+ * @LastEditors: zhp
+ * @LastEditTime: 2023-06-20 15:20:53
+ * @Description: 
+-->
+<template>
+  <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
+    <el-form-item prop="factoryId" :label="$t('code.factoryName')">
+      <el-select v-model="dataForm.factoryId" :placeholder="$t('code.factoryName')">
+        <el-option v-for="item in factoryList" :key="item.id" :label="item.factoryName" :value="item.id">
+        </el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item prop="batchNo" :label="$t('code.batchNo')">
+      <el-input v-model="dataForm.batchNo" :placeholder="$t('code.batchNo')"></el-input>
+    </el-form-item>
+    <el-form-item prop="inspectionType" :label="$t('code.inspectionType')">
+      <el-select v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')">
+        <el-option v-for="item in inspectionTypeList" :key="item.value" :label="item.label" :value="item.value">
+        </el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item prop="recheck" :label="$t('code.recheck')">
+      <el-switch v-model="dataForm.recheck" :active-value="1" :inactive-value="0">
+      </el-switch>
+    </el-form-item>
+    <el-form-item prop="productId" :label="$t('code.productName')">
+      <el-select v-model="dataForm.productId" :placeholder="$t('code.productName')">
+        <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.id">
+        </el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item prop="supplierId" :label="$t('code.supplierName')">
+      <el-select v-model="dataForm.supplierId" :placeholder="$t('code.supplierName')">
+        <el-option v-for="item in supplierList" :key="item.id" :label="item.name" :value="item.id">
+        </el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item prop="customSamplingId" :label="$t('code.customSampling')">
+      <el-select v-model="dataForm.customSamplingId" :placeholder="$t('code.customSampling')">
+        <el-option v-for="item in samplingPlanList" :key="item.id" :label="item.sampleRange" :value="item.id">
+        </el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item prop="recheck" :label="$t('code.recheck')">
+      <el-switch v-model="dataForm.recheck" :active-value="1" :inactive-value="0">
+      </el-switch>
+    </el-form-item>
+    <el-form-item prop="task" :label="$t('code.task')">
+      <el-switch v-model="dataForm.task" :active-value="1" :inactive-value="0">
+      </el-switch>
+    </el-form-item>
+    <el-form-item prop="inspectionStatus" :label="$t('code.inspectionStatus')">
+      <el-select v-model="dataForm.inspectionStatus" :placeholder="$t('code.inspectionStatus')">
+        <el-option v-for="item in inspectionStatusList" :key="item.id" :label="item.name" :value="item.id">
+        </el-option>
+      </el-select>
+    </el-form-item>
+  </el-form>
+</template>
+
+<script>
+import debounce from "lodash/debounce";
+import basicAdd from "@/mixins/basic-add";
+export default {
+  mixins: [basicAdd],
+  data() {
+    return {
+      urlOptions: {
+        submitURL: "/basic/qmsCustomerType",
+        infoURL: "/basic/qmsCustomerType/{id}",
+        getCodeURL: '/basic/qmsControlMode/getCode',
+        getFactoryURL: '/code/factory/page',
+        getProductURL: '/basic/product/page',
+        getSupplierURL: '/supplier/qmsSupplier/page',
+        getDictDataList: '/sys/dict/data/page',
+        getUserURL: '/sys/user/page',
+        getSamplingPlanURL: '/quality/qmsSamplingPlan/page'
+      },
+      // urlOptions: {
+      //   submitURL: "/sys/params/",
+      //   infoURL: "/sys/params",
+      // },
+      inspectionStatusList: [
+        {
+          id: 0,
+          name: '未登记'
+        },
+        {
+          id: 1,
+          name: '已登记'
+        }
+      ],
+      supplierList: [],
+      userList: [],
+      samplingPlanList: [],
+      unitList: [],
+      productList: [],
+      factoryList: [],
+      visible: false,
+      inspectionTypeList: [{
+        value: 0,
+        label: '监控'
+      },
+      {
+        value: 1,
+        label: '电芯来料检验'
+      },
+      {
+        value: 2,
+        label: 'IQC抽检'
+      },
+      {
+        value: 3,
+        label: 'IQC抽检2'
+      },
+      {
+        value: 4,
+        label: '原料抽检'
+      },
+      {
+        value: 5,
+        label: '进货外观检验'
+      },
+      {
+        value: 6,
+        label: '库内原料检验'
+      },
+      {
+        value: 7,
+        label: '来料检验'
+      },
+      {
+        value: 8,
+        label: '胶片'
+      },
+      {
+        value: 9,
+        label: '抽检'
+      },
+      {
+        value: 10,
+        label: '巡检'
+      }, {
+        value: 11,
+        label: '首检'
+      },
+      {
+        value: 12,
+        label: '末检'
+      },
+      {
+        value: 13,
+        label: '实时监测'
+      },
+      {
+        value: 14,
+        label: 'FQC抽检'
+      },
+      {
+        value: 15,
+        label: 'OQC抽检'
+      },
+      ],
+      dataForm: {
+        batchNo: null,
+        customSamplingId: null,
+        endTime: null,
+        factoryId: null,
+        inspectionStatus: null,
+        inspectionType: null,
+        productId: null,
+        recheck: null,
+        startTime: null,
+        supplierId: null,
+        task: null,
+        userId: null,
+      },
+    };
+  },
+  computed: {
+    // dataRule() {
+    //   return {
+    //     paramCode: [
+    //       {
+    //         required: true,
+    //         message: this.$t("validate.required"),
+    //         trigger: "blur",
+    //       },
+    //     ],
+    //     paramValue: [
+    //       {
+    //         required: true,
+    //         message: this.$t("validate.required"),
+    //         trigger: "blur",
+    //       },
+    //     ],
+    //   };
+    // },
+  },
+  mounted () {
+    this.getDict()
+  },
+  methods: {
+    getDict() {
+      this.$http
+        .get(this.urlOptions.getSamplingPlanURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.samplingPlanList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      this.$http
+        .get(this.urlOptions.getProductURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.productList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      this.$http
+        .get(this.urlOptions.getSupplierURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.supplierList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      this.$http
+        .get(this.urlOptions.getFactoryURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.factoryList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      // console.log(111111);
+    },
+    // init(id) {
+    //   this.dataForm.id = id || "";
+    //   this.visible = true;
+    //   this.$nextTick(() => {
+    //     this.$refs["dataForm"].resetFields();
+    //     if (this.dataForm.id) {
+    //       this.getInfo();
+    //     }
+    //   });
+    // },
+    // 获取信息
+    // getInfo() {
+    //   this.$http
+    //     .get(`/sys/params/${this.dataForm.id}`)
+    //     .then(({ data: res }) => {
+    //       if (res.code !== 0) {
+    //         return this.$message.error(res.msg);
+    //       }
+    //       this.dataForm = {
+    //         ...this.dataForm,
+    //         ...res.data,
+    //       };
+    //     })
+    //     .catch(() => {});
+    // },
+    // 表单提交
+    handleConditionSearch() {
+      this.$emit("successSubmit", this.dataForm)
+    },
+    // dataFormSubmitHandle: debounce(
+    //   function () {
+    //     // console.log(1111);
+    //     // this.visible = false;
+    //     this.$emit("successSubmit", this.dataForm.key);
+    //     // this.$refs["dataForm"].validate((valid) => {
+    //     //   if (!valid) {
+    //     //     return false;
+    //     //   }
+    //     //   this.$http[!this.dataForm.id ? "post" : "put"](
+    //     //     "/sys/params",
+    //     //     this.dataForm
+    //     //   )
+    //     //     .then(({ data: res }) => {
+    //     //       if (res.code !== 0) {
+    //     //         return this.$message.error(res.msg);
+    //     //       }
+    //     //       this.$message({
+    //     //         message: this.$t("prompt.success"),
+    //     //         type: "success",
+    //     //         duration: 500,
+    //     //         onClose: () => {
+
+    //     //         },
+    //     //       });
+    //     //     })
+    //     //     .catch(() => {});
+    //     // });
+    //   },
+    //   1000,
+    //   { leading: true, trailing: false }
+    // ),
+  },
+};
+</script>
diff --git a/src/views/modules/code/components/eightDiscipline-add.vue b/src/views/modules/code/components/eightDiscipline-add.vue
new file mode 100644
index 0000000..0a40e39
--- /dev/null
+++ b/src/views/modules/code/components/eightDiscipline-add.vue
@@ -0,0 +1,172 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-02-14 15:02:26
+ * @LastEditTime: 2023-06-01 14:22:21
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="130px">
+    <el-form-item prop="name" :label="$t('code.name')">
+      <el-input v-model="dataForm.name" :placeholder="$t('code.name')">
+      </el-input>
+    </el-form-item>
+    <el-form-item prop="code" :label="$t('code.code')">
+      <el-input v-model="dataForm.code" :placeholder="$t('code.code')"></el-input>
+    </el-form-item>
+    <el-form-item prop="eightDisciplineStatus" :label="$t('code.eightDisciplineStatus')">
+      <el-switch v-model="dataForm.eightDisciplineStatus" :active-value="1" :inactive-value="0">
+      </el-switch>
+    </el-form-item>
+    <el-form-item prop="eightDisciplineType" :label="$t('code.eightDisciplineType')">
+      <el-select v-model="dataForm.eightDisciplineType" :placeholder="$t('code.eightDisciplineType')">
+        <el-option v-for="item in eightDisciplineTypeList" :key="item.value" :label="item.label" :value="item.value">
+        </el-option>
+      </el-select>
+    </el-form-item>
+  </el-form>
+</template>
+
+<script>
+import debounce from "lodash/debounce";
+import basicAdd from "@/mixins/basic-add";
+export default {
+  mixins: [basicAdd],
+  data() {
+    return {
+      urlOptions: {
+        submitURL: "/code/eightDiscipline",
+        infoURL: "/code/eightDiscipline"
+      },
+      options: [{
+        value: 0,
+        label: '不可用'
+      },
+      {
+        value: 1,
+        label: '可用'
+        }],
+      eightDisciplineTypeList: [
+        {
+          value: 0,
+          label: '重复发生问题 '
+        },
+        {
+          value: 1,
+          label: '1客诉问题'
+        },
+        {
+          value: 2,
+          label: '重大质量问题'
+        }
+      ],
+      visible: false,
+      dataForm: {
+        id: null,
+        name: null,
+        code:null,	
+        eightDisciplineType:null,
+        eightDisciplineStatus: null,
+      },
+    };
+  },
+  computed: {
+    dataRule() {
+      return {
+        // dictLabel: [
+        //   {
+        //     required: true,
+        //     message: this.$t("validate.required"),
+        //     trigger: "blur",
+        //   },
+        // ],
+        // dictValue: [
+        //   {
+        //     required: true,
+        //     message: this.$t("validate.required"),
+        //     trigger: "blur",
+        //   },
+        // ],
+        // sort: [
+        //   {
+        //     required: true,
+        //     message: this.$t("validate.required"),
+        //     trigger: "blur",
+        //   },
+        // ],
+      };
+    },
+  },
+  methods: {
+    init(id, ) {
+      this.dataForm.id = id || ""
+      // console.log(11111)
+      // this.dataForm.dictTypeId = dictTypeId || "";
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs["dataForm"].resetFields();
+        if (this.dataForm.id) {
+          this.getInfo()
+        } else {
+          // this.getCode()
+        }
+      });
+    },
+    // getCode() {
+    //   this.$http.post(this.urlOptions.getCodeURL)
+    //     .then(({ data: res }) => {
+    //       if (res.code === 0) {
+    //         console.log(res);
+    //         this.dataForm.customSamplingCode = res.data
+    //       }
+    //     })
+    //     .catch(() => {
+    //     });
+    // },
+    // 获取信息
+    getInfo() {
+      this.$http
+        .get(`/code/eightDiscipline/${this.dataForm.id}`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          }
+          this.dataForm = {
+            ...this.dataForm,
+            ...res.data,
+          };
+        })
+        .catch(() => {});
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(
+      function () {
+        this.$refs["dataForm"].validate((valid) => {
+          if (!valid) {
+            return false;
+          }
+          this.$http[!this.dataForm.id ? "post" : "put"](this.urlOptions.submitURL, this.dataForm)
+            .then(({ data: res }) => {
+              if (res.code !== 0) {
+                return this.$message.error(res.msg);
+              }
+              this.$message({
+                message: this.$t("prompt.success"),
+                type: "success",
+                duration: 500,
+                onClose: () => {
+                  console.log(1111);
+                  this.visible = false;
+                  this.$emit("successSubmit");
+                },
+              });
+            })
+            .catch(() => {});
+        });
+      },
+      1000,
+      { leading: true, trailing: false }
+    ),
+  },
+};
+</script>
diff --git a/src/views/modules/code/components/productInspection-add.vue b/src/views/modules/code/components/productInspection-add.vue
new file mode 100644
index 0000000..04449bd
--- /dev/null
+++ b/src/views/modules/code/components/productInspection-add.vue
@@ -0,0 +1,428 @@
+
+<!--
+ * @Author: zhp
+ * @Date: 2023-02-14 15:02:26
+ * @LastEditTime: 2023-06-20 15:05:29
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
+    <el-row :gutter="24">
+      <el-col :span="8">
+        <el-form-item prop="factoryId" :label="$t('code.factoryName')">
+          <el-select v-model="dataForm.factoryId" :placeholder="$t('code.factoryName')">
+            <el-option v-for="item in factoryList" :key="item.id" :label="item.factoryName" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item prop="inspectionTime" :label="$t('code.inspectionTime')">
+          <el-date-picker v-model="dataForm.inspectionTime" type="datetime" :placeholder="$t('code.inspectionTime')"
+            format='yyyy-MM-dd HH:mm:ss' valueFormat='yyyy-MM-ddTHH:mm:ss'>
+          </el-date-picker>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item prop="orderNumber" :label="$t('code.orderNumber')">
+          <el-input v-model="dataForm.orderNumber" :placeholder="$t('code.orderNumber')"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="24">
+      <el-col :span="8">
+        <el-form-item prop="batchNo" :label="$t('code.batchNo')">
+          <el-input v-model="dataForm.batchNo" :placeholder="$t('code.batchNo')"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item prop="inspectionType" :label="$t('code.inspectionType')">
+          <el-select v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')">
+            <el-option v-for="item in inspectionTypeList" :key="item.value" :label="item.label" :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item prop="recheck" :label="$t('code.recheck')">
+          <el-switch v-model="dataForm.recheck" :active-value="1" :inactive-value="0">
+          </el-switch>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="24">
+      <el-col :span="8">
+        <el-form-item prop="productId" :label="$t('code.productName')">
+          <el-select v-model="dataForm.productId" :placeholder="$t('code.productName')">
+            <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item prop="supplierId" :label="$t('code.supplierName')">
+          <el-select v-model="dataForm.supplierId" :placeholder="$t('code.supplierName')">
+            <el-option v-for="item in supplierList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item prop="batchQuantity" :label="$t('code.batchQuantity')">
+          <el-input v-model="dataForm.batchQuantity" :placeholder="$t('code.batchQuantity')"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="24">
+      <el-col :span="8">
+        <el-form-item prop="inspectionQuantity" :label="$t('code.inspectionQuantity')">
+          <el-input v-model="dataForm.inspectionQuantity" :placeholder="$t('code.inspectionQuantity')"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item prop="batchSize" :label="$t('code.batchSize')">
+          <el-input v-model="dataForm.batchSize" :placeholder="$t('code.batchSize')"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item prop="samplesQuantity" :label="$t('code.samplesQuantity')">
+          <el-input v-model="dataForm.samplesQuantity" :placeholder="$t('code.samplesQuantity')"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="24">
+      <el-col :span="8">
+        <el-form-item prop="companyId" :label="$t('code.companyName')">
+          <el-select v-model="dataForm.companyId" :placeholder="$t('code.companyName')">
+            <el-option v-for="item in unitList" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item prop="userId" :label="$t('code.username')">
+          <el-select v-model="dataForm.userId" :placeholder="$t('code.username')">
+            <el-option v-for="item in unitList" :key="item.id" :label="item.realName" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item prop="inspectionStatus" :label="$t('code.inspectionStatus')">
+          <el-select v-model="dataForm.inspectionStatus" :placeholder="$t('code.inspectionStatus')">
+            <el-option v-for="item in inspectionStatusList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="24">
+      <el-col :span="8">
+        <el-form-item prop="customSamplingId" :label="$t('code.customSampling')">
+          <el-select v-model="dataForm.customSamplingId" :placeholder="$t('code.customSampling')">
+            <el-option v-for="item in samplingPlanList" :key="item.id" :label="item.sampleRange" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form>
+</template>
+
+<script>
+import debounce from "lodash/debounce";
+import basicAdd from "@/mixins/basic-add";
+export default {
+  mixins: [basicAdd],
+  data() {
+    return {
+      urlOptions: {
+        submitURL: "/code/productInspection",
+        infoURL: "/code/productInspection/{id}",
+        getFactoryURL: '/code/factory/page',
+        getProductURL: '/basic/product/page',
+        getSupplierURL: '/supplier/qmsSupplier/page',
+        getDictDataList: '/sys/dict/data/page',
+        getUserURL: '/sys/user/page',
+        getSamplingPlanURL: '/quality/qmsSamplingPlan/page'
+      },
+      supplierList: [],
+      userList: [],
+      samplingPlanList:[],
+      inspectionStatusList: [
+        {
+          id: 0,
+          name: '未登记'
+        },
+        {
+          id: 1,
+          name: '已登记'
+        }
+      ],
+      unitList:[],
+      productList: [],
+      factoryList:[],
+      visible: false,
+      listQuery: {
+        limit: 999,
+        page:1
+      },
+      inspectionTypeList: [{
+        value: 0,
+        label: '监控'
+      },
+      {
+        value: 1,
+        label: '电芯来料检验'
+      },
+      {
+        value: 2,
+        label: 'IQC抽检'
+      },
+      {
+        value: 3,
+        label: 'IQC抽检2'
+      },
+      {
+        value: 4,
+        label: '原料抽检'
+      },
+      {
+        value: 5,
+        label: '进货外观检验'
+      },
+      {
+        value: 6,
+        label: '库内原料检验'
+      },
+      {
+        value: 7,
+        label: '来料检验'
+      },
+      {
+        value: 8,
+        label: '胶片'
+      },
+      {
+        value: 9,
+        label: '抽检'
+      },
+      {
+        value: 10,
+        label: '巡检'
+      }, {
+        value: 11,
+        label: '首检'
+      },
+      {
+        value: 12,
+        label: '末检'
+      },
+      {
+        value: 13,
+        label: '实时监测'
+      },
+      {
+        value: 14,
+        label: 'FQC抽检'
+      },
+      {
+        value: 15,
+        label: 'OQC抽检'
+      },
+      ],
+      dataForm: {
+        id: null,
+        batchNo: null,
+        batchSize: null,
+        checkoutTime: null,
+        companyId: null,
+        factoryId: null,
+        inspectionPlan: null,
+        inspectionQuantity: null,
+        inspectionStatus: null,
+        inspectionTime: null,
+        inspectionType: null,
+        orderNumber: null,
+        productCode: null,
+        productId: null,
+        recheck: null,
+        remark: null,
+        samplesQuantity: null,
+        shiftId: null,
+        source: null,
+        supplierId: null,
+        teamId: null,
+        userId: null,
+      },
+    };
+  },
+  computed: {
+    dataRule() {
+      return {
+        dictLabel: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+        dictValue: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+        sort: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+      };
+    },
+  },
+  created() {
+    this.getDict()
+  },
+  methods: {
+    init(id, ) {
+      this.dataForm.id = id || ""
+      // this.dataForm.dictTypeId = dictTypeId || "";
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs["dataForm"].resetFields();
+        if (this.dataForm.id) {
+          this.getInfo();
+        }
+      });
+    },
+    // 获取信息
+    getInfo() {
+      this.$http
+        .get(`/code/productInspection/${this.dataForm.id}`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          }
+          this.dataForm = {
+            ...this.dataForm,
+            ...res.data,
+          };
+        })
+        .catch(() => {})
+    },
+    getDict() {
+      this.$http
+        .get(this.urlOptions.getSamplingPlanURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.samplingPlanList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      this.$http
+        .get(this.urlOptions.getUserURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.userList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      this.$http
+        .get(this.urlOptions.getProductURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.productList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      this.$http
+        .get(this.urlOptions.getDictDataList, {
+          params: {
+            limit: 999,
+            page: 1,
+            dictTypeId: '1665966021935190018'
+          }
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.unitList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      this.$http
+        .get(this.urlOptions.getSupplierURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.supplierList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      this.$http
+        .get(this.urlOptions.getFactoryURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.factoryList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      // console.log(111111);
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(
+      function () {
+        this.$refs["dataForm"].validate((valid) => {
+          if (!valid) {
+            return false;
+          }
+          this.$http[!this.dataForm.id ? "post" : "put"](this.urlOptions.submitURL, this.dataForm)
+            .then(({ data: res }) => {
+              if (res.code !== 0) {
+                return this.$message.error(res.msg);
+              }
+              this.$message({
+                message: this.$t("prompt.success"),
+                type: "success",
+                duration: 500,
+                onClose: () => {
+                  this.visible = false;
+                  console.log(1111);
+                  this.$emit("successSubmit");
+                },
+              });
+            })
+            .catch(() => {});
+        });
+      },
+      1000,
+      { leading: true, trailing: false }
+    ),
+  },
+};
+</script>
diff --git a/src/views/modules/code/components/productInspectionSearch.vue b/src/views/modules/code/components/productInspectionSearch.vue
new file mode 100644
index 0000000..c0c91e9
--- /dev/null
+++ b/src/views/modules/code/components/productInspectionSearch.vue
@@ -0,0 +1,321 @@
+<!--
+ * @Author: zwq
+ * @Date: 2023-01-04 10:29:40
+ * @LastEditors: zhp
+ * @LastEditTime: 2023-06-20 15:23:54
+ * @Description: 
+-->
+<template>
+  <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
+    <el-form-item prop="factoryId" :label="$t('code.factoryName')">
+      <el-select v-model="dataForm.factoryId" :placeholder="$t('code.factoryName')">
+        <el-option v-for="item in factoryList" :key="item.id" :label="item.factoryName" :value="item.id">
+        </el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item prop="batchNo" :label="$t('code.batchNo')">
+      <el-input v-model="dataForm.batchNo" :placeholder="$t('code.batchNo')"></el-input>
+    </el-form-item>
+    <el-form-item prop="inspectionType" :label="$t('code.inspectionType')">
+      <el-select v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')">
+        <el-option v-for="item in inspectionTypeList" :key="item.value" :label="item.label" :value="item.value">
+        </el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item prop="recheck" :label="$t('code.recheck')">
+      <el-switch v-model="dataForm.recheck" :active-value="1" :inactive-value="0">
+      </el-switch>
+    </el-form-item>
+    <el-form-item prop="productId" :label="$t('code.productName')">
+      <el-select v-model="dataForm.productId" :placeholder="$t('code.productName')">
+        <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.id">
+        </el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item prop="supplierId" :label="$t('code.supplierName')">
+      <el-select v-model="dataForm.supplierId" :placeholder="$t('code.supplierName')">
+        <el-option v-for="item in supplierList" :key="item.id" :label="item.name" :value="item.id">
+        </el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item prop="customSamplingId" :label="$t('code.customSampling')">
+      <el-select v-model="dataForm.customSamplingId" :placeholder="$t('code.customSampling')">
+        <el-option v-for="item in samplingPlanList" :key="item.id" :label="item.sampleRange" :value="item.id">
+        </el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item prop="recheck" :label="$t('code.recheck')">
+      <el-switch v-model="dataForm.recheck" :active-value="1" :inactive-value="0">
+      </el-switch>
+    </el-form-item>
+    <el-form-item prop="task" :label="$t('code.task')">
+      <el-switch v-model="dataForm.task" :active-value="1" :inactive-value="0">
+      </el-switch>
+    </el-form-item>
+    <el-form-item prop="inspectionStatus" :label="$t('code.inspectionStatus')">
+      <el-select v-model="dataForm.inspectionStatus" :placeholder="$t('code.inspectionStatus')">
+        <el-option v-for="item in inspectionStatusList" :key="item.id" :label="item.name" :value="item.id">
+        </el-option>
+      </el-select>
+    </el-form-item>
+  </el-form>
+</template>
+
+<script>
+import debounce from "lodash/debounce";
+import basicAdd from "@/mixins/basic-add";
+export default {
+  mixins: [basicAdd],
+  data() {
+    return {
+      urlOptions: {
+        submitURL: "/basic/qmsCustomerType",
+        infoURL: "/basic/qmsCustomerType/{id}",
+        getCodeURL: '/basic/qmsControlMode/getCode',
+        getFactoryURL: '/code/factory/page',
+        getProductURL: '/basic/product/page',
+        getSupplierURL: '/supplier/qmsSupplier/page',
+        getDictDataList: '/sys/dict/data/page',
+        getUserURL: '/sys/user/page',
+        getSamplingPlanURL: '/quality/qmsSamplingPlan/page'
+      },
+      // urlOptions: {
+      //   submitURL: "/sys/params/",
+      //   infoURL: "/sys/params",
+      // },
+      inspectionStatusList: [
+        {
+          id: 0,
+          name: '未登记'
+        },
+        {
+          id: 1,
+          name: '已登记'
+        }
+      ],
+      supplierList: [],
+      userList: [],
+      samplingPlanList: [],
+      unitList: [],
+      productList: [],
+      factoryList: [],
+      visible: false,
+      inspectionTypeList: [{
+        value: 0,
+        label: '监控'
+      },
+      {
+        value: 1,
+        label: '电芯来料检验'
+      },
+      {
+        value: 2,
+        label: 'IQC抽检'
+      },
+      {
+        value: 3,
+        label: 'IQC抽检2'
+      },
+      {
+        value: 4,
+        label: '原料抽检'
+      },
+      {
+        value: 5,
+        label: '进货外观检验'
+      },
+      {
+        value: 6,
+        label: '库内原料检验'
+      },
+      {
+        value: 7,
+        label: '来料检验'
+      },
+      {
+        value: 8,
+        label: '胶片'
+      },
+      {
+        value: 9,
+        label: '抽检'
+      },
+      {
+        value: 10,
+        label: '巡检'
+      }, {
+        value: 11,
+        label: '首检'
+      },
+      {
+        value: 12,
+        label: '末检'
+      },
+      {
+        value: 13,
+        label: '实时监测'
+      },
+      {
+        value: 14,
+        label: 'FQC抽检'
+      },
+      {
+        value: 15,
+        label: 'OQC抽检'
+      },
+      ],
+      dataForm: {
+        batchNo: null,
+        customSamplingId: null,
+        endTime: null,
+        factoryId: null,
+        inspectionStatus: null,
+        inspectionType: null,
+        productId: null,
+        recheck: null,
+        startTime: null,
+        supplierId: null,
+        task: null,
+        userId: null,
+      },
+    };
+  },
+  computed: {
+    // dataRule() {
+    //   return {
+    //     paramCode: [
+    //       {
+    //         required: true,
+    //         message: this.$t("validate.required"),
+    //         trigger: "blur",
+    //       },
+    //     ],
+    //     paramValue: [
+    //       {
+    //         required: true,
+    //         message: this.$t("validate.required"),
+    //         trigger: "blur",
+    //       },
+    //     ],
+    //   };
+    // },
+  },
+  mounted () {
+    this.getDict()
+  },
+  methods: {
+    getDict() {
+      this.$http
+        .get(this.urlOptions.getSamplingPlanURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.samplingPlanList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      this.$http
+        .get(this.urlOptions.getProductURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.productList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      this.$http
+        .get(this.urlOptions.getSupplierURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.supplierList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      this.$http
+        .get(this.urlOptions.getFactoryURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.factoryList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      // console.log(111111);
+    },
+    // init(id) {
+    //   this.dataForm.id = id || "";
+    //   this.visible = true;
+    //   this.$nextTick(() => {
+    //     this.$refs["dataForm"].resetFields();
+    //     if (this.dataForm.id) {
+    //       this.getInfo();
+    //     }
+    //   });
+    // },
+    // 获取信息
+    // getInfo() {
+    //   this.$http
+    //     .get(`/sys/params/${this.dataForm.id}`)
+    //     .then(({ data: res }) => {
+    //       if (res.code !== 0) {
+    //         return this.$message.error(res.msg);
+    //       }
+    //       this.dataForm = {
+    //         ...this.dataForm,
+    //         ...res.data,
+    //       };
+    //     })
+    //     .catch(() => {});
+    // },
+    // 表单提交
+    handleConditionSearch() {
+      this.$emit("successSubmit", this.dataForm)
+    },
+    // dataFormSubmitHandle: debounce(
+    //   function () {
+    //     // console.log(1111);
+    //     // this.visible = false;
+    //     this.$emit("successSubmit", this.dataForm.key);
+    //     // this.$refs["dataForm"].validate((valid) => {
+    //     //   if (!valid) {
+    //     //     return false;
+    //     //   }
+    //     //   this.$http[!this.dataForm.id ? "post" : "put"](
+    //     //     "/sys/params",
+    //     //     this.dataForm
+    //     //   )
+    //     //     .then(({ data: res }) => {
+    //     //       if (res.code !== 0) {
+    //     //         return this.$message.error(res.msg);
+    //     //       }
+    //     //       this.$message({
+    //     //         message: this.$t("prompt.success"),
+    //     //         type: "success",
+    //     //         duration: 500,
+    //     //         onClose: () => {
+
+    //     //         },
+    //     //       });
+    //     //     })
+    //     //     .catch(() => {});
+    //     // });
+    //   },
+    //   1000,
+    //   { leading: true, trailing: false }
+    // ),
+  },
+};
+</script>
diff --git a/src/views/modules/code/components/productRegistration-add.vue b/src/views/modules/code/components/productRegistration-add.vue
new file mode 100644
index 0000000..076dc95
--- /dev/null
+++ b/src/views/modules/code/components/productRegistration-add.vue
@@ -0,0 +1,634 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-02-14 15:02:26
+ * @LastEditTime: 2023-06-20 15:18:54
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <div>
+    <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
+      <el-row :gutter="24">
+        <el-col :span="8">
+          <el-form-item prop="factoryId" :label="$t('code.factoryName')">
+            <el-select v-model="dataForm.factoryId" :placeholder="$t('code.factoryName')">
+              <el-option v-for="item in factoryList" :key="item.id" :label="item.factoryName" :value="item.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item prop="inspectionTime" :label="$t('code.inspectionTime')">
+            <el-date-picker v-model="dataForm.inspectionTime" type="datetime" :placeholder="$t('code.inspectionTime')"
+              format='yyyy-MM-dd HH:mm:ss' valueFormat='yyyy-MM-ddTHH:mm:ss'>
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item prop="orderNumber" :label="$t('code.orderNumber')">
+            <el-input v-model="dataForm.orderNumber" :placeholder="$t('code.orderNumber')"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="8">
+          <el-form-item prop="batchNo" :label="$t('code.batchNo')">
+            <el-input v-model="dataForm.batchNo" :placeholder="$t('code.batchNo')"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item prop="inspectionType" :label="$t('code.inspectionType')">
+            <el-select v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')">
+              <el-option v-for="item in inspectionTypeList" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item prop="recheck" :label="$t('code.recheck')">
+            <el-switch v-model="dataForm.recheck" :active-value="1" :inactive-value="0">
+            </el-switch>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="8">
+          <el-form-item prop="productId" :label="$t('code.productName')">
+            <el-select v-model="dataForm.productId" :placeholder="$t('code.productName')">
+              <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item prop="supplierId" :label="$t('code.supplierName')">
+            <el-select v-model="dataForm.supplierId" :placeholder="$t('code.supplierName')">
+              <el-option v-for="item in supplierList" :key="item.id" :label="item.name" :value="item.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item prop="batchQuantity" :label="$t('code.batchQuantity')">
+            <el-input v-model="dataForm.batchQuantity" :placeholder="$t('code.batchQuantity')"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="8">
+          <el-form-item prop="inspectionQuantity" :label="$t('code.inspectionQuantity')">
+            <el-input v-model="dataForm.inspectionQuantity" :placeholder="$t('code.inspectionQuantity')"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item prop="batchSize" :label="$t('code.batchSize')">
+            <el-input v-model="dataForm.batchSize" :placeholder="$t('code.batchSize')"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item prop="samplesQuantity" :label="$t('code.samplesQuantity')">
+            <el-input v-model="dataForm.samplesQuantity" :placeholder="$t('code.samplesQuantity')"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="8">
+          <el-form-item prop="companyId" :label="$t('code.companyName')">
+            <el-select v-model="dataForm.companyId" :placeholder="$t('code.companyName')">
+              <el-option v-for="item in unitList" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item prop="userId" :label="$t('code.username')">
+            <el-select v-model="dataForm.userId" :placeholder="$t('code.username')">
+              <el-option v-for="item in unitList" :key="item.id" :label="item.realName" :value="item.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item prop="inspectionStatus" :label="$t('code.inspectionStatus')">
+            <el-select v-model="dataForm.inspectionStatus" :placeholder="$t('code.inspectionStatus')">
+              <el-option v-for="item in inspectionStatusList" :key="item.id" :label="item.name" :value="item.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="8">
+          <el-form-item prop="customSamplingId" :label="$t('code.customSampling')">
+            <el-select v-model="dataForm.customSamplingId" :placeholder="$t('code.customSampling')">
+              <el-option v-for="item in samplingPlanList" :key="item.id" :label="item.sampleRange" :value="item.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <el-divider content-position="center">GBT2828.1</el-divider>
+    <el-form :model="GBTDataForm" ref="GBTDataForm" label-width="80px">
+      <el-row :gutter="24">
+        <el-col :span="4">
+          <el-form-item prop="critical" label="CR" label-width="50px">
+            <el-input v-model="GBTDataForm.critical" placeholder="CR"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item prop="criticalAccept" label="Accept">
+            <el-input v-model="GBTDataForm.criticalAccept" placeholder="Accept"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item prop="criticalReject" label="Reject" label-width="60px">
+            <el-input v-model="GBTDataForm.criticalReject" placeholder="Reject"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item prop="criticalNumber" :label="$t('code.defectsNumber')">
+            <el-input v-model="GBTDataForm.criticalNumber" :placeholder="$t('code.defectsNumber')"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item prop="criticalDefectiveNumber" :label="$t('code.defectiveQuantity')">
+            <el-input v-model="GBTDataForm.criticalDefectiveNumber" :placeholder="$t('code.defectiveQuantity')">
+            </el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="4">
+          <el-form-item prop="major" label="MA" label-width="50px">
+            <el-input v-model="GBTDataForm.major" placeholder="CR"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item prop="majorAccept" label="Accept">
+            <el-input v-model="GBTDataForm.majorAccept" placeholder="Accept"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item prop="majorReject" label="Reject" label-width="60px">
+            <el-input v-model="GBTDataForm.majorReject" placeholder="Reject"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item prop="majorNumber" :label="$t('code.defectsNumber')">
+            <el-input v-model="GBTDataForm.majorNumber" :placeholder="$t('code.defectsNumber')"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item prop="majorDefectiveNumber" :label="$t('code.defectiveQuantity')">
+            <el-input v-model="GBTDataForm.majorDefectiveNumber" :placeholder="$t('code.defectiveQuantity')">
+            </el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="4">
+          <el-form-item prop="minor" label="MI" label-width="50px">
+            <el-input v-model="GBTDataForm.minor" placeholder="CR"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item prop="minorAccept" label="Accept">
+            <el-input v-model="GBTDataForm.minorAccept" placeholder="Accept"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item prop="minorReject" label="Reject" label-width="60px">
+            <el-input v-model="GBTDataForm.minorReject" placeholder="Reject"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item prop="minorNumber" :label="$t('code.defectsNumber')">
+            <el-input v-model="GBTDataForm.minorNumber" :placeholder="$t('code.defectsNumber')"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item prop="minorDefectiveNumber" :label="$t('code.defectiveQuantity')">
+            <el-input v-model="GBTDataForm.minorDefectiveNumber" :placeholder="$t('code.defectiveQuantity')">
+            </el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="4">
+          <el-form-item prop="total" label="total" label-width="50px">
+            <el-input v-model="GBTDataForm.total" placeholder="CR"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item prop="totalAccept" label="Accept">
+            <el-input v-model="GBTDataForm.totalAccept" placeholder="Accept"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item prop="totalReject" label="Reject" label-width="60px">
+            <el-input v-model="GBTDataForm.totalReject" placeholder="Reject"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item prop="totalNumber" :label="$t('code.defectsNumber')">
+            <el-input v-model="GBTDataForm.totalNumber" :placeholder="$t('code.defectsNumber')"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item prop="totalDefectiveNumber" :label="$t('code.defectiveQuantity')">
+            <el-input v-model="GBTDataForm.totalDefectiveNumber" :placeholder="$t('code.defectiveQuantity')">
+            </el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import debounce from "lodash/debounce";
+import basicAdd from "@/mixins/basic-add";
+export default {
+  mixins: [basicAdd],
+  data() {
+    return {
+      urlOptions: {
+        GBTSubmitURL: "/code/productRegistration",
+        submitURL: "/code/productRegistration",  
+        infoURL: "/code/productRegistration/{id}",
+        getFactoryURL: '/code/factory/page',
+        getProductURL: '/basic/product/page',
+        getSupplierURL: '/supplier/qmsSupplier/page',
+        getDictDataList: '/sys/dict/data/page',
+        getUserURL: '/sys/user/page',
+        getSamplingPlanURL: '/quality/qmsSamplingPlan/page'
+      },
+      supplierList: [],
+      userList: [],
+      samplingPlanList:[],
+      inspectionStatusList: [
+        {
+          id: 0,
+          name: '未登记'
+        },
+        {
+          id: 1,
+          name: '已登记'
+        }
+      ],
+      unitList:[],
+      productList: [],
+      factoryList:[],
+      visible: false,
+      listQuery: {
+        limit: 999,
+        page:1
+      },
+      inspectionTypeList: [{
+        value: 0,
+        label: '监控'
+      },
+      {
+        value: 1,
+        label: '电芯来料检验'
+      },
+      {
+        value: 2,
+        label: 'IQC抽检'
+      },
+      {
+        value: 3,
+        label: 'IQC抽检2'
+      },
+      {
+        value: 4,
+        label: '原料抽检'
+      },
+      {
+        value: 5,
+        label: '进货外观检验'
+      },
+      {
+        value: 6,
+        label: '库内原料检验'
+      },
+      {
+        value: 7,
+        label: '来料检验'
+      },
+      {
+        value: 8,
+        label: '胶片'
+      },
+      {
+        value: 9,
+        label: '抽检'
+      },
+      {
+        value: 10,
+        label: '巡检'
+      }, {
+        value: 11,
+        label: '首检'
+      },
+      {
+        value: 12,
+        label: '末检'
+      },
+      {
+        value: 13,
+        label: '实时监测'
+      },
+      {
+        value: 14,
+        label: 'FQC抽检'
+      },
+      {
+        value: 15,
+        label: 'OQC抽检'
+      },
+      ],
+      GBTDataForm: {
+        critical:null,
+        criticalAccept: null,
+        criticalDefectiveNumber: null,
+        criticalNumber: null,
+        criticalReject: null,
+        id: null,
+        major: null,
+        majorAccept: null,
+        majorDefectiveNumber: null,
+        majorNumber: null,
+        majorReject: null,
+        minor: null,
+        minorAccept: null,
+        minorDefectiveNumber: null,
+        minorNumber: null,
+        minorReject: null,
+        purchaseRegistrationId: null,
+        total: null,
+        totalAccept: null,
+        totalDefectiveNumber: null,
+        totalNumber: null,
+        totalReject: null,
+      },
+      dataForm: {
+        batchNo:null,
+        batchQuantity: null,
+        batchSize: null,
+        checkoutTime: null,
+        companyId: null,
+        customSamplingId: null,
+        defectiveQuantity: null,
+        defectsNumber: null,
+        distributionUserId: null,
+        factoryId: null,
+        id: null,
+        inspectionQuantity: null,
+        inspectionTime: null,
+        inspectionType: null,
+        orderNumber: null,
+        parameterName: null,
+        processingMethod: null,
+        processingResults: null,
+        productId: null,
+        recordQuantity: null,
+        remark: null,
+        shiftId: null,
+        submit: null,
+        supplierId: null,
+        teamId: null,
+        upload: null,
+        userId: null,
+      },
+    };
+  },
+  computed: {
+    dataRule() {
+      return {
+        dictLabel: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+        dictValue: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+        sort: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+      };
+    },
+  },
+  created() {
+    this.getDict()
+  },
+  methods: {
+    init(id, ) {
+      this.dataForm.id = id || ""
+      // this.dataForm.dictTypeId = dictTypeId || "";
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs["dataForm"].resetFields();
+        if (this.dataForm.id) {
+          this.getInfo();
+        }
+      });
+    },
+    // 获取信息
+    getInfo() {
+      this.$http
+        .get(`/code/productRegistration/${this.dataForm.id}`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          }
+          this.dataForm = {
+            ...this.dataForm,
+            ...res.data,
+          };
+        })
+        .catch(() => { })
+      this.$http
+        .get(`/code/shipmentInspectionNationalStandard/getById/${this.dataForm.id}`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          }
+          this.GBTDataForm = {
+            ...this.GBTDataForm,
+            ...res.data,
+          };
+        })
+        .catch(() => { })
+    },
+    getDict() {
+      this.$http
+        .post(this.urlOptions.getSamplingPlanURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.samplingPlanList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      this.$http
+        .post(this.urlOptions.getUserURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.userList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      this.$http
+        .post(this.urlOptions.getProductURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.productList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      this.$http
+        .post(this.urlOptions.getDictDataList, {
+          params: {
+            limit: 999,
+            page: 1,
+            dictTypeId: '1665966021935190018'
+          }
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.unitList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      this.$http
+        .post(this.urlOptions.getSupplierURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.supplierList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      this.$http
+        .post(this.urlOptions.getFactoryURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.factoryList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      // console.log(111111);
+    },
+    dataFormSubmit() {
+      this.$refs["dataForm"].validate((valid) => {
+        if (!valid) {
+          return false;
+        }
+        if (this.dataForm.id) {
+            this.$http.put(this.urlOptions.submitURL, this.dataForm)
+              .then(({ data: res }) => {
+                if (res.code !== 0) {
+                  return this.$message.error(res.msg);
+                }
+                this.GBTDataForm.purchaseRegistrationId = res.data
+                this.$http.post(this.urlOptions.GBTSubmitURL, this.parameterData)
+                  .then(({ data: res }) => {
+                    if (res.code !== 0) {
+                      return this.$message.error(res.msg);
+                    }
+                    this.$message({
+                      message: this.$t("prompt.success"),
+                      type: "success",
+                      duration: 500,
+                      onClose: () => {
+                        this.visible = false;
+                        this.$emit("refreshDataList")
+                      }
+                    })
+                  })
+
+                this.$message({
+                  message: this.$t("prompt.success"),
+                  type: "success",
+                  duration: 500,
+                  onClose: () => {
+                    this.visible = false;
+                    this.$emit("refreshDataList")
+                  }
+                })
+              })
+              .catch(() => { });
+        } else {
+          this.$http.post(this.urlOptions.submitURL, this.dataForm)
+            .then(({ data: res }) => {
+              if (res.code !== 0) {
+                return this.$message.error(res.msg);
+              }
+              this.GBTDataForm.purchaseRegistrationId = res.data
+              this.$http.post(this.urlOptions.GBTSubmitURL, this.parameterData)
+                .then(({ data: res }) => {
+                  if (res.code !== 0) {
+                    return this.$message.error(res.msg);
+                  }
+                  this.$message({
+                    message: this.$t("prompt.success"),
+                    type: "success",
+                    duration: 500,
+                    onClose: () => {
+                      this.visible = false;
+                      this.$emit("refreshDataList")
+                    }
+                  })
+                })
+
+              this.$message({
+                message: this.$t("prompt.success"),
+                type: "success",
+                duration: 500,
+                onClose: () => {
+                  this.visible = false;
+                  this.$emit("refreshDataList")
+                }
+              })
+            })
+            .catch(() => { });
+        }
+      });
+    },
+    // 表单提交
+  },
+};
+</script>
diff --git a/src/views/modules/code/components/productRegistrationSearch.vue b/src/views/modules/code/components/productRegistrationSearch.vue
new file mode 100644
index 0000000..540330d
--- /dev/null
+++ b/src/views/modules/code/components/productRegistrationSearch.vue
@@ -0,0 +1,366 @@
+<!--
+ * @Author: zwq
+ * @Date: 2023-01-04 10:29:40
+ * @LastEditors: zhp
+ * @LastEditTime: 2023-06-20 15:26:47
+ * @Description: 
+-->
+<template>
+  <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
+    <el-form-item prop="factoryId" :label="$t('code.factoryName')">
+      <el-select v-model="dataForm.factoryId" :placeholder="$t('code.factoryName')">
+        <el-option v-for="item in factoryList" :key="item.id" :label="item.factoryName" :value="item.id">
+        </el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item prop="batchNo" :label="$t('code.batchNo')">
+      <el-input v-model="dataForm.batchNo" :placeholder="$t('code.batchNo')"></el-input>
+    </el-form-item>
+    <el-form-item prop="inspectionType" :label="$t('code.inspectionType')">
+      <el-select v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')">
+        <el-option v-for="item in inspectionTypeList" :key="item.value" :label="item.label" :value="item.value">
+        </el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item prop="productId" :label="$t('code.productName')">
+      <el-select v-model="dataForm.productId" :placeholder="$t('code.productName')">
+        <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.id">
+        </el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item prop="supplierId" :label="$t('code.supplierName')">
+      <el-select v-model="dataForm.supplierId" :placeholder="$t('code.supplierName')">
+        <el-option v-for="item in supplierList" :key="item.id" :label="item.name" :value="item.id">
+        </el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item prop="userId" :label="$t('code.Examiner')">
+      <el-select v-model="dataForm.userId" :placeholder="$t('code.Examiner')">
+        <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id">
+        </el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item prop="customSamplingId" :label="$t('code.customSampling')">
+      <el-select v-model="dataForm.customSamplingId" :placeholder="$t('code.customSampling')">
+        <el-option v-for="item in samplingPlanList" :key="item.id" :label="item.sampleRange" :value="item.id">
+        </el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item prop="judgmentResult" :label="$t('code.judgmentResult')">
+      <el-select v-model="dataForm.judgmentResult" :placeholder="$t('code.judgmentResult')">
+        <el-option v-for="item in judgmentResultList" :key="item.id" :label="item.name" :value="item.id">
+        </el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item prop="orderNumber" :label="$t('code.orderNumber')">
+      <el-input v-model="dataForm.orderNumber" :placeholder="$t('code.orderNumber')"></el-input>
+    </el-form-item>
+    <el-form-item prop="recheck" :label="$t('code.recheck')">
+      <el-switch v-model="dataForm.recheck" :active-value="1" :inactive-value="0">
+      </el-switch>
+    </el-form-item>
+    <el-form-item prop="task" :label="$t('code.processingResults')">
+      <el-radio-group v-model="dataForm.processingResults">
+        <el-radio :label="0"> {{ $t('code.approval') }} </el-radio>
+        <el-radio :label="1">{{ $t('code.approvalComplete') }} </el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <el-form-item prop="task" :label="$t('code.status')">
+      <el-radio-group v-model="dataForm.upload">
+        <el-radio :label="0">{{ $t('code.notUploaded') }}</el-radio>
+        <el-radio :label="1">{{ $t('code.uploaded') }}</el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <el-form-item prop="inspectionStatus" :label="$t('code.inspectionStatus')">
+      <el-select v-model="dataForm.inspectionStatus" :placeholder="$t('code.inspectionStatus')">
+        <el-option v-for="item in inspectionStatusList" :key="item.id" :label="item.name" :value="item.id">
+        </el-option>
+      </el-select>
+    </el-form-item>
+  </el-form>
+</template>
+
+<script>
+import debounce from "lodash/debounce";
+import basicAdd from "@/mixins/basic-add";
+export default {
+  mixins: [basicAdd],
+  data() {
+    return {
+      urlOptions: {
+        submitURL: "/basic/qmsCustomerType",
+        infoURL: "/basic/qmsCustomerType/{id}",
+        getCodeURL: '/basic/qmsControlMode/getCode',
+        getFactoryURL: '/code/factory/page',
+        getProductURL: '/basic/product/page',
+        getSupplierURL: '/supplier/qmsSupplier/page',
+        getDictDataList: '/sys/dict/data/page',
+        getUserURL: '/sys/user/page',
+        getSamplingPlanURL: '/quality/qmsSamplingPlan/page'
+      },
+      // urlOptions: {
+      //   submitURL: "/sys/params/",
+      //   infoURL: "/sys/params",
+      // },
+      inspectionStatusList: [
+        {
+          id: 0,
+          name: '未登记'
+        },
+        {
+          id: 1,
+          name: '已登记'
+        }
+      ],
+      supplierList: [],
+      userList: [],
+      samplingPlanList: [],
+      judgmentResultList: [
+        {
+          id: 0,
+          name: '0未判定'
+        },
+        {
+          id: 1,
+          name: '1合格'
+        },
+        {
+          id: 2,
+          name: '不合格'
+        },
+      ],
+      unitList: [],
+      productList: [],
+      factoryList: [],
+      visible: false,
+      inspectionTypeList: [{
+        value: 0,
+        label: '监控'
+      },
+      {
+        value: 1,
+        label: '电芯来料检验'
+      },
+      {
+        value: 2,
+        label: 'IQC抽检'
+      },
+      {
+        value: 3,
+        label: 'IQC抽检2'
+      },
+      {
+        value: 4,
+        label: '原料抽检'
+      },
+      {
+        value: 5,
+        label: '进货外观检验'
+      },
+      {
+        value: 6,
+        label: '库内原料检验'
+      },
+      {
+        value: 7,
+        label: '来料检验'
+      },
+      {
+        value: 8,
+        label: '胶片'
+      },
+      {
+        value: 9,
+        label: '抽检'
+      },
+      {
+        value: 10,
+        label: '巡检'
+      }, {
+        value: 11,
+        label: '首检'
+      },
+      {
+        value: 12,
+        label: '末检'
+      },
+      {
+        value: 13,
+        label: '实时监测'
+      },
+      {
+        value: 14,
+        label: 'FQC抽检'
+      },
+      {
+        value: 15,
+        label: 'OQC抽检'
+      },
+      ],
+      dataForm: {
+        processingResults: null,
+        batchNo: null,
+        customSamplingId: null,
+        factoryId: null,
+        inspectionType: null,
+        judgmentResult: null,
+        orderNumber: null,
+        productId: null,
+        recheck: null,
+        supplierId: null,
+        upload: null,
+        userId: null
+      },
+    };
+  },
+  computed: {
+    // dataRule() {
+    //   return {
+    //     paramCode: [
+    //       {
+    //         required: true,
+    //         message: this.$t("validate.required"),
+    //         trigger: "blur",
+    //       },
+    //     ],
+    //     paramValue: [
+    //       {
+    //         required: true,
+    //         message: this.$t("validate.required"),
+    //         trigger: "blur",
+    //       },
+    //     ],
+    //   };
+    // },
+  },
+  mounted() {
+    this.getDict()
+  },
+  methods: {
+    getDict() {
+      this.$http
+        .get(this.urlOptions.getSamplingPlanURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.samplingPlanList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      this.$http
+        .get(this.urlOptions.getProductURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.productList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      this.$http
+        .get(this.urlOptions.getSupplierURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.supplierList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      this.$http
+        .get(this.urlOptions.getUserURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.userList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      this.$http
+        .get(this.urlOptions.getFactoryURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.factoryList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      // console.log(111111);
+    },
+    // init(id) {
+    //   this.dataForm.id = id || "";
+    //   this.visible = true;
+    //   this.$nextTick(() => {
+    //     this.$refs["dataForm"].resetFields();
+    //     if (this.dataForm.id) {
+    //       this.getInfo();
+    //     }
+    //   });
+    // },
+    // 获取信息
+    // getInfo() {
+    //   this.$http
+    //     .get(`/sys/params/${this.dataForm.id}`)
+    //     .then(({ data: res }) => {
+    //       if (res.code !== 0) {
+    //         return this.$message.error(res.msg);
+    //       }
+    //       this.dataForm = {
+    //         ...this.dataForm,
+    //         ...res.data,
+    //       };
+    //     })
+    //     .catch(() => {});
+    // },
+    // 表单提交
+    handleConditionSearch() {
+      this.$emit("successSubmit", this.dataForm)
+    },
+    // dataFormSubmitHandle: debounce(
+    //   function () {
+    //     // console.log(1111);
+    //     // this.visible = false;
+    //     this.$emit("successSubmit", this.dataForm.key);
+    //     // this.$refs["dataForm"].validate((valid) => {
+    //     //   if (!valid) {
+    //     //     return false;
+    //     //   }
+    //     //   this.$http[!this.dataForm.id ? "post" : "put"](
+    //     //     "/sys/params",
+    //     //     this.dataForm
+    //     //   )
+    //     //     .then(({ data: res }) => {
+    //     //       if (res.code !== 0) {
+    //     //         return this.$message.error(res.msg);
+    //     //       }
+    //     //       this.$message({
+    //     //         message: this.$t("prompt.success"),
+    //     //         type: "success",
+    //     //         duration: 500,
+    //     //         onClose: () => {
+
+    //     //         },
+    //     //       });
+    //     //     })
+    //     //     .catch(() => {});
+    //     // });
+    //   },
+    //   1000,
+    //   { leading: true, trailing: false }
+    // ),
+  },
+};
+</script>
diff --git a/src/views/modules/code/components/radio.vue b/src/views/modules/code/components/radio.vue
new file mode 100644
index 0000000..aaf9937
--- /dev/null
+++ b/src/views/modules/code/components/radio.vue
@@ -0,0 +1,49 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-01-31 14:12:10
+ * @LastEditTime: 2023-01-31 16:47:32
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <span>
+    <el-radio v-model="injectData.incomingInspection" :label="1"
+      >进货检验</el-radio
+    >
+    <el-radio v-model="injectData.processInspection" :label="1"
+      >过程检验</el-radio
+    >
+    <el-radio v-model="injectData.finishInspection" :label="1"
+      >成品检验</el-radio
+    >
+    <el-radio v-model="injectData.outInspection" :label="1">出货检验</el-radio>
+  </span>
+</template>
+
+<script>
+// import { addDynamicRoute } from '@/router'
+export default {
+  props: {
+    injectData: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+  methods: {
+    // 子级
+    // emitClick () {
+    //   // 路由参数
+    //   const routeParams = {
+    //     routeName: `${this.$route.name}__${this.injectData.id}`,
+    //     title: `${this.$route.meta.title} - ${this.injectData.dictType}`,
+    //     path: 'sys/dict-data',
+    //     params: {
+    //       dictTypeId: this.injectData.id
+    //     }
+    //   }
+    //   // 动态路由
+    //   addDynamicRoute(routeParams, this.$router)
+    // }
+  },
+};
+</script>
diff --git a/src/views/modules/code/components/shipmentRegistration-add.vue b/src/views/modules/code/components/shipmentRegistration-add.vue
new file mode 100644
index 0000000..4bb8b91
--- /dev/null
+++ b/src/views/modules/code/components/shipmentRegistration-add.vue
@@ -0,0 +1,634 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-02-14 15:02:26
+ * @LastEditTime: 2023-06-20 15:27:51
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <div>
+    <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
+      <el-row :gutter="24">
+        <el-col :span="8">
+          <el-form-item prop="factoryId" :label="$t('code.factoryName')">
+            <el-select v-model="dataForm.factoryId" :placeholder="$t('code.factoryName')">
+              <el-option v-for="item in factoryList" :key="item.id" :label="item.factoryName" :value="item.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item prop="inspectionTime" :label="$t('code.inspectionTime')">
+            <el-date-picker v-model="dataForm.inspectionTime" type="datetime" :placeholder="$t('code.inspectionTime')"
+              format='yyyy-MM-dd HH:mm:ss' valueFormat='yyyy-MM-ddTHH:mm:ss'>
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item prop="orderNumber" :label="$t('code.orderNumber')">
+            <el-input v-model="dataForm.orderNumber" :placeholder="$t('code.orderNumber')"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="8">
+          <el-form-item prop="batchNo" :label="$t('code.batchNo')">
+            <el-input v-model="dataForm.batchNo" :placeholder="$t('code.batchNo')"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item prop="inspectionType" :label="$t('code.inspectionType')">
+            <el-select v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')">
+              <el-option v-for="item in inspectionTypeList" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item prop="recheck" :label="$t('code.recheck')">
+            <el-switch v-model="dataForm.recheck" :active-value="1" :inactive-value="0">
+            </el-switch>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="8">
+          <el-form-item prop="productId" :label="$t('code.productName')">
+            <el-select v-model="dataForm.productId" :placeholder="$t('code.productName')">
+              <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item prop="supplierId" :label="$t('code.supplierName')">
+            <el-select v-model="dataForm.supplierId" :placeholder="$t('code.supplierName')">
+              <el-option v-for="item in supplierList" :key="item.id" :label="item.name" :value="item.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item prop="batchQuantity" :label="$t('code.batchQuantity')">
+            <el-input v-model="dataForm.batchQuantity" :placeholder="$t('code.batchQuantity')"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="8">
+          <el-form-item prop="inspectionQuantity" :label="$t('code.inspectionQuantity')">
+            <el-input v-model="dataForm.inspectionQuantity" :placeholder="$t('code.inspectionQuantity')"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item prop="batchSize" :label="$t('code.batchSize')">
+            <el-input v-model="dataForm.batchSize" :placeholder="$t('code.batchSize')"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item prop="samplesQuantity" :label="$t('code.samplesQuantity')">
+            <el-input v-model="dataForm.samplesQuantity" :placeholder="$t('code.samplesQuantity')"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="8">
+          <el-form-item prop="companyId" :label="$t('code.companyName')">
+            <el-select v-model="dataForm.companyId" :placeholder="$t('code.companyName')">
+              <el-option v-for="item in unitList" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item prop="userId" :label="$t('code.username')">
+            <el-select v-model="dataForm.userId" :placeholder="$t('code.username')">
+              <el-option v-for="item in unitList" :key="item.id" :label="item.realName" :value="item.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item prop="inspectionStatus" :label="$t('code.inspectionStatus')">
+            <el-select v-model="dataForm.inspectionStatus" :placeholder="$t('code.inspectionStatus')">
+              <el-option v-for="item in inspectionStatusList" :key="item.id" :label="item.name" :value="item.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="8">
+          <el-form-item prop="customSamplingId" :label="$t('code.customSampling')">
+            <el-select v-model="dataForm.customSamplingId" :placeholder="$t('code.customSampling')">
+              <el-option v-for="item in samplingPlanList" :key="item.id" :label="item.sampleRange" :value="item.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <el-divider content-position="center">GBT2828.1</el-divider>
+    <el-form :model="GBTDataForm" ref="GBTDataForm" label-width="80px">
+      <el-row :gutter="24">
+        <el-col :span="4">
+          <el-form-item prop="critical" label="CR" label-width="50px">
+            <el-input v-model="GBTDataForm.critical" placeholder="CR"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item prop="criticalAccept" label="Accept">
+            <el-input v-model="GBTDataForm.criticalAccept" placeholder="Accept"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item prop="criticalReject" label="Reject" label-width="60px">
+            <el-input v-model="GBTDataForm.criticalReject" placeholder="Reject"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item prop="criticalNumber" :label="$t('code.defectsNumber')">
+            <el-input v-model="GBTDataForm.criticalNumber" :placeholder="$t('code.defectsNumber')"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item prop="criticalDefectiveNumber" :label="$t('code.defectiveQuantity')">
+            <el-input v-model="GBTDataForm.criticalDefectiveNumber" :placeholder="$t('code.defectiveQuantity')">
+            </el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="4">
+          <el-form-item prop="major" label="MA" label-width="50px">
+            <el-input v-model="GBTDataForm.major" placeholder="CR"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item prop="majorAccept" label="Accept">
+            <el-input v-model="GBTDataForm.majorAccept" placeholder="Accept"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item prop="majorReject" label="Reject" label-width="60px">
+            <el-input v-model="GBTDataForm.majorReject" placeholder="Reject"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item prop="majorNumber" :label="$t('code.defectsNumber')">
+            <el-input v-model="GBTDataForm.majorNumber" :placeholder="$t('code.defectsNumber')"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item prop="majorDefectiveNumber" :label="$t('code.defectiveQuantity')">
+            <el-input v-model="GBTDataForm.majorDefectiveNumber" :placeholder="$t('code.defectiveQuantity')">
+            </el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="4">
+          <el-form-item prop="minor" label="MI" label-width="50px">
+            <el-input v-model="GBTDataForm.minor" placeholder="CR"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item prop="minorAccept" label="Accept">
+            <el-input v-model="GBTDataForm.minorAccept" placeholder="Accept"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item prop="minorReject" label="Reject" label-width="60px">
+            <el-input v-model="GBTDataForm.minorReject" placeholder="Reject"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item prop="minorNumber" :label="$t('code.defectsNumber')">
+            <el-input v-model="GBTDataForm.minorNumber" :placeholder="$t('code.defectsNumber')"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item prop="minorDefectiveNumber" :label="$t('code.defectiveQuantity')">
+            <el-input v-model="GBTDataForm.minorDefectiveNumber" :placeholder="$t('code.defectiveQuantity')">
+            </el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="4">
+          <el-form-item prop="total" label="total" label-width="50px">
+            <el-input v-model="GBTDataForm.total" placeholder="CR"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item prop="totalAccept" label="Accept">
+            <el-input v-model="GBTDataForm.totalAccept" placeholder="Accept"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item prop="totalReject" label="Reject" label-width="60px">
+            <el-input v-model="GBTDataForm.totalReject" placeholder="Reject"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item prop="totalNumber" :label="$t('code.defectsNumber')">
+            <el-input v-model="GBTDataForm.totalNumber" :placeholder="$t('code.defectsNumber')"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item prop="totalDefectiveNumber" :label="$t('code.defectiveQuantity')">
+            <el-input v-model="GBTDataForm.totalDefectiveNumber" :placeholder="$t('code.defectiveQuantity')">
+            </el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import debounce from "lodash/debounce";
+import basicAdd from "@/mixins/basic-add";
+export default {
+  mixins: [basicAdd],
+  data() {
+    return {
+      urlOptions: {
+        GBTSubmitURL: "/code/shipmentRegistration",
+        submitURL: "/code/shipmentRegistration",  
+        infoURL: "/code/shipmentRegistration/{id}",
+        getFactoryURL: '/code/factory/page',
+        getProductURL: '/basic/product/page',
+        getSupplierURL: '/supplier/qmsSupplier/page',
+        getDictDataList: '/sys/dict/data/page',
+        getUserURL: '/sys/user/page',
+        getSamplingPlanURL: '/quality/qmsSamplingPlan/page'
+      },
+      supplierList: [],
+      userList: [],
+      samplingPlanList:[],
+      inspectionStatusList: [
+        {
+          id: 0,
+          name: '未登记'
+        },
+        {
+          id: 1,
+          name: '已登记'
+        }
+      ],
+      unitList:[],
+      productList: [],
+      factoryList:[],
+      visible: false,
+      listQuery: {
+        limit: 999,
+        page:1
+      },
+      inspectionTypeList: [{
+        value: 0,
+        label: '监控'
+      },
+      {
+        value: 1,
+        label: '电芯来料检验'
+      },
+      {
+        value: 2,
+        label: 'IQC抽检'
+      },
+      {
+        value: 3,
+        label: 'IQC抽检2'
+      },
+      {
+        value: 4,
+        label: '原料抽检'
+      },
+      {
+        value: 5,
+        label: '进货外观检验'
+      },
+      {
+        value: 6,
+        label: '库内原料检验'
+      },
+      {
+        value: 7,
+        label: '来料检验'
+      },
+      {
+        value: 8,
+        label: '胶片'
+      },
+      {
+        value: 9,
+        label: '抽检'
+      },
+      {
+        value: 10,
+        label: '巡检'
+      }, {
+        value: 11,
+        label: '首检'
+      },
+      {
+        value: 12,
+        label: '末检'
+      },
+      {
+        value: 13,
+        label: '实时监测'
+      },
+      {
+        value: 14,
+        label: 'FQC抽检'
+      },
+      {
+        value: 15,
+        label: 'OQC抽检'
+      },
+      ],
+      GBTDataForm: {
+        critical:null,
+        criticalAccept: null,
+        criticalDefectiveNumber: null,
+        criticalNumber: null,
+        criticalReject: null,
+        id: null,
+        major: null,
+        majorAccept: null,
+        majorDefectiveNumber: null,
+        majorNumber: null,
+        majorReject: null,
+        minor: null,
+        minorAccept: null,
+        minorDefectiveNumber: null,
+        minorNumber: null,
+        minorReject: null,
+        purchaseRegistrationId: null,
+        total: null,
+        totalAccept: null,
+        totalDefectiveNumber: null,
+        totalNumber: null,
+        totalReject: null,
+      },
+      dataForm: {
+        batchNo: null,
+        batchQuantity: null,
+        batchSize: null,
+        checkoutTime: null,
+        companyId: null,
+        customSamplingId: null,
+        defectiveQuantity: null,
+        defectsNumber: null,
+        distributionUserId: null,
+        factoryId: null,
+        id: null,
+        inspectionQuantity: null,
+        inspectionTime: null,
+        inspectionType: null,
+        orderNumber: null,
+        parameterName: null,
+        processingMethod: null,
+        processingResults: null,
+        productId: null,
+        recordQuantity: null,
+        remark: null,
+        shiftId: null,
+        submit: null,
+        supplierId: null,
+        teamId: null,
+        upload: null,
+        userId: null,
+      },
+    };
+  },
+  computed: {
+    dataRule() {
+      return {
+        dictLabel: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+        dictValue: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+        sort: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+      };
+    },
+  },
+  created() {
+    this.getDict()
+  },
+  methods: {
+    init(id, ) {
+      this.dataForm.id = id || ""
+      // this.dataForm.dictTypeId = dictTypeId || "";
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs["dataForm"].resetFields();
+        if (this.dataForm.id) {
+          this.getInfo();
+        }
+      });
+    },
+    // 获取信息
+    getInfo() {
+      this.$http
+        .get(`/code/shipmentRegistration/${this.dataForm.id}`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          }
+          this.dataForm = {
+            ...this.dataForm,
+            ...res.data,
+          };
+        })
+        .catch(() => { })
+      this.$http
+        .get(`/code/purchaseRegistrationNationalStandard/getById/${this.dataForm.id}`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          }
+          this.GBTDataForm = {
+            ...this.GBTDataForm,
+            ...res.data,
+          };
+        })
+        .catch(() => { })
+    },
+    getDict() {
+      this.$http
+        .post(this.urlOptions.getSamplingPlanURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.samplingPlanList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      this.$http
+        .post(this.urlOptions.getUserURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.userList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      this.$http
+        .post(this.urlOptions.getProductURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.productList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      this.$http
+        .post(this.urlOptions.getDictDataList, {
+          params: {
+            limit: 999,
+            page: 1,
+            dictTypeId: '1665966021935190018'
+          }
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.unitList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      this.$http
+        .post(this.urlOptions.getSupplierURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.supplierList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      this.$http
+        .post(this.urlOptions.getFactoryURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.factoryList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      // console.log(111111);
+    },
+    dataFormSubmit() {
+      this.$refs["dataForm"].validate((valid) => {
+        if (!valid) {
+          return false;
+        }
+        if (this.dataForm.id) {
+            this.$http.put(this.urlOptions.submitURL, this.dataForm)
+              .then(({ data: res }) => {
+                if (res.code !== 0) {
+                  return this.$message.error(res.msg);
+                }
+                this.GBTDataForm.purchaseRegistrationId = res.data
+                this.$http.post(this.urlOptions.GBTSubmitURL, this.parameterData)
+                  .then(({ data: res }) => {
+                    if (res.code !== 0) {
+                      return this.$message.error(res.msg);
+                    }
+                    this.$message({
+                      message: this.$t("prompt.success"),
+                      type: "success",
+                      duration: 500,
+                      onClose: () => {
+                        this.visible = false;
+                        this.$emit("refreshDataList")
+                      }
+                    })
+                  })
+
+                this.$message({
+                  message: this.$t("prompt.success"),
+                  type: "success",
+                  duration: 500,
+                  onClose: () => {
+                    this.visible = false;
+                    this.$emit("refreshDataList")
+                  }
+                })
+              })
+              .catch(() => { });
+        } else {
+          this.$http.post(this.urlOptions.submitURL, this.dataForm)
+            .then(({ data: res }) => {
+              if (res.code !== 0) {
+                return this.$message.error(res.msg);
+              }
+              this.GBTDataForm.purchaseRegistrationId = res.data
+              this.$http.post(this.urlOptions.GBTSubmitURL, this.parameterData)
+                .then(({ data: res }) => {
+                  if (res.code !== 0) {
+                    return this.$message.error(res.msg);
+                  }
+                  this.$message({
+                    message: this.$t("prompt.success"),
+                    type: "success",
+                    duration: 500,
+                    onClose: () => {
+                      this.visible = false;
+                      this.$emit("refreshDataList")
+                    }
+                  })
+                })
+
+              this.$message({
+                message: this.$t("prompt.success"),
+                type: "success",
+                duration: 500,
+                onClose: () => {
+                  this.visible = false;
+                  this.$emit("refreshDataList")
+                }
+              })
+            })
+            .catch(() => { });
+        }
+      });
+    },
+    // 表单提交
+  },
+};
+</script>
diff --git a/src/views/modules/code/components/shipmentRegistrationSearch.vue b/src/views/modules/code/components/shipmentRegistrationSearch.vue
new file mode 100644
index 0000000..19b1dd1
--- /dev/null
+++ b/src/views/modules/code/components/shipmentRegistrationSearch.vue
@@ -0,0 +1,366 @@
+<!--
+ * @Author: zwq
+ * @Date: 2023-01-04 10:29:40
+ * @LastEditors: zhp
+ * @LastEditTime: 2023-06-20 15:27:11
+ * @Description: 
+-->
+<template>
+  <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
+    <el-form-item prop="factoryId" :label="$t('code.factoryName')">
+      <el-select v-model="dataForm.factoryId" :placeholder="$t('code.factoryName')">
+        <el-option v-for="item in factoryList" :key="item.id" :label="item.factoryName" :value="item.id">
+        </el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item prop="batchNo" :label="$t('code.batchNo')">
+      <el-input v-model="dataForm.batchNo" :placeholder="$t('code.batchNo')"></el-input>
+    </el-form-item>
+    <el-form-item prop="inspectionType" :label="$t('code.inspectionType')">
+      <el-select v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')">
+        <el-option v-for="item in inspectionTypeList" :key="item.value" :label="item.label" :value="item.value">
+        </el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item prop="productId" :label="$t('code.productName')">
+      <el-select v-model="dataForm.productId" :placeholder="$t('code.productName')">
+        <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.id">
+        </el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item prop="supplierId" :label="$t('code.supplierName')">
+      <el-select v-model="dataForm.supplierId" :placeholder="$t('code.supplierName')">
+        <el-option v-for="item in supplierList" :key="item.id" :label="item.name" :value="item.id">
+        </el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item prop="userId" :label="$t('code.Examiner')">
+      <el-select v-model="dataForm.userId" :placeholder="$t('code.Examiner')">
+        <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id">
+        </el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item prop="customSamplingId" :label="$t('code.customSampling')">
+      <el-select v-model="dataForm.customSamplingId" :placeholder="$t('code.customSampling')">
+        <el-option v-for="item in samplingPlanList" :key="item.id" :label="item.sampleRange" :value="item.id">
+        </el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item prop="judgmentResult" :label="$t('code.judgmentResult')">
+      <el-select v-model="dataForm.judgmentResult" :placeholder="$t('code.judgmentResult')">
+        <el-option v-for="item in judgmentResultList" :key="item.id" :label="item.name" :value="item.id">
+        </el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item prop="orderNumber" :label="$t('code.orderNumber')">
+      <el-input v-model="dataForm.orderNumber" :placeholder="$t('code.orderNumber')"></el-input>
+    </el-form-item>
+    <el-form-item prop="recheck" :label="$t('code.recheck')">
+      <el-switch v-model="dataForm.recheck" :active-value="1" :inactive-value="0">
+      </el-switch>
+    </el-form-item>
+    <el-form-item prop="task" :label="$t('code.processingResults')">
+      <el-radio-group v-model="dataForm.processingResults">
+        <el-radio :label="0"> {{ $t('code.approval') }} </el-radio>
+        <el-radio :label="1">{{ $t('code.approvalComplete') }} </el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <el-form-item prop="task" :label="$t('code.status')">
+      <el-radio-group v-model="dataForm.upload">
+        <el-radio :label="0">{{ $t('code.notUploaded') }}</el-radio>
+        <el-radio :label="1">{{ $t('code.uploaded') }}</el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <el-form-item prop="inspectionStatus" :label="$t('code.inspectionStatus')">
+      <el-select v-model="dataForm.inspectionStatus" :placeholder="$t('code.inspectionStatus')">
+        <el-option v-for="item in inspectionStatusList" :key="item.id" :label="item.name" :value="item.id">
+        </el-option>
+      </el-select>
+    </el-form-item>
+  </el-form>
+</template>
+
+<script>
+import debounce from "lodash/debounce";
+import basicAdd from "@/mixins/basic-add";
+export default {
+  mixins: [basicAdd],
+  data() {
+    return {
+      urlOptions: {
+        submitURL: "/basic/qmsCustomerType",
+        infoURL: "/basic/qmsCustomerType/{id}",
+        getCodeURL: '/basic/qmsControlMode/getCode',
+        getFactoryURL: '/code/factory/page',
+        getProductURL: '/basic/product/page',
+        getSupplierURL: '/supplier/qmsSupplier/page',
+        getDictDataList: '/sys/dict/data/page',
+        getUserURL: '/sys/user/page',
+        getSamplingPlanURL: '/quality/qmsSamplingPlan/page'
+      },
+      // urlOptions: {
+      //   submitURL: "/sys/params/",
+      //   infoURL: "/sys/params",
+      // },
+      inspectionStatusList: [
+        {
+          id: 0,
+          name: '未登记'
+        },
+        {
+          id: 1,
+          name: '已登记'
+        }
+      ],
+      supplierList: [],
+      userList: [],
+      samplingPlanList: [],
+      judgmentResultList: [
+        {
+          id: 0,
+          name: '0未判定'
+        },
+        {
+          id: 1,
+          name: '1合格'
+        },
+        {
+          id: 2,
+          name: '不合格'
+        },
+      ],
+      unitList: [],
+      productList: [],
+      factoryList: [],
+      visible: false,
+      inspectionTypeList: [{
+        value: 0,
+        label: '监控'
+      },
+      {
+        value: 1,
+        label: '电芯来料检验'
+      },
+      {
+        value: 2,
+        label: 'IQC抽检'
+      },
+      {
+        value: 3,
+        label: 'IQC抽检2'
+      },
+      {
+        value: 4,
+        label: '原料抽检'
+      },
+      {
+        value: 5,
+        label: '进货外观检验'
+      },
+      {
+        value: 6,
+        label: '库内原料检验'
+      },
+      {
+        value: 7,
+        label: '来料检验'
+      },
+      {
+        value: 8,
+        label: '胶片'
+      },
+      {
+        value: 9,
+        label: '抽检'
+      },
+      {
+        value: 10,
+        label: '巡检'
+      }, {
+        value: 11,
+        label: '首检'
+      },
+      {
+        value: 12,
+        label: '末检'
+      },
+      {
+        value: 13,
+        label: '实时监测'
+      },
+      {
+        value: 14,
+        label: 'FQC抽检'
+      },
+      {
+        value: 15,
+        label: 'OQC抽检'
+      },
+      ],
+      dataForm: {
+        processingResults: null,
+        batchNo: null,
+        customSamplingId: null,
+        factoryId: null,
+        inspectionType: null,
+        judgmentResult: null,
+        orderNumber: null,
+        productId: null,
+        recheck: null,
+        supplierId: null,
+        upload: null,
+        userId: null
+      },
+    };
+  },
+  computed: {
+    // dataRule() {
+    //   return {
+    //     paramCode: [
+    //       {
+    //         required: true,
+    //         message: this.$t("validate.required"),
+    //         trigger: "blur",
+    //       },
+    //     ],
+    //     paramValue: [
+    //       {
+    //         required: true,
+    //         message: this.$t("validate.required"),
+    //         trigger: "blur",
+    //       },
+    //     ],
+    //   };
+    // },
+  },
+  mounted() {
+    this.getDict()
+  },
+  methods: {
+    getDict() {
+      this.$http
+        .get(this.urlOptions.getSamplingPlanURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.samplingPlanList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      this.$http
+        .get(this.urlOptions.getProductURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.productList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      this.$http
+        .get(this.urlOptions.getSupplierURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.supplierList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      this.$http
+        .get(this.urlOptions.getUserURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.userList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      this.$http
+        .get(this.urlOptions.getFactoryURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.factoryList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      // console.log(111111);
+    },
+    // init(id) {
+    //   this.dataForm.id = id || "";
+    //   this.visible = true;
+    //   this.$nextTick(() => {
+    //     this.$refs["dataForm"].resetFields();
+    //     if (this.dataForm.id) {
+    //       this.getInfo();
+    //     }
+    //   });
+    // },
+    // 获取信息
+    // getInfo() {
+    //   this.$http
+    //     .get(`/sys/params/${this.dataForm.id}`)
+    //     .then(({ data: res }) => {
+    //       if (res.code !== 0) {
+    //         return this.$message.error(res.msg);
+    //       }
+    //       this.dataForm = {
+    //         ...this.dataForm,
+    //         ...res.data,
+    //       };
+    //     })
+    //     .catch(() => {});
+    // },
+    // 表单提交
+    handleConditionSearch() {
+      this.$emit("successSubmit", this.dataForm)
+    },
+    // dataFormSubmitHandle: debounce(
+    //   function () {
+    //     // console.log(1111);
+    //     // this.visible = false;
+    //     this.$emit("successSubmit", this.dataForm.key);
+    //     // this.$refs["dataForm"].validate((valid) => {
+    //     //   if (!valid) {
+    //     //     return false;
+    //     //   }
+    //     //   this.$http[!this.dataForm.id ? "post" : "put"](
+    //     //     "/sys/params",
+    //     //     this.dataForm
+    //     //   )
+    //     //     .then(({ data: res }) => {
+    //     //       if (res.code !== 0) {
+    //     //         return this.$message.error(res.msg);
+    //     //       }
+    //     //       this.$message({
+    //     //         message: this.$t("prompt.success"),
+    //     //         type: "success",
+    //     //         duration: 500,
+    //     //         onClose: () => {
+
+    //     //         },
+    //     //       });
+    //     //     })
+    //     //     .catch(() => {});
+    //     // });
+    //   },
+    //   1000,
+    //   { leading: true, trailing: false }
+    // ),
+  },
+};
+</script>
diff --git a/src/views/modules/code/components/startEightDiscipline-add.vue b/src/views/modules/code/components/startEightDiscipline-add.vue
new file mode 100644
index 0000000..c8ca5fb
--- /dev/null
+++ b/src/views/modules/code/components/startEightDiscipline-add.vue
@@ -0,0 +1,359 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-02-14 15:02:26
+ * @LastEditTime: 2023-06-01 16:26:20
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="130px">
+    <el-row :gutter="24">
+      <el-col :span="8">
+        <el-form-item prop="code" :label="$t('basic.code')">
+          <el-input v-model="dataForm.code" :placeholder="$t('basic.code')">
+          </el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item prop="title" :label="$t('basic.title')">
+          <el-input v-model="dataForm.title" :placeholder="$t('code.title')"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item prop="eightDisciplineType" :label="$t('code.eightDisciplineType')">
+          <el-select v-model="dataForm.eightDisciplineType" :placeholder="$t('code.eightDisciplineType')">
+            <el-option v-for="item in eightDisciplineTypeList" :key="item.value" :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="24">
+      <el-col :span="8">
+        <el-form-item prop="occurrenceDate" :label="$t('code.occurrenceDate')">
+          <el-date-picker v-model="dataForm.occurrenceDate" type="datetime" :placeholder="$t('code.occurrenceDate')"
+            format='yyyy-MM-dd HH:mm:ss' valueFormat='yyyy-MM-ddTHH:mm:ss'>
+          </el-date-picker>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item prop="requestResponseCycle" :label="$t('code.requestResponseCycle')">
+          <el-input v-model="dataForm.requestResponseCycle" :placeholder="$t('code.requestResponseCycle')"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item prop="finalCompletionDate" :label="$t('code.finalCompletionDate')">
+          <el-date-picker v-model="dataForm.finalCompletionDate" type="datetime"
+            :placeholder="$t('code.finalCompletionDate')" format='yyyy-MM-dd HH:mm:ss'
+            valueFormat='yyyy-MM-ddTHH:mm:ss'>
+          </el-date-picker>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="24">
+      <el-col :span="8">
+        <el-form-item prop="sampleAcceptanceTime" :label="$t('code.sampleAcceptanceTime')">
+          <el-date-picker v-model="dataForm.sampleAcceptanceTime" type="datetime"
+            :placeholder="$t('code.sampleAcceptanceTime')" format='yyyy-MM-dd HH:mm:ss'
+            valueFormat='yyyy-MM-ddTHH:mm:ss'>
+          </el-date-picker>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item prop="defectSourceId" :label="$t('code.defectSource')">
+          <el-select v-model="dataForm.defectSourceId" :placeholder="$t('code.defectSource')">
+            <el-option v-for="item in defectList" :key="item.dictTypeId" :label="item.dictLabel"
+              :value="item.dictTypeId">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item prop="actualResponsePeriod" :label="$t('code.actualResponsePeriod')">
+          <el-input v-model="dataForm.actualResponsePeriod" :placeholder="$t('code.requestResponseCycle')"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="24">
+      <el-col :span="8">
+        <el-form-item prop="orderNo" :label="$t('code.orderNo')">
+          <el-input v-model="dataForm.orderNo" :placeholder="$t('code.orderNo')"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item prop="batchNumber" :label="$t('code.batchNumber')">
+          <el-input v-model="dataForm.batchNumber" :placeholder="$t('code.batchNumber')"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item prop="responsibilityAttributionId" :label="$t('code.responsibilityAttribution')">
+          <el-select v-model="dataForm.responsibilityAttributionId" :placeholder="$t('code.responsibilityAttribution')">
+            <el-option v-for="item in dutyList" :key="item.dictTypeId" :label="item.dictLabel" :value="item.dictTypeId">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="24">
+      <el-col :span="8">
+        <el-form-item prop="description" :label="$t('code.description')">
+          <el-input v-model="dataForm.description" :placeholder="$t('code.description')"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item prop="batchNumber" :label="$t('code.batchNumber')">
+          <el-input v-model="dataForm.batchNumber" :placeholder="$t('code.batchNumber')"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item prop="responsibilityAttributionId" :label="$t('code.responsibilityAttribution')">
+          <el-select v-model="dataForm.responsibilityAttributionId" :placeholder="$t('code.responsibilityAttribution')">
+            <el-option v-for="item in dutyList" :key="item.dictTypeId" :label="item.dictLabel" :value="item.dictTypeId">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="24">
+      <el-col :span="8">
+        <el-form-item prop="examineStatus" :label="$t('code.examineStatus')">
+          <el-select v-model="dataForm.examineStatus" :placeholder="$t('code.examineStatus')">
+            <el-option v-for="item in examineStatusList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item prop="teamList" :label="$t('code.eightDTeam')">
+          <el-select v-model="dataForm.teamList" :placeholder="$t('code.eightDTeam')" multiple>
+            <el-option v-for="item in teamList" :key="item.id" :label="item.teamName" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form>
+</template>
+
+<script>
+import debounce from "lodash/debounce";
+import basicAdd from "@/mixins/basic-add";
+export default {
+  mixins: [basicAdd],
+  data() {
+    return {
+      urlOptions: {
+        submitURL: "/code/startEightDiscipline",
+        infoURL: "/code/startEightDiscipline/{id}",
+        getDictURL: '/sys/dict/data/page',
+        customerListURL: '/basic/qmsCustomer/page',
+        productListURL: '/basic/qmsProduct/page',
+        teamListURL: '/basic/qmsTeam/page',
+      },
+      defectList: [],
+      teamList:[],
+      customerList: [],
+      productList: [],
+      dutyList: [],
+      examineStatusList: [
+        {
+          id: 0,
+          name: '不需要审批'
+        },
+        {
+          id: 1,
+          name: '需要审批'
+        }
+      ],
+      options: [{
+        value: 0,
+        label: '不可用'
+      },
+      {
+        value: 1,
+        label: '可用'
+        }],
+      eightDisciplineTypeList: [
+        {
+          value: 0,
+          label: '重复发生问题 '
+        },
+        {
+          value: 1,
+          label: '1客诉问题'
+        },
+        {
+          value: 2,
+          label: '重大质量问题'
+        }
+      ],
+      listQuery: {
+        limit: 10,
+        page: 1
+      },
+      visible: false,
+      dataForm: {
+        actualResponsePeriod:null,
+        batchNumber: null,
+        code: null,
+        customId: null,
+        defectSourceId: null,
+        description: null,
+        eightDisciplineId: null,
+        eightDisciplineStatus: null,
+        eightDisciplineType: null,
+        examineStatus: null,
+        finalCompletionDate: null,
+        id: null,
+        occurrenceDate: null,
+        orderNo: null,
+        productId: null,
+        productTypeId: null,
+        teamList:undefined,
+        requestResponseCycle: null,
+        responsibilityAttributionId: null,
+        sampleAcceptanceTime: null,
+        supportProducts: null,
+        title: null,
+        userId: null,
+      },
+    };
+  },
+  computed: {
+    dataRule() {
+      return {
+        // dictLabel: [
+        //   {
+        //     required: true,
+        //     message: this.$t("validate.required"),
+        //     trigger: "blur",
+        //   },
+        // ],
+        // dictValue: [
+        //   {
+        //     required: true,
+        //     message: this.$t("validate.required"),
+        //     trigger: "blur",
+        //   },
+        // ],
+        // sort: [
+        //   {
+        //     required: true,
+        //     message: this.$t("validate.required"),
+        //     trigger: "blur",
+        //   },
+        // ],
+      };
+    },
+  },
+  mounted () {
+    this.getDict()
+  },
+  methods: {
+    init(id, ) {
+      this.dataForm.id = id || ""
+      // console.log(11111)
+      // this.dataForm.dictTypeId = dictTypeId || "";
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs["dataForm"].resetFields();
+        if (this.dataForm.id) {
+          this.getInfo()
+        } else {
+        }
+      });
+    },
+    // 获取信息
+    getInfo() {
+      this.$http
+        .get(`/code/startEightDiscipline/${this.dataForm.id}`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          }
+          this.dataForm = {
+            ...this.dataForm,
+            ...res.data,
+          };
+        })
+        .catch(() => {});
+    },
+    getDict() {
+      this.$http.get(this.urlOptions.teamListURL, {
+        params: {
+          limit: 999,
+          page: 1,
+        }
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.teamList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      this.$http.get(this.urlOptions.getDictURL, {
+        params: {
+          limit: 999,
+          page: 1,
+          dictTypeId: '1664162193896206337'
+        }
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.defectList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      this.$http.get(this.urlOptions.getDictURL, {
+        params: {
+          limit: 999,
+          page: 1,
+          dictTypeId: '1664162455184568321'
+        }
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.dutyList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(
+      function () {
+        this.$refs["dataForm"].validate((valid) => {
+          if (!valid) {
+            return false;
+          }
+          this.$http[!this.dataForm.id ? "post" : "put"](this.urlOptions.submitURL, this.dataForm)
+            .then(({ data: res }) => {
+              if (res.code !== 0) {
+                return this.$message.error(res.msg);
+              }
+              this.$message({
+                message: this.$t("prompt.success"),
+                type: "success",
+                duration: 500,
+                onClose: () => {
+                  console.log(1111);
+                  this.visible = false;
+                  this.$emit("successSubmit");
+                },
+              });
+            })
+            .catch(() => {});
+        });
+      },
+      1000,
+      { leading: true, trailing: false }
+    ),
+  },
+};
+</script>
diff --git a/src/views/modules/code/deliveryInspection.vue b/src/views/modules/code/deliveryInspection.vue
new file mode 100644
index 0000000..60310f6
--- /dev/null
+++ b/src/views/modules/code/deliveryInspection.vue
@@ -0,0 +1,322 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-06-19 15:52:51
+ * @LastEditTime: 2023-06-20 15:37:10
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__user">
+      <SearchBar :formConfigs="formConfig" ref="ruleForm" @headBtnClick="buttonClick">
+        <el-badge :value="1" class="item">
+          <el-button type="primary" size="small" @click="conditionSearch">条件搜索</el-button>
+        </el-badge>
+      </SearchBar>
+      <base-table id="palletTable" :table-props="tableProps" :page="listQuery.page" ref="palletTable1"
+        highlight-current-row :limit="listQuery.limit" :table-data="tableData" @current-change="handleCurrentChange">
+        <method-btn v-if="tableBtn.length" slot="handleBtn" :width="100" label="操作" :method-list="tableBtn"
+          @clickBtn="handleClick" />
+      </base-table>
+      <pagination :limit.sync="listQuery.limit" :page.sync="listQuery.page" :total="listQuery.total"
+        @pagination="getDataList" />
+      <!-- 弹窗, 新增 / 修改 -->
+      <base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="addOrUpdateVisible" @cancel="handleCancel"
+        @confirm="handleConfirm" :before-close="handleCancel">
+        <deliveryInspection-add ref="addOrUpdate" @successSubmit="successSubmit">
+        </deliveryInspection-add>
+        <!-- <el-row slot="footer" type="flex" justify="end"> </el-row> -->
+      </base-dialog>
+      <base-dialog :dialogTitle="searchOrEditTitle" :dialogVisible="searchOrUpdateVisible" @cancel="handleSearchCancel"
+        @confirm="handleSearchConfirm" :before-close="handleSearchCancel">
+        <deliveryInspection-search ref="searchOrUpdate" @refreshDataList="conditionSearchSubmit">
+        </deliveryInspection-search>
+        <el-row slot="footer" type="flex" justify="end">
+          <el-col :span="12">
+            <el-button size="small" type="primary" plain class="btnTextStyle" @click="handleSearchCancel">
+              {{ $t("close") }}
+            </el-button>
+            <el-button size="small" class="btnTextStyle" type="primary" plain @click="handleSearchReset">{{
+              $t("reset")
+              }}</el-button>
+            <el-button type="primary" size="small" class="btnTextStyle" @click="handleSearchConfirm">
+              {{ $t("search") }}
+            </el-button>
+          </el-col>
+        </el-row>
+      </base-dialog>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import basicPage from "@/mixins/basic-page";
+import basicSearch from "@/mixins/basic-search";
+// import showProductList from "./components/showProductList.vue";
+import deliveryInspectionSearch from "./components/deliveryInspectionSearch.vue";
+import deliveryInspectionAdd from "./components/deliveryInspection-add.vue";
+import i18n from "@/i18n";
+// import i18n from "@/i18n";
+const tableProps = [
+  {
+    prop: "inspectionStatus",
+    label: i18n.t('code.inspectionStatus'),
+  },
+  {
+    prop: "factoryName",
+    label: i18n.t('code.factoryName'),
+  },
+  {
+    prop: "batchNo",
+    label: i18n.t('code.batchNo'),
+  },
+  {
+    prop: "orderNumber",
+    label: i18n.t('code.orderNumber'),
+  },
+  {
+    prop: "productName",
+    label: i18n.t('code.productName'),
+  },
+  {
+    prop: "companyName",
+    label: i18n.t('code.companyName'),
+  },
+  {
+    prop: "productCode",
+    label: i18n.t('code.productCode'),
+  },
+  {
+    prop: "supplierName",
+    label: i18n.t('code.supplierName'),
+  },
+  {
+    prop: "batchQuantity",
+    label: i18n.t('code.batchQuantity'),
+  },
+  {
+    prop: "inspectionQuantity",
+    label: i18n.t('code.inspectionQuantity'),
+  },
+  {
+    prop: "checkoutTime",
+    label: i18n.t('code.checkoutTime'),
+  },
+  {
+    prop: "inspectionTime",
+    label: i18n.t('code.inspectionTime'),
+  },
+  {
+    prop: "inspectionType",
+    label: i18n.t('code.inspectionType'),
+  },
+  {
+    prop: "username",
+    label: i18n.t('code.username'),
+  },
+  {
+    prop: "source",
+    label: i18n.t('code.source'),
+  }
+];
+const tableBtn = [
+  {
+    type: "edit",
+    btnName: i18n.t('t.edit'),
+  },
+  {
+    type: "delete",
+    btnName: i18n.t('t.delete'),
+  },
+];
+export default {
+  mixins: [basicPage, basicSearch],
+  data() {
+    return {
+      urlOptions: {
+        getDataListURL: "code/deliveryInspection/page/term",
+        deleteURL: "/code/deliveryInspection",
+      },
+      tableProps,
+      tableBtn,
+      listQuery: {
+        limit: 10,
+        page:1
+      },
+      productData: {},
+      searchOrEditTitle: "",
+      searchOrUpdateVisible: false,
+      productOrEditTitle: "",
+      addOrEditTitle: '',
+      addOrUpdateVisible:false,
+      productOrUpdateVisible: false,
+      formConfig: [
+        // {
+        //   type: "",
+        //   label: i18n.t("params.paramCode"),
+        //   placeholder: i18n.t("params.paramCode"),
+        //   param: "paramCode",
+        // },
+        // {
+        //   type: "separate",
+        // },
+        {
+          type: "button",
+          btnName: "新增",
+          name: "add",
+          color: "primary",
+        },
+        {
+          type: "button",
+          btnName: "搜索",
+          name: "search",
+          color: "primary",
+          // plain: true,
+        }
+      ],
+    };
+  },
+  components: {
+    deliveryInspectionSearch,
+    deliveryInspectionAdd
+  },
+  methods: {
+    //search-bar点击
+    handleProductCancel() {
+      this.productOrUpdateVisible = false;
+      this.productOrEditTitle = "";
+    },
+    handleCurrentChange(val) {
+      console.log(val);
+      this.productData = val.newVal ? val.newVal: {}
+    },
+    setCurrent(index) {
+      this.$refs.palletTable1.setCurrent("palletTable", index);
+    },
+    // handleSearchCancel() {
+    //   this.searchOrEditTitle = "";
+    //   this.searchOrUpdateVisible = false;
+    // },
+    conditionSearch() {
+      this.searchOrEditTitle = "搜索";
+      this.searchOrUpdateVisible = true;
+      this.$nextTick(() => {
+        this.$refs.searchOrUpdate.init();
+      });
+    },
+    // handleConfirm() {
+    //   this.$refs.addOrUpdate.dataFormSubmitHandle();
+    // },
+    // conditionSearchSubmit() {},
+    conditionSearchSubmit(dataForm) {
+      // console.log(key);
+      this.listQuery.batchNo = dataForm.batchNo ? dataForm.batchNo : null
+      this.listQuery.customSamplingId = dataForm.customSamplingId ? dataForm.customSamplingId : null
+      this.listQuery.endTime = dataForm.timeSlot ? dataForm.timeSlot[1] : null
+      this.listQuery.startTime = dataForm.timeSlot ? dataForm.timeSlot[0] : null
+      this.listQuery.factoryId = dataForm.factoryId ? dataForm.factoryId : null
+      this.listQuery.inspectionStatus = dataForm.inspectionStatus ? dataForm.inspectionStatus : null
+      this.listQuery.inspectionType = dataForm.inspectionType ? dataForm.inspectionType : null
+      this.listQuery.productId = dataForm.productId ? dataForm.productId : null
+      this.listQuery.recheck = dataForm.recheck ? dataForm.recheck : null
+      this.listQuery.supplierId = dataForm.supplierId ? dataForm.supplierId : null
+      this.listQuery.task = dataForm.task ? dataForm.task : null
+      this.listQuery.userId = dataForm.userId ? dataForm.userId : null
+      this.listQuery.page = 1
+      this.getDataList(this.listQuery)
+      this.searchOrUpdateVisible = false
+      // console.log(11111);
+      // this.conditionSearchSubmit();
+    },
+    handleClick(val) {
+      if (val.type === "delete") {
+        this.$confirm(`确定对[名称=${val.data.customerTypeName}]进行删除操作?`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.$http.delete(this.urlOptions.deleteURL, { data: [val.data.id] }).then(({ data }) => {
+              if (data && data.code === 0) {
+                this.$message({
+                  message: "操作成功",
+                  type: "success",
+                  duration: 1500,
+                  onClose: () => {
+                    this.getDataList();
+                  },
+                });
+              } else {
+                this.$message.error(data.msg);
+              }
+            });
+          })
+          .catch(() => { });
+      } else if (val.type === 'edit') {
+        this.addOrUpdateVisible = true
+        this.addOrEditTitle = this.$t('edit')
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init(val.data.id);
+        });
+      }
+    },
+    // addOrUpdateHandle(productData) {
+    //   this.addOrUpdateVisible = true;
+    //   this.$nextTick(() => {
+    //     this.$refs.addOrUpdate.init(productData);
+    //   });
+    // },
+    getDataList() {
+      this.dataListLoading = true;
+      this.$http
+        .post(this.urlOptions.getDataListURL,  this.listQuery,
+        )
+        .then(({ data: res }) => {
+          this.dataListLoading = false;
+          if (res.code !== 0) {
+            this.tableData = [];
+            this.listQuery.total = 0;
+            return this.$message.error(res.msg);
+          }
+          this.tableData = res.data.list;
+          this.listQuery.total = res.data.total;
+        })
+        .catch(() => {
+          this.dataListLoading = false;
+        })
+    },
+    buttonClick(val) {
+      console.log(val);
+      switch (val.btnName) {
+        case "search":
+          // this.listQuery.paramCode = val.paramCode;
+          this.listQuery.key = null;
+          console.log(i18n  );
+          this.listQuery.page = 1;
+          this.getDataList();
+          break;
+        case "correlation":
+          this.productOrEditTitle = "产品";
+          this.productOrUpdateVisible = true;
+          // this.searchOrUpdateHandle(this.productData);
+          // this.searchOrUpdateVisible = true;
+          this.$nextTick(() => {
+            this.$refs.productOrUpdate.init(this.productData);
+          });
+          console.log(this.productId);
+          break;
+        case "add":
+          this.addOrEditTitle = '新增'
+          this.addOrUpdateVisible = true;
+          this.addOrUpdateHandle()
+          break;
+        case "cancel":
+          this.$refs.palletTable1.setCurrent("palletTable", -1);
+          break;
+        default:
+          console.log(val);
+      }
+    },
+  },
+};
+</script>
diff --git a/src/views/modules/code/eightDiscipline.vue b/src/views/modules/code/eightDiscipline.vue
new file mode 100644
index 0000000..ef8de8f
--- /dev/null
+++ b/src/views/modules/code/eightDiscipline.vue
@@ -0,0 +1,197 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-01-11 09:24:58
+ * @LastEditTime: 2023-06-05 09:12:25
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__user">
+      <SearchBar :formConfigs="formConfig" ref="ruleForm" @headBtnClick="buttonClick">
+        <el-badge :value="1" class="item">
+          <el-button type="primary" size="small" @click="conditionSearch">条件搜索</el-button>
+        </el-badge>
+      </SearchBar>
+      <base-table :table-props="tableProps" :page="listQuery.page" :limit="listQuery.limit" :table-data="tableData">
+        <method-btn v-if="tableBtn.length" slot="handleBtn" :width="100" label="操作" :method-list="tableBtn"
+          @clickBtn="handleClick" />
+      </base-table>
+      <pagination :limit.sync="listQuery.limit" :page.sync="listQuery.page" :total="listQuery.total"
+        @pagination="getDataList" />
+      <!-- 弹窗, 新增 / 修改 -->
+      <base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="addOrUpdateVisible" @cancel="handleCancel"
+        @confirm="handleConfirm" :before-close="handleCancel">
+        <eightDiscipline-add ref="addOrUpdate" @refreshDataList="successSubmit">
+          </eightDiscipline-add>
+          <!-- <el-row slot="footer" type="flex" justify="end"> </el-row> -->
+      </base-dialog>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import basicPage from "@/mixins/basic-page"
+import eightDisciplineAdd from "./components/eightDiscipline-add"
+// import AddOrUpdate from './params-add-or-update'
+// import disposalMethodSearch from "./components/disposalMethodSearch"
+import available from "./components/available.vue"
+import basicSearch from "@/mixins/basic-search"
+import i18n from "@/i18n"
+const tableProps = [
+  {
+    prop: 'name',
+    label: i18n.t("code.name"),
+    align: 'center'
+  },
+  {
+    prop: 'code',
+    label: i18n.t("code.code"),
+    align: 'center'
+  },
+  {
+    prop: 'eightDisciplineType',
+    label: i18n.t("code.eightDisciplineType"),
+    align: 'center'
+  },
+   {
+     prop: 'problemStatus',
+     label: i18n.t("code.problemStatus"),
+     align: 'center',
+     subcomponent: available
+  }
+]
+const tableBtn = [
+  {
+    type: "edit",
+    btnName: "编辑",
+  },
+  {
+    type: "delete",
+    btnName: "删除",
+  },
+];
+export default {
+  mixins: [basicPage, basicSearch],
+  components: {
+    // disposalMethodSearch,
+    eightDisciplineAdd
+  },
+  data() {
+    return {
+      urlOptions: {
+        getDataListURL: "/code/eightDiscipline/page",
+        deleteURL: "/code/eightDiscipline",
+      },
+      tableProps,
+      tableBtn,
+      searchOrEditTitle: '',
+      searchOrUpdateVisible: false,
+      formConfig: [
+        // {
+        //   type: "",
+        //   label: i18n.t("params.paramCode"),
+        //   placeholder: i18n.t("params.paramCode"),
+        //   param: "paramCode",
+        // },
+        // {
+        //   type: "separate",
+        // },
+        {
+          type: "button",
+          btnName: "新增",
+          name: "add",
+          color: "primary",
+        },
+        {
+          type: "button",
+          btnName: "搜索",
+          name: "search",
+          color: "primary",
+        }
+      ],
+    };
+  },
+  // components: {
+  //   AddOrUpdate,
+  // },
+  methods: {
+    //search-bar点击
+    handleProductCancel() {
+      this.productOrUpdateVisible = false;
+      this.productOrEditTitle = "";
+    },
+    // handleSearchCancel() {
+    //   this.searchOrEditTitle = "";
+    //   this.searchOrUpdateVisible = false;
+    // },
+    conditionSearch() {
+      this.searchOrEditTitle = "搜索";
+      this.searchOrUpdateVisible = true;
+      this.$nextTick(() => {
+        this.$refs.searchOrUpdate.init();
+      });
+    },
+    conditionSearchSubmit(dataForm) {
+      this.listQuery.disposalMethodStatus = dataForm.disposalMethodStatus
+      this.listQuery.page = 1;
+      this.getDataList();
+      this.searchOrUpdateVisible = false;
+      // console.log(11111);
+      // this.conditionSearchSubmit();
+    },
+    handleClick(val) {
+      console.log(val);
+      if (val.type === "delete") {
+        this.$confirm(`确定对[名称=${val.data.failureTypeName}]进行删除操作?`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.$http.delete(this.urlOptions.deleteURL, { data: [val.data.id] }).then(({ data }) => {
+              if (data && data.code === 0) {
+                this.$message({
+                  message: "操作成功",
+                  type: "success",
+                  duration: 1500,
+                  onClose: () => {
+                    this.getDataList();
+                  },
+                });
+              } else {
+                this.$message.error(data.msg);
+              }
+            });
+          })
+          .catch(() => { });
+      } else if (val.type === 'edit') {
+        this.addOrUpdateVisible = true
+        this.addOrEditTitle = this.$t('edit')
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init(val.data.id);
+        });
+      }
+    },
+    buttonClick(val) {
+      switch (val.btnName) {
+        case "search":
+          // this.listQuery.paramCode = val.paramCode;
+          this.listQuery.page = 1;
+          this.listQuery.code = null
+          this.listQuery.name = null
+          this.listQuery.failureTypeStatus = null
+          this.getDataList();
+          break;
+        case "add":
+          this.addOrEditTitle = this.$t('add')
+          this.addOrUpdateVisible = true;
+          this.addOrUpdateHandle()
+          break;
+        default:
+          console.log(val)
+      }
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/code/examineAndApprove.vue b/src/views/modules/code/examineAndApprove.vue
new file mode 100644
index 0000000..acd9001
--- /dev/null
+++ b/src/views/modules/code/examineAndApprove.vue
@@ -0,0 +1,214 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-01-11 09:24:58
+ * @LastEditTime: 2023-06-05 09:12:12
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__user">
+      <SearchBar :formConfigs="formConfig" ref="ruleForm" @headBtnClick="buttonClick">
+        <!-- <el-badge :value="1" class="item">
+          <el-button type="primary" size="small" @click="conditionSearch">条件搜索</el-button>
+        </el-badge> -->
+      </SearchBar>
+      <base-table :table-props="tableProps" :page="listQuery.page" :limit="listQuery.limit" :table-data="tableData">
+        <method-btn v-if="tableBtn.length" slot="handleBtn" :width="100" label="操作" :method-list="tableBtn"
+          @clickBtn="handleClick" />
+      </base-table>
+      <pagination :limit.sync="listQuery.limit" :page.sync="listQuery.page" :total="listQuery.total"
+        @pagination="getDataList" />
+      <!-- 弹窗, 新增 / 修改 -->
+    </div>
+  </el-card>
+</template>
+
+<script>
+import basicPage from "@/mixins/basic-page"
+// import transferSchemeAdd from "./components/transferScheme-add"
+// import transferSchemeSearch from "./components/transferSchemeSearch.vue"
+import basicSearch from "@/mixins/basic-search"
+import i18n from "@/i18n"
+const tableProps = [
+  {
+    prop: 'title',
+    label: i18n.t("code.title"),
+    align: 'center'
+  },
+  {
+    prop: 'eightDisciplineType',
+    label: i18n.t("code.eightDisciplineType"),
+    align: 'center'
+  },
+  {
+    prop: 'occurrenceDate',
+    label: i18n.t("code.occurrenceDate"),
+    align: 'center'
+  },
+  {
+    prop: 'productName',
+    label: i18n.t("code.productName"),
+    align: 'center'
+  },
+  {
+    prop: 'customName',
+    label: i18n.t("code.customName"),
+    align: 'center'
+  },
+  {
+    prop: 'description',
+    label: i18n.t("code.description"),
+    align: 'center'
+  },
+  {
+    prop: 'userId',
+    label: i18n.t("code.userId"),
+    align: 'center'
+  }
+]
+const tableBtn = [
+  {
+    type: "edit",
+    btnName: "编辑",
+  },
+  {
+    type: "delete",
+    btnName: "删除",
+  },
+];
+export default {
+  mixins: [basicPage, basicSearch],
+  components: {
+    // transferSchemeSearch,
+    // transferSchemeAdd
+  },
+  data() {
+    return {
+      urlOptions: {
+        getDataListURL: "/code/startEightDiscipline/page",
+        deleteURL: "/code/startEightDiscipline",
+      },
+      tableProps,
+      tableBtn,
+      listQuery: {
+        limit: 10,
+        page: 1,
+        eightDisciplineStatus: 8
+      },
+      searchOrEditTitle: '',
+      searchOrUpdateVisible: false,
+      formConfig: [
+        {
+          type: 'input',
+          label: i18n.t('code.title'),
+          placeholder: i18n.t('code.title'),
+          param: 'title'
+        },
+        {
+          type: 'select',
+          label: i18n.t('code.examineStatus'),
+          selectOptions: [
+            {
+              id: 0,
+              name: '不需要审批',
+            },
+             {
+               id: 1,
+               name: '需要审批',
+            }
+          ],
+          param: 'examineStatus',
+          clearable: true,
+          filterable: true
+        },
+        {
+          type: "button",
+          btnName: "搜索",
+          name: "search",
+          color: "primary",
+        }
+      ],
+    };
+  },
+  // components: {
+  //   AddOrUpdate,
+  // },
+  methods: {
+    //search-bar点击
+    handleProductCancel() {
+      this.productOrUpdateVisible = false;
+      this.productOrEditTitle = "";
+    },
+    // handleSearchCancel() {
+    //   this.searchOrEditTitle = "";
+    //   this.searchOrUpdateVisible = false;
+    // },
+    conditionSearch() {
+      this.searchOrEditTitle = "搜索";
+      this.searchOrUpdateVisible = true;
+      this.$nextTick(() => {
+        this.$refs.searchOrUpdate.init();
+      });
+    },
+    conditionSearchSubmit(dataForm) {
+      this.listQuery.page = 1;
+      this.getDataList();
+      this.searchOrUpdateVisible = false;
+      // console.log(11111);
+      // this.conditionSearchSubmit();
+    },
+    handleClick(val) {
+      console.log(val);
+      if (val.type === "delete") {
+        this.$confirm(`确定对[名称=${val.data.failureTypeName}]进行删除操作?`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.$http.delete(this.urlOptions.deleteURL, { data: [val.data.id] }).then(({ data }) => {
+              if (data && data.code === 0) {
+                this.$message({
+                  message: "操作成功",
+                  type: "success",
+                  duration: 1500,
+                  onClose: () => {
+                    this.getDataList();
+                  },
+                });
+              } else {
+                this.$message.error(data.msg);
+              }
+            });
+          })
+          .catch(() => { });
+      } else if (val.type === 'edit') {
+        this.addOrUpdateVisible = true
+        this.addOrEditTitle = this.$t('edit')
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init(val.data.id);
+        });
+      }
+    },
+    buttonClick(val) {
+      switch (val.btnName) {
+        case "search":
+          // this.listQuery.paramCode = val.paramCode;
+          this.listQuery.page = 1;
+          this.listQuery.title = val.title ? val.title : ''
+          this.listQuery.failureTypeStatus = null
+          this.getDataList();
+          break;
+        case "add":
+          this.addOrEditTitle = this.$t('add')
+          this.addOrUpdateVisible = true;
+          this.addOrUpdateHandle()
+          break;
+        default:
+          console.log(val)
+      }
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/code/productInspection.vue b/src/views/modules/code/productInspection.vue
new file mode 100644
index 0000000..11f0dc5
--- /dev/null
+++ b/src/views/modules/code/productInspection.vue
@@ -0,0 +1,321 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-06-19 15:52:51
+ * @LastEditTime: 2023-06-20 15:37:02
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__user">
+      <SearchBar :formConfigs="formConfig" ref="ruleForm" @headBtnClick="buttonClick">
+        <el-badge :value="1" class="item">
+          <el-button type="primary" size="small" @click="conditionSearch">条件搜索</el-button>
+        </el-badge>
+      </SearchBar>
+      <base-table id="palletTable" :table-props="tableProps" :page="listQuery.page" ref="palletTable1"
+        highlight-current-row :limit="listQuery.limit" :table-data="tableData" @current-change="handleCurrentChange">
+        <method-btn v-if="tableBtn.length" slot="handleBtn" :width="100" label="操作" :method-list="tableBtn"
+          @clickBtn="handleClick" />
+      </base-table>
+      <pagination :limit.sync="listQuery.limit" :page.sync="listQuery.page" :total="listQuery.total"
+        @pagination="getDataList" />
+      <!-- 弹窗, 新增 / 修改 -->
+      <base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="addOrUpdateVisible" @cancel="handleCancel"
+        @confirm="handleConfirm" :before-close="handleCancel">
+        <productInspection-add ref="addOrUpdate" @successSubmit="successSubmit"></productInspection-add>
+        <!-- <el-row slot="footer" type="flex" justify="end"> </el-row> -->
+      </base-dialog>
+      <base-dialog :dialogTitle="searchOrEditTitle" :dialogVisible="searchOrUpdateVisible" @cancel="handleSearchCancel"
+        @confirm="handleSearchConfirm" :before-close="handleSearchCancel">
+        <productInspection-search ref="searchOrUpdate" @refreshDataList="conditionSearchSubmit">
+        </productInspection-search>
+        <el-row slot="footer" type="flex" justify="end">
+          <el-col :span="12">
+            <el-button size="small" type="primary" plain class="btnTextStyle" @click="handleSearchCancel">
+              {{ $t("close") }}
+            </el-button>
+            <el-button size="small" class="btnTextStyle" type="primary" plain @click="handleSearchReset">{{
+              $t("reset")
+              }}</el-button>
+            <el-button type="primary" size="small" class="btnTextStyle" @click="handleSearchConfirm">
+              {{ $t("search") }}
+            </el-button>
+          </el-col>
+        </el-row>
+      </base-dialog>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import basicPage from "@/mixins/basic-page";
+import basicSearch from "@/mixins/basic-search";
+// import showProductList from "./components/showProductList.vue";
+import productInspectionSearch from "./components/productInspectionSearch.vue";
+import productInspectionAdd from "./components/productInspection-add.vue";
+import i18n from "@/i18n";
+// import i18n from "@/i18n";
+const tableProps = [
+  {
+    prop: "inspectionStatus",
+    label: i18n.t('code.inspectionStatus'),
+  },
+  {
+    prop: "factoryName",
+    label: i18n.t('code.factoryName'),
+  },
+  {
+    prop: "batchNo",
+    label: i18n.t('code.batchNo'),
+  },
+  {
+    prop: "orderNumber",
+    label: i18n.t('code.orderNumber'),
+  },
+  {
+    prop: "productName",
+    label: i18n.t('code.productName'),
+  },
+  {
+    prop: "companyName",
+    label: i18n.t('code.companyName'),
+  },
+  {
+    prop: "productCode",
+    label: i18n.t('code.productCode'),
+  },
+  {
+    prop: "supplierName",
+    label: i18n.t('code.supplierName'),
+  },
+  {
+    prop: "batchQuantity",
+    label: i18n.t('code.batchQuantity'),
+  },
+  {
+    prop: "inspectionQuantity",
+    label: i18n.t('code.inspectionQuantity'),
+  },
+  {
+    prop: "checkoutTime",
+    label: i18n.t('code.checkoutTime'),
+  },
+  {
+    prop: "inspectionTime",
+    label: i18n.t('code.inspectionTime'),
+  },
+  {
+    prop: "inspectionType",
+    label: i18n.t('code.inspectionType'),
+  },
+  {
+    prop: "username",
+    label: i18n.t('code.username'),
+  },
+  {
+    prop: "source",
+    label: i18n.t('code.source'),
+  }
+];
+const tableBtn = [
+  {
+    type: "edit",
+    btnName: i18n.t('t.edit'),
+  },
+  {
+    type: "delete",
+    btnName: i18n.t('t.delete'),
+  },
+];
+export default {
+  mixins: [basicPage, basicSearch],
+  data() {
+    return {
+      urlOptions: {
+        getDataListURL: "code/productInspection/page/term",
+        deleteURL: "/code/productInspection",
+      },
+      tableProps,
+      tableBtn,
+      listQuery: {
+        limit: 10,
+        page:1
+      },
+      productData: {},
+      searchOrEditTitle: "",
+      searchOrUpdateVisible: false,
+      productOrEditTitle: "",
+      addOrEditTitle: '',
+      addOrUpdateVisible:false,
+      productOrUpdateVisible: false,
+      formConfig: [
+        // {
+        //   type: "",
+        //   label: i18n.t("params.paramCode"),
+        //   placeholder: i18n.t("params.paramCode"),
+        //   param: "paramCode",
+        // },
+        // {
+        //   type: "separate",
+        // },
+        {
+          type: "button",
+          btnName: "新增",
+          name: "add",
+          color: "primary",
+        },
+        {
+          type: "button",
+          btnName: "搜索",
+          name: "search",
+          color: "primary",
+          // plain: true,
+        }
+      ],
+    };
+  },
+  components: {
+    productInspectionSearch,
+    productInspectionAdd
+  },
+  methods: {
+    //search-bar点击
+    handleProductCancel() {
+      this.productOrUpdateVisible = false;
+      this.productOrEditTitle = "";
+    },
+    handleCurrentChange(val) {
+      console.log(val);
+      this.productData = val.newVal ? val.newVal: {}
+    },
+    setCurrent(index) {
+      this.$refs.palletTable1.setCurrent("palletTable", index);
+    },
+    // handleSearchCancel() {
+    //   this.searchOrEditTitle = "";
+    //   this.searchOrUpdateVisible = false;
+    // },
+    conditionSearch() {
+      this.searchOrEditTitle = "搜索";
+      this.searchOrUpdateVisible = true;
+      this.$nextTick(() => {
+        this.$refs.searchOrUpdate.init();
+      });
+    },
+    // handleConfirm() {
+    //   this.$refs.addOrUpdate.dataFormSubmitHandle();
+    // },
+    // conditionSearchSubmit() {},
+    conditionSearchSubmit(dataForm) {
+      // console.log(key);
+      this.listQuery.batchNo = dataForm.batchNo ? dataForm.batchNo : null
+      this.listQuery.customSamplingId = dataForm.customSamplingId ? dataForm.customSamplingId : null
+      this.listQuery.endTime = dataForm.timeSlot ? dataForm.timeSlot[1] : null
+      this.listQuery.startTime = dataForm.timeSlot ? dataForm.timeSlot[0] : null
+      this.listQuery.factoryId = dataForm.factoryId ? dataForm.factoryId : null
+      this.listQuery.inspectionStatus = dataForm.inspectionStatus ? dataForm.inspectionStatus : null
+      this.listQuery.inspectionType = dataForm.inspectionType ? dataForm.inspectionType : null
+      this.listQuery.productId = dataForm.productId ? dataForm.productId : null
+      this.listQuery.recheck = dataForm.recheck ? dataForm.recheck : null
+      this.listQuery.supplierId = dataForm.supplierId ? dataForm.supplierId : null
+      this.listQuery.task = dataForm.task ? dataForm.task : null
+      this.listQuery.userId = dataForm.userId ? dataForm.userId : null
+      this.listQuery.page = 1
+      this.getDataList(this.listQuery)
+      this.searchOrUpdateVisible = false;
+      // console.log(11111);
+      // this.conditionSearchSubmit();
+    },
+    handleClick(val) {
+      if (val.type === "delete") {
+        this.$confirm(`确定对[名称=${val.data.customerTypeName}]进行删除操作?`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.$http.delete(this.urlOptions.deleteURL, { data: [val.data.id] }).then(({ data }) => {
+              if (data && data.code === 0) {
+                this.$message({
+                  message: "操作成功",
+                  type: "success",
+                  duration: 1500,
+                  onClose: () => {
+                    this.getDataList();
+                  },
+                });
+              } else {
+                this.$message.error(data.msg);
+              }
+            });
+          })
+          .catch(() => { });
+      } else if (val.type === 'edit') {
+        this.addOrUpdateVisible = true
+        this.addOrEditTitle = this.$t('edit')
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init(val.data.id);
+        });
+      }
+    },
+    // addOrUpdateHandle(productData) {
+    //   this.addOrUpdateVisible = true;
+    //   this.$nextTick(() => {
+    //     this.$refs.addOrUpdate.init(productData);
+    //   });
+    // },
+    getDataList() {
+      this.dataListLoading = true;
+      this.$http
+        .post(this.urlOptions.getDataListURL,  this.listQuery,
+        )
+        .then(({ data: res }) => {
+          this.dataListLoading = false;
+          if (res.code !== 0) {
+            this.tableData = [];
+            this.listQuery.total = 0;
+            return this.$message.error(res.msg);
+          }
+          this.tableData = res.data.list;
+          this.listQuery.total = res.data.total;
+        })
+        .catch(() => {
+          this.dataListLoading = false;
+        })
+    },
+    buttonClick(val) {
+      console.log(val);
+      switch (val.btnName) {
+        case "search":
+          // this.listQuery.paramCode = val.paramCode;
+          this.listQuery.key = null;
+          console.log(i18n  );
+          this.listQuery.page = 1;
+          this.getDataList();
+          break;
+        case "correlation":
+          this.productOrEditTitle = "产品";
+          this.productOrUpdateVisible = true;
+          // this.searchOrUpdateHandle(this.productData);
+          // this.searchOrUpdateVisible = true;
+          this.$nextTick(() => {
+            this.$refs.productOrUpdate.init(this.productData);
+          });
+          console.log(this.productId);
+          break;
+        case "add":
+          this.addOrEditTitle = '新增'
+          this.addOrUpdateVisible = true;
+          this.addOrUpdateHandle()
+          break;
+        case "cancel":
+          this.$refs.palletTable1.setCurrent("palletTable", -1);
+          break;
+        default:
+          console.log(val);
+      }
+    },
+  },
+};
+</script>
diff --git a/src/views/modules/code/productRegistration.vue b/src/views/modules/code/productRegistration.vue
new file mode 100644
index 0000000..71d5a8a
--- /dev/null
+++ b/src/views/modules/code/productRegistration.vue
@@ -0,0 +1,338 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-06-12 13:22:50
+ * @LastEditTime: 2023-06-20 15:36:58
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__user">
+      <SearchBar :formConfigs="formConfig" ref="ruleForm" @headBtnClick="buttonClick">
+        <el-badge :value="1" class="item">
+          <el-button type="primary" size="small" @click="conditionSearch">条件搜索</el-button>
+        </el-badge>
+      </SearchBar>
+      <base-table id="palletTable" :table-props="tableProps" :page="listQuery.page" ref="palletTable1"
+        highlight-current-row :limit="listQuery.limit" :table-data="tableData" @current-change="handleCurrentChange">
+        <method-btn v-if="tableBtn.length" slot="handleBtn" :width="100" label="操作" :method-list="tableBtn"
+          @clickBtn="handleClick" />
+      </base-table>
+      <pagination :limit.sync="listQuery.limit" :page.sync="listQuery.page" :total="listQuery.total"
+        @pagination="getDataList" />
+      <!-- 弹窗, 新增 / 修改 -->
+      <base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="addOrUpdateVisible" @cancel="handleCancel"
+        @confirm="handleConfirm" :before-close="handleCancel">
+        <productRegistration-add ref="addOrUpdate" @successSubmit="successSubmit">
+        </productRegistration-add>
+        <!-- <el-row slot="footer" type="flex" justify="end"> </el-row> -->
+      </base-dialog>
+      <base-dialog :dialogTitle="searchOrEditTitle" :dialogVisible="searchOrUpdateVisible" @cancel="handleSearchCancel"
+        @confirm="handleSearchConfirm" :before-close="handleSearchCancel">
+        <productRegistration-search ref="searchOrUpdate" @refreshDataList="conditionSearchSubmit">
+          </productRegistration-search>
+          <el-row slot="footer" type="flex" justify="end">
+            <el-col :span="12">
+              <el-button size="small" type="primary" plain class="btnTextStyle" @click="handleSearchCancel">
+                {{ $t("close") }}
+              </el-button>
+              <el-button size="small" class="btnTextStyle" type="primary" plain @click="handleSearchReset">{{
+                $t("reset")
+                }}</el-button>
+              <el-button type="primary" size="small" class="btnTextStyle" @click="handleSearchConfirm">
+                {{ $t("search") }}
+              </el-button>
+            </el-col>
+          </el-row>
+      </base-dialog>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import basicPage from "@/mixins/basic-page";
+import basicSearch from "@/mixins/basic-search";
+import productRegistrationSearch from "./components/productRegistrationSearch.vue";
+import productRegistrationAdd from "./components/productRegistration-add.vue";
+import i18n from "@/i18n";
+// import i18n from "@/i18n";
+const tableProps = [
+  {
+    prop: "customSamplingId",
+    label: i18n.t('code.customSampling'),
+  },
+  {
+    prop: "factoryName",
+    label: i18n.t('code.factoryName'),
+  },
+  {
+    prop: "batchNo",
+    label: i18n.t('code.batchNo'),
+  },
+  {
+    prop: "orderNumber",
+    label: i18n.t('code.orderNumber'),
+  },
+  {
+    prop: "upload",
+    label: i18n.t('code.upload'),
+  },
+  {
+    prop: "judgmentResult",
+    label: i18n.t('code.judgmentResult'),
+  },
+  {
+    prop: "productCode",
+    label: i18n.t('code.productCode'),
+  },
+  {
+    prop: "supplierName",
+    label: i18n.t('code.supplierName'),
+  },
+  {
+    prop: "batchQuantity",
+    label: i18n.t('code.batchQuantity'),
+  },
+  {
+    prop: "defectiveQuantity",
+    label: i18n.t('code.defectiveQuantity'),
+  },
+  {
+    prop: "defectsNumber",
+    label: i18n.t('code.defectsNumber'),
+  },
+  {
+    prop: "inspectionQuantity",
+    label: i18n.t('code.inspectionQuantity'),
+  },
+  {
+    prop: "checkoutTime",
+    label: i18n.t('code.checkoutTime'),
+  },
+  {
+    prop: "inspectionTime",
+    label: i18n.t('code.inspectionTime'),
+  },
+  {
+    prop: "inspectionType",
+    label: i18n.t('code.inspectionType'),
+  },
+  {
+    prop: "submit",
+    label: i18n.t('code.submit'),
+  },
+  {
+    prop: "username",
+    label: i18n.t('code.username'),
+  },
+  {
+    prop: "processingMethod",
+    label: i18n.t('code.processingMethod'),
+  },
+  {
+    prop: "processingResults",
+    label: i18n.t('code.processingResults'),
+  },
+];
+const tableBtn = [
+  {
+    type: "edit",
+    btnName: i18n.t('t.edit'),
+  },
+  {
+    type: "delete",
+    btnName: i18n.t('t.delete'),
+  },
+];
+export default {
+  mixins: [basicPage, basicSearch],
+  data() {
+    return {
+      urlOptions: {
+        getDataListURL: "code/productRegistration/page/term",
+        deleteURL: "/code/productRegistration",
+        exportURL: "/code/productRegistration/export",
+      },
+      tableProps,
+      tableBtn,
+      listQuery: {
+        limit: 10,
+        page:1
+      },
+      productData: {},
+      searchOrEditTitle: "",
+      searchOrUpdateVisible: false,
+      productOrEditTitle: "",
+      addOrEditTitle: '',
+      addOrUpdateVisible:false,
+      productOrUpdateVisible: false,
+      formConfig: [
+        // {
+        //   type: "",
+        //   label: i18n.t("params.paramCode"),
+        //   placeholder: i18n.t("params.paramCode"),
+        //   param: "paramCode",
+        // },
+        // {
+        //   type: "separate",
+        // },
+        {
+          type: "button",
+          btnName: "新增",
+          name: "add",
+          color: "primary",
+        },
+        {
+          type: "button",
+          btnName: "搜索",
+          name: "search",
+          color: "primary",
+          // plain: true,
+        }
+      ],
+    };
+  },
+  components: {
+    productRegistrationSearch,
+    productRegistrationAdd
+  },
+  methods: {
+    //search-bar点击
+    handleProductCancel() {
+      this.productOrUpdateVisible = false;
+      this.productOrEditTitle = "";
+    },
+    handleCurrentChange(val) {
+      console.log(val);
+      this.productData = val.newVal ? val.newVal: {}
+    },
+    setCurrent(index) {
+      this.$refs.palletTable1.setCurrent("palletTable", index);
+    },
+    // handleSearchCancel() {
+    //   this.searchOrEditTitle = "";
+    //   this.searchOrUpdateVisible = false;
+    // },
+    conditionSearch() {
+      this.searchOrEditTitle = "搜索";
+      this.searchOrUpdateVisible = true;
+      this.$nextTick(() => {
+        this.$refs.searchOrUpdate.init();
+      });
+    },
+    // handleConfirm() {
+    //   this.$refs.addOrUpdate.dataFormSubmitHandle();
+    // },
+    // conditionSearchSubmit() {},
+    conditionSearchSubmit(dataForm) {
+      // console.log(key);
+      this.listQuery.processingResults = dataForm.processingResults ? dataForm.processingResults : null
+      this.listQuery.batchNo = dataForm.batchNo ? dataForm.batchNo : null
+      this.listQuery.customSamplingId = dataForm.customSamplingId ? dataForm.customSamplingId : null
+      this.listQuery.factoryId = dataForm.factoryId ? dataForm.factoryId : null
+      this.listQuery.inspectionType = dataForm.inspectionType ? dataForm.inspectionType : null
+      this.listQuery.judgmentResult = dataForm.judgmentResult ? dataForm.judgmentResult : null
+      this.listQuery.orderNumber = dataForm.orderNumber ? dataForm.orderNumber : null
+      this.listQuery.productId = dataForm.productId ? dataForm.productId : null
+      this.listQuery.recheck = dataForm.recheck ? dataForm.recheck : null
+      this.listQuery.supplierId = dataForm.supplierId ? dataForm.supplierId : null
+      this.listQuery.upload = dataForm.upload ? dataForm.upload : null
+      this.listQuery.userId = dataForm.userId ? dataForm.userId : null
+      this.listQuery.page = 1
+      this.getDataList(this.listQuery)
+      this.searchOrUpdateVisible = false
+      // console.log(11111);
+      // this.conditionSearchSubmit();
+    },
+    handleClick(val) {
+      if (val.type === "delete") {
+        this.$confirm(`确定对[名称=${val.data.customerTypeName}]进行删除操作?`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.$http.delete(this.urlOptions.deleteURL, { data: [val.data.id] }).then(({ data }) => {
+              if (data && data.code === 0) {
+                this.$message({
+                  message: "操作成功",
+                  type: "success",
+                  duration: 1500,
+                  onClose: () => {
+                    this.getDataList();
+                  },
+                });
+              } else {
+                this.$message.error(data.msg);
+              }
+            });
+          })
+          .catch(() => { });
+      } else if (val.type === 'edit') {
+        this.addOrUpdateVisible = true
+        this.addOrEditTitle = this.$t('edit')
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init(val.data.id);
+        });
+      }
+    },
+    // addOrUpdateHandle(productData) {
+    //   this.addOrUpdateVisible = true;
+    //   this.$nextTick(() => {
+    //     this.$refs.addOrUpdate.init(productData);
+    //   });
+    // },
+    getDataList() {
+      this.dataListLoading = true;
+      this.$http
+        .post(this.urlOptions.getDataListURL,  this.listQuery,
+        )
+        .then(({ data: res }) => {
+          this.dataListLoading = false;
+          if (res.code !== 0) {
+            this.tableData = [];
+            this.listQuery.total = 0;
+            return this.$message.error(res.msg);
+          }
+          this.tableData = res.data.list;
+          this.listQuery.total = res.data.total;
+        })
+        .catch(() => {
+          this.dataListLoading = false;
+        })
+    },
+    buttonClick(val) {
+      console.log(val);
+      switch (val.btnName) {
+        case "search":
+          // this.listQuery.paramCode = val.paramCode;
+          this.listQuery.key = null;
+          console.log(i18n  );
+          this.listQuery.page = 1;
+          this.getDataList();
+          break;
+        case "correlation":
+          this.productOrEditTitle = "产品";
+          this.productOrUpdateVisible = true;
+          // this.searchOrUpdateHandle(this.productData);
+          // this.searchOrUpdateVisible = true;
+          this.$nextTick(() => {
+            this.$refs.productOrUpdate.init(this.productData);
+          });
+          console.log(this.productId);
+          break;
+        case "add":
+          this.addOrEditTitle = '新增'
+          this.addOrUpdateVisible = true;
+          this.addOrUpdateHandle()
+          break;
+        case "cancel":
+          this.$refs.palletTable1.setCurrent("palletTable", -1);
+          break;
+        default:
+          console.log(val);
+      }
+    },
+  },
+};
+</script>
diff --git a/src/views/modules/code/shipmentRegistration.vue b/src/views/modules/code/shipmentRegistration.vue
new file mode 100644
index 0000000..c914c42
--- /dev/null
+++ b/src/views/modules/code/shipmentRegistration.vue
@@ -0,0 +1,338 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-06-12 13:22:50
+ * @LastEditTime: 2023-06-20 15:36:53
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__user">
+      <SearchBar :formConfigs="formConfig" ref="ruleForm" @headBtnClick="buttonClick">
+        <el-badge :value="1" class="item">
+          <el-button type="primary" size="small" @click="conditionSearch">条件搜索</el-button>
+        </el-badge>
+      </SearchBar>
+      <base-table id="palletTable" :table-props="tableProps" :page="listQuery.page" ref="palletTable1"
+        highlight-current-row :limit="listQuery.limit" :table-data="tableData" @current-change="handleCurrentChange">
+        <method-btn v-if="tableBtn.length" slot="handleBtn" :width="100" label="操作" :method-list="tableBtn"
+          @clickBtn="handleClick" />
+      </base-table>
+      <pagination :limit.sync="listQuery.limit" :page.sync="listQuery.page" :total="listQuery.total"
+        @pagination="getDataList" />
+      <!-- 弹窗, 新增 / 修改 -->
+      <base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="addOrUpdateVisible" @cancel="handleCancel"
+        @confirm="handleConfirm" :before-close="handleCancel">
+        <shipmentRegistration-add ref="addOrUpdate" @successSubmit="successSubmit">
+        </shipmentRegistration-add>
+        <!-- <el-row slot="footer" type="flex" justify="end"> </el-row> -->
+      </base-dialog>
+      <base-dialog :dialogTitle="searchOrEditTitle" :dialogVisible="searchOrUpdateVisible" @cancel="handleSearchCancel"
+        @confirm="handleSearchConfirm" :before-close="handleSearchCancel">
+        <shipmentRegistration-search ref="searchOrUpdate" @refreshDataList="conditionSearchSubmit">
+        </shipmentRegistration-search>
+        <el-row slot="footer" type="flex" justify="end">
+          <el-col :span="12">
+            <el-button size="small" type="primary" plain class="btnTextStyle" @click="handleSearchCancel">
+              {{ $t("close") }}
+            </el-button>
+            <el-button size="small" class="btnTextStyle" type="primary" plain @click="handleSearchReset">{{
+              $t("reset")
+              }}</el-button>
+            <el-button type="primary" size="small" class="btnTextStyle" @click="handleSearchConfirm">
+              {{ $t("search") }}
+            </el-button>
+          </el-col>
+        </el-row>
+      </base-dialog>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import basicPage from "@/mixins/basic-page";
+import basicSearch from "@/mixins/basic-search";
+import shipmentRegistrationSearch from "./components/shipmentRegistrationSearch.vue";
+import shipmentRegistrationAdd from "./components/shipmentRegistration-add.vue";
+import i18n from "@/i18n";
+// import i18n from "@/i18n";
+const tableProps = [
+  {
+    prop: "customSamplingId",
+    label: i18n.t('code.customSampling'),
+  },
+  {
+    prop: "factoryName",
+    label: i18n.t('code.factoryName'),
+  },
+  {
+    prop: "batchNo",
+    label: i18n.t('code.batchNo'),
+  },
+  {
+    prop: "orderNumber",
+    label: i18n.t('code.orderNumber'),
+  },
+  {
+    prop: "upload",
+    label: i18n.t('code.upload'),
+  },
+  {
+    prop: "judgmentResult",
+    label: i18n.t('code.judgmentResult'),
+  },
+  {
+    prop: "productCode",
+    label: i18n.t('code.productCode'),
+  },
+  {
+    prop: "supplierName",
+    label: i18n.t('code.supplierName'),
+  },
+  {
+    prop: "batchQuantity",
+    label: i18n.t('code.batchQuantity'),
+  },
+  {
+    prop: "defectiveQuantity",
+    label: i18n.t('code.defectiveQuantity'),
+  },
+  {
+    prop: "defectsNumber",
+    label: i18n.t('code.defectsNumber'),
+  },
+  {
+    prop: "inspectionQuantity",
+    label: i18n.t('code.inspectionQuantity'),
+  },
+  {
+    prop: "checkoutTime",
+    label: i18n.t('code.checkoutTime'),
+  },
+  {
+    prop: "inspectionTime",
+    label: i18n.t('code.inspectionTime'),
+  },
+  {
+    prop: "inspectionType",
+    label: i18n.t('code.inspectionType'),
+  },
+  {
+    prop: "submit",
+    label: i18n.t('code.submit'),
+  },
+  {
+    prop: "username",
+    label: i18n.t('code.username'),
+  },
+  {
+    prop: "processingMethod",
+    label: i18n.t('code.processingMethod'),
+  },
+  {
+    prop: "processingResults",
+    label: i18n.t('code.processingResults'),
+  },
+];
+const tableBtn = [
+  {
+    type: "edit",
+    btnName: i18n.t('t.edit'),
+  },
+  {
+    type: "delete",
+    btnName: i18n.t('t.delete'),
+  },
+];
+export default {
+  mixins: [basicPage, basicSearch],
+  data() {
+    return {
+      urlOptions: {
+        getDataListURL: "code/shipmentRegistration/page/term",
+        deleteURL: "/code/shipmentRegistration",
+        exportURL: "/code/shipmentRegistration/export",
+      },
+      tableProps,
+      tableBtn,
+      listQuery: {
+        limit: 10,
+        page:1
+      },
+      productData: {},
+      searchOrEditTitle: "",
+      searchOrUpdateVisible: false,
+      productOrEditTitle: "",
+      addOrEditTitle: '',
+      addOrUpdateVisible:false,
+      productOrUpdateVisible: false,
+      formConfig: [
+        // {
+        //   type: "",
+        //   label: i18n.t("params.paramCode"),
+        //   placeholder: i18n.t("params.paramCode"),
+        //   param: "paramCode",
+        // },
+        // {
+        //   type: "separate",
+        // },
+        {
+          type: "button",
+          btnName: "新增",
+          name: "add",
+          color: "primary",
+        },
+        {
+          type: "button",
+          btnName: "搜索",
+          name: "search",
+          color: "primary",
+          // plain: true,
+        }
+      ],
+    };
+  },
+  components: {
+    shipmentRegistrationSearch,
+    shipmentRegistrationAdd
+  },
+  methods: {
+    //search-bar点击
+    handleProductCancel() {
+      this.productOrUpdateVisible = false;
+      this.productOrEditTitle = "";
+    },
+    handleCurrentChange(val) {
+      console.log(val);
+      this.productData = val.newVal ? val.newVal: {}
+    },
+    setCurrent(index) {
+      this.$refs.palletTable1.setCurrent("palletTable", index);
+    },
+    // handleSearchCancel() {
+    //   this.searchOrEditTitle = "";
+    //   this.searchOrUpdateVisible = false;
+    // },
+    conditionSearch() {
+      this.searchOrEditTitle = "搜索";
+      this.searchOrUpdateVisible = true;
+      this.$nextTick(() => {
+        this.$refs.searchOrUpdate.init();
+      });
+    },
+    // handleConfirm() {
+    //   this.$refs.addOrUpdate.dataFormSubmitHandle();
+    // },
+    // conditionSearchSubmit() {},
+    conditionSearchSubmit(dataForm) {
+      // console.log(key);
+      this.listQuery.processingResults = dataForm.processingResults ? dataForm.processingResults : null
+      this.listQuery.batchNo = dataForm.batchNo ? dataForm.batchNo : null
+      this.listQuery.customSamplingId = dataForm.customSamplingId ? dataForm.customSamplingId : null
+      this.listQuery.factoryId = dataForm.factoryId ? dataForm.factoryId : null
+      this.listQuery.inspectionType = dataForm.inspectionType ? dataForm.inspectionType : null
+      this.listQuery.judgmentResult = dataForm.judgmentResult ? dataForm.judgmentResult : null
+      this.listQuery.orderNumber = dataForm.orderNumber ? dataForm.orderNumber : null
+      this.listQuery.productId = dataForm.productId ? dataForm.productId : null
+      this.listQuery.recheck = dataForm.recheck ? dataForm.recheck : null
+      this.listQuery.supplierId = dataForm.supplierId ? dataForm.supplierId : null
+      this.listQuery.upload = dataForm.upload ? dataForm.upload : null
+      this.listQuery.userId = dataForm.userId ? dataForm.userId : null
+      this.listQuery.page = 1
+      this.getDataList(this.listQuery)
+      this.searchOrUpdateVisible = false
+      // console.log(11111);
+      // this.conditionSearchSubmit();
+    },
+    handleClick(val) {
+      if (val.type === "delete") {
+        this.$confirm(`确定对[名称=${val.data.customerTypeName}]进行删除操作?`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.$http.delete(this.urlOptions.deleteURL, { data: [val.data.id] }).then(({ data }) => {
+              if (data && data.code === 0) {
+                this.$message({
+                  message: "操作成功",
+                  type: "success",
+                  duration: 1500,
+                  onClose: () => {
+                    this.getDataList();
+                  },
+                });
+              } else {
+                this.$message.error(data.msg);
+              }
+            });
+          })
+          .catch(() => { });
+      } else if (val.type === 'edit') {
+        this.addOrUpdateVisible = true
+        this.addOrEditTitle = this.$t('edit')
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init(val.data.id);
+        });
+      }
+    },
+    // addOrUpdateHandle(productData) {
+    //   this.addOrUpdateVisible = true;
+    //   this.$nextTick(() => {
+    //     this.$refs.addOrUpdate.init(productData);
+    //   });
+    // },
+    getDataList() {
+      this.dataListLoading = true;
+      this.$http
+        .post(this.urlOptions.getDataListURL,  this.listQuery,
+        )
+        .then(({ data: res }) => {
+          this.dataListLoading = false;
+          if (res.code !== 0) {
+            this.tableData = [];
+            this.listQuery.total = 0;
+            return this.$message.error(res.msg);
+          }
+          this.tableData = res.data.list;
+          this.listQuery.total = res.data.total;
+        })
+        .catch(() => {
+          this.dataListLoading = false;
+        })
+    },
+    buttonClick(val) {
+      console.log(val);
+      switch (val.btnName) {
+        case "search":
+          // this.listQuery.paramCode = val.paramCode;
+          this.listQuery.key = null;
+          console.log(i18n  );
+          this.listQuery.page = 1;
+          this.getDataList();
+          break;
+        case "correlation":
+          this.productOrEditTitle = "产品";
+          this.productOrUpdateVisible = true;
+          // this.searchOrUpdateHandle(this.productData);
+          // this.searchOrUpdateVisible = true;
+          this.$nextTick(() => {
+            this.$refs.productOrUpdate.init(this.productData);
+          });
+          console.log(this.productId);
+          break;
+        case "add":
+          this.addOrEditTitle = '新增'
+          this.addOrUpdateVisible = true;
+          this.addOrUpdateHandle()
+          break;
+        case "cancel":
+          this.$refs.palletTable1.setCurrent("palletTable", -1);
+          break;
+        default:
+          console.log(val);
+      }
+    },
+  },
+};
+</script>
diff --git a/src/views/modules/code/startEightDiscipline.vue b/src/views/modules/code/startEightDiscipline.vue
new file mode 100644
index 0000000..9c04286
--- /dev/null
+++ b/src/views/modules/code/startEightDiscipline.vue
@@ -0,0 +1,221 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-01-11 09:24:58
+ * @LastEditTime: 2023-06-05 09:11:52
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__user">
+      <SearchBar :formConfigs="formConfig" ref="ruleForm" @headBtnClick="buttonClick">
+        <el-badge :value="1" class="item">
+          <el-button type="primary" size="small" @click="conditionSearch">条件搜索</el-button>
+        </el-badge>
+      </SearchBar>
+      <base-table :table-props="tableProps" :page="listQuery.page" :limit="listQuery.limit" :table-data="tableData">
+        <method-btn v-if="tableBtn.length" slot="handleBtn" :width="100" label="操作" :method-list="tableBtn"
+          @clickBtn="handleClick" />
+      </base-table>
+      <pagination :limit.sync="listQuery.limit" :page.sync="listQuery.page" :total="listQuery.total"
+        @pagination="getDataList" />
+      <!-- 弹窗, 新增 / 修改 -->
+      <base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="addOrUpdateVisible" @cancel="handleCancel"
+        @confirm="handleConfirm" :before-close="handleCancel">
+        <startEightDiscipline-add ref="addOrUpdate" @refreshDataList="successSubmit">
+        </startEightDiscipline-add>
+        <!-- <el-row slot="footer" type="flex" justify="end"> </el-row> -->
+      </base-dialog>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import basicPage from "@/mixins/basic-page"
+import startEightDisciplineAdd from "./components/startEightDiscipline-add"
+// import AddOrUpdate from './params-add-or-update'
+// import customSamplingSearch from "./components/customSamplingSearch"
+// import available from "./components/available.vue"
+import basicSearch from "@/mixins/basic-search"
+import i18n from "@/i18n"
+const tableProps = [
+  {
+    prop: 'title',
+    label: i18n.t("code.title"),
+    align: 'center'
+  },
+  {
+    prop: 'code',
+    label: i18n.t("code.code"),
+    align: 'center'
+  },
+  {
+    prop: 'eightDisciplineType',
+    label: i18n.t("code.eightDisciplineType"),
+    align: 'center'
+  },
+  {
+    prop: 'occurrenceDate',
+    label: i18n.t("code.occurrenceDate"),
+    align: 'center'
+  },
+  // {
+  //   prop: 'productName',
+  //   label: i18n.t("code.productName"),
+  //   align: 'center'
+  // },
+  // {
+  //   prop: 'customName',
+  //   label: i18n.t("code.customName"),
+  //   align: 'center'
+  // },
+  {
+    prop: 'description',
+    label: i18n.t("code.description"),
+    align: 'center'
+  },
+  {
+    prop: 'userId',
+    label: i18n.t("code.userId"),
+    align: 'center'
+  }
+]
+const tableBtn = [
+  {
+    type: "edit",
+    btnName: "编辑",
+  },
+  {
+    type: "delete",
+    btnName: "删除",
+  },
+];
+export default {
+  mixins: [basicPage, basicSearch],
+  components: {
+    // customSamplingSearch,
+    startEightDisciplineAdd
+  },
+  data() {
+    return {
+      urlOptions: {
+        getDataListURL: "/code/startEightDiscipline/page",
+        deleteURL: "/code/startEightDiscipline",
+      },
+      tableProps,
+      tableBtn,
+      searchOrEditTitle: '',
+      searchOrUpdateVisible: false,
+      formConfig: [
+        // {
+        //   type: "",
+        //   label: i18n.t("params.paramCode"),
+        //   placeholder: i18n.t("params.paramCode"),
+        //   param: "paramCode",
+        // },
+        // {
+        //   type: "separate",
+        // },
+        {
+          type: "button",
+          btnName: "新增",
+          name: "add",
+          color: "primary",
+        },
+        {
+          type: "button",
+          btnName: "搜索",
+          name: "search",
+          color: "primary",
+        }
+      ],
+    };
+  },
+  // components: {
+  //   AddOrUpdate,
+  // },
+  methods: {
+    //search-bar点击
+    handleProductCancel() {
+      this.productOrUpdateVisible = false;
+      this.productOrEditTitle = "";
+    },
+    // handleSearchCancel() {
+    //   this.searchOrEditTitle = "";
+    //   this.searchOrUpdateVisible = false;
+    // },
+    conditionSearch() {
+      this.searchOrEditTitle = "搜索";
+      this.searchOrUpdateVisible = true;
+      this.$nextTick(() => {
+        this.$refs.searchOrUpdate.init()
+      });
+    },
+    conditionSearchSubmit(dataForm) {
+      // console.log(key);
+      // console.log(key);
+      // this.listQuery.key = key;
+      this.listQuery.customSamplingCode = dataForm.customSamplingCode
+      // this.listQuery.name = dataForm.name
+      // this.listQuery.failureTypeStatus = dataForm.failureTypeStatus
+      this.listQuery.page = 1
+      this.getDataList()
+      this.searchOrUpdateVisible = false
+      // console.log(11111);
+      // this.conditionSearchSubmit();
+    },
+    handleClick(val) {
+      console.log(val);
+      if (val.type === "delete") {
+        this.$confirm(`确定对[名称=${val.data.failureTypeName}]进行删除操作?`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.$http.delete(this.urlOptions.deleteURL, { data: [val.data.id] }).then(({ data }) => {
+              if (data && data.code === 0) {
+                this.$message({
+                  message: "操作成功",
+                  type: "success",
+                  duration: 1500,
+                  onClose: () => {
+                    this.getDataList();
+                  },
+                });
+              } else {
+                this.$message.error(data.msg);
+              }
+            });
+          })
+          .catch(() => { });
+      } else if (val.type === 'edit') {
+        this.addOrUpdateVisible = true
+        this.addOrEditTitle = this.$t('edit')
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init(val.data.id);
+        });
+      }
+    },
+    buttonClick(val) {
+      switch (val.btnName) {
+        case "search":
+          // this.listQuery.paramCode = val.paramCode;
+          this.listQuery.page = 1;
+          this.listQuery.code = null
+          this.listQuery.name = null
+          this.listQuery.failureTypeStatus = null
+          this.getDataList();
+          break;
+        case "add":
+          this.addOrEditTitle = this.$t('add')
+          this.addOrUpdateVisible = true;
+          this.addOrUpdateHandle()
+          break;
+        default:
+          console.log(val)
+      }
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/code/startEightDisciplineCreateTeam.vue b/src/views/modules/code/startEightDisciplineCreateTeam.vue
new file mode 100644
index 0000000..6c3838e
--- /dev/null
+++ b/src/views/modules/code/startEightDisciplineCreateTeam.vue
@@ -0,0 +1,207 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-01-11 09:24:58
+ * @LastEditTime: 2023-06-05 09:11:39
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__user">
+      <SearchBar :formConfigs="formConfig" ref="ruleForm" @headBtnClick="buttonClick">
+        <!-- <el-badge :value="1" class="item">
+          <el-button type="primary" size="small" @click="conditionSearch">条件搜索</el-button>
+        </el-badge> -->
+      </SearchBar>
+      <base-table :table-props="tableProps" :page="listQuery.page" :limit="listQuery.limit" :table-data="tableData">
+        <method-btn v-if="tableBtn.length" slot="handleBtn" :width="100" label="操作" :method-list="tableBtn"
+          @clickBtn="handleClick" />
+      </base-table>
+      <pagination :limit.sync="listQuery.limit" :page.sync="listQuery.page" :total="listQuery.total"
+        @pagination="getDataList" />
+      <!-- 弹窗, 新增 / 修改 -->
+    </div>
+  </el-card>
+</template>
+
+<script>
+import basicPage from "@/mixins/basic-page"
+// import transferRecordsAdd from "./components/transferRecords-add"
+// import AddOrUpdate from './params-add-or-update'
+// import transferRecordsSearch from "./components/transferRecordsSearch"
+// import available from "./components/available.vue"
+import basicSearch from "@/mixins/basic-search"
+import i18n from "@/i18n"
+const tableProps = [
+  {
+    prop: 'productName',
+    label: i18n.t("quality.productName"),
+    align: 'center'
+  },
+  {
+    prop: 'supplierName',
+    label: i18n.t("quality.supplierName"),
+    align: 'center'
+  },
+  {
+    prop: 'transferOutName',
+    label: i18n.t("quality.transferOutName"),
+    align: 'center'
+  },
+   {
+     prop: 'transferInName',
+     label: i18n.t("quality.transferInName"),
+    align: 'center'
+  },
+  {
+    prop: 'dataSources',
+    label: i18n.t("quality.dataSources"),
+    align: 'center'
+  },
+   {
+     prop: 'remark',
+     label: i18n.t("quality.remark"),
+    align: 'center'
+  },
+  {
+    prop: 'userName',
+    label: i18n.t("quality.userName"),
+    align: 'center'
+  }
+]
+const tableBtn = [
+  {
+    type: "edit",
+    btnName: "编辑",
+  },
+  {
+    type: "delete",
+    btnName: "删除",
+  },
+];
+export default {
+  mixins: [basicPage, basicSearch],
+  components: {
+    // transferRecordsSearch,
+    // transferRecordsAdd
+  },
+  data() {
+    return {
+      urlOptions: {
+        getDataListURL: "/code/startEightDiscipline/page",
+        deleteURL: "/code/startEightDiscipline",
+      },
+      tableProps,
+      tableBtn,
+      listQuery: {
+        limit: 10,
+        page: 1,
+        eightDisciplineStatus: 2
+      },
+      searchOrEditTitle: '',
+      searchOrUpdateVisible: false,
+      formConfig: [
+        // {
+        //   type: "",
+        //   label: i18n.t("params.paramCode"),
+        //   placeholder: i18n.t("params.paramCode"),
+        //   param: "paramCode",
+        // },
+        // {
+        //   type: "separate",
+        // },
+        {
+          type: 'input',
+          label: i18n.t('code.title'),
+          placeholder: i18n.t('code.title'),
+          param: 'title'
+        },
+        {
+          type: "button",
+          btnName: "搜索",
+          name: "search",
+          color: "primary",
+        }
+      ],
+    };
+  },
+  // components: {
+  //   AddOrUpdate,
+  // },
+  methods: {
+    //search-bar点击
+    handleProductCancel() {
+      this.productOrUpdateVisible = false;
+      this.productOrEditTitle = "";
+    },
+    // handleSearchCancel() {
+    //   this.searchOrEditTitle = "";
+    //   this.searchOrUpdateVisible = false;
+    // },
+    conditionSearch() {
+      this.searchOrEditTitle = "搜索";
+      this.searchOrUpdateVisible = true;
+      this.$nextTick(() => {
+        this.$refs.searchOrUpdate.init();
+      });
+    },
+    conditionSearchSubmit(dataForm) {
+      this.listQuery.page = 1;
+      this.getDataList();
+      this.searchOrUpdateVisible = false;
+      // console.log(11111);
+      // this.conditionSearchSubmit();
+    },
+    handleClick(val) {
+      console.log(val);
+      if (val.type === "delete") {
+        this.$confirm(`确定对[名称=${val.data.failureTypeName}]进行删除操作?`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.$http.delete(this.urlOptions.deleteURL, { data: [val.data.id] }).then(({ data }) => {
+              if (data && data.code === 0) {
+                this.$message({
+                  message: "操作成功",
+                  type: "success",
+                  duration: 1500,
+                  onClose: () => {
+                    this.getDataList();
+                  },
+                });
+              } else {
+                this.$message.error(data.msg);
+              }
+            });
+          })
+          .catch(() => { });
+      } else if (val.type === 'edit') {
+        this.addOrUpdateVisible = true
+        this.addOrEditTitle = this.$t('edit')
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init(val.data.id);
+        });
+      }
+    },
+    buttonClick(val) {
+      switch (val.btnName) {
+        case "search":
+          // this.listQuery.paramCode = val.paramCode;
+          this.listQuery.page = 1;
+          this.listQuery.title = val.title ? val.title : ''
+          this.getDataList();
+          break;
+        case "add":
+          this.addOrEditTitle = this.$t('add')
+          this.addOrUpdateVisible = true;
+          this.addOrUpdateHandle()
+          break;
+        default:
+          console.log(val)
+      }
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/code/startEightDisciplineDescriptionCorrectiveAction.vue b/src/views/modules/code/startEightDisciplineDescriptionCorrectiveAction.vue
new file mode 100644
index 0000000..d7dd481
--- /dev/null
+++ b/src/views/modules/code/startEightDisciplineDescriptionCorrectiveAction.vue
@@ -0,0 +1,205 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-01-11 09:24:58
+ * @LastEditTime: 2023-06-05 09:11:18
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__user">
+      <SearchBar :formConfigs="formConfig" ref="ruleForm" @headBtnClick="buttonClick">
+        <!-- <el-badge :value="1" class="item">
+          <el-button type="primary" size="small" @click="conditionSearch">条件搜索</el-button>
+        </el-badge> -->
+      </SearchBar>
+      <base-table :table-props="tableProps" :page="listQuery.page" :limit="listQuery.limit" :table-data="tableData">
+        <method-btn v-if="tableBtn.length" slot="handleBtn" :width="100" label="操作" :method-list="tableBtn"
+          @clickBtn="handleClick" />
+      </base-table>
+      <pagination :limit.sync="listQuery.limit" :page.sync="listQuery.page" :total="listQuery.total"
+        @pagination="getDataList" />
+      <!-- 弹窗, 新增 / 修改 -->
+    </div>
+  </el-card>
+</template>
+
+<script>
+import basicPage from "@/mixins/basic-page"
+// import transferSchemeAdd from "./components/transferScheme-add"
+
+// import AddOrUpdate from './params-add-or-update'
+// import transferSchemeSearch from "./components/transferSchemeSearch.vue"
+// import available from "./components/available.vue"
+import basicSearch from "@/mixins/basic-search"
+import i18n from "@/i18n"
+const tableProps = [
+  {
+    prop: 'title',
+    label: i18n.t("code.title"),
+    align: 'center'
+  },
+  {
+    prop: 'code',
+    label: i18n.t("code.code"),
+    align: 'center'
+  },
+  {
+    prop: 'eightDisciplineType',
+    label: i18n.t("code.eightDisciplineType"),
+    align: 'center'
+  },
+  {
+    prop: 'occurrenceDate',
+    label: i18n.t("code.occurrenceDate"),
+    align: 'center'
+  },
+  // {
+  //   prop: 'productName',
+  //   label: i18n.t("code.productName"),
+  //   align: 'center'
+  // },
+  // {
+  //   prop: 'customName',
+  //   label: i18n.t("code.customName"),
+  //   align: 'center'
+  // },
+  {
+    prop: 'description',
+    label: i18n.t("code.description"),
+    align: 'center'
+  },
+  {
+    prop: 'userId',
+    label: i18n.t("code.userId"),
+    align: 'center'
+  }
+]
+const tableBtn = [
+  {
+    type: "edit",
+    btnName: "编辑",
+  },
+  {
+    type: "delete",
+    btnName: "删除",
+  },
+];
+export default {
+  mixins: [basicPage, basicSearch],
+  components: {
+    // transferSchemeSearch,
+    // transferSchemeAdd
+  },
+  data() {
+    return {
+      urlOptions: {
+        getDataListURL: "/code/startEightDiscipline/page",
+        deleteURL: "/code/startEightDiscipline",
+      },
+      tableProps,
+      tableBtn,
+      listQuery: {
+        limit: 10,
+        page: 1,
+        eightDisciplineStatus: 5
+      },
+      searchOrEditTitle: '',
+      searchOrUpdateVisible: false,
+      formConfig: [
+        {
+          type: 'input',
+          label: i18n.t('code.title'),
+          placeholder: i18n.t('code.title'),
+          param: 'title'
+        },
+        {
+          type: "button",
+          btnName: "搜索",
+          name: "search",
+          color: "primary",
+        }
+      ],
+    };
+  },
+  // components: {
+  //   AddOrUpdate,
+  // },
+  methods: {
+    //search-bar点击
+    handleProductCancel() {
+      this.productOrUpdateVisible = false;
+      this.productOrEditTitle = "";
+    },
+    // handleSearchCancel() {
+    //   this.searchOrEditTitle = "";
+    //   this.searchOrUpdateVisible = false;
+    // },
+    conditionSearch() {
+      this.searchOrEditTitle = "搜索";
+      this.searchOrUpdateVisible = true;
+      this.$nextTick(() => {
+        this.$refs.searchOrUpdate.init();
+      });
+    },
+    conditionSearchSubmit(dataForm) {
+      this.listQuery.page = 1;
+      this.getDataList();
+      this.searchOrUpdateVisible = false;
+      // console.log(11111);
+      // this.conditionSearchSubmit();
+    },
+    handleClick(val) {
+      console.log(val);
+      if (val.type === "delete") {
+        this.$confirm(`确定对[名称=${val.data.failureTypeName}]进行删除操作?`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.$http.delete(this.urlOptions.deleteURL, { data: [val.data.id] }).then(({ data }) => {
+              if (data && data.code === 0) {
+                this.$message({
+                  message: "操作成功",
+                  type: "success",
+                  duration: 1500,
+                  onClose: () => {
+                    this.getDataList();
+                  },
+                });
+              } else {
+                this.$message.error(data.msg);
+              }
+            });
+          })
+          .catch(() => { });
+      } else if (val.type === 'edit') {
+        this.addOrUpdateVisible = true
+        this.addOrEditTitle = this.$t('edit')
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init(val.data.id);
+        });
+      }
+    },
+    buttonClick(val) {
+      switch (val.btnName) {
+        case "search":
+          // this.listQuery.paramCode = val.paramCode;
+          this.listQuery.page = 1;
+          this.listQuery.title = val.title ? val.title : ''
+          this.listQuery.failureTypeStatus = null
+          this.getDataList();
+          break;
+        case "add":
+          this.addOrEditTitle = this.$t('add')
+          this.addOrUpdateVisible = true;
+          this.addOrUpdateHandle()
+          break;
+        default:
+          console.log(val)
+      }
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/code/startEightDisciplinePreliminaryAnalysis.vue b/src/views/modules/code/startEightDisciplinePreliminaryAnalysis.vue
new file mode 100644
index 0000000..74b0aeb
--- /dev/null
+++ b/src/views/modules/code/startEightDisciplinePreliminaryAnalysis.vue
@@ -0,0 +1,213 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-01-11 09:24:58
+ * @LastEditTime: 2023-06-05 09:11:07
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__user">
+      <SearchBar :formConfigs="formConfig" ref="ruleForm" @headBtnClick="buttonClick">
+        <!-- <el-badge :value="1" class="item">
+          <el-button type="primary" size="small" @click="conditionSearch">条件搜索</el-button>
+        </el-badge> -->
+      </SearchBar>
+      <base-table :table-props="tableProps" :page="listQuery.page" :limit="listQuery.limit" :table-data="tableData">
+        <method-btn v-if="tableBtn.length" slot="handleBtn" :width="100" label="操作" :method-list="tableBtn"
+          @clickBtn="handleClick" />
+      </base-table>
+      <pagination :limit.sync="listQuery.limit" :page.sync="listQuery.page" :total="listQuery.total"
+        @pagination="getDataList" />
+      <!-- 弹窗, 新增 / 修改 -->
+    </div>
+  </el-card>
+</template>
+
+<script>
+import basicPage from "@/mixins/basic-page"
+// import InspectionPositionAdd from "./components/InspectionPosition-add"
+// import AddOrUpdate from './params-add-or-update'
+// import failureTypeSearch from "./components/failureTypeSearch"
+// import available from "./components/available.vue"
+import basicSearch from "@/mixins/basic-search"
+import i18n from "@/i18n"
+const tableProps = [
+  {
+    prop: 'title',
+    label: i18n.t("code.title"),
+    align: 'center'
+  },
+  {
+    prop: 'code',
+    label: i18n.t("code.code"),
+    align: 'center'
+  },
+  {
+    prop: 'eightDisciplineType',
+    label: i18n.t("code.eightDisciplineType"),
+    align: 'center'
+  },
+  {
+    prop: 'occurrenceDate',
+    label: i18n.t("code.occurrenceDate"),
+    align: 'center'
+  },
+  // {
+  //   prop: 'productName',
+  //   label: i18n.t("code.productName"),
+  //   align: 'center'
+  // },
+  // {
+  //   prop: 'customName',
+  //   label: i18n.t("code.customName"),
+  //   align: 'center'
+  // },
+  {
+    prop: 'description',
+    label: i18n.t("code.description"),
+    align: 'center'
+  },
+  {
+    prop: 'userId',
+    label: i18n.t("code.userId"),
+    align: 'center'
+  }
+]
+const tableBtn = [
+  // {
+  //   type: "edit",
+  //   btnName: "编辑",
+  // },
+  {
+    type: "delete",
+    btnName: "删除",
+  },
+];
+export default {
+  mixins: [basicPage, basicSearch],
+  components: {
+    // failureTypeSearch,
+    // InspectionPositionAdd
+  },
+  data() {
+    return {
+      urlOptions: {
+        getDataListURL: "/code/startEightDiscipline/page",
+        deleteURL: "/code/startEightDiscipline",
+      },
+      tableProps,
+      tableBtn,
+      searchOrEditTitle: '',
+      listQuery: {
+        limit: 10,
+        page: 1,
+        eightDisciplineStatus:1
+      },
+      searchOrUpdateVisible: false,
+      formConfig: [
+        {
+          type: 'input',
+          label: i18n.t('code.title'),
+          placeholder: i18n.t('code.title'),
+          param: 'title'
+        },
+        // {
+        //   type: "",
+        //   label: i18n.t("params.paramCode"),
+        //   placeholder: i18n.t("params.paramCode"),
+        //   param: "paramCode",
+        // },
+        // {
+        //   type: "separate",
+        // },
+        {
+          type: "button",
+          btnName: "搜索",
+          name: "search",
+          color: "primary",
+        }
+      ],
+    };
+  },
+  // components: {
+  //   AddOrUpdate,
+  // },
+  methods: {
+    //search-bar点击
+    handleProductCancel() {
+      this.productOrUpdateVisible = false;
+      this.productOrEditTitle = "";
+    },
+    // handleSearchCancel() {
+    //   this.searchOrEditTitle = "";
+    //   this.searchOrUpdateVisible = false;
+    // },
+    conditionSearch() {
+      this.searchOrEditTitle = "搜索";
+      this.searchOrUpdateVisible = true;
+      this.$nextTick(() => {
+        this.$refs.searchOrUpdate.init();
+      });
+    },
+    conditionSearchSubmit(dataForm) {
+      this.listQuery.page = 1;
+      this.getDataList();
+      this.searchOrUpdateVisible = false;
+      // console.log(11111);
+      // this.conditionSearchSubmit();
+    },
+    handleClick(val) {
+      console.log(val);
+      if (val.type === "delete") {
+        this.$confirm(`确定对[名称=${val.data.failureTypeName}]进行删除操作?`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.$http.delete(this.urlOptions.deleteURL, { data: [val.data.id] }).then(({ data }) => {
+              if (data && data.code === 0) {
+                this.$message({
+                  message: "操作成功",
+                  type: "success",
+                  duration: 1500,
+                  onClose: () => {
+                    this.getDataList();
+                  },
+                });
+              } else {
+                this.$message.error(data.msg);
+              }
+            });
+          })
+          .catch(() => { });
+      } else if (val.type === 'edit') {
+        this.addOrUpdateVisible = true
+        this.addOrEditTitle = this.$t('edit')
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init(val.data.id);
+        });
+      }
+    },
+    buttonClick(val) {
+      switch (val.btnName) {
+        case "search":
+          // this.listQuery.paramCode = val.paramCode;
+          this.listQuery.page = 1;
+          this.listQuery.title = val.title ? val.title : ''
+          this.listQuery.failureTypeStatus = null
+          this.getDataList();
+          break;
+        case "add":
+          this.addOrEditTitle = this.$t('add')
+          this.addOrUpdateVisible = true;
+          this.addOrUpdateHandle()
+          break;
+        default:
+          console.log(val)
+      }
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/code/startEightDisciplinePreventRecurrence.vue b/src/views/modules/code/startEightDisciplinePreventRecurrence.vue
new file mode 100644
index 0000000..ac8000c
--- /dev/null
+++ b/src/views/modules/code/startEightDisciplinePreventRecurrence.vue
@@ -0,0 +1,205 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-01-11 09:24:58
+ * @LastEditTime: 2023-06-05 09:10:50
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__user">
+      <SearchBar :formConfigs="formConfig" ref="ruleForm" @headBtnClick="buttonClick">
+        <!-- <el-badge :value="1" class="item">
+          <el-button type="primary" size="small" @click="conditionSearch">条件搜索</el-button>
+        </el-badge> -->
+      </SearchBar>
+      <base-table :table-props="tableProps" :page="listQuery.page" :limit="listQuery.limit" :table-data="tableData">
+        <method-btn v-if="tableBtn.length" slot="handleBtn" :width="100" label="操作" :method-list="tableBtn"
+          @clickBtn="handleClick" />
+      </base-table>
+      <pagination :limit.sync="listQuery.limit" :page.sync="listQuery.page" :total="listQuery.total"
+        @pagination="getDataList" />
+      <!-- 弹窗, 新增 / 修改 -->
+    </div>
+  </el-card>
+</template>
+
+<script>
+import basicPage from "@/mixins/basic-page"
+// import transferSchemeAdd from "./components/transferScheme-add"
+
+// import AddOrUpdate from './params-add-or-update'
+// import transferSchemeSearch from "./components/transferSchemeSearch.vue"
+// import available from "./components/available.vue"
+import basicSearch from "@/mixins/basic-search"
+import i18n from "@/i18n"
+const tableProps = [
+  {
+    prop: 'title',
+    label: i18n.t("code.title"),
+    align: 'center'
+  },
+  {
+    prop: 'code',
+    label: i18n.t("code.code"),
+    align: 'center'
+  },
+  {
+    prop: 'eightDisciplineType',
+    label: i18n.t("code.eightDisciplineType"),
+    align: 'center'
+  },
+  {
+    prop: 'occurrenceDate',
+    label: i18n.t("code.occurrenceDate"),
+    align: 'center'
+  },
+  // {
+  //   prop: 'productName',
+  //   label: i18n.t("code.productName"),
+  //   align: 'center'
+  // },
+  // {
+  //   prop: 'customName',
+  //   label: i18n.t("code.customName"),
+  //   align: 'center'
+  // },
+  {
+    prop: 'description',
+    label: i18n.t("code.description"),
+    align: 'center'
+  },
+  {
+    prop: 'userId',
+    label: i18n.t("code.userId"),
+    align: 'center'
+  }
+]
+const tableBtn = [
+  {
+    type: "edit",
+    btnName: "编辑",
+  },
+  {
+    type: "delete",
+    btnName: "删除",
+  },
+];
+export default {
+  mixins: [basicPage, basicSearch],
+  components: {
+    // transferSchemeSearch,
+    // transferSchemeAdd
+  },
+  data() {
+    return {
+      urlOptions: {
+        getDataListURL: "/code/startEightDiscipline/page",
+        deleteURL: "/code/startEightDiscipline",
+      },
+      tableProps,
+      tableBtn,
+      listQuery: {
+        limit: 10,
+        page: 1,
+        eightDisciplineStatus: 6
+      },
+      searchOrEditTitle: '',
+      searchOrUpdateVisible: false,
+      formConfig: [
+        {
+          type: 'input',
+          label: i18n.t('code.title'),
+          placeholder: i18n.t('code.title'),
+          param: 'title'
+        },
+        {
+          type: "button",
+          btnName: "搜索",
+          name: "search",
+          color: "primary",
+        }
+      ],
+    };
+  },
+  // components: {
+  //   AddOrUpdate,
+  // },
+  methods: {
+    //search-bar点击
+    handleProductCancel() {
+      this.productOrUpdateVisible = false;
+      this.productOrEditTitle = "";
+    },
+    // handleSearchCancel() {
+    //   this.searchOrEditTitle = "";
+    //   this.searchOrUpdateVisible = false;
+    // },
+    conditionSearch() {
+      this.searchOrEditTitle = "搜索";
+      this.searchOrUpdateVisible = true;
+      this.$nextTick(() => {
+        this.$refs.searchOrUpdate.init();
+      });
+    },
+    conditionSearchSubmit(dataForm) {
+      this.listQuery.page = 1;
+      this.getDataList();
+      this.searchOrUpdateVisible = false;
+      // console.log(11111);
+      // this.conditionSearchSubmit();
+    },
+    handleClick(val) {
+      console.log(val);
+      if (val.type === "delete") {
+        this.$confirm(`确定对[名称=${val.data.failureTypeName}]进行删除操作?`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.$http.delete(this.urlOptions.deleteURL, { data: [val.data.id] }).then(({ data }) => {
+              if (data && data.code === 0) {
+                this.$message({
+                  message: "操作成功",
+                  type: "success",
+                  duration: 1500,
+                  onClose: () => {
+                    this.getDataList();
+                  },
+                });
+              } else {
+                this.$message.error(data.msg);
+              }
+            });
+          })
+          .catch(() => { });
+      } else if (val.type === 'edit') {
+        this.addOrUpdateVisible = true
+        this.addOrEditTitle = this.$t('edit')
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init(val.data.id);
+        });
+      }
+    },
+    buttonClick(val) {
+      switch (val.btnName) {
+        case "search":
+          // this.listQuery.paramCode = val.paramCode;
+          this.listQuery.page = 1;
+          this.listQuery.title = val.title ? val.title : ''
+          this.listQuery.failureTypeStatus = null
+          this.getDataList();
+          break;
+        case "add":
+          this.addOrEditTitle = this.$t('add')
+          this.addOrUpdateVisible = true;
+          this.addOrUpdateHandle()
+          break;
+        default:
+          console.log(val)
+      }
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/code/startEightDisciplineRootCauseAnalysis.vue b/src/views/modules/code/startEightDisciplineRootCauseAnalysis.vue
new file mode 100644
index 0000000..099b793
--- /dev/null
+++ b/src/views/modules/code/startEightDisciplineRootCauseAnalysis.vue
@@ -0,0 +1,204 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-01-11 09:24:58
+ * @LastEditTime: 2023-06-05 09:10:40
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__user">
+      <SearchBar :formConfigs="formConfig" ref="ruleForm" @headBtnClick="buttonClick">
+        <!-- <el-badge :value="1" class="item">
+          <el-button type="primary" size="small" @click="conditionSearch">条件搜索</el-button>
+        </el-badge> -->
+      </SearchBar>
+      <base-table :table-props="tableProps" :page="listQuery.page" :limit="listQuery.limit" :table-data="tableData">
+        <method-btn v-if="tableBtn.length" slot="handleBtn" :width="100" label="操作" :method-list="tableBtn"
+          @clickBtn="handleClick" />
+      </base-table>
+      <pagination :limit.sync="listQuery.limit" :page.sync="listQuery.page" :total="listQuery.total"
+        @pagination="getDataList" />
+      <!-- 弹窗, 新增 / 修改 -->
+    </div>
+  </el-card>
+</template>
+
+<script>
+import basicPage from "@/mixins/basic-page"
+// import transferSchemeAdd from "./components/transferScheme-add"
+// import AddOrUpdate from './params-add-or-update'
+// import transferSchemeSearch from "./components/transferSchemeSearch.vue"
+// import available from "./components/available.vue"
+import basicSearch from "@/mixins/basic-search"
+import i18n from "@/i18n"
+const tableProps = [
+  {
+    prop: 'title',
+    label: i18n.t("code.title"),
+    align: 'center'
+  },
+  {
+    prop: 'code',
+    label: i18n.t("code.code"),
+    align: 'center'
+  },
+  {
+    prop: 'eightDisciplineType',
+    label: i18n.t("code.eightDisciplineType"),
+    align: 'center'
+  },
+  {
+    prop: 'occurrenceDate',
+    label: i18n.t("code.occurrenceDate"),
+    align: 'center'
+  },
+  // {
+  //   prop: 'productName',
+  //   label: i18n.t("code.productName"),
+  //   align: 'center'
+  // },
+  // {
+  //   prop: 'customName',
+  //   label: i18n.t("code.customName"),
+  //   align: 'center'
+  // },
+  {
+    prop: 'description',
+    label: i18n.t("code.description"),
+    align: 'center'
+  },
+  {
+    prop: 'userId',
+    label: i18n.t("code.userId"),
+    align: 'center'
+  }
+]
+const tableBtn = [
+  {
+    type: "edit",
+    btnName: "编辑",
+  },
+  {
+    type: "delete",
+    btnName: "删除",
+  },
+];
+export default {
+  mixins: [basicPage, basicSearch],
+  components: {
+    // transferSchemeSearch,
+    // transferSchemeAdd
+  },
+  data() {
+    return {
+      urlOptions: {
+        getDataListURL: "/code/startEightDiscipline/page",
+        deleteURL: "/code/startEightDiscipline",
+      },
+      tableProps,
+      tableBtn,
+      listQuery: {
+        limit: 10,
+        page: 1,
+        eightDisciplineStatus: 4
+      },
+      searchOrEditTitle: '',
+      searchOrUpdateVisible: false,
+      formConfig: [
+        {
+          type: 'input',
+          label: i18n.t('code.title'),
+          placeholder: i18n.t('code.title'),
+          param: 'title'
+        },
+        {
+          type: "button",
+          btnName: "搜索",
+          name: "search",
+          color: "primary",
+        }
+      ],
+    };
+  },
+  // components: {
+  //   AddOrUpdate,
+  // },
+  methods: {
+    //search-bar点击
+    handleProductCancel() {
+      this.productOrUpdateVisible = false;
+      this.productOrEditTitle = "";
+    },
+    // handleSearchCancel() {
+    //   this.searchOrEditTitle = "";
+    //   this.searchOrUpdateVisible = false;
+    // },
+    conditionSearch() {
+      this.searchOrEditTitle = "搜索";
+      this.searchOrUpdateVisible = true;
+      this.$nextTick(() => {
+        this.$refs.searchOrUpdate.init();
+      });
+    },
+    conditionSearchSubmit(dataForm) {
+      this.listQuery.page = 1;
+      this.getDataList();
+      this.searchOrUpdateVisible = false;
+      // console.log(11111);
+      // this.conditionSearchSubmit();
+    },
+    handleClick(val) {
+      console.log(val);
+      if (val.type === "delete") {
+        this.$confirm(`确定对[名称=${val.data.failureTypeName}]进行删除操作?`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.$http.delete(this.urlOptions.deleteURL, { data: [val.data.id] }).then(({ data }) => {
+              if (data && data.code === 0) {
+                this.$message({
+                  message: "操作成功",
+                  type: "success",
+                  duration: 1500,
+                  onClose: () => {
+                    this.getDataList();
+                  },
+                });
+              } else {
+                this.$message.error(data.msg);
+              }
+            });
+          })
+          .catch(() => { });
+      } else if (val.type === 'edit') {
+        this.addOrUpdateVisible = true
+        this.addOrEditTitle = this.$t('edit')
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init(val.data.id);
+        });
+      }
+    },
+    buttonClick(val) {
+      switch (val.btnName) {
+        case "search":
+          // this.listQuery.paramCode = val.paramCode;
+          this.listQuery.page = 1;
+          this.listQuery.title = val.title ? val.title : ''
+          this.listQuery.failureTypeStatus = null
+          this.getDataList();
+          break;
+        case "add":
+          this.addOrEditTitle = this.$t('add')
+          this.addOrUpdateVisible = true;
+          this.addOrUpdateHandle()
+          break;
+        default:
+          console.log(val)
+      }
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/code/startEightDisciplineSummaryExperience.vue b/src/views/modules/code/startEightDisciplineSummaryExperience.vue
new file mode 100644
index 0000000..aab6ee3
--- /dev/null
+++ b/src/views/modules/code/startEightDisciplineSummaryExperience.vue
@@ -0,0 +1,205 @@
+
+<!--
+ * @Author: zhp
+ * @Date: 2023-01-11 09:24:58
+ * @LastEditTime: 2023-06-05 09:10:30
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__user">
+      <SearchBar :formConfigs="formConfig" ref="ruleForm" @headBtnClick="buttonClick">
+        <!-- <el-badge :value="1" class="item">
+          <el-button type="primary" size="small" @click="conditionSearch">条件搜索</el-button>
+        </el-badge> -->
+      </SearchBar>
+      <base-table :table-props="tableProps" :page="listQuery.page" :limit="listQuery.limit" :table-data="tableData">
+        <method-btn v-if="tableBtn.length" slot="handleBtn" :width="100" label="操作" :method-list="tableBtn"
+          @clickBtn="handleClick" />
+      </base-table>
+      <pagination :limit.sync="listQuery.limit" :page.sync="listQuery.page" :total="listQuery.total"
+        @pagination="getDataList" />
+      <!-- 弹窗, 新增 / 修改 -->
+    </div>
+  </el-card>
+</template>
+
+<script>
+import basicPage from "@/mixins/basic-page"
+// import transferSchemeAdd from "./components/transferScheme-add"
+// import AddOrUpdate from './params-add-or-update'
+// import transferSchemeSearch from "./components/transferSchemeSearch.vue"
+// import available from "./components/available.vue"
+import basicSearch from "@/mixins/basic-search"
+import i18n from "@/i18n"
+const tableProps = [
+  {
+    prop: 'title',
+    label: i18n.t("code.title"),
+    align: 'center'
+  },
+  {
+    prop: 'code',
+    label: i18n.t("code.code"),
+    align: 'center'
+  },
+  {
+    prop: 'eightDisciplineType',
+    label: i18n.t("code.eightDisciplineType"),
+    align: 'center'
+  },
+  {
+    prop: 'occurrenceDate',
+    label: i18n.t("code.occurrenceDate"),
+    align: 'center'
+  },
+  // {
+  //   prop: 'productName',
+  //   label: i18n.t("code.productName"),
+  //   align: 'center'
+  // },
+  // {
+  //   prop: 'customName',
+  //   label: i18n.t("code.customName"),
+  //   align: 'center'
+  // },
+  {
+    prop: 'description',
+    label: i18n.t("code.description"),
+    align: 'center'
+  },
+  {
+    prop: 'userId',
+    label: i18n.t("code.userId"),
+    align: 'center'
+  }
+]
+const tableBtn = [
+  {
+    type: "edit",
+    btnName: "编辑",
+  },
+  {
+    type: "delete",
+    btnName: "删除",
+  },
+];
+export default {
+  mixins: [basicPage, basicSearch],
+  components: {
+    // transferSchemeSearch,
+    // transferSchemeAdd
+  },
+  data() {
+    return {
+      urlOptions: {
+        getDataListURL: "/code/startEightDiscipline/page",
+        deleteURL: "/code/startEightDiscipline",
+      },
+      tableProps,
+      tableBtn,
+      listQuery: {
+        limit: 10,
+        page: 1,
+        eightDisciplineStatus: 8
+      },
+      searchOrEditTitle: '',
+      searchOrUpdateVisible: false,
+      formConfig: [
+        {
+          type: 'input',
+          label: i18n.t('code.title'),
+          placeholder: i18n.t('code.title'),
+          param: 'title'
+        },
+        {
+          type: "button",
+          btnName: "搜索",
+          name: "search",
+          color: "primary",
+        }
+      ],
+    };
+  },
+  // components: {
+  //   AddOrUpdate,
+  // },
+  methods: {
+    //search-bar点击
+    handleProductCancel() {
+      this.productOrUpdateVisible = false;
+      this.productOrEditTitle = "";
+    },
+    // handleSearchCancel() {
+    //   this.searchOrEditTitle = "";
+    //   this.searchOrUpdateVisible = false;
+    // },
+    conditionSearch() {
+      this.searchOrEditTitle = "搜索";
+      this.searchOrUpdateVisible = true;
+      this.$nextTick(() => {
+        this.$refs.searchOrUpdate.init();
+      });
+    },
+    conditionSearchSubmit(dataForm) {
+      this.listQuery.page = 1;
+      this.getDataList();
+      this.searchOrUpdateVisible = false;
+      // console.log(11111);
+      // this.conditionSearchSubmit();
+    },
+    handleClick(val) {
+      console.log(val);
+      if (val.type === "delete") {
+        this.$confirm(`确定对[名称=${val.data.failureTypeName}]进行删除操作?`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.$http.delete(this.urlOptions.deleteURL, { data: [val.data.id] }).then(({ data }) => {
+              if (data && data.code === 0) {
+                this.$message({
+                  message: "操作成功",
+                  type: "success",
+                  duration: 1500,
+                  onClose: () => {
+                    this.getDataList();
+                  },
+                });
+              } else {
+                this.$message.error(data.msg);
+              }
+            });
+          })
+          .catch(() => { });
+      } else if (val.type === 'edit') {
+        this.addOrUpdateVisible = true
+        this.addOrEditTitle = this.$t('edit')
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init(val.data.id);
+        });
+      }
+    },
+    buttonClick(val) {
+      switch (val.btnName) {
+        case "search":
+          // this.listQuery.paramCode = val.paramCode;
+          this.listQuery.page = 1;
+          this.listQuery.title = val.title ? val.title : ''
+          this.listQuery.failureTypeStatus = null
+          this.getDataList();
+          break;
+        case "add":
+          this.addOrEditTitle = this.$t('add')
+          this.addOrUpdateVisible = true;
+          this.addOrUpdateHandle()
+          break;
+        default:
+          console.log(val)
+      }
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/code/startEightDisciplineTemporaryTreatmentMeasures.vue b/src/views/modules/code/startEightDisciplineTemporaryTreatmentMeasures.vue
new file mode 100644
index 0000000..5bba2ce
--- /dev/null
+++ b/src/views/modules/code/startEightDisciplineTemporaryTreatmentMeasures.vue
@@ -0,0 +1,212 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-01-11 09:24:58
+ * @LastEditTime: 2023-06-05 09:13:01
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__user">
+      <SearchBar :formConfigs="formConfig" ref="ruleForm" @headBtnClick="buttonClick">
+        <!-- <el-badge :value="1" class="item">
+          <el-button type="primary" size="small" @click="conditionSearch">条件搜索</el-button>
+        </el-badge> -->
+      </SearchBar>
+      <base-table :table-props="tableProps" :page="listQuery.page" :limit="listQuery.limit" :table-data="tableData">
+        <method-btn v-if="tableBtn.length" slot="handleBtn" :width="100" label="操作" :method-list="tableBtn"
+          @clickBtn="handleClick" />
+      </base-table>
+      <pagination :limit.sync="listQuery.limit" :page.sync="listQuery.page" :total="listQuery.total"
+        @pagination="getDataList" />
+      <!-- 弹窗, 新增 / 修改 -->
+    </div>
+  </el-card>
+</template>
+
+<script>
+import basicPage from "@/mixins/basic-page"
+// import samplingPlanAdd from "./components/samplingPlan-add"
+// import AddOrUpdate from './params-add-or-update'
+// import failureTypeSearch from "./components/failureTypeSearch"
+// import available from "./components/available.vue"
+import basicSearch from "@/mixins/basic-search"
+import i18n from "@/i18n"
+const tableProps = [
+  {
+    prop: 'title',
+    label: i18n.t("code.title"),
+    align: 'center'
+  },
+  {
+    prop: 'code',
+    label: i18n.t("code.code"),
+    align: 'center'
+  },
+  {
+    prop: 'eightDisciplineType',
+    label: i18n.t("code.eightDisciplineType"),
+    align: 'center'
+  },
+  {
+    prop: 'occurrenceDate',
+    label: i18n.t("code.occurrenceDate"),
+    align: 'center'
+  },
+  // {
+  //   prop: 'productName',
+  //   label: i18n.t("code.productName"),
+  //   align: 'center'
+  // },
+  // {
+  //   prop: 'customName',
+  //   label: i18n.t("code.customName"),
+  //   align: 'center'
+  // },
+  {
+    prop: 'description',
+    label: i18n.t("code.description"),
+    align: 'center'
+  },
+  {
+    prop: 'userId',
+    label: i18n.t("code.userId"),
+    align: 'center'
+  }
+]
+const tableBtn = [
+  {
+    type: "edit",
+    btnName: "编辑",
+  },
+  {
+    type: "delete",
+    btnName: "删除",
+  },
+];
+export default {
+  mixins: [basicPage, basicSearch],
+  components: {
+    // failureTypeSearch,
+    // samplingPlanAdd
+  },
+  data() {
+    return {
+      urlOptions: {
+        getDataListURL: "/code/startEightDiscipline/page",
+        deleteURL: "/code/startEightDiscipline",
+      },
+      listQuery: {
+        limit: 10,
+        page: 1,
+        eightDisciplineStatus: 3
+      },
+      tableProps,
+      tableBtn,
+      searchOrEditTitle: '',
+      searchOrUpdateVisible: false,
+      formConfig: [
+        {
+          type: 'input',
+          label: i18n.t('code.title'),
+          placeholder: i18n.t('code.title'),
+          param: 'title'
+        },
+        // {
+        //   type: "",
+        //   label: i18n.t("params.paramCode"),
+        //   placeholder: i18n.t("params.paramCode"),
+        //   param: "paramCode",
+        // },
+        // {
+        //   type: "separate",
+        // },
+        {
+          type: "button",
+          btnName: "搜索",
+          name: "search",
+          color: "primary",
+        }
+      ],
+    };
+  },
+  // components: {
+  //   AddOrUpdate,
+  // },
+  methods: {
+    //search-bar点击
+    handleProductCancel() {
+      this.productOrUpdateVisible = false;
+      this.productOrEditTitle = "";
+    },
+    // handleSearchCancel() {
+    //   this.searchOrEditTitle = "";
+    //   this.searchOrUpdateVisible = false;
+    // },
+    conditionSearch() {
+      this.searchOrEditTitle = "搜索";
+      this.searchOrUpdateVisible = true;
+      this.$nextTick(() => {
+        this.$refs.searchOrUpdate.init();
+      });
+    },
+    conditionSearchSubmit(dataForm) {
+      this.listQuery.page = 1;
+      this.getDataList();
+      this.searchOrUpdateVisible = false;
+      // console.log(11111);
+      // this.conditionSearchSubmit();
+    },
+    handleClick(val) {
+      console.log(val);
+      if (val.type === "delete") {
+        this.$confirm(`确定对[名称=${val.data.failureTypeName}]进行删除操作?`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.$http.delete(this.urlOptions.deleteURL, { data: [val.data.id] }).then(({ data }) => {
+              if (data && data.code === 0) {
+                this.$message({
+                  message: "操作成功",
+                  type: "success",
+                  duration: 1500,
+                  onClose: () => {
+                    this.getDataList();
+                  },
+                });
+              } else {
+                this.$message.error(data.msg);
+              }
+            });
+          })
+          .catch(() => { });
+      } else if (val.type === 'edit') {
+        this.addOrUpdateVisible = true
+        this.addOrEditTitle = this.$t('edit')
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init(val.data.id);
+        });
+      }
+    },
+    buttonClick(val) {
+      switch (val.btnName) {
+        case "search":
+          // this.listQuery.paramCode = val.paramCode;
+          this.listQuery.page = 1;
+          this.listQuery.title = val.title ? val.title : ''
+          this.getDataList();
+          break;
+        case "add":
+          this.addOrEditTitle = this.$t('add')
+          this.addOrUpdateVisible = true;
+          this.addOrUpdateHandle()
+          break;
+        default:
+          console.log(val)
+      }
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/code/startEightDisciplineValidation.vue b/src/views/modules/code/startEightDisciplineValidation.vue
new file mode 100644
index 0000000..96c92a4
--- /dev/null
+++ b/src/views/modules/code/startEightDisciplineValidation.vue
@@ -0,0 +1,204 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-01-11 09:24:58
+ * @LastEditTime: 2023-06-05 09:09:59
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__user">
+      <SearchBar :formConfigs="formConfig" ref="ruleForm" @headBtnClick="buttonClick">
+        <!-- <el-badge :value="1" class="item">
+          <el-button type="primary" size="small" @click="conditionSearch">条件搜索</el-button>
+        </el-badge> -->
+      </SearchBar>
+      <base-table :table-props="tableProps" :page="listQuery.page" :limit="listQuery.limit" :table-data="tableData">
+        <method-btn v-if="tableBtn.length" slot="handleBtn" :width="100" label="操作" :method-list="tableBtn"
+          @clickBtn="handleClick" />
+      </base-table>
+      <pagination :limit.sync="listQuery.limit" :page.sync="listQuery.page" :total="listQuery.total"
+        @pagination="getDataList" />
+      <!-- 弹窗, 新增 / 修改 -->
+    </div>
+  </el-card>
+</template>
+
+<script>
+import basicPage from "@/mixins/basic-page"
+// import transferSchemeAdd from "./components/transferScheme-add"
+// import AddOrUpdate from './params-add-or-update'
+// import transferSchemeSearch from "./components/transferSchemeSearch.vue"
+// import available from "./components/available.vue"
+import basicSearch from "@/mixins/basic-search"
+import i18n from "@/i18n"
+const tableProps = [
+  {
+    prop: 'title',
+    label: i18n.t("code.title"),
+    align: 'center'
+  },
+  {
+    prop: 'code',
+    label: i18n.t("code.code"),
+    align: 'center'
+  },
+  {
+    prop: 'eightDisciplineType',
+    label: i18n.t("code.eightDisciplineType"),
+    align: 'center'
+  },
+  {
+    prop: 'occurrenceDate',
+    label: i18n.t("code.occurrenceDate"),
+    align: 'center'
+  },
+  // {
+  //   prop: 'productName',
+  //   label: i18n.t("code.productName"),
+  //   align: 'center'
+  // },
+  // {
+  //   prop: 'customName',
+  //   label: i18n.t("code.customName"),
+  //   align: 'center'
+  // },
+  {
+    prop: 'description',
+    label: i18n.t("code.description"),
+    align: 'center'
+  },
+  {
+    prop: 'userId',
+    label: i18n.t("code.userId"),
+    align: 'center'
+  }
+]
+const tableBtn = [
+  {
+    type: "edit",
+    btnName: "编辑",
+  },
+  {
+    type: "delete",
+    btnName: "删除",
+  },
+];
+export default {
+  mixins: [basicPage, basicSearch],
+  components: {
+    // transferSchemeSearch,
+    // transferSchemeAdd
+  },
+  data() {
+    return {
+      urlOptions: {
+        getDataListURL: "/code/startEightDiscipline/page",
+        deleteURL: "/code/startEightDiscipline",
+      },
+      tableProps,
+      tableBtn,
+      listQuery: {
+        limit: 10,
+        page: 1,
+        eightDisciplineStatus: 7
+      },
+      searchOrEditTitle: '',
+      searchOrUpdateVisible: false,
+      formConfig: [
+        {
+          type: 'input',
+          label: i18n.t('code.title'),
+          placeholder: i18n.t('code.title'),
+          param: 'title'
+        },
+        {
+          type: "button",
+          btnName: "搜索",
+          name: "search",
+          color: "primary",
+        }
+      ],
+    };
+  },
+  // components: {
+  //   AddOrUpdate,
+  // },
+  methods: {
+    //search-bar点击
+    handleProductCancel() {
+      this.productOrUpdateVisible = false;
+      this.productOrEditTitle = "";
+    },
+    // handleSearchCancel() {
+    //   this.searchOrEditTitle = "";
+    //   this.searchOrUpdateVisible = false;
+    // },
+    conditionSearch() {
+      this.searchOrEditTitle = "搜索";
+      this.searchOrUpdateVisible = true;
+      this.$nextTick(() => {
+        this.$refs.searchOrUpdate.init();
+      });
+    },
+    conditionSearchSubmit(dataForm) {
+      this.listQuery.page = 1;
+      this.getDataList();
+      this.searchOrUpdateVisible = false;
+      // console.log(11111);
+      // this.conditionSearchSubmit();
+    },
+    handleClick(val) {
+      console.log(val);
+      if (val.type === "delete") {
+        this.$confirm(`确定对[名称=${val.data.failureTypeName}]进行删除操作?`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.$http.delete(this.urlOptions.deleteURL, { data: [val.data.id] }).then(({ data }) => {
+              if (data && data.code === 0) {
+                this.$message({
+                  message: "操作成功",
+                  type: "success",
+                  duration: 1500,
+                  onClose: () => {
+                    this.getDataList();
+                  },
+                });
+              } else {
+                this.$message.error(data.msg);
+              }
+            });
+          })
+          .catch(() => { });
+      } else if (val.type === 'edit') {
+        this.addOrUpdateVisible = true
+        this.addOrEditTitle = this.$t('edit')
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init(val.data.id);
+        });
+      }
+    },
+    buttonClick(val) {
+      switch (val.btnName) {
+        case "search":
+          // this.listQuery.paramCode = val.paramCode;
+          this.listQuery.page = 1;
+          this.listQuery.title = val.title ? val.title : ''
+          this.listQuery.failureTypeStatus = null
+          this.getDataList();
+          break;
+        case "add":
+          this.addOrEditTitle = this.$t('add')
+          this.addOrUpdateVisible = true;
+          this.addOrUpdateHandle()
+          break;
+        default:
+          console.log(val)
+      }
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/finishproduct/CDiagram.vue b/src/views/modules/finishproduct/CDiagram.vue
new file mode 100644
index 0000000..657d838
--- /dev/null
+++ b/src/views/modules/finishproduct/CDiagram.vue
@@ -0,0 +1,311 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-01-11 09:24:58
+ * @LastEditTime: 2023-06-20 15:49:24
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__user">
+      <el-form :inline="true" :model="dataForm" class="demo-form-inline">
+        <el-form-item :label="$t('code.inspectionTime')" prop="timeSlot">
+          <el-date-picker v-model="dataForm.timeSlot" size="small" type="datetimerange" format='yyyy-MM-dd HH:mm:ss'
+            @change="getFactory" valueFormat='yyyy-MM-ddTHH:mm:ss' :start-placeholder="$t('gage.startTime')"
+            :end-placeholder="$t('gage.endTime')" :range-separator="$t('gage.to')" clearable />
+        </el-form-item>
+        <el-form-item :label="$t('code.factoryName')">
+          <el-select v-model="dataForm.factoryId" :placeholder="$t('code.factoryName')" @change="getInspectionType">
+            <el-option v-for="item in factoryList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('code.productName')">
+          <el-select v-model="dataForm.productId" :placeholder="$t('code.productName')" @change="gerCharacteristics">
+            <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('code.inspectionType')">
+          <el-input v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('code.characteristics')">
+          <el-select v-model="dataForm.characteristicsId" :placeholder="$t('code.characteristics')">
+            <el-option v-for="item in characteristicsList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('code.grouping')">
+          <el-radio v-model="dataForm.divideIntoGroup" label="0">批号</el-radio>
+          <el-radio v-model="dataForm.divideIntoGroup" label="1">年</el-radio>
+          <el-radio v-model="dataForm.divideIntoGroup" label="2">月</el-radio>
+          <el-radio v-model="dataForm.divideIntoGroup" label="3">日</el-radio>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getData">查询</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div id="priceMain" :style="{ width: '100%', height: '500px' }" />
+  </el-card>
+</template>
+
+<script>
+// import available from "./components/gageAvailable.vue"
+import i18n from "@/i18n"
+import * as echarts from 'echarts';
+export default {
+  data() {
+    return {
+      myChart: null,
+      urlOptions: {
+        getDataListURL: "/code/productRegistration/c/diagram",
+        getFactoryURL: '/code/productRegistration/query/factory',
+        getProductURL: '/code/productRegistration/query/product',
+        getInspectionTypeURL: '/code/productRegistration/query/inspection/type',
+        getPurchaseRegistrationTypeURL: '/code/productRegistration/query/checkout/project',
+      },
+      factoryList: [],
+      productList: [],
+      characteristicsList: [],
+      listQuery: {
+        characteristicsId: null,
+        factoryId: null,
+        inspectionType: null,
+        productId: null,
+        sampleSize: null,
+        endTime: null,
+        startTime: null,
+        divideIntoGroup:null
+      },
+      dataForm: {
+        productId: null,
+        timeSlot: [],
+        factoryId: null,
+        characteristicsId: null,
+        inspectionType: null,
+        sampleSize: null,
+        divideIntoGroup: null,
+        endTime: null,
+        startTime: null,
+      },
+      selectOptions: [{
+        id: 0,
+        name: '监控'
+      },
+      {
+        id: 1,
+        name: '电芯来料检验'
+      },
+      {
+        id: 2,
+        lname: 'IQC抽检'
+      },
+      {
+        id: 3,
+        name: 'IQC抽检2'
+      },
+      {
+        id: 4,
+        name: '原料抽检'
+      },
+      {
+        id: 5,
+        name: '进货外观检验'
+      },
+      {
+        id: 6,
+        name: '库内原料检验'
+      },
+      {
+        id: 7,
+        name: '来料检验'
+      },
+      {
+        id: 8,
+        name: '胶片'
+      },
+      {
+        id: 9,
+        name: '抽检'
+      },
+      {
+        id: 10,
+        name: '巡检'
+      }, {
+        id: 11,
+        name: '首检'
+      },
+      {
+        id: 12,
+        name: '末检'
+      },
+      {
+        id: 13,
+        name: '实时监测'
+      },
+      {
+        id: 14,
+        name: 'FQC抽检'
+      },
+      {
+        id: 15,
+        name: 'OQC抽检'
+      },
+      ],
+    };
+  },
+  // components: {
+  //   AddOrUpdate,
+  // },
+  mounted() {
+    this.getData()
+    // this.getDict()
+  },
+  methods: {
+    selectChanged(val) {
+      console.log(val)
+      alert(JSON.stringify(val))
+    },
+    getFactory(val) {
+      console.log(val)
+      this.$http.get(this.urlOptions.getFactoryURL, {
+        params: {
+          startTime: val[0],
+          endTime: val[1]
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.factoryList = res.data.map((item) => {
+              return {
+                id: item.factoryId,
+                name: item.factoryName
+              }
+            })
+          }
+        })
+      this.$http.get(this.urlOptions.getProductURL, {
+        params: {
+          startTime: val[0],
+          endTime: val[1]
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.productList = res.data.map((item) => {
+              return {
+                id: item.productId,
+                name: item.productName
+              }
+            })
+          }
+        })
+    },
+    getInspectionType(val) {
+      this.$http.get(this.urlOptions.getInspectionTypeURL, {
+        params: {
+          startTime: this.dataForm.timeSlot[0],
+          endTime: this.dataForm.timeSlot[1],
+          factoryId: val
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.dataForm.inspectionType = res.data.inspectionType
+          }
+        })
+    },
+    gerCharacteristics(val) {
+      this.$http.get(this.urlOptions.getPurchaseRegistrationTypeURL, {
+        params: {
+          productId: val
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.characteristicsList[0].id = res.data.id
+            this.characteristicsList[0].name = res.data.parameterName
+
+          }
+        })
+    },
+    getData() {
+      this.dataForm.startTime = this.dataForm.timeSlot ? this.dataForm.timeSlot[0] : null
+      this.dataForm.endTime = this.dataForm.timeSlot ? this.dataForm.timeSlot[1] : null
+      this.$http
+        .post(this.urlOptions.getDataListURL, {
+          params: this.dataForm
+        }
+        )
+        .then(({ data: res }) => {
+          let defectNumberArr = []
+          let xAxisData = []
+          res.data.forEach((item) => {
+            defectNumberArr.push(item.defectNumber)
+            this.dataForm.divideIntoGroup === 0 ? xAxisData.push(item.batchNo) : this.dataForm.divideIntoGroup === 1 ? xAxisData.push(item.year) : this.dataForm.divideIntoGroup === 2 ? xAxisData.push(item.month) : this.dataForm.divideIntoGroup === 3 ? xAxisData.push(item.day) : ''
+          })
+          var chartDom = document.getElementById('priceMain');
+          var myChart = echarts.init(chartDom)
+          this.myChart = myChart
+          var option;
+          // myChart.on('click', function (params) {
+          //   console.log(params);
+          // });
+          myChart.on('click', 'xAxis.category', function (params) {
+            console.log(params);
+          });
+          option = {
+            title: {
+              text: 'C图'
+            },
+            tooltip: {
+              trigger: 'axis'
+            },
+            // legend: {
+            //   data: ['推移图']
+            // },
+            grid: {
+              left: '3%',
+              right: '4%',
+              bottom: '3%',
+              containLabel: true
+            },
+            xAxis: {
+              data: xAxisData,
+              type: 'category',
+              axisLabel: {
+                clickable: true
+              },
+              silent: false,
+              triggerEvent: true
+            },
+            yAxis: {
+              type: 'value'
+            },
+            series: [
+              {
+                name: '	缺陷数',
+                type: 'line',
+                stack: 'Total',
+                data: defectNumberArr
+              }
+            ]
+          };
+          option && myChart.setOption(option);
+        })
+    },
+    buttonClick(val) {
+      console.log(val)
+      switch (val.btnName) {
+        case "search":
+          this.getData()
+          break;
+
+        default:
+          console.log(val)
+      }
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/finishproduct/NPDiagram.vue b/src/views/modules/finishproduct/NPDiagram.vue
new file mode 100644
index 0000000..c4c6dc4
--- /dev/null
+++ b/src/views/modules/finishproduct/NPDiagram.vue
@@ -0,0 +1,317 @@
+
+<!--
+ * @Author: zhp
+ * @Date: 2023-01-11 09:24:58
+ * @LastEditTime: 2023-06-20 15:49:35
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__user">
+      <el-form :inline="true" :model="dataForm" class="demo-form-inline">
+        <el-form-item :label="$t('code.inspectionTime')" prop="timeSlot">
+          <el-date-picker v-model="dataForm.timeSlot" size="small" type="datetimerange" format='yyyy-MM-dd HH:mm:ss'
+            @change="getFactory" valueFormat='yyyy-MM-ddTHH:mm:ss' :start-placeholder="$t('gage.startTime')"
+            :end-placeholder="$t('gage.endTime')" :range-separator="$t('gage.to')" clearable />
+        </el-form-item>
+        <el-form-item :label="$t('code.factoryName')">
+          <el-select v-model="dataForm.factoryId" :placeholder="$t('code.factoryName')" @change="getInspectionType">
+            <el-option v-for="item in factoryList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('code.productName')">
+          <el-select v-model="dataForm.productId" :placeholder="$t('code.productName')" @change="gerCharacteristics">
+            <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <!-- <el-form-item :label="$t('code.inspectionType')">
+          <el-select v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')">
+            <el-option v-for="item in inspectionTypeList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item> -->
+        <el-form-item :label="$t('code.inspectionType')">
+          <el-input v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('code.characteristics')">
+          <el-select v-model="dataForm.characteristicsId" :placeholder="$t('code.characteristics')">
+            <el-option v-for="item in characteristicsList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('code.grouping')">
+          <el-radio v-model="dataForm.divideIntoGroup" label="0">批号</el-radio>
+          <el-radio v-model="dataForm.divideIntoGroup" label="1">年</el-radio>
+          <el-radio v-model="dataForm.divideIntoGroup" label="2">月</el-radio>
+          <el-radio v-model="dataForm.divideIntoGroup" label="3">日</el-radio>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getData">查询</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div id="priceMain" :style="{ width: '100%', height: '500px' }" />
+  </el-card>
+</template>
+
+<script>
+// import available from "./components/gageAvailable.vue"
+import i18n from "@/i18n"
+import * as echarts from 'echarts';
+export default {
+  data() {
+    return {
+      myChart: null,
+      urlOptions: {
+        getDataListURL: "/code/productRegistration/np/diagram",
+        getFactoryURL: '/code/productRegistration/query/factory',
+        getProductURL: '/code/productRegistration/query/product',
+        getInspectionTypeURL: '/code/productRegistration/query/inspection/type',
+        getPurchaseRegistrationTypeURL: '/code/productRegistration/query/checkout/project',
+      },
+      factoryList: [],
+      productList: [],
+      characteristicsList: [],
+      listQuery: {
+        characteristicsId: null,
+        factoryId: null,
+        inspectionType: null,
+        productId: null,
+        sampleSize: null,
+        endTime: null,
+        startTime: null,
+        divideIntoGroup:null
+      },
+      dataForm: {
+        productId: null,
+        timeSlot: [],
+        factoryId: null,
+        characteristicsId: null,
+        inspectionType: null,
+        sampleSize: null,
+        divideIntoGroup: null,
+        endTime: null,
+        startTime: null,
+      },
+      selectOptions: [{
+        id: 0,
+        name: '监控'
+      },
+      {
+        id: 1,
+        name: '电芯来料检验'
+      },
+      {
+        id: 2,
+        lname: 'IQC抽检'
+      },
+      {
+        id: 3,
+        name: 'IQC抽检2'
+      },
+      {
+        id: 4,
+        name: '原料抽检'
+      },
+      {
+        id: 5,
+        name: '进货外观检验'
+      },
+      {
+        id: 6,
+        name: '库内原料检验'
+      },
+      {
+        id: 7,
+        name: '来料检验'
+      },
+      {
+        id: 8,
+        name: '胶片'
+      },
+      {
+        id: 9,
+        name: '抽检'
+      },
+      {
+        id: 10,
+        name: '巡检'
+      }, {
+        id: 11,
+        name: '首检'
+      },
+      {
+        id: 12,
+        name: '末检'
+      },
+      {
+        id: 13,
+        name: '实时监测'
+      },
+      {
+        id: 14,
+        name: 'FQC抽检'
+      },
+      {
+        id: 15,
+        name: 'OQC抽检'
+      },
+      ],
+    };
+  },
+  // components: {
+  //   AddOrUpdate,
+  // },
+  mounted() {
+    this.getData()
+    // this.getDict()
+  },
+  methods: {
+    selectChanged(val) {
+      console.log(val)
+      alert(JSON.stringify(val))
+    },
+    getFactory(val) {
+      console.log(val)
+      this.$http.get(this.urlOptions.getFactoryURL, {
+        params: {
+          startTime: val[0],
+          endTime: val[1]
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.factoryList = res.data.map((item) => {
+              return {
+                id: item.factoryId,
+                name: item.factoryName
+              }
+            })
+          }
+        })
+      this.$http.get(this.urlOptions.getProductURL, {
+        params: {
+          startTime: val[0],
+          endTime: val[1]
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.productList = res.data.map((item) => {
+              return {
+                id: item.productId,
+                name: item.productName
+              }
+            })
+          }
+        })
+    },
+    getInspectionType(val) {
+      this.$http.get(this.urlOptions.getInspectionTypeURL, {
+        params: {
+          startTime: this.dataForm.timeSlot[0],
+          endTime: this.dataForm.timeSlot[1],
+          factoryId: val
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.dataForm.inspectionType = res.data.inspectionType
+          }
+        })
+    },
+    gerCharacteristics(val) {
+      this.$http.get(this.urlOptions.getPurchaseRegistrationTypeURL, {
+        params: {
+          productId: val
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.characteristicsList[0].id = res.data.id
+            this.characteristicsList[0].name = res.data.parameterName
+
+          }
+        })
+    },
+    getData() {
+      this.dataForm.startTime = this.dataForm.timeSlot ? this.dataForm.timeSlot[0] : null
+      this.dataForm.endTime = this.dataForm.timeSlot ? this.dataForm.timeSlot[1] : null
+      this.$http
+        .post(this.urlOptions.getDataListURL, {
+          params: this.dataForm
+        }
+        )
+        .then(({ data: res }) => {
+          let xAxisData = []
+          res.data.forEach((item) => {
+            this.dataForm.divideIntoGroup === 0 ? xAxisData.push(item.batchNo) : this.dataForm.divideIntoGroup === 1 ? xAxisData.push(item.year) : this.dataForm.divideIntoGroup === 2 ? xAxisData.push(item.month) : this.dataForm.divideIntoGroup === 3 ? xAxisData.push(item.day) : ''
+          })
+          var chartDom = document.getElementById('priceMain');
+          var myChart = echarts.init(chartDom)
+          this.myChart = myChart
+          var option;
+          // myChart.on('click', function (params) {
+          //   console.log(params);
+          // });
+          myChart.on('click', 'xAxis.category', function (params) {
+            console.log(params);
+          });
+          option = {
+            title: {
+              text: 'C图'
+            },
+            tooltip: {
+              trigger: 'axis'
+            },
+            // legend: {
+            //   data: ['推移图']
+            // },
+            grid: {
+              left: '3%',
+              right: '4%',
+              bottom: '3%',
+              containLabel: true
+            },
+            xAxis: {
+              data: xAxisData,
+              type: 'category',
+              axisLabel: {
+                clickable: true
+              },
+              silent: false,
+              triggerEvent: true
+            },
+            yAxis: {
+              type: 'value',
+              data: dpuData
+            },
+            series: [
+              {
+                name: '缺陷数量',
+                type: 'line',
+                stack: 'Total',
+                data: res.data.map(i => { return i.defectNumber })
+              }
+            ]
+          };
+          option && myChart.setOption(option);
+        })
+    },
+    buttonClick(val) {
+      console.log(val)
+      switch (val.btnName) {
+        case "search":
+          this.getData()
+          break;
+
+        default:
+          console.log(val)
+      }
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/finishproduct/UDiagram.vue b/src/views/modules/finishproduct/UDiagram.vue
new file mode 100644
index 0000000..0dd6ed0
--- /dev/null
+++ b/src/views/modules/finishproduct/UDiagram.vue
@@ -0,0 +1,328 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-01-11 09:24:58
+ * @LastEditTime: 2023-06-20 15:51:30
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__user">
+      <el-form :inline="true" :model="dataForm" class="demo-form-inline">
+        <el-form-item :label="$t('code.inspectionTime')" prop="timeSlot">
+          <el-date-picker v-model="dataForm.timeSlot" size="small" type="datetimerange" format='yyyy-MM-dd HH:mm:ss'
+            @change="getFactory" valueFormat='yyyy-MM-ddTHH:mm:ss' :start-placeholder="$t('gage.startTime')"
+            :end-placeholder="$t('gage.endTime')" :range-separator="$t('gage.to')" clearable />
+        </el-form-item>
+        <el-form-item :label="$t('code.factoryName')">
+          <el-select v-model="dataForm.factoryId" :placeholder="$t('code.factoryName')" @change="getInspectionType">
+            <el-option v-for="item in factoryList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('code.productName')">
+          <el-select v-model="dataForm.productId" :placeholder="$t('code.productName')" @change="gerCharacteristics">
+            <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <!-- <el-form-item :label="$t('code.inspectionType')">
+          <el-select v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')">
+            <el-option v-for="item in inspectionTypeList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item> -->
+        <el-form-item :label="$t('code.inspectionType')">
+          <el-input v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('code.characteristics')">
+          <el-select v-model="dataForm.characteristicsId" :placeholder="$t('code.characteristics')">
+            <el-option v-for="item in characteristicsList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('code.grouping')">
+          <el-radio v-model="dataForm.divideIntoGroup" label="0">批号</el-radio>
+          <el-radio v-model="dataForm.divideIntoGroup" label="1">年</el-radio>
+          <el-radio v-model="dataForm.divideIntoGroup" label="2">月</el-radio>
+          <el-radio v-model="dataForm.divideIntoGroup" label="3">日</el-radio>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getData">查询</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div id="priceMain" :style="{ width: '100%', height: '500px' }" />
+  </el-card>
+</template>
+
+<script>
+// import available from "./components/gageAvailable.vue"
+import i18n from "@/i18n"
+import * as echarts from 'echarts';
+export default {
+  data() {
+    return {
+      myChart: null,
+      urlOptions: {
+        getDataListURL: "/code/productRegistration/u/diagram",
+        getFactoryURL: '/code/productRegistration/query/factory',
+        getProductURL: '/code/productRegistration/query/product',
+        getInspectionTypeURL: '/code/productRegistration/query/inspection/type',
+        getPurchaseRegistrationTypeURL: '/code/productRegistration/query/checkout/project',
+      },
+      factoryList: [],
+      productList: [],
+      characteristicsList: [],
+      listQuery: {
+        characteristicsId: null,
+        factoryId: null,
+        inspectionType: null,
+        productId: null,
+        sampleSize: null,
+        endTime: null,
+        startTime: null,
+        divideIntoGroup:null
+      },
+      dataForm: {
+        productId: null,
+        timeSlot: [],
+        factoryId: null,
+        characteristicsId: null,
+        inspectionType: null,
+        sampleSize: null,
+        divideIntoGroup: null,
+        endTime: null,
+        startTime: null,
+      },
+      selectOptions: [{
+        id: 0,
+        name: '监控'
+      },
+      {
+        id: 1,
+        name: '电芯来料检验'
+      },
+      {
+        id: 2,
+        lname: 'IQC抽检'
+      },
+      {
+        id: 3,
+        name: 'IQC抽检2'
+      },
+      {
+        id: 4,
+        name: '原料抽检'
+      },
+      {
+        id: 5,
+        name: '进货外观检验'
+      },
+      {
+        id: 6,
+        name: '库内原料检验'
+      },
+      {
+        id: 7,
+        name: '来料检验'
+      },
+      {
+        id: 8,
+        name: '胶片'
+      },
+      {
+        id: 9,
+        name: '抽检'
+      },
+      {
+        id: 10,
+        name: '巡检'
+      }, {
+        id: 11,
+        name: '首检'
+      },
+      {
+        id: 12,
+        name: '末检'
+      },
+      {
+        id: 13,
+        name: '实时监测'
+      },
+      {
+        id: 14,
+        name: 'FQC抽检'
+      },
+      {
+        id: 15,
+        name: 'OQC抽检'
+      },
+      ],
+    };
+  },
+  // components: {
+  //   AddOrUpdate,
+  // },
+  mounted() {
+    this.getData()
+    // this.getDict()
+  },
+  methods: {
+    selectChanged(val) {
+      console.log(val)
+      alert(JSON.stringify(val))
+    },
+    getFactory(val) {
+      console.log(val)
+      this.$http.get(this.urlOptions.getFactoryURL, {
+        params: {
+          startTime: val[0],
+          endTime: val[1]
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.factoryList = res.data.map((item) => {
+              return {
+                id: item.factoryId,
+                name: item.factoryName
+              }
+            })
+          }
+        })
+      this.$http.get(this.urlOptions.getProductURL, {
+        params: {
+          startTime: val[0],
+          endTime: val[1]
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.productList = res.data.map((item) => {
+              return {
+                id: item.productId,
+                name: item.productName
+              }
+            })
+          }
+        })
+    },
+    getInspectionType(val) {
+      this.$http.get(this.urlOptions.getInspectionTypeURL, {
+        params: {
+          startTime: this.dataForm.timeSlot[0],
+          endTime: this.dataForm.timeSlot[1],
+          factoryId: val
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.dataForm.inspectionType = res.data.inspectionType
+          }
+        })
+    },
+    gerCharacteristics(val) {
+      this.$http.get(this.urlOptions.getPurchaseRegistrationTypeURL, {
+        params: {
+          productId: val
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.characteristicsList[0].id = res.data.id
+            this.characteristicsList[0].name = res.data.parameterName
+
+          }
+        })
+    },
+    getData() {
+      this.dataForm.startTime = this.dataForm.timeSlot ? this.dataForm.timeSlot[0] : null
+      this.dataForm.endTime = this.dataForm.timeSlot ? this.dataForm.timeSlot[1] : null
+      this.$http
+        .post(this.urlOptions.getDataListURL, {
+          params: this.dataForm
+        }
+        )
+        .then(({ data: res }) => {
+          let xAxisData = []
+          res.data.forEach((item) => {
+            this.dataForm.divideIntoGroup === 0 ? xAxisData.push(item.batchNo) : this.dataForm.divideIntoGroup === 1 ? xAxisData.push(item.year) : this.dataForm.divideIntoGroup === 2 ? xAxisData.push(item.month) : this.dataForm.divideIntoGroup === 3 ? xAxisData.push(item.day) : ''
+          })
+          var chartDom = document.getElementById('priceMain');
+          var myChart = echarts.init(chartDom)
+          this.myChart = myChart
+          var option;
+          // myChart.on('click', function (params) {
+          //   console.log(params);
+          // });
+          myChart.on('click', 'xAxis.category', function (params) {
+            console.log(params);
+          });
+          option = {
+            title: {
+              text: 'C图'
+            },
+            tooltip: {
+              trigger: 'axis'
+            },
+            // legend: {
+            //   data: ['推移图']
+            // },
+            grid: {
+              left: '3%',
+              right: '4%',
+              bottom: '3%',
+              containLabel: true
+            },
+            xAxis: {
+              data: xAxisData,
+              type: 'category',
+              axisLabel: {
+                clickable: true
+              },
+              silent: false,
+              triggerEvent: true
+            },
+            yAxis: {
+              type: 'value',
+              data: res.data.map(i => { return i.dpu })
+            },
+            series: [
+              {
+                name: '	单位缺陷',
+                type: 'line',
+                stack: 'Total',
+                data: res.data.map(i => { return i.dpu })
+              },
+              {
+                name: '	UCL',
+                type: 'line',
+                stack: 'Total',
+                data: res.data.map(i => { return i.ucl })
+              },
+                {
+                name: 'LCL',
+                type: 'line',
+                stack: 'Total',
+                  data: res.data.map(i => { return i.lcl })
+              }
+            ]
+          };
+          option && myChart.setOption(option);
+        })
+    },
+    buttonClick(val) {
+      console.log(val)
+      switch (val.btnName) {
+        case "search":
+          this.getData()
+          break;
+
+        default:
+          console.log(val)
+      }
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/finishproduct/boxplot.vue b/src/views/modules/finishproduct/boxplot.vue
new file mode 100644
index 0000000..843852c
--- /dev/null
+++ b/src/views/modules/finishproduct/boxplot.vue
@@ -0,0 +1,370 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-01-11 09:24:58
+ * @LastEditTime: 2023-06-20 15:49:08
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__user">
+      <el-form :inline="true" :model="dataForm" class="demo-form-inline">
+        <el-form-item :label="$t('code.inspectionTime')" prop="timeSlot">
+          <el-date-picker v-model="dataForm.timeSlot" size="small" type="datetimerange" format='yyyy-MM-dd HH:mm:ss'
+            @change="getFactory" valueFormat='yyyy-MM-ddTHH:mm:ss' :start-placeholder="$t('gage.startTime')"
+            :end-placeholder="$t('gage.endTime')" :range-separator="$t('gage.to')" clearable />
+        </el-form-item>
+        <el-form-item :label="$t('code.factoryName')">
+          <el-select v-model="dataForm.factoryId" :placeholder="$t('code.factoryName')" @change="getInspectionType">
+            <el-option v-for="item in factoryList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('code.productName')">
+          <el-select v-model="dataForm.productId" :placeholder="$t('code.productName')" @change="gerCharacteristics">
+            <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <!-- <el-form-item :label="$t('code.inspectionType')">
+          <el-select v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')">
+            <el-option v-for="item in inspectionTypeList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item> -->
+        <el-form-item :label="$t('code.inspectionType')">
+          <el-input v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('code.characteristics')">
+          <el-input v-model="dataForm.characteristicsId" :placeholder="$t('code.characteristics')"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('code.sampleSize')">
+          <el-input v-model="dataForm.sampleSize" :placeholder="$t('code.sampleSize')"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getData">查询</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div id="priceMain" :style="{ width: '100%', height: '500px' }" />
+  </el-card>
+</template>
+
+<script>
+// import available from "./components/gageAvailable.vue"
+import i18n from "@/i18n"
+import * as echarts from 'echarts';
+export default {
+  data() {
+    return {
+      myChart: null,
+      urlOptions: {
+        getDataListURL: "/code/purchaseRegistration/box/diagram",
+        getFactoryURL: '/code/purchaseRegistration/query/factory',
+        getProductURL: '/code/purchaseRegistration/query/product',
+        getInspectionTypeURL: '/code/purchaseRegistration/query/inspection/type',
+        getPurchaseRegistrationTypeURL: '/code/purchaseRegistration/query/checkout/project',
+      },
+      factoryList: [],
+      productList:[],
+      listQuery: {
+        characteristicsId:null,
+        factoryId: null,
+        inspectionType: null,
+        productId: null,
+        sampleSize: null,
+        endTime: null,
+        startTime: null,
+      },
+      dataForm: {
+        productId: null,
+        timeSlot: [],
+        factoryId: null,
+        characteristicsId: null,
+        inspectionType: null,
+        sampleSize:null
+      },
+      selectOptions: [{
+            id: 0,
+            name: '监控'
+          },
+            {
+              id: 1,
+              name: '电芯来料检验'
+            },
+            {
+              id: 2,
+              lname: 'IQC抽检'
+            },
+            {
+              id: 3,
+              name: 'IQC抽检2'
+            },
+            {
+              id: 4,
+              name: '原料抽检'
+            },
+            {
+              id: 5,
+              name: '进货外观检验'
+            },
+            {
+              id: 6,
+              name: '库内原料检验'
+            },
+            {
+              id: 7,
+              name: '来料检验'
+            },
+            {
+              id: 8,
+              name: '胶片'
+            },
+            {
+              id: 9,
+              name: '抽检'
+            },
+            {
+              id: 10,
+              name: '巡检'
+            }, {
+              id: 11,
+              name: '首检'
+            },
+            {
+              id: 12,
+              name: '末检'
+            },
+            {
+              id: 13,
+              name: '实时监测'
+            },
+            {
+              id: 14,
+              name: 'FQC抽检'
+            },
+            {
+              id: 15,
+              name: 'OQC抽检'
+            },
+          ],
+    };
+  },
+  // components: {
+  //   AddOrUpdate,
+  // },
+  mounted() {
+    this.getData()
+    // this.getDict()
+  },
+  methods: {
+    selectChanged(val) {
+      console.log(val)
+      alert(JSON.stringify(val))
+    },
+    getFactory(val) {
+      console.log(val)
+      this.$http.get(this.urlOptions.getFactoryURL, {
+        params: {
+          startTime: val[0],
+          endTime: val[1]
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.factoryList = res.data.map((item) => {
+              return {
+                id: item.factoryId,
+                name: item.factoryName
+              }
+            })
+          }
+        })
+      this.$http.get(this.urlOptions.getProductURL, {
+        params: {
+          startTime: val[0],
+          endTime: val[1]
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.productList = res.data.map((item) => {
+              return {
+                id: item.productId,
+                name: item.productName
+              }
+            })
+          }
+        })
+    },
+    getInspectionType(val) {
+      this.$http.get(this.urlOptions.getInspectionTypeURL, {
+        params: {
+          startTime: this.dataForm.timeSlot[0],
+          endTime: this.dataForm.timeSlot[1],
+          factoryId: val
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.dataForm.inspectionType = res.data.inspectionType
+          }
+        })
+    },
+    gerCharacteristics(val) {
+      this.$http.get(this.urlOptions.getPurchaseRegistrationTypeURL, {
+        params: {
+          productId:val
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.dataForm.characteristicsId = res.data.parameterName
+          }
+        })
+    },
+    getData() {
+      this.$http
+        .post(this.urlOptions.getDataListURL, {
+          params: this.listQuery
+        }
+        )
+        .then(({ data: res }) => {
+          console.log(res)
+          let xAxisData = []
+          var chartDom = document.getElementById('priceMain');
+          var myChart = echarts.init(chartDom)
+          this.myChart = myChart
+          var option;
+          // myChart.on('click', function (params) {
+          //   console.log(params);
+          // });
+          myChart.on('click', 'xAxis.category', function (params) {
+            console.log(params);
+          });
+          option = {
+            title: {
+              text:'箱线图'
+            },
+            tooltip: {
+              trigger: 'axis'
+            },
+            // legend: {
+            //   data: ['推移图']
+            // },
+            // tooltip: {
+            //   trigger: 'item', // axis显示该列下所有坐标轴对应数据，item只显示该点数据
+            //   axisPointer: { // 坐标轴指示器，坐标轴触发有效
+            //     type: 'line' // 默认为直线，可选为：'line' | 'shadow'
+            //   },
+            //   formatter: function (params) {
+            //     var res = `
+            //       <div>
+            //         <div
+            //           style='display: inline-block;
+            //           width:  10px;
+            //           height: 20px;
+            //           color: ${params.color}'
+            //           >●</div>
+            //         <span>${'min:' + res.data.min}</span>
+            //       </div>
+            //       <div>
+            //         <div
+            //           style='display: inline-block;
+            //           width: 10px;
+            //           height: 20px;
+            //           color: ${params.color}'
+            //         >●</div>
+            //         <span>${'Q1:' + res.data.Q1}</span>
+            //       </div>
+            //       <div>
+            //         <div
+            //           style='display: inline-block;
+            //           width: 10px;
+            //           height: 20px;
+            //           color: ${params.color}'
+            //         >●</div>
+            //         <span>${'median:' + res.data.median}</span>
+            //       </div>
+            //       <div>
+            //         <div
+            //           style='display: inline-block;
+            //           width: 10px;
+            //           height: 20px;
+            //           color: ${params.color}'
+            //         >●</div>
+            //         <span>${'Q3:' + res.data.Q3}</span>
+            //       </div>
+            //       <div>
+            //         <div
+            //           style='display: inline-block;
+            //           width: 10px;
+            //           height: 20px;
+            //           color: ${params.color}'
+            //         >●</div>
+            //         <span>${'max:' + res.data.max}</span>
+            //       </div>
+            //           <div>
+            //         <div
+            //           style='display: inline-block;
+            //           width: 10px;
+            //           height: 20px;
+            //           color: ${params.color}'
+            //         >●</div>
+            //         <span>${'outlier:' + res.data.outlier}</span>
+            //       </div>
+            //     `
+            //     return params.name + res
+            //   }
+            // },
+            grid: {
+              left: '3%',
+              right: '4%',
+              bottom: '3%',
+              containLabel: true
+            },
+            xAxis: {
+              data: [this.dataForm.characteristicsId ],
+              type: 'category',
+              axisLabel: {
+                clickable: true
+              },
+              silent: false,
+              triggerEvent: true
+            },
+            yAxis: {
+              type: 'value'
+            },
+            series: [
+              {
+                name: '最大值',
+                type: 'line',
+                stack: 'Total',
+                data: [res.data.max]
+              },
+            ]
+          };
+          option && myChart.setOption(option);
+        })
+    },
+    buttonClick(val) {
+      console.log(val)
+      switch (val.btnName) {
+        case "search":
+          this.dataForm.sampleSize = val.sampleSize ? val.sampleSize : null
+          this.dataForm.inspectionType = val.inspectionType ? val.inspectionType : null
+          this.dataForm.characteristicsId = val.characteristicsId ? val.characteristicsId : null
+          this.dataForm.factoryId = val.factoryId ? val.factoryId : null
+          this.dataForm.productId = val.productId ? val.productId : null
+          this.dataForm.startTime = val.timeSlot ? val.timeSlot[0] : null
+          this.dataForm.endTime = val.timeSlot ? val.timeSlot[1] : null
+          this.getData()
+          break;
+
+        default:
+          console.log(val)
+      }
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/finishproduct/components/meanMovingRangeRange.vue b/src/views/modules/finishproduct/components/meanMovingRangeRange.vue
new file mode 100644
index 0000000..27c7061
--- /dev/null
+++ b/src/views/modules/finishproduct/components/meanMovingRangeRange.vue
@@ -0,0 +1,254 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-06-19 09:19:53
+ * @LastEditTime: 2023-06-20 10:54:49
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <el-row :gutter="24">
+      <el-col :span="18">
+        <div id="priceMain" :style="{ width: '100%', height: '500px' }" />
+      </el-col>
+      <el-col :span="6">
+        <el-table style="width: 100%" :data="getValues" :show-header="false">
+          <el-table-column width="180" v-for="(item, index) in getHeaders" :key="index" :prop="item">
+          </el-table-column>
+        </el-table>
+      </el-col>
+    </el-row>
+  </el-card>
+</template>
+
+<script>
+// import available from "./components/gageAvailable.vue"
+import i18n from "@/i18n"
+import * as echarts from 'echarts';
+export default {
+  data() {
+    return {
+      myChart: null,
+      urlOptions: {
+        getDataListURL: "/code/productRegistration/mean/range/chart",
+      },
+      tableData: [],
+      headers: [
+        {
+          prop: 'usl',
+          label: 'USL',
+        },
+        {
+          prop: 'sl',
+          label: 'SL',
+        },
+        {
+          prop: 'lsl',
+          label: 'LSL',
+        },
+        {
+          prop: 'rangeUcl',
+          label: 'CL(图一)',
+        },
+        {
+          prop: 'averageUcl',
+          label: 'UCL(图一)',
+        },
+        {
+          prop: 'rangeLcl',
+          label: 'LCL(图一)',
+        },
+        {
+          prop: 'standardDeviationCl',
+          label: 'CL(图二)',
+        },
+        {
+          prop: 'standardDeviationLcl',
+          label: 'LCL(图二)',
+        },
+        {
+          prop: 'standardDeviationUcl',
+          label: 'UCL(图二)',
+        },
+        {
+          prop: 'standardDeviationGroup',
+          label: '标准差',
+        },
+        {
+          prop: 'cpk',
+          label: 'cpk',
+        },
+        {
+          prop: 'standardDeviationWhole',
+          label: '总体标准差',
+        },
+        {
+          prop: 'ppk',
+          label: 'ppk',
+        },
+        {
+          prop: 'ca',
+          label: 'ca',
+        },
+        {
+          prop: 'cp',
+          label: 'cp',
+        },
+        {
+          prop: 'ca',
+          label: 'ca',
+        },
+        {
+          prop: 'average',
+          label: '均值',
+        },
+        {
+          prop: 'max',
+          label: '最大值',
+        },
+        {
+          prop: 'max',
+          label: '最大值',
+        },
+      ],
+      listQuery: {
+        characteristicsId: null,
+        factoryId: null,
+        inspectionType: null,
+        productId: null,
+        sampleSize: null,
+        endTime: null,
+        startTime: null,
+      },
+    };
+  },
+  computed: {
+    getHeaders() {
+      return this.tableData.reduce((pre, cur, index) => pre.concat(`value${index}`), ['title'])
+    },
+    getValues() {
+      return this.headers.map(item => {
+        return this.tableData.reduce((pre, cur, index) => Object.assign(pre, { ['value' + index]: cur[item.prop] }), { 'title': item.label, });
+      });
+    }
+  },
+  // components: {
+  //   AddOrUpdate,
+  // },
+  methods: {
+    getData(listQuery) {
+      this.$http
+        .post(this.urlOptions.getDataListURL, {
+          params: listQuery
+        }
+        )
+        .then(({ data: res }) => {
+          this.tableData.push({
+            average: res.data.average,
+            averageCl: res.data.averageCl,
+            averageLcl: res.data.averageLcl,
+            averageUcl: res.data.averageUcl,
+            ca: res.data.ca,
+            cp: res.data.cp,
+            cpk: res.data.cpk,
+            groupNum: res.data.groupNum,
+            lsl: res.data.lsl,
+            ppk: res.data.ppk,
+            rangeCl: res.data.rangeCl,
+            rangeLcl: res.data.rangeCl,
+            rangeUcl: res.data.rangeCl,
+            standardDeviationWhole: res.data.standardDeviationWhole,
+            usl: res.data.usl,
+            max: res.data.max,
+            min: res.data.min,
+          })
+          console.log(res)
+          var chartDom = document.getElementById('priceMain');
+          var myChart = echarts.init(chartDom)
+          this.myChart = myChart
+          var option;
+          // myChart.on('click', function (params) {
+          //   console.log(params);
+          // });
+          myChart.on('click', 'xAxis.category', function (params) {
+            console.log(params);
+          });
+          option = {
+            title: {
+              text: '均值极差图'
+            },
+            tooltip: {
+              trigger: 'axis'
+            },
+            // legend: {
+            //   data: ['推移图']
+            // },
+            grid: {
+              left: '3%',
+              right: '4%',
+              bottom: '3%',
+              containLabel: true
+            },
+            xAxis: {
+              data: [1, 2131, 312, 231321, 321312, 321321, 321312, 321321],
+              type: 'category',
+              axisLabel: {
+                clickable: true
+              },
+              silent: false,
+              triggerEvent: true
+            },
+            yAxis: {
+              type: 'value'
+            },
+            series: [
+              {
+                name: 'lsl',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.lsl]
+              },
+              {
+                name: 'UCL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.averageUcl]
+              },
+              {
+                name: 'UCL(图二)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.rangeUcl]
+              },
+              {
+                name: 'USL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.usl]
+              },
+              {
+                name: 'CL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.rangeCl]
+              },
+              {
+                name: 'LCL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.averageLcl]
+              },
+              {
+                name: 'SL',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.sl]
+              },
+            ]
+          };
+          option && myChart.setOption(option);
+        })
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/finishproduct/components/meanMovingRangeStandardDeviation.vue b/src/views/modules/finishproduct/components/meanMovingRangeStandardDeviation.vue
new file mode 100644
index 0000000..e651ab3
--- /dev/null
+++ b/src/views/modules/finishproduct/components/meanMovingRangeStandardDeviation.vue
@@ -0,0 +1,254 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-06-19 09:19:53
+ * @LastEditTime: 2023-06-20 10:54:52
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <el-row :gutter="24">
+      <el-col :span="18">
+        <div id="priceMain" :style="{ width: '100%', height: '500px' }" />
+      </el-col>
+      <el-col :span="6">
+        <el-table style="width: 100%" :data="getValues" :show-header="false">
+          <el-table-column width="180" v-for="(item, index) in getHeaders" :key="index" :prop="item">
+          </el-table-column>
+        </el-table>
+      </el-col>
+    </el-row>
+  </el-card>
+</template>
+
+<script>
+// import available from "./components/gageAvailable.vue"
+import i18n from "@/i18n"
+import * as echarts from 'echarts';
+export default {
+  data() {
+    return {
+      myChart: null,
+      urlOptions: {
+        getDataListURL: "/code/productRegistration/mean/range/chart",
+      },
+      tableData: [],
+      headers: [
+        {
+          prop: 'usl',
+          label: 'USL',
+        },
+        {
+          prop: 'sl',
+          label: 'SL',
+        },
+        {
+          prop: 'lsl',
+          label: 'LSL',
+        },
+        {
+          prop: 'rangeUcl',
+          label: 'CL(图一)',
+        },
+        {
+          prop: 'averageUcl',
+          label: 'UCL(图一)',
+        },
+        {
+          prop: 'rangeLcl',
+          label: 'LCL(图一)',
+        },
+        {
+          prop: 'standardDeviationCl',
+          label: 'CL(图二)',
+        },
+        {
+          prop: 'standardDeviationLcl',
+          label: 'LCL(图二)',
+        },
+        {
+          prop: 'standardDeviationUcl',
+          label: 'UCL(图二)',
+        },
+        {
+          prop: 'standardDeviationGroup',
+          label: '标准差',
+        },
+        {
+          prop: 'cpk',
+          label: 'cpk',
+        },
+        {
+          prop: 'standardDeviationWhole',
+          label: '总体标准差',
+        },
+        {
+          prop: 'ppk',
+          label: 'ppk',
+        },
+        {
+          prop: 'ca',
+          label: 'ca',
+        },
+        {
+          prop: 'cp',
+          label: 'cp',
+        },
+        {
+          prop: 'ca',
+          label: 'ca',
+        },
+        {
+          prop: 'average',
+          label: '均值',
+        },
+        {
+          prop: 'max',
+          label: '最大值',
+        },
+        {
+          prop: 'max',
+          label: '最大值',
+        },
+      ],
+      listQuery: {
+        characteristicsId: null,
+        factoryId: null,
+        inspectionType: null,
+        productId: null,
+        sampleSize: null,
+        endTime: null,
+        startTime: null,
+      },
+    };
+  },
+  computed: {
+    getHeaders() {
+      return this.tableData.reduce((pre, cur, index) => pre.concat(`value${index}`), ['title'])
+    },
+    getValues() {
+      return this.headers.map(item => {
+        return this.tableData.reduce((pre, cur, index) => Object.assign(pre, { ['value' + index]: cur[item.prop] }), { 'title': item.label, });
+      });
+    }
+  },
+  // components: {
+  //   AddOrUpdate,
+  // },
+  methods: {
+    getData(listQuery) {
+      this.$http
+        .post(this.urlOptions.getDataListURL, {
+          params: listQuery
+        }
+        )
+        .then(({ data: res }) => {
+          this.tableData.push({
+            average: res.data.average,
+            averageCl: res.data.averageCl,
+            averageLcl: res.data.averageLcl,
+            averageUcl: res.data.averageUcl,
+            ca: res.data.ca,
+            cp: res.data.cp,
+            cpk: res.data.cpk,
+            groupNum: res.data.groupNum,
+            lsl: res.data.lsl,
+            ppk: res.data.ppk,
+            rangeCl: res.data.rangeCl,
+            rangeLcl: res.data.rangeCl,
+            rangeUcl: res.data.rangeCl,
+            standardDeviationWhole: res.data.standardDeviationWhole,
+            usl: res.data.usl,
+            max: res.data.max,
+            min: res.data.min,
+          })
+          console.log(res)
+          var chartDom = document.getElementById('priceMain');
+          var myChart = echarts.init(chartDom)
+          this.myChart = myChart
+          var option;
+          // myChart.on('click', function (params) {
+          //   console.log(params);
+          // });
+          myChart.on('click', 'xAxis.category', function (params) {
+            console.log(params);
+          });
+          option = {
+            title: {
+              text: '均值极差图'
+            },
+            tooltip: {
+              trigger: 'axis'
+            },
+            // legend: {
+            //   data: ['推移图']
+            // },
+            grid: {
+              left: '3%',
+              right: '4%',
+              bottom: '3%',
+              containLabel: true
+            },
+            xAxis: {
+              data: [1, 2131, 312, 231321, 321312, 321321, 321312, 321321],
+              type: 'category',
+              axisLabel: {
+                clickable: true
+              },
+              silent: false,
+              triggerEvent: true
+            },
+            yAxis: {
+              type: 'value'
+            },
+            series: [
+              {
+                name: 'lsl',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.lsl]
+              },
+              {
+                name: 'UCL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.averageUcl]
+              },
+              {
+                name: 'UCL(图二)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.rangeUcl]
+              },
+              {
+                name: 'USL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.usl]
+              },
+              {
+                name: 'CL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.rangeCl]
+              },
+              {
+                name: 'LCL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.averageLcl]
+              },
+              {
+                name: 'SL',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.sl]
+              },
+            ]
+          };
+          option && myChart.setOption(option);
+        })
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/finishproduct/components/meanRange.vue b/src/views/modules/finishproduct/components/meanRange.vue
new file mode 100644
index 0000000..f6f6271
--- /dev/null
+++ b/src/views/modules/finishproduct/components/meanRange.vue
@@ -0,0 +1,264 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-06-19 09:19:53
+ * @LastEditTime: 2023-06-20 14:14:18
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <el-row :gutter="24">
+      <el-col :span="18">
+        <div id="priceMain" :style="{ width: '100%', height: '500px' }" />
+      </el-col>
+      <el-col :span="6">
+        <el-table style="width: 100%" :data="getValues" :show-header="false">
+          <el-table-column width="180" v-for="(item, index) in getHeaders" :key="index" :prop="item">
+          </el-table-column>
+        </el-table>
+      </el-col>
+    </el-row>
+  </el-card>
+</template>
+
+<script>
+// import available from "./components/gageAvailable.vue"
+import i18n from "@/i18n"
+import * as echarts from 'echarts';
+export default {
+  data() {
+    return {
+      myChart: null,
+      urlOptions: {
+        getDataListURL: "/code/productRegistration/mean/range/chart",
+      },
+      tableData:[],
+      headers: [
+        {
+          prop: 'usl',
+          label: 'USL',
+        },
+        {
+          prop: 'sl',
+          label: 'SL',
+        },
+        {
+          prop: 'lsl',
+          label: 'LSL',
+        },
+        {
+          prop: 'averageUcl',
+          label: 'CL(图一)',
+        },
+        {
+          prop: 'averageUcl',
+          label: 'UCL(图一)',
+        },
+        {
+          prop: 'averageLcl',
+          label: 'LCL(图一)',
+        },
+        {
+          prop: 'rangeCl',
+          label: 'CL(图二)',
+        },
+        {
+          prop: 'rangeLcl',
+          label: 'LCL(图二)',
+        },
+        {
+          prop: 'rangeUcl',
+          label: 'UCL(图二)',
+        },
+        {
+          prop: 'standardDeviationGroup',
+          label: '标准差',
+        },
+        {
+          prop: 'cpk',
+          label: 'cpk',
+        },
+        {
+          prop: 'standardDeviationWhole',
+          label: '总体标准差',
+        },
+        {
+          prop: 'ppk',
+          label: 'ppk',
+        },
+        {
+          prop: 'ca',
+          label: 'ca',
+        },
+        {
+          prop: 'cp',
+          label: 'cp',
+        },
+        {
+          prop: 'ca',
+          label: 'ca',
+        },
+        {
+          prop: 'average',
+          label: '均值',
+        },
+        {
+          prop: 'max',
+          label: '最大值',
+        },
+        {
+          prop: 'max',
+          label: '最大值',
+        },
+      ],
+      listQuery: {
+        characteristicsId: null,
+        factoryId: null,
+        inspectionType: null,
+        productId: null,
+        sampleSize: null,
+        endTime: null,
+        startTime: null,
+      },
+    };
+  },
+  computed: {
+    getHeaders() {
+      return this.tableData.reduce((pre, cur, index) => pre.concat(`value${index}`), ['title'])
+    },
+    getValues() {
+      return this.headers.map(item => {
+        return this.tableData.reduce((pre, cur, index) => Object.assign(pre, { ['value' + index]: cur[item.prop] }), { 'title': item.label, });
+      });
+    }
+  },
+  // components: {
+  //   AddOrUpdate,
+  // },
+  methods: {
+    getData(listQuery) {
+      this.$http
+        .post(this.urlOptions.getDataListURL, {
+          params: listQuery
+        }
+        )
+        .then(({ data: res }) => {
+          this.tableData.push({
+            average: res.data.average,
+            averageCl: res.data.averageCl,
+            averageLcl: res.data.averageLcl,
+            averageUcl: res.data.averageUcl,
+            ca: res.data.ca,
+            cp: res.data.cp,
+            cpk: res.data.cpk,
+            groupNum: res.data.groupNum,
+            lsl: res.data.lsl,
+            ppk: res.data.ppk,
+            rangeCl: res.data.rangeCl,
+            rangeLcl: res.data.rangeLcl,
+            rangeUcl: res.data.rangeUcl,
+            standardDeviationWhole: res.data.standardDeviationWhole,
+            usl: res.data.usl,
+            max: res.data.max,
+            min: res.data.min,
+          })
+          console.log(res)
+          let xAxisData = []
+          res.data.productInspectionCharacteristicDTOList.forEach(ele => {
+            xAxisData.push(ele.batchNo + ele.groupNo)
+          })
+          var chartDom = document.getElementById('priceMain');
+          var myChart = echarts.init(chartDom)
+          this.myChart = myChart
+          var option;
+          // myChart.on('click', function (params) {
+          //   console.log(params);
+          // });
+          myChart.on('click', 'xAxis.category', function (params) {
+            console.log(params);
+          });
+          option = {
+            title: {
+              text: '均值极差图'
+            },
+            tooltip: {
+              trigger: 'axis'
+            },
+            // legend: {
+            //   data: ['推移图']
+            // },
+            grid: {
+              left: '3%',
+              right: '4%',
+              bottom: '3%',
+              containLabel: true
+            },
+            xAxis: {
+              data: xAxisData,
+              type: 'category',
+              axisLabel: {
+                clickable: true
+              },
+              silent: false,
+              triggerEvent: true
+            },
+            yAxis: {
+              type: 'value'
+            },
+            series: [
+              {
+                name: 'lsl',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.lsl]
+              },
+              {
+                name: 'UCL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.averageUcl]
+              },
+              {
+                name: 'UCL(图二)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.rangeUcl]
+              },
+              {
+                name: 'USL',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.usl]
+              },
+              {
+                name: 'CL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.averageCl]
+              },
+              {
+                name: 'CL(图二)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.rangeCl]
+              },
+              {
+                name: 'LCL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.averageLcl]
+              },
+              {
+                name: 'SL',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.sl]
+              },
+            ]
+          };
+          option && myChart.setOption(option);
+        })
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/finishproduct/components/meanStandard.vue b/src/views/modules/finishproduct/components/meanStandard.vue
new file mode 100644
index 0000000..7f8b0fb
--- /dev/null
+++ b/src/views/modules/finishproduct/components/meanStandard.vue
@@ -0,0 +1,264 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-06-19 09:19:53
+ * @LastEditTime: 2023-06-20 14:14:24
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <el-row :gutter="24">
+      <el-col :span="18">
+        <div id="priceMain" :style="{ width: '100%', height: '500px' }" />
+      </el-col>
+      <el-col :span="6">
+        <el-table style="width: 100%" :data="getValues" :show-header="false">
+          <el-table-column width="180" v-for="(item, index) in getHeaders" :key="index" :prop="item">
+          </el-table-column>
+        </el-table>
+      </el-col>
+    </el-row>
+  </el-card>
+</template>
+
+<script>
+// import available from "./components/gageAvailable.vue"
+import i18n from "@/i18n"
+import * as echarts from 'echarts';
+export default {
+  data() {
+    return {
+      myChart: null,
+      urlOptions: {
+        getDataListURL: "/code/productRegistration/mean/standard/deviation/chart",
+      },
+      tableData: [],
+      headers: [
+        {
+          prop: 'usl',
+          label: 'USL',
+        },
+        {
+          prop: 'sl',
+          label: 'SL',
+        },
+        {
+          prop: 'lsl',
+          label: 'LSL',
+        },
+        {
+          prop: 'averageCl',
+          label: 'CL(图一)',
+        },
+        {
+          prop: 'averageUcl',
+          label: 'UCL(图一)',
+        },
+        {
+          prop: 'averageLcl',
+          label: 'LCL(图一)',
+        },
+        {
+          prop: 'standardDeviationCl',
+          label: 'CL(图二)',
+        },
+        {
+          prop: 'standardDeviationLcl',
+          label: 'LCL(图二)',
+        },
+        {
+          prop: 'standardDeviationUcl',
+          label: 'UCL(图二)',
+        },
+        {
+          prop: 'standardDeviationGroup',
+          label: '标准差',
+        },
+        {
+          prop: 'cpk',
+          label: 'cpk',
+        },
+        {
+          prop: 'standardDeviationWhole',
+          label: '总体标准差',
+        },
+        {
+          prop: 'ppk',
+          label: 'ppk',
+        },
+        {
+          prop: 'ca',
+          label: 'ca',
+        },
+        {
+          prop: 'cp',
+          label: 'cp',
+        },
+        {
+          prop: 'ca',
+          label: 'ca',
+        },
+        {
+          prop: 'average',
+          label: '均值',
+        },
+        {
+          prop: 'max',
+          label: '最大值',
+        },
+        {
+          prop: 'max',
+          label: '最大值',
+        },
+      ],
+      listQuery: {
+        characteristicsId: null,
+        factoryId: null,
+        inspectionType: null,
+        productId: null,
+        sampleSize: null,
+        endTime: null,
+        startTime: null,
+      },
+    };
+  },
+  computed: {
+    getHeaders() {
+      return this.tableData.reduce((pre, cur, index) => pre.concat(`value${index}`), ['title'])
+    },
+    getValues() {
+      return this.headers.map(item => {
+        return this.tableData.reduce((pre, cur, index) => Object.assign(pre, { ['value' + index]: cur[item.prop] }), { 'title': item.label, });
+      });
+    }
+  },
+  // components: {
+  //   AddOrUpdate,
+  // },
+  methods: {
+    getData(listQuery) {
+      this.$http
+        .post(this.urlOptions.getDataListURL, {
+          params: listQuery
+        }
+        )
+        .then(({ data: res }) => {
+          this.tableData.push({
+            average: res.data.average,
+            averageCl: res.data.averageCl,
+            averageLcl: res.data.averageLcl,
+            averageUcl: res.data.averageUcl,
+            ca: res.data.ca,
+            cp: res.data.cp,
+            cpk: res.data.cpk,
+            groupNum: res.data.groupNum,
+            lsl: res.data.lsl,
+            ppk: res.data.ppk,
+            standardDeviationCl: res.data.standardDeviationCl,
+            standardDeviationLcl: res.data.standardDeviationLcl,
+            standardDeviationUcl: res.data.standardDeviationUcl,
+            standardDeviationWhole: res.data.standardDeviationWhole,
+            usl: res.data.usl,
+            max: res.data.max,
+            min: res.data.min,
+          })
+          console.log(res)
+          let xAxisData = []
+          res.data.productInspectionCharacteristicDTOList.forEach(ele => {
+            xAxisData.push(ele.batchNo + ele.groupNo)
+          })
+          var chartDom = document.getElementById('priceMain');
+          var myChart = echarts.init(chartDom)
+          this.myChart = myChart
+          var option;
+          // myChart.on('click', function (params) {
+          //   console.log(params);
+          // });
+          myChart.on('click', 'xAxis.category', function (params) {
+            console.log(params);
+          });
+          option = {
+            title: {
+              text: '均值极差图'
+            },
+            tooltip: {
+              trigger: 'axis'
+            },
+            // legend: {
+            //   data: ['推移图']
+            // },
+            grid: {
+              left: '3%',
+              right: '4%',
+              bottom: '3%',
+              containLabel: true
+            },
+            xAxis: {
+              data: xAxisData,
+              type: 'category',
+              axisLabel: {
+                clickable: true
+              },
+              silent: false,
+              triggerEvent: true
+            },
+            yAxis: {
+              type: 'value'
+            },
+            series: [
+              {
+                name: 'lsl',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.lsl]
+              },
+              {
+                name: 'UCL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.averageUcl]
+              },
+              {
+                name: 'UCL(图二)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.standardDeviationUcl]
+              },
+              {
+                name: 'USL',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.usl]
+              },
+              {
+                name: 'CL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.averageCl]
+              }, 
+              {
+                name: 'CL(图二)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.standardDeviationCl]
+              },
+              {
+                name: 'LCL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.averageLcl]
+              },
+              {
+                name: 'SL',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.sl]
+              },
+            ]
+          };
+          option && myChart.setOption(option);
+        })
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/finishproduct/components/medianRange.vue b/src/views/modules/finishproduct/components/medianRange.vue
new file mode 100644
index 0000000..d7ea42c
--- /dev/null
+++ b/src/views/modules/finishproduct/components/medianRange.vue
@@ -0,0 +1,271 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-06-19 09:19:53
+ * @LastEditTime: 2023-06-20 14:14:37
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <el-row :gutter="24">
+      <el-col :span="18">
+        <div id="priceMain" :style="{ width: '100%', height: '500px' }" />
+      </el-col>
+      <el-col :span="6">
+        <el-table style="width: 100%" :data="getValues" :show-header="false">
+          <el-table-column width="180" v-for="(item, index) in getHeaders" :key="index" :prop="item">
+          </el-table-column>
+        </el-table>
+      </el-col>
+    </el-row>
+  </el-card>
+</template>
+
+<script>
+// import available from "./components/gageAvailable.vue"
+import i18n from "@/i18n"
+import * as echarts from 'echarts';
+export default {
+  data() {
+    return {
+      myChart: null,
+      urlOptions: {
+        getDataListURL: "/code/productRegistration/median/range/chart",
+      },
+      tableData: [],
+      headers: [
+        {
+          prop: 'usl',
+          label: 'USL',
+        },
+        {
+          prop: 'sl',
+          label: 'SL',
+        },
+        {
+          prop: 'lsl',
+          label: 'LSL',
+        },
+        {
+          prop: 'averageUcl',
+          label: 'CL(图一)',
+        },
+        {
+          prop: 'averageUcl',
+          label: 'UCL(图一)',
+        },
+        {
+          prop: 'averageLcl',
+          label: 'LCL(图一)',
+        },
+        {
+          prop: 'rangeCl',
+          label: 'CL(图二)',
+        },
+        {
+          prop: 'rangeLcl',
+          label: 'LCL(图二)',
+        },
+        {
+          prop: 'rangeUcl',
+          label: 'UCL(图二)',
+        },
+        {
+          prop: 'standardDeviationGroup',
+          label: '标准差',
+        },
+        {
+          prop: 'cpk',
+          label: 'cpk',
+        },
+        {
+          prop: 'standardDeviationWhole',
+          label: '总体标准差',
+        },
+        {
+          prop: 'ppk',
+          label: 'ppk',
+        },
+        {
+          prop: 'ca',
+          label: 'ca',
+        },
+        {
+          prop: 'cp',
+          label: 'cp',
+        },
+        {
+          prop: 'ca',
+          label: 'ca',
+        },
+        {
+          prop: 'average',
+          label: '均值',
+        },
+        {
+          prop: 'max',
+          label: '最大值',
+        },
+        {
+          prop: 'max',
+          label: '最大值',
+        },
+        {
+          prop: 'median',
+          label: '中位数',
+        },
+      ],
+      listQuery: {
+        characteristicsId: null,
+        factoryId: null,
+        inspectionType: null,
+        productId: null,
+        sampleSize: null,
+        endTime: null,
+        startTime: null,
+      },
+    };
+  },
+  computed: {
+    getHeaders() {
+      return this.tableData.reduce((pre, cur, index) => pre.concat(`value${index}`), ['title'])
+    },
+    getValues() {
+      return this.headers.map(item => {
+        return this.tableData.reduce((pre, cur, index) => Object.assign(pre, { ['value' + index]: cur[item.prop] }), { 'title': item.label, });
+      });
+    }
+  },
+  // components: {
+  //   AddOrUpdate,
+  // },
+  methods: {
+    getData(listQuery) {
+      this.$http
+        .post(this.urlOptions.getDataListURL, {
+          params: listQuery
+        }
+        )
+        .then(({ data: res }) => {
+          this.tableData.push({
+            average: res.data.average,
+            averageCl: res.data.averageCl,
+            averageLcl: res.data.averageLcl,
+            averageUcl: res.data.averageUcl,
+            ca: res.data.ca,
+            cp: res.data.cp,
+            cpk: res.data.cpk,
+            groupNum: res.data.groupNum,
+            lsl: res.data.lsl,
+            ppk: res.data.ppk,
+            rangeCl: res.data.rangeCl,
+            rangeLcl: res.data.rangeCl,
+            rangeUcl: res.data.rangeCl,
+            standardDeviationWhole: res.data.standardDeviationWhole,
+            usl: res.data.usl,
+            max: res.data.max,
+            min: res.data.min,
+          })
+          res.data.productInspectionCharacteristicDTOList.forEach(ele => {
+            this.tableData.push(ele.median)
+          })
+          let xAxisData = []
+          res.data.productInspectionCharacteristicDTOList.forEach(ele => {
+            xAxisData.push(ele.batchNo + ele.groupNo)
+          })
+          console.log(res)
+          var chartDom = document.getElementById('priceMain');
+          var myChart = echarts.init(chartDom)
+          this.myChart = myChart
+          var option;
+          // myChart.on('click', function (params) {
+          //   console.log(params);
+          // });
+          myChart.on('click', 'xAxis.category', function (params) {
+            console.log(params);
+          });
+          option = {
+            title: {
+              text: '均值极差图'
+            },
+            tooltip: {
+              trigger: 'axis'
+            },
+            // legend: {
+            //   data: ['推移图']
+            // },
+            grid: {
+              left: '3%',
+              right: '4%',
+              bottom: '3%',
+              containLabel: true
+            },
+            xAxis: {
+              data: xAxisData,
+              type: 'category',
+              axisLabel: {
+                clickable: true
+              },
+              silent: false,
+              triggerEvent: true
+            },
+            yAxis: {
+              type: 'value'
+            },
+            series: [
+              {
+                name: 'lsl',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.lsl]
+              },
+              {
+                name: 'UCL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.averageUcl]
+              },
+              {
+                name: 'UCL(图二)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.rangeUcl]
+              },
+              {
+                name: 'USL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.usl]
+              },
+              {
+                name: 'CL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.rangeCl]
+              },
+              {
+                name: 'CL(图二)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.rangeCl]
+              },
+              {
+                name: 'LCL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.averageLcl]
+              },
+              {
+                name: 'SL',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.sl]
+              },
+            ]
+          };
+          option && myChart.setOption(option);
+        })
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/finishproduct/components/singleValueMovingRange.vue b/src/views/modules/finishproduct/components/singleValueMovingRange.vue
new file mode 100644
index 0000000..1eb3291
--- /dev/null
+++ b/src/views/modules/finishproduct/components/singleValueMovingRange.vue
@@ -0,0 +1,264 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-06-19 09:19:53
+ * @LastEditTime: 2023-06-20 14:14:46
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <el-row :gutter="24">
+      <el-col :span="18">
+        <div id="priceMain" :style="{ width: '100%', height: '500px' }" />
+      </el-col>
+      <el-col :span="6">
+        <el-table style="width: 100%" :data="getValues" :show-header="false">
+          <el-table-column width="180" v-for="(item, index) in getHeaders" :key="index" :prop="item">
+          </el-table-column>
+        </el-table>
+      </el-col>
+    </el-row>
+  </el-card>
+</template>
+
+<script>
+// import available from "./components/gageAvailable.vue"
+import i18n from "@/i18n"
+import * as echarts from 'echarts';
+export default {
+  data() {
+    return {
+      myChart: null,
+      urlOptions: {
+        getDataListURL: "/code/productRegistration/single/value/movement/range/chart",
+      },
+      tableData: [],
+      headers: [
+        {
+          prop: 'usl',
+          label: 'USL',
+        },
+        {
+          prop: 'sl',
+          label: 'SL',
+        },
+        {
+          prop: 'lsl',
+          label: 'LSL',
+        },
+        {
+          prop: 'averageUcl',
+          label: 'CL(图一)',
+        },
+        {
+          prop: 'averageUcl',
+          label: 'UCL(图一)',
+        },
+        {
+          prop: 'averageLcl',
+          label: 'LCL(图一)',
+        },
+        {
+          prop: 'rangeCl',
+          label: 'CL(图二)',
+        },
+        {
+          prop: 'rangeLcl',
+          label: 'LCL(图二)',
+        },
+        {
+          prop: 'rangeUcl',
+          label: 'UCL(图二)',
+        },
+        {
+          prop: 'standardDeviationGroup',
+          label: '标准差',
+        },
+        {
+          prop: 'cpk',
+          label: 'cpk',
+        },
+        {
+          prop: 'standardDeviationWhole',
+          label: '总体标准差',
+        },
+        {
+          prop: 'ppk',
+          label: 'ppk',
+        },
+        {
+          prop: 'ca',
+          label: 'ca',
+        },
+        {
+          prop: 'cp',
+          label: 'cp',
+        },
+        {
+          prop: 'ca',
+          label: 'ca',
+        },
+        {
+          prop: 'average',
+          label: '均值',
+        },
+        {
+          prop: 'max',
+          label: '最大值',
+        },
+        {
+          prop: 'max',
+          label: '最大值',
+        },
+      ],
+      listQuery: {
+        characteristicsId: null,
+        factoryId: null,
+        inspectionType: null,
+        productId: null,
+        sampleSize: null,
+        endTime: null,
+        startTime: null,
+      },
+    };
+  },
+  computed: {
+    getHeaders() {
+      return this.tableData.reduce((pre, cur, index) => pre.concat(`value${index}`), ['title'])
+    },
+    getValues() {
+      return this.headers.map(item => {
+        return this.tableData.reduce((pre, cur, index) => Object.assign(pre, { ['value' + index]: cur[item.prop] }), { 'title': item.label, });
+      });
+    }
+  },
+  // components: {
+  //   AddOrUpdate,
+  // },
+  methods: {
+    getData(listQuery) {
+      this.$http
+        .post(this.urlOptions.getDataListURL, {
+          params: listQuery
+        }
+        )
+        .then(({ data: res }) => {
+          this.tableData.push({
+            average: res.data.average,
+            averageCl: res.data.averageCl,
+            averageLcl: res.data.averageLcl,
+            averageUcl: res.data.averageUcl,
+            ca: res.data.ca,
+            cp: res.data.cp,
+            cpk: res.data.cpk,
+            groupNum: res.data.groupNum,
+            lsl: res.data.lsl,
+            ppk: res.data.ppk,
+            rangeCl: res.data.rangeCl,
+            rangeLcl: res.data.rangeCl,
+            rangeUcl: res.data.rangeCl,
+            standardDeviationWhole: res.data.standardDeviationWhole,
+            usl: res.data.usl,
+            max: res.data.max,
+            min: res.data.min,
+          })
+          console.log(res)
+          let xAxisData = []
+          res.data.productInspectionCharacteristicDTOList.forEach(ele => {
+            xAxisData.push(ele.batchNo + ele.groupNo)
+          })
+          var chartDom = document.getElementById('priceMain');
+          var myChart = echarts.init(chartDom)
+          this.myChart = myChart
+          var option;
+          // myChart.on('click', function (params) {
+          //   console.log(params);
+          // });
+          myChart.on('click', 'xAxis.category', function (params) {
+            console.log(params);
+          });
+          option = {
+            title: {
+              text: '均值极差图'
+            },
+            tooltip: {
+              trigger: 'axis'
+            },
+            // legend: {
+            //   data: ['推移图']
+            // },
+            grid: {
+              left: '3%',
+              right: '4%',
+              bottom: '3%',
+              containLabel: true
+            },
+            xAxis: {
+              data: xAxisData,
+              type: 'category',
+              axisLabel: {
+                clickable: true
+              },
+              silent: false,
+              triggerEvent: true
+            },
+            yAxis: {
+              type: 'value'
+            },
+            series: [
+              {
+                name: 'lsl',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.lsl]
+              },
+              {
+                name: 'UCL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.averageUcl]
+              },
+              {
+                name: 'UCL(图二)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.rangeUcl]
+              },
+              {
+                name: 'USL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.usl]
+              },
+              {
+                name: 'CL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.rangeCl]
+              },
+              {
+                name: 'CL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.averageCl]
+              },
+              {
+                name: 'LCL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.averageLcl]
+              },
+              {
+                name: 'SL',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.sl]
+              },
+            ]
+          };
+          option && myChart.setOption(option);
+        })
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/finishproduct/controlDiagram.vue b/src/views/modules/finishproduct/controlDiagram.vue
new file mode 100644
index 0000000..754f3fe
--- /dev/null
+++ b/src/views/modules/finishproduct/controlDiagram.vue
@@ -0,0 +1,442 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-01-11 09:24:58
+ * @LastEditTime: 2023-06-20 15:47:19
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__user">
+      <el-form :inline="true" :model="dataForm" class="demo-form-inline">
+        <el-form-item :label="$t('code.inspectionTime')" prop="timeSlot">
+          <el-date-picker v-model="dataForm.timeSlot" size="small" type="datetimerange" format='yyyy-MM-dd HH:mm:ss'
+            @change="getFactory" valueFormat='yyyy-MM-ddTHH:mm:ss' :start-placeholder="$t('gage.startTime')"
+            :end-placeholder="$t('gage.endTime')" :range-separator="$t('gage.to')" clearable />
+        </el-form-item>
+        <el-form-item :label="$t('code.factoryName')">
+          <el-select v-model="dataForm.factoryId" :placeholder="$t('code.factoryName')" @change="getInspectionType">
+            <el-option v-for="item in factoryList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('code.productName')">
+          <el-select v-model="dataForm.productId" :placeholder="$t('code.productName')" @change="gerCharacteristics">
+            <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('code.inspectionType')">
+          <el-select v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')">
+            <el-option v-for="item in inspectionTypeList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <!-- <el-form-item :label="$t('code.inspectionType')">
+          <el-input v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')"></el-input>
+        </el-form-item> -->
+        <el-form-item :label="$t('code.characteristics')">
+          <el-input v-model="dataForm.characteristicsId" :placeholder="$t('code.characteristics')"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('code.sampleSize')">
+          <el-input v-model="dataForm.sampleSize" :placeholder="$t('code.sampleSize')"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getOriginalData">{{ $t('code.originalData') }}}</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tab-pane :label="$t('code.meanRange')" name="first">
+        <mean-range ref="meanRange"></mean-range>
+      </el-tab-pane>
+      <el-tab-pane :label="$t('code.meanStandard')" name="second">
+        <mean-standard ref="meanStandard">
+        </mean-standard>
+      </el-tab-pane>
+      <el-tab-pane :label=" $t('code.medianRange')" name="third">
+        <median-range ref="medianRange">
+        </median-range>
+      </el-tab-pane>
+      <el-tab-pane :label="$t('code.singleValueMovingRange')" name="fourth">
+        <single-valueMovingRange ref="singleValueMovingRange">
+        </single-valueMovingRange>
+      </el-tab-pane>
+      <el-tab-pane :label="$t('code.meanMovingRangeRange')" name="fifth">
+        <mean-MovingRangeRange ref="meanMovingRangeRange">
+        </mean-MovingRangeRange>
+      </el-tab-pane>
+      <el-tab-pane :label="$t('code.meanMovingRangeStandardDeviation')" name="sixth">
+        <mean-movingRangeStandardDeviation ref="meanMovingRangeStandardDeviation">
+        </mean-movingRangeStandardDeviation>
+      </el-tab-pane>
+    </el-tabs>
+    <base-table id="palletTable" :table-props="tableProps" :page="listQuery.page" ref="palletTable1"
+      highlight-current-row :limit="listQuery.limit" :table-data="tableData">
+    </base-table>
+  </el-card>
+</template>
+
+<script>
+import meanRange from "./components/meanRange.vue"
+import meanStandard from "./components/meanStandard.vue"
+import medianRange from "./components/medianRange.vue"
+import singleValueMovingRange from "./components/singleValueMovingRange.vue"
+import meanMovingRangeRange from "./components/meanMovingRangeRange.vue"
+import meanMovingRangeStandardDeviation from "./components/meanMovingRangeStandardDeviation.vue"
+import i18n from "@/i18n"
+import * as echarts from 'echarts';
+const tableProps = [
+  {
+    prop: "orderNumber",
+    label: i18n.t('code.inspectionNumber'),
+  },
+  {
+    prop: "batchNo",
+    label: i18n.t('code.batchNo'),
+  },
+  {
+    prop: "locationNo",
+    label: i18n.t('code.locationNo'),
+  },
+  {
+    prop: "groupNo",
+    label: i18n.t('code.groupNo'),
+  },
+  {
+    prop: "meteringValue",
+    label: i18n.t('code.assayValue'),
+  },
+  {
+    prop: "createDate",
+    label: i18n.t('code.parsingTime'),
+  }
+];
+export default {
+  data() {
+    return {
+      myChart: null,
+      urlOptions: {
+        getXBarURL: '',
+        getDataListURL: "/code/productRegistration/mean/range/chart",
+        getFactoryURL: '/code/productRegistration/query/factory',
+        getProductURL: '/code/productRegistration/query/product',
+        getInspectionTypeURL: '/code/productRegistration/query/inspection/type',
+        getOriginalDataURL: '/code/productRegistration/raw/data',
+        getPurchaseRegistrationTypeURL: '/code/productRegistration/query/checkout/project',
+      },
+      tableData:[],
+      tableProps,
+      factoryList: [],
+      productList: [],
+      meanRangeShow:false,
+      listQuery: {
+        characteristicsId: null,
+        factoryId: null,
+        inspectionType: null,
+        productId: null,
+        sampleSize: null,
+        endTime: null,
+        startTime: null,
+      },
+      activeName:null,
+      headers: [
+        {
+          prop: 'usl',
+          label: 'USL',
+        },
+        {
+          prop: 'sl',
+          label: 'SL',
+        },
+        {
+          prop: 'lsl',
+          label: 'LSL',
+        },
+        {
+          prop: 'rangeUcl',
+          label: 'CL(图一)',
+        },
+        {
+          prop: 'averageUcl',
+          label: 'UCL(图一)',
+        },
+        {
+          prop: 'rangeLcl',
+          label: 'LCL(图一)',
+        },
+        {
+          prop: 'standardDeviationCl',
+          label: 'CL(图二)',
+        },
+        {
+          prop: 'standardDeviationLcl',
+          label: 'LCL(图二)',
+        },
+        {
+          prop: 'standardDeviationUcl',
+          label: 'UCL(图二)',
+        },
+        {
+          prop: 'standardDeviationGroup',
+          label: '标准差',
+        },
+        {
+          prop: 'cpk',
+          label: 'cpk',
+        },
+        {
+          prop: 'standardDeviationWhole',
+          label: '总体标准差',
+        },
+        {
+          prop: 'ppk',
+          label: 'ppk',
+        },
+        {
+          prop: 'ca',
+          label: 'ca',
+        },
+        {
+          prop: 'cp',
+          label: 'cp',
+        },
+        {
+          prop: 'ca',
+          label: 'ca',
+        },
+        {
+          prop: 'average',
+          label: '均值',
+        },
+        {
+          prop: 'max',
+          label: '最大值',
+        },
+        {
+          prop: 'max',
+          label: '最大值',
+        },
+      ],
+      tableData: [],
+      dataForm: {
+        productId: null,
+        timeSlot: [],
+        factoryId: null,
+        characteristicsId: null,
+        inspectionType: null,
+        sampleSize: null
+      },
+      selectOptions: [{
+        id: 0,
+        name: '监控'
+      },
+      {
+        id: 1,
+        name: '电芯来料检验'
+      },
+      {
+        id: 2,
+        lname: 'IQC抽检'
+      },
+      {
+        id: 3,
+        name: 'IQC抽检2'
+      },
+      {
+        id: 4,
+        name: '原料抽检'
+      },
+      {
+        id: 5,
+        name: '进货外观检验'
+      },
+      {
+        id: 6,
+        name: '库内原料检验'
+      },
+      {
+        id: 7,
+        name: '来料检验'
+      },
+      {
+        id: 8,
+        name: '胶片'
+      },
+      {
+        id: 9,
+        name: '抽检'
+      },
+      {
+        id: 10,
+        name: '巡检'
+      }, {
+        id: 11,
+        name: '首检'
+      },
+      {
+        id: 12,
+        name: '末检'
+      },
+      {
+        id: 13,
+        name: '实时监测'
+      },
+      {
+        id: 14,
+        name: 'FQC抽检'
+      },
+      {
+        id: 15,
+        name: 'OQC抽检'
+      },
+      ],
+    };
+  },
+  components: {
+    meanRange,
+    meanStandard,
+    medianRange,
+    singleValueMovingRange,
+    meanMovingRangeRange,
+    meanMovingRangeStandardDeviation
+  },
+  computed: {
+    getHeaders() {
+      return this.tableData.reduce((pre, cur, index) => pre.concat(`value${index}`), ['title'])
+    },
+    getValues() {
+      return this.headers.map(item => {
+        return this.tableData.reduce((pre, cur, index) => Object.assign(pre, { ['value' + index]: cur[item.prop] }), { 'title': item.label, });
+      });
+    }
+  },
+  mounted() {
+    // this.getData()
+    // this.getDict()
+  },
+  methods: {
+    selectChanged(val) {
+      console.log(val)
+      alert(JSON.stringify(val))
+    },
+    handleClick(val) {
+      if (this.activeName === 'first') {
+        this.$nextTick(() => {
+          this.$refs.meanRange.getData(this.listQuery)
+        })
+      } else if (this.activeName === 'second') {
+        this.$nextTick(() => {
+          this.$refs.meanStandard.getData(this.listQuery)
+        })
+      } else if (this.activeName === 'third') {
+        this.$nextTick(() => {
+          this.$refs.medianRange.getData(this.listQuery)
+        })
+      } else if (this.activeName === 'fourth') {
+        this.$nextTick(() => {
+          this.$refs.singleValueMovingRange.getData(this.listQuery)
+        })
+      } else if (this.activeName === 'fifth') {
+        this.$nextTick(() => {
+          this.$refs.meanMovingRangeRange.getData(this.listQuery)
+        })
+      } else if (this.activeName === 'sixth') {
+        this.$nextTick(() => {
+          this.$refs.meanMovingRangeStandardDeviation.getData(this.listQuery)
+        })
+      }
+
+    },
+    getFactory(val) {
+      console.log(val)
+      this.$http.get(this.urlOptions.getFactoryURL, {
+        params: {
+          startTime: val[0],
+          endTime: val[1]
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.factoryList = res.data.map((item) => {
+              return {
+                id: item.factoryId,
+                name: item.factoryName
+              }
+            })
+          }
+        })
+      this.$http.get(this.urlOptions.getProductURL, {
+        params: {
+          startTime: val[0],
+          endTime: val[1]
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.productList = res.data.map((item) => {
+              return {
+                id: item.productId,
+                name: item.productName
+              }
+            })
+          }
+        })
+    },
+    getInspectionType(val) {
+      this.$http.get(this.urlOptions.getInspectionTypeURL, {
+        params: {
+          startTime: this.dataForm.timeSlot[0],
+          endTime: this.dataForm.timeSlot[1],
+          factoryId: val
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.dataForm.inspectionType = res.data.inspectionType
+          }
+        })
+    },
+    gerCharacteristics(val) {
+      this.$http.get(this.urlOptions.getPurchaseRegistrationTypeURL, {
+        params: {
+          productId: val
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.dataForm.characteristicsId = res.data.parameterName
+          }
+        })
+    },
+    getOriginalData() {
+      this.$http.get(this.urlOptions.getOriginalDataURL, {
+        params:this.listQuery
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.tableData = res.data
+          }
+        })
+    },
+    buttonClick(val) {
+      console.log(val)
+      switch (val.btnName) {
+        case "search":
+          this.dataForm.sampleSize = val.sampleSize ? val.sampleSize : null
+          this.dataForm.inspectionType = val.inspectionType ? val.inspectionType : null
+          this.dataForm.characteristicsId = val.characteristicsId ? val.characteristicsId : null
+          this.dataForm.factoryId = val.factoryId ? val.factoryId : null
+          this.dataForm.productId = val.productId ? val.productId : null
+          this.dataForm.startTime = val.timeSlot ? val.timeSlot[0] : null
+          this.dataForm.endTime = val.timeSlot ? val.timeSlot[1] : null
+          this.getData()
+          break;
+
+        default:
+          console.log(val)
+      }
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/finishproduct/paretoDiagram.vue b/src/views/modules/finishproduct/paretoDiagram.vue
new file mode 100644
index 0000000..4095380
--- /dev/null
+++ b/src/views/modules/finishproduct/paretoDiagram.vue
@@ -0,0 +1,312 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-01-11 09:24:58
+ * @LastEditTime: 2023-06-20 15:50:01
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__user">
+      <el-form :inline="true" :model="dataForm" class="demo-form-inline">
+        <el-form-item :label="$t('code.inspectionTime')" prop="timeSlot">
+          <el-date-picker v-model="dataForm.timeSlot" size="small" type="datetimerange" format='yyyy-MM-dd HH:mm:ss'
+            @change="getFactory" valueFormat='yyyy-MM-ddTHH:mm:ss' :start-placeholder="$t('gage.startTime')"
+            :end-placeholder="$t('gage.endTime')" :range-separator="$t('gage.to')" clearable />
+        </el-form-item>
+        <el-form-item :label="$t('code.factoryName')">
+          <el-select v-model="dataForm.factoryId" :placeholder="$t('code.factoryName')" @change="getInspectionType">
+            <el-option v-for="item in factoryList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('code.inspectionType')">
+          <el-input v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')"></el-input>
+        </el-form-item>
+        <!-- <el-form-item :label="$t('code.productName')">
+          <el-select v-model="dataForm.productId" :placeholder="$t('code.productName')" @change="gerCharacteristics">
+            <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item> -->
+        <!-- <el-form-item :label="$t('code.inspectionType')">
+          <el-select v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')">
+            <el-option v-for="item in inspectionTypeList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item> -->
+        <!--
+        <el-form-item :label="$t('code.characteristics')">
+          <el-input v-model="dataForm.characteristicsId" :placeholder="$t('code.characteristics')"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('code.sampleSize')">
+          <el-input v-model="dataForm.sampleSize" :placeholder="$t('code.sampleSize')"></el-input>
+        </el-form-item> -->
+        <el-form-item>
+          <el-button type="primary" @click="getData">查询</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div id="priceMain" :style="{ width: '100%', height: '500px' }" />
+  </el-card>
+</template>
+
+<script>
+// import available from "./components/gageAvailable.vue"
+import i18n from "@/i18n"
+import * as echarts from 'echarts';
+export default {
+  data() {
+    return {
+      myChart: null,
+      urlOptions: {
+        getDataListURL: "/code/productRegistration/pareto/diagram",
+        getFactoryURL: '/code/productRegistration/query/factory',
+        getProductURL: '/code/productRegistration/query/product',
+        getInspectionTypeURL: '/code/productRegistration/query/inspection/type',
+        getPurchaseRegistrationTypeURL: '/code/productRegistration/query/checkout/project',
+      },
+      factoryList: [],
+      productList:[],
+      listQuery: {
+        characteristicsId:null,
+        factoryId: null,
+        inspectionType: null,
+        productId: null,
+        sampleSize: null,
+        endTime: null,
+        startTime: null,
+      },
+      dataForm: {
+        productId: null,
+        timeSlot: [],
+        factoryId: null,
+        characteristicsId: null,
+        inspectionType: null,
+        sampleSize:null
+      },
+      selectOptions: [{
+            id: 0,
+            name: '监控'
+          },
+            {
+              id: 1,
+              name: '电芯来料检验'
+            },
+            {
+              id: 2,
+              lname: 'IQC抽检'
+            },
+            {
+              id: 3,
+              name: 'IQC抽检2'
+            },
+            {
+              id: 4,
+              name: '原料抽检'
+            },
+            {
+              id: 5,
+              name: '进货外观检验'
+            },
+            {
+              id: 6,
+              name: '库内原料检验'
+            },
+            {
+              id: 7,
+              name: '来料检验'
+            },
+            {
+              id: 8,
+              name: '胶片'
+            },
+            {
+              id: 9,
+              name: '抽检'
+            },
+            {
+              id: 10,
+              name: '巡检'
+            }, {
+              id: 11,
+              name: '首检'
+            },
+            {
+              id: 12,
+              name: '末检'
+            },
+            {
+              id: 13,
+              name: '实时监测'
+            },
+            {
+              id: 14,
+              name: 'FQC抽检'
+            },
+            {
+              id: 15,
+              name: 'OQC抽检'
+            },
+          ],
+    };
+  },
+  // components: {
+  //   AddOrUpdate,
+  // },
+  mounted() {
+    this.getData()
+    // this.getDict()
+  },
+  methods: {
+    selectChanged(val) {
+      console.log(val)
+      alert(JSON.stringify(val))
+    },
+    getFactory(val) {
+      console.log(val)
+      this.$http.get(this.urlOptions.getFactoryURL, {
+        params: {
+          startTime: val[0],
+          endTime: val[1]
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.factoryList = res.data.map((item) => {
+              return {
+                id: item.factoryId,
+                name: item.factoryName
+              }
+            })
+          }
+        })
+      this.$http.get(this.urlOptions.getProductURL, {
+        params: {
+          startTime: val[0],
+          endTime: val[1]
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.productList = res.data.map((item) => {
+              return {
+                id: item.productId,
+                name: item.productName
+              }
+            })
+          }
+        })
+    },
+    getInspectionType(val) {
+      this.$http.get(this.urlOptions.getInspectionTypeURL, {
+        params: {
+          startTime: this.dataForm.timeSlot[0],
+          endTime: this.dataForm.timeSlot[1],
+          factoryId: val
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.dataForm.inspectionType = res.data.inspectionType
+          }
+        })
+    },
+    // gerCharacteristics(val) {
+    //   this.$http.get(this.urlOptions.getPurchaseRegistrationTypeURL, {
+    //     params: {
+    //       productId:val
+    //     },
+    //   })
+    //     .then(({ data: res }) => {
+    //       if (res.code === 0) {
+    //         this.dataForm.characteristicsId = res.data.parameterName
+    //       }
+    //     })
+    // },
+    getData() {
+      this.$http
+        .post(this.urlOptions.getDataListURL, {
+          params: this.listQuery
+        }
+        )
+        .then(({ data: res }) => {
+          console.log(res)
+          var chartDom = document.getElementById('priceMain');
+          var myChart = echarts.init(chartDom)
+          this.myChart = myChart
+          var option;
+          // myChart.on('click', function (params) {
+          //   console.log(params);
+          // });
+          myChart.on('click', 'xAxis.category', function (params) {
+            console.log(params);
+          });
+          option = {
+            title: {
+              text:'帕累托图'
+            },
+            tooltip: {
+              formatter: (params) => {
+                // 打印确认params是对象还是数组
+                console.log(params)
+                // 对象：取鼠标悬浮当前项索引params.dataIndex
+                // 数组：取鼠标悬浮当前项索引params[0].dataIndex
+                let index = params.dataIndex
+                let obj = res.data[index] // 通过索引取当前项完整的接口返回值
+                let str = `缺陷数量:${obj.number}<br/>
+			        缺陷率${obj.defectRate}<br/>`
+                return str
+              }
+            },
+            xAxis: {
+              data: res.data.map(i => { return i.propertyName })
+            },
+            yAxis: [{
+              type: 'value',
+              name: '缺陷数量',
+              show: true,
+              interval: 10,
+              axisLine: {
+                lineStyle: {
+                  color: '#5e859e',
+                  width: 2
+                }
+              }
+            }],
+            series: [{
+              name: '缺陷率',
+              type: 'bar',
+              barWidth: '50%',
+              data: res.data.map(i => { return i.defectRate })
+            }, {
+              name: '缺陷数量',
+              type: 'line',
+              smooth: true,
+              data: res.data.map(i => { return i.number })
+            }]
+          };
+          option && myChart.setOption(option);
+        })
+    },
+    buttonClick(val) {
+      console.log(val)
+      switch (val.btnName) {
+        case "search":
+          // this.dataForm.sampleSize = val.sampleSize ? val.sampleSize : null
+          this.dataForm.inspectionType = val.inspectionType ? val.inspectionType : null
+          // this.dataForm.characteristicsId = val.characteristicsId ? val.characteristicsId : null
+          this.dataForm.factoryId = val.factoryId ? val.factoryId : null
+          // this.dataForm.productId = val.productId ? val.productId : null
+          this.dataForm.startTime = val.timeSlot ? val.timeSlot[0] : null
+          this.dataForm.endTime = val.timeSlot ? val.timeSlot[1] : null
+          this.getData()
+          break;
+
+        default:
+          console.log(val)
+      }
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/finishproduct/scatterPlot.vue b/src/views/modules/finishproduct/scatterPlot.vue
new file mode 100644
index 0000000..05fa59f
--- /dev/null
+++ b/src/views/modules/finishproduct/scatterPlot.vue
@@ -0,0 +1,303 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-01-11 09:24:58
+ * @LastEditTime: 2023-06-20 10:48:38
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__user">
+      <el-form :inline="true" :model="dataForm" class="demo-form-inline">
+        <el-form-item :label="$t('code.inspectionTime')" prop="timeSlot">
+          <el-date-picker v-model="dataForm.timeSlot" size="small" type="datetimerange" format='yyyy-MM-dd HH:mm:ss'
+            @change="getFactory" valueFormat='yyyy-MM-ddTHH:mm:ss' :start-placeholder="$t('gage.startTime')"
+            :end-placeholder="$t('gage.endTime')" :range-separator="$t('gage.to')" clearable />
+        </el-form-item>
+        <el-form-item :label="$t('code.factoryName')">
+          <el-select v-model="dataForm.factoryId" :placeholder="$t('code.factoryName')" @change="getInspectionType">
+            <el-option v-for="item in factoryList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('code.productName')">
+          <el-select v-model="dataForm.productId" :placeholder="$t('code.productName')" @change="gerCharacteristics">
+            <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <!-- <el-form-item :label="$t('code.inspectionType')">
+          <el-select v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')">
+            <el-option v-for="item in inspectionTypeList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item> -->
+        <el-form-item :label="$t('code.inspectionType')">
+          <el-input v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('code.characteristics')">
+          <el-input v-model="dataForm.characteristicsId" :placeholder="$t('code.characteristics')"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('code.sampleSize')">
+          <el-input v-model="dataForm.sampleSize" :placeholder="$t('code.sampleSize')"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getData">查询</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div id="priceMain" :style="{ width: '100%', height: '500px' }" />
+  </el-card>
+</template>
+
+<script>
+// import available from "./components/gageAvailable.vue"
+import i18n from "@/i18n"
+import * as echarts from 'echarts';
+export default {
+  data() {
+    return {
+      myChart: null,
+      urlOptions: {
+        getDataListURL: "/code/productRegistration/phase/diagram",
+        getFactoryURL: '/code/productRegistration/query/factory',
+        getProductURL: '/code/productRegistration/query/product',
+        getInspectionTypeURL: '/code/productRegistration/query/inspection/type',
+        getPurchaseRegistrationTypeURL: '/code/productRegistration/query/checkout/project',
+      },
+      factoryList: [],
+      productList:[],
+      listQuery: {
+        characteristicsId:null,
+        factoryId: null,
+        inspectionType: null,
+        productId: null,
+        sampleSize: null,
+        endTime: null,
+        startTime: null,
+      },
+      dataForm: {
+        productId: null,
+        timeSlot: [],
+        factoryId: null,
+        characteristicsId: null,
+        inspectionType: null,
+        sampleSize:null
+      },
+      selectOptions: [{
+            id: 0,
+            name: '监控'
+          },
+            {
+              id: 1,
+              name: '电芯来料检验'
+            },
+            {
+              id: 2,
+              lname: 'IQC抽检'
+            },
+            {
+              id: 3,
+              name: 'IQC抽检2'
+            },
+            {
+              id: 4,
+              name: '原料抽检'
+            },
+            {
+              id: 5,
+              name: '进货外观检验'
+            },
+            {
+              id: 6,
+              name: '库内原料检验'
+            },
+            {
+              id: 7,
+              name: '来料检验'
+            },
+            {
+              id: 8,
+              name: '胶片'
+            },
+            {
+              id: 9,
+              name: '抽检'
+            },
+            {
+              id: 10,
+              name: '巡检'
+            }, {
+              id: 11,
+              name: '首检'
+            },
+            {
+              id: 12,
+              name: '末检'
+            },
+            {
+              id: 13,
+              name: '实时监测'
+            },
+            {
+              id: 14,
+              name: 'FQC抽检'
+            },
+            {
+              id: 15,
+              name: 'OQC抽检'
+            },
+          ],
+    };
+  },
+  // components: {
+  //   AddOrUpdate,
+  // },
+  mounted() {
+    this.getData()
+    // this.getDict()
+  },
+  methods: {
+    selectChanged(val) {
+      console.log(val)
+      alert(JSON.stringify(val))
+    },
+    getFactory(val) {
+      console.log(val)
+      this.$http.get(this.urlOptions.getFactoryURL, {
+        params: {
+          startTime: val[0],
+          endTime: val[1]
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.factoryList = res.data.map((item) => {
+              return {
+                id: item.factoryId,
+                name: item.factoryName
+              }
+            })
+          }
+        })
+      this.$http.get(this.urlOptions.getProductURL, {
+        params: {
+          startTime: val[0],
+          endTime: val[1]
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.productList = res.data.map((item) => {
+              return {
+                id: item.productId,
+                name: item.productName
+              }
+            })
+          }
+        })
+    },
+    getInspectionType(val) {
+      this.$http.get(this.urlOptions.getInspectionTypeURL, {
+        params: {
+          startTime: this.dataForm.timeSlot[0],
+          endTime: this.dataForm.timeSlot[1],
+          factoryId: val
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.dataForm.inspectionType = res.data.inspectionType
+          }
+        })
+    },
+    gerCharacteristics(val) {
+      this.$http.get(this.urlOptions.getPurchaseRegistrationTypeURL, {
+        params: {
+          productId:val
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.dataForm.characteristicsId = res.data.parameterName
+          }
+        })
+    },
+    getData() {
+      this.$http
+        .post(this.urlOptions.getDataListURL, {
+          params: this.listQuery
+        }
+        )
+        .then(({ data: res }) => {
+          console.log(res)
+          let xAxisData = []
+          var chartDom = document.getElementById('priceMain');
+          var myChart = echarts.init(chartDom)
+          this.myChart = myChart
+          var option;
+          // myChart.on('click', function (params) {
+          //   console.log(params);
+          // });
+          myChart.on('click', 'xAxis.category', function (params) {
+            console.log(params);
+          });
+          option = {
+            title: {
+              text:'散点图'
+            },
+            tooltip: {
+              trigger: 'axis'
+            },
+            // legend: {
+            //   data: ['推移图']
+            // },
+            grid: {
+              left: '3%',
+              right: '4%',
+              bottom: '3%',
+              containLabel: true
+            },
+            xAxis: {
+              data: res.data.abscissaList,
+              type: 'category',
+              axisLabel: {
+                clickable: true
+              },
+              silent: false,
+              triggerEvent: true
+            },
+            yAxis: {
+              type: 'value'
+            },
+            series: [{
+              name: '缺陷率',
+              type: 'bar',
+              barWidth: '50%',
+              data: res.data.ordinateList
+            }]
+          };
+          option && myChart.setOption(option);
+        })
+    },
+    buttonClick(val) {
+      console.log(val)
+      switch (val.btnName) {
+        case "search":
+          this.dataForm.sampleSize = val.sampleSize ? val.sampleSize : null
+          this.dataForm.inspectionType = val.inspectionType ? val.inspectionType : null
+          this.dataForm.characteristicsId = val.characteristicsId ? val.characteristicsId : null
+          this.dataForm.factoryId = val.factoryId ? val.factoryId : null
+          this.dataForm.productId = val.productId ? val.productId : null
+          this.dataForm.startTime = val.timeSlot ? val.timeSlot[0] : null
+          this.dataForm.endTime = val.timeSlot ? val.timeSlot[1] : null
+          this.getData()
+          break;
+
+        default:
+          console.log(val)
+      }
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/finishproduct/stageDiagram.vue b/src/views/modules/finishproduct/stageDiagram.vue
new file mode 100644
index 0000000..5d9f0c9
--- /dev/null
+++ b/src/views/modules/finishproduct/stageDiagram.vue
@@ -0,0 +1,298 @@
+
+<!--
+ * @Author: zhp
+ * @Date: 2023-01-11 09:24:58
+ * @LastEditTime: 2023-06-20 15:51:03
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__user">
+      <el-form :inline="true" :model="dataForm" class="demo-form-inline">
+        <el-form-item :label="$t('code.inspectionTime')" prop="timeSlot">
+          <el-date-picker v-model="dataForm.timeSlot" size="small" type="datetimerange" format='yyyy-MM-dd HH:mm:ss'
+            @change="getFactory" valueFormat='yyyy-MM-ddTHH:mm:ss' :start-placeholder="$t('gage.startTime')"
+            :end-placeholder="$t('gage.endTime')" :range-separator="$t('gage.to')" clearable />
+        </el-form-item>
+        <el-form-item :label="$t('code.factoryName')">
+          <el-select v-model="dataForm.factoryId" :placeholder="$t('code.factoryName')" @change="getInspectionType">
+            <el-option v-for="item in factoryList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('code.productName')">
+          <el-select v-model="dataForm.productId" :placeholder="$t('code.productName')" @change="gerCharacteristics">
+            <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <!-- <el-form-item :label="$t('code.inspectionType')">
+          <el-select v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')">
+            <el-option v-for="item in inspectionTypeList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item> -->
+        <el-form-item :label="$t('code.inspectionType')">
+          <el-input v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('code.characteristics')">
+          <el-input v-model="dataForm.characteristicsId" :placeholder="$t('code.characteristics')"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('code.sampleSize')">
+          <el-input v-model="dataForm.sampleSize" :placeholder="$t('code.sampleSize')"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getData">查询</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div id="priceMain" :style="{ width: '100%', height: '500px' }" />
+  </el-card>
+</template>
+
+<script>
+// import available from "./components/gageAvailable.vue"
+import i18n from "@/i18n"
+import * as echarts from 'echarts';
+export default {
+  data() {
+    return {
+      myChart: null,
+      urlOptions: {
+        getDataListURL: "/code/productRegistration/phase/diagram",
+        getFactoryURL: '/code/productRegistration/query/factory',
+        getProductURL: '/code/productRegistration/query/product',
+        getInspectionTypeURL: '/code/productRegistration/query/inspection/type',
+        getPurchaseRegistrationTypeURL: '/code/productRegistration/query/checkout/project',
+      },
+      factoryList: [],
+      productList:[],
+      listQuery: {
+        characteristicsId:null,
+        factoryId: null,
+        inspectionType: null,
+        productId: null,
+        sampleSize: null,
+        endTime: null,
+        startTime: null,
+      },
+      dataForm: {
+        productId: null,
+        timeSlot: [],
+        factoryId: null,
+        characteristicsId: null,
+        inspectionType: null,
+        sampleSize:null
+      },
+      selectOptions: [{
+            id: 0,
+            name: '监控'
+          },
+            {
+              id: 1,
+              name: '电芯来料检验'
+            },
+            {
+              id: 2,
+              lname: 'IQC抽检'
+            },
+            {
+              id: 3,
+              name: 'IQC抽检2'
+            },
+            {
+              id: 4,
+              name: '原料抽检'
+            },
+            {
+              id: 5,
+              name: '进货外观检验'
+            },
+            {
+              id: 6,
+              name: '库内原料检验'
+            },
+            {
+              id: 7,
+              name: '来料检验'
+            },
+            {
+              id: 8,
+              name: '胶片'
+            },
+            {
+              id: 9,
+              name: '抽检'
+            },
+            {
+              id: 10,
+              name: '巡检'
+            }, {
+              id: 11,
+              name: '首检'
+            },
+            {
+              id: 12,
+              name: '末检'
+            },
+            {
+              id: 13,
+              name: '实时监测'
+            },
+            {
+              id: 14,
+              name: 'FQC抽检'
+            },
+            {
+              id: 15,
+              name: 'OQC抽检'
+            },
+          ],
+    };
+  },
+  // components: {
+  //   AddOrUpdate,
+  // },
+  mounted() {
+    this.getData()
+    // this.getDict()
+  },
+  methods: {
+    selectChanged(val) {
+      console.log(val)
+      alert(JSON.stringify(val))
+    },
+    getFactory(val) {
+      console.log(val)
+      this.$http.get(this.urlOptions.getFactoryURL, {
+        params: {
+          startTime: val[0],
+          endTime: val[1]
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.factoryList = res.data.map((item) => {
+              return {
+                id: item.factoryId,
+                name: item.factoryName
+              }
+            })
+          }
+        })
+      this.$http.get(this.urlOptions.getProductURL, {
+        params: {
+          startTime: val[0],
+          endTime: val[1]
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.productList = res.data.map((item) => {
+              return {
+                id: item.productId,
+                name: item.productName
+              }
+            })
+          }
+        })
+    },
+    getInspectionType(val) {
+      this.$http.get(this.urlOptions.getInspectionTypeURL, {
+        params: {
+          startTime: this.dataForm.timeSlot[0],
+          endTime: this.dataForm.timeSlot[1],
+          factoryId: val
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.dataForm.inspectionType = res.data.inspectionType
+          }
+        })
+    },
+    gerCharacteristics(val) {
+      this.$http.get(this.urlOptions.getPurchaseRegistrationTypeURL, {
+        params: {
+          productId:val
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.dataForm.characteristicsId = res.data.parameterName
+          }
+        })
+    },
+    getData() {
+      this.$http
+        .post(this.urlOptions.getDataListURL, {
+          params: this.listQuery
+        }
+        )
+        .then(({ data: res }) => {
+          console.log(res)
+          let xAxisData = []
+          var chartDom = document.getElementById('priceMain');
+          var myChart = echarts.init(chartDom)
+          this.myChart = myChart
+          var option;
+          // myChart.on('click', function (params) {
+          //   console.log(params);
+          // });
+          myChart.on('click', 'xAxis.category', function (params) {
+            console.log(params);
+          });
+          option = {
+            title: {
+              text:'阶段图'
+            },
+            tooltip: {
+              trigger: 'axis'
+            },
+            // legend: {
+            //   data: ['推移图']
+            // },
+            grid: {
+              left: '3%',
+              right: '4%',
+              bottom: '3%',
+              containLabel: true
+            },
+            xAxis: {
+              data: res.data.purchaseRegistrationCharacteristicsDTOList.length,
+              type: 'category',
+              axisLabel: {
+                clickable: true
+              },
+              silent: false,
+              triggerEvent: true
+            },
+            yAxis: {
+              type: 'value'
+            },
+          };
+          option && myChart.setOption(option);
+        })
+    },
+    buttonClick(val) {
+      console.log(val)
+      switch (val.btnName) {
+        case "search":
+          this.dataForm.sampleSize = val.sampleSize ? val.sampleSize : null
+          this.dataForm.inspectionType = val.inspectionType ? val.inspectionType : null
+          this.dataForm.characteristicsId = val.characteristicsId ? val.characteristicsId : null
+          this.dataForm.factoryId = val.factoryId ? val.factoryId : null
+          this.dataForm.productId = val.productId ? val.productId : null
+          this.dataForm.startTime = val.timeSlot ? val.timeSlot[0] : null
+          this.dataForm.endTime = val.timeSlot ? val.timeSlot[1] : null
+          this.getData()
+          break;
+
+        default:
+          console.log(val)
+      }
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/finishproduct/trendChart.vue b/src/views/modules/finishproduct/trendChart.vue
new file mode 100644
index 0000000..197c7d8
--- /dev/null
+++ b/src/views/modules/finishproduct/trendChart.vue
@@ -0,0 +1,319 @@
+
+<!--
+ * @Author: zhp
+ * @Date: 2023-01-11 09:24:58
+ * @LastEditTime: 2023-06-20 15:51:17
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__user">
+      <el-form :inline="true" :model="dataForm" class="demo-form-inline">
+        <el-form-item :label="$t('code.inspectionTime')" prop="timeSlot">
+          <el-date-picker v-model="dataForm.timeSlot" size="small" type="datetimerange" format='yyyy-MM-dd HH:mm:ss'
+            @change="getFactory" valueFormat='yyyy-MM-ddTHH:mm:ss' :start-placeholder="$t('gage.startTime')"
+            :end-placeholder="$t('gage.endTime')" :range-separator="$t('gage.to')" clearable />
+        </el-form-item>
+        <el-form-item :label="$t('code.factoryName')">
+          <el-select v-model="dataForm.factoryId" :placeholder="$t('code.factoryName')" @change="getInspectionType">
+            <el-option v-for="item in factoryList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('code.productName')">
+          <el-select v-model="dataForm.productId" :placeholder="$t('code.productName')" @change="gerCharacteristics">
+            <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <!-- <el-form-item :label="$t('code.inspectionType')">
+          <el-select v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')">
+            <el-option v-for="item in inspectionTypeList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item> -->
+        <el-form-item :label="$t('code.inspectionType')">
+          <el-input v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('code.characteristics')">
+          <el-select v-model="dataForm.characteristicsId" :placeholder="$t('code.characteristics')">
+            <el-option v-for="item in characteristicsList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('code.sampleSize')">
+          <el-input v-model="dataForm.sampleSize" :placeholder="$t('code.sampleSize')"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getData">查询</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div id="priceMain" :style="{ width: '100%', height: '500px' }" />
+  </el-card>
+</template>
+
+<script>
+// import available from "./components/gageAvailable.vue"
+import i18n from "@/i18n"
+import * as echarts from 'echarts';
+export default {
+  data() {
+    return {
+      myChart: null,
+      urlOptions: {
+        getDataListURL: "/code/productRegistration/transition/diagram",
+        getFactoryURL: '/code/productRegistration/query/factory',
+        getProductURL: '/code/productRegistration/query/product',
+        getInspectionTypeURL: '/code/productRegistration/query/inspection/type',
+        getPurchaseRegistrationTypeURL: '/code/productRegistration/query/checkout/project',
+      },
+      factoryList: [],
+      productList: [],
+      characteristicsList:[],
+      listQuery: {
+        characteristicsId: null,
+        factoryId: null,
+        inspectionType: null, 
+        productId: null,
+        sampleSize: null,
+        endTime: null,
+        startTime: null,
+      },
+      dataForm: {
+        productId: null,
+        timeSlot: [],
+        factoryId: null,
+        characteristicsId: null,
+        inspectionType: null,
+        sampleSize: null
+      },
+      selectOptions: [{
+        id: 0,
+        name: '监控'
+      },
+      {
+        id: 1,
+        name: '电芯来料检验'
+      },
+      {
+        id: 2,
+        lname: 'IQC抽检'
+      },
+      {
+        id: 3,
+        name: 'IQC抽检2'
+      },
+      {
+        id: 4,
+        name: '原料抽检'
+      },
+      {
+        id: 5,
+        name: '进货外观检验'
+      },
+      {
+        id: 6,
+        name: '库内原料检验'
+      },
+      {
+        id: 7,
+        name: '来料检验'
+      },
+      {
+        id: 8,
+        name: '胶片'
+      },
+      {
+        id: 9,
+        name: '抽检'
+      },
+      {
+        id: 10,
+        name: '巡检'
+      }, {
+        id: 11,
+        name: '首检'
+      },
+      {
+        id: 12,
+        name: '末检'
+      },
+      {
+        id: 13,
+        name: '实时监测'
+      },
+      {
+        id: 14,
+        name: 'FQC抽检'
+      },
+      {
+        id: 15,
+        name: 'OQC抽检'
+      },
+      ],
+    };
+  },
+  // components: {
+  //   AddOrUpdate,
+  // },
+  mounted() {
+    this.getData()
+    // this.getDict()
+  },
+  methods: {
+    selectChanged(val) {
+      console.log(val)
+      alert(JSON.stringify(val))
+    },
+    getFactory(val) {
+      console.log(val)
+      this.$http.get(this.urlOptions.getFactoryURL, {
+        params: {
+          startTime: val[0],
+          endTime: val[1]
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.factoryList = res.data.map((item) => {
+              return {
+                id: item.factoryId,
+                name: item.factoryName
+              }
+            })
+          }
+        })
+      this.$http.get(this.urlOptions.getProductURL, {
+        params: {
+          startTime: val[0],
+          endTime: val[1]
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.productList = res.data.map((item) => {
+              return {
+                id: item.productId,
+                name: item.productName
+              }
+            })
+          }
+        })
+    },
+    getInspectionType(val) {
+      this.$http.get(this.urlOptions.getInspectionTypeURL, {
+        params: {
+          startTime: this.dataForm.timeSlot[0],
+          endTime: this.dataForm.timeSlot[1],
+          factoryId: val
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.dataForm.inspectionType = res.data.inspectionType
+          }
+        })
+    },
+    gerCharacteristics(val) {
+      this.$http.get(this.urlOptions.getPurchaseRegistrationTypeURL, {
+        params: {
+          productId: val
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.characteristicsList[0].id = res.data.id
+            this.characteristicsList[0].name = res.data.parameterName
+
+          }
+        })
+    },
+    getData() {
+      this.$http
+        .post(this.urlOptions.getDataListURL, {
+          params: this.listQuery
+        }
+        )
+        .then(({ data: res }) => {
+          console.log(res)
+          let xAxisData = []
+          let yAxisData = []
+          res.data.purchaseRegistrationCharacteristicsDTOList.forEach(ele => {
+            xAxisData.push(ele.batchNo + ele.groupNo)
+          })
+          res.data.purchaseRegistrationCharacteristicsDTOList.forEach(ele => {
+            yAxisData.push(ele.countValue)
+          })
+          var chartDom = document.getElementById('priceMain');
+          var myChart = echarts.init(chartDom)
+          this.myChart = myChart
+          var option;
+          // myChart.on('click', function (params) {
+          //   console.log(params);
+          // });
+          myChart.on('click', 'xAxis.category', function (params) {
+            console.log(params);
+          });
+          option = {
+            title: {
+              text: '推移图'
+            },
+            tooltip: {
+              trigger: 'axis'
+            },
+            // legend: {
+            //   data: ['推移图']
+            // },
+            grid: {
+              left: '3%',
+              right: '4%',
+              bottom: '3%',
+              containLabel: true
+            },
+            xAxis: {
+              data: res.data.map(i => { return i.batchNo + i.groupNo }),
+              type: 'category',
+              axisLabel: {
+                clickable: true
+              },
+              silent: false,
+              triggerEvent: true
+            },
+            yAxis: {
+              type: 'value'
+            },
+            series: [
+              {
+                name: '计数型值',
+                type: 'line',
+                stack: 'Total',
+                data: res.data.map(i => { return i.countValue })
+              }
+            ]
+          };
+          option && myChart.setOption(option);
+        })
+    },
+    buttonClick(val) {
+      console.log(val)
+      switch (val.btnName) {
+        case "search":
+          this.dataForm.sampleSize = val.sampleSize ? val.sampleSize : null
+          this.dataForm.inspectionType = val.inspectionType ? val.inspectionType : null
+          this.dataForm.characteristicsId = val.characteristicsId ? val.characteristicsId : null
+          this.dataForm.factoryId = val.factoryId ? val.factoryId : null
+          this.dataForm.productId = val.productId ? val.productId : null
+          this.dataForm.startTime = val.timeSlot ? val.timeSlot[0] : null
+          this.dataForm.endTime = val.timeSlot ? val.timeSlot[1] : null
+          this.getData()
+          break;
+
+        default:
+          console.log(val)
+      }
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/gage/components/gageType-add.vue b/src/views/modules/gage/components/gageType-add.vue
index 7b44efe..c3e4491 100644
--- a/src/views/modules/gage/components/gageType-add.vue
+++ b/src/views/modules/gage/components/gageType-add.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-02-14 15:02:26
- * @LastEditTime: 2023-05-17 14:40:50
+ * @LastEditTime: 2023-05-30 14:39:38
  * @LastEditors: zhp
  * @Description: 
 -->
@@ -52,7 +52,7 @@ export default {
       // teamList:[],
       listQuery: {
         limit: 999,
-        gape: 1
+        page: 1
       },
       measurementTypeList: [{
         id: 0,
diff --git a/src/views/modules/gage/components/parameter-show.vue b/src/views/modules/gage/components/parameter-show.vue
index d4285cc..bfc77c7 100644
--- a/src/views/modules/gage/components/parameter-show.vue
+++ b/src/views/modules/gage/components/parameter-show.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
  * @LastEditors: zhp
- * @LastEditTime: 2023-05-22 15:24:00
+ * @LastEditTime: 2023-06-20 15:36:04
  * @remark: 报废原因--新增
 -->
 <template>
@@ -186,7 +186,7 @@ export default {
           .catch(() => { });
       } else if (val.type === 'edit') {
         this.addOrUpdateVisible = true
-        this.addOrEditTitle = ' 修改'
+        this.addOrEditTitle = this.$t('edit')
         this.$nextTick(() => {
           this.$refs.addOrUpdate.init(val.data.id)
         });
diff --git a/src/views/modules/gage/components/verify-show.vue b/src/views/modules/gage/components/verify-show.vue
index 02c2de3..b6f8b93 100644
--- a/src/views/modules/gage/components/verify-show.vue
+++ b/src/views/modules/gage/components/verify-show.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
  * @LastEditors: zhp
- * @LastEditTime: 2023-05-23 14:21:48
+ * @LastEditTime: 2023-06-20 15:35:58
  * @remark: 报废原因--新增
 -->
 <template>
@@ -235,7 +235,7 @@ export default {
           .catch(() => { });
       } else if (val.type === 'edit') {
         this.addOrUpdateVisible = true
-        this.addOrEditTitle = ' 修改'
+        this.addOrEditTitle = this.$t('edit')
         this.$nextTick(() => {
           this.$refs.addOrUpdate.init(val.data.id)
         });
diff --git a/src/views/modules/gage/qmsGage.vue b/src/views/modules/gage/qmsGage.vue
index 404facd..7588bc0 100644
--- a/src/views/modules/gage/qmsGage.vue
+++ b/src/views/modules/gage/qmsGage.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-05-22 16:40:43
+ * @LastEditTime: 2023-06-20 15:36:34
  * @LastEditors: zhp
  * @Description: 
 -->
@@ -265,7 +265,8 @@ export default {
           })
           .catch(() => { });
       } else if (val.type === 'edit') {
-        this.addOrUpdateVisible = true;
+        this.addOrUpdateVisible = true
+        this.addOrEditTitle = this.$t('edit')
         this.$nextTick(() => {
           this.$refs.addOrUpdate.init(val.data.id);
         });
diff --git a/src/views/modules/gage/qmsGageGrr.vue b/src/views/modules/gage/qmsGageGrr.vue
index 94ec22a..e8c9bbf 100644
--- a/src/views/modules/gage/qmsGageGrr.vue
+++ b/src/views/modules/gage/qmsGageGrr.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-05-12 14:29:12
+ * @LastEditTime: 2023-06-21 16:52:20
  * @LastEditors: zhp
  * @Description: 
 -->
@@ -41,6 +41,18 @@
           </el-col>
         </el-row>
       </base-dialog>
+      <el-dialog :title="$t('gage.report')" :visible.sync="dialogTableVisible">
+        <el-table :show-header="false" :data="data" :span-method="objectSpanMethod" border :cell-style="columnStyle"
+          style="width: 100%; margin-top: 20px">
+          <el-table-column width="180" prop="name"></el-table-column>
+          <el-table-column prop="amount1"></el-table-column>
+          <el-table-column width="180" prop="amount2"></el-table-column>
+          <el-table-column prop="amount3"></el-table-column>
+          <el-table-column prop="amount4"></el-table-column>
+          <el-table-column prop="amount5"></el-table-column>
+        </el-table>
+      </el-dialog>
+
     </div>
   </el-card>
 </template>
@@ -95,7 +107,10 @@ const tableBtn = [
   {
     type: "delete",
     btnName: i18n.t("delete"),
-
+  },
+  {
+    type: "report",
+    btnName: i18n.t("gage.report"),
   },
   {
     type: "parameter",
@@ -108,6 +123,45 @@ export default {
     gageSearch,
     gapeGrsAdd
   },
+  computed: {
+    //因为数据用到了dataform中的数据，所以写在了computed中
+    data() {
+      return [
+        {
+          name: i18n.t("gage.partName"),
+          amount1: this.dataForm.partName,
+          amount2: i18n.t("gage.gageName"),
+          amount3: this.dataForm.gageName,
+          amount4: i18n.t("gage.measurementTime"),
+          amount5: this.dataForm.measurementTime
+        },
+        {
+          name: i18n.t("gage.itemNo"),
+          amount1: this.dataForm.itemNo,
+          amount2: i18n.t("gage.model"),
+          amount3: this.dataForm.model,
+          amount4: i18n.t("gage.measurementTime"),
+          amount5: this.dataForm.measurementTime
+        },
+        {
+          name: i18n.t("gage.measuringToolSpecification"),
+          amount1: this.dataForm.measuringToolSpecification,
+          amount2: i18n.t("gage.measuringToolAccuracy"),
+          amount3: this.dataForm.measuringToolAccuracy,
+          amount4: i18n.t("gage.process"),
+          amount5: this.dataForm.process
+        },
+        // {
+        //   name: i18n.t("gage.partName"),
+        //   amount1: this.dataForm.partName,
+        //   amount2: i18n.t("gage.gageName"),
+        //   amount3: this.dataForm.gageName,
+        //   amount4: i18n.t("gage.measurementTime"),
+        //   amount5: this.dataForm.measurementTime
+        // },
+      ];
+    }
+  },
   data() {
     return {
       urlOptions: {
@@ -115,7 +169,9 @@ export default {
         deleteURL: "/gage/qmsGageGrr",
         exportUrl: '/gage/qmsGageGrr/export'
       },
+      dialogTableVisible:false,
       tableProps,
+      dataForm: {},
       tableBtn,
       searchOrEditTitle: '',
       searchOrUpdateVisible: false,
@@ -154,6 +210,31 @@ export default {
   //   AddOrUpdate,
   // },
   methods: {
+    columnStyle({ row, column, rowIndex, columnIndex }) {
+      console.log(rowIndex)
+      if (columnIndex == 0 || columnIndex == 2 || columnIndex == 4) {
+        //第三第四列的背景色就改变了2和3都是列数的下标
+        return "background:#f3f6fc;";
+      } else {
+        return "background:#ffffff;";
+      }
+    },
+    // 和并列
+    // objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+    //   if (columnIndex === 0) {
+    //     if (rowIndex % 4 === 0) {
+    //       return {
+    //         rowspan: 4,
+    //         colspan: 1
+    //       };
+    //     } else {
+    //       return {
+    //         rowspan: 0,
+    //         colspan: 0
+    //       };
+    //     }
+    //   }
+    // },
     //search-bar点击
     handleProductCancel() {
       this.productOrUpdateVisible = false;
@@ -209,7 +290,8 @@ export default {
           })
           .catch(() => { });
       } else if (val.type === 'edit') {
-        this.addOrUpdateVisible = true;
+        this.addOrUpdateVisible = true
+        this.addOrEditTitle = this.$t('edit')
         this.$nextTick(() => {
           this.$refs.addOrUpdate.init(val.data.id);
         });
@@ -220,29 +302,10 @@ export default {
             gageTypeId: val.data.gageTypeId
           }
         })
-      } else if (val.type === 'change') {
-        const obj = {
-          id: val.data.id,
-          measurementType: val.data.measurementType,
-          name: val.data.name,
-          code: val.data.code,
-          gageTypeStatus: val.data.gageTypeStatus === 0 ? 1: 0,
-          parentId: val.data.parentId
-        }
-        this.$http.put(this.urlOptions.submitURL, obj)
-          .then(({ data: res }) => {
-            if (res.code !== 0) {
-              return this.$message.error(res.msg);
-            }
-            this.$message({
-              message: this.$t("prompt.success"),
-              type: "success",
-              duration: 500,
-              onClose: () => {
-                this.getDataList()
-              },
-            });
-          })
+      } else if (val.type === 'report') {
+        this.dialogTableVisible = true
+        this.dataForm = val.data
+        console.log(val.data)
       }
     },
     buttonClick(val) {
diff --git a/src/views/modules/gage/qmsGageResume.vue b/src/views/modules/gage/qmsGageResume.vue
index 017c234..663c986 100644
--- a/src/views/modules/gage/qmsGageResume.vue
+++ b/src/views/modules/gage/qmsGageResume.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-05-08 11:11:06
- * @LastEditTime: 2023-05-23 14:33:55
+ * @LastEditTime: 2023-06-20 15:36:23
  * @LastEditors: zhp
  * @Description: 
 -->
@@ -230,7 +230,8 @@ export default {
           })
           .catch(() => { });
       } else if (val.type === 'edit') {
-        this.addOrUpdateVisible = true;
+        this.addOrUpdateVisible = true
+        this.addOrEditTitle = this.$t('edit')
         this.$nextTick(() => {
           this.$refs.addOrUpdate.init(val.data.id);
         });
diff --git a/src/views/modules/gage/qmsGageType.vue b/src/views/modules/gage/qmsGageType.vue
index b705e42..a8991fc 100644
--- a/src/views/modules/gage/qmsGageType.vue
+++ b/src/views/modules/gage/qmsGageType.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-05-23 14:20:48
+ * @LastEditTime: 2023-06-20 15:36:19
  * @LastEditors: zhp
  * @Description: 
 -->
@@ -195,7 +195,8 @@ export default {
           })
           .catch(() => { });
       } else if (val.type === 'edit') {
-        this.addOrUpdateVisible = true;
+        this.addOrUpdateVisible = true
+        this.addOrEditTitle = this.$t('edit')
         this.$nextTick(() => {
           this.$refs.addOrUpdate.init(val.data.id);
         });
diff --git a/src/views/modules/gage/qmsGageTypeDifferenceParameter.vue b/src/views/modules/gage/qmsGageTypeDifferenceParameter.vue
index 264f2c1..430fd7d 100644
--- a/src/views/modules/gage/qmsGageTypeDifferenceParameter.vue
+++ b/src/views/modules/gage/qmsGageTypeDifferenceParameter.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-05-08 10:31:11
- * @LastEditTime: 2023-05-17 14:41:23
+ * @LastEditTime: 2023-06-20 15:36:15
  * @LastEditors: zhp
  * @Description: 
 -->
@@ -206,7 +206,8 @@ export default {
           })
           .catch(() => { });
       } else if (val.type === 'edit') {
-        this.addOrUpdateVisible = true;
+        this.addOrUpdateVisible = true
+        this.addOrEditTitle = this.$t('edit')
         this.$nextTick(() => {
           this.$refs.addOrUpdate.init(val.data.id);
         });
diff --git a/src/views/modules/gage/qmsGageVerification.vue b/src/views/modules/gage/qmsGageVerification.vue
index 4196da3..46cb27b 100644
--- a/src/views/modules/gage/qmsGageVerification.vue
+++ b/src/views/modules/gage/qmsGageVerification.vue
@@ -2,7 +2,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-05-11 10:20:06
+ * @LastEditTime: 2023-06-20 15:36:10
  * @LastEditors: zhp
  * @Description: 
 -->
@@ -263,7 +263,8 @@ export default {
           })
           .catch(() => { });
       } else if (val.type === 'edit') {
-        this.addOrUpdateVisible = true;
+        this.addOrUpdateVisible = true
+        this.addOrEditTitle = this.$t('edit')
         this.$nextTick(() => {
           this.$refs.addOrUpdate.init(val.data.id);
         });
diff --git a/src/views/modules/gage/qmsStationDeviationAnalysis.vue b/src/views/modules/gage/qmsStationDeviationAnalysis.vue
index a92c5c6..760fd2e 100644
--- a/src/views/modules/gage/qmsStationDeviationAnalysis.vue
+++ b/src/views/modules/gage/qmsStationDeviationAnalysis.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-05-17 14:03:17
+ * @LastEditTime: 2023-06-12 13:49:44
  * @LastEditors: zhp
  * @Description: 
 -->
@@ -106,12 +106,6 @@ export default {
           param: 'timeSlot',
           width: 350
         },
-        {
-          type: "button",
-          btnName: i18n.t('add'),
-          name: "add",
-          color: "primary",
-        },
         {
           type: "button",
           btnName: i18n.t('export'),
diff --git a/src/views/modules/incoming/CDiagram.vue b/src/views/modules/incoming/CDiagram.vue
new file mode 100644
index 0000000..b4aaf46
--- /dev/null
+++ b/src/views/modules/incoming/CDiagram.vue
@@ -0,0 +1,311 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-01-11 09:24:58
+ * @LastEditTime: 2023-06-20 15:52:15
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__user">
+      <el-form :inline="true" :model="dataForm" class="demo-form-inline">
+        <el-form-item :label="$t('code.inspectionTime')" prop="timeSlot">
+          <el-date-picker v-model="dataForm.timeSlot" size="small" type="datetimerange" format='yyyy-MM-dd HH:mm:ss'
+            @change="getFactory" valueFormat='yyyy-MM-ddTHH:mm:ss' :start-placeholder="$t('gage.startTime')"
+            :end-placeholder="$t('gage.endTime')" :range-separator="$t('gage.to')" clearable />
+        </el-form-item>
+        <el-form-item :label="$t('code.factoryName')">
+          <el-select v-model="dataForm.factoryId" :placeholder="$t('code.factoryName')" @change="getInspectionType">
+            <el-option v-for="item in factoryList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('code.productName')">
+          <el-select v-model="dataForm.productId" :placeholder="$t('code.productName')" @change="gerCharacteristics">
+            <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('code.inspectionType')">
+          <el-input v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('code.characteristics')">
+          <el-select v-model="dataForm.characteristicsId" :placeholder="$t('code.characteristics')">
+            <el-option v-for="item in characteristicsList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('code.grouping')">
+          <el-radio v-model="dataForm.divideIntoGroup" label="0">批号</el-radio>
+          <el-radio v-model="dataForm.divideIntoGroup" label="1">年</el-radio>
+          <el-radio v-model="dataForm.divideIntoGroup" label="2">月</el-radio>
+          <el-radio v-model="dataForm.divideIntoGroup" label="3">日</el-radio>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getData">查询</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div id="priceMain" :style="{ width: '100%', height: '500px' }" />
+  </el-card>
+</template>
+
+<script>
+// import available from "./components/gageAvailable.vue"
+import i18n from "@/i18n"
+import * as echarts from 'echarts';
+export default {
+  data() {
+    return {
+      myChart: null,
+      urlOptions: {
+        getDataListURL: "/code/purchaseRegistration/c/diagram",
+        getFactoryURL: '/code/purchaseRegistration/query/factory',
+        getProductURL: '/code/purchaseRegistration/query/product',
+        getInspectionTypeURL: '/code/purchaseRegistration/query/inspection/type',
+        getPurchaseRegistrationTypeURL: '/code/purchaseRegistration/query/checkout/project',
+      },
+      factoryList: [],
+      productList: [],
+      characteristicsList: [],
+      listQuery: {
+        characteristicsId: null,
+        factoryId: null,
+        inspectionType: null,
+        productId: null,
+        sampleSize: null,
+        endTime: null,
+        startTime: null,
+        divideIntoGroup:null
+      },
+      dataForm: {
+        productId: null,
+        timeSlot: [],
+        factoryId: null,
+        characteristicsId: null,
+        inspectionType: null,
+        sampleSize: null,
+        divideIntoGroup: null,
+        endTime: null,
+        startTime: null,
+      },
+      selectOptions: [{
+        id: 0,
+        name: '监控'
+      },
+      {
+        id: 1,
+        name: '电芯来料检验'
+      },
+      {
+        id: 2,
+        lname: 'IQC抽检'
+      },
+      {
+        id: 3,
+        name: 'IQC抽检2'
+      },
+      {
+        id: 4,
+        name: '原料抽检'
+      },
+      {
+        id: 5,
+        name: '进货外观检验'
+      },
+      {
+        id: 6,
+        name: '库内原料检验'
+      },
+      {
+        id: 7,
+        name: '来料检验'
+      },
+      {
+        id: 8,
+        name: '胶片'
+      },
+      {
+        id: 9,
+        name: '抽检'
+      },
+      {
+        id: 10,
+        name: '巡检'
+      }, {
+        id: 11,
+        name: '首检'
+      },
+      {
+        id: 12,
+        name: '末检'
+      },
+      {
+        id: 13,
+        name: '实时监测'
+      },
+      {
+        id: 14,
+        name: 'FQC抽检'
+      },
+      {
+        id: 15,
+        name: 'OQC抽检'
+      },
+      ],
+    };
+  },
+  // components: {
+  //   AddOrUpdate,
+  // },
+  mounted() {
+    this.getData()
+    // this.getDict()
+  },
+  methods: {
+    selectChanged(val) {
+      console.log(val)
+      alert(JSON.stringify(val))
+    },
+    getFactory(val) {
+      console.log(val)
+      this.$http.get(this.urlOptions.getFactoryURL, {
+        params: {
+          startTime: val[0],
+          endTime: val[1]
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.factoryList = res.data.map((item) => {
+              return {
+                id: item.factoryId,
+                name: item.factoryName
+              }
+            })
+          }
+        })
+      this.$http.get(this.urlOptions.getProductURL, {
+        params: {
+          startTime: val[0],
+          endTime: val[1]
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.productList = res.data.map((item) => {
+              return {
+                id: item.productId,
+                name: item.productName
+              }
+            })
+          }
+        })
+    },
+    getInspectionType(val) {
+      this.$http.get(this.urlOptions.getInspectionTypeURL, {
+        params: {
+          startTime: this.dataForm.timeSlot[0],
+          endTime: this.dataForm.timeSlot[1],
+          factoryId: val
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.dataForm.inspectionType = res.data.inspectionType
+          }
+        })
+    },
+    gerCharacteristics(val) {
+      this.$http.get(this.urlOptions.getPurchaseRegistrationTypeURL, {
+        params: {
+          productId: val
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.characteristicsList[0].id = res.data.id
+            this.characteristicsList[0].name = res.data.parameterName
+
+          }
+        })
+    },
+    getData() {
+      this.dataForm.startTime = this.dataForm.timeSlot ? this.dataForm.timeSlot[0] : null
+      this.dataForm.endTime = this.dataForm.timeSlot ? this.dataForm.timeSlot[1] : null
+      this.$http
+        .post(this.urlOptions.getDataListURL, {
+          params: this.dataForm
+        }
+        )
+        .then(({ data: res }) => {
+          let defectNumberArr = []
+          let xAxisData = []
+          res.data.forEach((item) => {
+            defectNumberArr.push(item.defectNumber)
+            this.dataForm.divideIntoGroup === 0 ? xAxisData.push(item.batchNo) : this.dataForm.divideIntoGroup === 1 ? xAxisData.push(item.year) : this.dataForm.divideIntoGroup === 2 ? xAxisData.push(item.month) : this.dataForm.divideIntoGroup === 3 ? xAxisData.push(item.day) : ''
+          })
+          var chartDom = document.getElementById('priceMain');
+          var myChart = echarts.init(chartDom)
+          this.myChart = myChart
+          var option;
+          // myChart.on('click', function (params) {
+          //   console.log(params);
+          // });
+          myChart.on('click', 'xAxis.category', function (params) {
+            console.log(params);
+          });
+          option = {
+            title: {
+              text: 'C图'
+            },
+            tooltip: {
+              trigger: 'axis'
+            },
+            // legend: {
+            //   data: ['推移图']
+            // },
+            grid: {
+              left: '3%',
+              right: '4%',
+              bottom: '3%',
+              containLabel: true
+            },
+            xAxis: {
+              data: xAxisData,
+              type: 'category',
+              axisLabel: {
+                clickable: true
+              },
+              silent: false,
+              triggerEvent: true
+            },
+            yAxis: {
+              type: 'value'
+            },
+            series: [
+              {
+                name: '	缺陷数',
+                type: 'line',
+                stack: 'Total',
+                data: defectNumberArr
+              }
+            ]
+          };
+          option && myChart.setOption(option);
+        })
+    },
+    buttonClick(val) {
+      console.log(val)
+      switch (val.btnName) {
+        case "search":
+          this.getData()
+          break;
+
+        default:
+          console.log(val)
+      }
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/incoming/NPDiagram.vue b/src/views/modules/incoming/NPDiagram.vue
new file mode 100644
index 0000000..d8ea40d
--- /dev/null
+++ b/src/views/modules/incoming/NPDiagram.vue
@@ -0,0 +1,317 @@
+
+<!--
+ * @Author: zhp
+ * @Date: 2023-01-11 09:24:58
+ * @LastEditTime: 2023-06-20 15:52:51
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__user">
+      <el-form :inline="true" :model="dataForm" class="demo-form-inline">
+        <el-form-item :label="$t('code.inspectionTime')" prop="timeSlot">
+          <el-date-picker v-model="dataForm.timeSlot" size="small" type="datetimerange" format='yyyy-MM-dd HH:mm:ss'
+            @change="getFactory" valueFormat='yyyy-MM-ddTHH:mm:ss' :start-placeholder="$t('gage.startTime')"
+            :end-placeholder="$t('gage.endTime')" :range-separator="$t('gage.to')" clearable />
+        </el-form-item>
+        <el-form-item :label="$t('code.factoryName')">
+          <el-select v-model="dataForm.factoryId" :placeholder="$t('code.factoryName')" @change="getInspectionType">
+            <el-option v-for="item in factoryList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('code.productName')">
+          <el-select v-model="dataForm.productId" :placeholder="$t('code.productName')" @change="gerCharacteristics">
+            <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <!-- <el-form-item :label="$t('code.inspectionType')">
+          <el-select v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')">
+            <el-option v-for="item in inspectionTypeList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item> -->
+        <el-form-item :label="$t('code.inspectionType')">
+          <el-input v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('code.characteristics')">
+          <el-select v-model="dataForm.characteristicsId" :placeholder="$t('code.characteristics')">
+            <el-option v-for="item in characteristicsList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('code.grouping')">
+          <el-radio v-model="dataForm.divideIntoGroup" label="0">批号</el-radio>
+          <el-radio v-model="dataForm.divideIntoGroup" label="1">年</el-radio>
+          <el-radio v-model="dataForm.divideIntoGroup" label="2">月</el-radio>
+          <el-radio v-model="dataForm.divideIntoGroup" label="3">日</el-radio>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getData">查询</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div id="priceMain" :style="{ width: '100%', height: '500px' }" />
+  </el-card>
+</template>
+
+<script>
+// import available from "./components/gageAvailable.vue"
+import i18n from "@/i18n"
+import * as echarts from 'echarts';
+export default {
+  data() {
+    return {
+      myChart: null,
+      urlOptions: {
+        getDataListURL: "/code/purchaseRegistration/np/diagram",
+        getFactoryURL: '/code/purchaseRegistration/query/factory',
+        getProductURL: '/code/purchaseRegistration/query/product',
+        getInspectionTypeURL: '/code/purchaseRegistration/query/inspection/type',
+        getPurchaseRegistrationTypeURL: '/code/purchaseRegistration/query/checkout/project',
+      },
+      factoryList: [],
+      productList: [],
+      characteristicsList: [],
+      listQuery: {
+        characteristicsId: null,
+        factoryId: null,
+        inspectionType: null,
+        productId: null,
+        sampleSize: null,
+        endTime: null,
+        startTime: null,
+        divideIntoGroup:null
+      },
+      dataForm: {
+        productId: null,
+        timeSlot: [],
+        factoryId: null,
+        characteristicsId: null,
+        inspectionType: null,
+        sampleSize: null,
+        divideIntoGroup: null,
+        endTime: null,
+        startTime: null,
+      },
+      selectOptions: [{
+        id: 0,
+        name: '监控'
+      },
+      {
+        id: 1,
+        name: '电芯来料检验'
+      },
+      {
+        id: 2,
+        lname: 'IQC抽检'
+      },
+      {
+        id: 3,
+        name: 'IQC抽检2'
+      },
+      {
+        id: 4,
+        name: '原料抽检'
+      },
+      {
+        id: 5,
+        name: '进货外观检验'
+      },
+      {
+        id: 6,
+        name: '库内原料检验'
+      },
+      {
+        id: 7,
+        name: '来料检验'
+      },
+      {
+        id: 8,
+        name: '胶片'
+      },
+      {
+        id: 9,
+        name: '抽检'
+      },
+      {
+        id: 10,
+        name: '巡检'
+      }, {
+        id: 11,
+        name: '首检'
+      },
+      {
+        id: 12,
+        name: '末检'
+      },
+      {
+        id: 13,
+        name: '实时监测'
+      },
+      {
+        id: 14,
+        name: 'FQC抽检'
+      },
+      {
+        id: 15,
+        name: 'OQC抽检'
+      },
+      ],
+    };
+  },
+  // components: {
+  //   AddOrUpdate,
+  // },
+  mounted() {
+    this.getData()
+    // this.getDict()
+  },
+  methods: {
+    selectChanged(val) {
+      console.log(val)
+      alert(JSON.stringify(val))
+    },
+    getFactory(val) {
+      console.log(val)
+      this.$http.get(this.urlOptions.getFactoryURL, {
+        params: {
+          startTime: val[0],
+          endTime: val[1]
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.factoryList = res.data.map((item) => {
+              return {
+                id: item.factoryId,
+                name: item.factoryName
+              }
+            })
+          }
+        })
+      this.$http.get(this.urlOptions.getProductURL, {
+        params: {
+          startTime: val[0],
+          endTime: val[1]
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.productList = res.data.map((item) => {
+              return {
+                id: item.productId,
+                name: item.productName
+              }
+            })
+          }
+        })
+    },
+    getInspectionType(val) {
+      this.$http.get(this.urlOptions.getInspectionTypeURL, {
+        params: {
+          startTime: this.dataForm.timeSlot[0],
+          endTime: this.dataForm.timeSlot[1],
+          factoryId: val
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.dataForm.inspectionType = res.data.inspectionType
+          }
+        })
+    },
+    gerCharacteristics(val) {
+      this.$http.get(this.urlOptions.getPurchaseRegistrationTypeURL, {
+        params: {
+          productId: val
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.characteristicsList[0].id = res.data.id
+            this.characteristicsList[0].name = res.data.parameterName
+
+          }
+        })
+    },
+    getData() {
+      this.dataForm.startTime = this.dataForm.timeSlot ? this.dataForm.timeSlot[0] : null
+      this.dataForm.endTime = this.dataForm.timeSlot ? this.dataForm.timeSlot[1] : null
+      this.$http
+        .post(this.urlOptions.getDataListURL, {
+          params: this.dataForm
+        }
+        )
+        .then(({ data: res }) => {
+          let xAxisData = []
+          res.data.forEach((item) => {
+            this.dataForm.divideIntoGroup === 0 ? xAxisData.push(item.batchNo) : this.dataForm.divideIntoGroup === 1 ? xAxisData.push(item.year) : this.dataForm.divideIntoGroup === 2 ? xAxisData.push(item.month) : this.dataForm.divideIntoGroup === 3 ? xAxisData.push(item.day) : ''
+          })
+          var chartDom = document.getElementById('priceMain');
+          var myChart = echarts.init(chartDom)
+          this.myChart = myChart
+          var option;
+          // myChart.on('click', function (params) {
+          //   console.log(params);
+          // });
+          myChart.on('click', 'xAxis.category', function (params) {
+            console.log(params);
+          });
+          option = {
+            title: {
+              text: 'C图'
+            },
+            tooltip: {
+              trigger: 'axis'
+            },
+            // legend: {
+            //   data: ['推移图']
+            // },
+            grid: {
+              left: '3%',
+              right: '4%',
+              bottom: '3%',
+              containLabel: true
+            },
+            xAxis: {
+              data: xAxisData,
+              type: 'category',
+              axisLabel: {
+                clickable: true
+              },
+              silent: false,
+              triggerEvent: true
+            },
+            yAxis: {
+              type: 'value',
+              data: dpuData
+            },
+            series: [
+              {
+                name: '缺陷数量',
+                type: 'line',
+                stack: 'Total',
+                data: res.data.map(i => { return i.defectNumber })
+              }
+            ]
+          };
+          option && myChart.setOption(option);
+        })
+    },
+    buttonClick(val) {
+      console.log(val)
+      switch (val.btnName) {
+        case "search":
+          this.getData()
+          break;
+
+        default:
+          console.log(val)
+      }
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/incoming/UDiagram.vue b/src/views/modules/incoming/UDiagram.vue
new file mode 100644
index 0000000..d6dd0c0
--- /dev/null
+++ b/src/views/modules/incoming/UDiagram.vue
@@ -0,0 +1,328 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-01-11 09:24:58
+ * @LastEditTime: 2023-06-20 15:53:43
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__user">
+      <el-form :inline="true" :model="dataForm" class="demo-form-inline">
+        <el-form-item :label="$t('code.inspectionTime')" prop="timeSlot">
+          <el-date-picker v-model="dataForm.timeSlot" size="small" type="datetimerange" format='yyyy-MM-dd HH:mm:ss'
+            @change="getFactory" valueFormat='yyyy-MM-ddTHH:mm:ss' :start-placeholder="$t('gage.startTime')"
+            :end-placeholder="$t('gage.endTime')" :range-separator="$t('gage.to')" clearable />
+        </el-form-item>
+        <el-form-item :label="$t('code.factoryName')">
+          <el-select v-model="dataForm.factoryId" :placeholder="$t('code.factoryName')" @change="getInspectionType">
+            <el-option v-for="item in factoryList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('code.productName')">
+          <el-select v-model="dataForm.productId" :placeholder="$t('code.productName')" @change="gerCharacteristics">
+            <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <!-- <el-form-item :label="$t('code.inspectionType')">
+          <el-select v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')">
+            <el-option v-for="item in inspectionTypeList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item> -->
+        <el-form-item :label="$t('code.inspectionType')">
+          <el-input v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('code.characteristics')">
+          <el-select v-model="dataForm.characteristicsId" :placeholder="$t('code.characteristics')">
+            <el-option v-for="item in characteristicsList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('code.grouping')">
+          <el-radio v-model="dataForm.divideIntoGroup" label="0">批号</el-radio>
+          <el-radio v-model="dataForm.divideIntoGroup" label="1">年</el-radio>
+          <el-radio v-model="dataForm.divideIntoGroup" label="2">月</el-radio>
+          <el-radio v-model="dataForm.divideIntoGroup" label="3">日</el-radio>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getData">查询</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div id="priceMain" :style="{ width: '100%', height: '500px' }" />
+  </el-card>
+</template>
+
+<script>
+// import available from "./components/gageAvailable.vue"
+import i18n from "@/i18n"
+import * as echarts from 'echarts';
+export default {
+  data() {
+    return {
+      myChart: null,
+      urlOptions: {
+        getDataListURL: "/code/purchaseRegistration/u/diagram",
+        getFactoryURL: '/code/purchaseRegistration/query/factory',
+        getProductURL: '/code/purchaseRegistration/query/product',
+        getInspectionTypeURL: '/code/purchaseRegistration/query/inspection/type',
+        getPurchaseRegistrationTypeURL: '/code/purchaseRegistration/query/checkout/project',
+      },
+      factoryList: [],
+      productList: [],
+      characteristicsList: [],
+      listQuery: {
+        characteristicsId: null,
+        factoryId: null,
+        inspectionType: null,
+        productId: null,
+        sampleSize: null,
+        endTime: null,
+        startTime: null,
+        divideIntoGroup:null
+      },
+      dataForm: {
+        productId: null,
+        timeSlot: [],
+        factoryId: null,
+        characteristicsId: null,
+        inspectionType: null,
+        sampleSize: null,
+        divideIntoGroup: null,
+        endTime: null,
+        startTime: null,
+      },
+      selectOptions: [{
+        id: 0,
+        name: '监控'
+      },
+      {
+        id: 1,
+        name: '电芯来料检验'
+      },
+      {
+        id: 2,
+        lname: 'IQC抽检'
+      },
+      {
+        id: 3,
+        name: 'IQC抽检2'
+      },
+      {
+        id: 4,
+        name: '原料抽检'
+      },
+      {
+        id: 5,
+        name: '进货外观检验'
+      },
+      {
+        id: 6,
+        name: '库内原料检验'
+      },
+      {
+        id: 7,
+        name: '来料检验'
+      },
+      {
+        id: 8,
+        name: '胶片'
+      },
+      {
+        id: 9,
+        name: '抽检'
+      },
+      {
+        id: 10,
+        name: '巡检'
+      }, {
+        id: 11,
+        name: '首检'
+      },
+      {
+        id: 12,
+        name: '末检'
+      },
+      {
+        id: 13,
+        name: '实时监测'
+      },
+      {
+        id: 14,
+        name: 'FQC抽检'
+      },
+      {
+        id: 15,
+        name: 'OQC抽检'
+      },
+      ],
+    };
+  },
+  // components: {
+  //   AddOrUpdate,
+  // },
+  mounted() {
+    this.getData()
+    // this.getDict()
+  },
+  methods: {
+    selectChanged(val) {
+      console.log(val)
+      alert(JSON.stringify(val))
+    },
+    getFactory(val) {
+      console.log(val)
+      this.$http.get(this.urlOptions.getFactoryURL, {
+        params: {
+          startTime: val[0],
+          endTime: val[1]
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.factoryList = res.data.map((item) => {
+              return {
+                id: item.factoryId,
+                name: item.factoryName
+              }
+            })
+          }
+        })
+      this.$http.get(this.urlOptions.getProductURL, {
+        params: {
+          startTime: val[0],
+          endTime: val[1]
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.productList = res.data.map((item) => {
+              return {
+                id: item.productId,
+                name: item.productName
+              }
+            })
+          }
+        })
+    },
+    getInspectionType(val) {
+      this.$http.get(this.urlOptions.getInspectionTypeURL, {
+        params: {
+          startTime: this.dataForm.timeSlot[0],
+          endTime: this.dataForm.timeSlot[1],
+          factoryId: val
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.dataForm.inspectionType = res.data.inspectionType
+          }
+        })
+    },
+    gerCharacteristics(val) {
+      this.$http.get(this.urlOptions.getPurchaseRegistrationTypeURL, {
+        params: {
+          productId: val
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.characteristicsList[0].id = res.data.id
+            this.characteristicsList[0].name = res.data.parameterName
+
+          }
+        })
+    },
+    getData() {
+      this.dataForm.startTime = this.dataForm.timeSlot ? this.dataForm.timeSlot[0] : null
+      this.dataForm.endTime = this.dataForm.timeSlot ? this.dataForm.timeSlot[1] : null
+      this.$http
+        .post(this.urlOptions.getDataListURL, {
+          params: this.dataForm
+        }
+        )
+        .then(({ data: res }) => {
+          let xAxisData = []
+          res.data.forEach((item) => {
+            this.dataForm.divideIntoGroup === 0 ? xAxisData.push(item.batchNo) : this.dataForm.divideIntoGroup === 1 ? xAxisData.push(item.year) : this.dataForm.divideIntoGroup === 2 ? xAxisData.push(item.month) : this.dataForm.divideIntoGroup === 3 ? xAxisData.push(item.day) : ''
+          })
+          var chartDom = document.getElementById('priceMain');
+          var myChart = echarts.init(chartDom)
+          this.myChart = myChart
+          var option;
+          // myChart.on('click', function (params) {
+          //   console.log(params);
+          // });
+          myChart.on('click', 'xAxis.category', function (params) {
+            console.log(params);
+          });
+          option = {
+            title: {
+              text: 'C图'
+            },
+            tooltip: {
+              trigger: 'axis'
+            },
+            // legend: {
+            //   data: ['推移图']
+            // },
+            grid: {
+              left: '3%',
+              right: '4%',
+              bottom: '3%',
+              containLabel: true
+            },
+            xAxis: {
+              data: xAxisData,
+              type: 'category',
+              axisLabel: {
+                clickable: true
+              },
+              silent: false,
+              triggerEvent: true
+            },
+            yAxis: {
+              type: 'value',
+              data: res.data.map(i => { return i.dpu })
+            },
+            series: [
+              {
+                name: '	单位缺陷',
+                type: 'line',
+                stack: 'Total',
+                data: res.data.map(i => { return i.dpu })
+              },
+              {
+                name: '	UCL',
+                type: 'line',
+                stack: 'Total',
+                data: res.data.map(i => { return i.ucl })
+              },
+                {
+                name: 'LCL',
+                type: 'line',
+                stack: 'Total',
+                  data: res.data.map(i => { return i.lcl })
+              }
+            ]
+          };
+          option && myChart.setOption(option);
+        })
+    },
+    buttonClick(val) {
+      console.log(val)
+      switch (val.btnName) {
+        case "search":
+          this.getData()
+          break;
+
+        default:
+          console.log(val)
+      }
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/incoming/boxplot.vue b/src/views/modules/incoming/boxplot.vue
new file mode 100644
index 0000000..4f8d570
--- /dev/null
+++ b/src/views/modules/incoming/boxplot.vue
@@ -0,0 +1,370 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-01-11 09:24:58
+ * @LastEditTime: 2023-06-20 15:51:56
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__user">
+      <el-form :inline="true" :model="dataForm" class="demo-form-inline">
+        <el-form-item :label="$t('code.inspectionTime')" prop="timeSlot">
+          <el-date-picker v-model="dataForm.timeSlot" size="small" type="datetimerange" format='yyyy-MM-dd HH:mm:ss'
+            @change="getFactory" valueFormat='yyyy-MM-ddTHH:mm:ss' :start-placeholder="$t('gage.startTime')"
+            :end-placeholder="$t('gage.endTime')" :range-separator="$t('gage.to')" clearable />
+        </el-form-item>
+        <el-form-item :label="$t('code.factoryName')">
+          <el-select v-model="dataForm.factoryId" :placeholder="$t('code.factoryName')" @change="getInspectionType">
+            <el-option v-for="item in factoryList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('code.productName')">
+          <el-select v-model="dataForm.productId" :placeholder="$t('code.productName')" @change="gerCharacteristics">
+            <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <!-- <el-form-item :label="$t('code.inspectionType')">
+          <el-select v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')">
+            <el-option v-for="item in inspectionTypeList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item> -->
+        <el-form-item :label="$t('code.inspectionType')">
+          <el-input v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('code.characteristics')">
+          <el-input v-model="dataForm.characteristicsId" :placeholder="$t('code.characteristics')"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('code.sampleSize')">
+          <el-input v-model="dataForm.sampleSize" :placeholder="$t('code.sampleSize')"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getData">查询</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div id="priceMain" :style="{ width: '100%', height: '500px' }" />
+  </el-card>
+</template>
+
+<script>
+// import available from "./components/gageAvailable.vue"
+import i18n from "@/i18n"
+import * as echarts from 'echarts';
+export default {
+  data() {
+    return {
+      myChart: null,
+      urlOptions: {
+        getDataListURL: "/code/purchaseRegistration/box/diagram",
+        getFactoryURL: '/code/purchaseRegistration/query/factory',
+        getProductURL: '/code/purchaseRegistration/query/product',
+        getInspectionTypeURL: '/code/purchaseRegistration/query/inspection/type',
+        getPurchaseRegistrationTypeURL: '/code/purchaseRegistration/query/checkout/project',
+      },
+      factoryList: [],
+      productList:[],
+      listQuery: {
+        characteristicsId:null,
+        factoryId: null,
+        inspectionType: null,
+        productId: null,
+        sampleSize: null,
+        endTime: null,
+        startTime: null,
+      },
+      dataForm: {
+        productId: null,
+        timeSlot: [],
+        factoryId: null,
+        characteristicsId: null,
+        inspectionType: null,
+        sampleSize:null
+      },
+      selectOptions: [{
+            id: 0,
+            name: '监控'
+          },
+            {
+              id: 1,
+              name: '电芯来料检验'
+            },
+            {
+              id: 2,
+              lname: 'IQC抽检'
+            },
+            {
+              id: 3,
+              name: 'IQC抽检2'
+            },
+            {
+              id: 4,
+              name: '原料抽检'
+            },
+            {
+              id: 5,
+              name: '进货外观检验'
+            },
+            {
+              id: 6,
+              name: '库内原料检验'
+            },
+            {
+              id: 7,
+              name: '来料检验'
+            },
+            {
+              id: 8,
+              name: '胶片'
+            },
+            {
+              id: 9,
+              name: '抽检'
+            },
+            {
+              id: 10,
+              name: '巡检'
+            }, {
+              id: 11,
+              name: '首检'
+            },
+            {
+              id: 12,
+              name: '末检'
+            },
+            {
+              id: 13,
+              name: '实时监测'
+            },
+            {
+              id: 14,
+              name: 'FQC抽检'
+            },
+            {
+              id: 15,
+              name: 'OQC抽检'
+            },
+          ],
+    };
+  },
+  // components: {
+  //   AddOrUpdate,
+  // },
+  mounted() {
+    this.getData()
+    // this.getDict()
+  },
+  methods: {
+    selectChanged(val) {
+      console.log(val)
+      alert(JSON.stringify(val))
+    },
+    getFactory(val) {
+      console.log(val)
+      this.$http.get(this.urlOptions.getFactoryURL, {
+        params: {
+          startTime: val[0],
+          endTime: val[1]
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.factoryList = res.data.map((item) => {
+              return {
+                id: item.factoryId,
+                name: item.factoryName
+              }
+            })
+          }
+        })
+      this.$http.get(this.urlOptions.getProductURL, {
+        params: {
+          startTime: val[0],
+          endTime: val[1]
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.productList = res.data.map((item) => {
+              return {
+                id: item.productId,
+                name: item.productName
+              }
+            })
+          }
+        })
+    },
+    getInspectionType(val) {
+      this.$http.get(this.urlOptions.getInspectionTypeURL, {
+        params: {
+          startTime: this.dataForm.timeSlot[0],
+          endTime: this.dataForm.timeSlot[1],
+          factoryId: val
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.dataForm.inspectionType = res.data.inspectionType
+          }
+        })
+    },
+    gerCharacteristics(val) {
+      this.$http.get(this.urlOptions.getPurchaseRegistrationTypeURL, {
+        params: {
+          productId:val
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.dataForm.characteristicsId = res.data.parameterName
+          }
+        })
+    },
+    getData() {
+      this.$http
+        .post(this.urlOptions.getDataListURL, {
+          params: this.listQuery
+        }
+        )
+        .then(({ data: res }) => {
+          console.log(res)
+          let xAxisData = []
+          var chartDom = document.getElementById('priceMain');
+          var myChart = echarts.init(chartDom)
+          this.myChart = myChart
+          var option;
+          // myChart.on('click', function (params) {
+          //   console.log(params);
+          // });
+          myChart.on('click', 'xAxis.category', function (params) {
+            console.log(params);
+          });
+          option = {
+            title: {
+              text:'箱线图'
+            },
+            tooltip: {
+              trigger: 'axis'
+            },
+            // legend: {
+            //   data: ['推移图']
+            // },
+            // tooltip: {
+            //   trigger: 'item', // axis显示该列下所有坐标轴对应数据，item只显示该点数据
+            //   axisPointer: { // 坐标轴指示器，坐标轴触发有效
+            //     type: 'line' // 默认为直线，可选为：'line' | 'shadow'
+            //   },
+            //   formatter: function (params) {
+            //     var res = `
+            //       <div>
+            //         <div
+            //           style='display: inline-block;
+            //           width:  10px;
+            //           height: 20px;
+            //           color: ${params.color}'
+            //           >●</div>
+            //         <span>${'min:' + res.data.min}</span>
+            //       </div>
+            //       <div>
+            //         <div
+            //           style='display: inline-block;
+            //           width: 10px;
+            //           height: 20px;
+            //           color: ${params.color}'
+            //         >●</div>
+            //         <span>${'Q1:' + res.data.Q1}</span>
+            //       </div>
+            //       <div>
+            //         <div
+            //           style='display: inline-block;
+            //           width: 10px;
+            //           height: 20px;
+            //           color: ${params.color}'
+            //         >●</div>
+            //         <span>${'median:' + res.data.median}</span>
+            //       </div>
+            //       <div>
+            //         <div
+            //           style='display: inline-block;
+            //           width: 10px;
+            //           height: 20px;
+            //           color: ${params.color}'
+            //         >●</div>
+            //         <span>${'Q3:' + res.data.Q3}</span>
+            //       </div>
+            //       <div>
+            //         <div
+            //           style='display: inline-block;
+            //           width: 10px;
+            //           height: 20px;
+            //           color: ${params.color}'
+            //         >●</div>
+            //         <span>${'max:' + res.data.max}</span>
+            //       </div>
+            //           <div>
+            //         <div
+            //           style='display: inline-block;
+            //           width: 10px;
+            //           height: 20px;
+            //           color: ${params.color}'
+            //         >●</div>
+            //         <span>${'outlier:' + res.data.outlier}</span>
+            //       </div>
+            //     `
+            //     return params.name + res
+            //   }
+            // },
+            grid: {
+              left: '3%',
+              right: '4%',
+              bottom: '3%',
+              containLabel: true
+            },
+            xAxis: {
+              data: [this.dataForm.characteristicsId ],
+              type: 'category',
+              axisLabel: {
+                clickable: true
+              },
+              silent: false,
+              triggerEvent: true
+            },
+            yAxis: {
+              type: 'value'
+            },
+            series: [
+              {
+                name: '最大值',
+                type: 'line',
+                stack: 'Total',
+                data: [res.data.max]
+              },
+            ]
+          };
+          option && myChart.setOption(option);
+        })
+    },
+    buttonClick(val) {
+      console.log(val)
+      switch (val.btnName) {
+        case "search":
+          this.dataForm.sampleSize = val.sampleSize ? val.sampleSize : null
+          this.dataForm.inspectionType = val.inspectionType ? val.inspectionType : null
+          this.dataForm.characteristicsId = val.characteristicsId ? val.characteristicsId : null
+          this.dataForm.factoryId = val.factoryId ? val.factoryId : null
+          this.dataForm.productId = val.productId ? val.productId : null
+          this.dataForm.startTime = val.timeSlot ? val.timeSlot[0] : null
+          this.dataForm.endTime = val.timeSlot ? val.timeSlot[1] : null
+          this.getData()
+          break;
+
+        default:
+          console.log(val)
+      }
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/incoming/components/available.vue b/src/views/modules/incoming/components/available.vue
new file mode 100644
index 0000000..6448570
--- /dev/null
+++ b/src/views/modules/incoming/components/available.vue
@@ -0,0 +1,43 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-01-31 09:49:36
+ * @LastEditTime: 2023-04-17 11:10:37
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <span>
+    <el-tag
+      v-if="injectData.controlStatus === 1 || injectData.customerTypeStatus === 1 || injectData.customerStatus === 1 || injectData.failureTypeStatus === 1 || injectData.productTypeStatus === 1"
+      type="success">可用</el-tag>
+    <el-tag v-else type="warning">不可用</el-tag>
+  </span>
+</template>
+
+<script>
+// import { addDynamicRoute } from '@/router'
+export default {
+  props: {
+    injectData: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  methods: {
+    // 子级
+    // emitClick () {
+    //   // 路由参数
+    //   const routeParams = {
+    //     routeName: `${this.$route.name}__${this.injectData.id}`,
+    //     title: `${this.$route.meta.title} - ${this.injectData.dictType}`,
+    //     path: 'sys/dict-data',
+    //     params: {
+    //       dictTypeId: this.injectData.id
+    //     }
+    //   }
+    //   // 动态路由
+    //   addDynamicRoute(routeParams, this.$router)
+    // }
+  }
+}
+</script>
diff --git a/src/views/modules/incoming/components/incomingInspection-add.vue b/src/views/modules/incoming/components/incomingInspection-add.vue
new file mode 100644
index 0000000..568235f
--- /dev/null
+++ b/src/views/modules/incoming/components/incomingInspection-add.vue
@@ -0,0 +1,427 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-02-14 15:02:26
+ * @LastEditTime: 2023-06-20 15:25:08
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
+    <el-row :gutter="24">
+      <el-col :span="8">
+        <el-form-item prop="factoryId" :label="$t('code.factoryName')">
+          <el-select v-model="dataForm.factoryId" :placeholder="$t('code.factoryName')">
+            <el-option v-for="item in factoryList" :key="item.id" :label="item.factoryName" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item prop="inspectionTime" :label="$t('code.inspectionTime')">
+          <el-date-picker v-model="dataForm.inspectionTime" type="datetime" :placeholder="$t('code.inspectionTime')"
+            format='yyyy-MM-dd HH:mm:ss' valueFormat='yyyy-MM-ddTHH:mm:ss'>
+          </el-date-picker>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item prop="orderNumber" :label="$t('code.orderNumber')">
+          <el-input v-model="dataForm.orderNumber" :placeholder="$t('code.orderNumber')"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="24">
+      <el-col :span="8">
+        <el-form-item prop="batchNo" :label="$t('code.batchNo')">
+          <el-input v-model="dataForm.batchNo" :placeholder="$t('code.batchNo')"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item prop="inspectionType" :label="$t('code.inspectionType')">
+          <el-select v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')">
+            <el-option v-for="item in inspectionTypeList" :key="item.value" :label="item.label" :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item prop="recheck" :label="$t('code.recheck')">
+          <el-switch v-model="dataForm.recheck" :active-value="1" :inactive-value="0">
+          </el-switch>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="24">
+      <el-col :span="8">
+        <el-form-item prop="productId" :label="$t('code.productName')">
+          <el-select v-model="dataForm.productId" :placeholder="$t('code.productName')">
+            <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item prop="supplierId" :label="$t('code.supplierName')">
+          <el-select v-model="dataForm.supplierId" :placeholder="$t('code.supplierName')">
+            <el-option v-for="item in supplierList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item prop="batchQuantity" :label="$t('code.batchQuantity')">
+          <el-input v-model="dataForm.batchQuantity" :placeholder="$t('code.batchQuantity')"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="24">
+      <el-col :span="8">
+        <el-form-item prop="inspectionQuantity" :label="$t('code.inspectionQuantity')">
+          <el-input v-model="dataForm.inspectionQuantity" :placeholder="$t('code.inspectionQuantity')"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item prop="batchSize" :label="$t('code.batchSize')">
+          <el-input v-model="dataForm.batchSize" :placeholder="$t('code.batchSize')"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item prop="samplesQuantity" :label="$t('code.samplesQuantity')">
+          <el-input v-model="dataForm.samplesQuantity" :placeholder="$t('code.samplesQuantity')"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="24">
+      <el-col :span="8">
+        <el-form-item prop="companyId" :label="$t('code.companyName')">
+          <el-select v-model="dataForm.companyId" :placeholder="$t('code.companyName')">
+            <el-option v-for="item in unitList" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item prop="userId" :label="$t('code.username')">
+          <el-select v-model="dataForm.userId" :placeholder="$t('code.username')">
+            <el-option v-for="item in unitList" :key="item.id" :label="item.realName" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item prop="inspectionStatus" :label="$t('code.inspectionStatus')">
+          <el-select v-model="dataForm.inspectionStatus" :placeholder="$t('code.inspectionStatus')">
+            <el-option v-for="item in inspectionStatusList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="24">
+      <el-col :span="8">
+        <el-form-item prop="customSamplingId" :label="$t('code.customSampling')">
+          <el-select v-model="dataForm.customSamplingId" :placeholder="$t('code.customSampling')">
+            <el-option v-for="item in samplingPlanList" :key="item.id" :label="item.sampleRange" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form>
+</template>
+
+<script>
+import debounce from "lodash/debounce";
+import basicAdd from "@/mixins/basic-add";
+export default {
+  mixins: [basicAdd],
+  data() {
+    return {
+      urlOptions: {
+        submitURL: "/code/incomingInspection",
+        infoURL: "/code/incomingInspection/{id}",
+        getFactoryURL: '/code/factory/page',
+        getProductURL: '/basic/product/page',
+        getSupplierURL: '/supplier/qmsSupplier/page',
+        getDictDataList: '/sys/dict/data/page',
+        getUserURL: '/sys/user/page',
+        getSamplingPlanURL: '/quality/qmsSamplingPlan/page'
+      },
+      supplierList: [],
+      userList: [],
+      samplingPlanList:[],
+      inspectionStatusList: [
+        {
+          id: 0,
+          name: '未登记'
+        },
+        {
+          id: 1,
+          name: '已登记'
+        }
+      ],
+      unitList:[],
+      productList: [],
+      factoryList:[],
+      visible: false,
+      listQuery: {
+        limit: 999,
+        page:1
+      },
+      inspectionTypeList: [{
+        value: 0,
+        label: '监控'
+      },
+      {
+        value: 1,
+        label: '电芯来料检验'
+      },
+      {
+        value: 2,
+        label: 'IQC抽检'
+      },
+      {
+        value: 3,
+        label: 'IQC抽检2'
+      },
+      {
+        value: 4,
+        label: '原料抽检'
+      },
+      {
+        value: 5,
+        label: '进货外观检验'
+      },
+      {
+        value: 6,
+        label: '库内原料检验'
+      },
+      {
+        value: 7,
+        label: '来料检验'
+      },
+      {
+        value: 8,
+        label: '胶片'
+      },
+      {
+        value: 9,
+        label: '抽检'
+      },
+      {
+        value: 10,
+        label: '巡检'
+      }, {
+        value: 11,
+        label: '首检'
+      },
+      {
+        value: 12,
+        label: '末检'
+      },
+      {
+        value: 13,
+        label: '实时监测'
+      },
+      {
+        value: 14,
+        label: 'FQC抽检'
+      },
+      {
+        value: 15,
+        label: 'OQC抽检'
+      },
+      ],
+      dataForm: {
+        id: null,
+        batchNo: null,
+        batchSize: null,
+        checkoutTime: null,
+        companyId: null,
+        factoryId: null,
+        inspectionPlan: null,
+        inspectionQuantity: null,
+        inspectionStatus: null,
+        inspectionTime: null,
+        inspectionType: null,
+        orderNumber: null,
+        productCode: null,
+        productId: null,
+        recheck: null,
+        remark: null,
+        samplesQuantity: null,
+        shiftId: null,
+        source: null,
+        supplierId: null,
+        teamId: null,
+        userId: null,
+      },
+    };
+  },
+  computed: {
+    dataRule() {
+      return {
+        dictLabel: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+        dictValue: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+        sort: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+      };
+    },
+  },
+  created() {
+    this.getDict()
+  },
+  methods: {
+    init(id, ) {
+      this.dataForm.id = id || ""
+      // this.dataForm.dictTypeId = dictTypeId || "";
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs["dataForm"].resetFields();
+        if (this.dataForm.id) {
+          this.getInfo();
+        }
+      });
+    },
+    // 获取信息
+    getInfo() {
+      this.$http
+        .get(`/code/incomingInspection/${this.dataForm.id}`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          }
+          this.dataForm = {
+            ...this.dataForm,
+            ...res.data,
+          };
+        })
+        .catch(() => {})
+    },
+    getDict() {
+      this.$http
+        .get(this.urlOptions.getSamplingPlanURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.samplingPlanList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      this.$http
+        .get(this.urlOptions.getUserURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.userList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      this.$http
+        .get(this.urlOptions.getProductURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.productList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      this.$http
+        .get(this.urlOptions.getDictDataList, {
+          params: {
+            limit: 999,
+            page: 1,
+            dictTypeId: '1665966021935190018'
+          }
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.unitList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      this.$http
+        .get(this.urlOptions.getSupplierURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.supplierList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      this.$http
+        .get(this.urlOptions.getFactoryURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.factoryList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      // console.log(111111);
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(
+      function () {
+        this.$refs["dataForm"].validate((valid) => {
+          if (!valid) {
+            return false;
+          }
+          this.$http[!this.dataForm.id ? "post" : "put"](this.urlOptions.submitURL, this.dataForm)
+            .then(({ data: res }) => {
+              if (res.code !== 0) {
+                return this.$message.error(res.msg);
+              }
+              this.$message({
+                message: this.$t("prompt.success"),
+                type: "success",
+                duration: 500,
+                onClose: () => {
+                  this.visible = false;
+                  console.log(1111);
+                  this.$emit("successSubmit");
+                },
+              });
+            })
+            .catch(() => {});
+        });
+      },
+      1000,
+      { leading: true, trailing: false }
+    ),
+  },
+};
+</script>
diff --git a/src/views/modules/incoming/components/incomingInspectionSearch.vue b/src/views/modules/incoming/components/incomingInspectionSearch.vue
new file mode 100644
index 0000000..1c2afeb
--- /dev/null
+++ b/src/views/modules/incoming/components/incomingInspectionSearch.vue
@@ -0,0 +1,321 @@
+<!--
+ * @Author: zwq
+ * @Date: 2023-01-04 10:29:40
+ * @LastEditors: zhp
+ * @LastEditTime: 2023-06-20 15:24:30
+ * @Description: 
+-->
+<template>
+  <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
+    <el-form-item prop="factoryId" :label="$t('code.factoryName')">
+      <el-select v-model="dataForm.factoryId" :placeholder="$t('code.factoryName')">
+        <el-option v-for="item in factoryList" :key="item.id" :label="item.factoryName" :value="item.id">
+        </el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item prop="batchNo" :label="$t('code.batchNo')">
+      <el-input v-model="dataForm.batchNo" :placeholder="$t('code.batchNo')"></el-input>
+    </el-form-item>
+    <el-form-item prop="inspectionType" :label="$t('code.inspectionType')">
+      <el-select v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')">
+        <el-option v-for="item in inspectionTypeList" :key="item.value" :label="item.label" :value="item.value">
+        </el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item prop="recheck" :label="$t('code.recheck')">
+      <el-switch v-model="dataForm.recheck" :active-value="1" :inactive-value="0">
+      </el-switch>
+    </el-form-item>
+    <el-form-item prop="productId" :label="$t('code.productName')">
+      <el-select v-model="dataForm.productId" :placeholder="$t('code.productName')">
+        <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.id">
+        </el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item prop="supplierId" :label="$t('code.supplierName')">
+      <el-select v-model="dataForm.supplierId" :placeholder="$t('code.supplierName')">
+        <el-option v-for="item in supplierList" :key="item.id" :label="item.name" :value="item.id">
+        </el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item prop="customSamplingId" :label="$t('code.customSampling')">
+      <el-select v-model="dataForm.customSamplingId" :placeholder="$t('code.customSampling')">
+        <el-option v-for="item in samplingPlanList" :key="item.id" :label="item.sampleRange" :value="item.id">
+        </el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item prop="recheck" :label="$t('code.recheck')">
+      <el-switch v-model="dataForm.recheck" :active-value="1" :inactive-value="0">
+      </el-switch>
+    </el-form-item>
+    <el-form-item prop="task" :label="$t('code.task')">
+      <el-switch v-model="dataForm.task" :active-value="1" :inactive-value="0">
+      </el-switch>
+    </el-form-item>
+    <el-form-item prop="inspectionStatus" :label="$t('code.inspectionStatus')">
+      <el-select v-model="dataForm.inspectionStatus" :placeholder="$t('code.inspectionStatus')">
+        <el-option v-for="item in inspectionStatusList" :key="item.id" :label="item.name" :value="item.id">
+        </el-option>
+      </el-select>
+    </el-form-item>
+  </el-form>
+</template>
+
+<script>
+import debounce from "lodash/debounce";
+import basicAdd from "@/mixins/basic-add";
+export default {
+  mixins: [basicAdd],
+  data() {
+    return {
+      urlOptions: {
+        submitURL: "/basic/qmsCustomerType",
+        infoURL: "/basic/qmsCustomerType/{id}",
+        getCodeURL: '/basic/qmsControlMode/getCode',
+        getFactoryURL: '/code/factory/page',
+        getProductURL: '/basic/product/page',
+        getSupplierURL: '/supplier/qmsSupplier/page',
+        getDictDataList: '/sys/dict/data/page',
+        getUserURL: '/sys/user/page',
+        getSamplingPlanURL: '/quality/qmsSamplingPlan/page'
+      },
+      // urlOptions: {
+      //   submitURL: "/sys/params/",
+      //   infoURL: "/sys/params",
+      // },
+      inspectionStatusList: [
+        {
+          id: 0,
+          name: '未登记'
+        },
+        {
+          id: 1,
+          name: '已登记'
+        }
+      ],
+      supplierList: [],
+      userList: [],
+      samplingPlanList: [],
+      unitList: [],
+      productList: [],
+      factoryList: [],
+      visible: false,
+      inspectionTypeList: [{
+        value: 0,
+        label: '监控'
+      },
+      {
+        value: 1,
+        label: '电芯来料检验'
+      },
+      {
+        value: 2,
+        label: 'IQC抽检'
+      },
+      {
+        value: 3,
+        label: 'IQC抽检2'
+      },
+      {
+        value: 4,
+        label: '原料抽检'
+      },
+      {
+        value: 5,
+        label: '进货外观检验'
+      },
+      {
+        value: 6,
+        label: '库内原料检验'
+      },
+      {
+        value: 7,
+        label: '来料检验'
+      },
+      {
+        value: 8,
+        label: '胶片'
+      },
+      {
+        value: 9,
+        label: '抽检'
+      },
+      {
+        value: 10,
+        label: '巡检'
+      }, {
+        value: 11,
+        label: '首检'
+      },
+      {
+        value: 12,
+        label: '末检'
+      },
+      {
+        value: 13,
+        label: '实时监测'
+      },
+      {
+        value: 14,
+        label: 'FQC抽检'
+      },
+      {
+        value: 15,
+        label: 'OQC抽检'
+      },
+      ],
+      dataForm: {
+        batchNo:null,
+        customSamplingId: null,
+        endTime: null,
+        factoryId: null,
+        inspectionStatus: null,
+        inspectionType: null,
+        productId: null,
+        recheck: null,
+        startTime: null,
+        supplierId: null,
+        task: null,
+        userId: null,
+      },
+    };
+  },
+  computed: {
+    // dataRule() {
+    //   return {
+    //     paramCode: [
+    //       {
+    //         required: true,
+    //         message: this.$t("validate.required"),
+    //         trigger: "blur",
+    //       },
+    //     ],
+    //     paramValue: [
+    //       {
+    //         required: true,
+    //         message: this.$t("validate.required"),
+    //         trigger: "blur",
+    //       },
+    //     ],
+    //   };
+    // },
+  },
+  mounted () {
+    this.getDict()
+  },
+  methods: {
+    getDict() {
+      this.$http
+        .post(this.urlOptions.getSamplingPlanURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.samplingPlanList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      this.$http
+        .post(this.urlOptions.getProductURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.productList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      this.$http
+        .post(this.urlOptions.getSupplierURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.supplierList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      this.$http
+        .post(this.urlOptions.getFactoryURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.factoryList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      // console.log(111111);
+    },
+    // init(id) {
+    //   this.dataForm.id = id || "";
+    //   this.visible = true;
+    //   this.$nextTick(() => {
+    //     this.$refs["dataForm"].resetFields();
+    //     if (this.dataForm.id) {
+    //       this.getInfo();
+    //     }
+    //   });
+    // },
+    // 获取信息
+    // getInfo() {
+    //   this.$http
+    //     .get(`/sys/params/${this.dataForm.id}`)
+    //     .then(({ data: res }) => {
+    //       if (res.code !== 0) {
+    //         return this.$message.error(res.msg);
+    //       }
+    //       this.dataForm = {
+    //         ...this.dataForm,
+    //         ...res.data,
+    //       };
+    //     })
+    //     .catch(() => {});
+    // },
+    // 表单提交
+    handleConditionSearch() {
+      this.$emit("successSubmit", this.dataForm)
+    },
+    // dataFormSubmitHandle: debounce(
+    //   function () {
+    //     // console.log(1111);
+    //     // this.visible = false;
+    //     this.$emit("successSubmit", this.dataForm.key);
+    //     // this.$refs["dataForm"].validate((valid) => {
+    //     //   if (!valid) {
+    //     //     return false;
+    //     //   }
+    //     //   this.$http[!this.dataForm.id ? "post" : "put"](
+    //     //     "/sys/params",
+    //     //     this.dataForm
+    //     //   )
+    //     //     .then(({ data: res }) => {
+    //     //       if (res.code !== 0) {
+    //     //         return this.$message.error(res.msg);
+    //     //       }
+    //     //       this.$message({
+    //     //         message: this.$t("prompt.success"),
+    //     //         type: "success",
+    //     //         duration: 500,
+    //     //         onClose: () => {
+
+    //     //         },
+    //     //       });
+    //     //     })
+    //     //     .catch(() => {});
+    //     // });
+    //   },
+    //   1000,
+    //   { leading: true, trailing: false }
+    // ),
+  },
+};
+</script>
diff --git a/src/views/modules/incoming/components/meanMovingRangeRange.vue b/src/views/modules/incoming/components/meanMovingRangeRange.vue
new file mode 100644
index 0000000..66092f7
--- /dev/null
+++ b/src/views/modules/incoming/components/meanMovingRangeRange.vue
@@ -0,0 +1,254 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-06-19 09:19:53
+ * @LastEditTime: 2023-06-19 10:49:27
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <el-row :gutter="24">
+      <el-col :span="18">
+        <div id="priceMain" :style="{ width: '100%', height: '500px' }" />
+      </el-col>
+      <el-col :span="6">
+        <el-table style="width: 100%" :data="getValues" :show-header="false">
+          <el-table-column width="180" v-for="(item, index) in getHeaders" :key="index" :prop="item">
+          </el-table-column>
+        </el-table>
+      </el-col>
+    </el-row>
+  </el-card>
+</template>
+
+<script>
+// import available from "./components/gageAvailable.vue"
+import i18n from "@/i18n"
+import * as echarts from 'echarts';
+export default {
+  data() {
+    return {
+      myChart: null,
+      urlOptions: {
+        getDataListURL: "/code/purchaseRegistration/mean/range/chart",
+      },
+      tableData: [],
+      headers: [
+        {
+          prop: 'usl',
+          label: 'USL',
+        },
+        {
+          prop: 'sl',
+          label: 'SL',
+        },
+        {
+          prop: 'lsl',
+          label: 'LSL',
+        },
+        {
+          prop: 'rangeUcl',
+          label: 'CL(图一)',
+        },
+        {
+          prop: 'averageUcl',
+          label: 'UCL(图一)',
+        },
+        {
+          prop: 'rangeLcl',
+          label: 'LCL(图一)',
+        },
+        {
+          prop: 'standardDeviationCl',
+          label: 'CL(图二)',
+        },
+        {
+          prop: 'standardDeviationLcl',
+          label: 'LCL(图二)',
+        },
+        {
+          prop: 'standardDeviationUcl',
+          label: 'UCL(图二)',
+        },
+        {
+          prop: 'standardDeviationGroup',
+          label: '标准差',
+        },
+        {
+          prop: 'cpk',
+          label: 'cpk',
+        },
+        {
+          prop: 'standardDeviationWhole',
+          label: '总体标准差',
+        },
+        {
+          prop: 'ppk',
+          label: 'ppk',
+        },
+        {
+          prop: 'ca',
+          label: 'ca',
+        },
+        {
+          prop: 'cp',
+          label: 'cp',
+        },
+        {
+          prop: 'ca',
+          label: 'ca',
+        },
+        {
+          prop: 'average',
+          label: '均值',
+        },
+        {
+          prop: 'max',
+          label: '最大值',
+        },
+        {
+          prop: 'max',
+          label: '最大值',
+        },
+      ],
+      listQuery: {
+        characteristicsId: null,
+        factoryId: null,
+        inspectionType: null,
+        productId: null,
+        sampleSize: null,
+        endTime: null,
+        startTime: null,
+      },
+    };
+  },
+  computed: {
+    getHeaders() {
+      return this.tableData.reduce((pre, cur, index) => pre.concat(`value${index}`), ['title'])
+    },
+    getValues() {
+      return this.headers.map(item => {
+        return this.tableData.reduce((pre, cur, index) => Object.assign(pre, { ['value' + index]: cur[item.prop] }), { 'title': item.label, });
+      });
+    }
+  },
+  // components: {
+  //   AddOrUpdate,
+  // },
+  methods: {
+    getData(listQuery) {
+      this.$http
+        .post(this.urlOptions.getDataListURL, {
+          params: listQuery
+        }
+        )
+        .then(({ data: res }) => {
+          this.tableData.push({
+            average: res.data.average,
+            averageCl: res.data.averageCl,
+            averageLcl: res.data.averageLcl,
+            averageUcl: res.data.averageUcl,
+            ca: res.data.ca,
+            cp: res.data.cp,
+            cpk: res.data.cpk,
+            groupNum: res.data.groupNum,
+            lsl: res.data.lsl,
+            ppk: res.data.ppk,
+            rangeCl: res.data.rangeCl,
+            rangeLcl: res.data.rangeCl,
+            rangeUcl: res.data.rangeCl,
+            standardDeviationWhole: res.data.standardDeviationWhole,
+            usl: res.data.usl,
+            max: res.data.max,
+            min: res.data.min,
+          })
+          console.log(res)
+          var chartDom = document.getElementById('priceMain');
+          var myChart = echarts.init(chartDom)
+          this.myChart = myChart
+          var option;
+          // myChart.on('click', function (params) {
+          //   console.log(params);
+          // });
+          myChart.on('click', 'xAxis.category', function (params) {
+            console.log(params);
+          });
+          option = {
+            title: {
+              text: '均值极差图'
+            },
+            tooltip: {
+              trigger: 'axis'
+            },
+            // legend: {
+            //   data: ['推移图']
+            // },
+            grid: {
+              left: '3%',
+              right: '4%',
+              bottom: '3%',
+              containLabel: true
+            },
+            xAxis: {
+              data: [1, 2131, 312, 231321, 321312, 321321, 321312, 321321],
+              type: 'category',
+              axisLabel: {
+                clickable: true
+              },
+              silent: false,
+              triggerEvent: true
+            },
+            yAxis: {
+              type: 'value'
+            },
+            series: [
+              {
+                name: 'lsl',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.lsl]
+              },
+              {
+                name: 'UCL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.averageUcl]
+              },
+              {
+                name: 'UCL(图二)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.rangeUcl]
+              },
+              {
+                name: 'USL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.usl]
+              },
+              {
+                name: 'CL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.rangeCl]
+              },
+              {
+                name: 'LCL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.averageLcl]
+              },
+              {
+                name: 'SL',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.sl]
+              },
+            ]
+          };
+          option && myChart.setOption(option);
+        })
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/incoming/components/meanMovingRangeStandardDeviation.vue b/src/views/modules/incoming/components/meanMovingRangeStandardDeviation.vue
new file mode 100644
index 0000000..dd8c6b8
--- /dev/null
+++ b/src/views/modules/incoming/components/meanMovingRangeStandardDeviation.vue
@@ -0,0 +1,254 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-06-19 09:19:53
+ * @LastEditTime: 2023-06-19 10:49:35
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <el-row :gutter="24">
+      <el-col :span="18">
+        <div id="priceMain" :style="{ width: '100%', height: '500px' }" />
+      </el-col>
+      <el-col :span="6">
+        <el-table style="width: 100%" :data="getValues" :show-header="false">
+          <el-table-column width="180" v-for="(item, index) in getHeaders" :key="index" :prop="item">
+          </el-table-column>
+        </el-table>
+      </el-col>
+    </el-row>
+  </el-card>
+</template>
+
+<script>
+// import available from "./components/gageAvailable.vue"
+import i18n from "@/i18n"
+import * as echarts from 'echarts';
+export default {
+  data() {
+    return {
+      myChart: null,
+      urlOptions: {
+        getDataListURL: "/code/purchaseRegistration/mean/range/chart",
+      },
+      tableData: [],
+      headers: [
+        {
+          prop: 'usl',
+          label: 'USL',
+        },
+        {
+          prop: 'sl',
+          label: 'SL',
+        },
+        {
+          prop: 'lsl',
+          label: 'LSL',
+        },
+        {
+          prop: 'rangeUcl',
+          label: 'CL(图一)',
+        },
+        {
+          prop: 'averageUcl',
+          label: 'UCL(图一)',
+        },
+        {
+          prop: 'rangeLcl',
+          label: 'LCL(图一)',
+        },
+        {
+          prop: 'standardDeviationCl',
+          label: 'CL(图二)',
+        },
+        {
+          prop: 'standardDeviationLcl',
+          label: 'LCL(图二)',
+        },
+        {
+          prop: 'standardDeviationUcl',
+          label: 'UCL(图二)',
+        },
+        {
+          prop: 'standardDeviationGroup',
+          label: '标准差',
+        },
+        {
+          prop: 'cpk',
+          label: 'cpk',
+        },
+        {
+          prop: 'standardDeviationWhole',
+          label: '总体标准差',
+        },
+        {
+          prop: 'ppk',
+          label: 'ppk',
+        },
+        {
+          prop: 'ca',
+          label: 'ca',
+        },
+        {
+          prop: 'cp',
+          label: 'cp',
+        },
+        {
+          prop: 'ca',
+          label: 'ca',
+        },
+        {
+          prop: 'average',
+          label: '均值',
+        },
+        {
+          prop: 'max',
+          label: '最大值',
+        },
+        {
+          prop: 'max',
+          label: '最大值',
+        },
+      ],
+      listQuery: {
+        characteristicsId: null,
+        factoryId: null,
+        inspectionType: null,
+        productId: null,
+        sampleSize: null,
+        endTime: null,
+        startTime: null,
+      },
+    };
+  },
+  computed: {
+    getHeaders() {
+      return this.tableData.reduce((pre, cur, index) => pre.concat(`value${index}`), ['title'])
+    },
+    getValues() {
+      return this.headers.map(item => {
+        return this.tableData.reduce((pre, cur, index) => Object.assign(pre, { ['value' + index]: cur[item.prop] }), { 'title': item.label, });
+      });
+    }
+  },
+  // components: {
+  //   AddOrUpdate,
+  // },
+  methods: {
+    getData(listQuery) {
+      this.$http
+        .post(this.urlOptions.getDataListURL, {
+          params: listQuery
+        }
+        )
+        .then(({ data: res }) => {
+          this.tableData.push({
+            average: res.data.average,
+            averageCl: res.data.averageCl,
+            averageLcl: res.data.averageLcl,
+            averageUcl: res.data.averageUcl,
+            ca: res.data.ca,
+            cp: res.data.cp,
+            cpk: res.data.cpk,
+            groupNum: res.data.groupNum,
+            lsl: res.data.lsl,
+            ppk: res.data.ppk,
+            rangeCl: res.data.rangeCl,
+            rangeLcl: res.data.rangeCl,
+            rangeUcl: res.data.rangeCl,
+            standardDeviationWhole: res.data.standardDeviationWhole,
+            usl: res.data.usl,
+            max: res.data.max,
+            min: res.data.min,
+          })
+          console.log(res)
+          var chartDom = document.getElementById('priceMain');
+          var myChart = echarts.init(chartDom)
+          this.myChart = myChart
+          var option;
+          // myChart.on('click', function (params) {
+          //   console.log(params);
+          // });
+          myChart.on('click', 'xAxis.category', function (params) {
+            console.log(params);
+          });
+          option = {
+            title: {
+              text: '均值极差图'
+            },
+            tooltip: {
+              trigger: 'axis'
+            },
+            // legend: {
+            //   data: ['推移图']
+            // },
+            grid: {
+              left: '3%',
+              right: '4%',
+              bottom: '3%',
+              containLabel: true
+            },
+            xAxis: {
+              data: [1, 2131, 312, 231321, 321312, 321321, 321312, 321321],
+              type: 'category',
+              axisLabel: {
+                clickable: true
+              },
+              silent: false,
+              triggerEvent: true
+            },
+            yAxis: {
+              type: 'value'
+            },
+            series: [
+              {
+                name: 'lsl',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.lsl]
+              },
+              {
+                name: 'UCL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.averageUcl]
+              },
+              {
+                name: 'UCL(图二)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.rangeUcl]
+              },
+              {
+                name: 'USL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.usl]
+              },
+              {
+                name: 'CL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.rangeCl]
+              },
+              {
+                name: 'LCL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.averageLcl]
+              },
+              {
+                name: 'SL',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.sl]
+              },
+            ]
+          };
+          option && myChart.setOption(option);
+        })
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/incoming/components/meanRange.vue b/src/views/modules/incoming/components/meanRange.vue
new file mode 100644
index 0000000..829fbfe
--- /dev/null
+++ b/src/views/modules/incoming/components/meanRange.vue
@@ -0,0 +1,264 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-06-19 09:19:53
+ * @LastEditTime: 2023-06-19 14:35:10
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <el-row :gutter="24">
+      <el-col :span="18">
+        <div id="priceMain" :style="{ width: '100%', height: '500px' }" />
+      </el-col>
+      <el-col :span="6">
+        <el-table style="width: 100%" :data="getValues" :show-header="false">
+          <el-table-column width="180" v-for="(item, index) in getHeaders" :key="index" :prop="item">
+          </el-table-column>
+        </el-table>
+      </el-col>
+    </el-row>
+  </el-card>
+</template>
+
+<script>
+// import available from "./components/gageAvailable.vue"
+import i18n from "@/i18n"
+import * as echarts from 'echarts';
+export default {
+  data() {
+    return {
+      myChart: null,
+      urlOptions: {
+        getDataListURL: "/code/purchaseRegistration/mean/range/chart",
+      },
+      tableData:[],
+      headers: [
+        {
+          prop: 'usl',
+          label: 'USL',
+        },
+        {
+          prop: 'sl',
+          label: 'SL',
+        },
+        {
+          prop: 'lsl',
+          label: 'LSL',
+        },
+        {
+          prop: 'averageUcl',
+          label: 'CL(图一)',
+        },
+        {
+          prop: 'averageUcl',
+          label: 'UCL(图一)',
+        },
+        {
+          prop: 'averageLcl',
+          label: 'LCL(图一)',
+        },
+        {
+          prop: 'rangeCl',
+          label: 'CL(图二)',
+        },
+        {
+          prop: 'rangeLcl',
+          label: 'LCL(图二)',
+        },
+        {
+          prop: 'rangeUcl',
+          label: 'UCL(图二)',
+        },
+        {
+          prop: 'standardDeviationGroup',
+          label: '标准差',
+        },
+        {
+          prop: 'cpk',
+          label: 'cpk',
+        },
+        {
+          prop: 'standardDeviationWhole',
+          label: '总体标准差',
+        },
+        {
+          prop: 'ppk',
+          label: 'ppk',
+        },
+        {
+          prop: 'ca',
+          label: 'ca',
+        },
+        {
+          prop: 'cp',
+          label: 'cp',
+        },
+        {
+          prop: 'ca',
+          label: 'ca',
+        },
+        {
+          prop: 'average',
+          label: '均值',
+        },
+        {
+          prop: 'max',
+          label: '最大值',
+        },
+        {
+          prop: 'max',
+          label: '最大值',
+        },
+      ],
+      listQuery: {
+        characteristicsId: null,
+        factoryId: null,
+        inspectionType: null,
+        productId: null,
+        sampleSize: null,
+        endTime: null,
+        startTime: null,
+      },
+    };
+  },
+  computed: {
+    getHeaders() {
+      return this.tableData.reduce((pre, cur, index) => pre.concat(`value${index}`), ['title'])
+    },
+    getValues() {
+      return this.headers.map(item => {
+        return this.tableData.reduce((pre, cur, index) => Object.assign(pre, { ['value' + index]: cur[item.prop] }), { 'title': item.label, });
+      });
+    }
+  },
+  // components: {
+  //   AddOrUpdate,
+  // },
+  methods: {
+    getData(listQuery) {
+      this.$http
+        .post(this.urlOptions.getDataListURL, {
+          params: listQuery
+        }
+        )
+        .then(({ data: res }) => {
+          this.tableData.push({
+            average: res.data.average,
+            averageCl: res.data.averageCl,
+            averageLcl: res.data.averageLcl,
+            averageUcl: res.data.averageUcl,
+            ca: res.data.ca,
+            cp: res.data.cp,
+            cpk: res.data.cpk,
+            groupNum: res.data.groupNum,
+            lsl: res.data.lsl,
+            ppk: res.data.ppk,
+            rangeCl: res.data.rangeCl,
+            rangeLcl: res.data.rangeLcl,
+            rangeUcl: res.data.rangeUcl,
+            standardDeviationWhole: res.data.standardDeviationWhole,
+            usl: res.data.usl,
+            max: res.data.max,
+            min: res.data.min,
+          })
+          console.log(res)
+          let xAxisData = []
+          res.data.purchaseRegistrationCharacteristicsDTOList.forEach(ele => {
+            xAxisData.push(ele.batchNo + ele.groupNo)
+          })
+          var chartDom = document.getElementById('priceMain');
+          var myChart = echarts.init(chartDom)
+          this.myChart = myChart
+          var option;
+          // myChart.on('click', function (params) {
+          //   console.log(params);
+          // });
+          myChart.on('click', 'xAxis.category', function (params) {
+            console.log(params);
+          });
+          option = {
+            title: {
+              text: '均值极差图'
+            },
+            tooltip: {
+              trigger: 'axis'
+            },
+            // legend: {
+            //   data: ['推移图']
+            // },
+            grid: {
+              left: '3%',
+              right: '4%',
+              bottom: '3%',
+              containLabel: true
+            },
+            xAxis: {
+              data: xAxisData,
+              type: 'category',
+              axisLabel: {
+                clickable: true
+              },
+              silent: false,
+              triggerEvent: true
+            },
+            yAxis: {
+              type: 'value'
+            },
+            series: [
+              {
+                name: 'lsl',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.lsl]
+              },
+              {
+                name: 'UCL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.averageUcl]
+              },
+              {
+                name: 'UCL(图二)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.rangeUcl]
+              },
+              {
+                name: 'USL',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.usl]
+              },
+              {
+                name: 'CL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.averageCl]
+              },
+              {
+                name: 'CL(图二)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.rangeCl]
+              },
+              {
+                name: 'LCL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.averageLcl]
+              },
+              {
+                name: 'SL',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.sl]
+              },
+            ]
+          };
+          option && myChart.setOption(option);
+        })
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/incoming/components/meanStandard.vue b/src/views/modules/incoming/components/meanStandard.vue
new file mode 100644
index 0000000..28b95bb
--- /dev/null
+++ b/src/views/modules/incoming/components/meanStandard.vue
@@ -0,0 +1,264 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-06-19 09:19:53
+ * @LastEditTime: 2023-06-19 14:42:37
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <el-row :gutter="24">
+      <el-col :span="18">
+        <div id="priceMain" :style="{ width: '100%', height: '500px' }" />
+      </el-col>
+      <el-col :span="6">
+        <el-table style="width: 100%" :data="getValues" :show-header="false">
+          <el-table-column width="180" v-for="(item, index) in getHeaders" :key="index" :prop="item">
+          </el-table-column>
+        </el-table>
+      </el-col>
+    </el-row>
+  </el-card>
+</template>
+
+<script>
+// import available from "./components/gageAvailable.vue"
+import i18n from "@/i18n"
+import * as echarts from 'echarts';
+export default {
+  data() {
+    return {
+      myChart: null,
+      urlOptions: {
+        getDataListURL: "/code/productRegistration/mean/standard/deviation/chart",
+      },
+      tableData: [],
+      headers: [
+        {
+          prop: 'usl',
+          label: 'USL',
+        },
+        {
+          prop: 'sl',
+          label: 'SL',
+        },
+        {
+          prop: 'lsl',
+          label: 'LSL',
+        },
+        {
+          prop: 'averageCl',
+          label: 'CL(图一)',
+        },
+        {
+          prop: 'averageUcl',
+          label: 'UCL(图一)',
+        },
+        {
+          prop: 'averageLcl',
+          label: 'LCL(图一)',
+        },
+        {
+          prop: 'standardDeviationCl',
+          label: 'CL(图二)',
+        },
+        {
+          prop: 'standardDeviationLcl',
+          label: 'LCL(图二)',
+        },
+        {
+          prop: 'standardDeviationUcl',
+          label: 'UCL(图二)',
+        },
+        {
+          prop: 'standardDeviationGroup',
+          label: '标准差',
+        },
+        {
+          prop: 'cpk',
+          label: 'cpk',
+        },
+        {
+          prop: 'standardDeviationWhole',
+          label: '总体标准差',
+        },
+        {
+          prop: 'ppk',
+          label: 'ppk',
+        },
+        {
+          prop: 'ca',
+          label: 'ca',
+        },
+        {
+          prop: 'cp',
+          label: 'cp',
+        },
+        {
+          prop: 'ca',
+          label: 'ca',
+        },
+        {
+          prop: 'average',
+          label: '均值',
+        },
+        {
+          prop: 'max',
+          label: '最大值',
+        },
+        {
+          prop: 'max',
+          label: '最大值',
+        },
+      ],
+      listQuery: {
+        characteristicsId: null,
+        factoryId: null,
+        inspectionType: null,
+        productId: null,
+        sampleSize: null,
+        endTime: null,
+        startTime: null,
+      },
+    };
+  },
+  computed: {
+    getHeaders() {
+      return this.tableData.reduce((pre, cur, index) => pre.concat(`value${index}`), ['title'])
+    },
+    getValues() {
+      return this.headers.map(item => {
+        return this.tableData.reduce((pre, cur, index) => Object.assign(pre, { ['value' + index]: cur[item.prop] }), { 'title': item.label, });
+      });
+    }
+  },
+  // components: {
+  //   AddOrUpdate,
+  // },
+  methods: {
+    getData(listQuery) {
+      this.$http
+        .post(this.urlOptions.getDataListURL, {
+          params: listQuery
+        }
+        )
+        .then(({ data: res }) => {
+          this.tableData.push({
+            average: res.data.average,
+            averageCl: res.data.averageCl,
+            averageLcl: res.data.averageLcl,
+            averageUcl: res.data.averageUcl,
+            ca: res.data.ca,
+            cp: res.data.cp,
+            cpk: res.data.cpk,
+            groupNum: res.data.groupNum,
+            lsl: res.data.lsl,
+            ppk: res.data.ppk,
+            standardDeviationCl: res.data.standardDeviationCl,
+            standardDeviationLcl: res.data.standardDeviationLcl,
+            standardDeviationUcl: res.data.standardDeviationUcl,
+            standardDeviationWhole: res.data.standardDeviationWhole,
+            usl: res.data.usl,
+            max: res.data.max,
+            min: res.data.min,
+          })
+          console.log(res)
+          let xAxisData = []
+          res.data.purchaseRegistrationCharacteristicsDTOList.forEach(ele => {
+            xAxisData.push(ele.batchNo + ele.groupNo)
+          })
+          var chartDom = document.getElementById('priceMain');
+          var myChart = echarts.init(chartDom)
+          this.myChart = myChart
+          var option;
+          // myChart.on('click', function (params) {
+          //   console.log(params);
+          // });
+          myChart.on('click', 'xAxis.category', function (params) {
+            console.log(params);
+          });
+          option = {
+            title: {
+              text: '均值极差图'
+            },
+            tooltip: {
+              trigger: 'axis'
+            },
+            // legend: {
+            //   data: ['推移图']
+            // },
+            grid: {
+              left: '3%',
+              right: '4%',
+              bottom: '3%',
+              containLabel: true
+            },
+            xAxis: {
+              data: xAxisData,
+              type: 'category',
+              axisLabel: {
+                clickable: true
+              },
+              silent: false,
+              triggerEvent: true
+            },
+            yAxis: {
+              type: 'value'
+            },
+            series: [
+              {
+                name: 'lsl',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.lsl]
+              },
+              {
+                name: 'UCL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.averageUcl]
+              },
+              {
+                name: 'UCL(图二)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.standardDeviationUcl]
+              },
+              {
+                name: 'USL',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.usl]
+              },
+              {
+                name: 'CL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.averageCl]
+              }, 
+              {
+                name: 'CL(图二)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.standardDeviationCl]
+              },
+              {
+                name: 'LCL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.averageLcl]
+              },
+              {
+                name: 'SL',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.sl]
+              },
+            ]
+          };
+          option && myChart.setOption(option);
+        })
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/incoming/components/medianRange.vue b/src/views/modules/incoming/components/medianRange.vue
new file mode 100644
index 0000000..acafd23
--- /dev/null
+++ b/src/views/modules/incoming/components/medianRange.vue
@@ -0,0 +1,271 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-06-19 09:19:53
+ * @LastEditTime: 2023-06-19 14:42:46
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <el-row :gutter="24">
+      <el-col :span="18">
+        <div id="priceMain" :style="{ width: '100%', height: '500px' }" />
+      </el-col>
+      <el-col :span="6">
+        <el-table style="width: 100%" :data="getValues" :show-header="false">
+          <el-table-column width="180" v-for="(item, index) in getHeaders" :key="index" :prop="item">
+          </el-table-column>
+        </el-table>
+      </el-col>
+    </el-row>
+  </el-card>
+</template>
+
+<script>
+// import available from "./components/gageAvailable.vue"
+import i18n from "@/i18n"
+import * as echarts from 'echarts';
+export default {
+  data() {
+    return {
+      myChart: null,
+      urlOptions: {
+        getDataListURL: "/code/purchaseRegistration/median/range/chart",
+      },
+      tableData: [],
+      headers: [
+        {
+          prop: 'usl',
+          label: 'USL',
+        },
+        {
+          prop: 'sl',
+          label: 'SL',
+        },
+        {
+          prop: 'lsl',
+          label: 'LSL',
+        },
+        {
+          prop: 'averageUcl',
+          label: 'CL(图一)',
+        },
+        {
+          prop: 'averageUcl',
+          label: 'UCL(图一)',
+        },
+        {
+          prop: 'averageLcl',
+          label: 'LCL(图一)',
+        },
+        {
+          prop: 'rangeCl',
+          label: 'CL(图二)',
+        },
+        {
+          prop: 'rangeLcl',
+          label: 'LCL(图二)',
+        },
+        {
+          prop: 'rangeUcl',
+          label: 'UCL(图二)',
+        },
+        {
+          prop: 'standardDeviationGroup',
+          label: '标准差',
+        },
+        {
+          prop: 'cpk',
+          label: 'cpk',
+        },
+        {
+          prop: 'standardDeviationWhole',
+          label: '总体标准差',
+        },
+        {
+          prop: 'ppk',
+          label: 'ppk',
+        },
+        {
+          prop: 'ca',
+          label: 'ca',
+        },
+        {
+          prop: 'cp',
+          label: 'cp',
+        },
+        {
+          prop: 'ca',
+          label: 'ca',
+        },
+        {
+          prop: 'average',
+          label: '均值',
+        },
+        {
+          prop: 'max',
+          label: '最大值',
+        },
+        {
+          prop: 'max',
+          label: '最大值',
+        },
+        {
+          prop: 'median',
+          label: '中位数',
+        },
+      ],
+      listQuery: {
+        characteristicsId: null,
+        factoryId: null,
+        inspectionType: null,
+        productId: null,
+        sampleSize: null,
+        endTime: null,
+        startTime: null,
+      },
+    };
+  },
+  computed: {
+    getHeaders() {
+      return this.tableData.reduce((pre, cur, index) => pre.concat(`value${index}`), ['title'])
+    },
+    getValues() {
+      return this.headers.map(item => {
+        return this.tableData.reduce((pre, cur, index) => Object.assign(pre, { ['value' + index]: cur[item.prop] }), { 'title': item.label, });
+      });
+    }
+  },
+  // components: {
+  //   AddOrUpdate,
+  // },
+  methods: {
+    getData(listQuery) {
+      this.$http
+        .post(this.urlOptions.getDataListURL, {
+          params: listQuery
+        }
+        )
+        .then(({ data: res }) => {
+          this.tableData.push({
+            average: res.data.average,
+            averageCl: res.data.averageCl,
+            averageLcl: res.data.averageLcl,
+            averageUcl: res.data.averageUcl,
+            ca: res.data.ca,
+            cp: res.data.cp,
+            cpk: res.data.cpk,
+            groupNum: res.data.groupNum,
+            lsl: res.data.lsl,
+            ppk: res.data.ppk,
+            rangeCl: res.data.rangeCl,
+            rangeLcl: res.data.rangeCl,
+            rangeUcl: res.data.rangeCl,
+            standardDeviationWhole: res.data.standardDeviationWhole,
+            usl: res.data.usl,
+            max: res.data.max,
+            min: res.data.min,
+          })
+          res.data.purchaseRegistrationCharacteristicsDTOList.forEach(ele => {
+            this.tableData.push(ele.median)
+          })
+          let xAxisData = []
+          res.data.purchaseRegistrationCharacteristicsDTOList.forEach(ele => {
+            xAxisData.push(ele.batchNo + ele.groupNo)
+          })
+          console.log(res)
+          var chartDom = document.getElementById('priceMain');
+          var myChart = echarts.init(chartDom)
+          this.myChart = myChart
+          var option;
+          // myChart.on('click', function (params) {
+          //   console.log(params);
+          // });
+          myChart.on('click', 'xAxis.category', function (params) {
+            console.log(params);
+          });
+          option = {
+            title: {
+              text: '均值极差图'
+            },
+            tooltip: {
+              trigger: 'axis'
+            },
+            // legend: {
+            //   data: ['推移图']
+            // },
+            grid: {
+              left: '3%',
+              right: '4%',
+              bottom: '3%',
+              containLabel: true
+            },
+            xAxis: {
+              data: xAxisData,
+              type: 'category',
+              axisLabel: {
+                clickable: true
+              },
+              silent: false,
+              triggerEvent: true
+            },
+            yAxis: {
+              type: 'value'
+            },
+            series: [
+              {
+                name: 'lsl',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.lsl]
+              },
+              {
+                name: 'UCL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.averageUcl]
+              },
+              {
+                name: 'UCL(图二)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.rangeUcl]
+              },
+              {
+                name: 'USL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.usl]
+              },
+              {
+                name: 'CL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.rangeCl]
+              },
+              {
+                name: 'CL(图二)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.rangeCl]
+              },
+              {
+                name: 'LCL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.averageLcl]
+              },
+              {
+                name: 'SL',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.sl]
+              },
+            ]
+          };
+          option && myChart.setOption(option);
+        })
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/incoming/components/planBtn.vue b/src/views/modules/incoming/components/planBtn.vue
new file mode 100644
index 0000000..60fe5df
--- /dev/null
+++ b/src/views/modules/incoming/components/planBtn.vue
@@ -0,0 +1,68 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-01-31 09:49:36
+ * @LastEditTime: 2023-05-17 15:00:50
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <span>
+    <el-button type="text" @click="emitClick()">同步所有关联产品</el-button>
+  </span>
+</template>
+
+<script>
+// import { addDynamicRoute } from '@/router'
+export default {
+  props: {
+    injectData: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  data() {
+    return {
+      urlOptions: {
+        syncURL: "/basic/qmsProduct/connectAllProduct"
+      },
+    }
+  },
+  methods: {
+    // 子级
+    emitClick() {
+      const data = {
+        id: this.injectData.id,
+        finishInspection: this.injectData.finishInspection,
+        incomingInspection: this.injectData.incomingInspection,
+        outInspection: this.injectData.outInspection,
+        processInspection: this.injectData.outInspection
+      }
+      this.$http.put(this.urlOptions.syncURL, { data }).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.$message({
+            message: "操作成功",
+            type: "success",
+            duration: 1500,
+            onClose: () => {
+              this.$message.error(data.msg);
+            },
+          });
+        } else {
+          this.$message.error(data.msg)
+        }
+      });
+      // 路由参数
+      // const routeParams = {
+      //   routeName: `${this.$route.name}__${this.injectData.id}`,
+      //   title: `${this.$route.meta.title} - ${this.injectData.dictType}`,
+      //   path: 'sys/dict-data',
+      //   params: {
+      //     dictTypeId: this.injectData.id
+      //   }
+      // }
+      // 动态路由
+      // addDynamicRoute(routeParams, this.$router)
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/incoming/components/purchaseRegistration-add.vue b/src/views/modules/incoming/components/purchaseRegistration-add.vue
new file mode 100644
index 0000000..0dea683
--- /dev/null
+++ b/src/views/modules/incoming/components/purchaseRegistration-add.vue
@@ -0,0 +1,634 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-02-14 15:02:26
+ * @LastEditTime: 2023-06-20 15:28:55
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <div>
+    <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
+      <el-row :gutter="24">
+        <el-col :span="8">
+          <el-form-item prop="factoryId" :label="$t('code.factoryName')">
+            <el-select v-model="dataForm.factoryId" :placeholder="$t('code.factoryName')">
+              <el-option v-for="item in factoryList" :key="item.id" :label="item.factoryName" :value="item.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item prop="inspectionTime" :label="$t('code.inspectionTime')">
+            <el-date-picker v-model="dataForm.inspectionTime" type="datetime" :placeholder="$t('code.inspectionTime')"
+              format='yyyy-MM-dd HH:mm:ss' valueFormat='yyyy-MM-ddTHH:mm:ss'>
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item prop="orderNumber" :label="$t('code.orderNumber')">
+            <el-input v-model="dataForm.orderNumber" :placeholder="$t('code.orderNumber')"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="8">
+          <el-form-item prop="batchNo" :label="$t('code.batchNo')">
+            <el-input v-model="dataForm.batchNo" :placeholder="$t('code.batchNo')"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item prop="inspectionType" :label="$t('code.inspectionType')">
+            <el-select v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')">
+              <el-option v-for="item in inspectionTypeList" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item prop="recheck" :label="$t('code.recheck')">
+            <el-switch v-model="dataForm.recheck" :active-value="1" :inactive-value="0">
+            </el-switch>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="8">
+          <el-form-item prop="productId" :label="$t('code.productName')">
+            <el-select v-model="dataForm.productId" :placeholder="$t('code.productName')">
+              <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item prop="supplierId" :label="$t('code.supplierName')">
+            <el-select v-model="dataForm.supplierId" :placeholder="$t('code.supplierName')">
+              <el-option v-for="item in supplierList" :key="item.id" :label="item.name" :value="item.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item prop="batchQuantity" :label="$t('code.batchQuantity')">
+            <el-input v-model="dataForm.batchQuantity" :placeholder="$t('code.batchQuantity')"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="8">
+          <el-form-item prop="inspectionQuantity" :label="$t('code.inspectionQuantity')">
+            <el-input v-model="dataForm.inspectionQuantity" :placeholder="$t('code.inspectionQuantity')"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item prop="batchSize" :label="$t('code.batchSize')">
+            <el-input v-model="dataForm.batchSize" :placeholder="$t('code.batchSize')"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item prop="samplesQuantity" :label="$t('code.samplesQuantity')">
+            <el-input v-model="dataForm.samplesQuantity" :placeholder="$t('code.samplesQuantity')"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="8">
+          <el-form-item prop="companyId" :label="$t('code.companyName')">
+            <el-select v-model="dataForm.companyId" :placeholder="$t('code.companyName')">
+              <el-option v-for="item in unitList" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item prop="userId" :label="$t('code.username')">
+            <el-select v-model="dataForm.userId" :placeholder="$t('code.username')">
+              <el-option v-for="item in unitList" :key="item.id" :label="item.realName" :value="item.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item prop="inspectionStatus" :label="$t('code.inspectionStatus')">
+            <el-select v-model="dataForm.inspectionStatus" :placeholder="$t('code.inspectionStatus')">
+              <el-option v-for="item in inspectionStatusList" :key="item.id" :label="item.name" :value="item.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="8">
+          <el-form-item prop="customSamplingId" :label="$t('code.customSampling')">
+            <el-select v-model="dataForm.customSamplingId" :placeholder="$t('code.customSampling')">
+              <el-option v-for="item in samplingPlanList" :key="item.id" :label="item.sampleRange" :value="item.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <el-divider content-position="center">GBT2828.1</el-divider>
+    <el-form :model="GBTDataForm" ref="GBTDataForm" label-width="80px">
+      <el-row :gutter="24">
+        <el-col :span="4">
+          <el-form-item prop="critical" label="CR" label-width="50px">
+            <el-input v-model="GBTDataForm.critical" placeholder="CR"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item prop="criticalAccept" label="Accept">
+            <el-input v-model="GBTDataForm.criticalAccept" placeholder="Accept"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item prop="criticalReject" label="Reject" label-width="60px">
+            <el-input v-model="GBTDataForm.criticalReject" placeholder="Reject"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item prop="criticalNumber" :label="$t('code.defectsNumber')">
+            <el-input v-model="GBTDataForm.criticalNumber" :placeholder="$t('code.defectsNumber')"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item prop="criticalDefectiveNumber" :label="$t('code.defectiveQuantity')">
+            <el-input v-model="GBTDataForm.criticalDefectiveNumber" :placeholder="$t('code.defectiveQuantity')">
+            </el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="4">
+          <el-form-item prop="major" label="MA" label-width="50px">
+            <el-input v-model="GBTDataForm.major" placeholder="CR"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item prop="majorAccept" label="Accept">
+            <el-input v-model="GBTDataForm.majorAccept" placeholder="Accept"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item prop="majorReject" label="Reject" label-width="60px">
+            <el-input v-model="GBTDataForm.majorReject" placeholder="Reject"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item prop="majorNumber" :label="$t('code.defectsNumber')">
+            <el-input v-model="GBTDataForm.majorNumber" :placeholder="$t('code.defectsNumber')"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item prop="majorDefectiveNumber" :label="$t('code.defectiveQuantity')">
+            <el-input v-model="GBTDataForm.majorDefectiveNumber" :placeholder="$t('code.defectiveQuantity')">
+            </el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="4">
+          <el-form-item prop="minor" label="MI" label-width="50px">
+            <el-input v-model="GBTDataForm.minor" placeholder="CR"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item prop="minorAccept" label="Accept">
+            <el-input v-model="GBTDataForm.minorAccept" placeholder="Accept"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item prop="minorReject" label="Reject" label-width="60px">
+            <el-input v-model="GBTDataForm.minorReject" placeholder="Reject"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item prop="minorNumber" :label="$t('code.defectsNumber')">
+            <el-input v-model="GBTDataForm.minorNumber" :placeholder="$t('code.defectsNumber')"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item prop="minorDefectiveNumber" :label="$t('code.defectiveQuantity')">
+            <el-input v-model="GBTDataForm.minorDefectiveNumber" :placeholder="$t('code.defectiveQuantity')">
+            </el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="4">
+          <el-form-item prop="total" label="total" label-width="50px">
+            <el-input v-model="GBTDataForm.total" placeholder="CR"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item prop="totalAccept" label="Accept">
+            <el-input v-model="GBTDataForm.totalAccept" placeholder="Accept"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item prop="totalReject" label="Reject" label-width="60px">
+            <el-input v-model="GBTDataForm.totalReject" placeholder="Reject"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item prop="totalNumber" :label="$t('code.defectsNumber')">
+            <el-input v-model="GBTDataForm.totalNumber" :placeholder="$t('code.defectsNumber')"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item prop="totalDefectiveNumber" :label="$t('code.defectiveQuantity')">
+            <el-input v-model="GBTDataForm.totalDefectiveNumber" :placeholder="$t('code.defectiveQuantity')">
+            </el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import debounce from "lodash/debounce";
+import basicAdd from "@/mixins/basic-add";
+export default {
+  mixins: [basicAdd],
+  data() {
+    return {
+      urlOptions: {
+        GBTSubmitURL: "/code/purchaseRegistration",
+        submitURL: "/code/purchaseRegistration",  
+        infoURL: "/code/purchaseRegistration/{id}",
+        getFactoryURL: '/code/factory/page',
+        getProductURL: '/basic/product/page',
+        getSupplierURL: '/supplier/qmsSupplier/page',
+        getDictDataList: '/sys/dict/data/page',
+        getUserURL: '/sys/user/page',
+        getSamplingPlanURL: '/quality/qmsSamplingPlan/page'
+      },
+      supplierList: [],
+      userList: [],
+      samplingPlanList:[],
+      inspectionStatusList: [
+        {
+          id: 0,
+          name: '未登记'
+        },
+        {
+          id: 1,
+          name: '已登记'
+        }
+      ],
+      unitList:[],
+      productList: [],
+      factoryList:[],
+      visible: false,
+      listQuery: {
+        limit: 999,
+        page:1
+      },
+      inspectionTypeList: [{
+        value: 0,
+        label: '监控'
+      },
+      {
+        value: 1,
+        label: '电芯来料检验'
+      },
+      {
+        value: 2,
+        label: 'IQC抽检'
+      },
+      {
+        value: 3,
+        label: 'IQC抽检2'
+      },
+      {
+        value: 4,
+        label: '原料抽检'
+      },
+      {
+        value: 5,
+        label: '进货外观检验'
+      },
+      {
+        value: 6,
+        label: '库内原料检验'
+      },
+      {
+        value: 7,
+        label: '来料检验'
+      },
+      {
+        value: 8,
+        label: '胶片'
+      },
+      {
+        value: 9,
+        label: '抽检'
+      },
+      {
+        value: 10,
+        label: '巡检'
+      }, {
+        value: 11,
+        label: '首检'
+      },
+      {
+        value: 12,
+        label: '末检'
+      },
+      {
+        value: 13,
+        label: '实时监测'
+      },
+      {
+        value: 14,
+        label: 'FQC抽检'
+      },
+      {
+        value: 15,
+        label: 'OQC抽检'
+      },
+      ],
+      GBTDataForm: {
+        critical:null,
+        criticalAccept: null,
+        criticalDefectiveNumber: null,
+        criticalNumber: null,
+        criticalReject: null,
+        id: null,
+        major: null,
+        majorAccept: null,
+        majorDefectiveNumber: null,
+        majorNumber: null,
+        majorReject: null,
+        minor: null,
+        minorAccept: null,
+        minorDefectiveNumber: null,
+        minorNumber: null,
+        minorReject: null,
+        purchaseRegistrationId: null,
+        total: null,
+        totalAccept: null,
+        totalDefectiveNumber: null,
+        totalNumber: null,
+        totalReject: null,
+      },
+      dataForm: {
+        batchNo: null,
+        batchQuantity: null,
+        batchSize: null,
+        checkoutTime: null,
+        companyId: null,
+        customSamplingId: null,
+        defectiveQuantity: null,
+        defectsNumber: null,
+        distributionUserId: null,
+        factoryId: null,
+        id: null,
+        inspectionQuantity: null,
+        inspectionTime: null,
+        inspectionType: null,
+        orderNumber: null,
+        parameterName: null,
+        processingMethod: null,
+        processingResults: null,
+        productId: null,
+        recordQuantity: null,
+        remark: null,
+        shiftId: null,
+        submit: null,
+        supplierId: null,
+        teamId: null,
+        upload: null,
+        userId: null
+      },
+    };
+  },
+  computed: {
+    dataRule() {
+      return {
+        dictLabel: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+        dictValue: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+        sort: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+      };
+    },
+  },
+  created() {
+    this.getDict()
+  },
+  methods: {
+    init(id, ) {
+      this.dataForm.id = id || ""
+      // this.dataForm.dictTypeId = dictTypeId || "";
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs["dataForm"].resetFields();
+        if (this.dataForm.id) {
+          this.getInfo();
+        }
+      });
+    },
+    // 获取信息
+    getInfo() {
+      this.$http
+        .get(`/code/purchaseRegistration/${this.dataForm.id}`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          }
+          this.dataForm = {
+            ...this.dataForm,
+            ...res.data,
+          };
+        })
+        .catch(() => { })
+      this.$http
+        .get(`/code/purchaseRegistrationNationalStandard/getById/${this.dataForm.id}`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          }
+          this.GBTDataForm = {
+            ...this.GBTDataForm,
+            ...res.data,
+          };
+        })
+        .catch(() => { })
+    },
+    getDict() {
+      this.$http
+        .get(this.urlOptions.getSamplingPlanURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.samplingPlanList = res.data
+          }
+        })
+        .catch(() => {
+        })
+      this.$http
+        .get(this.urlOptions.getUserURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.userList = res.data
+          }
+        })
+        .catch(() => {
+        })
+      this.$http
+        .get(this.urlOptions.getProductURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.productList = res.data
+          }
+        })
+        .catch(() => {
+        })
+      this.$http
+        .get(this.urlOptions.getDictDataList, {
+          params: {
+            limit: 999,
+            page: 1,
+            dictTypeId: '1665966021935190018'
+          }
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.unitList = res.data
+          }
+        })
+        .catch(() => {
+        })
+      this.$http
+        .get(this.urlOptions.getSupplierURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.supplierList = res.data
+          }
+        })
+        .catch(() => {
+        })
+      this.$http
+        .get(this.urlOptions.getFactoryURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.factoryList = res.data
+          }
+        })
+        .catch(() => {
+        })
+      // console.log(111111);
+    },
+    dataFormSubmit() {
+      this.$refs["dataForm"].validate((valid) => {
+        if (!valid) {
+          return false;
+        }
+        if (this.dataForm.id) {
+            this.$http.put(this.urlOptions.submitURL, this.dataForm)
+              .then(({ data: res }) => {
+                if (res.code !== 0) {
+                  return this.$message.error(res.msg);
+                }
+                this.GBTDataForm.purchaseRegistrationId = res.data
+                this.$http.post(this.urlOptions.GBTSubmitURL, this.parameterData)
+                  .then(({ data: res }) => {
+                    if (res.code !== 0) {
+                      return this.$message.error(res.msg);
+                    }
+                    this.$message({
+                      message: this.$t("prompt.success"),
+                      type: "success",
+                      duration: 500,
+                      onClose: () => {
+                        this.visible = false;
+                        this.$emit("refreshDataList")
+                      }
+                    })
+                  })
+
+                this.$message({
+                  message: this.$t("prompt.success"),
+                  type: "success",
+                  duration: 500,
+                  onClose: () => {
+                    this.visible = false;
+                    this.$emit("refreshDataList")
+                  }
+                })
+              })
+              .catch(() => { });
+        } else {
+          this.$http.post(this.urlOptions.submitURL, this.dataForm)
+            .then(({ data: res }) => {
+              if (res.code !== 0) {
+                return this.$message.error(res.msg);
+              }
+              this.GBTDataForm.purchaseRegistrationId = res.data
+              this.$http.post(this.urlOptions.GBTSubmitURL, this.parameterData)
+                .then(({ data: res }) => {
+                  if (res.code !== 0) {
+                    return this.$message.error(res.msg);
+                  }
+                  this.$message({
+                    message: this.$t("prompt.success"),
+                    type: "success",
+                    duration: 500,
+                    onClose: () => {
+                      this.visible = false;
+                      this.$emit("refreshDataList")
+                    }
+                  })
+                })
+
+              this.$message({
+                message: this.$t("prompt.success"),
+                type: "success",
+                duration: 500,
+                onClose: () => {
+                  this.visible = false;
+                  this.$emit("refreshDataList")
+                }
+              })
+            })
+            .catch(() => { });
+        }
+      });
+    },
+    // 表单提交
+  },
+};
+</script>
diff --git a/src/views/modules/incoming/components/purchaseRegistrationSearch.vue b/src/views/modules/incoming/components/purchaseRegistrationSearch.vue
new file mode 100644
index 0000000..fb674bb
--- /dev/null
+++ b/src/views/modules/incoming/components/purchaseRegistrationSearch.vue
@@ -0,0 +1,366 @@
+<!--
+ * @Author: zwq
+ * @Date: 2023-01-04 10:29:40
+ * @LastEditors: zhp
+ * @LastEditTime: 2023-06-20 14:49:25
+ * @Description: 
+-->
+<template>
+  <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
+    <el-form-item prop="factoryId" :label="$t('code.factoryName')">
+      <el-select v-model="dataForm.factoryId" :placeholder="$t('code.factoryName')">
+        <el-option v-for="item in factoryList" :key="item.id" :label="item.factoryName" :value="item.id">
+        </el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item prop="batchNo" :label="$t('code.batchNo')">
+      <el-input v-model="dataForm.batchNo" :placeholder="$t('code.batchNo')"></el-input>
+    </el-form-item>
+    <el-form-item prop="inspectionType" :label="$t('code.inspectionType')">
+      <el-select v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')">
+        <el-option v-for="item in inspectionTypeList" :key="item.value" :label="item.label" :value="item.value">
+        </el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item prop="productId" :label="$t('code.productName')">
+      <el-select v-model="dataForm.productId" :placeholder="$t('code.productName')">
+        <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.id">
+        </el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item prop="supplierId" :label="$t('code.supplierName')">
+      <el-select v-model="dataForm.supplierId" :placeholder="$t('code.supplierName')">
+        <el-option v-for="item in supplierList" :key="item.id" :label="item.name" :value="item.id">
+        </el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item prop="userId" :label="$t('code.Examiner')">
+      <el-select v-model="dataForm.userId" :placeholder="$t('code.Examiner')">
+        <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id">
+        </el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item prop="customSamplingId" :label="$t('code.customSampling')">
+      <el-select v-model="dataForm.customSamplingId" :placeholder="$t('code.customSampling')">
+        <el-option v-for="item in samplingPlanList" :key="item.id" :label="item.sampleRange" :value="item.id">
+        </el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item prop="judgmentResult" :label="$t('code.judgmentResult')">
+      <el-select v-model="dataForm.judgmentResult" :placeholder="$t('code.judgmentResult')">
+        <el-option v-for="item in judgmentResultList" :key="item.id" :label="item.name" :value="item.id">
+        </el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item prop="orderNumber" :label="$t('code.orderNumber')">
+      <el-input v-model="dataForm.orderNumber" :placeholder="$t('code.orderNumber')"></el-input>
+    </el-form-item>
+    <el-form-item prop="recheck" :label="$t('code.recheck')">
+      <el-switch v-model="dataForm.recheck" :active-value="1" :inactive-value="0">
+      </el-switch>
+    </el-form-item>
+    <el-form-item prop="task" :label="$t('code.processingResults')">
+      <el-radio-group v-model="dataForm.processingResults">
+        <el-radio :label="0"> {{ $t('code.approval')}} </el-radio>
+        <el-radio :label="1">{{ $t('code.approvalComplete')}} </el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <el-form-item prop="task" :label="$t('code.status')">
+      <el-radio-group v-model="dataForm.upload">
+        <el-radio :label="0">{{ $t('code.notUploaded')}}</el-radio>
+        <el-radio :label="1">{{ $t('code.uploaded')}}</el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <el-form-item prop="inspectionStatus" :label="$t('code.inspectionStatus')">
+      <el-select v-model="dataForm.inspectionStatus" :placeholder="$t('code.inspectionStatus')">
+        <el-option v-for="item in inspectionStatusList" :key="item.id" :label="item.name" :value="item.id">
+        </el-option>
+      </el-select>
+    </el-form-item>
+  </el-form>
+</template>
+
+<script>
+import debounce from "lodash/debounce";
+import basicAdd from "@/mixins/basic-add";
+export default {
+  mixins: [basicAdd],
+  data() {
+    return {
+      urlOptions: {
+        submitURL: "/basic/qmsCustomerType",
+        infoURL: "/basic/qmsCustomerType/{id}",
+        getCodeURL: '/basic/qmsControlMode/getCode',
+        getFactoryURL: '/code/factory/page',
+        getProductURL: '/basic/product/page',
+        getSupplierURL: '/supplier/qmsSupplier/page',
+        getDictDataList: '/sys/dict/data/page',
+        getUserURL: '/sys/user/page',
+        getSamplingPlanURL: '/quality/qmsSamplingPlan/page'
+      },
+      // urlOptions: {
+      //   submitURL: "/sys/params/",
+      //   infoURL: "/sys/params",
+      // },
+      inspectionStatusList: [
+        {
+          id: 0,
+          name: '未登记'
+        },
+        {
+          id: 1,
+          name: '已登记'
+        }
+      ],
+      supplierList: [],
+      userList: [],
+      samplingPlanList: [],
+      judgmentResultList: [
+        {
+          id: 0,
+          name: '0未判定'
+        },
+        {
+          id: 1,
+          name: '1合格'
+        },
+        {
+          id: 2,
+          name: '不合格'
+        },
+      ],
+      unitList: [],
+      productList: [],
+      factoryList: [],
+      visible: false,
+      inspectionTypeList: [{
+        value: 0,
+        label: '监控'
+      },
+      {
+        value: 1,
+        label: '电芯来料检验'
+      },
+      {
+        value: 2,
+        label: 'IQC抽检'
+      },
+      {
+        value: 3,
+        label: 'IQC抽检2'
+      },
+      {
+        value: 4,
+        label: '原料抽检'
+      },
+      {
+        value: 5,
+        label: '进货外观检验'
+      },
+      {
+        value: 6,
+        label: '库内原料检验'
+      },
+      {
+        value: 7,
+        label: '来料检验'
+      },
+      {
+        value: 8,
+        label: '胶片'
+      },
+      {
+        value: 9,
+        label: '抽检'
+      },
+      {
+        value: 10,
+        label: '巡检'
+      }, {
+        value: 11,
+        label: '首检'
+      },
+      {
+        value: 12,
+        label: '末检'
+      },
+      {
+        value: 13,
+        label: '实时监测'
+      },
+      {
+        value: 14,
+        label: 'FQC抽检'
+      },
+      {
+        value: 15,
+        label: 'OQC抽检'
+      },
+      ],
+      dataForm: {
+        processingResults: null,
+        batchNo: null,
+        customSamplingId: null,
+        factoryId: null,
+        inspectionType: null,
+        judgmentResult: null,
+        orderNumber: null,
+        productId: null,
+        recheck: null,
+        supplierId: null,
+        upload: null,
+        userId: null
+      },
+    };
+  },
+  computed: {
+    // dataRule() {
+    //   return {
+    //     paramCode: [
+    //       {
+    //         required: true,
+    //         message: this.$t("validate.required"),
+    //         trigger: "blur",
+    //       },
+    //     ],
+    //     paramValue: [
+    //       {
+    //         required: true,
+    //         message: this.$t("validate.required"),
+    //         trigger: "blur",
+    //       },
+    //     ],
+    //   };
+    // },
+  },
+  mounted () {
+    this.getDict()
+  },
+  methods: {
+    getDict() {
+      this.$http
+        .get(this.urlOptions.getSamplingPlanURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.samplingPlanList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      this.$http
+        .get(this.urlOptions.getProductURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.productList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      this.$http
+        .get(this.urlOptions.getSupplierURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.supplierList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      this.$http
+        .get(this.urlOptions.getUserURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.userList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      this.$http
+        .get (this.urlOptions.getFactoryURL, {
+          params: this.listQuery
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.factoryList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      // console.log(111111);
+    },
+    // init(id) {
+    //   this.dataForm.id = id || "";
+    //   this.visible = true;
+    //   this.$nextTick(() => {
+    //     this.$refs["dataForm"].resetFields();
+    //     if (this.dataForm.id) {
+    //       this.getInfo();
+    //     }
+    //   });
+    // },
+    // 获取信息
+    // getInfo() {
+    //   this.$http
+    //     .get(`/sys/params/${this.dataForm.id}`)
+    //     .then(({ data: res }) => {
+    //       if (res.code !== 0) {
+    //         return this.$message.error(res.msg);
+    //       }
+    //       this.dataForm = {
+    //         ...this.dataForm,
+    //         ...res.data,
+    //       };
+    //     })
+    //     .catch(() => {});
+    // },
+    // 表单提交
+    handleConditionSearch() {
+      this.$emit("successSubmit", this.dataForm.key);
+    },
+    // dataFormSubmitHandle: debounce(
+    //   function () {
+    //     // console.log(1111);
+    //     // this.visible = false;
+    //     this.$emit("successSubmit", this.dataForm.key);
+    //     // this.$refs["dataForm"].validate((valid) => {
+    //     //   if (!valid) {
+    //     //     return false;
+    //     //   }
+    //     //   this.$http[!this.dataForm.id ? "post" : "put"](
+    //     //     "/sys/params",
+    //     //     this.dataForm
+    //     //   )
+    //     //     .then(({ data: res }) => {
+    //     //       if (res.code !== 0) {
+    //     //         return this.$message.error(res.msg);
+    //     //       }
+    //     //       this.$message({
+    //     //         message: this.$t("prompt.success"),
+    //     //         type: "success",
+    //     //         duration: 500,
+    //     //         onClose: () => {
+
+    //     //         },
+    //     //       });
+    //     //     })
+    //     //     .catch(() => {});
+    //     // });
+    //   },
+    //   1000,
+    //   { leading: true, trailing: false }
+    // ),
+  },
+};
+</script>
diff --git a/src/views/modules/incoming/components/radio.vue b/src/views/modules/incoming/components/radio.vue
new file mode 100644
index 0000000..aaf9937
--- /dev/null
+++ b/src/views/modules/incoming/components/radio.vue
@@ -0,0 +1,49 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-01-31 14:12:10
+ * @LastEditTime: 2023-01-31 16:47:32
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <span>
+    <el-radio v-model="injectData.incomingInspection" :label="1"
+      >进货检验</el-radio
+    >
+    <el-radio v-model="injectData.processInspection" :label="1"
+      >过程检验</el-radio
+    >
+    <el-radio v-model="injectData.finishInspection" :label="1"
+      >成品检验</el-radio
+    >
+    <el-radio v-model="injectData.outInspection" :label="1">出货检验</el-radio>
+  </span>
+</template>
+
+<script>
+// import { addDynamicRoute } from '@/router'
+export default {
+  props: {
+    injectData: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+  methods: {
+    // 子级
+    // emitClick () {
+    //   // 路由参数
+    //   const routeParams = {
+    //     routeName: `${this.$route.name}__${this.injectData.id}`,
+    //     title: `${this.$route.meta.title} - ${this.injectData.dictType}`,
+    //     path: 'sys/dict-data',
+    //     params: {
+    //       dictTypeId: this.injectData.id
+    //     }
+    //   }
+    //   // 动态路由
+    //   addDynamicRoute(routeParams, this.$router)
+    // }
+  },
+};
+</script>
diff --git a/src/views/modules/incoming/components/singleValueMovingRange.vue b/src/views/modules/incoming/components/singleValueMovingRange.vue
new file mode 100644
index 0000000..c7590f7
--- /dev/null
+++ b/src/views/modules/incoming/components/singleValueMovingRange.vue
@@ -0,0 +1,264 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-06-19 09:19:53
+ * @LastEditTime: 2023-06-19 14:43:40
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <el-row :gutter="24">
+      <el-col :span="18">
+        <div id="priceMain" :style="{ width: '100%', height: '500px' }" />
+      </el-col>
+      <el-col :span="6">
+        <el-table style="width: 100%" :data="getValues" :show-header="false">
+          <el-table-column width="180" v-for="(item, index) in getHeaders" :key="index" :prop="item">
+          </el-table-column>
+        </el-table>
+      </el-col>
+    </el-row>
+  </el-card>
+</template>
+
+<script>
+// import available from "./components/gageAvailable.vue"
+import i18n from "@/i18n"
+import * as echarts from 'echarts';
+export default {
+  data() {
+    return {
+      myChart: null,
+      urlOptions: {
+        getDataListURL: "/code/purchaseRegistration/single/value/movement/range/chart",
+      },
+      tableData: [],
+      headers: [
+        {
+          prop: 'usl',
+          label: 'USL',
+        },
+        {
+          prop: 'sl',
+          label: 'SL',
+        },
+        {
+          prop: 'lsl',
+          label: 'LSL',
+        },
+        {
+          prop: 'averageUcl',
+          label: 'CL(图一)',
+        },
+        {
+          prop: 'averageUcl',
+          label: 'UCL(图一)',
+        },
+        {
+          prop: 'averageLcl',
+          label: 'LCL(图一)',
+        },
+        {
+          prop: 'rangeCl',
+          label: 'CL(图二)',
+        },
+        {
+          prop: 'rangeLcl',
+          label: 'LCL(图二)',
+        },
+        {
+          prop: 'rangeUcl',
+          label: 'UCL(图二)',
+        },
+        {
+          prop: 'standardDeviationGroup',
+          label: '标准差',
+        },
+        {
+          prop: 'cpk',
+          label: 'cpk',
+        },
+        {
+          prop: 'standardDeviationWhole',
+          label: '总体标准差',
+        },
+        {
+          prop: 'ppk',
+          label: 'ppk',
+        },
+        {
+          prop: 'ca',
+          label: 'ca',
+        },
+        {
+          prop: 'cp',
+          label: 'cp',
+        },
+        {
+          prop: 'ca',
+          label: 'ca',
+        },
+        {
+          prop: 'average',
+          label: '均值',
+        },
+        {
+          prop: 'max',
+          label: '最大值',
+        },
+        {
+          prop: 'max',
+          label: '最大值',
+        },
+      ],
+      listQuery: {
+        characteristicsId: null,
+        factoryId: null,
+        inspectionType: null,
+        productId: null,
+        sampleSize: null,
+        endTime: null,
+        startTime: null,
+      },
+    };
+  },
+  computed: {
+    getHeaders() {
+      return this.tableData.reduce((pre, cur, index) => pre.concat(`value${index}`), ['title'])
+    },
+    getValues() {
+      return this.headers.map(item => {
+        return this.tableData.reduce((pre, cur, index) => Object.assign(pre, { ['value' + index]: cur[item.prop] }), { 'title': item.label, });
+      });
+    }
+  },
+  // components: {
+  //   AddOrUpdate,
+  // },
+  methods: {
+    getData(listQuery) {
+      this.$http
+        .post(this.urlOptions.getDataListURL, {
+          params: listQuery
+        }
+        )
+        .then(({ data: res }) => {
+          this.tableData.push({
+            average: res.data.average,
+            averageCl: res.data.averageCl,
+            averageLcl: res.data.averageLcl,
+            averageUcl: res.data.averageUcl,
+            ca: res.data.ca,
+            cp: res.data.cp,
+            cpk: res.data.cpk,
+            groupNum: res.data.groupNum,
+            lsl: res.data.lsl,
+            ppk: res.data.ppk,
+            rangeCl: res.data.rangeCl,
+            rangeLcl: res.data.rangeCl,
+            rangeUcl: res.data.rangeCl,
+            standardDeviationWhole: res.data.standardDeviationWhole,
+            usl: res.data.usl,
+            max: res.data.max,
+            min: res.data.min,
+          })
+          console.log(res)
+          let xAxisData = []
+          res.data.purchaseRegistrationCharacteristicsDTOList.forEach(ele => {
+            xAxisData.push(ele.batchNo + ele.groupNo)
+          })
+          var chartDom = document.getElementById('priceMain');
+          var myChart = echarts.init(chartDom)
+          this.myChart = myChart
+          var option;
+          // myChart.on('click', function (params) {
+          //   console.log(params);
+          // });
+          myChart.on('click', 'xAxis.category', function (params) {
+            console.log(params);
+          });
+          option = {
+            title: {
+              text: '均值极差图'
+            },
+            tooltip: {
+              trigger: 'axis'
+            },
+            // legend: {
+            //   data: ['推移图']
+            // },
+            grid: {
+              left: '3%',
+              right: '4%',
+              bottom: '3%',
+              containLabel: true
+            },
+            xAxis: {
+              data: xAxisData,
+              type: 'category',
+              axisLabel: {
+                clickable: true
+              },
+              silent: false,
+              triggerEvent: true
+            },
+            yAxis: {
+              type: 'value'
+            },
+            series: [
+              {
+                name: 'lsl',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.lsl]
+              },
+              {
+                name: 'UCL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.averageUcl]
+              },
+              {
+                name: 'UCL(图二)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.rangeUcl]
+              },
+              {
+                name: 'USL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.usl]
+              },
+              {
+                name: 'CL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.rangeCl]
+              },
+              {
+                name: 'CL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.averageCl]
+              },
+              {
+                name: 'LCL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.averageLcl]
+              },
+              {
+                name: 'SL',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.sl]
+              },
+            ]
+          };
+          option && myChart.setOption(option);
+        })
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/incoming/controlChart.vue b/src/views/modules/incoming/controlChart.vue
new file mode 100644
index 0000000..2dbb41b
--- /dev/null
+++ b/src/views/modules/incoming/controlChart.vue
@@ -0,0 +1,442 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-01-11 09:24:58
+ * @LastEditTime: 2023-06-20 15:52:27
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__user">
+      <el-form :inline="true" :model="dataForm" class="demo-form-inline">
+        <el-form-item :label="$t('code.inspectionTime')" prop="timeSlot">
+          <el-date-picker v-model="dataForm.timeSlot" size="small" type="datetimerange" format='yyyy-MM-dd HH:mm:ss'
+            @change="getFactory" valueFormat='yyyy-MM-ddTHH:mm:ss' :start-placeholder="$t('gage.startTime')"
+            :end-placeholder="$t('gage.endTime')" :range-separator="$t('gage.to')" clearable />
+        </el-form-item>
+        <el-form-item :label="$t('code.factoryName')">
+          <el-select v-model="dataForm.factoryId" :placeholder="$t('code.factoryName')" @change="getInspectionType">
+            <el-option v-for="item in factoryList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('code.productName')">
+          <el-select v-model="dataForm.productId" :placeholder="$t('code.productName')" @change="gerCharacteristics">
+            <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <!-- <el-form-item :label="$t('code.inspectionType')">
+          <el-select v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')">
+            <el-option v-for="item in inspectionTypeList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item> -->
+        <el-form-item :label="$t('code.inspectionType')">
+          <el-input v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('code.characteristics')">
+          <el-input v-model="dataForm.characteristicsId" :placeholder="$t('code.characteristics')"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('code.sampleSize')">
+          <el-input v-model="dataForm.sampleSize" :placeholder="$t('code.sampleSize')"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getOriginalData">{{ $t('code.originalData') }}}</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tab-pane :label="$t('code.meanRange')" name="first">
+        <mean-range ref="meanRange"></mean-range>
+      </el-tab-pane>
+      <el-tab-pane :label="$t('code.meanStandard')" name="second">
+        <mean-standard ref="meanStandard">
+        </mean-standard>
+      </el-tab-pane>
+      <el-tab-pane :label=" $t('code.medianRange')" name="third">
+        <median-range ref="medianRange">
+        </median-range>
+      </el-tab-pane>
+      <el-tab-pane :label="$t('code.singleValueMovingRange')" name="fourth">
+        <single-valueMovingRange ref="singleValueMovingRange">
+        </single-valueMovingRange>
+      </el-tab-pane>
+      <el-tab-pane :label="$t('code.meanMovingRangeRange')" name="fifth">
+        <mean-MovingRangeRange ref="meanMovingRangeRange">
+        </mean-MovingRangeRange>
+      </el-tab-pane>
+      <el-tab-pane :label="$t('code.meanMovingRangeStandardDeviation')" name="sixth">
+        <mean-movingRangeStandardDeviation ref="meanMovingRangeStandardDeviation">
+        </mean-movingRangeStandardDeviation>
+      </el-tab-pane>
+    </el-tabs>
+    <base-table id="palletTable" :table-props="tableProps" :page="listQuery.page" ref="palletTable1"
+      highlight-current-row :limit="listQuery.limit" :table-data="tableData">
+    </base-table>
+  </el-card>
+</template>
+
+<script>
+import meanRange from "./components/meanRange.vue"
+import meanStandard from "./components/meanStandard.vue"
+import medianRange from "./components/medianRange.vue"
+import singleValueMovingRange from "./components/singleValueMovingRange.vue"
+import meanMovingRangeRange from "./components/meanMovingRangeRange.vue"
+import meanMovingRangeStandardDeviation from "./components/meanMovingRangeStandardDeviation.vue"
+import i18n from "@/i18n"
+import * as echarts from 'echarts';
+const tableProps = [
+  {
+    prop: "orderNumber",
+    label: i18n.t('code.inspectionNumber'),
+  },
+  {
+    prop: "batchNo",
+    label: i18n.t('code.batchNo'),
+  },
+  {
+    prop: "locationNo",
+    label: i18n.t('code.locationNo'),
+  },
+  {
+    prop: "groupNo",
+    label: i18n.t('code.groupNo'),
+  },
+  {
+    prop: "meteringValue",
+    label: i18n.t('code.assayValue'),
+  },
+  {
+    prop: "createDate",
+    label: i18n.t('code.parsingTime'),
+  }
+];
+export default {
+  data() {
+    return {
+      myChart: null,
+      urlOptions: {
+        getXBarURL: '',
+        getDataListURL: "/code/purchaseRegistration/mean/range/chart",
+        getFactoryURL: '/code/purchaseRegistration/query/factory',
+        getProductURL: '/code/purchaseRegistration/query/product',
+        getInspectionTypeURL: '/code/purchaseRegistration/query/inspection/type',
+        getOriginalDataURL: '/code/purchaseRegistration/raw/data',
+        getPurchaseRegistrationTypeURL: '/code/purchaseRegistration/query/checkout/project',
+      },
+      tableData:[],
+      tableProps,
+      factoryList: [],
+      productList: [],
+      meanRangeShow:false,
+      listQuery: {
+        characteristicsId: null,
+        factoryId: null,
+        inspectionType: null,
+        productId: null,
+        sampleSize: null,
+        endTime: null,
+        startTime: null,
+      },
+      activeName:null,
+      headers: [
+        {
+          prop: 'usl',
+          label: 'USL',
+        },
+        {
+          prop: 'sl',
+          label: 'SL',
+        },
+        {
+          prop: 'lsl',
+          label: 'LSL',
+        },
+        {
+          prop: 'rangeUcl',
+          label: 'CL(图一)',
+        },
+        {
+          prop: 'averageUcl',
+          label: 'UCL(图一)',
+        },
+        {
+          prop: 'rangeLcl',
+          label: 'LCL(图一)',
+        },
+        {
+          prop: 'standardDeviationCl',
+          label: 'CL(图二)',
+        },
+        {
+          prop: 'standardDeviationLcl',
+          label: 'LCL(图二)',
+        },
+        {
+          prop: 'standardDeviationUcl',
+          label: 'UCL(图二)',
+        },
+        {
+          prop: 'standardDeviationGroup',
+          label: '标准差',
+        },
+        {
+          prop: 'cpk',
+          label: 'cpk',
+        },
+        {
+          prop: 'standardDeviationWhole',
+          label: '总体标准差',
+        },
+        {
+          prop: 'ppk',
+          label: 'ppk',
+        },
+        {
+          prop: 'ca',
+          label: 'ca',
+        },
+        {
+          prop: 'cp',
+          label: 'cp',
+        },
+        {
+          prop: 'ca',
+          label: 'ca',
+        },
+        {
+          prop: 'average',
+          label: '均值',
+        },
+        {
+          prop: 'max',
+          label: '最大值',
+        },
+        {
+          prop: 'max',
+          label: '最大值',
+        },
+      ],
+      tableData: [],
+      dataForm: {
+        productId: null,
+        timeSlot: [],
+        factoryId: null,
+        characteristicsId: null,
+        inspectionType: null,
+        sampleSize: null
+      },
+      selectOptions: [{
+        id: 0,
+        name: '监控'
+      },
+      {
+        id: 1,
+        name: '电芯来料检验'
+      },
+      {
+        id: 2,
+        lname: 'IQC抽检'
+      },
+      {
+        id: 3,
+        name: 'IQC抽检2'
+      },
+      {
+        id: 4,
+        name: '原料抽检'
+      },
+      {
+        id: 5,
+        name: '进货外观检验'
+      },
+      {
+        id: 6,
+        name: '库内原料检验'
+      },
+      {
+        id: 7,
+        name: '来料检验'
+      },
+      {
+        id: 8,
+        name: '胶片'
+      },
+      {
+        id: 9,
+        name: '抽检'
+      },
+      {
+        id: 10,
+        name: '巡检'
+      }, {
+        id: 11,
+        name: '首检'
+      },
+      {
+        id: 12,
+        name: '末检'
+      },
+      {
+        id: 13,
+        name: '实时监测'
+      },
+      {
+        id: 14,
+        name: 'FQC抽检'
+      },
+      {
+        id: 15,
+        name: 'OQC抽检'
+      },
+      ],
+    };
+  },
+  components: {
+    meanRange,
+    meanStandard,
+    medianRange,
+    singleValueMovingRange,
+    meanMovingRangeRange,
+    meanMovingRangeStandardDeviation
+  },
+  computed: {
+    getHeaders() {
+      return this.tableData.reduce((pre, cur, index) => pre.concat(`value${index}`), ['title'])
+    },
+    getValues() {
+      return this.headers.map(item => {
+        return this.tableData.reduce((pre, cur, index) => Object.assign(pre, { ['value' + index]: cur[item.prop] }), { 'title': item.label, });
+      });
+    }
+  },
+  mounted() {
+    // this.getData()
+    // this.getDict()
+  },
+  methods: {
+    selectChanged(val) {
+      console.log(val)
+      alert(JSON.stringify(val))
+    },
+    handleClick(val) {
+      if (this.activeName === 'first') {
+        this.$nextTick(() => {
+          this.$refs.meanRange.getData(this.listQuery)
+        })
+      } else if (this.activeName === 'second') {
+        this.$nextTick(() => {
+          this.$refs.meanStandard.getData(this.listQuery)
+        })
+      } else if (this.activeName === 'third') {
+        this.$nextTick(() => {
+          this.$refs.medianRange.getData(this.listQuery)
+        })
+      } else if (this.activeName === 'fourth') {
+        this.$nextTick(() => {
+          this.$refs.singleValueMovingRange.getData(this.listQuery)
+        })
+      } else if (this.activeName === 'fifth') {
+        this.$nextTick(() => {
+          this.$refs.meanMovingRangeRange.getData(this.listQuery)
+        })
+      } else if (this.activeName === 'sixth') {
+        this.$nextTick(() => {
+          this.$refs.meanMovingRangeStandardDeviation.getData(this.listQuery)
+        })
+      }
+
+    },
+    getFactory(val) {
+      console.log(val)
+      this.$http.get(this.urlOptions.getFactoryURL, {
+        params: {
+          startTime: val[0],
+          endTime: val[1]
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.factoryList = res.data.map((item) => {
+              return {
+                id: item.factoryId,
+                name: item.factoryName
+              }
+            })
+          }
+        })
+      this.$http.get(this.urlOptions.getProductURL, {
+        params: {
+          startTime: val[0],
+          endTime: val[1]
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.productList = res.data.map((item) => {
+              return {
+                id: item.productId,
+                name: item.productName
+              }
+            })
+          }
+        })
+    },
+    getInspectionType(val) {
+      this.$http.get(this.urlOptions.getInspectionTypeURL, {
+        params: {
+          startTime: this.dataForm.timeSlot[0],
+          endTime: this.dataForm.timeSlot[1],
+          factoryId: val
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.dataForm.inspectionType = res.data.inspectionType
+          }
+        })
+    },
+    gerCharacteristics(val) {
+      this.$http.get(this.urlOptions.getPurchaseRegistrationTypeURL, {
+        params: {
+          productId: val
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.dataForm.characteristicsId = res.data.parameterName
+          }
+        })
+    },
+    getOriginalData() {
+      this.$http.get(this.urlOptions.getOriginalDataURL, {
+        params:this.listQuery
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.tableData = res.data
+          }
+        })
+    },
+    buttonClick(val) {
+      console.log(val)
+      switch (val.btnName) {
+        case "search":
+          this.dataForm.sampleSize = val.sampleSize ? val.sampleSize : null
+          this.dataForm.inspectionType = val.inspectionType ? val.inspectionType : null
+          this.dataForm.characteristicsId = val.characteristicsId ? val.characteristicsId : null
+          this.dataForm.factoryId = val.factoryId ? val.factoryId : null
+          this.dataForm.productId = val.productId ? val.productId : null
+          this.dataForm.startTime = val.timeSlot ? val.timeSlot[0] : null
+          this.dataForm.endTime = val.timeSlot ? val.timeSlot[1] : null
+          this.getData()
+          break;
+
+        default:
+          console.log(val)
+      }
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/incoming/incomingInspection.vue b/src/views/modules/incoming/incomingInspection.vue
new file mode 100644
index 0000000..447bbdf
--- /dev/null
+++ b/src/views/modules/incoming/incomingInspection.vue
@@ -0,0 +1,312 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__user">
+      <SearchBar :formConfigs="formConfig" ref="ruleForm" @headBtnClick="buttonClick">
+        <el-badge :value="1" class="item">
+          <el-button type="primary" size="small" @click="conditionSearch">条件搜索</el-button>
+        </el-badge>
+      </SearchBar>
+      <base-table id="palletTable" :table-props="tableProps" :page="listQuery.page" ref="palletTable1"
+        highlight-current-row :limit="listQuery.limit" :table-data="tableData" @current-change="handleCurrentChange">
+        <method-btn v-if="tableBtn.length" slot="handleBtn" :width="100" label="操作" :method-list="tableBtn"
+          @clickBtn="handleClick" />
+      </base-table>
+      <pagination :limit.sync="listQuery.limit" :page.sync="listQuery.page" :total="listQuery.total"
+        @pagination="getDataList" />
+      <!-- 弹窗, 新增 / 修改 -->
+      <base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="addOrUpdateVisible" @cancel="handleCancel"
+        @confirm="handleConfirm" :before-close="handleCancel">
+        <incomingInspection-add ref="addOrUpdate" @successSubmit="successSubmit"></incomingInspection-add>
+        <!-- <el-row slot="footer" type="flex" justify="end"> </el-row> -->
+      </base-dialog>
+      <base-dialog :dialogTitle="searchOrEditTitle" :dialogVisible="searchOrUpdateVisible" @cancel="handleSearchCancel"
+        @confirm="handleSearchConfirm" :before-close="handleSearchCancel">
+        <incomingInspection-search ref="searchOrUpdate" @refreshDataList="conditionSearchSubmit"></incomingInspection-search>
+        <el-row slot="footer" type="flex" justify="end">
+          <el-col :span="12">
+            <el-button size="small" type="primary" plain class="btnTextStyle" @click="handleSearchCancel">
+              {{ $t("close") }}
+            </el-button>
+            <el-button size="small" class="btnTextStyle" type="primary" plain @click="handleSearchReset">{{ $t("reset")
+              }}</el-button>
+            <el-button type="primary" size="small" class="btnTextStyle" @click="handleSearchConfirm">
+              {{ $t("search") }}
+            </el-button>
+          </el-col>
+        </el-row>
+      </base-dialog>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import basicPage from "@/mixins/basic-page";
+import basicSearch from "@/mixins/basic-search";
+// import showProductList from "./components/showProductList.vue";
+import incomingInspectionSearch from "./components/incomingInspectionSearch.vue";
+import incomingInspectionAdd from "./components/incomingInspection-add.vue";
+import i18n from "@/i18n";
+// import i18n from "@/i18n";
+const tableProps = [
+  {
+    prop: "inspectionStatus",
+    label: i18n.t('code.inspectionStatus'),
+  },
+  {
+    prop: "factoryName",
+    label: i18n.t('code.factoryName'),
+  },
+  {
+    prop: "batchNo",
+    label: i18n.t('code.batchNo'),
+  },
+  {
+    prop: "orderNumber",
+    label: i18n.t('code.orderNumber'),
+  },
+  {
+    prop: "productName",
+    label: i18n.t('code.productName'),
+  },
+  {
+    prop: "companyName",
+    label: i18n.t('code.companyName'),
+  },
+  {
+    prop: "productCode",
+    label: i18n.t('code.productCode'),
+  },
+  {
+    prop: "supplierName",
+    label: i18n.t('code.supplierName'),
+  },
+  {
+    prop: "batchQuantity",
+    label: i18n.t('code.batchQuantity'),
+  },
+  {
+    prop: "inspectionQuantity",
+    label: i18n.t('code.inspectionQuantity'),
+  },
+  {
+    prop: "checkoutTime",
+    label: i18n.t('code.checkoutTime'),
+  },
+  {
+    prop: "inspectionTime",
+    label: i18n.t('code.inspectionTime'),
+  },
+  {
+    prop: "inspectionType",
+    label: i18n.t('code.inspectionType'),
+  },
+  {
+    prop: "username",
+    label: i18n.t('code.username'),
+  },
+  {
+    prop: "source",
+    label: i18n.t('code.source'),
+  }
+];
+const tableBtn = [
+  {
+    type: "edit",
+    btnName: i18n.t('t.edit'),
+  },
+  {
+    type: "delete",
+    btnName: i18n.t('t.delete'),
+  },
+];
+export default {
+  mixins: [basicPage, basicSearch],
+  data() {
+    return {
+      urlOptions: {
+        getDataListURL: "code/incomingInspection/page/term",
+        deleteURL: "/code/incomingInspection",
+      },
+      tableProps,
+      tableBtn,
+      listQuery: {
+        limit: 10,
+        page:1
+      },
+      productData: {},
+      searchOrEditTitle: "",
+      searchOrUpdateVisible: false,
+      productOrEditTitle: "",
+      addOrEditTitle: '',
+      addOrUpdateVisible:false,
+      productOrUpdateVisible: false,
+      formConfig: [
+        // {
+        //   type: "",
+        //   label: i18n.t("params.paramCode"),
+        //   placeholder: i18n.t("params.paramCode"),
+        //   param: "paramCode",
+        // },
+        // {
+        //   type: "separate",
+        // },
+        {
+          type: "button",
+          btnName: "新增",
+          name: "add",
+          color: "primary",
+        },
+        {
+          type: "button",
+          btnName: "搜索",
+          name: "search",
+          color: "primary",
+          // plain: true,
+        }
+      ],
+    };
+  },
+  components: {
+    incomingInspectionSearch,
+    incomingInspectionAdd
+  },
+  methods: {
+    //search-bar点击
+    handleProductCancel() {
+      this.productOrUpdateVisible = false;
+      this.productOrEditTitle = "";
+    },
+    handleCurrentChange(val) {
+      console.log(val);
+      this.productData = val.newVal ? val.newVal: {}
+    },
+    setCurrent(index) {
+      this.$refs.palletTable1.setCurrent("palletTable", index);
+    },
+    // handleSearchCancel() {
+    //   this.searchOrEditTitle = "";
+    //   this.searchOrUpdateVisible = false;
+    // },
+    conditionSearch() {
+      this.searchOrEditTitle = "搜索";
+      this.searchOrUpdateVisible = true;
+      this.$nextTick(() => {
+        this.$refs.searchOrUpdate.init();
+      });
+    },
+    // handleConfirm() {
+    //   this.$refs.addOrUpdate.dataFormSubmitHandle();
+    // },
+    // conditionSearchSubmit() {},
+    conditionSearchSubmit(dataForm) {
+      // console.log(key);
+      this.listQuery.batchNo = dataForm.batchNo ? dataForm.batchNo : null
+      this.listQuery.customSamplingId = dataForm.customSamplingId ? dataForm.customSamplingId : null
+      this.listQuery.endTime = dataForm.timeSlot ? dataForm.timeSlot[1] : null
+      this.listQuery.startTime = dataForm.timeSlot ? dataForm.timeSlot[0] : null
+      this.listQuery.factoryId = dataForm.factoryId ? dataForm.factoryId : null
+      this.listQuery.inspectionStatus = dataForm.inspectionStatus ? dataForm.inspectionStatus : null
+      this.listQuery.inspectionType = dataForm.inspectionType ? dataForm.inspectionType : null
+      this.listQuery.productId = dataForm.productId ? dataForm.productId : null
+      this.listQuery.recheck = dataForm.recheck ? dataForm.recheck : null
+      this.listQuery.supplierId = dataForm.supplierId ? dataForm.supplierId : null
+      this.listQuery.task = dataForm.task ? dataForm.task : null
+      this.listQuery.userId = dataForm.userId ? dataForm.userId : null
+      this.listQuery.page = 1;
+      this.getDataList(this.listQuery)
+      this.searchOrUpdateVisible = false;
+      // console.log(11111);
+      // this.conditionSearchSubmit();
+    },
+    handleClick(val) {
+      if (val.type === "delete") {
+        this.$confirm(`确定对[名称=${val.data.customerTypeName}]进行删除操作?`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.$http.delete(this.urlOptions.deleteURL, { data: [val.data.id] }).then(({ data }) => {
+              if (data && data.code === 0) {
+                this.$message({
+                  message: "操作成功",
+                  type: "success",
+                  duration: 1500,
+                  onClose: () => {
+                    this.getDataList();
+                  },
+                });
+              } else {
+                this.$message.error(data.msg);
+              }
+            });
+          })
+          .catch(() => { });
+      } else if (val.type === 'edit') {
+        this.addOrEditTitle = this.$t('edit')
+        this.addOrUpdateVisible = true;
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init(val.data.id);
+        });
+      }
+    },
+    // addOrUpdateHandle(productData) {
+    //   this.addOrUpdateVisible = true;
+    //   this.$nextTick(() => {
+    //     this.$refs.addOrUpdate.init(productData);
+    //   });
+    // },
+    getDataList() {
+      this.dataListLoading = true;
+      this.$http
+        .post(this.urlOptions.getDataListURL,  this.listQuery,
+        )
+        .then(({ data: res }) => {
+          this.dataListLoading = false;
+          if (res.code !== 0) {
+            this.tableData = [];
+            this.listQuery.total = 0;
+            return this.$message.error(res.msg);
+          }
+          this.tableData = res.data.list;
+          this.listQuery.total = res.data.total;
+        })
+        .catch(() => {
+          this.dataListLoading = false;
+        })
+    },
+    buttonClick(val) {
+      console.log(val);
+      switch (val.btnName) {
+        case "search":
+          // this.listQuery.paramCode = val.paramCode;
+          this.listQuery.key = null;
+          console.log(i18n  );
+          this.listQuery.page = 1;
+          this.getDataList();
+          break;
+        case "correlation":
+          this.productOrEditTitle = "产品";
+          this.productOrUpdateVisible = true;
+          // this.searchOrUpdateHandle(this.productData);
+          // this.searchOrUpdateVisible = true;
+          this.$nextTick(() => {
+            this.$refs.productOrUpdate.init(this.productData);
+          });
+          console.log(this.productId);
+          break;
+        case "add":
+          this.addOrEditTitle = '新增'
+          this.addOrUpdateVisible = true;
+          this.addOrUpdateHandle()
+          break;
+        case "cancel":
+          this.$refs.palletTable1.setCurrent("palletTable", -1);
+          break;
+        default:
+          console.log(val);
+      }
+    },
+  },
+};
+</script>
diff --git a/src/views/modules/incoming/paretoDiagram.vue b/src/views/modules/incoming/paretoDiagram.vue
new file mode 100644
index 0000000..e82b7b5
--- /dev/null
+++ b/src/views/modules/incoming/paretoDiagram.vue
@@ -0,0 +1,312 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-01-11 09:24:58
+ * @LastEditTime: 2023-06-20 15:53:00
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__user">
+      <el-form :inline="true" :model="dataForm" class="demo-form-inline">
+        <el-form-item :label="$t('code.inspectionTime')" prop="timeSlot">
+          <el-date-picker v-model="dataForm.timeSlot" size="small" type="datetimerange" format='yyyy-MM-dd HH:mm:ss'
+            @change="getFactory" valueFormat='yyyy-MM-ddTHH:mm:ss' :start-placeholder="$t('gage.startTime')"
+            :end-placeholder="$t('gage.endTime')" :range-separator="$t('gage.to')" clearable />
+        </el-form-item>
+        <el-form-item :label="$t('code.factoryName')">
+          <el-select v-model="dataForm.factoryId" :placeholder="$t('code.factoryName')" @change="getInspectionType">
+            <el-option v-for="item in factoryList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('code.inspectionType')">
+          <el-input v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')"></el-input>
+        </el-form-item>
+        <!-- <el-form-item :label="$t('code.productName')">
+          <el-select v-model="dataForm.productId" :placeholder="$t('code.productName')" @change="gerCharacteristics">
+            <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item> -->
+        <!-- <el-form-item :label="$t('code.inspectionType')">
+          <el-select v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')">
+            <el-option v-for="item in inspectionTypeList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item> -->
+        <!--
+        <el-form-item :label="$t('code.characteristics')">
+          <el-input v-model="dataForm.characteristicsId" :placeholder="$t('code.characteristics')"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('code.sampleSize')">
+          <el-input v-model="dataForm.sampleSize" :placeholder="$t('code.sampleSize')"></el-input>
+        </el-form-item> -->
+        <el-form-item>
+          <el-button type="primary" @click="getData">查询</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div id="priceMain" :style="{ width: '100%', height: '500px' }" />
+  </el-card>
+</template>
+
+<script>
+// import available from "./components/gageAvailable.vue"
+import i18n from "@/i18n"
+import * as echarts from 'echarts';
+export default {
+  data() {
+    return {
+      myChart: null,
+      urlOptions: {
+        getDataListURL: "/code/purchaseRegistration/pareto/diagram",
+        getFactoryURL: '/code/purchaseRegistration/query/factory',
+        getProductURL: '/code/purchaseRegistration/query/product',
+        getInspectionTypeURL: '/code/purchaseRegistration/query/inspection/type',
+        getPurchaseRegistrationTypeURL: '/code/purchaseRegistration/query/checkout/project',
+      },
+      factoryList: [],
+      productList:[],
+      listQuery: {
+        characteristicsId:null,
+        factoryId: null,
+        inspectionType: null,
+        productId: null,
+        sampleSize: null,
+        endTime: null,
+        startTime: null,
+      },
+      dataForm: {
+        productId: null,
+        timeSlot: [],
+        factoryId: null,
+        characteristicsId: null,
+        inspectionType: null,
+        sampleSize:null
+      },
+      selectOptions: [{
+            id: 0,
+            name: '监控'
+          },
+            {
+              id: 1,
+              name: '电芯来料检验'
+            },
+            {
+              id: 2,
+              lname: 'IQC抽检'
+            },
+            {
+              id: 3,
+              name: 'IQC抽检2'
+            },
+            {
+              id: 4,
+              name: '原料抽检'
+            },
+            {
+              id: 5,
+              name: '进货外观检验'
+            },
+            {
+              id: 6,
+              name: '库内原料检验'
+            },
+            {
+              id: 7,
+              name: '来料检验'
+            },
+            {
+              id: 8,
+              name: '胶片'
+            },
+            {
+              id: 9,
+              name: '抽检'
+            },
+            {
+              id: 10,
+              name: '巡检'
+            }, {
+              id: 11,
+              name: '首检'
+            },
+            {
+              id: 12,
+              name: '末检'
+            },
+            {
+              id: 13,
+              name: '实时监测'
+            },
+            {
+              id: 14,
+              name: 'FQC抽检'
+            },
+            {
+              id: 15,
+              name: 'OQC抽检'
+            },
+          ],
+    };
+  },
+  // components: {
+  //   AddOrUpdate,
+  // },
+  mounted() {
+    this.getData()
+    // this.getDict()
+  },
+  methods: {
+    selectChanged(val) {
+      console.log(val)
+      alert(JSON.stringify(val))
+    },
+    getFactory(val) {
+      console.log(val)
+      this.$http.get(this.urlOptions.getFactoryURL, {
+        params: {
+          startTime: val[0],
+          endTime: val[1]
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.factoryList = res.data.map((item) => {
+              return {
+                id: item.factoryId,
+                name: item.factoryName
+              }
+            })
+          }
+        })
+      this.$http.get(this.urlOptions.getProductURL, {
+        params: {
+          startTime: val[0],
+          endTime: val[1]
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.productList = res.data.map((item) => {
+              return {
+                id: item.productId,
+                name: item.productName
+              }
+            })
+          }
+        })
+    },
+    getInspectionType(val) {
+      this.$http.get(this.urlOptions.getInspectionTypeURL, {
+        params: {
+          startTime: this.dataForm.timeSlot[0],
+          endTime: this.dataForm.timeSlot[1],
+          factoryId: val
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.dataForm.inspectionType = res.data.inspectionType
+          }
+        })
+    },
+    // gerCharacteristics(val) {
+    //   this.$http.get(this.urlOptions.getPurchaseRegistrationTypeURL, {
+    //     params: {
+    //       productId:val
+    //     },
+    //   })
+    //     .then(({ data: res }) => {
+    //       if (res.code === 0) {
+    //         this.dataForm.characteristicsId = res.data.parameterName
+    //       }
+    //     })
+    // },
+    getData() {
+      this.$http
+        .post(this.urlOptions.getDataListURL, {
+          params: this.listQuery
+        }
+        )
+        .then(({ data: res }) => {
+          console.log(res)
+          var chartDom = document.getElementById('priceMain');
+          var myChart = echarts.init(chartDom)
+          this.myChart = myChart
+          var option;
+          // myChart.on('click', function (params) {
+          //   console.log(params);
+          // });
+          myChart.on('click', 'xAxis.category', function (params) {
+            console.log(params);
+          });
+          option = {
+            title: {
+              text:'帕累托图'
+            },
+            tooltip: {
+              formatter: (params) => {
+                // 打印确认params是对象还是数组
+                console.log(params)
+                // 对象：取鼠标悬浮当前项索引params.dataIndex
+                // 数组：取鼠标悬浮当前项索引params[0].dataIndex
+                let index = params.dataIndex
+                let obj = res.data[index] // 通过索引取当前项完整的接口返回值
+                let str = `缺陷数量:${obj.number}<br/>
+			        缺陷率${obj.defectRate}<br/>`
+                return str
+              }
+            },
+            xAxis: {
+              data: res.data.map(i => { return i.propertyName })
+            },
+            yAxis: [{
+              type: 'value',
+              name: '缺陷数量',
+              show: true,
+              interval: 10,
+              axisLine: {
+                lineStyle: {
+                  color: '#5e859e',
+                  width: 2
+                }
+              }
+            }],
+            series: [{
+              name: '缺陷率',
+              type: 'bar',
+              barWidth: '50%',
+              data: res.data.map(i => { return i.defectRate })
+            }, {
+              name: '缺陷数量',
+              type: 'line',
+              smooth: true,
+              data: res.data.map(i => { return i.number })
+            }]
+          };
+          option && myChart.setOption(option);
+        })
+    },
+    buttonClick(val) {
+      console.log(val)
+      switch (val.btnName) {
+        case "search":
+          // this.dataForm.sampleSize = val.sampleSize ? val.sampleSize : null
+          this.dataForm.inspectionType = val.inspectionType ? val.inspectionType : null
+          // this.dataForm.characteristicsId = val.characteristicsId ? val.characteristicsId : null
+          this.dataForm.factoryId = val.factoryId ? val.factoryId : null
+          // this.dataForm.productId = val.productId ? val.productId : null
+          this.dataForm.startTime = val.timeSlot ? val.timeSlot[0] : null
+          this.dataForm.endTime = val.timeSlot ? val.timeSlot[1] : null
+          this.getData()
+          break;
+
+        default:
+          console.log(val)
+      }
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/incoming/purchaseRegistration.vue b/src/views/modules/incoming/purchaseRegistration.vue
new file mode 100644
index 0000000..5e15a8d
--- /dev/null
+++ b/src/views/modules/incoming/purchaseRegistration.vue
@@ -0,0 +1,337 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-06-12 13:22:50
+ * @LastEditTime: 2023-06-20 15:35:49
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__user">
+      <SearchBar :formConfigs="formConfig" ref="ruleForm" @headBtnClick="buttonClick">
+        <el-badge :value="1" class="item">
+          <el-button type="primary" size="small" @click="conditionSearch">条件搜索</el-button>
+        </el-badge>
+      </SearchBar>
+      <base-table id="palletTable" :table-props="tableProps" :page="listQuery.page" ref="palletTable1"
+        highlight-current-row :limit="listQuery.limit" :table-data="tableData" @current-change="handleCurrentChange">
+        <method-btn v-if="tableBtn.length" slot="handleBtn" :width="100" label="操作" :method-list="tableBtn"
+          @clickBtn="handleClick" />
+      </base-table>
+      <pagination :limit.sync="listQuery.limit" :page.sync="listQuery.page" :total="listQuery.total"
+        @pagination="getDataList" />
+      <!-- 弹窗, 新增 / 修改 -->
+      <base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="addOrUpdateVisible" @cancel="handleCancel"
+        @confirm="handleConfirm" :before-close="handleCancel">
+        <purchaseRegistration-add ref="addOrUpdate" @successSubmit="successSubmit">
+          </purchaseRegistration-add>
+          <!-- <el-row slot="footer" type="flex" justify="end"> </el-row> -->
+      </base-dialog>
+      <base-dialog :dialogTitle="searchOrEditTitle" :dialogVisible="searchOrUpdateVisible" @cancel="handleSearchCancel"
+        @confirm="handleSearchConfirm" :before-close="handleSearchCancel">
+        <purchaseRegistration-search ref="searchOrUpdate" @refreshDataList="conditionSearchSubmit">
+        </purchaseRegistration-search>
+        <el-row slot="footer" type="flex" justify="end">
+          <el-col :span="12">
+            <el-button size="small" type="primary" plain class="btnTextStyle" @click="handleSearchCancel">
+              {{ $t("close") }}
+            </el-button>
+            <el-button size="small" class="btnTextStyle" type="primary" plain @click="handleSearchReset">{{ $t("reset")
+              }}</el-button>
+            <el-button type="primary" size="small" class="btnTextStyle" @click="handleSearchConfirm">
+              {{ $t("search") }}
+            </el-button>
+          </el-col>
+        </el-row>
+      </base-dialog>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import basicPage from "@/mixins/basic-page";
+import basicSearch from "@/mixins/basic-search";
+import purchaseRegistrationSearch from "./components/purchaseRegistrationSearch.vue";
+import purchaseRegistrationAdd from "./components/purchaseRegistration-add.vue";
+import i18n from "@/i18n";
+// import i18n from "@/i18n";
+const tableProps = [
+  {
+    prop: "customSamplingId",
+    label: i18n.t('code.customSampling'),
+  },
+  {
+    prop: "factoryName",
+    label: i18n.t('code.factoryName'),
+  },
+  {
+    prop: "batchNo",
+    label: i18n.t('code.batchNo'),
+  },
+  {
+    prop: "orderNumber",
+    label: i18n.t('code.orderNumber'),
+  },
+  {
+    prop: "upload",
+    label: i18n.t('code.upload'),
+  },
+  {
+    prop: "judgmentResult",
+    label: i18n.t('code.judgmentResult'),
+  },
+  {
+    prop: "productCode",
+    label: i18n.t('code.productCode'),
+  },
+  {
+    prop: "supplierName",
+    label: i18n.t('code.supplierName'),
+  },
+  {
+    prop: "batchQuantity",
+    label: i18n.t('code.batchQuantity'),
+  },
+  {
+    prop: "defectiveQuantity",
+    label: i18n.t('code.defectiveQuantity'),
+  },
+  {
+    prop: "defectsNumber",
+    label: i18n.t('code.defectsNumber'),
+  },
+  {
+    prop: "inspectionQuantity",
+    label: i18n.t('code.inspectionQuantity'),
+  },
+  {
+    prop: "checkoutTime",
+    label: i18n.t('code.checkoutTime'),
+  },
+  {
+    prop: "inspectionTime",
+    label: i18n.t('code.inspectionTime'),
+  },
+  {
+    prop: "inspectionType",
+    label: i18n.t('code.inspectionType'),
+  },
+  {
+    prop: "submit",
+    label: i18n.t('code.submit'),
+  },
+  {
+    prop: "username",
+    label: i18n.t('code.username'),
+  },
+  {
+    prop: "processingMethod",
+    label: i18n.t('code.processingMethod'),
+  },
+  {
+    prop: "processingResults",
+    label: i18n.t('code.processingResults'),
+  },
+];
+const tableBtn = [
+  {
+    type: "edit",
+    btnName: i18n.t('t.edit'),
+  },
+  {
+    type: "delete",
+    btnName: i18n.t('t.delete'),
+  },
+];
+export default {
+  mixins: [basicPage, basicSearch],
+  data() {
+    return {
+      urlOptions: {
+        getDataListURL: "code/purchaseRegistration/page/term",
+        deleteURL: "/code/purchaseRegistration",
+        exportURL: "/code/purchaseRegistration/export",
+      },
+      tableProps,
+      tableBtn,
+      listQuery: {
+        limit: 10,
+        page:1
+      },
+      productData: {},
+      searchOrEditTitle: "",
+      searchOrUpdateVisible: false,
+      productOrEditTitle: "",
+      addOrEditTitle: '',
+      addOrUpdateVisible:false,
+      productOrUpdateVisible: false,
+      formConfig: [
+        // {
+        //   type: "",
+        //   label: i18n.t("params.paramCode"),
+        //   placeholder: i18n.t("params.paramCode"),
+        //   param: "paramCode",
+        // },
+        // {
+        //   type: "separate",
+        // },
+        {
+          type: "button",
+          btnName: "新增",
+          name: "add",
+          color: "primary",
+        },
+        {
+          type: "button",
+          btnName: "搜索",
+          name: "search",
+          color: "primary",
+          // plain: true,
+        }
+      ],
+    };
+  },
+  components: {
+    purchaseRegistrationSearch,
+    purchaseRegistrationAdd
+  },
+  methods: {
+    //search-bar点击
+    handleProductCancel() {
+      this.productOrUpdateVisible = false;
+      this.productOrEditTitle = "";
+    },
+    handleCurrentChange(val) {
+      console.log(val);
+      this.productData = val.newVal ? val.newVal: {}
+    },
+    setCurrent(index) {
+      this.$refs.palletTable1.setCurrent("palletTable", index);
+    },
+    // handleSearchCancel() {
+    //   this.searchOrEditTitle = "";
+    //   this.searchOrUpdateVisible = false;
+    // },
+    conditionSearch() {
+      this.searchOrEditTitle = "搜索";
+      this.searchOrUpdateVisible = true;
+      this.$nextTick(() => {
+        this.$refs.searchOrUpdate.init();
+      });
+    },
+    // handleConfirm() {
+    //   this.$refs.addOrUpdate.dataFormSubmitHandle();
+    // },
+    // conditionSearchSubmit() {},
+    conditionSearchSubmit(dataForm) {
+      // console.log(key);
+      this.listQuery.processingResults = dataForm.processingResults ? dataForm.processingResults : null
+      this.listQuery.batchNo = dataForm.batchNo ? dataForm.batchNo : null
+      this.listQuery.customSamplingId = dataForm.customSamplingId ? dataForm.customSamplingId : null
+      this.listQuery.factoryId = dataForm.factoryId ? dataForm.factoryId : null
+      this.listQuery.inspectionType = dataForm.inspectionType ? dataForm.inspectionType : null
+      this.listQuery.judgmentResult = dataForm.judgmentResult ? dataForm.judgmentResult : null
+      this.listQuery.orderNumber = dataForm.orderNumber ? dataForm.orderNumber : null
+      this.listQuery.productId = dataForm.productId ? dataForm.productId : null
+      this.listQuery.recheck = dataForm.recheck ? dataForm.recheck : null
+      this.listQuery.supplierId = dataForm.supplierId ? dataForm.supplierId : null
+      this.listQuery.upload = dataForm.upload ? dataForm.upload : null
+      this.listQuery.userId = dataForm.userId ? dataForm.userId : null
+      this.listQuery.page = 1
+      this.getDataList(this.listQuery)
+      this.searchOrUpdateVisible = false
+      // console.log(11111);
+      // this.conditionSearchSubmit();
+    },
+    handleClick(val) {
+      if (val.type === "delete") {
+        this.$confirm(`确定对[名称=${val.data.customerTypeName}]进行删除操作?`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.$http.delete(this.urlOptions.deleteURL, { data: [val.data.id] }).then(({ data }) => {
+              if (data && data.code === 0) {
+                this.$message({
+                  message: "操作成功",
+                  type: "success",
+                  duration: 1500,
+                  onClose: () => {
+                    this.getDataList();
+                  },
+                });
+              } else {
+                this.$message.error(data.msg);
+              }
+            });
+          })
+          .catch(() => { });
+      } else if (val.type === 'edit') {
+        this.addOrEditTitle = this.$t('edit')
+        this.addOrUpdateVisible = true
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init(val.data.id)
+        });
+      }
+    },
+    // addOrUpdateHandle(productData) {
+    //   this.addOrUpdateVisible = true;
+    //   this.$nextTick(() => {
+    //     this.$refs.addOrUpdate.init(productData);
+    //   });
+    // },
+    getDataList() {
+      this.dataListLoading = true;
+      this.$http
+        .post(this.urlOptions.getDataListURL,  this.listQuery,
+        )
+        .then(({ data: res }) => {
+          this.dataListLoading = false;
+          if (res.code !== 0) {
+            this.tableData = [];
+            this.listQuery.total = 0;
+            return this.$message.error(res.msg);
+          }
+          this.tableData = res.data.list;
+          this.listQuery.total = res.data.total;
+        })
+        .catch(() => {
+          this.dataListLoading = false;
+        })
+    },
+    buttonClick(val) {
+      console.log(val);
+      switch (val.btnName) {
+        case "search":
+          // this.listQuery.paramCode = val.paramCode;
+          this.listQuery.key = null;
+          console.log(i18n  );
+          this.listQuery.page = 1;
+          this.getDataList();
+          break;
+        case "correlation":
+          this.productOrEditTitle = "产品";
+          this.productOrUpdateVisible = true;
+          // this.searchOrUpdateHandle(this.productData);
+          // this.searchOrUpdateVisible = true;
+          this.$nextTick(() => {
+            this.$refs.productOrUpdate.init(this.productData);
+          });
+          console.log(this.productId);
+          break;
+        case "add":
+          this.addOrEditTitle = '新增'
+          this.addOrUpdateVisible = true;
+          this.addOrUpdateHandle()
+          break;
+        case "cancel":
+          this.$refs.palletTable1.setCurrent("palletTable", -1);
+          break;
+        default:
+          console.log(val);
+      }
+    },
+  },
+};
+</script>
diff --git a/src/views/modules/incoming/scatterPlot.vue b/src/views/modules/incoming/scatterPlot.vue
new file mode 100644
index 0000000..8808b11
--- /dev/null
+++ b/src/views/modules/incoming/scatterPlot.vue
@@ -0,0 +1,303 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-01-11 09:24:58
+ * @LastEditTime: 2023-06-20 15:53:12
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__user">
+      <el-form :inline="true" :model="dataForm" class="demo-form-inline">
+        <el-form-item :label="$t('code.inspectionTime')" prop="timeSlot">
+          <el-date-picker v-model="dataForm.timeSlot" size="small" type="datetimerange" format='yyyy-MM-dd HH:mm:ss'
+            @change="getFactory" valueFormat='yyyy-MM-ddTHH:mm:ss' :start-placeholder="$t('gage.startTime')"
+            :end-placeholder="$t('gage.endTime')" :range-separator="$t('gage.to')" clearable />
+        </el-form-item>
+        <el-form-item :label="$t('code.factoryName')">
+          <el-select v-model="dataForm.factoryId" :placeholder="$t('code.factoryName')" @change="getInspectionType">
+            <el-option v-for="item in factoryList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('code.productName')">
+          <el-select v-model="dataForm.productId" :placeholder="$t('code.productName')" @change="gerCharacteristics">
+            <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <!-- <el-form-item :label="$t('code.inspectionType')">
+          <el-select v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')">
+            <el-option v-for="item in inspectionTypeList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item> -->
+        <el-form-item :label="$t('code.inspectionType')">
+          <el-input v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('code.characteristics')">
+          <el-input v-model="dataForm.characteristicsId" :placeholder="$t('code.characteristics')"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('code.sampleSize')">
+          <el-input v-model="dataForm.sampleSize" :placeholder="$t('code.sampleSize')"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getData">查询</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div id="priceMain" :style="{ width: '100%', height: '500px' }" />
+  </el-card>
+</template>
+
+<script>
+// import available from "./components/gageAvailable.vue"
+import i18n from "@/i18n"
+import * as echarts from 'echarts';
+export default {
+  data() {
+    return {
+      myChart: null,
+      urlOptions: {
+        getDataListURL: "/code/purchaseRegistration/phase/diagram",
+        getFactoryURL: '/code/purchaseRegistration/query/factory',
+        getProductURL: '/code/purchaseRegistration/query/product',
+        getInspectionTypeURL: '/code/purchaseRegistration/query/inspection/type',
+        getPurchaseRegistrationTypeURL: '/code/purchaseRegistration/query/checkout/project',
+      },
+      factoryList: [],
+      productList:[],
+      listQuery: {
+        characteristicsId:null,
+        factoryId: null,
+        inspectionType: null,
+        productId: null,
+        sampleSize: null,
+        endTime: null,
+        startTime: null,
+      },
+      dataForm: {
+        productId: null,
+        timeSlot: [],
+        factoryId: null,
+        characteristicsId: null,
+        inspectionType: null,
+        sampleSize:null
+      },
+      selectOptions: [{
+            id: 0,
+            name: '监控'
+          },
+            {
+              id: 1,
+              name: '电芯来料检验'
+            },
+            {
+              id: 2,
+              lname: 'IQC抽检'
+            },
+            {
+              id: 3,
+              name: 'IQC抽检2'
+            },
+            {
+              id: 4,
+              name: '原料抽检'
+            },
+            {
+              id: 5,
+              name: '进货外观检验'
+            },
+            {
+              id: 6,
+              name: '库内原料检验'
+            },
+            {
+              id: 7,
+              name: '来料检验'
+            },
+            {
+              id: 8,
+              name: '胶片'
+            },
+            {
+              id: 9,
+              name: '抽检'
+            },
+            {
+              id: 10,
+              name: '巡检'
+            }, {
+              id: 11,
+              name: '首检'
+            },
+            {
+              id: 12,
+              name: '末检'
+            },
+            {
+              id: 13,
+              name: '实时监测'
+            },
+            {
+              id: 14,
+              name: 'FQC抽检'
+            },
+            {
+              id: 15,
+              name: 'OQC抽检'
+            },
+          ],
+    };
+  },
+  // components: {
+  //   AddOrUpdate,
+  // },
+  mounted() {
+    this.getData()
+    // this.getDict()
+  },
+  methods: {
+    selectChanged(val) {
+      console.log(val)
+      alert(JSON.stringify(val))
+    },
+    getFactory(val) {
+      console.log(val)
+      this.$http.get(this.urlOptions.getFactoryURL, {
+        params: {
+          startTime: val[0],
+          endTime: val[1]
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.factoryList = res.data.map((item) => {
+              return {
+                id: item.factoryId,
+                name: item.factoryName
+              }
+            })
+          }
+        })
+      this.$http.get(this.urlOptions.getProductURL, {
+        params: {
+          startTime: val[0],
+          endTime: val[1]
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.productList = res.data.map((item) => {
+              return {
+                id: item.productId,
+                name: item.productName
+              }
+            })
+          }
+        })
+    },
+    getInspectionType(val) {
+      this.$http.get(this.urlOptions.getInspectionTypeURL, {
+        params: {
+          startTime: this.dataForm.timeSlot[0],
+          endTime: this.dataForm.timeSlot[1],
+          factoryId: val
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.dataForm.inspectionType = res.data.inspectionType
+          }
+        })
+    },
+    gerCharacteristics(val) {
+      this.$http.get(this.urlOptions.getPurchaseRegistrationTypeURL, {
+        params: {
+          productId:val
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.dataForm.characteristicsId = res.data.parameterName
+          }
+        })
+    },
+    getData() {
+      this.$http
+        .post(this.urlOptions.getDataListURL, {
+          params: this.listQuery
+        }
+        )
+        .then(({ data: res }) => {
+          console.log(res)
+          let xAxisData = []
+          var chartDom = document.getElementById('priceMain');
+          var myChart = echarts.init(chartDom)
+          this.myChart = myChart
+          var option;
+          // myChart.on('click', function (params) {
+          //   console.log(params);
+          // });
+          myChart.on('click', 'xAxis.category', function (params) {
+            console.log(params);
+          });
+          option = {
+            title: {
+              text:'散点图'
+            },
+            tooltip: {
+              trigger: 'axis'
+            },
+            // legend: {
+            //   data: ['推移图']
+            // },
+            grid: {
+              left: '3%',
+              right: '4%',
+              bottom: '3%',
+              containLabel: true
+            },
+            xAxis: {
+              data: res.data.abscissaList,
+              type: 'category',
+              axisLabel: {
+                clickable: true
+              },
+              silent: false,
+              triggerEvent: true
+            },
+            yAxis: {
+              type: 'value'
+            },
+            series: [{
+              name: '缺陷率',
+              type: 'bar',
+              barWidth: '50%',
+              data: res.data.ordinateList
+            }]
+          };
+          option && myChart.setOption(option);
+        })
+    },
+    buttonClick(val) {
+      console.log(val)
+      switch (val.btnName) {
+        case "search":
+          this.dataForm.sampleSize = val.sampleSize ? val.sampleSize : null
+          this.dataForm.inspectionType = val.inspectionType ? val.inspectionType : null
+          this.dataForm.characteristicsId = val.characteristicsId ? val.characteristicsId : null
+          this.dataForm.factoryId = val.factoryId ? val.factoryId : null
+          this.dataForm.productId = val.productId ? val.productId : null
+          this.dataForm.startTime = val.timeSlot ? val.timeSlot[0] : null
+          this.dataForm.endTime = val.timeSlot ? val.timeSlot[1] : null
+          this.getData()
+          break;
+
+        default:
+          console.log(val)
+      }
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/incoming/stageDiagram.vue b/src/views/modules/incoming/stageDiagram.vue
new file mode 100644
index 0000000..48d5247
--- /dev/null
+++ b/src/views/modules/incoming/stageDiagram.vue
@@ -0,0 +1,298 @@
+
+<!--
+ * @Author: zhp
+ * @Date: 2023-01-11 09:24:58
+ * @LastEditTime: 2023-06-20 15:53:18
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__user">
+      <el-form :inline="true" :model="dataForm" class="demo-form-inline">
+        <el-form-item :label="$t('code.inspectionTime')" prop="timeSlot">
+          <el-date-picker v-model="dataForm.timeSlot" size="small" type="datetimerange" format='yyyy-MM-dd HH:mm:ss'
+            @change="getFactory" valueFormat='yyyy-MM-ddTHH:mm:ss' :start-placeholder="$t('gage.startTime')"
+            :end-placeholder="$t('gage.endTime')" :range-separator="$t('gage.to')" clearable />
+        </el-form-item>
+        <el-form-item :label="$t('code.factoryName')">
+          <el-select v-model="dataForm.factoryId" :placeholder="$t('code.factoryName')" @change="getInspectionType">
+            <el-option v-for="item in factoryList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('code.productName')">
+          <el-select v-model="dataForm.productId" :placeholder="$t('code.productName')" @change="gerCharacteristics">
+            <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <!-- <el-form-item :label="$t('code.inspectionType')">
+          <el-select v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')">
+            <el-option v-for="item in inspectionTypeList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item> -->
+        <el-form-item :label="$t('code.inspectionType')">
+          <el-input v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('code.characteristics')">
+          <el-input v-model="dataForm.characteristicsId" :placeholder="$t('code.characteristics')"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('code.sampleSize')">
+          <el-input v-model="dataForm.sampleSize" :placeholder="$t('code.sampleSize')"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getData">查询</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div id="priceMain" :style="{ width: '100%', height: '500px' }" />
+  </el-card>
+</template>
+
+<script>
+// import available from "./components/gageAvailable.vue"
+import i18n from "@/i18n"
+import * as echarts from 'echarts';
+export default {
+  data() {
+    return {
+      myChart: null,
+      urlOptions: {
+        getDataListURL: "/code/purchaseRegistration/phase/diagram",
+        getFactoryURL: '/code/purchaseRegistration/query/factory',
+        getProductURL: '/code/purchaseRegistration/query/product',
+        getInspectionTypeURL: '/code/purchaseRegistration/query/inspection/type',
+        getPurchaseRegistrationTypeURL: '/code/purchaseRegistration/query/checkout/project',
+      },
+      factoryList: [],
+      productList:[],
+      listQuery: {
+        characteristicsId:null,
+        factoryId: null,
+        inspectionType: null,
+        productId: null,
+        sampleSize: null,
+        endTime: null,
+        startTime: null,
+      },
+      dataForm: {
+        productId: null,
+        timeSlot: [],
+        factoryId: null,
+        characteristicsId: null,
+        inspectionType: null,
+        sampleSize:null
+      },
+      selectOptions: [{
+            id: 0,
+            name: '监控'
+          },
+            {
+              id: 1,
+              name: '电芯来料检验'
+            },
+            {
+              id: 2,
+              lname: 'IQC抽检'
+            },
+            {
+              id: 3,
+              name: 'IQC抽检2'
+            },
+            {
+              id: 4,
+              name: '原料抽检'
+            },
+            {
+              id: 5,
+              name: '进货外观检验'
+            },
+            {
+              id: 6,
+              name: '库内原料检验'
+            },
+            {
+              id: 7,
+              name: '来料检验'
+            },
+            {
+              id: 8,
+              name: '胶片'
+            },
+            {
+              id: 9,
+              name: '抽检'
+            },
+            {
+              id: 10,
+              name: '巡检'
+            }, {
+              id: 11,
+              name: '首检'
+            },
+            {
+              id: 12,
+              name: '末检'
+            },
+            {
+              id: 13,
+              name: '实时监测'
+            },
+            {
+              id: 14,
+              name: 'FQC抽检'
+            },
+            {
+              id: 15,
+              name: 'OQC抽检'
+            },
+          ],
+    };
+  },
+  // components: {
+  //   AddOrUpdate,
+  // },
+  mounted() {
+    this.getData()
+    // this.getDict()
+  },
+  methods: {
+    selectChanged(val) {
+      console.log(val)
+      alert(JSON.stringify(val))
+    },
+    getFactory(val) {
+      console.log(val)
+      this.$http.get(this.urlOptions.getFactoryURL, {
+        params: {
+          startTime: val[0],
+          endTime: val[1]
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.factoryList = res.data.map((item) => {
+              return {
+                id: item.factoryId,
+                name: item.factoryName
+              }
+            })
+          }
+        })
+      this.$http.get(this.urlOptions.getProductURL, {
+        params: {
+          startTime: val[0],
+          endTime: val[1]
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.productList = res.data.map((item) => {
+              return {
+                id: item.productId,
+                name: item.productName
+              }
+            })
+          }
+        })
+    },
+    getInspectionType(val) {
+      this.$http.get(this.urlOptions.getInspectionTypeURL, {
+        params: {
+          startTime: this.dataForm.timeSlot[0],
+          endTime: this.dataForm.timeSlot[1],
+          factoryId: val
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.dataForm.inspectionType = res.data.inspectionType
+          }
+        })
+    },
+    gerCharacteristics(val) {
+      this.$http.get(this.urlOptions.getPurchaseRegistrationTypeURL, {
+        params: {
+          productId:val
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.dataForm.characteristicsId = res.data.parameterName
+          }
+        })
+    },
+    getData() {
+      this.$http
+        .post(this.urlOptions.getDataListURL, {
+          params: this.listQuery
+        }
+        )
+        .then(({ data: res }) => {
+          console.log(res)
+          let xAxisData = []
+          var chartDom = document.getElementById('priceMain');
+          var myChart = echarts.init(chartDom)
+          this.myChart = myChart
+          var option;
+          // myChart.on('click', function (params) {
+          //   console.log(params);
+          // });
+          myChart.on('click', 'xAxis.category', function (params) {
+            console.log(params);
+          });
+          option = {
+            title: {
+              text:'阶段图'
+            },
+            tooltip: {
+              trigger: 'axis'
+            },
+            // legend: {
+            //   data: ['推移图']
+            // },
+            grid: {
+              left: '3%',
+              right: '4%',
+              bottom: '3%',
+              containLabel: true
+            },
+            xAxis: {
+              data: res.data.purchaseRegistrationCharacteristicsDTOList.length,
+              type: 'category',
+              axisLabel: {
+                clickable: true
+              },
+              silent: false,
+              triggerEvent: true
+            },
+            yAxis: {
+              type: 'value'
+            },
+          };
+          option && myChart.setOption(option);
+        })
+    },
+    buttonClick(val) {
+      console.log(val)
+      switch (val.btnName) {
+        case "search":
+          this.dataForm.sampleSize = val.sampleSize ? val.sampleSize : null
+          this.dataForm.inspectionType = val.inspectionType ? val.inspectionType : null
+          this.dataForm.characteristicsId = val.characteristicsId ? val.characteristicsId : null
+          this.dataForm.factoryId = val.factoryId ? val.factoryId : null
+          this.dataForm.productId = val.productId ? val.productId : null
+          this.dataForm.startTime = val.timeSlot ? val.timeSlot[0] : null
+          this.dataForm.endTime = val.timeSlot ? val.timeSlot[1] : null
+          this.getData()
+          break;
+
+        default:
+          console.log(val)
+      }
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/incoming/trendChart.vue b/src/views/modules/incoming/trendChart.vue
new file mode 100644
index 0000000..16e6c15
--- /dev/null
+++ b/src/views/modules/incoming/trendChart.vue
@@ -0,0 +1,319 @@
+
+<!--
+ * @Author: zhp
+ * @Date: 2023-01-11 09:24:58
+ * @LastEditTime: 2023-06-20 15:53:29
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__user">
+      <el-form :inline="true" :model="dataForm" class="demo-form-inline">
+        <el-form-item :label="$t('code.inspectionTime')" prop="timeSlot">
+          <el-date-picker v-model="dataForm.timeSlot" size="small" type="datetimerange" format='yyyy-MM-dd HH:mm:ss'
+            @change="getFactory" valueFormat='yyyy-MM-ddTHH:mm:ss' :start-placeholder="$t('gage.startTime')"
+            :end-placeholder="$t('gage.endTime')" :range-separator="$t('gage.to')" clearable />
+        </el-form-item>
+        <el-form-item :label="$t('code.factoryName')">
+          <el-select v-model="dataForm.factoryId" :placeholder="$t('code.factoryName')" @change="getInspectionType">
+            <el-option v-for="item in factoryList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('code.productName')">
+          <el-select v-model="dataForm.productId" :placeholder="$t('code.productName')" @change="gerCharacteristics">
+            <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <!-- <el-form-item :label="$t('code.inspectionType')">
+          <el-select v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')">
+            <el-option v-for="item in inspectionTypeList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item> -->
+        <el-form-item :label="$t('code.inspectionType')">
+          <el-input v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('code.characteristics')">
+          <el-select v-model="dataForm.characteristicsId" :placeholder="$t('code.characteristics')">
+            <el-option v-for="item in characteristicsList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('code.sampleSize')">
+          <el-input v-model="dataForm.sampleSize" :placeholder="$t('code.sampleSize')"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getData">查询</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div id="priceMain" :style="{ width: '100%', height: '500px' }" />
+  </el-card>
+</template>
+
+<script>
+// import available from "./components/gageAvailable.vue"
+import i18n from "@/i18n"
+import * as echarts from 'echarts';
+export default {
+  data() {
+    return {
+      myChart: null,
+      urlOptions: {
+        getDataListURL: "/code/purchaseRegistration/transition/diagram",
+        getFactoryURL: '/code/purchaseRegistration/query/factory',
+        getProductURL: '/code/purchaseRegistration/query/product',
+        getInspectionTypeURL: '/code/purchaseRegistration/query/inspection/type',
+        getPurchaseRegistrationTypeURL: '/code/purchaseRegistration/query/checkout/project',
+      },
+      factoryList: [],
+      productList: [],
+      characteristicsList:[],
+      listQuery: {
+        characteristicsId: null,
+        factoryId: null,
+        inspectionType: null, 
+        productId: null,
+        sampleSize: null,
+        endTime: null,
+        startTime: null,
+      },
+      dataForm: {
+        productId: null,
+        timeSlot: [],
+        factoryId: null,
+        characteristicsId: null,
+        inspectionType: null,
+        sampleSize: null
+      },
+      selectOptions: [{
+        id: 0,
+        name: '监控'
+      },
+      {
+        id: 1,
+        name: '电芯来料检验'
+      },
+      {
+        id: 2,
+        lname: 'IQC抽检'
+      },
+      {
+        id: 3,
+        name: 'IQC抽检2'
+      },
+      {
+        id: 4,
+        name: '原料抽检'
+      },
+      {
+        id: 5,
+        name: '进货外观检验'
+      },
+      {
+        id: 6,
+        name: '库内原料检验'
+      },
+      {
+        id: 7,
+        name: '来料检验'
+      },
+      {
+        id: 8,
+        name: '胶片'
+      },
+      {
+        id: 9,
+        name: '抽检'
+      },
+      {
+        id: 10,
+        name: '巡检'
+      }, {
+        id: 11,
+        name: '首检'
+      },
+      {
+        id: 12,
+        name: '末检'
+      },
+      {
+        id: 13,
+        name: '实时监测'
+      },
+      {
+        id: 14,
+        name: 'FQC抽检'
+      },
+      {
+        id: 15,
+        name: 'OQC抽检'
+      },
+      ],
+    };
+  },
+  // components: {
+  //   AddOrUpdate,
+  // },
+  mounted() {
+    this.getData()
+    // this.getDict()
+  },
+  methods: {
+    selectChanged(val) {
+      console.log(val)
+      alert(JSON.stringify(val))
+    },
+    getFactory(val) {
+      console.log(val)
+      this.$http.get(this.urlOptions.getFactoryURL, {
+        params: {
+          startTime: val[0],
+          endTime: val[1]
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.factoryList = res.data.map((item) => {
+              return {
+                id: item.factoryId,
+                name: item.factoryName
+              }
+            })
+          }
+        })
+      this.$http.get(this.urlOptions.getProductURL, {
+        params: {
+          startTime: val[0],
+          endTime: val[1]
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.productList = res.data.map((item) => {
+              return {
+                id: item.productId,
+                name: item.productName
+              }
+            })
+          }
+        })
+    },
+    getInspectionType(val) {
+      this.$http.get(this.urlOptions.getInspectionTypeURL, {
+        params: {
+          startTime: this.dataForm.timeSlot[0],
+          endTime: this.dataForm.timeSlot[1],
+          factoryId: val
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.dataForm.inspectionType = res.data.inspectionType
+          }
+        })
+    },
+    gerCharacteristics(val) {
+      this.$http.get(this.urlOptions.getPurchaseRegistrationTypeURL, {
+        params: {
+          productId: val
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.characteristicsList[0].id = res.data.id
+            this.characteristicsList[0].name = res.data.parameterName
+
+          }
+        })
+    },
+    getData() {
+      this.$http
+        .post(this.urlOptions.getDataListURL, {
+          params: this.listQuery
+        }
+        )
+        .then(({ data: res }) => {
+          console.log(res)
+          let xAxisData = []
+          let yAxisData = []
+          res.data.purchaseRegistrationCharacteristicsDTOList.forEach(ele => {
+            xAxisData.push(ele.batchNo + ele.groupNo)
+          })
+          res.data.purchaseRegistrationCharacteristicsDTOList.forEach(ele => {
+            yAxisData.push(ele.countValue)
+          })
+          var chartDom = document.getElementById('priceMain');
+          var myChart = echarts.init(chartDom)
+          this.myChart = myChart
+          var option;
+          // myChart.on('click', function (params) {
+          //   console.log(params);
+          // });
+          myChart.on('click', 'xAxis.category', function (params) {
+            console.log(params);
+          });
+          option = {
+            title: {
+              text: '推移图'
+            },
+            tooltip: {
+              trigger: 'axis'
+            },
+            // legend: {
+            //   data: ['推移图']
+            // },
+            grid: {
+              left: '3%',
+              right: '4%',
+              bottom: '3%',
+              containLabel: true
+            },
+            xAxis: {
+              data: res.data.map(i => { return i.batchNo + i.groupNo }),
+              type: 'category',
+              axisLabel: {
+                clickable: true
+              },
+              silent: false,
+              triggerEvent: true
+            },
+            yAxis: {
+              type: 'value'
+            },
+            series: [
+              {
+                name: '计数型值',
+                type: 'line',
+                stack: 'Total',
+                data: res.data.map(i => { return i.countValue })
+              }
+            ]
+          };
+          option && myChart.setOption(option);
+        })
+    },
+    buttonClick(val) {
+      console.log(val)
+      switch (val.btnName) {
+        case "search":
+          this.dataForm.sampleSize = val.sampleSize ? val.sampleSize : null
+          this.dataForm.inspectionType = val.inspectionType ? val.inspectionType : null
+          this.dataForm.characteristicsId = val.characteristicsId ? val.characteristicsId : null
+          this.dataForm.factoryId = val.factoryId ? val.factoryId : null
+          this.dataForm.productId = val.productId ? val.productId : null
+          this.dataForm.startTime = val.timeSlot ? val.timeSlot[0] : null
+          this.dataForm.endTime = val.timeSlot ? val.timeSlot[1] : null
+          this.getData()
+          break;
+
+        default:
+          console.log(val)
+      }
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/laboratory/qmsLaboratoryEmployeeResume.vue b/src/views/modules/laboratory/qmsLaboratoryEmployeeResume.vue
index daae849..8162948 100644
--- a/src/views/modules/laboratory/qmsLaboratoryEmployeeResume.vue
+++ b/src/views/modules/laboratory/qmsLaboratoryEmployeeResume.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-05-08 11:11:06
- * @LastEditTime: 2023-05-15 14:32:17
+ * @LastEditTime: 2023-06-20 15:35:38
  * @LastEditors: zhp
  * @Description: 
 -->
@@ -197,7 +197,7 @@ export default {
           .catch(() => { });
       } else if (val.type === 'edit') {
         this.addOrUpdateVisible = true
-        this.addOrEditTitle = '修改'
+        this.addOrEditTitle = this.$t('edit')
         this.$nextTick(() => {
           this.$refs.addOrUpdate.init({ laboratoryTesterId: this.$route.query.laboratoryTesterId })
         })
diff --git a/src/views/modules/laboratory/qmsLaboratoryTester.vue b/src/views/modules/laboratory/qmsLaboratoryTester.vue
index 4d1267d..46d8cf9 100644
--- a/src/views/modules/laboratory/qmsLaboratoryTester.vue
+++ b/src/views/modules/laboratory/qmsLaboratoryTester.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-05-15 14:31:54
+ * @LastEditTime: 2023-06-20 15:35:33
  * @LastEditors: zhp
  * @Description: 
 -->
@@ -201,6 +201,7 @@ export default {
           })
           .catch(() => { });
       } else if (val.type === 'edit') {
+        this.addOrEditTitle = this.$t('edit')
         this.addOrUpdateVisible = true;
         this.$nextTick(() => {
           this.$refs.addOrUpdate.init(val.data.id);
diff --git a/src/views/modules/laboratory/qmsLaboratoryTesterInspectionQualification.vue b/src/views/modules/laboratory/qmsLaboratoryTesterInspectionQualification.vue
index ef096bf..3307ce3 100644
--- a/src/views/modules/laboratory/qmsLaboratoryTesterInspectionQualification.vue
+++ b/src/views/modules/laboratory/qmsLaboratoryTesterInspectionQualification.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-05-15 14:29:47
+ * @LastEditTime: 2023-06-20 15:35:30
  * @LastEditors: zhp
  * @Description: 
 -->
@@ -201,7 +201,7 @@ export default {
           .catch(() => { });
       } else if (val.type === 'edit') {
         this.addOrUpdateVisible = true
-        this.addOrEditTitle = '修改'
+        this.addOrEditTitle = this.$t('edit')
         this.$nextTick(() => {
           this.$refs.addOrUpdate.init({ id:val.data.id })
         });
diff --git a/src/views/modules/laboratory/qmsLaboratoryTrainExperience.vue b/src/views/modules/laboratory/qmsLaboratoryTrainExperience.vue
index e2ad5fc..fb496e0 100644
--- a/src/views/modules/laboratory/qmsLaboratoryTrainExperience.vue
+++ b/src/views/modules/laboratory/qmsLaboratoryTrainExperience.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-05-15 14:32:25
+ * @LastEditTime: 2023-06-20 15:35:25
  * @LastEditors: zhp
  * @Description: 
 -->
@@ -206,7 +206,7 @@ export default {
           .catch(() => { });
       } else if (val.type === 'edit') {
         this.addOrUpdateVisible = true;
-        this.addOrEditTitle = '修改'
+        this.addOrEditTitle = this.$t('edit')
         this.$nextTick(() => {
           this.$refs.addOrUpdate.init({ id: val.data.id })
         })
diff --git a/src/views/modules/mutual/qmsApprovalProcess.vue b/src/views/modules/mutual/qmsApprovalProcess.vue
index c638607..4862563 100644
--- a/src/views/modules/mutual/qmsApprovalProcess.vue
+++ b/src/views/modules/mutual/qmsApprovalProcess.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-05-08 15:45:08
+ * @LastEditTime: 2023-06-20 15:35:20
  * @LastEditors: zhp
  * @Description: 
 -->
@@ -193,6 +193,7 @@ export default {
           })
           .catch(() => { });
       } else if (val.type === 'edit') {
+        this.addOrEditTitle = this.$t('edit')
         this.addOrUpdateVisible = true;
         this.$nextTick(() => {
           this.$refs.addOrUpdate.init(val.data.id);
diff --git a/src/views/modules/mutual/qmsApprovalProcessConfiguration.vue b/src/views/modules/mutual/qmsApprovalProcessConfiguration.vue
index 97565fc..08b9ab6 100644
--- a/src/views/modules/mutual/qmsApprovalProcessConfiguration.vue
+++ b/src/views/modules/mutual/qmsApprovalProcessConfiguration.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-05-08 10:26:26
+ * @LastEditTime: 2023-06-20 15:34:19
  * @LastEditors: zhp
  * @Description: 
 -->
@@ -187,6 +187,7 @@ export default {
           })
           .catch(() => { });
       } else if (val.type === 'edit') {
+        this.addOrEditTitle = this.$t('edit')
         this.addOrUpdateVisible = true;
         this.$nextTick(() => {
           this.$refs.addOrUpdate.init(val.data.id);
diff --git a/src/views/modules/mutual/qmsDataDictionary.vue b/src/views/modules/mutual/qmsDataDictionary.vue
index 09deea7..313e995 100644
--- a/src/views/modules/mutual/qmsDataDictionary.vue
+++ b/src/views/modules/mutual/qmsDataDictionary.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-05-09 11:08:28
+ * @LastEditTime: 2023-06-20 15:34:26
  * @LastEditors: zhp
  * @Description: 
 -->
@@ -194,6 +194,7 @@ export default {
           })
           .catch(() => { });
       } else if (val.type === 'edit') {
+        this.addOrEditTitle = this.$t('edit')
         this.addOrUpdateVisible = true;
         this.$nextTick(() => {
           this.$refs.addOrUpdate.init(val.data.id, this.listQuery.moduleDataDictionaryId);
diff --git a/src/views/modules/mutual/qmsDataDictionaryDetail.vue b/src/views/modules/mutual/qmsDataDictionaryDetail.vue
index 0bf90f6..8decbfd 100644
--- a/src/views/modules/mutual/qmsDataDictionaryDetail.vue
+++ b/src/views/modules/mutual/qmsDataDictionaryDetail.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-05-09 13:46:47
+ * @LastEditTime: 2023-06-20 15:35:08
  * @LastEditors: zhp
  * @Description: 
 -->
@@ -190,7 +190,7 @@ export default {
           .catch(() => { });
       } else if (val.type === 'edit') {
         this.addOrUpdateVisible = true
-        this.addOrEditTitle = '修改'
+        this.addOrEditTitle = this.$t('edit')
         this.$nextTick(() => {
           this.$refs.addOrUpdate.init(val.data.id, this.listQuery.dataDictionaryId);
         });
diff --git a/src/views/modules/mutual/qmsModuleDataDictionary.vue b/src/views/modules/mutual/qmsModuleDataDictionary.vue
index a345925..d2d375b 100644
--- a/src/views/modules/mutual/qmsModuleDataDictionary.vue
+++ b/src/views/modules/mutual/qmsModuleDataDictionary.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-05-09 10:11:44
+ * @LastEditTime: 2023-06-20 15:34:33
  * @LastEditors: zhp
  * @Description: 
 -->
@@ -180,6 +180,7 @@ export default {
           })
           .catch(() => { });
       } else if (val.type === 'edit') {
+        this.addOrEditTitle = this.$t('edit')
         this.addOrUpdateVisible = true;
         this.$nextTick(() => {
           this.$refs.addOrUpdate.init(val.data.id);
diff --git a/src/views/modules/nonconform/qmsApprovalDispositionTeamConfiguration.vue b/src/views/modules/nonconform/qmsApprovalDispositionTeamConfiguration.vue
index 520c3e3..be658ab 100644
--- a/src/views/modules/nonconform/qmsApprovalDispositionTeamConfiguration.vue
+++ b/src/views/modules/nonconform/qmsApprovalDispositionTeamConfiguration.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-04-18 16:10:40
+ * @LastEditTime: 2023-06-20 15:34:38
  * @LastEditors: zhp
  * @Description: 
 -->
@@ -179,6 +179,7 @@ export default {
           })
           .catch(() => { });
       } else if (val.type === 'edit') {
+        this.addOrEditTitle = this.$t('edit')
         this.addOrUpdateVisible = true;
         this.$nextTick(() => {
           this.$refs.addOrUpdate.init(val.data.id);
diff --git a/src/views/modules/nonconform/qmsNonconformityReviewSheet.vue b/src/views/modules/nonconform/qmsNonconformityReviewSheet.vue
index 5a18c19..d19b1e0 100644
--- a/src/views/modules/nonconform/qmsNonconformityReviewSheet.vue
+++ b/src/views/modules/nonconform/qmsNonconformityReviewSheet.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-04-07 15:31:53
+ * @LastEditTime: 2023-06-20 15:34:42
  * @LastEditors: zhp
  * @Description: 
 -->
@@ -240,6 +240,7 @@ export default {
           })
           .catch(() => { });
       } else if (val.type === 'edit') {
+        this.addOrEditTitle = this.$t('edit')
         this.addOrUpdateVisible = true;
         this.$nextTick(() => {
           this.$refs.addOrUpdate.init(val.data.id);
diff --git a/src/views/modules/quality/components/transferScheme-add.vue b/src/views/modules/quality/components/transferScheme-add.vue
index 61df82e..1d2fc2f 100644
--- a/src/views/modules/quality/components/transferScheme-add.vue
+++ b/src/views/modules/quality/components/transferScheme-add.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-02-14 15:02:26
- * @LastEditTime: 2023-05-24 15:48:18
+ * @LastEditTime: 2023-05-26 11:21:02
  * @LastEditors: zhp
  * @Description: 
 -->
@@ -11,7 +11,8 @@
     <el-row>
       <el-col :span="12">
         <el-form-item prop="transferSchemeCode" :label="$t('quality.code')">
-          <el-input v-model="dataForm.transferSchemeCode" :placeholder="$t('quality.code')">
+          <el-input @input="(e) => handlerShow(e)" v-model="dataForm.transferSchemeCode"
+            :placeholder="$t('quality.code')">
           </el-input>
         </el-form-item>
       </el-col>
@@ -116,6 +117,27 @@ export default {
    
   // },
   methods: {
+    handleShow(e) {
+      this.debounce(this.ajax(e),500)
+    },
+    ajax(e) {
+      console.log(e)
+    },
+    debounce(fn, delay) {
+      let timer
+      return function () {
+        console.log(timer)
+        if (timer) {
+          console.log('aaaaa')
+          clearTimeout(timer)
+        }
+        timer = setTimeout(() => {
+          console.log(arguments)
+          fn.apply(this, arguments) // 透传 this和参数
+          timer = 0
+        }, delay)
+      }
+    },
     init(id, ) {
       this.dataForm.id = id || ""
       // console.log(11111)
diff --git a/src/views/modules/quality/qmsCustomSampling.vue b/src/views/modules/quality/qmsCustomSampling.vue
index 2103424..2c60844 100644
--- a/src/views/modules/quality/qmsCustomSampling.vue
+++ b/src/views/modules/quality/qmsCustomSampling.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-05-24 15:54:21
+ * @LastEditTime: 2023-06-02 13:54:08
  * @LastEditors: zhp
  * @Description: 
 -->
@@ -267,8 +267,6 @@ export default {
         case "search":
           // this.listQuery.paramCode = val.paramCode;
           this.listQuery.page = 1;
-          this.listQuery.code = null
-          this.listQuery.name = null
           this.listQuery.failureTypeStatus = null
           this.getDataList();
           break;
diff --git a/src/views/modules/quality/qmsDisposalMethod.vue b/src/views/modules/quality/qmsDisposalMethod.vue
index 5a106c6..f78f554 100644
--- a/src/views/modules/quality/qmsDisposalMethod.vue
+++ b/src/views/modules/quality/qmsDisposalMethod.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-05-24 15:54:07
+ * @LastEditTime: 2023-06-02 13:53:56
  * @LastEditors: zhp
  * @Description: 
 -->
@@ -194,8 +194,6 @@ export default {
         case "search":
           // this.listQuery.paramCode = val.paramCode;
           this.listQuery.page = 1;
-          this.listQuery.code = null
-          this.listQuery.name = null
           this.listQuery.failureTypeStatus = null
           this.getDataList();
           break;
diff --git a/src/views/modules/quality/qmsInspectionPosition.vue b/src/views/modules/quality/qmsInspectionPosition.vue
index 8032e77..1c54d8a 100644
--- a/src/views/modules/quality/qmsInspectionPosition.vue
+++ b/src/views/modules/quality/qmsInspectionPosition.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-05-24 15:53:39
+ * @LastEditTime: 2023-06-02 13:53:49
  * @LastEditors: zhp
  * @Description: 
 -->
@@ -188,8 +188,6 @@ export default {
         case "search":
           // this.listQuery.paramCode = val.paramCode;
           this.listQuery.page = 1;
-          this.listQuery.code = null
-          this.listQuery.name = null
           this.listQuery.failureTypeStatus = null
           this.getDataList();
           break;
diff --git a/src/views/modules/quality/qmsSamplingPlan.vue b/src/views/modules/quality/qmsSamplingPlan.vue
index 34ec972..5aaf7aa 100644
--- a/src/views/modules/quality/qmsSamplingPlan.vue
+++ b/src/views/modules/quality/qmsSamplingPlan.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-05-24 15:53:25
+ * @LastEditTime: 2023-06-02 13:53:43
  * @LastEditors: zhp
  * @Description: 
 -->
@@ -258,8 +258,6 @@ export default {
         case "search":
           // this.listQuery.paramCode = val.paramCode;
           this.listQuery.page = 1;
-          this.listQuery.code = null
-          this.listQuery.name = null
           this.listQuery.failureTypeStatus = null
           this.getDataList();
           break;
diff --git a/src/views/modules/quality/qmsTransferRecords.vue b/src/views/modules/quality/qmsTransferRecords.vue
index c112c75..36a2c0e 100644
--- a/src/views/modules/quality/qmsTransferRecords.vue
+++ b/src/views/modules/quality/qmsTransferRecords.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-05-24 16:38:23
+ * @LastEditTime: 2023-06-02 13:53:38
  * @LastEditors: zhp
  * @Description: 
 -->
@@ -215,8 +215,6 @@ export default {
         case "search":
           // this.listQuery.paramCode = val.paramCode;
           this.listQuery.page = 1;
-          this.listQuery.code = null
-          this.listQuery.name = null
           this.listQuery.failureTypeStatus = null
           this.getDataList();
           break;
diff --git a/src/views/modules/quality/qmsTransferScheme.vue b/src/views/modules/quality/qmsTransferScheme.vue
index 92c141f..285d834 100644
--- a/src/views/modules/quality/qmsTransferScheme.vue
+++ b/src/views/modules/quality/qmsTransferScheme.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-05-24 16:01:20
+ * @LastEditTime: 2023-06-02 13:53:32
  * @LastEditors: zhp
  * @Description: 
 -->
@@ -215,8 +215,6 @@ export default {
         case "search":
           // this.listQuery.paramCode = val.paramCode;
           this.listQuery.page = 1;
-          this.listQuery.code = null
-          this.listQuery.name = null
           this.listQuery.failureTypeStatus = null
           this.getDataList();
           break;
diff --git a/src/views/modules/shipment/CDiagram.vue b/src/views/modules/shipment/CDiagram.vue
new file mode 100644
index 0000000..7b9d5c0
--- /dev/null
+++ b/src/views/modules/shipment/CDiagram.vue
@@ -0,0 +1,311 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-01-11 09:24:58
+ * @LastEditTime: 2023-06-20 15:55:12
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__user">
+      <el-form :inline="true" :model="dataForm" class="demo-form-inline">
+        <el-form-item :label="$t('code.inspectionTime')" prop="timeSlot">
+          <el-date-picker v-model="dataForm.timeSlot" size="small" type="datetimerange" format='yyyy-MM-dd HH:mm:ss'
+            @change="getFactory" valueFormat='yyyy-MM-ddTHH:mm:ss' :start-placeholder="$t('gage.startTime')"
+            :end-placeholder="$t('gage.endTime')" :range-separator="$t('gage.to')" clearable />
+        </el-form-item>
+        <el-form-item :label="$t('code.factoryName')">
+          <el-select v-model="dataForm.factoryId" :placeholder="$t('code.factoryName')" @change="getInspectionType">
+            <el-option v-for="item in factoryList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('code.productName')">
+          <el-select v-model="dataForm.productId" :placeholder="$t('code.productName')" @change="gerCharacteristics">
+            <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('code.inspectionType')">
+          <el-input v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('code.characteristics')">
+          <el-select v-model="dataForm.characteristicsId" :placeholder="$t('code.characteristics')">
+            <el-option v-for="item in characteristicsList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('code.grouping')">
+          <el-radio v-model="dataForm.divideIntoGroup" label="0">批号</el-radio>
+          <el-radio v-model="dataForm.divideIntoGroup" label="1">年</el-radio>
+          <el-radio v-model="dataForm.divideIntoGroup" label="2">月</el-radio>
+          <el-radio v-model="dataForm.divideIntoGroup" label="3">日</el-radio>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getData">查询</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div id="priceMain" :style="{ width: '100%', height: '500px' }" />
+  </el-card>
+</template>
+
+<script>
+// import available from "./components/gageAvailable.vue"
+import i18n from "@/i18n"
+import * as echarts from 'echarts';
+export default {
+  data() {
+    return {
+      myChart: null,
+      urlOptions: {
+        getDataListURL: "/code/shipmentRegistration/c/diagram",
+        getFactoryURL: '/code/shipmentRegistration/query/factory',
+        getProductURL: '/code/shipmentRegistration/query/product',
+        getInspectionTypeURL: '/code/shipmentRegistration/query/inspection/type',
+        getPurchaseRegistrationTypeURL: '/code/shipmentRegistration/query/checkout/project',
+      },
+      factoryList: [],
+      productList: [],
+      characteristicsList: [],
+      listQuery: {
+        characteristicsId: null,
+        factoryId: null,
+        inspectionType: null,
+        productId: null,
+        sampleSize: null,
+        endTime: null,
+        startTime: null,
+        divideIntoGroup:null
+      },
+      dataForm: {
+        productId: null,
+        timeSlot: [],
+        factoryId: null,
+        characteristicsId: null,
+        inspectionType: null,
+        sampleSize: null,
+        divideIntoGroup: null,
+        endTime: null,
+        startTime: null,
+      },
+      selectOptions: [{
+        id: 0,
+        name: '监控'
+      },
+      {
+        id: 1,
+        name: '电芯来料检验'
+      },
+      {
+        id: 2,
+        lname: 'IQC抽检'
+      },
+      {
+        id: 3,
+        name: 'IQC抽检2'
+      },
+      {
+        id: 4,
+        name: '原料抽检'
+      },
+      {
+        id: 5,
+        name: '进货外观检验'
+      },
+      {
+        id: 6,
+        name: '库内原料检验'
+      },
+      {
+        id: 7,
+        name: '来料检验'
+      },
+      {
+        id: 8,
+        name: '胶片'
+      },
+      {
+        id: 9,
+        name: '抽检'
+      },
+      {
+        id: 10,
+        name: '巡检'
+      }, {
+        id: 11,
+        name: '首检'
+      },
+      {
+        id: 12,
+        name: '末检'
+      },
+      {
+        id: 13,
+        name: '实时监测'
+      },
+      {
+        id: 14,
+        name: 'FQC抽检'
+      },
+      {
+        id: 15,
+        name: 'OQC抽检'
+      },
+      ],
+    };
+  },
+  // components: {
+  //   AddOrUpdate,
+  // },
+  mounted() {
+    this.getData()
+    // this.getDict()
+  },
+  methods: {
+    selectChanged(val) {
+      console.log(val)
+      alert(JSON.stringify(val))
+    },
+    getFactory(val) {
+      console.log(val)
+      this.$http.get(this.urlOptions.getFactoryURL, {
+        params: {
+          startTime: val[0],
+          endTime: val[1]
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.factoryList = res.data.map((item) => {
+              return {
+                id: item.factoryId,
+                name: item.factoryName
+              }
+            })
+          }
+        })
+      this.$http.get(this.urlOptions.getProductURL, {
+        params: {
+          startTime: val[0],
+          endTime: val[1]
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.productList = res.data.map((item) => {
+              return {
+                id: item.productId,
+                name: item.productName
+              }
+            })
+          }
+        })
+    },
+    getInspectionType(val) {
+      this.$http.get(this.urlOptions.getInspectionTypeURL, {
+        params: {
+          startTime: this.dataForm.timeSlot[0],
+          endTime: this.dataForm.timeSlot[1],
+          factoryId: val
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.dataForm.inspectionType = res.data.inspectionType
+          }
+        })
+    },
+    gerCharacteristics(val) {
+      this.$http.get(this.urlOptions.getPurchaseRegistrationTypeURL, {
+        params: {
+          productId: val
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.characteristicsList[0].id = res.data.id
+            this.characteristicsList[0].name = res.data.parameterName
+
+          }
+        })
+    },
+    getData() {
+      this.dataForm.startTime = this.dataForm.timeSlot ? this.dataForm.timeSlot[0] : null
+      this.dataForm.endTime = this.dataForm.timeSlot ? this.dataForm.timeSlot[1] : null
+      this.$http
+        .post(this.urlOptions.getDataListURL, {
+          params: this.dataForm
+        }
+        )
+        .then(({ data: res }) => {
+          let defectNumberArr = []
+          let xAxisData = []
+          res.data.forEach((item) => {
+            defectNumberArr.push(item.defectNumber)
+            this.dataForm.divideIntoGroup === 0 ? xAxisData.push(item.batchNo) : this.dataForm.divideIntoGroup === 1 ? xAxisData.push(item.year) : this.dataForm.divideIntoGroup === 2 ? xAxisData.push(item.month) : this.dataForm.divideIntoGroup === 3 ? xAxisData.push(item.day) : ''
+          })
+          var chartDom = document.getElementById('priceMain');
+          var myChart = echarts.init(chartDom)
+          this.myChart = myChart
+          var option;
+          // myChart.on('click', function (params) {
+          //   console.log(params);
+          // });
+          myChart.on('click', 'xAxis.category', function (params) {
+            console.log(params);
+          });
+          option = {
+            title: {
+              text: 'C图'
+            },
+            tooltip: {
+              trigger: 'axis'
+            },
+            // legend: {
+            //   data: ['推移图']
+            // },
+            grid: {
+              left: '3%',
+              right: '4%',
+              bottom: '3%',
+              containLabel: true
+            },
+            xAxis: {
+              data: xAxisData,
+              type: 'category',
+              axisLabel: {
+                clickable: true
+              },
+              silent: false,
+              triggerEvent: true
+            },
+            yAxis: {
+              type: 'value'
+            },
+            series: [
+              {
+                name: '	缺陷数',
+                type: 'line',
+                stack: 'Total',
+                data: defectNumberArr
+              }
+            ]
+          };
+          option && myChart.setOption(option);
+        })
+    },
+    buttonClick(val) {
+      console.log(val)
+      switch (val.btnName) {
+        case "search":
+          this.getData()
+          break;
+
+        default:
+          console.log(val)
+      }
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/shipment/NPDiagram.vue b/src/views/modules/shipment/NPDiagram.vue
new file mode 100644
index 0000000..79f2b13
--- /dev/null
+++ b/src/views/modules/shipment/NPDiagram.vue
@@ -0,0 +1,317 @@
+
+<!--
+ * @Author: zhp
+ * @Date: 2023-01-11 09:24:58
+ * @LastEditTime: 2023-06-20 15:55:36
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__user">
+      <el-form :inline="true" :model="dataForm" class="demo-form-inline">
+        <el-form-item :label="$t('code.inspectionTime')" prop="timeSlot">
+          <el-date-picker v-model="dataForm.timeSlot" size="small" type="datetimerange" format='yyyy-MM-dd HH:mm:ss'
+            @change="getFactory" valueFormat='yyyy-MM-ddTHH:mm:ss' :start-placeholder="$t('gage.startTime')"
+            :end-placeholder="$t('gage.endTime')" :range-separator="$t('gage.to')" clearable />
+        </el-form-item>
+        <el-form-item :label="$t('code.factoryName')">
+          <el-select v-model="dataForm.factoryId" :placeholder="$t('code.factoryName')" @change="getInspectionType">
+            <el-option v-for="item in factoryList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('code.productName')">
+          <el-select v-model="dataForm.productId" :placeholder="$t('code.productName')" @change="gerCharacteristics">
+            <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <!-- <el-form-item :label="$t('code.inspectionType')">
+          <el-select v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')">
+            <el-option v-for="item in inspectionTypeList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item> -->
+        <el-form-item :label="$t('code.inspectionType')">
+          <el-input v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('code.characteristics')">
+          <el-select v-model="dataForm.characteristicsId" :placeholder="$t('code.characteristics')">
+            <el-option v-for="item in characteristicsList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('code.grouping')">
+          <el-radio v-model="dataForm.divideIntoGroup" label="0">批号</el-radio>
+          <el-radio v-model="dataForm.divideIntoGroup" label="1">年</el-radio>
+          <el-radio v-model="dataForm.divideIntoGroup" label="2">月</el-radio>
+          <el-radio v-model="dataForm.divideIntoGroup" label="3">日</el-radio>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getData">查询</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div id="priceMain" :style="{ width: '100%', height: '500px' }" />
+  </el-card>
+</template>
+
+<script>
+// import available from "./components/gageAvailable.vue"
+import i18n from "@/i18n"
+import * as echarts from 'echarts';
+export default {
+  data() {
+    return {
+      myChart: null,
+      urlOptions: {
+        getDataListURL: "/code/shipmentRegistration/np/diagram",
+        getFactoryURL: '/code/shipmentRegistration/query/factory',
+        getProductURL: '/code/shipmentRegistration/query/product',
+        getInspectionTypeURL: '/code/shipmentRegistration/query/inspection/type',
+        getPurchaseRegistrationTypeURL: '/code/shipmentRegistration/query/checkout/project',
+      },
+      factoryList: [],
+      productList: [],
+      characteristicsList: [],
+      listQuery: {
+        characteristicsId: null,
+        factoryId: null,
+        inspectionType: null,
+        productId: null,
+        sampleSize: null,
+        endTime: null,
+        startTime: null,
+        divideIntoGroup:null
+      },
+      dataForm: {
+        productId: null,
+        timeSlot: [],
+        factoryId: null,
+        characteristicsId: null,
+        inspectionType: null,
+        sampleSize: null,
+        divideIntoGroup: null,
+        endTime: null,
+        startTime: null,
+      },
+      selectOptions: [{
+        id: 0,
+        name: '监控'
+      },
+      {
+        id: 1,
+        name: '电芯来料检验'
+      },
+      {
+        id: 2,
+        lname: 'IQC抽检'
+      },
+      {
+        id: 3,
+        name: 'IQC抽检2'
+      },
+      {
+        id: 4,
+        name: '原料抽检'
+      },
+      {
+        id: 5,
+        name: '进货外观检验'
+      },
+      {
+        id: 6,
+        name: '库内原料检验'
+      },
+      {
+        id: 7,
+        name: '来料检验'
+      },
+      {
+        id: 8,
+        name: '胶片'
+      },
+      {
+        id: 9,
+        name: '抽检'
+      },
+      {
+        id: 10,
+        name: '巡检'
+      }, {
+        id: 11,
+        name: '首检'
+      },
+      {
+        id: 12,
+        name: '末检'
+      },
+      {
+        id: 13,
+        name: '实时监测'
+      },
+      {
+        id: 14,
+        name: 'FQC抽检'
+      },
+      {
+        id: 15,
+        name: 'OQC抽检'
+      },
+      ],
+    };
+  },
+  // components: {
+  //   AddOrUpdate,
+  // },
+  mounted() {
+    this.getData()
+    // this.getDict()
+  },
+  methods: {
+    selectChanged(val) {
+      console.log(val)
+      alert(JSON.stringify(val))
+    },
+    getFactory(val) {
+      console.log(val)
+      this.$http.get(this.urlOptions.getFactoryURL, {
+        params: {
+          startTime: val[0],
+          endTime: val[1]
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.factoryList = res.data.map((item) => {
+              return {
+                id: item.factoryId,
+                name: item.factoryName
+              }
+            })
+          }
+        })
+      this.$http.get(this.urlOptions.getProductURL, {
+        params: {
+          startTime: val[0],
+          endTime: val[1]
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.productList = res.data.map((item) => {
+              return {
+                id: item.productId,
+                name: item.productName
+              }
+            })
+          }
+        })
+    },
+    getInspectionType(val) {
+      this.$http.get(this.urlOptions.getInspectionTypeURL, {
+        params: {
+          startTime: this.dataForm.timeSlot[0],
+          endTime: this.dataForm.timeSlot[1],
+          factoryId: val
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.dataForm.inspectionType = res.data.inspectionType
+          }
+        })
+    },
+    gerCharacteristics(val) {
+      this.$http.get(this.urlOptions.getPurchaseRegistrationTypeURL, {
+        params: {
+          productId: val
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.characteristicsList[0].id = res.data.id
+            this.characteristicsList[0].name = res.data.parameterName
+
+          }
+        })
+    },
+    getData() {
+      this.dataForm.startTime = this.dataForm.timeSlot ? this.dataForm.timeSlot[0] : null
+      this.dataForm.endTime = this.dataForm.timeSlot ? this.dataForm.timeSlot[1] : null
+      this.$http
+        .post(this.urlOptions.getDataListURL, {
+          params: this.dataForm
+        }
+        )
+        .then(({ data: res }) => {
+          let xAxisData = []
+          res.data.forEach((item) => {
+            this.dataForm.divideIntoGroup === 0 ? xAxisData.push(item.batchNo) : this.dataForm.divideIntoGroup === 1 ? xAxisData.push(item.year) : this.dataForm.divideIntoGroup === 2 ? xAxisData.push(item.month) : this.dataForm.divideIntoGroup === 3 ? xAxisData.push(item.day) : ''
+          })
+          var chartDom = document.getElementById('priceMain');
+          var myChart = echarts.init(chartDom)
+          this.myChart = myChart
+          var option;
+          // myChart.on('click', function (params) {
+          //   console.log(params);
+          // });
+          myChart.on('click', 'xAxis.category', function (params) {
+            console.log(params);
+          });
+          option = {
+            title: {
+              text: 'C图'
+            },
+            tooltip: {
+              trigger: 'axis'
+            },
+            // legend: {
+            //   data: ['推移图']
+            // },
+            grid: {
+              left: '3%',
+              right: '4%',
+              bottom: '3%',
+              containLabel: true
+            },
+            xAxis: {
+              data: xAxisData,
+              type: 'category',
+              axisLabel: {
+                clickable: true
+              },
+              silent: false,
+              triggerEvent: true
+            },
+            yAxis: {
+              type: 'value',
+              data: dpuData
+            },
+            series: [
+              {
+                name: '缺陷数量',
+                type: 'line',
+                stack: 'Total',
+                data: res.data.map(i => { return i.defectNumber })
+              }
+            ]
+          };
+          option && myChart.setOption(option);
+        })
+    },
+    buttonClick(val) {
+      console.log(val)
+      switch (val.btnName) {
+        case "search":
+          this.getData()
+          break;
+
+        default:
+          console.log(val)
+      }
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/shipment/UDiagram.vue b/src/views/modules/shipment/UDiagram.vue
new file mode 100644
index 0000000..9d6bdba
--- /dev/null
+++ b/src/views/modules/shipment/UDiagram.vue
@@ -0,0 +1,328 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-01-11 09:24:58
+ * @LastEditTime: 2023-06-20 15:56:30
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__user">
+      <el-form :inline="true" :model="dataForm" class="demo-form-inline">
+        <el-form-item :label="$t('code.inspectionTime')" prop="timeSlot">
+          <el-date-picker v-model="dataForm.timeSlot" size="small" type="datetimerange" format='yyyy-MM-dd HH:mm:ss'
+            @change="getFactory" valueFormat='yyyy-MM-ddTHH:mm:ss' :start-placeholder="$t('gage.startTime')"
+            :end-placeholder="$t('gage.endTime')" :range-separator="$t('gage.to')" clearable />
+        </el-form-item>
+        <el-form-item :label="$t('code.factoryName')">
+          <el-select v-model="dataForm.factoryId" :placeholder="$t('code.factoryName')" @change="getInspectionType">
+            <el-option v-for="item in factoryList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('code.productName')">
+          <el-select v-model="dataForm.productId" :placeholder="$t('code.productName')" @change="gerCharacteristics">
+            <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <!-- <el-form-item :label="$t('code.inspectionType')">
+          <el-select v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')">
+            <el-option v-for="item in inspectionTypeList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item> -->
+        <el-form-item :label="$t('code.inspectionType')">
+          <el-input v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('code.characteristics')">
+          <el-select v-model="dataForm.characteristicsId" :placeholder="$t('code.characteristics')">
+            <el-option v-for="item in characteristicsList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('code.grouping')">
+          <el-radio v-model="dataForm.divideIntoGroup" label="0">批号</el-radio>
+          <el-radio v-model="dataForm.divideIntoGroup" label="1">年</el-radio>
+          <el-radio v-model="dataForm.divideIntoGroup" label="2">月</el-radio>
+          <el-radio v-model="dataForm.divideIntoGroup" label="3">日</el-radio>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getData">查询</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div id="priceMain" :style="{ width: '100%', height: '500px' }" />
+  </el-card>
+</template>
+
+<script>
+// import available from "./components/gageAvailable.vue"
+import i18n from "@/i18n"
+import * as echarts from 'echarts';
+export default {
+  data() {
+    return {
+      myChart: null,
+      urlOptions: {
+        getDataListURL: "/code/shipmentRegistration/u/diagram",
+        getFactoryURL: '/code/shipmentRegistration/query/factory',
+        getProductURL: '/code/shipmentRegistration/query/product',
+        getInspectionTypeURL: '/code/shipmentRegistration/query/inspection/type',
+        getPurchaseRegistrationTypeURL: '/code/shipmentRegistration/query/checkout/project',
+      },
+      factoryList: [],
+      productList: [],
+      characteristicsList: [],
+      listQuery: {
+        characteristicsId: null,
+        factoryId: null,
+        inspectionType: null,
+        productId: null,
+        sampleSize: null,
+        endTime: null,
+        startTime: null,
+        divideIntoGroup:null
+      },
+      dataForm: {
+        productId: null,
+        timeSlot: [],
+        factoryId: null,
+        characteristicsId: null,
+        inspectionType: null,
+        sampleSize: null,
+        divideIntoGroup: null,
+        endTime: null,
+        startTime: null,
+      },
+      selectOptions: [{
+        id: 0,
+        name: '监控'
+      },
+      {
+        id: 1,
+        name: '电芯来料检验'
+      },
+      {
+        id: 2,
+        lname: 'IQC抽检'
+      },
+      {
+        id: 3,
+        name: 'IQC抽检2'
+      },
+      {
+        id: 4,
+        name: '原料抽检'
+      },
+      {
+        id: 5,
+        name: '进货外观检验'
+      },
+      {
+        id: 6,
+        name: '库内原料检验'
+      },
+      {
+        id: 7,
+        name: '来料检验'
+      },
+      {
+        id: 8,
+        name: '胶片'
+      },
+      {
+        id: 9,
+        name: '抽检'
+      },
+      {
+        id: 10,
+        name: '巡检'
+      }, {
+        id: 11,
+        name: '首检'
+      },
+      {
+        id: 12,
+        name: '末检'
+      },
+      {
+        id: 13,
+        name: '实时监测'
+      },
+      {
+        id: 14,
+        name: 'FQC抽检'
+      },
+      {
+        id: 15,
+        name: 'OQC抽检'
+      },
+      ],
+    };
+  },
+  // components: {
+  //   AddOrUpdate,
+  // },
+  mounted() {
+    this.getData()
+    // this.getDict()
+  },
+  methods: {
+    selectChanged(val) {
+      console.log(val)
+      alert(JSON.stringify(val))
+    },
+    getFactory(val) {
+      console.log(val)
+      this.$http.get(this.urlOptions.getFactoryURL, {
+        params: {
+          startTime: val[0],
+          endTime: val[1]
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.factoryList = res.data.map((item) => {
+              return {
+                id: item.factoryId,
+                name: item.factoryName
+              }
+            })
+          }
+        })
+      this.$http.get(this.urlOptions.getProductURL, {
+        params: {
+          startTime: val[0],
+          endTime: val[1]
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.productList = res.data.map((item) => {
+              return {
+                id: item.productId,
+                name: item.productName
+              }
+            })
+          }
+        })
+    },
+    getInspectionType(val) {
+      this.$http.get(this.urlOptions.getInspectionTypeURL, {
+        params: {
+          startTime: this.dataForm.timeSlot[0],
+          endTime: this.dataForm.timeSlot[1],
+          factoryId: val
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.dataForm.inspectionType = res.data.inspectionType
+          }
+        })
+    },
+    gerCharacteristics(val) {
+      this.$http.get(this.urlOptions.getPurchaseRegistrationTypeURL, {
+        params: {
+          productId: val
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.characteristicsList[0].id = res.data.id
+            this.characteristicsList[0].name = res.data.parameterName
+
+          }
+        })
+    },
+    getData() {
+      this.dataForm.startTime = this.dataForm.timeSlot ? this.dataForm.timeSlot[0] : null
+      this.dataForm.endTime = this.dataForm.timeSlot ? this.dataForm.timeSlot[1] : null
+      this.$http
+        .post(this.urlOptions.getDataListURL, {
+          params: this.dataForm
+        }
+        )
+        .then(({ data: res }) => {
+          let xAxisData = []
+          res.data.forEach((item) => {
+            this.dataForm.divideIntoGroup === 0 ? xAxisData.push(item.batchNo) : this.dataForm.divideIntoGroup === 1 ? xAxisData.push(item.year) : this.dataForm.divideIntoGroup === 2 ? xAxisData.push(item.month) : this.dataForm.divideIntoGroup === 3 ? xAxisData.push(item.day) : ''
+          })
+          var chartDom = document.getElementById('priceMain');
+          var myChart = echarts.init(chartDom)
+          this.myChart = myChart
+          var option;
+          // myChart.on('click', function (params) {
+          //   console.log(params);
+          // });
+          myChart.on('click', 'xAxis.category', function (params) {
+            console.log(params);
+          });
+          option = {
+            title: {
+              text: 'C图'
+            },
+            tooltip: {
+              trigger: 'axis'
+            },
+            // legend: {
+            //   data: ['推移图']
+            // },
+            grid: {
+              left: '3%',
+              right: '4%',
+              bottom: '3%',
+              containLabel: true
+            },
+            xAxis: {
+              data: xAxisData,
+              type: 'category',
+              axisLabel: {
+                clickable: true
+              },
+              silent: false,
+              triggerEvent: true
+            },
+            yAxis: {
+              type: 'value',
+              data: res.data.map(i => { return i.dpu })
+            },
+            series: [
+              {
+                name: '	单位缺陷',
+                type: 'line',
+                stack: 'Total',
+                data: res.data.map(i => { return i.dpu })
+              },
+              {
+                name: '	UCL',
+                type: 'line',
+                stack: 'Total',
+                data: res.data.map(i => { return i.ucl })
+              },
+                {
+                name: 'LCL',
+                type: 'line',
+                stack: 'Total',
+                  data: res.data.map(i => { return i.lcl })
+              }
+            ]
+          };
+          option && myChart.setOption(option);
+        })
+    },
+    buttonClick(val) {
+      console.log(val)
+      switch (val.btnName) {
+        case "search":
+          this.getData()
+          break;
+
+        default:
+          console.log(val)
+      }
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/shipment/boxplot.vue b/src/views/modules/shipment/boxplot.vue
new file mode 100644
index 0000000..c8ddeed
--- /dev/null
+++ b/src/views/modules/shipment/boxplot.vue
@@ -0,0 +1,370 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-01-11 09:24:58
+ * @LastEditTime: 2023-06-20 15:55:03
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__user">
+      <el-form :inline="true" :model="dataForm" class="demo-form-inline">
+        <el-form-item :label="$t('code.inspectionTime')" prop="timeSlot">
+          <el-date-picker v-model="dataForm.timeSlot" size="small" type="datetimerange" format='yyyy-MM-dd HH:mm:ss'
+            @change="getFactory" valueFormat='yyyy-MM-ddTHH:mm:ss' :start-placeholder="$t('gage.startTime')"
+            :end-placeholder="$t('gage.endTime')" :range-separator="$t('gage.to')" clearable />
+        </el-form-item>
+        <el-form-item :label="$t('code.factoryName')">
+          <el-select v-model="dataForm.factoryId" :placeholder="$t('code.factoryName')" @change="getInspectionType">
+            <el-option v-for="item in factoryList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('code.productName')">
+          <el-select v-model="dataForm.productId" :placeholder="$t('code.productName')" @change="gerCharacteristics">
+            <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <!-- <el-form-item :label="$t('code.inspectionType')">
+          <el-select v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')">
+            <el-option v-for="item in inspectionTypeList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item> -->
+        <el-form-item :label="$t('code.inspectionType')">
+          <el-input v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('code.characteristics')">
+          <el-input v-model="dataForm.characteristicsId" :placeholder="$t('code.characteristics')"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('code.sampleSize')">
+          <el-input v-model="dataForm.sampleSize" :placeholder="$t('code.sampleSize')"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getData">查询</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div id="priceMain" :style="{ width: '100%', height: '500px' }" />
+  </el-card>
+</template>
+
+<script>
+// import available from "./components/gageAvailable.vue"
+import i18n from "@/i18n"
+import * as echarts from 'echarts';
+export default {
+  data() {
+    return {
+      myChart: null,
+      urlOptions: {
+        getDataListURL: "/code/shipmentRegistration/box/diagram",
+        getFactoryURL: '/code/shipmentRegistration/query/factory',
+        getProductURL: '/code/shipmentRegistration/query/product',
+        getInspectionTypeURL: '/code/shipmentRegistration/query/inspection/type',
+        getPurchaseRegistrationTypeURL: '/code/shipmentRegistration/query/checkout/project',
+      },
+      factoryList: [],
+      productList:[],
+      listQuery: {
+        characteristicsId:null,
+        factoryId: null,
+        inspectionType: null,
+        productId: null,
+        sampleSize: null,
+        endTime: null,
+        startTime: null,
+      },
+      dataForm: {
+        productId: null,
+        timeSlot: [],
+        factoryId: null,
+        characteristicsId: null,
+        inspectionType: null,
+        sampleSize:null
+      },
+      selectOptions: [{
+            id: 0,
+            name: '监控'
+          },
+            {
+              id: 1,
+              name: '电芯来料检验'
+            },
+            {
+              id: 2,
+              lname: 'IQC抽检'
+            },
+            {
+              id: 3,
+              name: 'IQC抽检2'
+            },
+            {
+              id: 4,
+              name: '原料抽检'
+            },
+            {
+              id: 5,
+              name: '进货外观检验'
+            },
+            {
+              id: 6,
+              name: '库内原料检验'
+            },
+            {
+              id: 7,
+              name: '来料检验'
+            },
+            {
+              id: 8,
+              name: '胶片'
+            },
+            {
+              id: 9,
+              name: '抽检'
+            },
+            {
+              id: 10,
+              name: '巡检'
+            }, {
+              id: 11,
+              name: '首检'
+            },
+            {
+              id: 12,
+              name: '末检'
+            },
+            {
+              id: 13,
+              name: '实时监测'
+            },
+            {
+              id: 14,
+              name: 'FQC抽检'
+            },
+            {
+              id: 15,
+              name: 'OQC抽检'
+            },
+          ],
+    };
+  },
+  // components: {
+  //   AddOrUpdate,
+  // },
+  mounted() {
+    this.getData()
+    // this.getDict()
+  },
+  methods: {
+    selectChanged(val) {
+      console.log(val)
+      alert(JSON.stringify(val))
+    },
+    getFactory(val) {
+      console.log(val)
+      this.$http.get(this.urlOptions.getFactoryURL, {
+        params: {
+          startTime: val[0],
+          endTime: val[1]
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.factoryList = res.data.map((item) => {
+              return {
+                id: item.factoryId,
+                name: item.factoryName
+              }
+            })
+          }
+        })
+      this.$http.get(this.urlOptions.getProductURL, {
+        params: {
+          startTime: val[0],
+          endTime: val[1]
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.productList = res.data.map((item) => {
+              return {
+                id: item.productId,
+                name: item.productName
+              }
+            })
+          }
+        })
+    },
+    getInspectionType(val) {
+      this.$http.get(this.urlOptions.getInspectionTypeURL, {
+        params: {
+          startTime: this.dataForm.timeSlot[0],
+          endTime: this.dataForm.timeSlot[1],
+          factoryId: val
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.dataForm.inspectionType = res.data.inspectionType
+          }
+        })
+    },
+    gerCharacteristics(val) {
+      this.$http.get(this.urlOptions.getPurchaseRegistrationTypeURL, {
+        params: {
+          productId:val
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.dataForm.characteristicsId = res.data.parameterName
+          }
+        })
+    },
+    getData() {
+      this.$http
+        .post(this.urlOptions.getDataListURL, {
+          params: this.listQuery
+        }
+        )
+        .then(({ data: res }) => {
+          console.log(res)
+          let xAxisData = []
+          var chartDom = document.getElementById('priceMain');
+          var myChart = echarts.init(chartDom)
+          this.myChart = myChart
+          var option;
+          // myChart.on('click', function (params) {
+          //   console.log(params);
+          // });
+          myChart.on('click', 'xAxis.category', function (params) {
+            console.log(params);
+          });
+          option = {
+            title: {
+              text:'箱线图'
+            },
+            tooltip: {
+              trigger: 'axis'
+            },
+            // legend: {
+            //   data: ['推移图']
+            // },
+            tooltip: {
+              trigger: 'item', // axis显示该列下所有坐标轴对应数据，item只显示该点数据
+              axisPointer: { // 坐标轴指示器，坐标轴触发有效
+                type: 'line' // 默认为直线，可选为：'line' | 'shadow'
+              },
+              formatter: function (params) {
+                var res = `
+                  <div>
+                    <div
+                      style='display: inline-block;
+                      width:  10px;
+                      height: 20px;
+                      color: ${params.color}'
+                      >●</div>
+                    <span>${'min:' + res.data.min}</span>
+                  </div>
+                  <div>
+                    <div
+                      style='display: inline-block;
+                      width: 10px;
+                      height: 20px;
+                      color: ${params.color}'
+                    >●</div>
+                    <span>${'Q1:' + res.data.Q1}</span>
+                  </div>
+                  <div>
+                    <div
+                      style='display: inline-block;
+                      width: 10px;
+                      height: 20px;
+                      color: ${params.color}'
+                    >●</div>
+                    <span>${'median:' + res.data.median}</span>
+                  </div>
+                  <div>
+                    <div
+                      style='display: inline-block;
+                      width: 10px;
+                      height: 20px;
+                      color: ${params.color}'
+                    >●</div>
+                    <span>${'Q3:' + res.data.Q3}</span>
+                  </div>
+                  <div>
+                    <div
+                      style='display: inline-block;
+                      width: 10px;
+                      height: 20px;
+                      color: ${params.color}'
+                    >●</div>
+                    <span>${'max:' + res.data.max}</span>
+                  </div>
+                      <div>
+                    <div
+                      style='display: inline-block;
+                      width: 10px;
+                      height: 20px;
+                      color: ${params.color}'
+                    >●</div>
+                    <span>${'outlier:' + res.data.outlier}</span>
+                  </div>
+                `
+                return params.name + res
+              }
+            },
+            grid: {
+              left: '3%',
+              right: '4%',
+              bottom: '3%',
+              containLabel: true
+            },
+            xAxis: {
+              data: [this.dataForm.characteristicsId ],
+              type: 'category',
+              axisLabel: {
+                clickable: true
+              },
+              silent: false,
+              triggerEvent: true
+            },
+            yAxis: {
+              type: 'value'
+            },
+            series: [
+              {
+                name: '最大值',
+                type: 'line',
+                stack: 'Total',
+                data: [res.data.max]
+              },
+            ]
+          };
+          option && myChart.setOption(option);
+        })
+    },
+    buttonClick(val) {
+      console.log(val)
+      switch (val.btnName) {
+        case "search":
+          this.dataForm.sampleSize = val.sampleSize ? val.sampleSize : null
+          this.dataForm.inspectionType = val.inspectionType ? val.inspectionType : null
+          this.dataForm.characteristicsId = val.characteristicsId ? val.characteristicsId : null
+          this.dataForm.factoryId = val.factoryId ? val.factoryId : null
+          this.dataForm.productId = val.productId ? val.productId : null
+          this.dataForm.startTime = val.timeSlot ? val.timeSlot[0] : null
+          this.dataForm.endTime = val.timeSlot ? val.timeSlot[1] : null
+          this.getData()
+          break;
+
+        default:
+          console.log(val)
+      }
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/shipment/components/meanMovingRangeRange.vue b/src/views/modules/shipment/components/meanMovingRangeRange.vue
new file mode 100644
index 0000000..d571694
--- /dev/null
+++ b/src/views/modules/shipment/components/meanMovingRangeRange.vue
@@ -0,0 +1,254 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-06-19 09:19:53
+ * @LastEditTime: 2023-06-20 11:23:41
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <el-row :gutter="24">
+      <el-col :span="18">
+        <div id="priceMain" :style="{ width: '100%', height: '500px' }" />
+      </el-col>
+      <el-col :span="6">
+        <el-table style="width: 100%" :data="getValues" :show-header="false">
+          <el-table-column width="180" v-for="(item, index) in getHeaders" :key="index" :prop="item">
+          </el-table-column>
+        </el-table>
+      </el-col>
+    </el-row>
+  </el-card>
+</template>
+
+<script>
+// import available from "./components/gageAvailable.vue"
+import i18n from "@/i18n"
+import * as echarts from 'echarts';
+export default {
+  data() {
+    return {
+      myChart: null,
+      urlOptions: {
+        getDataListURL: "/code/shipmentRegistration/mean/range/chart",
+      },
+      tableData: [],
+      headers: [
+        {
+          prop: 'usl',
+          label: 'USL',
+        },
+        {
+          prop: 'sl',
+          label: 'SL',
+        },
+        {
+          prop: 'lsl',
+          label: 'LSL',
+        },
+        {
+          prop: 'rangeUcl',
+          label: 'CL(图一)',
+        },
+        {
+          prop: 'averageUcl',
+          label: 'UCL(图一)',
+        },
+        {
+          prop: 'rangeLcl',
+          label: 'LCL(图一)',
+        },
+        {
+          prop: 'standardDeviationCl',
+          label: 'CL(图二)',
+        },
+        {
+          prop: 'standardDeviationLcl',
+          label: 'LCL(图二)',
+        },
+        {
+          prop: 'standardDeviationUcl',
+          label: 'UCL(图二)',
+        },
+        {
+          prop: 'standardDeviationGroup',
+          label: '标准差',
+        },
+        {
+          prop: 'cpk',
+          label: 'cpk',
+        },
+        {
+          prop: 'standardDeviationWhole',
+          label: '总体标准差',
+        },
+        {
+          prop: 'ppk',
+          label: 'ppk',
+        },
+        {
+          prop: 'ca',
+          label: 'ca',
+        },
+        {
+          prop: 'cp',
+          label: 'cp',
+        },
+        {
+          prop: 'ca',
+          label: 'ca',
+        },
+        {
+          prop: 'average',
+          label: '均值',
+        },
+        {
+          prop: 'max',
+          label: '最大值',
+        },
+        {
+          prop: 'max',
+          label: '最大值',
+        },
+      ],
+      listQuery: {
+        characteristicsId: null,
+        factoryId: null,
+        inspectionType: null,
+        productId: null,
+        sampleSize: null,
+        endTime: null,
+        startTime: null,
+      },
+    };
+  },
+  computed: {
+    getHeaders() {
+      return this.tableData.reduce((pre, cur, index) => pre.concat(`value${index}`), ['title'])
+    },
+    getValues() {
+      return this.headers.map(item => {
+        return this.tableData.reduce((pre, cur, index) => Object.assign(pre, { ['value' + index]: cur[item.prop] }), { 'title': item.label, });
+      });
+    }
+  },
+  // components: {
+  //   AddOrUpdate,
+  // },
+  methods: {
+    getData(listQuery) {
+      this.$http
+        .post(this.urlOptions.getDataListURL, {
+          params: listQuery
+        }
+        )
+        .then(({ data: res }) => {
+          this.tableData.push({
+            average: res.data.average,
+            averageCl: res.data.averageCl,
+            averageLcl: res.data.averageLcl,
+            averageUcl: res.data.averageUcl,
+            ca: res.data.ca,
+            cp: res.data.cp,
+            cpk: res.data.cpk,
+            groupNum: res.data.groupNum,
+            lsl: res.data.lsl,
+            ppk: res.data.ppk,
+            rangeCl: res.data.rangeCl,
+            rangeLcl: res.data.rangeCl,
+            rangeUcl: res.data.rangeCl,
+            standardDeviationWhole: res.data.standardDeviationWhole,
+            usl: res.data.usl,
+            max: res.data.max,
+            min: res.data.min,
+          })
+          console.log(res)
+          var chartDom = document.getElementById('priceMain');
+          var myChart = echarts.init(chartDom)
+          this.myChart = myChart
+          var option;
+          // myChart.on('click', function (params) {
+          //   console.log(params);
+          // });
+          myChart.on('click', 'xAxis.category', function (params) {
+            console.log(params);
+          });
+          option = {
+            title: {
+              text: '均值极差图'
+            },
+            tooltip: {
+              trigger: 'axis'
+            },
+            // legend: {
+            //   data: ['推移图']
+            // },
+            grid: {
+              left: '3%',
+              right: '4%',
+              bottom: '3%',
+              containLabel: true
+            },
+            xAxis: {
+              data: [1, 2131, 312, 231321, 321312, 321321, 321312, 321321],
+              type: 'category',
+              axisLabel: {
+                clickable: true
+              },
+              silent: false,
+              triggerEvent: true
+            },
+            yAxis: {
+              type: 'value'
+            },
+            series: [
+              {
+                name: 'lsl',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.lsl]
+              },
+              {
+                name: 'UCL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.averageUcl]
+              },
+              {
+                name: 'UCL(图二)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.rangeUcl]
+              },
+              {
+                name: 'USL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.usl]
+              },
+              {
+                name: 'CL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.rangeCl]
+              },
+              {
+                name: 'LCL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.averageLcl]
+              },
+              {
+                name: 'SL',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.sl]
+              },
+            ]
+          };
+          option && myChart.setOption(option);
+        })
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/shipment/components/meanMovingRangeStandardDeviation.vue b/src/views/modules/shipment/components/meanMovingRangeStandardDeviation.vue
new file mode 100644
index 0000000..37968d7
--- /dev/null
+++ b/src/views/modules/shipment/components/meanMovingRangeStandardDeviation.vue
@@ -0,0 +1,254 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-06-19 09:19:53
+ * @LastEditTime: 2023-06-20 11:23:43
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <el-row :gutter="24">
+      <el-col :span="18">
+        <div id="priceMain" :style="{ width: '100%', height: '500px' }" />
+      </el-col>
+      <el-col :span="6">
+        <el-table style="width: 100%" :data="getValues" :show-header="false">
+          <el-table-column width="180" v-for="(item, index) in getHeaders" :key="index" :prop="item">
+          </el-table-column>
+        </el-table>
+      </el-col>
+    </el-row>
+  </el-card>
+</template>
+
+<script>
+// import available from "./components/gageAvailable.vue"
+import i18n from "@/i18n"
+import * as echarts from 'echarts';
+export default {
+  data() {
+    return {
+      myChart: null,
+      urlOptions: {
+        getDataListURL: "/code/shipmentRegistration/mean/range/chart",
+      },
+      tableData: [],
+      headers: [
+        {
+          prop: 'usl',
+          label: 'USL',
+        },
+        {
+          prop: 'sl',
+          label: 'SL',
+        },
+        {
+          prop: 'lsl',
+          label: 'LSL',
+        },
+        {
+          prop: 'rangeUcl',
+          label: 'CL(图一)',
+        },
+        {
+          prop: 'averageUcl',
+          label: 'UCL(图一)',
+        },
+        {
+          prop: 'rangeLcl',
+          label: 'LCL(图一)',
+        },
+        {
+          prop: 'standardDeviationCl',
+          label: 'CL(图二)',
+        },
+        {
+          prop: 'standardDeviationLcl',
+          label: 'LCL(图二)',
+        },
+        {
+          prop: 'standardDeviationUcl',
+          label: 'UCL(图二)',
+        },
+        {
+          prop: 'standardDeviationGroup',
+          label: '标准差',
+        },
+        {
+          prop: 'cpk',
+          label: 'cpk',
+        },
+        {
+          prop: 'standardDeviationWhole',
+          label: '总体标准差',
+        },
+        {
+          prop: 'ppk',
+          label: 'ppk',
+        },
+        {
+          prop: 'ca',
+          label: 'ca',
+        },
+        {
+          prop: 'cp',
+          label: 'cp',
+        },
+        {
+          prop: 'ca',
+          label: 'ca',
+        },
+        {
+          prop: 'average',
+          label: '均值',
+        },
+        {
+          prop: 'max',
+          label: '最大值',
+        },
+        {
+          prop: 'max',
+          label: '最大值',
+        },
+      ],
+      listQuery: {
+        characteristicsId: null,
+        factoryId: null,
+        inspectionType: null,
+        productId: null,
+        sampleSize: null,
+        endTime: null,
+        startTime: null,
+      },
+    };
+  },
+  computed: {
+    getHeaders() {
+      return this.tableData.reduce((pre, cur, index) => pre.concat(`value${index}`), ['title'])
+    },
+    getValues() {
+      return this.headers.map(item => {
+        return this.tableData.reduce((pre, cur, index) => Object.assign(pre, { ['value' + index]: cur[item.prop] }), { 'title': item.label, });
+      });
+    }
+  },
+  // components: {
+  //   AddOrUpdate,
+  // },
+  methods: {
+    getData(listQuery) {
+      this.$http
+        .post(this.urlOptions.getDataListURL, {
+          params: listQuery
+        }
+        )
+        .then(({ data: res }) => {
+          this.tableData.push({
+            average: res.data.average,
+            averageCl: res.data.averageCl,
+            averageLcl: res.data.averageLcl,
+            averageUcl: res.data.averageUcl,
+            ca: res.data.ca,
+            cp: res.data.cp,
+            cpk: res.data.cpk,
+            groupNum: res.data.groupNum,
+            lsl: res.data.lsl,
+            ppk: res.data.ppk,
+            rangeCl: res.data.rangeCl,
+            rangeLcl: res.data.rangeCl,
+            rangeUcl: res.data.rangeCl,
+            standardDeviationWhole: res.data.standardDeviationWhole,
+            usl: res.data.usl,
+            max: res.data.max,
+            min: res.data.min,
+          })
+          console.log(res)
+          var chartDom = document.getElementById('priceMain');
+          var myChart = echarts.init(chartDom)
+          this.myChart = myChart
+          var option;
+          // myChart.on('click', function (params) {
+          //   console.log(params);
+          // });
+          myChart.on('click', 'xAxis.category', function (params) {
+            console.log(params);
+          });
+          option = {
+            title: {
+              text: '均值极差图'
+            },
+            tooltip: {
+              trigger: 'axis'
+            },
+            // legend: {
+            //   data: ['推移图']
+            // },
+            grid: {
+              left: '3%',
+              right: '4%',
+              bottom: '3%',
+              containLabel: true
+            },
+            xAxis: {
+              data: [1, 2131, 312, 231321, 321312, 321321, 321312, 321321],
+              type: 'category',
+              axisLabel: {
+                clickable: true
+              },
+              silent: false,
+              triggerEvent: true
+            },
+            yAxis: {
+              type: 'value'
+            },
+            series: [
+              {
+                name: 'lsl',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.lsl]
+              },
+              {
+                name: 'UCL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.averageUcl]
+              },
+              {
+                name: 'UCL(图二)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.rangeUcl]
+              },
+              {
+                name: 'USL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.usl]
+              },
+              {
+                name: 'CL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.rangeCl]
+              },
+              {
+                name: 'LCL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.averageLcl]
+              },
+              {
+                name: 'SL',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.sl]
+              },
+            ]
+          };
+          option && myChart.setOption(option);
+        })
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/shipment/components/meanRange.vue b/src/views/modules/shipment/components/meanRange.vue
new file mode 100644
index 0000000..5c82159
--- /dev/null
+++ b/src/views/modules/shipment/components/meanRange.vue
@@ -0,0 +1,264 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-06-19 09:19:53
+ * @LastEditTime: 2023-06-20 14:11:35
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <el-row :gutter="24">
+      <el-col :span="18">
+        <div id="priceMain" :style="{ width: '100%', height: '500px' }" />
+      </el-col>
+      <el-col :span="6">
+        <el-table style="width: 100%" :data="getValues" :show-header="false">
+          <el-table-column width="180" v-for="(item, index) in getHeaders" :key="index" :prop="item">
+          </el-table-column>
+        </el-table>
+      </el-col>
+    </el-row>
+  </el-card>
+</template>
+
+<script>
+// import available from "./components/gageAvailable.vue"
+import i18n from "@/i18n"
+import * as echarts from 'echarts';
+export default {
+  data() {
+    return {
+      myChart: null,
+      urlOptions: {
+        getDataListURL: "/code/shipmentRegistration/mean/range/chart",
+      },
+      tableData:[],
+      headers: [
+        {
+          prop: 'usl',
+          label: 'USL',
+        },
+        {
+          prop: 'sl',
+          label: 'SL',
+        },
+        {
+          prop: 'lsl',
+          label: 'LSL',
+        },
+        {
+          prop: 'averageUcl',
+          label: 'CL(图一)',
+        },
+        {
+          prop: 'averageUcl',
+          label: 'UCL(图一)',
+        },
+        {
+          prop: 'averageLcl',
+          label: 'LCL(图一)',
+        },
+        {
+          prop: 'rangeCl',
+          label: 'CL(图二)',
+        },
+        {
+          prop: 'rangeLcl',
+          label: 'LCL(图二)',
+        },
+        {
+          prop: 'rangeUcl',
+          label: 'UCL(图二)',
+        },
+        {
+          prop: 'standardDeviationGroup',
+          label: '标准差',
+        },
+        {
+          prop: 'cpk',
+          label: 'cpk',
+        },
+        {
+          prop: 'standardDeviationWhole',
+          label: '总体标准差',
+        },
+        {
+          prop: 'ppk',
+          label: 'ppk',
+        },
+        {
+          prop: 'ca',
+          label: 'ca',
+        },
+        {
+          prop: 'cp',
+          label: 'cp',
+        },
+        {
+          prop: 'ca',
+          label: 'ca',
+        },
+        {
+          prop: 'average',
+          label: '均值',
+        },
+        {
+          prop: 'max',
+          label: '最大值',
+        },
+        {
+          prop: 'max',
+          label: '最大值',
+        },
+      ],
+      listQuery: {
+        characteristicsId: null,
+        factoryId: null,
+        inspectionType: null,
+        productId: null,
+        sampleSize: null,
+        endTime: null,
+        startTime: null,
+      },
+    };
+  },
+  computed: {
+    getHeaders() {
+      return this.tableData.reduce((pre, cur, index) => pre.concat(`value${index}`), ['title'])
+    },
+    getValues() {
+      return this.headers.map(item => {
+        return this.tableData.reduce((pre, cur, index) => Object.assign(pre, { ['value' + index]: cur[item.prop] }), { 'title': item.label, });
+      });
+    }
+  },
+  // components: {
+  //   AddOrUpdate,
+  // },
+  methods: {
+    getData(listQuery) {
+      this.$http
+        .post(this.urlOptions.getDataListURL, {
+          params: listQuery
+        }
+        )
+        .then(({ data: res }) => {
+          this.tableData.push({
+            average: res.data.average,
+            averageCl: res.data.averageCl,
+            averageLcl: res.data.averageLcl,
+            averageUcl: res.data.averageUcl,
+            ca: res.data.ca,
+            cp: res.data.cp,
+            cpk: res.data.cpk,
+            groupNum: res.data.groupNum,
+            lsl: res.data.lsl,
+            ppk: res.data.ppk,
+            rangeCl: res.data.rangeCl,
+            rangeLcl: res.data.rangeLcl,
+            rangeUcl: res.data.rangeUcl,
+            standardDeviationWhole: res.data.standardDeviationWhole,
+            usl: res.data.usl,
+            max: res.data.max,
+            min: res.data.min,
+          })
+          console.log(res)
+          let xAxisData = []
+          res.data.shipmentRegistrationCharacteristicsDTOList.forEach(ele => {
+            xAxisData.push(ele.batchNo + ele.groupNo)
+          })
+          var chartDom = document.getElementById('priceMain');
+          var myChart = echarts.init(chartDom)
+          this.myChart = myChart
+          var option;
+          // myChart.on('click', function (params) {
+          //   console.log(params);
+          // });
+          myChart.on('click', 'xAxis.category', function (params) {
+            console.log(params);
+          });
+          option = {
+            title: {
+              text: '均值极差图'
+            },
+            tooltip: {
+              trigger: 'axis'
+            },
+            // legend: {
+            //   data: ['推移图']
+            // },
+            grid: {
+              left: '3%',
+              right: '4%',
+              bottom: '3%',
+              containLabel: true
+            },
+            xAxis: {
+              data: xAxisData,
+              type: 'category',
+              axisLabel: {
+                clickable: true
+              },
+              silent: false,
+              triggerEvent: true
+            },
+            yAxis: {
+              type: 'value'
+            },
+            series: [
+              {
+                name: 'lsl',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.lsl]
+              },
+              {
+                name: 'UCL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.averageUcl]
+              },
+              {
+                name: 'UCL(图二)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.rangeUcl]
+              },
+              {
+                name: 'USL',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.usl]
+              },
+              {
+                name: 'CL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.averageCl]
+              },
+              {
+                name: 'CL(图二)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.rangeCl]
+              },
+              {
+                name: 'LCL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.averageLcl]
+              },
+              {
+                name: 'SL',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.sl]
+              },
+            ]
+          };
+          option && myChart.setOption(option);
+        })
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/shipment/components/meanStandard.vue b/src/views/modules/shipment/components/meanStandard.vue
new file mode 100644
index 0000000..ce3b1e1
--- /dev/null
+++ b/src/views/modules/shipment/components/meanStandard.vue
@@ -0,0 +1,264 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-06-19 09:19:53
+ * @LastEditTime: 2023-06-20 14:11:30
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <el-row :gutter="24">
+      <el-col :span="18">
+        <div id="priceMain" :style="{ width: '100%', height: '500px' }" />
+      </el-col>
+      <el-col :span="6">
+        <el-table style="width: 100%" :data="getValues" :show-header="false">
+          <el-table-column width="180" v-for="(item, index) in getHeaders" :key="index" :prop="item">
+          </el-table-column>
+        </el-table>
+      </el-col>
+    </el-row>
+  </el-card>
+</template>
+
+<script>
+// import available from "./components/gageAvailable.vue"
+import i18n from "@/i18n"
+import * as echarts from 'echarts';
+export default {
+  data() {
+    return {
+      myChart: null,
+      urlOptions: {
+        getDataListURL: "/code/shipmentRegistration/mean/standard/deviation/chart",
+      },
+      tableData: [],
+      headers: [
+        {
+          prop: 'usl',
+          label: 'USL',
+        },
+        {
+          prop: 'sl',
+          label: 'SL',
+        },
+        {
+          prop: 'lsl',
+          label: 'LSL',
+        },
+        {
+          prop: 'averageCl',
+          label: 'CL(图一)',
+        },
+        {
+          prop: 'averageUcl',
+          label: 'UCL(图一)',
+        },
+        {
+          prop: 'averageLcl',
+          label: 'LCL(图一)',
+        },
+        {
+          prop: 'standardDeviationCl',
+          label: 'CL(图二)',
+        },
+        {
+          prop: 'standardDeviationLcl',
+          label: 'LCL(图二)',
+        },
+        {
+          prop: 'standardDeviationUcl',
+          label: 'UCL(图二)',
+        },
+        {
+          prop: 'standardDeviationGroup',
+          label: '标准差',
+        },
+        {
+          prop: 'cpk',
+          label: 'cpk',
+        },
+        {
+          prop: 'standardDeviationWhole',
+          label: '总体标准差',
+        },
+        {
+          prop: 'ppk',
+          label: 'ppk',
+        },
+        {
+          prop: 'ca',
+          label: 'ca',
+        },
+        {
+          prop: 'cp',
+          label: 'cp',
+        },
+        {
+          prop: 'ca',
+          label: 'ca',
+        },
+        {
+          prop: 'average',
+          label: '均值',
+        },
+        {
+          prop: 'max',
+          label: '最大值',
+        },
+        {
+          prop: 'max',
+          label: '最大值',
+        },
+      ],
+      listQuery: {
+        characteristicsId: null,
+        factoryId: null,
+        inspectionType: null,
+        productId: null,
+        sampleSize: null,
+        endTime: null,
+        startTime: null,
+      },
+    };
+  },
+  computed: {
+    getHeaders() {
+      return this.tableData.reduce((pre, cur, index) => pre.concat(`value${index}`), ['title'])
+    },
+    getValues() {
+      return this.headers.map(item => {
+        return this.tableData.reduce((pre, cur, index) => Object.assign(pre, { ['value' + index]: cur[item.prop] }), { 'title': item.label, });
+      });
+    }
+  },
+  // components: {
+  //   AddOrUpdate,
+  // },
+  methods: {
+    getData(listQuery) {
+      this.$http
+        .post(this.urlOptions.getDataListURL, {
+          params: listQuery
+        }
+        )
+        .then(({ data: res }) => {
+          this.tableData.push({
+            average: res.data.average,
+            averageCl: res.data.averageCl,
+            averageLcl: res.data.averageLcl,
+            averageUcl: res.data.averageUcl,
+            ca: res.data.ca,
+            cp: res.data.cp,
+            cpk: res.data.cpk,
+            groupNum: res.data.groupNum,
+            lsl: res.data.lsl,
+            ppk: res.data.ppk,
+            standardDeviationCl: res.data.standardDeviationCl,
+            standardDeviationLcl: res.data.standardDeviationLcl,
+            standardDeviationUcl: res.data.standardDeviationUcl,
+            standardDeviationWhole: res.data.standardDeviationWhole,
+            usl: res.data.usl,
+            max: res.data.max,
+            min: res.data.min,
+          })
+          console.log(res)
+          let xAxisData = []
+          res.data.shipmentRegistrationCharacteristicsDTOList.forEach(ele => {
+            xAxisData.push(ele.batchNo + ele.groupNo)
+          })
+          var chartDom = document.getElementById('priceMain');
+          var myChart = echarts.init(chartDom)
+          this.myChart = myChart
+          var option;
+          // myChart.on('click', function (params) {
+          //   console.log(params);
+          // });
+          myChart.on('click', 'xAxis.category', function (params) {
+            console.log(params);
+          });
+          option = {
+            title: {
+              text: '均值极差图'
+            },
+            tooltip: {
+              trigger: 'axis'
+            },
+            // legend: {
+            //   data: ['推移图']
+            // },
+            grid: {
+              left: '3%',
+              right: '4%',
+              bottom: '3%',
+              containLabel: true
+            },
+            xAxis: {
+              data: xAxisData,
+              type: 'category',
+              axisLabel: {
+                clickable: true
+              },
+              silent: false,
+              triggerEvent: true
+            },
+            yAxis: {
+              type: 'value'
+            },
+            series: [
+              {
+                name: 'lsl',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.lsl]
+              },
+              {
+                name: 'UCL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.averageUcl]
+              },
+              {
+                name: 'UCL(图二)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.standardDeviationUcl]
+              },
+              {
+                name: 'USL',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.usl]
+              },
+              {
+                name: 'CL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.averageCl]
+              }, 
+              {
+                name: 'CL(图二)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.standardDeviationCl]
+              },
+              {
+                name: 'LCL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.averageLcl]
+              },
+              {
+                name: 'SL',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.sl]
+              },
+            ]
+          };
+          option && myChart.setOption(option);
+        })
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/shipment/components/medianRange.vue b/src/views/modules/shipment/components/medianRange.vue
new file mode 100644
index 0000000..ac4f408
--- /dev/null
+++ b/src/views/modules/shipment/components/medianRange.vue
@@ -0,0 +1,271 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-06-19 09:19:53
+ * @LastEditTime: 2023-06-20 14:11:13
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <el-row :gutter="24">
+      <el-col :span="18">
+        <div id="priceMain" :style="{ width: '100%', height: '500px' }" />
+      </el-col>
+      <el-col :span="6">
+        <el-table style="width: 100%" :data="getValues" :show-header="false">
+          <el-table-column width="180" v-for="(item, index) in getHeaders" :key="index" :prop="item">
+          </el-table-column>
+        </el-table>
+      </el-col>
+    </el-row>
+  </el-card>
+</template>
+
+<script>
+// import available from "./components/gageAvailable.vue"
+import i18n from "@/i18n"
+import * as echarts from 'echarts';
+export default {
+  data() {
+    return {
+      myChart: null,
+      urlOptions: {
+        getDataListURL: "/code/shipmentRegistration/median/range/chart",
+      },
+      tableData: [],
+      headers: [
+        {
+          prop: 'usl',
+          label: 'USL',
+        },
+        {
+          prop: 'sl',
+          label: 'SL',
+        },
+        {
+          prop: 'lsl',
+          label: 'LSL',
+        },
+        {
+          prop: 'averageUcl',
+          label: 'CL(图一)',
+        },
+        {
+          prop: 'averageUcl',
+          label: 'UCL(图一)',
+        },
+        {
+          prop: 'averageLcl',
+          label: 'LCL(图一)',
+        },
+        {
+          prop: 'rangeCl',
+          label: 'CL(图二)',
+        },
+        {
+          prop: 'rangeLcl',
+          label: 'LCL(图二)',
+        },
+        {
+          prop: 'rangeUcl',
+          label: 'UCL(图二)',
+        },
+        {
+          prop: 'standardDeviationGroup',
+          label: '标准差',
+        },
+        {
+          prop: 'cpk',
+          label: 'cpk',
+        },
+        {
+          prop: 'standardDeviationWhole',
+          label: '总体标准差',
+        },
+        {
+          prop: 'ppk',
+          label: 'ppk',
+        },
+        {
+          prop: 'ca',
+          label: 'ca',
+        },
+        {
+          prop: 'cp',
+          label: 'cp',
+        },
+        {
+          prop: 'ca',
+          label: 'ca',
+        },
+        {
+          prop: 'average',
+          label: '均值',
+        },
+        {
+          prop: 'max',
+          label: '最大值',
+        },
+        {
+          prop: 'max',
+          label: '最大值',
+        },
+        {
+          prop: 'median',
+          label: '中位数',
+        },
+      ],
+      listQuery: {
+        characteristicsId: null,
+        factoryId: null,
+        inspectionType: null,
+        productId: null,
+        sampleSize: null,
+        endTime: null,
+        startTime: null,
+      },
+    };
+  },
+  computed: {
+    getHeaders() {
+      return this.tableData.reduce((pre, cur, index) => pre.concat(`value${index}`), ['title'])
+    },
+    getValues() {
+      return this.headers.map(item => {
+        return this.tableData.reduce((pre, cur, index) => Object.assign(pre, { ['value' + index]: cur[item.prop] }), { 'title': item.label, });
+      });
+    }
+  },
+  // components: {
+  //   AddOrUpdate,
+  // },
+  methods: {
+    getData(listQuery) {
+      this.$http
+        .post(this.urlOptions.getDataListURL, {
+          params: listQuery
+        }
+        )
+        .then(({ data: res }) => {
+          this.tableData.push({
+            average: res.data.average,
+            averageCl: res.data.averageCl,
+            averageLcl: res.data.averageLcl,
+            averageUcl: res.data.averageUcl,
+            ca: res.data.ca,
+            cp: res.data.cp,
+            cpk: res.data.cpk,
+            groupNum: res.data.groupNum,
+            lsl: res.data.lsl,
+            ppk: res.data.ppk,
+            rangeCl: res.data.rangeCl,
+            rangeLcl: res.data.rangeCl,
+            rangeUcl: res.data.rangeCl,
+            standardDeviationWhole: res.data.standardDeviationWhole,
+            usl: res.data.usl,
+            max: res.data.max,
+            min: res.data.min,
+          })
+          res.data.shipmentRegistrationCharacteristicsDTOList.forEach(ele => {
+            this.tableData.push(ele.median)
+          })
+          let xAxisData = []
+          res.data.shipmentRegistrationCharacteristicsDTOList.forEach(ele => {
+            xAxisData.push(ele.batchNo + ele.groupNo)
+          })
+          console.log(res)
+          var chartDom = document.getElementById('priceMain');
+          var myChart = echarts.init(chartDom)
+          this.myChart = myChart
+          var option;
+          // myChart.on('click', function (params) {
+          //   console.log(params);
+          // });
+          myChart.on('click', 'xAxis.category', function (params) {
+            console.log(params);
+          });
+          option = {
+            title: {
+              text: '均值极差图'
+            },
+            tooltip: {
+              trigger: 'axis'
+            },
+            // legend: {
+            //   data: ['推移图']
+            // },
+            grid: {
+              left: '3%',
+              right: '4%',
+              bottom: '3%',
+              containLabel: true
+            },
+            xAxis: {
+              data: xAxisData,
+              type: 'category',
+              axisLabel: {
+                clickable: true
+              },
+              silent: false,
+              triggerEvent: true
+            },
+            yAxis: {
+              type: 'value'
+            },
+            series: [
+              {
+                name: 'lsl',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.lsl]
+              },
+              {
+                name: 'UCL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.averageUcl]
+              },
+              {
+                name: 'UCL(图二)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.rangeUcl]
+              },
+              {
+                name: 'USL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.usl]
+              },
+              {
+                name: 'CL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.rangeCl]
+              },
+              {
+                name: 'CL(图二)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.rangeCl]
+              },
+              {
+                name: 'LCL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.averageLcl]
+              },
+              {
+                name: 'SL',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.sl]
+              },
+            ]
+          };
+          option && myChart.setOption(option);
+        })
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/shipment/components/singleValueMovingRange.vue b/src/views/modules/shipment/components/singleValueMovingRange.vue
new file mode 100644
index 0000000..8726c03
--- /dev/null
+++ b/src/views/modules/shipment/components/singleValueMovingRange.vue
@@ -0,0 +1,264 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-06-19 09:19:53
+ * @LastEditTime: 2023-06-20 14:11:05
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <el-row :gutter="24">
+      <el-col :span="18">
+        <div id="priceMain" :style="{ width: '100%', height: '500px' }" />
+      </el-col>
+      <el-col :span="6">
+        <el-table style="width: 100%" :data="getValues" :show-header="false">
+          <el-table-column width="180" v-for="(item, index) in getHeaders" :key="index" :prop="item">
+          </el-table-column>
+        </el-table>
+      </el-col>
+    </el-row>
+  </el-card>
+</template>
+
+<script>
+// import available from "./components/gageAvailable.vue"
+import i18n from "@/i18n"
+import * as echarts from 'echarts';
+export default {
+  data() {
+    return {
+      myChart: null,
+      urlOptions: {
+        getDataListURL: "/code/shipmentRegistration/single/value/movement/range/chart",
+      },
+      tableData: [],
+      headers: [
+        {
+          prop: 'usl',
+          label: 'USL',
+        },
+        {
+          prop: 'sl',
+          label: 'SL',
+        },
+        {
+          prop: 'lsl',
+          label: 'LSL',
+        },
+        {
+          prop: 'averageUcl',
+          label: 'CL(图一)',
+        },
+        {
+          prop: 'averageUcl',
+          label: 'UCL(图一)',
+        },
+        {
+          prop: 'averageLcl',
+          label: 'LCL(图一)',
+        },
+        {
+          prop: 'rangeCl',
+          label: 'CL(图二)',
+        },
+        {
+          prop: 'rangeLcl',
+          label: 'LCL(图二)',
+        },
+        {
+          prop: 'rangeUcl',
+          label: 'UCL(图二)',
+        },
+        {
+          prop: 'standardDeviationGroup',
+          label: '标准差',
+        },
+        {
+          prop: 'cpk',
+          label: 'cpk',
+        },
+        {
+          prop: 'standardDeviationWhole',
+          label: '总体标准差',
+        },
+        {
+          prop: 'ppk',
+          label: 'ppk',
+        },
+        {
+          prop: 'ca',
+          label: 'ca',
+        },
+        {
+          prop: 'cp',
+          label: 'cp',
+        },
+        {
+          prop: 'ca',
+          label: 'ca',
+        },
+        {
+          prop: 'average',
+          label: '均值',
+        },
+        {
+          prop: 'max',
+          label: '最大值',
+        },
+        {
+          prop: 'max',
+          label: '最大值',
+        },
+      ],
+      listQuery: {
+        characteristicsId: null,
+        factoryId: null,
+        inspectionType: null,
+        productId: null,
+        sampleSize: null,
+        endTime: null,
+        startTime: null,
+      },
+    };
+  },
+  computed: {
+    getHeaders() {
+      return this.tableData.reduce((pre, cur, index) => pre.concat(`value${index}`), ['title'])
+    },
+    getValues() {
+      return this.headers.map(item => {
+        return this.tableData.reduce((pre, cur, index) => Object.assign(pre, { ['value' + index]: cur[item.prop] }), { 'title': item.label, });
+      });
+    }
+  },
+  // components: {
+  //   AddOrUpdate,
+  // },
+  methods: {
+    getData(listQuery) {
+      this.$http
+        .post(this.urlOptions.getDataListURL, {
+          params: listQuery
+        }
+        )
+        .then(({ data: res }) => {
+          this.tableData.push({
+            average: res.data.average,
+            averageCl: res.data.averageCl,
+            averageLcl: res.data.averageLcl,
+            averageUcl: res.data.averageUcl,
+            ca: res.data.ca,
+            cp: res.data.cp,
+            cpk: res.data.cpk,
+            groupNum: res.data.groupNum,
+            lsl: res.data.lsl,
+            ppk: res.data.ppk,
+            rangeCl: res.data.rangeCl,
+            rangeLcl: res.data.rangeCl,
+            rangeUcl: res.data.rangeCl,
+            standardDeviationWhole: res.data.standardDeviationWhole,
+            usl: res.data.usl,
+            max: res.data.max,
+            min: res.data.min,
+          })
+          console.log(res)
+          let xAxisData = []
+          res.data.shipmentRegistrationCharacteristicsDTOList.forEach(ele => {
+            xAxisData.push(ele.batchNo + ele.groupNo)
+          })
+          var chartDom = document.getElementById('priceMain');
+          var myChart = echarts.init(chartDom)
+          this.myChart = myChart
+          var option;
+          // myChart.on('click', function (params) {
+          //   console.log(params);
+          // });
+          myChart.on('click', 'xAxis.category', function (params) {
+            console.log(params);
+          });
+          option = {
+            title: {
+              text: '均值极差图'
+            },
+            tooltip: {
+              trigger: 'axis'
+            },
+            // legend: {
+            //   data: ['推移图']
+            // },
+            grid: {
+              left: '3%',
+              right: '4%',
+              bottom: '3%',
+              containLabel: true
+            },
+            xAxis: {
+              data: xAxisData,
+              type: 'category',
+              axisLabel: {
+                clickable: true
+              },
+              silent: false,
+              triggerEvent: true
+            },
+            yAxis: {
+              type: 'value'
+            },
+            series: [
+              {
+                name: 'lsl',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.lsl]
+              },
+              {
+                name: 'UCL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.averageUcl]
+              },
+              {
+                name: 'UCL(图二)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.rangeUcl]
+              },
+              {
+                name: 'USL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.usl]
+              },
+              {
+                name: 'CL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.rangeCl]
+              },
+              {
+                name: 'CL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.averageCl]
+              },
+              {
+                name: 'LCL(图一)',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.averageLcl]
+              },
+              {
+                name: 'SL',
+                type: 'bar',
+                barWidth: '50%',
+                data: [res.data.sl]
+              },
+            ]
+          };
+          option && myChart.setOption(option);
+        })
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/shipment/controlDiagram.vue b/src/views/modules/shipment/controlDiagram.vue
new file mode 100644
index 0000000..e2b182f
--- /dev/null
+++ b/src/views/modules/shipment/controlDiagram.vue
@@ -0,0 +1,442 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-01-11 09:24:58
+ * @LastEditTime: 2023-06-20 15:55:28
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__user">
+      <el-form :inline="true" :model="dataForm" class="demo-form-inline">
+        <el-form-item :label="$t('code.inspectionTime')" prop="timeSlot">
+          <el-date-picker v-model="dataForm.timeSlot" size="small" type="datetimerange" format='yyyy-MM-dd HH:mm:ss'
+            @change="getFactory" valueFormat='yyyy-MM-ddTHH:mm:ss' :start-placeholder="$t('gage.startTime')"
+            :end-placeholder="$t('gage.endTime')" :range-separator="$t('gage.to')" clearable />
+        </el-form-item>
+        <el-form-item :label="$t('code.factoryName')">
+          <el-select v-model="dataForm.factoryId" :placeholder="$t('code.factoryName')" @change="getInspectionType">
+            <el-option v-for="item in factoryList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('code.productName')">
+          <el-select v-model="dataForm.productId" :placeholder="$t('code.productName')" @change="gerCharacteristics">
+            <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <!-- <el-form-item :label="$t('code.inspectionType')">
+          <el-select v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')">
+            <el-option v-for="item in inspectionTypeList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item> -->
+        <el-form-item :label="$t('code.inspectionType')">
+          <el-input v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('code.characteristics')">
+          <el-input v-model="dataForm.characteristicsId" :placeholder="$t('code.characteristics')"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('code.sampleSize')">
+          <el-input v-model="dataForm.sampleSize" :placeholder="$t('code.sampleSize')"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getOriginalData">{{ $t('code.originalData') }}}</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tab-pane :label="$t('code.meanRange')" name="first">
+        <mean-range ref="meanRange"></mean-range>
+      </el-tab-pane>
+      <el-tab-pane :label="$t('code.meanStandard')" name="second">
+        <mean-standard ref="meanStandard">
+        </mean-standard>
+      </el-tab-pane>
+      <el-tab-pane :label=" $t('code.medianRange')" name="third">
+        <median-range ref="medianRange">
+        </median-range>
+      </el-tab-pane>
+      <el-tab-pane :label="$t('code.singleValueMovingRange')" name="fourth">
+        <single-valueMovingRange ref="singleValueMovingRange">
+        </single-valueMovingRange>
+      </el-tab-pane>
+      <el-tab-pane :label="$t('code.meanMovingRangeRange')" name="fifth">
+        <mean-MovingRangeRange ref="meanMovingRangeRange">
+        </mean-MovingRangeRange>
+      </el-tab-pane>
+      <el-tab-pane :label="$t('code.meanMovingRangeStandardDeviation')" name="sixth">
+        <mean-movingRangeStandardDeviation ref="meanMovingRangeStandardDeviation">
+        </mean-movingRangeStandardDeviation>
+      </el-tab-pane>
+    </el-tabs>
+    <base-table id="palletTable" :table-props="tableProps" :page="listQuery.page" ref="palletTable1"
+      highlight-current-row :limit="listQuery.limit" :table-data="tableData">
+    </base-table>
+  </el-card>
+</template>
+
+<script>
+import meanRange from "./components/meanRange.vue"
+import meanStandard from "./components/meanStandard.vue"
+import medianRange from "./components/medianRange.vue"
+import singleValueMovingRange from "./components/singleValueMovingRange.vue"
+import meanMovingRangeRange from "./components/meanMovingRangeRange.vue"
+import meanMovingRangeStandardDeviation from "./components/meanMovingRangeStandardDeviation.vue"
+import i18n from "@/i18n"
+import * as echarts from 'echarts';
+const tableProps = [
+  {
+    prop: "orderNumber",
+    label: i18n.t('code.inspectionNumber'),
+  },
+  {
+    prop: "batchNo",
+    label: i18n.t('code.batchNo'),
+  },
+  {
+    prop: "locationNo",
+    label: i18n.t('code.locationNo'),
+  },
+  {
+    prop: "groupNo",
+    label: i18n.t('code.groupNo'),
+  },
+  {
+    prop: "meteringValue",
+    label: i18n.t('code.assayValue'),
+  },
+  {
+    prop: "createDate",
+    label: i18n.t('code.parsingTime'),
+  }
+];
+export default {
+  data() {
+    return {
+      myChart: null,
+      urlOptions: {
+        getXBarURL: '',
+        getDataListURL: "/code/shipmentRegistration/mean/range/chart",
+        getFactoryURL: '/code/shipmentRegistration/query/factory',
+        getProductURL: '/code/shipmentRegistration/query/product',
+        getInspectionTypeURL: '/code/shipmentRegistration/query/inspection/type',
+        getOriginalDataURL: '/code/shipmentRegistration/raw/data',
+        getPurchaseRegistrationTypeURL: '/code/shipmentRegistration/query/checkout/project',
+      },
+      tableData:[],
+      tableProps,
+      factoryList: [],
+      productList: [],
+      meanRangeShow:false,
+      listQuery: {
+        characteristicsId: null,
+        factoryId: null,
+        inspectionType: null,
+        productId: null,
+        sampleSize: null,
+        endTime: null,
+        startTime: null,
+      },
+      activeName:null,
+      headers: [
+        {
+          prop: 'usl',
+          label: 'USL',
+        },
+        {
+          prop: 'sl',
+          label: 'SL',
+        },
+        {
+          prop: 'lsl',
+          label: 'LSL',
+        },
+        {
+          prop: 'rangeUcl',
+          label: 'CL(图一)',
+        },
+        {
+          prop: 'averageUcl',
+          label: 'UCL(图一)',
+        },
+        {
+          prop: 'rangeLcl',
+          label: 'LCL(图一)',
+        },
+        {
+          prop: 'standardDeviationCl',
+          label: 'CL(图二)',
+        },
+        {
+          prop: 'standardDeviationLcl',
+          label: 'LCL(图二)',
+        },
+        {
+          prop: 'standardDeviationUcl',
+          label: 'UCL(图二)',
+        },
+        {
+          prop: 'standardDeviationGroup',
+          label: '标准差',
+        },
+        {
+          prop: 'cpk',
+          label: 'cpk',
+        },
+        {
+          prop: 'standardDeviationWhole',
+          label: '总体标准差',
+        },
+        {
+          prop: 'ppk',
+          label: 'ppk',
+        },
+        {
+          prop: 'ca',
+          label: 'ca',
+        },
+        {
+          prop: 'cp',
+          label: 'cp',
+        },
+        {
+          prop: 'ca',
+          label: 'ca',
+        },
+        {
+          prop: 'average',
+          label: '均值',
+        },
+        {
+          prop: 'max',
+          label: '最大值',
+        },
+        {
+          prop: 'max',
+          label: '最大值',
+        },
+      ],
+      tableData: [],
+      dataForm: {
+        productId: null,
+        timeSlot: [],
+        factoryId: null,
+        characteristicsId: null,
+        inspectionType: null,
+        sampleSize: null
+      },
+      selectOptions: [{
+        id: 0,
+        name: '监控'
+      },
+      {
+        id: 1,
+        name: '电芯来料检验'
+      },
+      {
+        id: 2,
+        lname: 'IQC抽检'
+      },
+      {
+        id: 3,
+        name: 'IQC抽检2'
+      },
+      {
+        id: 4,
+        name: '原料抽检'
+      },
+      {
+        id: 5,
+        name: '进货外观检验'
+      },
+      {
+        id: 6,
+        name: '库内原料检验'
+      },
+      {
+        id: 7,
+        name: '来料检验'
+      },
+      {
+        id: 8,
+        name: '胶片'
+      },
+      {
+        id: 9,
+        name: '抽检'
+      },
+      {
+        id: 10,
+        name: '巡检'
+      }, {
+        id: 11,
+        name: '首检'
+      },
+      {
+        id: 12,
+        name: '末检'
+      },
+      {
+        id: 13,
+        name: '实时监测'
+      },
+      {
+        id: 14,
+        name: 'FQC抽检'
+      },
+      {
+        id: 15,
+        name: 'OQC抽检'
+      },
+      ],
+    };
+  },
+  components: {
+    meanRange,
+    meanStandard,
+    medianRange,
+    singleValueMovingRange,
+    meanMovingRangeRange,
+    meanMovingRangeStandardDeviation
+  },
+  computed: {
+    getHeaders() {
+      return this.tableData.reduce((pre, cur, index) => pre.concat(`value${index}`), ['title'])
+    },
+    getValues() {
+      return this.headers.map(item => {
+        return this.tableData.reduce((pre, cur, index) => Object.assign(pre, { ['value' + index]: cur[item.prop] }), { 'title': item.label, });
+      });
+    }
+  },
+  mounted() {
+    // this.getData()
+    // this.getDict()
+  },
+  methods: {
+    selectChanged(val) {
+      console.log(val)
+      alert(JSON.stringify(val))
+    },
+    handleClick(val) {
+      if (this.activeName === 'first') {
+        this.$nextTick(() => {
+          this.$refs.meanRange.getData(this.listQuery)
+        })
+      } else if (this.activeName === 'second') {
+        this.$nextTick(() => {
+          this.$refs.meanStandard.getData(this.listQuery)
+        })
+      } else if (this.activeName === 'third') {
+        this.$nextTick(() => {
+          this.$refs.medianRange.getData(this.listQuery)
+        })
+      } else if (this.activeName === 'fourth') {
+        this.$nextTick(() => {
+          this.$refs.singleValueMovingRange.getData(this.listQuery)
+        })
+      } else if (this.activeName === 'fifth') {
+        this.$nextTick(() => {
+          this.$refs.meanMovingRangeRange.getData(this.listQuery)
+        })
+      } else if (this.activeName === 'sixth') {
+        this.$nextTick(() => {
+          this.$refs.meanMovingRangeStandardDeviation.getData(this.listQuery)
+        })
+      }
+
+    },
+    getFactory(val) {
+      console.log(val)
+      this.$http.get(this.urlOptions.getFactoryURL, {
+        params: {
+          startTime: val[0],
+          endTime: val[1]
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.factoryList = res.data.map((item) => {
+              return {
+                id: item.factoryId,
+                name: item.factoryName
+              }
+            })
+          }
+        })
+      this.$http.get(this.urlOptions.getProductURL, {
+        params: {
+          startTime: val[0],
+          endTime: val[1]
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.productList = res.data.map((item) => {
+              return {
+                id: item.productId,
+                name: item.productName
+              }
+            })
+          }
+        })
+    },
+    getInspectionType(val) {
+      this.$http.get(this.urlOptions.getInspectionTypeURL, {
+        params: {
+          startTime: this.dataForm.timeSlot[0],
+          endTime: this.dataForm.timeSlot[1],
+          factoryId: val
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.dataForm.inspectionType = res.data.inspectionType
+          }
+        })
+    },
+    gerCharacteristics(val) {
+      this.$http.get(this.urlOptions.getPurchaseRegistrationTypeURL, {
+        params: {
+          productId: val
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.dataForm.characteristicsId = res.data.parameterName
+          }
+        })
+    },
+    getOriginalData() {
+      this.$http.get(this.urlOptions.getOriginalDataURL, {
+        params:this.listQuery
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.tableData = res.data
+          }
+        })
+    },
+    buttonClick(val) {
+      console.log(val)
+      switch (val.btnName) {
+        case "search":
+          this.dataForm.sampleSize = val.sampleSize ? val.sampleSize : null
+          this.dataForm.inspectionType = val.inspectionType ? val.inspectionType : null
+          this.dataForm.characteristicsId = val.characteristicsId ? val.characteristicsId : null
+          this.dataForm.factoryId = val.factoryId ? val.factoryId : null
+          this.dataForm.productId = val.productId ? val.productId : null
+          this.dataForm.startTime = val.timeSlot ? val.timeSlot[0] : null
+          this.dataForm.endTime = val.timeSlot ? val.timeSlot[1] : null
+          this.getData()
+          break;
+
+        default:
+          console.log(val)
+      }
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/shipment/paretoDiagram.vue b/src/views/modules/shipment/paretoDiagram.vue
new file mode 100644
index 0000000..408744a
--- /dev/null
+++ b/src/views/modules/shipment/paretoDiagram.vue
@@ -0,0 +1,312 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-01-11 09:24:58
+ * @LastEditTime: 2023-06-20 15:55:48
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__user">
+      <el-form :inline="true" :model="dataForm" class="demo-form-inline">
+        <el-form-item :label="$t('code.inspectionTime')" prop="timeSlot">
+          <el-date-picker v-model="dataForm.timeSlot" size="small" type="datetimerange" format='yyyy-MM-dd HH:mm:ss'
+            @change="getFactory" valueFormat='yyyy-MM-ddTHH:mm:ss' :start-placeholder="$t('gage.startTime')"
+            :end-placeholder="$t('gage.endTime')" :range-separator="$t('gage.to')" clearable />
+        </el-form-item>
+        <el-form-item :label="$t('code.factoryName')">
+          <el-select v-model="dataForm.factoryId" :placeholder="$t('code.factoryName')" @change="getInspectionType">
+            <el-option v-for="item in factoryList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('code.inspectionType')">
+          <el-input v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')"></el-input>
+        </el-form-item>
+        <!-- <el-form-item :label="$t('code.productName')">
+          <el-select v-model="dataForm.productId" :placeholder="$t('code.productName')" @change="gerCharacteristics">
+            <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item> -->
+        <!-- <el-form-item :label="$t('code.inspectionType')">
+          <el-select v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')">
+            <el-option v-for="item in inspectionTypeList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item> -->
+        <!--
+        <el-form-item :label="$t('code.characteristics')">
+          <el-input v-model="dataForm.characteristicsId" :placeholder="$t('code.characteristics')"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('code.sampleSize')">
+          <el-input v-model="dataForm.sampleSize" :placeholder="$t('code.sampleSize')"></el-input>
+        </el-form-item> -->
+        <el-form-item>
+          <el-button type="primary" @click="getData">查询</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div id="priceMain" :style="{ width: '100%', height: '500px' }" />
+  </el-card>
+</template>
+
+<script>
+// import available from "./components/gageAvailable.vue"
+import i18n from "@/i18n"
+import * as echarts from 'echarts';
+export default {
+  data() {
+    return {
+      myChart: null,
+      urlOptions: {
+        getDataListURL: "/code/shipmentRegistration/pareto/diagram",
+        getFactoryURL: '/code/shipmentRegistration/query/factory',
+        getProductURL: '/code/shipmentRegistration/query/product',
+        getInspectionTypeURL: '/code/shipmentRegistration/query/inspection/type',
+        getPurchaseRegistrationTypeURL: '/code/shipmentRegistration/query/checkout/project',
+      },
+      factoryList: [],
+      productList:[],
+      listQuery: {
+        characteristicsId:null,
+        factoryId: null,
+        inspectionType: null,
+        productId: null,
+        sampleSize: null,
+        endTime: null,
+        startTime: null,
+      },
+      dataForm: {
+        productId: null,
+        timeSlot: [],
+        factoryId: null,
+        characteristicsId: null,
+        inspectionType: null,
+        sampleSize:null
+      },
+      selectOptions: [{
+            id: 0,
+            name: '监控'
+          },
+            {
+              id: 1,
+              name: '电芯来料检验'
+            },
+            {
+              id: 2,
+              lname: 'IQC抽检'
+            },
+            {
+              id: 3,
+              name: 'IQC抽检2'
+            },
+            {
+              id: 4,
+              name: '原料抽检'
+            },
+            {
+              id: 5,
+              name: '进货外观检验'
+            },
+            {
+              id: 6,
+              name: '库内原料检验'
+            },
+            {
+              id: 7,
+              name: '来料检验'
+            },
+            {
+              id: 8,
+              name: '胶片'
+            },
+            {
+              id: 9,
+              name: '抽检'
+            },
+            {
+              id: 10,
+              name: '巡检'
+            }, {
+              id: 11,
+              name: '首检'
+            },
+            {
+              id: 12,
+              name: '末检'
+            },
+            {
+              id: 13,
+              name: '实时监测'
+            },
+            {
+              id: 14,
+              name: 'FQC抽检'
+            },
+            {
+              id: 15,
+              name: 'OQC抽检'
+            },
+          ],
+    };
+  },
+  // components: {
+  //   AddOrUpdate,
+  // },
+  mounted() {
+    this.getData()
+    // this.getDict()
+  },
+  methods: {
+    selectChanged(val) {
+      console.log(val)
+      alert(JSON.stringify(val))
+    },
+    getFactory(val) {
+      console.log(val)
+      this.$http.get(this.urlOptions.getFactoryURL, {
+        params: {
+          startTime: val[0],
+          endTime: val[1]
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.factoryList = res.data.map((item) => {
+              return {
+                id: item.factoryId,
+                name: item.factoryName
+              }
+            })
+          }
+        })
+      this.$http.get(this.urlOptions.getProductURL, {
+        params: {
+          startTime: val[0],
+          endTime: val[1]
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.productList = res.data.map((item) => {
+              return {
+                id: item.productId,
+                name: item.productName
+              }
+            })
+          }
+        })
+    },
+    getInspectionType(val) {
+      this.$http.get(this.urlOptions.getInspectionTypeURL, {
+        params: {
+          startTime: this.dataForm.timeSlot[0],
+          endTime: this.dataForm.timeSlot[1],
+          factoryId: val
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.dataForm.inspectionType = res.data.inspectionType
+          }
+        })
+    },
+    // gerCharacteristics(val) {
+    //   this.$http.get(this.urlOptions.getPurchaseRegistrationTypeURL, {
+    //     params: {
+    //       productId:val
+    //     },
+    //   })
+    //     .then(({ data: res }) => {
+    //       if (res.code === 0) {
+    //         this.dataForm.characteristicsId = res.data.parameterName
+    //       }
+    //     })
+    // },
+    getData() {
+      this.$http
+        .post(this.urlOptions.getDataListURL, {
+          params: this.listQuery
+        }
+        )
+        .then(({ data: res }) => {
+          console.log(res)
+          var chartDom = document.getElementById('priceMain');
+          var myChart = echarts.init(chartDom)
+          this.myChart = myChart
+          var option;
+          // myChart.on('click', function (params) {
+          //   console.log(params);
+          // });
+          myChart.on('click', 'xAxis.category', function (params) {
+            console.log(params);
+          });
+          option = {
+            title: {
+              text:'帕累托图'
+            },
+            tooltip: {
+              formatter: (params) => {
+                // 打印确认params是对象还是数组
+                console.log(params)
+                // 对象：取鼠标悬浮当前项索引params.dataIndex
+                // 数组：取鼠标悬浮当前项索引params[0].dataIndex
+                let index = params.dataIndex
+                let obj = res.data[index] // 通过索引取当前项完整的接口返回值
+                let str = `缺陷数量:${obj.number}<br/>
+			        缺陷率${obj.defectRate}<br/>`
+                return str
+              }
+            },
+            xAxis: {
+              data: res.data.map(i => { return i.propertyName })
+            },
+            yAxis: [{
+              type: 'value',
+              name: '缺陷数量',
+              show: true,
+              interval: 10,
+              axisLine: {
+                lineStyle: {
+                  color: '#5e859e',
+                  width: 2
+                }
+              }
+            }],
+            series: [{
+              name: '缺陷率',
+              type: 'bar',
+              barWidth: '50%',
+              data: res.data.map(i => { return i.defectRate })
+            }, {
+              name: '缺陷数量',
+              type: 'line',
+              smooth: true,
+              data: res.data.map(i => { return i.number })
+            }]
+          };
+          option && myChart.setOption(option);
+        })
+    },
+    buttonClick(val) {
+      console.log(val)
+      switch (val.btnName) {
+        case "search":
+          // this.dataForm.sampleSize = val.sampleSize ? val.sampleSize : null
+          this.dataForm.inspectionType = val.inspectionType ? val.inspectionType : null
+          // this.dataForm.characteristicsId = val.characteristicsId ? val.characteristicsId : null
+          this.dataForm.factoryId = val.factoryId ? val.factoryId : null
+          // this.dataForm.productId = val.productId ? val.productId : null
+          this.dataForm.startTime = val.timeSlot ? val.timeSlot[0] : null
+          this.dataForm.endTime = val.timeSlot ? val.timeSlot[1] : null
+          this.getData()
+          break;
+
+        default:
+          console.log(val)
+      }
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/shipment/scatterPlot.vue b/src/views/modules/shipment/scatterPlot.vue
new file mode 100644
index 0000000..84d7cc9
--- /dev/null
+++ b/src/views/modules/shipment/scatterPlot.vue
@@ -0,0 +1,303 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-01-11 09:24:58
+ * @LastEditTime: 2023-06-20 15:55:57
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__user">
+      <el-form :inline="true" :model="dataForm" class="demo-form-inline">
+        <el-form-item :label="$t('code.inspectionTime')" prop="timeSlot">
+          <el-date-picker v-model="dataForm.timeSlot" size="small" type="datetimerange" format='yyyy-MM-dd HH:mm:ss'
+            @change="getFactory" valueFormat='yyyy-MM-ddTHH:mm:ss' :start-placeholder="$t('gage.startTime')"
+            :end-placeholder="$t('gage.endTime')" :range-separator="$t('gage.to')" clearable />
+        </el-form-item>
+        <el-form-item :label="$t('code.factoryName')">
+          <el-select v-model="dataForm.factoryId" :placeholder="$t('code.factoryName')" @change="getInspectionType">
+            <el-option v-for="item in factoryList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('code.productName')">
+          <el-select v-model="dataForm.productId" :placeholder="$t('code.productName')" @change="gerCharacteristics">
+            <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <!-- <el-form-item :label="$t('code.inspectionType')">
+          <el-select v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')">
+            <el-option v-for="item in inspectionTypeList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item> -->
+        <el-form-item :label="$t('code.inspectionType')">
+          <el-input v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('code.characteristics')">
+          <el-input v-model="dataForm.characteristicsId" :placeholder="$t('code.characteristics')"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('code.sampleSize')">
+          <el-input v-model="dataForm.sampleSize" :placeholder="$t('code.sampleSize')"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getData">查询</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div id="priceMain" :style="{ width: '100%', height: '500px' }" />
+  </el-card>
+</template>
+
+<script>
+// import available from "./components/gageAvailable.vue"
+import i18n from "@/i18n"
+import * as echarts from 'echarts';
+export default {
+  data() {
+    return {
+      myChart: null,
+      urlOptions: {
+        getDataListURL: "/code/shipmentRegistration/phase/diagram",
+        getFactoryURL: '/code/shipmentRegistration/query/factory',
+        getProductURL: '/code/shipmentRegistration/query/product',
+        getInspectionTypeURL: '/code/shipmentRegistration/query/inspection/type',
+        getPurchaseRegistrationTypeURL: '/code/shipmentRegistration/query/checkout/project',
+      },
+      factoryList: [],
+      productList:[],
+      listQuery: {
+        characteristicsId:null,
+        factoryId: null,
+        inspectionType: null,
+        productId: null,
+        sampleSize: null,
+        endTime: null,
+        startTime: null,
+      },
+      dataForm: {
+        productId: null,
+        timeSlot: [],
+        factoryId: null,
+        characteristicsId: null,
+        inspectionType: null,
+        sampleSize:null
+      },
+      selectOptions: [{
+            id: 0,
+            name: '监控'
+          },
+            {
+              id: 1,
+              name: '电芯来料检验'
+            },
+            {
+              id: 2,
+              lname: 'IQC抽检'
+            },
+            {
+              id: 3,
+              name: 'IQC抽检2'
+            },
+            {
+              id: 4,
+              name: '原料抽检'
+            },
+            {
+              id: 5,
+              name: '进货外观检验'
+            },
+            {
+              id: 6,
+              name: '库内原料检验'
+            },
+            {
+              id: 7,
+              name: '来料检验'
+            },
+            {
+              id: 8,
+              name: '胶片'
+            },
+            {
+              id: 9,
+              name: '抽检'
+            },
+            {
+              id: 10,
+              name: '巡检'
+            }, {
+              id: 11,
+              name: '首检'
+            },
+            {
+              id: 12,
+              name: '末检'
+            },
+            {
+              id: 13,
+              name: '实时监测'
+            },
+            {
+              id: 14,
+              name: 'FQC抽检'
+            },
+            {
+              id: 15,
+              name: 'OQC抽检'
+            },
+          ],
+    };
+  },
+  // components: {
+  //   AddOrUpdate,
+  // },
+  mounted() {
+    this.getData()
+    // this.getDict()
+  },
+  methods: {
+    selectChanged(val) {
+      console.log(val)
+      alert(JSON.stringify(val))
+    },
+    getFactory(val) {
+      console.log(val)
+      this.$http.get(this.urlOptions.getFactoryURL, {
+        params: {
+          startTime: val[0],
+          endTime: val[1]
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.factoryList = res.data.map((item) => {
+              return {
+                id: item.factoryId,
+                name: item.factoryName
+              }
+            })
+          }
+        })
+      this.$http.get(this.urlOptions.getProductURL, {
+        params: {
+          startTime: val[0],
+          endTime: val[1]
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.productList = res.data.map((item) => {
+              return {
+                id: item.productId,
+                name: item.productName
+              }
+            })
+          }
+        })
+    },
+    getInspectionType(val) {
+      this.$http.get(this.urlOptions.getInspectionTypeURL, {
+        params: {
+          startTime: this.dataForm.timeSlot[0],
+          endTime: this.dataForm.timeSlot[1],
+          factoryId: val
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.dataForm.inspectionType = res.data.inspectionType
+          }
+        })
+    },
+    gerCharacteristics(val) {
+      this.$http.get(this.urlOptions.getPurchaseRegistrationTypeURL, {
+        params: {
+          productId:val
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.dataForm.characteristicsId = res.data.parameterName
+          }
+        })
+    },
+    getData() {
+      this.$http
+        .post(this.urlOptions.getDataListURL, {
+          params: this.listQuery
+        }
+        )
+        .then(({ data: res }) => {
+          console.log(res)
+          let xAxisData = []
+          var chartDom = document.getElementById('priceMain');
+          var myChart = echarts.init(chartDom)
+          this.myChart = myChart
+          var option;
+          // myChart.on('click', function (params) {
+          //   console.log(params);
+          // });
+          myChart.on('click', 'xAxis.category', function (params) {
+            console.log(params);
+          });
+          option = {
+            title: {
+              text:'散点图'
+            },
+            tooltip: {
+              trigger: 'axis'
+            },
+            // legend: {
+            //   data: ['推移图']
+            // },
+            grid: {
+              left: '3%',
+              right: '4%',
+              bottom: '3%',
+              containLabel: true
+            },
+            xAxis: {
+              data: res.data.abscissaList,
+              type: 'category',
+              axisLabel: {
+                clickable: true
+              },
+              silent: false,
+              triggerEvent: true
+            },
+            yAxis: {
+              type: 'value'
+            },
+            series: [{
+              name: '缺陷率',
+              type: 'bar',
+              barWidth: '50%',
+              data: res.data.ordinateList
+            }]
+          };
+          option && myChart.setOption(option);
+        })
+    },
+    buttonClick(val) {
+      console.log(val)
+      switch (val.btnName) {
+        case "search":
+          this.dataForm.sampleSize = val.sampleSize ? val.sampleSize : null
+          this.dataForm.inspectionType = val.inspectionType ? val.inspectionType : null
+          this.dataForm.characteristicsId = val.characteristicsId ? val.characteristicsId : null
+          this.dataForm.factoryId = val.factoryId ? val.factoryId : null
+          this.dataForm.productId = val.productId ? val.productId : null
+          this.dataForm.startTime = val.timeSlot ? val.timeSlot[0] : null
+          this.dataForm.endTime = val.timeSlot ? val.timeSlot[1] : null
+          this.getData()
+          break;
+
+        default:
+          console.log(val)
+      }
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/shipment/stageDiagram.vue b/src/views/modules/shipment/stageDiagram.vue
new file mode 100644
index 0000000..f507d0e
--- /dev/null
+++ b/src/views/modules/shipment/stageDiagram.vue
@@ -0,0 +1,298 @@
+
+<!--
+ * @Author: zhp
+ * @Date: 2023-01-11 09:24:58
+ * @LastEditTime: 2023-06-20 15:56:04
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__user">
+      <el-form :inline="true" :model="dataForm" class="demo-form-inline">
+        <el-form-item :label="$t('code.inspectionTime')" prop="timeSlot">
+          <el-date-picker v-model="dataForm.timeSlot" size="small" type="datetimerange" format='yyyy-MM-dd HH:mm:ss'
+            @change="getFactory" valueFormat='yyyy-MM-ddTHH:mm:ss' :start-placeholder="$t('gage.startTime')"
+            :end-placeholder="$t('gage.endTime')" :range-separator="$t('gage.to')" clearable />
+        </el-form-item>
+        <el-form-item :label="$t('code.factoryName')">
+          <el-select v-model="dataForm.factoryId" :placeholder="$t('code.factoryName')" @change="getInspectionType">
+            <el-option v-for="item in factoryList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('code.productName')">
+          <el-select v-model="dataForm.productId" :placeholder="$t('code.productName')" @change="gerCharacteristics">
+            <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <!-- <el-form-item :label="$t('code.inspectionType')">
+          <el-select v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')">
+            <el-option v-for="item in inspectionTypeList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item> -->
+        <el-form-item :label="$t('code.inspectionType')">
+          <el-input v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('code.characteristics')">
+          <el-input v-model="dataForm.characteristicsId" :placeholder="$t('code.characteristics')"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('code.sampleSize')">
+          <el-input v-model="dataForm.sampleSize" :placeholder="$t('code.sampleSize')"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getData">查询</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div id="priceMain" :style="{ width: '100%', height: '500px' }" />
+  </el-card>
+</template>
+
+<script>
+// import available from "./components/gageAvailable.vue"
+import i18n from "@/i18n"
+import * as echarts from 'echarts';
+export default {
+  data() {
+    return {
+      myChart: null,
+      urlOptions: {
+        getDataListURL: "/code/shipmentRegistration/phase/diagram",
+        getFactoryURL: '/code/shipmentRegistration/query/factory',
+        getProductURL: '/code/shipmentRegistration/query/product',
+        getInspectionTypeURL: '/code/shipmentRegistration/query/inspection/type',
+        getPurchaseRegistrationTypeURL: '/code/shipmentRegistration/query/checkout/project',
+      },
+      factoryList: [],
+      productList:[],
+      listQuery: {
+        characteristicsId:null,
+        factoryId: null,
+        inspectionType: null,
+        productId: null,
+        sampleSize: null,
+        endTime: null,
+        startTime: null,
+      },
+      dataForm: {
+        productId: null,
+        timeSlot: [],
+        factoryId: null,
+        characteristicsId: null,
+        inspectionType: null,
+        sampleSize:null
+      },
+      selectOptions: [{
+            id: 0,
+            name: '监控'
+          },
+            {
+              id: 1,
+              name: '电芯来料检验'
+            },
+            {
+              id: 2,
+              lname: 'IQC抽检'
+            },
+            {
+              id: 3,
+              name: 'IQC抽检2'
+            },
+            {
+              id: 4,
+              name: '原料抽检'
+            },
+            {
+              id: 5,
+              name: '进货外观检验'
+            },
+            {
+              id: 6,
+              name: '库内原料检验'
+            },
+            {
+              id: 7,
+              name: '来料检验'
+            },
+            {
+              id: 8,
+              name: '胶片'
+            },
+            {
+              id: 9,
+              name: '抽检'
+            },
+            {
+              id: 10,
+              name: '巡检'
+            }, {
+              id: 11,
+              name: '首检'
+            },
+            {
+              id: 12,
+              name: '末检'
+            },
+            {
+              id: 13,
+              name: '实时监测'
+            },
+            {
+              id: 14,
+              name: 'FQC抽检'
+            },
+            {
+              id: 15,
+              name: 'OQC抽检'
+            },
+          ],
+    };
+  },
+  // components: {
+  //   AddOrUpdate,
+  // },
+  mounted() {
+    this.getData()
+    // this.getDict()
+  },
+  methods: {
+    selectChanged(val) {
+      console.log(val)
+      alert(JSON.stringify(val))
+    },
+    getFactory(val) {
+      console.log(val)
+      this.$http.get(this.urlOptions.getFactoryURL, {
+        params: {
+          startTime: val[0],
+          endTime: val[1]
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.factoryList = res.data.map((item) => {
+              return {
+                id: item.factoryId,
+                name: item.factoryName
+              }
+            })
+          }
+        })
+      this.$http.get(this.urlOptions.getProductURL, {
+        params: {
+          startTime: val[0],
+          endTime: val[1]
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.productList = res.data.map((item) => {
+              return {
+                id: item.productId,
+                name: item.productName
+              }
+            })
+          }
+        })
+    },
+    getInspectionType(val) {
+      this.$http.get(this.urlOptions.getInspectionTypeURL, {
+        params: {
+          startTime: this.dataForm.timeSlot[0],
+          endTime: this.dataForm.timeSlot[1],
+          factoryId: val
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.dataForm.inspectionType = res.data.inspectionType
+          }
+        })
+    },
+    gerCharacteristics(val) {
+      this.$http.get(this.urlOptions.getPurchaseRegistrationTypeURL, {
+        params: {
+          productId:val
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.dataForm.characteristicsId = res.data.parameterName
+          }
+        })
+    },
+    getData() {
+      this.$http
+        .post(this.urlOptions.getDataListURL, {
+          params: this.listQuery
+        }
+        )
+        .then(({ data: res }) => {
+          console.log(res)
+          let xAxisData = []
+          var chartDom = document.getElementById('priceMain');
+          var myChart = echarts.init(chartDom)
+          this.myChart = myChart
+          var option;
+          // myChart.on('click', function (params) {
+          //   console.log(params);
+          // });
+          myChart.on('click', 'xAxis.category', function (params) {
+            console.log(params);
+          });
+          option = {
+            title: {
+              text:'阶段图'
+            },
+            tooltip: {
+              trigger: 'axis'
+            },
+            // legend: {
+            //   data: ['推移图']
+            // },
+            grid: {
+              left: '3%',
+              right: '4%',
+              bottom: '3%',
+              containLabel: true
+            },
+            xAxis: {
+              data: res.data.purchaseRegistrationCharacteristicsDTOList.length,
+              type: 'category',
+              axisLabel: {
+                clickable: true
+              },
+              silent: false,
+              triggerEvent: true
+            },
+            yAxis: {
+              type: 'value'
+            },
+          };
+          option && myChart.setOption(option);
+        })
+    },
+    buttonClick(val) {
+      console.log(val)
+      switch (val.btnName) {
+        case "search":
+          this.dataForm.sampleSize = val.sampleSize ? val.sampleSize : null
+          this.dataForm.inspectionType = val.inspectionType ? val.inspectionType : null
+          this.dataForm.characteristicsId = val.characteristicsId ? val.characteristicsId : null
+          this.dataForm.factoryId = val.factoryId ? val.factoryId : null
+          this.dataForm.productId = val.productId ? val.productId : null
+          this.dataForm.startTime = val.timeSlot ? val.timeSlot[0] : null
+          this.dataForm.endTime = val.timeSlot ? val.timeSlot[1] : null
+          this.getData()
+          break;
+
+        default:
+          console.log(val)
+      }
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/shipment/trendChart.vue b/src/views/modules/shipment/trendChart.vue
new file mode 100644
index 0000000..04dd565
--- /dev/null
+++ b/src/views/modules/shipment/trendChart.vue
@@ -0,0 +1,319 @@
+
+<!--
+ * @Author: zhp
+ * @Date: 2023-01-11 09:24:58
+ * @LastEditTime: 2023-06-20 15:56:14
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__user">
+      <el-form :inline="true" :model="dataForm" class="demo-form-inline">
+        <el-form-item :label="$t('code.inspectionTime')" prop="timeSlot">
+          <el-date-picker v-model="dataForm.timeSlot" size="small" type="datetimerange" format='yyyy-MM-dd HH:mm:ss'
+            @change="getFactory" valueFormat='yyyy-MM-ddTHH:mm:ss' :start-placeholder="$t('gage.startTime')"
+            :end-placeholder="$t('gage.endTime')" :range-separator="$t('gage.to')" clearable />
+        </el-form-item>
+        <el-form-item :label="$t('code.factoryName')">
+          <el-select v-model="dataForm.factoryId" :placeholder="$t('code.factoryName')" @change="getInspectionType">
+            <el-option v-for="item in factoryList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('code.productName')">
+          <el-select v-model="dataForm.productId" :placeholder="$t('code.productName')" @change="gerCharacteristics">
+            <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <!-- <el-form-item :label="$t('code.inspectionType')">
+          <el-select v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')">
+            <el-option v-for="item in inspectionTypeList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item> -->
+        <el-form-item :label="$t('code.inspectionType')">
+          <el-input v-model="dataForm.inspectionType" :placeholder="$t('code.inspectionType')"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('code.characteristics')">
+          <el-select v-model="dataForm.characteristicsId" :placeholder="$t('code.characteristics')">
+            <el-option v-for="item in characteristicsList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('code.sampleSize')">
+          <el-input v-model="dataForm.sampleSize" :placeholder="$t('code.sampleSize')"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getData">查询</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div id="priceMain" :style="{ width: '100%', height: '500px' }" />
+  </el-card>
+</template>
+
+<script>
+// import available from "./components/gageAvailable.vue"
+import i18n from "@/i18n"
+import * as echarts from 'echarts';
+export default {
+  data() {
+    return {
+      myChart: null,
+      urlOptions: {
+        getDataListURL: "/code/shipmentRegistration/transition/diagram",
+        getFactoryURL: '/code/shipmentRegistration/query/factory',
+        getProductURL: '/code/shipmentRegistration/query/product',
+        getInspectionTypeURL: '/code/shipmentRegistration/query/inspection/type',
+        getPurchaseRegistrationTypeURL: '/code/shipmentRegistration/query/checkout/project',
+      },
+      factoryList: [],
+      productList: [],
+      characteristicsList:[],
+      listQuery: {
+        characteristicsId: null,
+        factoryId: null,
+        inspectionType: null, 
+        productId: null,
+        sampleSize: null,
+        endTime: null,
+        startTime: null,
+      },
+      dataForm: {
+        productId: null,
+        timeSlot: [],
+        factoryId: null,
+        characteristicsId: null,
+        inspectionType: null,
+        sampleSize: null
+      },
+      selectOptions: [{
+        id: 0,
+        name: '监控'
+      },
+      {
+        id: 1,
+        name: '电芯来料检验'
+      },
+      {
+        id: 2,
+        lname: 'IQC抽检'
+      },
+      {
+        id: 3,
+        name: 'IQC抽检2'
+      },
+      {
+        id: 4,
+        name: '原料抽检'
+      },
+      {
+        id: 5,
+        name: '进货外观检验'
+      },
+      {
+        id: 6,
+        name: '库内原料检验'
+      },
+      {
+        id: 7,
+        name: '来料检验'
+      },
+      {
+        id: 8,
+        name: '胶片'
+      },
+      {
+        id: 9,
+        name: '抽检'
+      },
+      {
+        id: 10,
+        name: '巡检'
+      }, {
+        id: 11,
+        name: '首检'
+      },
+      {
+        id: 12,
+        name: '末检'
+      },
+      {
+        id: 13,
+        name: '实时监测'
+      },
+      {
+        id: 14,
+        name: 'FQC抽检'
+      },
+      {
+        id: 15,
+        name: 'OQC抽检'
+      },
+      ],
+    };
+  },
+  // components: {
+  //   AddOrUpdate,
+  // },
+  mounted() {
+    this.getData()
+    // this.getDict()
+  },
+  methods: {
+    selectChanged(val) {
+      console.log(val)
+      alert(JSON.stringify(val))
+    },
+    getFactory(val) {
+      console.log(val)
+      this.$http.get(this.urlOptions.getFactoryURL, {
+        params: {
+          startTime: val[0],
+          endTime: val[1]
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.factoryList = res.data.map((item) => {
+              return {
+                id: item.factoryId,
+                name: item.factoryName
+              }
+            })
+          }
+        })
+      this.$http.get(this.urlOptions.getProductURL, {
+        params: {
+          startTime: val[0],
+          endTime: val[1]
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.productList = res.data.map((item) => {
+              return {
+                id: item.productId,
+                name: item.productName
+              }
+            })
+          }
+        })
+    },
+    getInspectionType(val) {
+      this.$http.get(this.urlOptions.getInspectionTypeURL, {
+        params: {
+          startTime: this.dataForm.timeSlot[0],
+          endTime: this.dataForm.timeSlot[1],
+          factoryId: val
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.dataForm.inspectionType = res.data.inspectionType
+          }
+        })
+    },
+    gerCharacteristics(val) {
+      this.$http.get(this.urlOptions.getPurchaseRegistrationTypeURL, {
+        params: {
+          productId: val
+        },
+      })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            this.characteristicsList[0].id = res.data.id
+            this.characteristicsList[0].name = res.data.parameterName
+
+          }
+        })
+    },
+    getData() {
+      this.$http
+        .post(this.urlOptions.getDataListURL, {
+          params: this.listQuery
+        }
+        )
+        .then(({ data: res }) => {
+          console.log(res)
+          let xAxisData = []
+          let yAxisData = []
+          res.data.purchaseRegistrationCharacteristicsDTOList.forEach(ele => {
+            xAxisData.push(ele.batchNo + ele.groupNo)
+          })
+          res.data.purchaseRegistrationCharacteristicsDTOList.forEach(ele => {
+            yAxisData.push(ele.countValue)
+          })
+          var chartDom = document.getElementById('priceMain');
+          var myChart = echarts.init(chartDom)
+          this.myChart = myChart
+          var option;
+          // myChart.on('click', function (params) {
+          //   console.log(params);
+          // });
+          myChart.on('click', 'xAxis.category', function (params) {
+            console.log(params);
+          });
+          option = {
+            title: {
+              text: '推移图'
+            },
+            tooltip: {
+              trigger: 'axis'
+            },
+            // legend: {
+            //   data: ['推移图']
+            // },
+            grid: {
+              left: '3%',
+              right: '4%',
+              bottom: '3%',
+              containLabel: true
+            },
+            xAxis: {
+              data: res.data.map(i => { return i.batchNo + i.groupNo }),
+              type: 'category',
+              axisLabel: {
+                clickable: true
+              },
+              silent: false,
+              triggerEvent: true
+            },
+            yAxis: {
+              type: 'value'
+            },
+            series: [
+              {
+                name: '计数型值',
+                type: 'line',
+                stack: 'Total',
+                data: res.data.map(i => { return i.countValue })
+              }
+            ]
+          };
+          option && myChart.setOption(option);
+        })
+    },
+    buttonClick(val) {
+      console.log(val)
+      switch (val.btnName) {
+        case "search":
+          this.dataForm.sampleSize = val.sampleSize ? val.sampleSize : null
+          this.dataForm.inspectionType = val.inspectionType ? val.inspectionType : null
+          this.dataForm.characteristicsId = val.characteristicsId ? val.characteristicsId : null
+          this.dataForm.factoryId = val.factoryId ? val.factoryId : null
+          this.dataForm.productId = val.productId ? val.productId : null
+          this.dataForm.startTime = val.timeSlot ? val.timeSlot[0] : null
+          this.dataForm.endTime = val.timeSlot ? val.timeSlot[1] : null
+          this.getData()
+          break;
+
+        default:
+          console.log(val)
+      }
+    },
+  }
+};
+</script>
diff --git a/src/views/modules/supplier/components/evaluationItemList-add.vue b/src/views/modules/supplier/components/evaluationItemList-add.vue
new file mode 100644
index 0000000..b65c8cd
--- /dev/null
+++ b/src/views/modules/supplier/components/evaluationItemList-add.vue
@@ -0,0 +1,205 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-02-14 15:02:26
+ * @LastEditTime: 2023-06-05 16:38:54
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
+    <el-form-item prop="code" :label="$t('supplier.code')">
+      <el-input v-model="dataForm.code" :placeholder="$t('supplier.code')">
+      </el-input>
+    </el-form-item>
+    <el-form-item prop="title" :label="$t('supplier.title')">
+      <el-input v-model="dataForm.title" :placeholder="$t('supplier.title')">
+      </el-input>
+    </el-form-item>
+    <el-form-item prop="projectTypeId" :label="$t('supplier.projectTypeName')">
+      <el-select v-model="dataForm.projectTypeId" :placeholder="$t('supplier.projectTypeName')">
+        <el-option v-for="item in projectTypeList" :key="item.id" :label="item.name" :value="item.id">
+        </el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item prop="requirement" :label="$t('supplier.requirement')">
+      <el-input v-model="dataForm.requirement" :placeholder="$t('supplier.requirement')">
+      </el-input>
+    </el-form-item>
+    <el-form-item prop="statisticalValue" :label="$t('supplier.statisticalValue')">
+      <K v-model="dataForm.closedLoop" :active-value="1" :inactive-value="0">
+      </K>
+    </el-form-item>
+  </el-form>
+</template>
+
+<script>
+import debounce from "lodash/debounce";
+import basicAdd from "@/mixins/basic-add";
+export default {
+  mixins: [basicAdd],
+  data() {
+    return {
+      urlOptions: {
+        submitURL: "/supplier/qmsEvaluationItemList",
+        infoURL: "/supplier/qmsEvaluationItemList/{id}",
+        getProjectTypeURL: '/supplier/qmsProjectType/page',
+        getCodeURL: '/supplier/qmsEvaluationItemList/getCode'
+      },
+      options: [{
+        value: 0,
+        label: '不可用'
+      },
+      {
+        value: 1,
+        label: '可用'
+        }],
+      supplierList:null,
+      enterpriseNatureList: [
+        {
+          value: 0,
+          label: '私营'
+        },
+        {
+          value: 1,
+          label: '国有'
+        },
+           {
+          value: 2,
+          label: '外资'
+        },
+           {
+          value: 3,
+          label: '其他'
+        }
+      ],
+      projectTypeList:[],
+      visible: false,
+      listQuery: {
+        limit: 999,
+        page:1
+      },
+      dataForm: {
+        id: "",
+        title:null,
+        projectTypeId: undefined,
+        requirement: null,
+        statisticalValue: null,
+
+      },
+    };
+  },
+  computed: {
+    dataRule() {
+      return {
+        // dictLabel: [
+        //   {
+        //     required: true,
+        //     message: this.$t("validate.required"),
+        //     trigger: "blur",
+        //   },
+        // ],
+        // dictValue: [
+        //   {
+        //     required: true,
+        //     message: this.$t("validate.required"),
+        //     trigger: "blur",
+        //   },
+        // ],
+        // sort: [
+        //   {
+        //     required: true,
+        //     message: this.$t("validate.required"),
+        //     trigger: "blur",
+        //   },
+        // ],
+      };
+    },
+  },
+  methods: {
+    init(data,) {
+      console.log(data)
+      console.log(this.dataForm.projectTypeId)
+      // this.dataForm.dictTypeId = dictTypeId || "";
+      this.visible = true;
+      this.$nextTick(() => {
+        this.$refs["dataForm"].resetFields()
+        if (data) {
+          this.dataForm.id = data.id ? data.id : ''
+          this.dataForm.projectTypeId = data.projectTypeId ? data.projectTypeId : ''
+        }
+        if (this.dataForm.id) {
+          this.getInfo()
+        } else {
+          this.getCode()
+        }
+      });
+    },
+    getCode() {
+      this.$http
+        .get(this.urlOptions.getProjectTypeURL, { params: this.listQuery })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res.data);
+            this.projectTypeList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+      this.$http
+        .post(this.urlOptions.getCodeURL)
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.dataForm.code = res.data
+          }
+        })
+        .catch(() => {
+        })
+    },
+    // 获取信息
+    getInfo() {
+      this.$http
+        .get(`/supplier/qmsEvaluationItemList/${this.dataForm.id}`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          }
+          this.dataForm = {
+            ...this.dataForm,
+            ...res.data,
+          };
+        })
+        .catch(() => {});
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(
+      function () {
+        this.$refs["dataForm"].validate((valid) => {
+          if (!valid) {
+            return false;
+          }
+          this.$http[!this.dataForm.id ? "post" : "put"](this.urlOptions.submitURL, this.dataForm)
+            .then(({ data: res }) => {
+              if (res.code !== 0) {
+                return this.$message.error(res.msg);
+              }
+              this.$message({
+                message: this.$t("prompt.success"),
+                type: "success",
+                duration: 500,
+                onClose: () => {
+                  console.log(1111);
+                  this.visible = false;
+                  this.$emit("successSubmit");
+                },
+              });
+            })
+            .catch(() => {});
+        });
+      },
+      1000,
+      { leading: true, trailing: false }
+    ),
+  },
+};
+</script>
diff --git a/src/views/modules/supplier/components/levelSetting-add.vue b/src/views/modules/supplier/components/levelSetting-add.vue
new file mode 100644
index 0000000..a23c3b3
--- /dev/null
+++ b/src/views/modules/supplier/components/levelSetting-add.vue
@@ -0,0 +1,171 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-02-14 15:02:26
+ * @LastEditTime: 2023-06-16 14:22:14
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
+    <el-form-item prop="name" :label="$t('basic.name')">
+      <el-input v-model="dataForm.name" :placeholder="$t('basic.name')"></el-input>
+    </el-form-item>
+    <el-form-item prop="online" :label="$t('supplier.online')">
+      <el-input v-model="dataForm.online" :placeholder="$t('supplier.online')"></el-input>
+    </el-form-item>
+    <el-form-item prop="offline" :label="$t('supplier.offline')">
+      <el-input v-model="dataForm.offline" :placeholder="$t('supplier.offline')"></el-input>
+    </el-form-item>
+    <!-- <el-form-item prop="productTypeStatus" :label="$t('basic.status')">
+      <el-select v-model="dataForm.productTypeStatus" :placeholder="$t('basic.status')">
+        <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
+        </el-option>
+      </el-select>
+    </el-form-item> -->
+  </el-form>
+</template>
+
+<script>
+import debounce from "lodash/debounce";
+import basicAdd from "@/mixins/basic-add";
+export default {
+  mixins: [basicAdd],
+  data() {
+    return {
+      urlOptions: {
+        submitURL: "/supplier/qmsLevelSetting",
+        infoURL: "/supplier/qmsLevelSetting/{id}"
+        // getTypeListURL: '/basic/qmsProductType/page'
+      },
+      options: [{
+        value: 0,
+        label: '不可用'
+      },
+      {
+        value: 1,
+        label: '可用'
+      }],
+      typeList:[],
+      visible: false,
+      listQuery: {
+        limit: 999,
+        page:1
+      },
+      dataForm: {
+        id: "",
+        name: null,
+        offline: null,
+        online: null,
+      },
+    };
+  },
+  computed: {
+    dataRule() {
+      return {
+        // dictLabel: [
+        //   {
+        //     required: true,
+        //     message: this.$t("validate.required"),
+        //     trigger: "blur",
+        //   },
+        // ],
+        // dictValue: [
+        //   {
+        //     required: true,
+        //     message: this.$t("validate.required"),
+        //     trigger: "blur",
+        //   },
+        // ],
+        // sort: [
+        //   {
+        //     required: true,
+        //     message: this.$t("validate.required"),
+        //     trigger: "blur",
+        //   },
+        // ],
+      };
+    },
+  },
+  methods: {
+    init(id, ) {
+      this.dataForm.id = id || ""
+      // this.dataForm.dictTypeId = dictTypeId || "";
+      this.visible = true;
+      this.$nextTick(() => {
+        this.$refs["dataForm"].resetFields();
+        if (this.dataForm.id) {
+          this.getInfo();
+        } else {
+          // this.getCode()
+        }
+      });
+    },
+    // getCode() {
+    //   this.$http
+    //     .post(this.urlOptions.getCodeURL)
+    //     .then(({ data: res }) => {
+    //       if (res.code === 0) {
+    //         console.log(res);
+    //         this.dataForm.code = res.data
+    //       }
+    //     })
+    //     .catch(() => {
+    //     });
+    //   // this.$http
+    //   //   .get(this.urlOptions.getTypeListURL,this.listQuery )
+    //   //   .then(({ data: res }) => {
+    //   //     if (res.code === 0) {
+    //   //       console.log(res.data);
+    //   //       this.typeList = res.data.list
+    //   //     }
+    //   //   })
+    //   //   .catch(() => {
+    //   //   });
+    // },
+    // 获取信息
+    getInfo() {
+      this.$http
+        .get(`/supplier/qmsLevelSetting/${this.dataForm.id}`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          }
+          this.dataForm = {
+            ...this.dataForm,
+            ...res.data,
+          };
+        })
+        .catch(() => {});
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(
+      function () {
+        this.$refs["dataForm"].validate((valid) => {
+          if (!valid) {
+            return false;
+          }
+          this.$http[!this.dataForm.id ? "post" : "put"](this.urlOptions.submitURL, this.dataForm)
+            .then(({ data: res }) => {
+              if (res.code !== 0) {
+                return this.$message.error(res.msg);
+              }
+              this.$message({
+                message: this.$t("prompt.success"),
+                type: "success",
+                duration: 500,
+                onClose: () => {
+                  console.log(1111);
+                  this.visible = false;
+                  this.$emit("successSubmit");
+                },
+              });
+            })
+            .catch(() => {});
+        });
+      },
+      1000,
+      { leading: true, trailing: false }
+    ),
+  },
+};
+</script>
diff --git a/src/views/modules/supplier/components/levelSettingSearch.vue b/src/views/modules/supplier/components/levelSettingSearch.vue
new file mode 100644
index 0000000..2e53fd9
--- /dev/null
+++ b/src/views/modules/supplier/components/levelSettingSearch.vue
@@ -0,0 +1,129 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-02-21 14:44:31
+ * @LastEditTime: 2023-06-08 15:16:16
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
+    <el-form-item prop="code" :label="$t('basic.code')">
+      <el-input v-model="dataForm.code" :placeholder="$t('basic.code')" clearable></el-input>
+    </el-form-item>
+    <el-form-item prop="name" :label="$t('basic.name')">
+      <el-input v-model="dataForm.name" :placeholder="$t('basic.name')" clearable></el-input>
+    </el-form-item>
+  </el-form>
+</template>
+
+<script>
+import debounce from "lodash/debounce";
+import basicAdd from "@/mixins/basic-add";
+export default {
+  mixins: [basicAdd],
+  data() {
+    return {
+      // urlOptions: {
+      //   submitURL: "/sys/params/",
+      //   infoURL: "/sys/params",
+      // },
+      visible: false,
+      options: [{
+        value: '0',
+        label: '不可用'
+      },
+      {
+        value: '1',
+        label: '可用'
+      }],
+      dataForm: {
+        name: null,
+        code: null
+      },
+    };
+  },
+  computed: {
+    // dataRule() {
+    //   return {
+    //     paramCode: [
+    //       {
+    //         required: true,
+    //         message: this.$t("validate.required"),
+    //         trigger: "blur",
+    //       },
+    //     ],
+    //     paramValue: [
+    //       {
+    //         required: true,
+    //         message: this.$t("validate.required"),
+    //         trigger: "blur",
+    //       },
+    //     ],
+    //   };
+    // },
+  },
+  methods: {
+    // init(id) {
+    //   this.dataForm.id = id || "";
+    //   this.visible = true;
+    //   this.$nextTick(() => {
+    //     this.$refs["dataForm"].resetFields();
+    //     if (this.dataForm.id) {
+    //       this.getInfo();
+    //     }
+    //   });
+    // },
+    // 获取信息
+    // getInfo() {
+    //   this.$http
+    //     .get(`/sys/params/${this.dataForm.id}`)
+    //     .then(({ data: res }) => {
+    //       if (res.code !== 0) {
+    //         return this.$message.error(res.msg);
+    //       }
+    //       this.dataForm = {
+    //         ...this.dataForm,
+    //         ...res.data,
+    //       };
+    //     })
+    //     .catch(() => {});
+    // },
+    // 表单提交
+    handleConditionSearch() {
+      this.$emit("successSubmit", this.dataForm);
+    },
+    // dataFormSubmitHandle: debounce(
+    //   function () {
+    //     // console.log(1111);
+    //     // this.visible = false;
+    //     this.$emit("successSubmit", this.dataForm.key);
+    //     // this.$refs["dataForm"].validate((valid) => {
+    //     //   if (!valid) {
+    //     //     return false;
+    //     //   }
+    //     //   this.$http[!this.dataForm.id ? "post" : "put"](
+    //     //     "/sys/params",
+    //     //     this.dataForm
+    //     //   )
+    //     //     .then(({ data: res }) => {
+    //     //       if (res.code !== 0) {
+    //     //         return this.$message.error(res.msg);
+    //     //       }
+    //     //       this.$message({
+    //     //         message: this.$t("prompt.success"),
+    //     //         type: "success",
+    //     //         duration: 500,
+    //     //         onClose: () => {
+
+    //     //         },
+    //     //       });
+    //     //     })
+    //     //     .catch(() => {});
+    //     // });
+    //   },
+    //   1000,
+    //   { leading: true, trailing: false }
+    // ),
+  },
+};
+</script>
diff --git a/src/views/modules/supplier/components/projectType-add.vue b/src/views/modules/supplier/components/projectType-add.vue
new file mode 100644
index 0000000..cc02208
--- /dev/null
+++ b/src/views/modules/supplier/components/projectType-add.vue
@@ -0,0 +1,177 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-06-09 15:05:26
+ * @LastEditTime: 2023-06-09 15:05:26
+ * @LastEditors: zhp
+ * @Description: 
+-->
+
+<!--
+ * @Author: zhp
+ * @Date: 2023-02-14 15:02:26
+ * @LastEditTime: 2023-06-08 15:13:41
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
+    <el-form-item prop="code" :label="$t('basic.code')">
+      <el-input v-model="dataForm.code" :placeholder="$t('basic.code')"></el-input>
+    </el-form-item>
+    <el-form-item prop="name" :label="$t('basic.name')">
+      <el-input v-model="dataForm.name" :placeholder="$t('basic.name')"></el-input>
+    </el-form-item>
+    <!-- <el-form-item prop="productTypeStatus" :label="$t('basic.status')">
+      <el-select v-model="dataForm.productTypeStatus" :placeholder="$t('basic.status')">
+        <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
+        </el-option>
+      </el-select>
+    </el-form-item> -->
+  </el-form>
+</template>
+
+<script>
+import debounce from "lodash/debounce";
+import basicAdd from "@/mixins/basic-add";
+export default {
+  mixins: [basicAdd],
+  data() {
+    return {
+      urlOptions: {
+        submitURL: "/supplier/qmsProjectType",
+        infoURL: "/supplier/qmsProjectType/{id}",
+        getCodeURL: '/supplier/qmsProjectType/getCode',
+        // getTypeListURL: '/basic/qmsProductType/page'
+      },
+      options: [{
+        value: 0,
+        label: '不可用'
+      },
+      {
+        value: 1,
+        label: '可用'
+      }],
+      typeList:[],
+      visible: false,
+      listQuery: {
+        limit: 999,
+        page:1
+      },
+      dataForm: {
+        id: "",
+        code:null,
+        name: null,
+        supplierTypeStatus:null,
+      },
+    };
+  },
+  computed: {
+    dataRule() {
+      return {
+        // dictLabel: [
+        //   {
+        //     required: true,
+        //     message: this.$t("validate.required"),
+        //     trigger: "blur",
+        //   },
+        // ],
+        // dictValue: [
+        //   {
+        //     required: true,
+        //     message: this.$t("validate.required"),
+        //     trigger: "blur",
+        //   },
+        // ],
+        // sort: [
+        //   {
+        //     required: true,
+        //     message: this.$t("validate.required"),
+        //     trigger: "blur",
+        //   },
+        // ],
+      };
+    },
+  },
+  methods: {
+    init(id, ) {
+      this.dataForm.id = id || ""
+      // this.dataForm.dictTypeId = dictTypeId || "";
+      this.visible = true;
+      this.$nextTick(() => {
+        this.$refs["dataForm"].resetFields();
+        if (this.dataForm.id) {
+          this.getInfo();
+        } else {
+          this.getCode()
+        }
+      });
+    },
+    getCode() {
+      this.$http
+        .post(this.urlOptions.getCodeURL)
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res);
+            this.dataForm.code = res.data
+          }
+        })
+        .catch(() => {
+        });
+      // this.$http
+      //   .get(this.urlOptions.getTypeListURL,this.listQuery )
+      //   .then(({ data: res }) => {
+      //     if (res.code === 0) {
+      //       console.log(res.data);
+      //       this.typeList = res.data.list
+      //     }
+      //   })
+      //   .catch(() => {
+      //   });
+    },
+    // 获取信息
+    getInfo() {
+      this.$http
+        .get(`/supplier/qmsProjectType/${this.dataForm.id}`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          }
+          this.dataForm = {
+            ...this.dataForm,
+            ...res.data,
+          };
+        })
+        .catch(() => {});
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(
+      function () {
+        this.$refs["dataForm"].validate((valid) => {
+          if (!valid) {
+            return false;
+          }
+          this.$http[!this.dataForm.id ? "post" : "put"](this.urlOptions.submitURL, this.dataForm)
+            .then(({ data: res }) => {
+              if (res.code !== 0) {
+                return this.$message.error(res.msg);
+              }
+              this.$message({
+                message: this.$t("prompt.success"),
+                type: "success",
+                duration: 500,
+                onClose: () => {
+                  console.log(1111);
+                  this.visible = false;
+                  this.$emit("successSubmit");
+                },
+              });
+            })
+            .catch(() => {});
+        });
+      },
+      1000,
+      { leading: true, trailing: false }
+    ),
+  },
+};
+</script>
diff --git a/src/views/modules/supplier/components/projectTypeSearch.vue b/src/views/modules/supplier/components/projectTypeSearch.vue
new file mode 100644
index 0000000..ce13293
--- /dev/null
+++ b/src/views/modules/supplier/components/projectTypeSearch.vue
@@ -0,0 +1,129 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-02-21 14:44:31
+ * @LastEditTime: 2023-06-09 14:53:26
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
+    <el-form-item prop="code" :label="$t('basic.code')">
+      <el-input v-model="dataForm.code" :placeholder="$t('basic.code')" clearable></el-input>
+    </el-form-item>
+    <el-form-item prop="name" :label="$t('basic.name')">
+      <el-input v-model="dataForm.name" :placeholder="$t('basic.name')" clearable></el-input>
+    </el-form-item>
+  </el-form>
+</template>
+
+<script>
+import debounce from "lodash/debounce";
+import basicAdd from "@/mixins/basic-add";
+export default {
+  mixins: [basicAdd],
+  data() {
+    return {
+      // urlOptions: {
+      //   submitURL: "/sys/params/",
+      //   infoURL: "/sys/params",
+      // },
+      visible: false,
+      options: [{
+        value: '0',
+        label: '不可用'
+      },
+      {
+        value: '1',
+        label: '可用'
+      }],
+      dataForm: {
+        name: null,
+        code: null
+      },
+    };
+  },
+  computed: {
+    // dataRule() {
+    //   return {
+    //     paramCode: [
+    //       {
+    //         required: true,
+    //         message: this.$t("validate.required"),
+    //         trigger: "blur",
+    //       },
+    //     ],
+    //     paramValue: [
+    //       {
+    //         required: true,
+    //         message: this.$t("validate.required"),
+    //         trigger: "blur",
+    //       },
+    //     ],
+    //   };
+    // },
+  },
+  methods: {
+    // init(id) {
+    //   this.dataForm.id = id || "";
+    //   this.visible = true;
+    //   this.$nextTick(() => {
+    //     this.$refs["dataForm"].resetFields();
+    //     if (this.dataForm.id) {
+    //       this.getInfo();
+    //     }
+    //   });
+    // },
+    // 获取信息
+    // getInfo() {
+    //   this.$http
+    //     .get(`/sys/params/${this.dataForm.id}`)
+    //     .then(({ data: res }) => {
+    //       if (res.code !== 0) {
+    //         return this.$message.error(res.msg);
+    //       }
+    //       this.dataForm = {
+    //         ...this.dataForm,
+    //         ...res.data,
+    //       };
+    //     })
+    //     .catch(() => {});
+    // },
+    // 表单提交
+    handleConditionSearch() {
+      this.$emit("successSubmit", this.dataForm);
+    },
+    // dataFormSubmitHandle: debounce(
+    //   function () {
+    //     // console.log(1111);
+    //     // this.visible = false;
+    //     this.$emit("successSubmit", this.dataForm.key);
+    //     // this.$refs["dataForm"].validate((valid) => {
+    //     //   if (!valid) {
+    //     //     return false;
+    //     //   }
+    //     //   this.$http[!this.dataForm.id ? "post" : "put"](
+    //     //     "/sys/params",
+    //     //     this.dataForm
+    //     //   )
+    //     //     .then(({ data: res }) => {
+    //     //       if (res.code !== 0) {
+    //     //         return this.$message.error(res.msg);
+    //     //       }
+    //     //       this.$message({
+    //     //         message: this.$t("prompt.success"),
+    //     //         type: "success",
+    //     //         duration: 500,
+    //     //         onClose: () => {
+
+    //     //         },
+    //     //       });
+    //     //     })
+    //     //     .catch(() => {});
+    //     // });
+    //   },
+    //   1000,
+    //   { leading: true, trailing: false }
+    // ),
+  },
+};
+</script>
diff --git a/src/views/modules/supplier/qmsEvaluationItemList.vue b/src/views/modules/supplier/qmsEvaluationItemList.vue
new file mode 100644
index 0000000..873c5a5
--- /dev/null
+++ b/src/views/modules/supplier/qmsEvaluationItemList.vue
@@ -0,0 +1,294 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-04-17 14:23:17
+ * @LastEditTime: 2023-06-20 15:39:07
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__user">
+      <el-tabs @tab-click="clickTabs" tab-position="left" style="height: 200px;">
+        <el-tab-pane v-for="(item,index) in projectTypeList" :name="item.id" :key="index" :label="item.name">
+          <SearchBar :formConfigs="formConfig" ref="ruleForm" @headBtnClick="buttonClick">
+          </SearchBar>
+          <base-table id="palletTable" :table-props="tableProps" :page="listQuery.page" ref="palletTable1" :limit="listQuery.limit" :table-data="tableData">
+            <method-btn v-if="tableBtn.length" slot="handleBtn" :width="100" label="操作" :method-list="tableBtn"
+              @clickBtn="handleClick" />
+          </base-table>
+          <pagination :limit.sync="listQuery.limit" :page.sync="listQuery.page" :total="listQuery.total"
+            @pagination="getDataList" />
+        </el-tab-pane>
+      </el-tabs>
+      <!-- 弹窗, 新增 / 修改 -->
+      <base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="addOrUpdateVisible" @cancel="handleCancel"
+        @confirm="handleConfirm" :before-close="handleCancel">
+        <evaluationItemList-add ref="addOrUpdate" @refreshDataList="successSubmit">
+          </evaluationItemList-add>
+          <!-- <el-row slot="footer" type="flex" justify="end"> </el-row> -->
+      </base-dialog>
+      <base-dialog :dialogTitle="searchOrEditTitle" :dialogVisible="searchOrUpdateVisible" @cancel="handleSearchCancel"
+        @confirm="handleSearchConfirm" :before-close="handleSearchCancel">
+        <supplierProduct-search ref="searchOrUpdate" @successSubmit="conditionSearchSubmit">
+        </supplierProduct-search>
+        <el-row slot="footer" type="flex" justify="end">
+          <el-col :span="12">
+            <el-button size="small" type="primary" plain class="btnTextStyle" @click="handleSearchCancel">
+              {{ $t("close") }}
+            </el-button>
+            <el-button size="small" class="btnTextStyle" type="primary" plain @click="handleSearchReset">{{
+              $t("reset")
+              }}</el-button>
+            <el-button type="primary" size="small" class="btnTextStyle" @click="handleSearchConfirm">
+              {{ $t("search") }}
+            </el-button>
+          </el-col>
+        </el-row>
+      </base-dialog>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import basicPage from "@/mixins/basic-page"
+import basicSearch from "@/mixins/basic-search"
+import supplierProductSearch from "./components/supplierProductSearch.vue"
+import evaluationItemListAdd from "./components/evaluationItemList-add.vue"
+import { timeFormatter } from '@/filters'
+import i18n from "@/i18n"
+// import i18n from "@/i18n";
+const tableProps = [
+  {
+    prop: "title",
+    label: i18n.t('supplier.title')
+  },
+  {
+    prop: "projectTypeName",
+    label: i18n.t('supplier.projectTypeName')
+  },
+  {
+    prop: "requirement",
+    label: i18n.t('supplier.requirement')
+  }
+];
+const tableBtn = [
+  {
+    type: "edit",
+    btnName: i18n.t('t.edit'),
+  },
+  {
+    type: "delete",
+    btnName: i18n.t('t.delete'),
+  }
+];
+export default {
+  mixins: [basicPage, basicSearch],
+  data() {
+    return {
+      urlOptions: {
+        getDataListURL: "/supplier/qmsEvaluationItemList/page",
+        deleteURL: "/supplier/qmsEvaluationItemList",
+        getProjectTypeList: '/supplier/qmsProjectType/page'
+        // submitURL: '/supplier/qmsSupplierType'
+      },
+      tableProps,
+      ment: '',
+      tableBtn,
+      productData: {},
+      dataForm:{
+        limit: 999,
+        page:1
+      },
+      projectTypeId:null,
+      projectTypeList:[],
+      searchOrEditTitle: "",
+      searchOrUpdateVisible: false,
+      productOrEditTitle: "",
+      addOrEditTitle: '',
+      addOrUpdateVisible: false,
+      productOrUpdateVisible: false,
+      formConfig: [
+        {
+          type: 'input',
+          label: i18n.t('supplier.name'),
+          placeholder: i18n.t('supplier.name'),
+          param: 'name'
+        },
+        {
+          type: 'input',
+          label: i18n.t('supplier.code'),
+          placeholder: i18n.t('supplier.code'),
+          param: 'code'
+        },
+        {
+          type: "button",
+          btnName: i18n.t('search'),
+          name: "search",
+          color: "primary",
+          // plain: true,
+        },
+        {
+          type: "button",
+          btnName: i18n.t('add'),
+          name: "add",
+          color: "primary",
+          // plain: true,
+        },
+      ],
+    };
+  },
+  components: {
+    supplierProductSearch,
+    // supplierProduct,
+    evaluationItemListAdd
+  },
+  mounted () {
+    this.getData()
+  },
+  methods: {
+    clickTabs(e) {
+      this.projectTypeId = e.name
+      this.listQuery.projectTypeId = e.name
+      this.getDataList();
+    },
+    getData() {
+      this.$http
+        .get(this.urlOptions.getProjectTypeList, { params: this.listQuery })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res.data);
+            this.projectTypeList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+    },
+    //search-bar点击
+    handleProductCancel() {
+      this.productOrUpdateVisible = false;
+      this.productOrEditTitle = ""
+    },
+    // handleSearchCancel() {
+    //   this.searchOrEditTitle = "";
+    //   this.searchOrUpdateVisible = false;
+    // },
+    conditionSearch() {
+      this.searchOrEditTitle = "搜索";
+      this.searchOrUpdateVisible = true;
+      this.$nextTick(() => {
+        this.$refs.searchOrUpdate.init();
+      });
+    },
+    exportHandle() {
+      this.$http.get(this.urlOptions.exportURL, { responseType: 'blob' }, {
+        ...this.dataForm
+      }).then((res) => {
+        console.log(res)
+        // if (res !== 0) {
+        //   return this.$message.error(res.msg) 
+        // }
+        let fileName = ''
+        const contentDisposition = res.headers['content-disposition']
+        if (contentDisposition) {
+          const temp = res.headers['content-disposition']
+            .split(';')[1]
+            .split('=')[1]
+          // 对文件名乱码转义--【Node.js】使用iconv-lite解决中文乱码
+          fileName = decodeURI(temp)
+          console.log(temp)
+        }
+        const blob = new Blob([res.data])
+        const reader = new FileReader()
+        reader.readAsDataURL(blob)
+        reader.onload = (e) => {
+          const a = document.createElement('a')
+          a.download = fileName
+          a.href = e.target.result
+          document.body.appendChild(a)
+          a.click()
+          document.body.removeChild(a)
+        }
+      }).catch(() => { })
+    },
+    // handleConfirm() {
+    //   this.$refs.addOrUpdate.dataFormSubmitHandle();
+    // },
+    // conditionSearchSubmit() {},
+    conditionSearchSubmit(dataForm) {
+      // console.log(key);
+      // console.log(key);
+      this.listQuery.supplierName = dataForm.supplierName
+      this.listQuery.page = 1;
+      this.getDataList();
+      this.searchOrUpdateVisible = false;
+      // console.log(11111);
+      // this.conditionSearchSubmit();
+    },
+    handleClick(val) {
+      if (val.type === "delete") {
+        this.$confirm(`确定对[名称=${val.data.customerTypeName}]进行删除操作?`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.$http.delete(this.urlOptions.deleteURL, { data: [val.data.id] }).then(({ data }) => {
+              if (data && data.code === 0) {
+                this.$message({
+                  message: "操作成功",
+                  type: "success",
+                  duration: 1500,
+                  onClose: () => {
+                    this.getDataList();
+                  },
+                });
+              } else {
+                this.$message.error(data.msg);
+              }
+            });
+          })
+          .catch(() => { });
+      } else if (val.type === 'edit') {
+        this.addOrUpdateVisible = true
+        this.addOrEditTitle = this.$t('edit')
+        this.$nextTick(() => {
+          const data ={
+            id: val.data.id, 
+            projectTypeId: this.projectTypeId
+          }
+          this.$refs.addOrUpdate.init(data)
+        });
+      }
+    },
+    addOrUpdateHandle() {
+      console.log(this.projectTypeId)
+      this.addOrUpdateVisible = true;
+      this.$nextTick(() => {
+        const data = {
+          projectTypeId: this.projectTypeId
+        }
+        this.$refs.addOrUpdate.init(data)
+      });
+    },
+    buttonClick(val) {
+      console.log(val)
+      switch (val.btnName) {
+        case "search":
+          // this.listQuery.paramCode = val.paramCode;
+          this.listQuery.name = val.name ? val.name : undefined
+          this.listQuery.code = val.code ? val.code : undefined
+          // console.log(i18n);
+          this.listQuery.page = 1;
+          this.getDataList();
+          break;
+        case "add":
+          this.addOrEditTitle = '新增'
+          this.addOrUpdateVisible = true
+          this.addOrUpdateHandle()
+          break;
+        default:
+      }
+    },
+  },
+};
+</script>
diff --git a/src/views/modules/supplier/qmsEvaluationItemListTag.vue b/src/views/modules/supplier/qmsEvaluationItemListTag.vue
index f5a819f..81ad192 100644
--- a/src/views/modules/supplier/qmsEvaluationItemListTag.vue
+++ b/src/views/modules/supplier/qmsEvaluationItemListTag.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-04-17 14:23:17
- * @LastEditTime: 2023-05-12 14:14:39
+ * @LastEditTime: 2023-06-20 15:39:01
  * @LastEditors: zhp
  * @Description: 
 -->
@@ -219,8 +219,8 @@ export default {
           })
           .catch(() => { });
       } else if (val.type === 'edit') {
-        this.addOrEditTitle = '修改'
-        this.addOrUpdateVisible = true;
+        this.addOrUpdateVisible = true
+        this.addOrEditTitle = this.$t('edit')
         this.$nextTick(() => {
           this.$refs.addOrUpdate.init(val.data.id);
         });
diff --git a/src/views/modules/supplier/qmsEvaluationPlan.vue b/src/views/modules/supplier/qmsEvaluationPlan.vue
new file mode 100644
index 0000000..e0bfe75
--- /dev/null
+++ b/src/views/modules/supplier/qmsEvaluationPlan.vue
@@ -0,0 +1,302 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-04-17 14:23:17
+ * @LastEditTime: 2023-06-20 15:38:53
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__user">
+      <SearchBar :formConfigs="formConfig" ref="ruleForm" @headBtnClick="buttonClick">
+      </SearchBar>
+      <base-table id="palletTable" :table-props="tableProps" :page="listQuery.page" ref="palletTable1"
+        :limit="listQuery.limit" :table-data="tableData">
+        <method-btn v-if="tableBtn.length" slot="handleBtn" :width="100" label="操作" :method-list="tableBtn"
+          @clickBtn="handleClick" />
+      </base-table>
+      <pagination :limit.sync="listQuery.limit" :page.sync="listQuery.page" :total="listQuery.total"
+        @pagination="getDataList" />
+      <!-- 弹窗, 新增 / 修改 -->
+      <base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="addOrUpdateVisible" @cancel="handleCancel"
+        @confirm="handleConfirm" :before-close="handleCancel">
+        <evaluationItemList-add ref="addOrUpdate" @refreshDataList="successSubmit">
+        </evaluationItemList-add>
+        <!-- <el-row slot="footer" type="flex" justify="end"> </el-row> -->
+      </base-dialog>
+      <base-dialog :dialogTitle="searchOrEditTitle" :dialogVisible="searchOrUpdateVisible" @cancel="handleSearchCancel"
+        @confirm="handleSearchConfirm" :before-close="handleSearchCancel">
+        <supplierProduct-search ref="searchOrUpdate" @successSubmit="conditionSearchSubmit">
+        </supplierProduct-search>
+        <el-row slot="footer" type="flex" justify="end">
+          <el-col :span="12">
+            <el-button size="small" type="primary" plain class="btnTextStyle" @click="handleSearchCancel">
+              {{ $t("close") }}
+            </el-button>
+            <el-button size="small" class="btnTextStyle" type="primary" plain @click="handleSearchReset">{{
+            $t("reset")
+            }}</el-button>
+            <el-button type="primary" size="small" class="btnTextStyle" @click="handleSearchConfirm">
+              {{ $t("search") }}
+            </el-button>
+          </el-col>
+        </el-row>
+      </base-dialog>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import basicPage from "@/mixins/basic-page"
+import basicSearch from "@/mixins/basic-search"
+import supplierProductSearch from "./components/supplierProductSearch.vue"
+import evaluationItemListAdd from "./components/evaluationItemList-add.vue"
+import { timeFormatter } from '@/filters'
+import i18n from "@/i18n"
+// import i18n from "@/i18n";
+const tableProps = [
+  {
+    prop: "evaluationType",
+    label: i18n.t('supplier.evaluationType')
+  },
+  {
+    prop: "title",
+    label: i18n.t('supplier.title')
+  },
+  {
+    prop: "evaluationTemplateName",
+    label: i18n.t('supplier.evaluationTemplateName')
+  },
+  {
+    prop: "description",
+    label: i18n.t('supplier.description')
+  },
+  {
+    prop: "lastStartTime",
+    label: i18n.t('supplier.lastStartTime')
+  },
+  {
+    prop: "lastStartEvaluationPeriod",
+    label: i18n.t('supplier.lastStartEvaluationPeriod')
+  },
+  {
+    prop: "estimatedNextStartTime",
+    label: i18n.t('supplier.estimatedNextStartTime')
+  }
+];
+const tableBtn = [
+  {
+    type: "edit",
+    btnName: i18n.t('t.edit'),
+  },
+  {
+    type: "delete",
+    btnName: i18n.t('t.delete'),
+  }
+];
+export default {
+  mixins: [basicPage, basicSearch],
+  data() {
+    return {
+      urlOptions: {
+        getDataListURL: "/supplier/qmsEvaluationPlan/page",
+        deleteURL: "/supplier/qmsEvaluationPlan",
+        getProjectTypeList: '/supplier/qmsProjectType/page'
+        // submitURL: '/supplier/qmsSupplierType'
+      },
+      tableProps,
+      ment: '',
+      tableBtn,
+      productData: {},
+      dataForm:{
+        limit: 999,
+        page:1
+      },
+      projectTypeId:null,
+      projectTypeList:[],
+      searchOrEditTitle: "",
+      searchOrUpdateVisible: false,
+      productOrEditTitle: "",
+      addOrEditTitle: '',
+      addOrUpdateVisible: false,
+      productOrUpdateVisible: false,
+      formConfig: [
+        {
+          type: 'input',
+          label: i18n.t('supplier.name'),
+          placeholder: i18n.t('supplier.name'),
+          param: 'name'
+        },
+        {
+          type: 'input',
+          label: i18n.t('supplier.code'),
+          placeholder: i18n.t('supplier.code'),
+          param: 'code'
+        },
+        {
+          type: "button",
+          btnName: i18n.t('search'),
+          name: "search",
+          color: "primary",
+          // plain: true,
+        },
+        {
+          type: "button",
+          btnName: i18n.t('add'),
+          name: "add",
+          color: "primary",
+          // plain: true,
+        },
+      ],
+    };
+  },
+  components: {
+    supplierProductSearch,
+    // supplierProduct,
+    evaluationItemListAdd
+  },
+  mounted () {
+    this.getData()
+  },
+  methods: {
+    getData() {
+      this.$http
+        .get(this.urlOptions.getProjectTypeList, { params: this.listQuery })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res.data);
+            this.projectTypeList = res.data.list
+          }
+        })
+        .catch(() => {
+        })
+    },
+    //search-bar点击
+    handleProductCancel() {
+      this.productOrUpdateVisible = false;
+      this.productOrEditTitle = ""
+    },
+    // handleSearchCancel() {
+    //   this.searchOrEditTitle = "";
+    //   this.searchOrUpdateVisible = false;
+    // },
+    conditionSearch() {
+      this.searchOrEditTitle = "搜索";
+      this.searchOrUpdateVisible = true;
+      this.$nextTick(() => {
+        this.$refs.searchOrUpdate.init();
+      });
+    },
+    exportHandle() {
+      this.$http.get(this.urlOptions.exportURL, { responseType: 'blob' }, {
+        ...this.dataForm
+      }).then((res) => {
+        console.log(res)
+        // if (res !== 0) {
+        //   return this.$message.error(res.msg) 
+        // }
+        let fileName = ''
+        const contentDisposition = res.headers['content-disposition']
+        if (contentDisposition) {
+          const temp = res.headers['content-disposition']
+            .split(';')[1]
+            .split('=')[1]
+          // 对文件名乱码转义--【Node.js】使用iconv-lite解决中文乱码
+          fileName = decodeURI(temp)
+          console.log(temp)
+        }
+        const blob = new Blob([res.data])
+        const reader = new FileReader()
+        reader.readAsDataURL(blob)
+        reader.onload = (e) => {
+          const a = document.createElement('a')
+          a.download = fileName
+          a.href = e.target.result
+          document.body.appendChild(a)
+          a.click()
+          document.body.removeChild(a)
+        }
+      }).catch(() => { })
+    },
+    // handleConfirm() {
+    //   this.$refs.addOrUpdate.dataFormSubmitHandle();
+    // },
+    // conditionSearchSubmit() {},
+    conditionSearchSubmit(dataForm) {
+      // console.log(key);
+      // console.log(key);
+      this.listQuery.supplierName = dataForm.supplierName
+      this.listQuery.page = 1;
+      this.getDataList();
+      this.searchOrUpdateVisible = false;
+      // console.log(11111);
+      // this.conditionSearchSubmit();
+    },
+    handleClick(val) {
+      if (val.type === "delete") {
+        this.$confirm(`确定对[名称=${val.data.customerTypeName}]进行删除操作?`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.$http.delete(this.urlOptions.deleteURL, { data: [val.data.id] }).then(({ data }) => {
+              if (data && data.code === 0) {
+                this.$message({
+                  message: "操作成功",
+                  type: "success",
+                  duration: 1500,
+                  onClose: () => {
+                    this.getDataList();
+                  },
+                });
+              } else {
+                this.$message.error(data.msg);
+              }
+            });
+          })
+          .catch(() => { });
+      } else if (val.type === 'edit') {
+        this.addOrUpdateVisible = true
+        this.addOrEditTitle = this.$t('edit')
+        this.$nextTick(() => {
+          const data ={
+            id: val.data.id, 
+            projectTypeId: this.projectTypeId
+          }
+          this.$refs.addOrUpdate.init(data)
+        });
+      }
+    },
+    addOrUpdateHandle() {
+      console.log(this.projectTypeId)
+      this.addOrUpdateVisible = true;
+      this.$nextTick(() => {
+        const data = {
+          projectTypeId: this.projectTypeId
+        }
+        this.$refs.addOrUpdate.init(data)
+      });
+    },
+    buttonClick(val) {
+      console.log(val)
+      switch (val.btnName) {
+        case "search":
+          // this.listQuery.paramCode = val.paramCode;
+          this.listQuery.name = val.name ? val.name : undefined
+          this.listQuery.code = val.code ? val.code : undefined
+          // console.log(i18n);
+          this.listQuery.page = 1;
+          this.getDataList();
+          break;
+        case "add":
+          this.addOrEditTitle = '新增'
+          this.addOrUpdateVisible = true
+          this.addOrUpdateHandle()
+          break;
+        default:
+      }
+    },
+  },
+};
+</script>
diff --git a/src/views/modules/supplier/qmsEvaluationTask.vue b/src/views/modules/supplier/qmsEvaluationTask.vue
index 1ea898a..5facdf3 100644
--- a/src/views/modules/supplier/qmsEvaluationTask.vue
+++ b/src/views/modules/supplier/qmsEvaluationTask.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-04-17 14:23:17
- * @LastEditTime: 2023-04-19 14:30:08
+ * @LastEditTime: 2023-06-20 15:38:46
  * @LastEditors: zhp
  * @Description: 
 -->
@@ -323,8 +323,8 @@ export default {
           })
           .catch(() => { });
       } else if (val.type === 'edit') {
-        this.addOrEditTitle = '修改'
-        this.addOrUpdateVisible = true;
+        this.addOrUpdateVisible = true
+        this.addOrEditTitle = this.$t('edit')
         this.$nextTick(() => {
           this.$refs.addOrUpdate.init(val.data.id);
         });
diff --git a/src/views/modules/supplier/qmsLevelSetting.vue b/src/views/modules/supplier/qmsLevelSetting.vue
new file mode 100644
index 0000000..db41b42
--- /dev/null
+++ b/src/views/modules/supplier/qmsLevelSetting.vue
@@ -0,0 +1,287 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-06-08 14:29:46
+ * @LastEditTime: 2023-06-16 14:20:12
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__user">
+      <SearchBar :formConfigs="formConfig" ref="ruleForm" @headBtnClick="buttonClick">
+        <!-- <el-badge :value="2" class="item">
+          <el-button type="primary" size="small" @click="conditionSearch">条件搜索</el-button>
+        </el-badge> -->
+      </SearchBar>
+      <div v-for="item in tableData" :key="item.id">
+        <el-tooltip class="item" effect="dark" :content="'上线:' + item.online + ',下线:' + item.offline" placement="top">
+          <div class="item">
+            <span>
+              {{item.name}}
+            </span>
+            <el-button style="margin-left:5px" type="text" icon="el-icon-edit" @click="handleEdit(item.id)"></el-button>
+            <el-progress :stroke-width="26" :percentage="item.online ? item.online : ''">
+            </el-progress>
+          </div>
+        </el-tooltip>
+
+      </div>
+      <!-- 弹窗, 新增 / 修改 -->
+      <base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="addOrUpdateVisible" @cancel="handleCancel"
+        @confirm="handleConfirm" :before-close="handleCancel">
+        <levelSetting-add ref="addOrUpdate" @refreshDataList="successSubmit">
+        </levelSetting-add>
+        <!-- <el-row slot="footer" type="flex" justify="end"> </el-row> -->
+      </base-dialog>
+      <base-dialog :dialogTitle="searchOrEditTitle" :dialogVisible="searchOrUpdateVisible" @cancel="handleSearchCancel"
+        @confirm="handleSearchConfirm" :before-close="handleSearchCancel">
+        <levelSetting-search ref="searchOrUpdate" @successSubmit="conditionSearchSubmit">
+        </levelSetting-search>
+        <el-row slot="footer" type="flex" justify="end">
+          <el-col :span="12">
+            <el-button size="small" type="primary" plain class="btnTextStyle" @click="handleSearchCancel">
+              {{ $t("close") }}
+            </el-button>
+            <el-button size="small" class="btnTextStyle" type="primary" plain @click="handleSearchReset">{{
+            $t("reset")
+            }}</el-button>
+            <el-button type="primary" size="small" class="btnTextStyle" @click="handleSearchConfirm">
+              {{ $t("search") }}
+            </el-button>
+          </el-col>
+        </el-row>
+      </base-dialog>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import basicPage from "@/mixins/basic-page"
+import basicSearch from "@/mixins/basic-search"
+import levelSettingSearch from "./components/levelSettingSearch.vue"
+import levelSettingAdd from "./components/levelSetting-add.vue"
+import i18n from "@/i18n"
+// import i18n from "@/i18n";
+const tableProps = [
+  {
+    prop: "code",
+    label: i18n.t('supplier.code'),
+  },
+  {
+    prop: "name",
+    label: i18n.t('supplier.name'),
+  }
+];
+const tableBtn = [
+  {
+    type: "edit",
+    btnName: i18n.t('edit'),
+  },
+  {
+    type: "delete",
+    btnName: i18n.t('delete'),
+  }
+];
+export default {
+  mixins: [basicPage, basicSearch],
+  data() {
+    return {
+      urlOptions: {
+        getDataListURL: "/supplier/qmsLevelSetting/page",
+        deleteURL: "/supplier/qmsLevelSetting",
+        exportURL: '/supplier/qmsLevelSetting/export',
+        submitURL: '/supplier/qmsLevelSetting'
+      },
+      tableProps,
+      tableBtn,
+      productData: {},
+      dataForm:{
+        limit: 999,
+        page:1
+      },
+      searchOrEditTitle: "",
+      searchOrUpdateVisible: false,
+      productOrEditTitle: "",
+      addOrEditTitle: '',
+      addOrUpdateVisible: false,
+      productOrUpdateVisible: false,
+      formConfig: [
+        // {
+        //   type: "",
+        //   label: i18n.t("params.paramCode"),
+        //   placeholder: i18n.t("params.paramCode"),
+        //   param: "paramCode",
+        // },
+        // {
+        //   type: "separate",
+        // },
+        {
+          type: "button",
+          btnName: i18n.t('add'),
+          name: "add",
+          color: "primary",
+        },
+        {
+          type: "button",
+          btnName: i18n.t('search'),
+          name: "search",
+          color: "primary",
+          // plain: true,
+        },
+        {
+          type: "button",
+          btnName: i18n.t('export'),
+          name: "export",
+          color: "primary",
+          // plain: true,
+        }
+      ],
+    };
+  },
+  components: {
+    levelSettingSearch,
+    levelSettingAdd
+  },
+  methods: {
+    //search-bar点击
+    handleProductCancel() {
+      this.productOrUpdateVisible = false;
+      this.productOrEditTitle = "";
+    },
+    handleCurrentChange(val) {
+      console.log(val);
+      this.productData = val.newVal ? val.newVal : {}
+    },
+    setCurrent(index) {
+      this.$refs.palletTable1.setCurrent("palletTable", index);
+    },
+    // handleSearchCancel() {
+    //   this.searchOrEditTitle = "";
+    //   this.searchOrUpdateVisible = false;
+    // },
+    conditionSearch() {
+      this.searchOrEditTitle = "搜索";
+      this.searchOrUpdateVisible = true;
+      this.$nextTick(() => {
+        this.$refs.searchOrUpdate.init();
+      });
+    },
+    // handleConfirm() {
+    //   this.$refs.addOrUpdate.dataFormSubmitHandle();
+    // },
+    // conditionSearchSubmit() {},
+    conditionSearchSubmit(dataForm) {
+      // console.log(key);
+      // console.log(key);
+      this.listQuery.name = dataForm.name
+      this.listQuery.code = dataForm.code
+      this.listQuery.page = 1;
+      this.getDataList();
+      this.searchOrUpdateVisible = false;
+      // console.log(11111);
+      // this.conditionSearchSubmit();
+    },
+    exportHandle() {
+      this.$http.get(this.urlOptions.exportURL, { responseType: 'blob' }, {
+        ...this.dataForm
+      }).then((res) => {
+        console.log(res)
+        // if (res !== 0) {
+        //   return this.$message.error(res.msg) 
+        // }
+        let fileName = ''
+        const contentDisposition = res.headers['content-disposition']
+        if (contentDisposition) {
+          const temp = res.headers['content-disposition']
+            .split(';')[1]
+            .split('=')[1]
+          // 对文件名乱码转义--【Node.js】使用iconv-lite解决中文乱码
+          fileName = decodeURI(temp)
+          console.log(temp)
+        }
+        const blob = new Blob([res.data])
+        const reader = new FileReader()
+        reader.readAsDataURL(blob)
+        reader.onload = (e) => {
+          const a = document.createElement('a')
+          a.download = fileName
+          a.href = e.target.result
+          document.body.appendChild(a)
+          a.click()
+          document.body.removeChild(a)
+        }
+      }).catch(() => { })
+    },
+    handleClick(val) {
+      if (val.type === "delete") {
+        this.$confirm(`确定对[名称=${val.data.customerTypeName}]进行删除操作?`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.$http.delete(this.urlOptions.deleteURL, { data: [val.data.id] }).then(({ data }) => {
+              if (data && data.code === 0) {
+                this.$message({
+                  message: "操作成功",
+                  type: "success",
+                  duration: 1500,
+                  onClose: () => {
+                    this.getDataList();
+                  },
+                });
+              } else {
+                this.$message.error(data.msg);
+              }
+            });
+          })
+          .catch(() => { });
+      }
+    },
+    handleEdit(id) {
+      this.addOrEditTitle = '修改'
+      this.addOrUpdateVisible = true;
+      this.$nextTick(() => {
+        this.$refs.addOrUpdate.init(id);
+      });
+    },
+    // addOrUpdateHandle(productData) {
+    //   this.addOrUpdateVisible = true;
+    //   this.$nextTick(() => {
+    //     this.$refs.addOrUpdate.init(productData);
+    //   });
+    // },
+    buttonClick(val) {
+      console.log(val);
+      switch (val.btnName) {
+        case "search":
+          // this.listQuery.paramCode = val.paramCode;
+          // console.log(i18n);
+          this.listQuery.page = 1
+          this.getDataList()
+          break;
+        case "export":
+         this.exportHandle()
+          break;
+        case "add":
+          this.addOrEditTitle = '新增'
+          this.addOrUpdateVisible = true;
+          this.addOrUpdateHandle()
+          break;
+        default:
+      }
+    },
+  },
+};
+</script>
+<style lang="css" scoped>
+
+
+.item{
+  width:500px;
+  margin-top: 50px;
+}
+.el-progress{
+  margin-top:5px
+}
+</style>
diff --git a/src/views/modules/supplier/qmsPoorLaunch.vue b/src/views/modules/supplier/qmsPoorLaunch.vue
index 695d5bb..28fb99a 100644
--- a/src/views/modules/supplier/qmsPoorLaunch.vue
+++ b/src/views/modules/supplier/qmsPoorLaunch.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-04-17 14:23:17
- * @LastEditTime: 2023-04-18 15:20:13
+ * @LastEditTime: 2023-06-20 15:38:40
  * @LastEditors: zhp
  * @Description: 
 -->
@@ -314,8 +314,8 @@ export default {
           })
           .catch(() => { });
       } else if (val.type === 'edit') {
-        this.addOrEditTitle = '修改'
-        this.addOrUpdateVisible = true;
+        this.addOrUpdateVisible = true
+        this.addOrEditTitle = this.$t('edit')
         this.$nextTick(() => {
           this.$refs.addOrUpdate.init(val.data.id);
         });
diff --git a/src/views/modules/supplier/qmsProjectType.vue b/src/views/modules/supplier/qmsProjectType.vue
new file mode 100644
index 0000000..dd8000d
--- /dev/null
+++ b/src/views/modules/supplier/qmsProjectType.vue
@@ -0,0 +1,269 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-06-08 14:29:46
+ * @LastEditTime: 2023-06-20 15:38:33
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__user">
+      <SearchBar :formConfigs="formConfig" ref="ruleForm" @headBtnClick="buttonClick">
+        <el-badge :value="2" class="item">
+          <el-button type="primary" size="small" @click="conditionSearch">条件搜索</el-button>
+        </el-badge>
+      </SearchBar>
+      <base-table id="palletTable" :table-props="tableProps" :page="listQuery.page" ref="palletTable1"
+        :limit="listQuery.limit" :table-data="tableData">
+        <method-btn v-if="tableBtn.length" slot="handleBtn" :width="100" label="操作" :method-list="tableBtn"
+          @clickBtn="handleClick" />
+      </base-table>
+      <pagination :limit.sync="listQuery.limit" :page.sync="listQuery.page" :total="listQuery.total"
+        @pagination="getDataList" />
+      <!-- 弹窗, 新增 / 修改 -->
+      <base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="addOrUpdateVisible" @cancel="handleCancel"
+        @confirm="handleConfirm" :before-close="handleCancel">
+        <projectsType-add ref="addOrUpdate" @refreshDataList="successSubmit">
+        </projectsType-add>
+        <!-- <el-row slot="footer" type="flex" justify="end"> </el-row> -->
+      </base-dialog>
+      <base-dialog :dialogTitle="searchOrEditTitle" :dialogVisible="searchOrUpdateVisible" @cancel="handleSearchCancel"
+        @confirm="handleSearchConfirm" :before-close="handleSearchCancel">
+        <projectType-search ref="searchOrUpdate" @successSubmit="conditionSearchSubmit">
+          </projectType-search>
+          <el-row slot="footer" type="flex" justify="end">
+            <el-col :span="12">
+              <el-button size="small" type="primary" plain class="btnTextStyle" @click="handleSearchCancel">
+                {{ $t("close") }}
+              </el-button>
+              <el-button size="small" class="btnTextStyle" type="primary" plain @click="handleSearchReset">{{
+                $t("reset")
+                }}</el-button>
+              <el-button type="primary" size="small" class="btnTextStyle" @click="handleSearchConfirm">
+                {{ $t("search") }}
+              </el-button>
+            </el-col>
+          </el-row>
+      </base-dialog>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import basicPage from "@/mixins/basic-page"
+import basicSearch from "@/mixins/basic-search"
+import projectTypeSearch from "./components/projectTypeSearch.vue"
+import projectTypeAdd from "./components/projectType-add.vue"
+import i18n from "@/i18n"
+// import i18n from "@/i18n";
+const tableProps = [
+  {
+    prop: "code",
+    label: i18n.t('supplier.code'),
+  },
+  {
+    prop: "name",
+    label: i18n.t('supplier.name'),
+  }
+];
+const tableBtn = [
+  {
+    type: "edit",
+    btnName: i18n.t('edit'),
+  },
+  {
+    type: "delete",
+    btnName: i18n.t('delete'),
+  }
+];
+export default {
+  mixins: [basicPage, basicSearch],
+  data() {
+    return {
+      urlOptions: {
+        getDataListURL: "/supplier/qmsProjectType/page",
+        deleteURL: "/supplier/qmsProjectType",
+        exportURL: '/supplier/qmsProjectType/export',
+        submitURL: '/supplier/qmsProjectType'
+      },
+      tableProps,
+      tableBtn,
+      productData: {},
+      dataForm:{
+        limit: 999,
+        page:1
+      },
+      searchOrEditTitle: "",
+      searchOrUpdateVisible: false,
+      productOrEditTitle: "",
+      addOrEditTitle: '',
+      addOrUpdateVisible: false,
+      productOrUpdateVisible: false,
+      formConfig: [
+        // {
+        //   type: "",
+        //   label: i18n.t("params.paramCode"),
+        //   placeholder: i18n.t("params.paramCode"),
+        //   param: "paramCode",
+        // },
+        // {
+        //   type: "separate",
+        // },
+        {
+          type: "button",
+          btnName: i18n.t('add'),
+          name: "add",
+          color: "primary",
+        },
+        {
+          type: "button",
+          btnName: i18n.t('search'),
+          name: "search",
+          color: "primary",
+          // plain: true,
+        },
+        {
+          type: "button",
+          btnName: i18n.t('export'),
+          name: "export",
+          color: "primary",
+          // plain: true,
+        }
+      ],
+    };
+  },
+  components: {
+    projectTypeSearch,
+    projectTypeAdd
+  },
+  methods: {
+    //search-bar点击
+    handleProductCancel() {
+      this.productOrUpdateVisible = false;
+      this.productOrEditTitle = "";
+    },
+    handleCurrentChange(val) {
+      console.log(val);
+      this.productData = val.newVal ? val.newVal : {}
+    },
+    setCurrent(index) {
+      this.$refs.palletTable1.setCurrent("palletTable", index);
+    },
+    // handleSearchCancel() {
+    //   this.searchOrEditTitle = "";
+    //   this.searchOrUpdateVisible = false;
+    // },
+    conditionSearch() {
+      this.searchOrEditTitle = "搜索";
+      this.searchOrUpdateVisible = true;
+      this.$nextTick(() => {
+        this.$refs.searchOrUpdate.init();
+      });
+    },
+    // handleConfirm() {
+    //   this.$refs.addOrUpdate.dataFormSubmitHandle();
+    // },
+    // conditionSearchSubmit() {},
+    conditionSearchSubmit(dataForm) {
+      // console.log(key);
+      // console.log(key);
+      this.listQuery.name = dataForm.name
+      this.listQuery.code = dataForm.code
+      this.listQuery.page = 1;
+      this.getDataList();
+      this.searchOrUpdateVisible = false;
+      // console.log(11111);
+      // this.conditionSearchSubmit();
+    },
+    exportHandle() {
+      this.$http.get(this.urlOptions.exportURL, { responseType: 'blob' }, {
+        ...this.dataForm
+      }).then((res) => {
+        console.log(res)
+        // if (res !== 0) {
+        //   return this.$message.error(res.msg) 
+        // }
+        let fileName = ''
+        const contentDisposition = res.headers['content-disposition']
+        if (contentDisposition) {
+          const temp = res.headers['content-disposition']
+            .split(';')[1]
+            .split('=')[1]
+          // 对文件名乱码转义--【Node.js】使用iconv-lite解决中文乱码
+          fileName = decodeURI(temp)
+          console.log(temp)
+        }
+        const blob = new Blob([res.data])
+        const reader = new FileReader()
+        reader.readAsDataURL(blob)
+        reader.onload = (e) => {
+          const a = document.createElement('a')
+          a.download = fileName
+          a.href = e.target.result
+          document.body.appendChild(a)
+          a.click()
+          document.body.removeChild(a)
+        }
+      }).catch(() => { })
+    },
+    handleClick(val) {
+      if (val.type === "delete") {
+        this.$confirm(`确定对[名称=${val.data.customerTypeName}]进行删除操作?`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.$http.delete(this.urlOptions.deleteURL, { data: [val.data.id] }).then(({ data }) => {
+              if (data && data.code === 0) {
+                this.$message({
+                  message: "操作成功",
+                  type: "success",
+                  duration: 1500,
+                  onClose: () => {
+                    this.getDataList();
+                  },
+                });
+              } else {
+                this.$message.error(data.msg);
+              }
+            });
+          })
+          .catch(() => { });
+      } else if (val.type === 'edit') {
+        this.addOrUpdateVisible = true
+        this.addOrEditTitle = this.$t('edit')
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init(val.data.id);
+        });
+      }
+    },
+    // addOrUpdateHandle(productData) {
+    //   this.addOrUpdateVisible = true;
+    //   this.$nextTick(() => {
+    //     this.$refs.addOrUpdate.init(productData);
+    //   });
+    // },
+    buttonClick(val) {
+      console.log(val);
+      switch (val.btnName) {
+        case "search":
+          // this.listQuery.paramCode = val.paramCode;
+          // console.log(i18n);
+          this.listQuery.page = 1
+          this.getDataList()
+          break;
+        case "export":
+         this.exportHandle()
+          break;
+        case "add":
+          this.addOrEditTitle = '新增'
+          this.addOrUpdateVisible = true;
+          this.addOrUpdateHandle()
+          break;
+        default:
+      }
+    },
+  },
+};
+</script>
diff --git a/src/views/modules/supplier/qmsQualityAccident.vue b/src/views/modules/supplier/qmsQualityAccident.vue
index 49c3c57..0090a71 100644
--- a/src/views/modules/supplier/qmsQualityAccident.vue
+++ b/src/views/modules/supplier/qmsQualityAccident.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-04-17 14:23:17
- * @LastEditTime: 2023-04-18 16:11:41
+ * @LastEditTime: 2023-06-20 15:38:27
  * @LastEditors: zhp
  * @Description: 
 -->
@@ -350,8 +350,8 @@ export default {
           })
           .catch(() => { });
       } else if (val.type === 'edit') {
-        this.addOrEditTitle = '修改'
-        this.addOrUpdateVisible = true;
+        this.addOrUpdateVisible = true
+        this.addOrEditTitle = this.$t('edit')
         this.$nextTick(() => {
           this.$refs.addOrUpdate.init(val.data.id);
         });
diff --git a/src/views/modules/supplier/qmsSupplier.vue b/src/views/modules/supplier/qmsSupplier.vue
index 438b5fd..f07a6fd 100644
--- a/src/views/modules/supplier/qmsSupplier.vue
+++ b/src/views/modules/supplier/qmsSupplier.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-04-17 14:23:17
- * @LastEditTime: 2023-04-18 15:19:18
+ * @LastEditTime: 2023-06-20 15:38:21
  * @LastEditors: zhp
  * @Description: 
 -->
@@ -294,8 +294,8 @@ export default {
           })
           .catch(() => { });
       } else if (val.type === 'edit') {
-        this.addOrEditTitle = '修改'
-        this.addOrUpdateVisible = true;
+        this.addOrUpdateVisible = true
+        this.addOrEditTitle = this.$t('edit')
         this.$nextTick(() => {
           this.$refs.addOrUpdate.init(val.data.id);
         });
diff --git a/src/views/modules/supplier/qmsSupplierProduct.vue b/src/views/modules/supplier/qmsSupplierProduct.vue
index ca0adfd..727bb50 100644
--- a/src/views/modules/supplier/qmsSupplierProduct.vue
+++ b/src/views/modules/supplier/qmsSupplierProduct.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-04-17 14:23:17
- * @LastEditTime: 2023-04-17 15:27:42
+ * @LastEditTime: 2023-06-20 15:38:13
  * @LastEditors: zhp
  * @Description: 
 -->
@@ -202,8 +202,8 @@ export default {
           })
           .catch(() => { });
       } else if (val.type === 'edit') {
-        this.addOrEditTitle = '修改'
-        this.addOrUpdateVisible = true;
+        this.addOrUpdateVisible = true
+        this.addOrEditTitle = this.$t('edit')
         this.$nextTick(() => {
           this.$refs.addOrUpdate.init(val.data.id);
         });
diff --git a/src/views/modules/supplier/qmsSupplierType.vue b/src/views/modules/supplier/qmsSupplierType.vue
index 289ede3..a20a5c5 100644
--- a/src/views/modules/supplier/qmsSupplierType.vue
+++ b/src/views/modules/supplier/qmsSupplierType.vue
@@ -235,8 +235,8 @@ export default {
           })
           .catch(() => { });
       } else if (val.type === 'edit') {
-        this.addOrEditTitle = '修改'
-        this.addOrUpdateVisible = true;
+        this.addOrUpdateVisible = true
+        this.addOrEditTitle = this.$t('edit')
         this.$nextTick(() => {
           this.$refs.addOrUpdate.init(val.data.id);
         });
diff --git a/src/views/modules/sys/dict-data.vue b/src/views/modules/sys/dict-data.vue
index 0d7c70c..764f225 100644
--- a/src/views/modules/sys/dict-data.vue
+++ b/src/views/modules/sys/dict-data.vue
@@ -1,44 +1,17 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-sys__user">
-      <search-bar
-        :formConfigs="formConfig"
-        ref="searchBarForm"
-        @headBtnClick="buttonClick"
-      />
-      <base-table
-        :table-props="tableProps"
-        :page="listQuery.page"
-        :limit="listQuery.limit"
-        :table-data="tableData"
-      >
-        <method-btn
-          v-if="tableBtn.length"
-          slot="handleBtn"
-          :width="100"
-          label="操作"
-          :method-list="tableBtn"
-          @clickBtn="handleClick"
-        />
+      <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
+      <base-table :table-props="tableProps" :page="listQuery.page" :limit="listQuery.limit" :table-data="tableData">
+        <method-btn v-if="tableBtn.length" slot="handleBtn" :width="100" label="操作" :method-list="tableBtn"
+          @clickBtn="handleClick" />
       </base-table>
-      <pagination
-        :limit.sync="listQuery.limit"
-        :page.sync="listQuery.page"
-        :total="listQuery.total"
-        @pagination="getDataList"
-      />
+      <pagination :limit.sync="listQuery.limit" :page.sync="listQuery.page" :total="listQuery.total"
+        @pagination="getDataList" />
       <!-- 弹窗, 新增 / 修改 -->
-      <base-dialog
-        :dialogTitle="addOrEditTitle"
-        :dialogVisible="addOrUpdateVisible"
-        @cancel="handleCancel"
-        @confirm="handleConfirm"
-        :before-close="handleCancel"
-      >
-        <add-or-update
-          ref="addOrUpdate"
-          @successSubmit="successSubmit"
-        ></add-or-update>
+      <base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="addOrUpdateVisible" @cancel="handleCancel"
+        @confirm="handleConfirm" :before-close="handleCancel">
+        <add-or-update ref="addOrUpdate" @refreshDataList="successSubmit"></add-or-update>
       </base-dialog>
     </div>
   </el-card>
diff --git a/src/views/modules/sys/dict-type.vue b/src/views/modules/sys/dict-type.vue
index fb10e5d..a75d94b 100644
--- a/src/views/modules/sys/dict-type.vue
+++ b/src/views/modules/sys/dict-type.vue
@@ -2,36 +2,16 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-sys__user">
       <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-      <base-table
-        :table-props="tableProps"
-        :page="listQuery.page"
-        :limit="listQuery.limit"
-        :table-data="tableData"
-      >
-        <method-btn
-          v-if="tableBtn.length"
-          slot="handleBtn"
-          :width="100"
-          label="操作"
-          :method-list="tableBtn"
-          @clickBtn="handleClick"
-        />
+      <base-table :table-props="tableProps" :page="listQuery.page" :limit="listQuery.limit" :table-data="tableData">
+        <method-btn v-if="tableBtn.length" slot="handleBtn" :width="100" label="操作" :method-list="tableBtn"
+          @clickBtn="handleClick" />
       </base-table>
-      <pagination
-        :limit.sync="listQuery.limit"
-        :page.sync="listQuery.page"
-        :total="listQuery.total"
-        @pagination="getDataList"
-      />
+      <pagination :limit.sync="listQuery.limit" :page.sync="listQuery.page" :total="listQuery.total"
+        @pagination="getDataList" />
       <!-- 弹窗, 新增 / 修改 -->
-      <base-dialog
-        :dialogTitle="addOrEditTitle"
-        :dialogVisible="addOrUpdateVisible"
-        @cancel="handleCancel"
-        @confirm="handleConfirm"
-        :before-close="handleCancel"
-      >
-        <add-or-update ref="addOrUpdate" @successSubmit="successSubmit"></add-or-update>
+      <base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="addOrUpdateVisible" @cancel="handleCancel"
+        @confirm="handleConfirm" :before-close="handleCancel">
+        <add-or-update ref="addOrUpdate" @refreshDataList="successSubmit"></add-or-update>
       </base-dialog>
     </div>
   </el-card>
diff --git a/src/views/pages/login.vue b/src/views/pages/login.vue
index e500dca..a419b6c 100644
--- a/src/views/pages/login.vue
+++ b/src/views/pages/login.vue
@@ -22,7 +22,7 @@
                 </span>
               </el-input>
             </el-form-item>
-            <!-- <el-form-item prop="captcha">
+            <el-form-item prop="captcha">
               <el-row :gutter="20">
                 <el-col :span="14">
                   <el-input v-model="dataForm.captcha" :placeholder="$t('login.captcha')">
@@ -35,7 +35,7 @@
                   <img :src="captchaPath" @click="getCaptcha()">
                 </el-col>
               </el-row>
-            </el-form-item> -->
+            </el-form-item>
             <el-form-item>
               <el-button type="primary" @click="dataFormSubmitHandle()" class="w-percent-100">{{ $t('login.title') }}</el-button>
             </el-form-item>
@@ -81,14 +81,14 @@ export default {
     }
   },
   created () {
-    // this.getCaptcha()
+    this.getCaptcha()
   },
   methods: {
     // 获取验证码
-    // getCaptcha () {
-    //   // this.dataForm.uuid = getUUID()
-    //   this.captchaPath = `${window.SITE_CONFIG['apiURL']}/captcha?uuid=${this.dataForm.uuid}`
-    // },
+    getCaptcha () {
+      // this.dataForm.uuid = getUUID()
+      this.captchaPath = `${window.SITE_CONFIG['apiURL']}/captcha?uuid=${this.dataForm.uuid}`
+    },
     // 表单提交
     dataFormSubmitHandle: debounce(function () {
       // this.$refs['dataForm'].validate((valid) => {
diff --git a/vue.config.js b/vue.config.js
index 742e30e..d3b6242 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,7 +1,7 @@
 /*
  * @Author: zhp
  * @Date: 2023-01-06 10:13:07
- * @LastEditTime: 2023-04-07 09:56:13
+ * @LastEditTime: 2023-05-31 10:43:18
  * @LastEditors: zhp
  * @Description: 
  */
-- 
2.45.2