Merge branch 'master' into dy

提交
Merge pull request 'zhp' (#30 ) from zhp into master
2023-08-25 14:46:33 +08:00 · 2023-08-25 11:11:34 +08:00 · 2023-07-21 17:04:29 +08:00 · 2023-07-21 17:03:56 +08:00 · 2023-07-21 17:03:25 +08:00 · 2023-07-21 16:47:13 +08:00
181 changed files with 14307 additions and 2092 deletions
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
    "axios": "^0.19.2",
    "babel-eslint": "^8.0.1",
    "babel-plugin-component": "^1.1.1",
-    "code-brick-zj": "0.0.7",
+    "code-brick-zj": "1.0.2",
    "core-js": "^3.6.5",
    "echarts": "^5.4.2",
    "element-theme": "^2.0.1",
--- a/public/index.html
+++ b/public/index.html
@@ -1,8 +1,8 @@
 <!--
 * @Author: zwq
 * @Date: 2022-08-22 14:57:50
- * @LastEditors: zhp
+ * @LastEditors: DY
- * @LastEditTime: 2023-07-11 10:23:31
+ * @LastEditTime: 2023-08-01 14:42:59
 * @Description: 
 -->
 <!DOCTYPE html>
@@ -40,6 +40,7 @@
    <script>
      // window.SITE_CONFIG['apiURL'] = 'http://192.168.1.76:8080/ym-pass';
      window.SITE_CONFIG['apiURL'] = 'http://192.168.1.23:8080/';
      // window.SITE_CONFIG['apiURL'] = 'http://192.168.0.31:8080/';
    </script>
    <% } %>
      <!-- 集成测试环境 -->
--- a/src/assets/img/add_new.png
+++ b/src/assets/img/add_new.png
--- a/src/assets/scss/common.scss
+++ b/src/assets/scss/common.scss
@@ -599,13 +599,19 @@ img {
            display: none;
          }
          & > .el-tabs__item {
            height: $content--tabs-header-height;
            border: 0;
            padding: 0 10px;
-            color: rgba(89, 89, 89, 1);
+            margin: 6px 5px 6px 0px;
            height: 24px;
            font-size: 12px;
            line-height: 24px;
            border-radius: 5px;
            background-color: rgba(239, 239, 239, 1);
            &:focus,
            &:hover,
            &.is-active {
              color: rgba(255, 255, 255, 1);
              background-color: rgba(62, 142, 247, 1);
              &:after {
                display: block;
              }
@@ -630,6 +636,7 @@ img {
              line-height: 24px;
              border-radius: 5px;
              background-color: rgba(239, 239, 239, 1);
              &:hover,
              &.is-active {
                color: rgba(255, 255, 255, 1);
                background-color: rgba(62, 142, 247, 1);
--- a/src/filters/code-filter.js
+++ b/src/filters/code-filter.js
@@ -18,6 +18,10 @@ const table = {
    1: '需要审批',
    0: '不需要审批',
  },
  gradeFinish: {
    1: '已打分',
    0: '未打分',
  },
  step: {
    0: 'D0',
    1: 'D1',
--- a/src/filters/customerquality/index.js
+++ b/src/filters/customerquality/index.js
@@ -0,0 +1,33 @@
 /*
 * @Date: 2020-12-29 16:49:28
 * @LastEditors: zhp
 * @LastEditTime: 2023-07-13 15:52:31
 * @FilePath: \basic-admin\src\filters\DataDict\index.js
 * @Description: 部分常量的数据字典定义
 */
 const table = {
     currentStage:{
         0: '接受投诉阶段',
         1: '解释澄清阶段',
         2: '提出解决方案阶段',
         3: '回访阶段'
        },
      questionType: {
           0: '产品质量题',
           1: '售后服务题',
           2: '物流配送问题',
           3: '单关问题',
           4: '4系统故问题'
        },
      status: {
        0: '不可用',
        1: '可用'
      },
 }
 export default function (dictTable) {
  return function (val) {
    return table?.[dictTable]?.[val]
  }
 }
--- a/src/filters/incoming/index.js
+++ b/src/filters/incoming/index.js
@@ -0,0 +1,29 @@
 /*
 * @Date: 2020-12-29 16:49:28
 * @LastEditors: zhp
 * @LastEditTime: 2023-07-17 09:36:52
 * @FilePath: \basic-admin\src\filters\DataDict\index.js
 * @Description: 部分常量的数据字典定义
 */
 import i18n from "@/i18n"
 const table = {
  upload: {
      0: '未上传',
      1:' 已上传',
  },
  VerifyType: {
    0: i18n.t('gage.insideVerify'),
    1:  i18n.t('gage.outsideVerify')
  },
  judgmentResult: {
    0: '未判定  ',
    1: '合格',
    2: '不合格'
   },
 }
 export default function (dictTable) {
  return function (val) {
    return table?.[dictTable]?.[val]
  }
 }
--- a/src/filters/index.js
+++ b/src/filters/index.js
@@ -1,7 +1,7 @@
 /*
 * @Date: 2020-12-14 09:07:03
 * @LastEditors: zhp
- * @LastEditTime: 2023-04-18 15:14:26
+ * @LastEditTime: 2023-07-17 14:34:42
 * @FilePath: \basic-admin\src\filters\index.js
 * @Description: 过滤器定义、多语言过滤器修改
 */
@@ -146,6 +146,22 @@ export function handleLimit(string) {
  }
 }
 export function handleProductType(Array) {
  let arr = []
  Array.forEach(ele => {
    arr.push(ele.productTypeName)
  })
  return arr.join(',')
 }
 export function handleProcess(Array) {
  let arr = []
  Array.forEach(ele => {
    arr.push(ele.processName)
  })
  return arr.join(',')
 }
 export function getSimpleText(html) {
  var re1 = new RegExp('<.+?>', 'g')
  var msg = html.replace(re1, '')
--- a/src/filters/quality/index.js
+++ b/src/filters/quality/index.js
@@ -0,0 +1,46 @@
 /*
 * @Date: 2020-12-29 16:49:28
 * @LastEditors: zhp
 * @LastEditTime: 2023-07-18 14:08:41
 * @FilePath: \basic-admin\src\filters\DataDict\index.js
 * @Description: 部分常量的数据字典定义
 */
 import i18n from "@/i18n"
 const table = {
  monitor: {
      0: '否',
      1:'是',
  },
  characteristicsType: {
      0: '计量',
      1:'计数',
  },
  VerifyType: {
    0: i18n.t('gage.insideVerify'),
    1:  i18n.t('gage.outsideVerify')
  },
  inspectionType: {
      0: '监控',
        1:'电芯来料检验',
        2: 'IQC抽检',
        3: 'IQC抽检2',
        4: '原料抽检',
        5: '进货外观检验',
        6: '库内原料检验',
        7: '来料检验',
        8: '胶片',
        9: '抽检',
        10: '巡检',
        11: '首检',
        12: '末检',
        13: '实时监测',
        14: 'FQC抽检',
        15: 'OQC抽检'
  }
 }
 export default function (dictTable) {
  return function (val) {
    return table?.[dictTable]?.[val]
  }
 }
--- a/src/filters/supplier/index.js
+++ b/src/filters/supplier/index.js
@@ -1,7 +1,7 @@
 /*
 * @Date: 2020-12-29 16:49:28
 * @LastEditors: zhp
- * @LastEditTime: 2023-07-11 14:23:27
+ * @LastEditTime: 2023-07-13 15:46:31
 * @FilePath: \basic-admin\src\filters\DataDict\index.js
 * @Description: 部分常量的数据字典定义
 */
@@ -13,7 +13,7 @@ const table = {
  },
  available: {
     0: '不可用',
-     1:'不可用',
+     1:'可用',
  },
  supplierStatus:{
     0: '合格',
--- a/src/i18n/zh-CN.js
+++ b/src/i18n/zh-CN.js
@@ -13,6 +13,7 @@ t.brand.mini = 'qms'
 t.public = {}
 t.public.operation = '操作'
 t.public.activate = '启动'
 t.add = '新增'
 t.delete = '删除'
@@ -42,6 +43,13 @@ t.available = '可用'
 t.notAvailable = '不可用'
 t.time = '时间段'
 t.parameter = '台差参数'
 t.configuration = '配置'
 t.uploadFile = '上传'
 t.detail = '查看详情'
 t.preview = '预览'
 t.edit = '编辑'
 t.finished = '已完成'
 t.implementation = '实施中'
@@ -49,9 +57,11 @@ t.parameter = '台差参数'
 t.prompt = {}
 t.prompt.title = '提示'
 t.prompt.info = '确定进行[{handle}]操作?'
 t.prompt.delete = '是否对[{object}]进行删除操作？'
 t.prompt.success = '操作成功'
 t.prompt.failed = '操作失败'
 t.prompt.deleteBatch = '请选择删除项'
 t.prompt.chooseGroup = '请选择要求分组'
 t.validate = {}
 t.validate.required = '必填项不能为空'
@@ -299,6 +309,10 @@ t.basic.course = '过程检验'
 t.basic.shipment = '出货检验'
 t.basic.userName = '用户名'
 t.basic.departName = '部门名'
 t.basic.productCode = '产品编码'
 t.basic.productName = '产品名称'
@@ -338,7 +352,7 @@ t.quality.judgmentMark = '判断标识'
 t.quality.disposalMethodStatus = '状态'
 t.quality.inspectionPositionNumber = '序号'
 t.quality.productName =	'检验产品'
-t.quality.supplierName =	'供应商名称'
+t.quality.suppliername =	'供应商名称'
 t.quality.transferOutName =	'转出'
 t.quality.transferInName =	'转入'
 t.quality.dataSources	 =	'数据来源'
@@ -346,6 +360,8 @@ t.quality.remark = '备注'
 t.quality.userName = '创建人'
 t.quality.inspectionStage = '检验阶段'
 t.quality.supplierName = '供应商'
 t.quality.supplierList = '供应商列表'
 t.quality.principal = '负责人列表'
 t.quality.normalToRelaxed = '正常转放宽'
 t.quality.normalToTightened =	'正常转加严'
 t.quality.relaxedToNormal =	'放宽转正常'
@@ -359,7 +375,23 @@ t.quality.sampleRangeHigh = '取样范围高'
 t.quality.inspectionLevel = '检验水平'
 t.quality.sampleSizeCode = '样本量字码'
 t.quality.sampleSize = '样本量'
-
+t.quality.inspectionPlan = '是否有检验计划'
 t.quality.analyzeDrawings = '分析图形'
 t.quality.characteristicsType = '特性类型'
 t.quality.company = '单位'
 t.quality.decimalDigits = '小数位数'
 t.quality.measuringToolsType = '量具类型'
 t.quality.monitor = '是否监控'
 t.quality.parameterName = '参数名称'
 t.quality.parameterCode = '	参数编码'
 t.quality.sampleSize = '样本大小'
 t.quality.source = '来源'
 t.quality.specificationCenterline = 'SL'
 t.quality.specificationOffline = 'LSL'
 t.quality.specifications = '规格'
 t.quality.targetCpk = '目标CPK'
 t.quality.targetPpk = '目标PPK'
 t.quality.upperSpecificationLimit = 'USL'
@@ -445,13 +477,17 @@ t.supplier.projectName = '评估项目'
 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.supplier.supplierStatus = '供应商状态'
 t.supplier.year = '年度'
 t.supplier.quarter = '季度'
 t.supplier.month = '月度'
 t.supplier.materiel = '物料'
 t.supplier.requiredGrouping = '要求分组'
@@ -551,6 +587,9 @@ t.gage.repeatabilityAndReproducibility = '重复性和再现性(R&R)'
 t.gage.partVariation = '零件变差(TV)'
 t.gage.decide = '综合判定'
 t.gage.tabularComputations = '表格计算'
 t.gage.tabularComputationsAdd = '表格计算新增'
 t.gage.fabrication = '制作'
@@ -578,7 +617,9 @@ t.laboratory.title = '主题'
 t.laboratory.trainContent	= '培训内容'
 t.laboratory.trainDate	= '培训日期'
 t.laboratory.trainDuration = '培训时长'
-t.laboratory.trainType	= '培训类型'
+t.laboratory.trainType = '培训类型'
 t.laboratory.timeSlot	= '时间段'
 t.code = {}
@@ -663,5 +704,76 @@ t.dictionary = {}
 t.dictionary.name = '	名称'
 t.dictionary.code = '	编码'
 t.researchquality = {}
 t.researchquality.title = '标题'
 t.researchquality.description = '描述'
 t.researchquality.code = '编码'
 t.researchquality.requirementListGroupId = '所属分组'
 t.researchquality.registrationDate = '登记日期'
 t.researchquality.changeSource = '变更来源'
 t.researchquality.owner = '所有者'
 t.researchquality.category = 'Category'
 t.researchquality.currentStage = '当前阶段'
 t.researchquality.productName = '产品名称'
 t.researchquality.qualityChangeStatus = '状态'
 t.researchquality.temporaryChange = '临时变更'
 t.researchquality.sourceRemark = '来源备注'
 t.researchquality.processName = '工序名称'
 t.researchquality.productTypeName = '产品类型'
 t.researchquality.planPhase = '计划阶段'
 t.researchquality.planTime = '计划时间'
 t.researchquality.stageOneName = '阶段1'
 t.researchquality.stageTwoName = '阶段2'
 t.researchquality.stageThreeName = '阶段3'
 t.researchquality.stageFourName = '阶段4'
 t.researchquality.stageOneDate = '阶段1时间'
 t.researchquality.stageTwoDate = '阶段2时间'
 t.researchquality.stageThreeDate = '阶段3时间'
 t.researchquality.stageFourDate = '阶段4时间'
 t.researchquality.approvedMemo = '审核记录'
 t.researchquality.phase = '阶段'
 t.researchquality.realTime = '实际完成时间'
 t.customerquality = {}
 t.customerquality.customerName = '客户名称'
 t.customerquality.currentStage = '当前阶段'
 t.customerquality.serialNumber = '序列号'
 t.customerquality.description = '描述'
 t.customerquality.questionType = '问题类型'
 t.customerquality.knowledgeBaseName = '知识库名称'
 t.customerquality.code = '编号'
 t.customerquality.category = '类别'
 t.customerquality.requirementListName = '要求清单名称'
 t.customerquality.uploadFiles = '不可上传文件'
 t.customerquality.accessPath = '访问路径'
 t.customerquality.knowledgeBaseFileId = '知识库文件标识'
 t.customerquality.title = '标题'
 t.customerquality.knowledgeBase = '知识库'
 t.customerquality.productName = '品名'
 t.customerquality.customerName = '客户'
 t.customerquality.qualityAcceptanceDate = '质量接收日期'
 t.customerquality.confirmDeliveryDate = '确认交付日期'
 t.customerquality.deliveryRequiredDate = '要求交付日期'
 t.customerquality.status = '状态'
 t.customerquality.file = '清单文件'
 t.customerquality.previousVersionCode = '上一版本号'
 t.customerquality.first = '首次'
 t.customerquality.confidentialityAgreement = '保密协议'
 t.customerquality.ppapGrade = '	ppap等级'
 t.customerquality.version = '	版本'
 t.customerquality.amendment = '	修订'
 export default t
--- a/src/icons/svg/icon-del.svg
+++ b/src/icons/svg/icon-del.svg
@@ -0,0 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="40px" height="40px" viewBox="0 0 40 40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <title>删除</title>
    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.69689">
        <g id="供应商评估_评估模版" transform="translate(-1241.000000, -403.000000)" fill-rule="nonzero">
            <g id="删除" transform="translate(1241.000000, 403.000000)">
                <rect id="矩形" opacity="0" x="0" y="0" width="40" height="40"></rect>
                <path d="M25.5755088,1.28498542 C27.8552525,1.28498542 29.739258,3.1141321 29.8368374,5.37516257 L29.840807,5.5594082 L29.84046,6.86781876 L36.7102456,6.86802554 C37.3996072,6.86802554 37.8113884,7.26595838 38.0368575,7.91362769 L38.0794942,8.04644746 L38.1173248,8.18566341 L38.13,8.28889447 C38.13,9.06911419 37.5468225,9.64626258 36.8307452,9.70485377 L36.7102456,9.70976341 L35.16042,9.70934985 L35.1607368,33.8468114 C35.1607368,36.0667398 33.4366512,37.9141397 31.2664665,38.1049823 L31.079388,38.1172534 L30.8954386,38.1212342 L9.6157193,38.1212342 C7.3359756,38.1212342 5.45197012,36.2920875 5.3543907,34.0310571 L5.35042105,33.8468114 L5.35024,9.70934985 L3.42975439,9.70976341 C2.69477563,9.70976341 2.14173305,9.19187233 2.03050853,8.53418971 L2.01489493,8.40932835 L2.01,8.28889447 C2.01,7.50867476 2.59317752,6.93152637 3.30925482,6.87293518 L3.42975439,6.86802554 L9.92802,6.86781876 L9.92803509,5.5594082 C9.92803509,3.33947983 11.6521207,1.49207995 13.8223054,1.30123731 L14.0093839,1.28896619 L14.1933333,1.28498542 L25.5755088,1.28498542 Z M32.3207,9.70934985 L8.31122,9.70934985 L8.18992982,33.970879 C8.18992982,34.6086332 8.93553979,35.2156816 9.73635524,35.274792 L9.86315789,35.2794963 L31.1428772,35.2794963 C31.7547945,35.2794963 32.2675306,34.5542502 32.3172744,33.6232439 L32.3212281,33.4746088 L32.3207,9.70934985 Z M14.4407719,14.1880115 C15.1760909,14.1880115 15.5955852,14.6407706 15.8100205,15.3664334 L15.8478511,15.5056493 L15.8605263,15.6088804 L15.8605263,28.8841091 C15.8605263,29.7076744 15.2107514,30.3049781 14.4407719,30.3049781 C13.7113177,30.3049781 13.0897479,29.7688939 13.0263401,29.0122113 L13.0210175,28.8841091 L13.0210175,15.6088804 C13.0210175,14.7526239 13.5840451,14.1880115 14.4407719,14.1880115 Z M20.6267368,14.1880115 C21.3620559,14.1880115 21.7815501,14.6407706 21.9959854,15.3664334 L22.0338161,15.5056493 L22.0464912,15.6088804 L22.0464912,28.8841091 C22.0464912,29.7076744 21.3967163,30.3049781 20.6267368,30.3049781 C19.8972826,30.3049781 19.2757128,29.7688939 19.212305,29.0122113 L19.2069825,28.8841091 L19.2069825,15.6088804 C19.2069825,14.7526239 19.77001,14.1880115 20.6267368,14.1880115 Z M26.8127018,14.1880115 C27.5480208,14.1880115 27.967515,14.6407706 28.1819503,15.3664334 L28.219781,15.5056493 L28.2324561,15.6088804 L28.2324561,28.8841091 C28.2324561,29.7076744 27.5826812,30.3049781 26.8127018,30.3049781 C26.0832476,30.3049781 25.4616777,29.7688939 25.39827,29.0122113 L25.3929474,28.8841091 L25.3929474,15.6088804 C25.3929474,14.7526239 25.9559749,14.1880115 26.8127018,14.1880115 Z M25.6992281,4.1267233 L14.3170526,4.1267233 C13.6049877,4.1267233 12.9624425,4.73349464 12.8967786,5.44069788 L12.8912632,5.5594082 L12.89072,6.86781876 L27.12458,6.86781876 L27.1250175,5.5594082 C27.1250175,4.84260863 26.5199494,4.19811099 25.8171749,4.13225473 L25.6992281,4.1267233 Z" id="形状结合" fill="#000000"></path>
            </g>
        </g>
    </g>
 </svg>
--- a/src/icons/svg/icon-del1.svg
+++ b/src/icons/svg/icon-del1.svg
@@ -0,0 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="40px" height="40px" viewBox="0 0 40 40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <title>删除</title>
    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
        <g id="供应商评估_评估模版" transform="translate(-689.000000, -403.000000)" fill-rule="nonzero">
            <g id="删除" transform="translate(689.000000, 403.000000)">
                <rect id="矩形" opacity="0" x="0" y="0" width="40" height="40"></rect>
                <path d="M25.5755088,1.28498542 C27.8552525,1.28498542 29.739258,3.1141321 29.8368374,5.37516257 L29.840807,5.5594082 L29.84046,6.86781876 L36.7102456,6.86802554 C37.3996072,6.86802554 37.8113884,7.26595838 38.0368575,7.91362769 L38.0794942,8.04644746 L38.1173248,8.18566341 L38.13,8.28889447 C38.13,9.06911419 37.5468225,9.64626258 36.8307452,9.70485377 L36.7102456,9.70976341 L35.16042,9.70934985 L35.1607368,33.8468114 C35.1607368,36.0667398 33.4366512,37.9141397 31.2664665,38.1049823 L31.079388,38.1172534 L30.8954386,38.1212342 L9.6157193,38.1212342 C7.3359756,38.1212342 5.45197012,36.2920875 5.3543907,34.0310571 L5.35042105,33.8468114 L5.35024,9.70934985 L3.42975439,9.70976341 C2.69477563,9.70976341 2.14173305,9.19187233 2.03050853,8.53418971 L2.01489493,8.40932835 L2.01,8.28889447 C2.01,7.50867476 2.59317752,6.93152637 3.30925482,6.87293518 L3.42975439,6.86802554 L9.92802,6.86781876 L9.92803509,5.5594082 C9.92803509,3.33947983 11.6521207,1.49207995 13.8223054,1.30123731 L14.0093839,1.28896619 L14.1933333,1.28498542 L25.5755088,1.28498542 Z M32.3207,9.70934985 L8.31122,9.70934985 L8.18992982,33.970879 C8.18992982,34.6086332 8.93553979,35.2156816 9.73635524,35.274792 L9.86315789,35.2794963 L31.1428772,35.2794963 C31.7547945,35.2794963 32.2675306,34.5542502 32.3172744,33.6232439 L32.3212281,33.4746088 L32.3207,9.70934985 Z M14.4407719,14.1880115 C15.1760909,14.1880115 15.5955852,14.6407706 15.8100205,15.3664334 L15.8478511,15.5056493 L15.8605263,15.6088804 L15.8605263,28.8841091 C15.8605263,29.7076744 15.2107514,30.3049781 14.4407719,30.3049781 C13.7113177,30.3049781 13.0897479,29.7688939 13.0263401,29.0122113 L13.0210175,28.8841091 L13.0210175,15.6088804 C13.0210175,14.7526239 13.5840451,14.1880115 14.4407719,14.1880115 Z M20.6267368,14.1880115 C21.3620559,14.1880115 21.7815501,14.6407706 21.9959854,15.3664334 L22.0338161,15.5056493 L22.0464912,15.6088804 L22.0464912,28.8841091 C22.0464912,29.7076744 21.3967163,30.3049781 20.6267368,30.3049781 C19.8972826,30.3049781 19.2757128,29.7688939 19.212305,29.0122113 L19.2069825,28.8841091 L19.2069825,15.6088804 C19.2069825,14.7526239 19.77001,14.1880115 20.6267368,14.1880115 Z M26.8127018,14.1880115 C27.5480208,14.1880115 27.967515,14.6407706 28.1819503,15.3664334 L28.219781,15.5056493 L28.2324561,15.6088804 L28.2324561,28.8841091 C28.2324561,29.7076744 27.5826812,30.3049781 26.8127018,30.3049781 C26.0832476,30.3049781 25.4616777,29.7688939 25.39827,29.0122113 L25.3929474,28.8841091 L25.3929474,15.6088804 C25.3929474,14.7526239 25.9559749,14.1880115 26.8127018,14.1880115 Z M25.6992281,4.1267233 L14.3170526,4.1267233 C13.6049877,4.1267233 12.9624425,4.73349464 12.8967786,5.44069788 L12.8912632,5.5594082 L12.89072,6.86781876 L27.12458,6.86781876 L27.1250175,5.5594082 C27.1250175,4.84260863 26.5199494,4.19811099 25.8171749,4.13225473 L25.6992281,4.1267233 Z" id="形状结合" fill="#FF2323"></path>
            </g>
        </g>
    </g>
 </svg>
--- a/src/icons/svg/icon-edit0.svg
+++ b/src/icons/svg/icon-edit0.svg
@@ -0,0 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="40px" height="40px" viewBox="0 0 40 40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <title>编辑</title>
    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
        <g id="供应商评估_评估模版" transform="translate(-513.000000, -404.000000)">
            <g id="编组-2备份" transform="translate(512.000000, 404.000000)">
                <g id="编辑" transform="translate(1.000000, 0.000000)">
                    <rect id="矩形" x="0" y="0" width="35.5555556" height="35.5555556"></rect>
                    <g id="常用购票人／编辑32" fill-rule="nonzero">
                        <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="40" height="40"></rect>
                        <path d="M21.9461538,3.08333333 C22.4935031,3.08333333 22.9992746,3.37534065 23.2729492,3.84935897 C23.5466238,4.32337729 23.5466238,4.90739194 23.2729492,5.38141027 C23.0241541,5.81233601 22.5835434,6.09283945 22.0942569,6.14027869 L21.9461538,6.1474359 L9.74358974,6.1474359 C7.82155659,6.1474359 6.25170159,7.65528983 6.15242066,9.55260178 L6.1474359,9.74358974 L6.1474359,30.2564103 C6.1474359,32.1784434 7.65528983,33.7482984 9.55260178,33.8475793 L9.74358974,33.8525641 L30.2564103,33.8525641 C32.1784434,33.8525641 33.7482984,32.3447102 33.8475793,30.4473982 L33.8525641,30.2564103 L33.8525641,19.5602564 C33.8525641,18.7141279 34.5384868,18.0282051 35.3846154,18.0282051 C36.1837368,18.0282051 36.8399586,18.6400313 36.9104057,19.4208085 L36.9166667,19.5602564 L36.9166667,30.2564103 C36.9166667,33.8565054 34.0603077,36.7894621 30.4902312,36.912639 L30.2564103,36.9166667 L9.74358974,36.9166667 C6.14349464,36.9166667 3.21053791,34.0603077 3.08736098,30.4902312 L3.08333333,30.2564103 L3.08333333,9.74358974 C3.08333333,6.14349464 5.93969229,3.21053791 9.50976879,3.08736098 L9.74358974,3.08333333 L21.9461538,3.08333333 Z M35.5111781,5.19079908 C36.0819035,5.72326795 36.1560265,6.59166826 35.7034748,7.2136457 L35.6059332,7.334583 L21.6187527,22.3371482 C21.2454671,22.7375271 20.6869374,22.908347 20.1535563,22.7852616 C19.6201753,22.6621763 19.1929761,22.2638853 19.0328806,21.7404211 C18.8873392,21.2645445 18.9826458,20.7509435 19.2816371,20.3606783 L19.3774079,20.2474599 L33.3698382,5.24073629 C33.951474,4.64500849 34.9024043,4.62283227 35.5111781,5.19079908 Z" id="形状结合" fill="#0B58FF"></path>
                    </g>
                </g>
            </g>
        </g>
    </g>
 </svg>
--- a/src/icons/svg/icon-edit1.svg
+++ b/src/icons/svg/icon-edit1.svg
@@ -0,0 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="40px" height="40px" viewBox="0 0 40 40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <title>编辑</title>
    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.69689">
        <g id="供应商评估_评估模版" transform="translate(-1065.000000, -404.000000)">
            <g id="编组-2备份-3" transform="translate(1064.000000, 404.000000)">
                <g id="编辑" transform="translate(1.000000, 0.000000)">
                    <rect id="矩形" x="0" y="0" width="35.5555556" height="35.5555556"></rect>
                    <g id="常用购票人／编辑32" fill="#000000" fill-rule="nonzero">
                        <rect id="矩形" opacity="0" x="0" y="0" width="40" height="40"></rect>
                        <path d="M21.9461538,3.08333333 C22.4935031,3.08333333 22.9992746,3.37534065 23.2729492,3.84935897 C23.5466238,4.32337729 23.5466238,4.90739194 23.2729492,5.38141027 C23.0241541,5.81233601 22.5835434,6.09283945 22.0942569,6.14027869 L21.9461538,6.1474359 L9.74358974,6.1474359 C7.82155659,6.1474359 6.25170159,7.65528983 6.15242066,9.55260178 L6.1474359,9.74358974 L6.1474359,30.2564103 C6.1474359,32.1784434 7.65528983,33.7482984 9.55260178,33.8475793 L9.74358974,33.8525641 L30.2564103,33.8525641 C32.1784434,33.8525641 33.7482984,32.3447102 33.8475793,30.4473982 L33.8525641,30.2564103 L33.8525641,19.5602564 C33.8525641,18.7141279 34.5384868,18.0282051 35.3846154,18.0282051 C36.1837368,18.0282051 36.8399586,18.6400313 36.9104057,19.4208085 L36.9166667,19.5602564 L36.9166667,30.2564103 C36.9166667,33.8565054 34.0603077,36.7894621 30.4902312,36.912639 L30.2564103,36.9166667 L9.74358974,36.9166667 C6.14349464,36.9166667 3.21053791,34.0603077 3.08736098,30.4902312 L3.08333333,30.2564103 L3.08333333,9.74358974 C3.08333333,6.14349464 5.93969229,3.21053791 9.50976879,3.08736098 L9.74358974,3.08333333 L21.9461538,3.08333333 Z M35.5111781,5.19079908 C36.0819035,5.72326795 36.1560265,6.59166826 35.7034748,7.2136457 L35.6059332,7.334583 L21.6187527,22.3371482 C21.2454671,22.7375271 20.6869374,22.908347 20.1535563,22.7852616 C19.6201753,22.6621763 19.1929761,22.2638853 19.0328806,21.7404211 C18.8873392,21.2645445 18.9826458,20.7509435 19.2816371,20.3606783 L19.3774079,20.2474599 L33.3698382,5.24073629 C33.951474,4.64500849 34.9024043,4.62283227 35.5111781,5.19079908 Z" id="形状结合"></path>
                    </g>
                </g>
            </g>
        </g>
    </g>
 </svg>
--- a/src/icons/svg/icon-look.svg
+++ b/src/icons/svg/icon-look.svg
@@ -0,0 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="40px" height="40px" viewBox="0 0 40 40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <title>预览</title>
    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
        <g id="供应商评估_评估模版" transform="translate(-333.000000, -404.000000)" fill-rule="nonzero">
            <g id="预览" transform="translate(333.000000, 404.000000)">
                <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="39.7350993" height="40"></rect>
                <path d="M38.0837006,36.8192237 L34.2436156,32.9468752 C34.9636315,31.7367663 35.4436422,30.2846356 35.4436422,28.8325049 C35.4436422,24.7181346 32.0835677,21.3298297 28.0034774,21.3298297 C23.923387,21.3298297 20.5633126,24.7181346 20.5633126,28.8325049 C20.5633126,32.9468752 23.923387,36.3351801 28.0034774,36.3351801 C29.6835146,36.3351801 31.1235465,35.8511366 32.3235731,34.8830494 L36.1636581,38.7553979 C36.6436687,39.2394415 37.60369,39.2394415 38.0837006,38.7553979 C38.5637113,38.2713544 38.5637113,37.3032673 38.0837006,36.8192237 Z M27.7634721,33.4309188 C25.1234136,33.4309188 23.2033711,31.2527227 23.2033711,28.8325049 C23.2033711,26.1702653 25.3634189,24.234091 27.7634721,24.234091 C30.4035305,24.234091 32.3235731,26.4122871 32.3235731,28.8325049 C32.5635784,31.4947445 30.4035305,33.4309188 27.7634721,33.4309188 Z M8.5630468,39.4814633 C6.64300427,39.4814633 2.56291391,38.2713544 2.56291391,34.1569841 L2.56291391,8.26065345 C2.56291391,3.42021782 5.68298301,1 8.5630468,1 L29.4435093,1 C33.043589,1 35.4436422,3.42021782 35.4436422,7.29256632 L35.4436422,16.0053505 C35.4436422,16.7314158 34.9636315,17.6995029 34.0036103,17.6995029 C32.8035837,17.4574812 32.3235731,16.9734376 32.3235731,16.0053505 L32.3235731,7.77660989 C32.3235731,5.11437029 29.9235199,4.14628316 28.9634986,4.14628316 L8.5630468,4.14628316 C7.36302022,4.14628316 5.4429777,5.59841385 5.4429777,8.74469702 L5.4429777,32.9468752 C5.4429777,36.5772019 7.84303085,36.5772019 8.80305212,36.5772019 L16.0032116,36.5772019 C16.9632329,36.3351801 17.4432435,37.3032673 17.4432435,38.0293326 C17.4432435,38.7553979 16.9632329,39.4814633 15.7632063,39.4814633 L8.5630468,39.4814633 Z M10.7230946,7.53458811 L27.0434561,7.53458811 C27.7634721,7.53458811 28.2434827,8.01863167 28.2434827,8.74469702 C28.2434827,9.47076236 27.7634721,9.95480592 27.0434561,9.95480592 L10.7230946,9.95480592 C10.0030787,9.95480592 9.52306806,9.47076236 9.52306806,8.74469702 C9.52306806,8.01863167 9.76307338,7.53458811 10.7230946,7.53458811 Z M10.7230946,14.5532198 L27.0434561,14.5532198 C27.7634721,14.5532198 28.2434827,15.0372633 28.2434827,15.7633287 C28.2434827,16.489394 27.7634721,16.9734376 27.0434561,16.9734376 L10.7230946,16.9734376 C10.0030787,16.9734376 9.52306806,16.489394 9.52306806,15.7633287 C9.52306806,15.2792851 9.76307338,14.5532198 10.7230946,14.5532198 Z M10.7230946,21.8138732 L17.6832488,21.8138732 C18.4032647,21.8138732 18.8832754,22.2979168 18.8832754,23.0239821 C18.8832754,23.7500475 18.1632594,24.234091 17.6832488,24.234091 L10.7230946,24.234091 C10.0030787,24.234091 9.52306806,23.7500475 9.52306806,23.0239821 C9.52306806,22.2979168 9.76307338,21.8138732 10.7230946,21.8138732 Z" id="形状" fill="#0B58FF"></path>
            </g>
        </g>
    </g>
 </svg>
--- a/src/icons/svg/icon-look1.svg
+++ b/src/icons/svg/icon-look1.svg
@@ -0,0 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="40px" height="40px" viewBox="0 0 40 40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <title>预览</title>
    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.69689">
        <g id="供应商评估_评估模版" transform="translate(-885.000000, -404.000000)" fill="#000000" fill-rule="nonzero">
            <g id="预览" transform="translate(885.000000, 404.000000)">
                <rect id="矩形" opacity="0" x="0" y="0" width="39.7350993" height="40"></rect>
                <path d="M38.0837006,36.8192237 L34.2436156,32.9468752 C34.9636315,31.7367663 35.4436422,30.2846356 35.4436422,28.8325049 C35.4436422,24.7181346 32.0835677,21.3298297 28.0034774,21.3298297 C23.923387,21.3298297 20.5633126,24.7181346 20.5633126,28.8325049 C20.5633126,32.9468752 23.923387,36.3351801 28.0034774,36.3351801 C29.6835146,36.3351801 31.1235465,35.8511366 32.3235731,34.8830494 L36.1636581,38.7553979 C36.6436687,39.2394415 37.60369,39.2394415 38.0837006,38.7553979 C38.5637113,38.2713544 38.5637113,37.3032673 38.0837006,36.8192237 Z M27.7634721,33.4309188 C25.1234136,33.4309188 23.2033711,31.2527227 23.2033711,28.8325049 C23.2033711,26.1702653 25.3634189,24.234091 27.7634721,24.234091 C30.4035305,24.234091 32.3235731,26.4122871 32.3235731,28.8325049 C32.5635784,31.4947445 30.4035305,33.4309188 27.7634721,33.4309188 Z M8.5630468,39.4814633 C6.64300427,39.4814633 2.56291391,38.2713544 2.56291391,34.1569841 L2.56291391,8.26065345 C2.56291391,3.42021782 5.68298301,1 8.5630468,1 L29.4435093,1 C33.043589,1 35.4436422,3.42021782 35.4436422,7.29256632 L35.4436422,16.0053505 C35.4436422,16.7314158 34.9636315,17.6995029 34.0036103,17.6995029 C32.8035837,17.4574812 32.3235731,16.9734376 32.3235731,16.0053505 L32.3235731,7.77660989 C32.3235731,5.11437029 29.9235199,4.14628316 28.9634986,4.14628316 L8.5630468,4.14628316 C7.36302022,4.14628316 5.4429777,5.59841385 5.4429777,8.74469702 L5.4429777,32.9468752 C5.4429777,36.5772019 7.84303085,36.5772019 8.80305212,36.5772019 L16.0032116,36.5772019 C16.9632329,36.3351801 17.4432435,37.3032673 17.4432435,38.0293326 C17.4432435,38.7553979 16.9632329,39.4814633 15.7632063,39.4814633 L8.5630468,39.4814633 Z M10.7230946,7.53458811 L27.0434561,7.53458811 C27.7634721,7.53458811 28.2434827,8.01863167 28.2434827,8.74469702 C28.2434827,9.47076236 27.7634721,9.95480592 27.0434561,9.95480592 L10.7230946,9.95480592 C10.0030787,9.95480592 9.52306806,9.47076236 9.52306806,8.74469702 C9.52306806,8.01863167 9.76307338,7.53458811 10.7230946,7.53458811 Z M10.7230946,14.5532198 L27.0434561,14.5532198 C27.7634721,14.5532198 28.2434827,15.0372633 28.2434827,15.7633287 C28.2434827,16.489394 27.7634721,16.9734376 27.0434561,16.9734376 L10.7230946,16.9734376 C10.0030787,16.9734376 9.52306806,16.489394 9.52306806,15.7633287 C9.52306806,15.2792851 9.76307338,14.5532198 10.7230946,14.5532198 Z M10.7230946,21.8138732 L17.6832488,21.8138732 C18.4032647,21.8138732 18.8832754,22.2979168 18.8832754,23.0239821 C18.8832754,23.7500475 18.1632594,24.234091 17.6832488,24.234091 L10.7230946,24.234091 C10.0030787,24.234091 9.52306806,23.7500475 9.52306806,23.0239821 C9.52306806,22.2979168 9.76307338,21.8138732 10.7230946,21.8138732 Z" id="形状"></path>
            </g>
        </g>
    </g>
 </svg>
--- a/src/icons/svg/首页.svg
+++ b/src/icons/svg/首页.svg
@@ -0,0 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <title>首页</title>
    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
        <g id="icon" transform="translate(-506.000000, -176.000000)" fill-rule="nonzero">
            <g id="首页" transform="translate(506.000000, 176.000000)">
                <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="24" height="24"></rect>
                <path d="M11.1710783,2.42919989 C11.7298936,2.09409047 12.4328291,2.12455473 12.9654367,2.52059014 L12.9654367,2.52059014 L20.3218013,7.99000647 L20.4665209,8.10559268 C21.0744501,8.62656431 21.4302636,9.40344805 21.4302636,10.227099 L21.4302636,10.227099 L21.4302636,19.0470569 L21.4250327,19.2212289 C21.3382831,20.6611171 20.1833875,21.8011882 18.7715031,21.8011882 L18.7715031,21.8011882 L5.2284969,21.8011882 L5.06035624,21.7957697 C3.67032883,21.7059084 2.56973638,20.5095861 2.56973638,19.0470569 L2.56973638,19.0470569 L2.56973638,10.2273587 L2.57600507,10.0381789 C2.63012926,9.22282649 3.03207443,8.47038558 3.67819781,7.99000711 L3.67819781,7.99000711 L11.034559,2.52059336 Z M12.0713092,3.55793652 C11.9772762,3.53774358 11.8769764,3.55793433 11.7954857,3.6185066 L11.7954857,3.6185066 L4.43911542,9.0879271 L4.32641124,9.18150853 C4.04059293,9.44596068 3.87451485,9.82573182 3.87451485,10.2273587 L3.87451485,10.2273587 L3.87451485,19.0470569 L3.880713,19.1821318 C3.94632222,19.8933667 4.52470053,20.4496068 5.2284969,20.4496068 L5.2284969,20.4496068 L11.2507497,20.4487759 L11.3507364,20.3451977 L11.3512202,14.4627186 L11.3582338,14.3683764 C11.4044406,14.0603828 11.6734228,13.8227675 12,13.8227675 C12.3345637,13.8227675 12.6123182,14.0734451 12.6454705,14.3976012 L12.6454705,14.3976012 L12.6489183,14.4681588 L12.6487364,20.3451881 L12.7487231,20.4487759 L18.7714898,20.4496068 L18.9018895,20.4431864 C19.5885066,20.3752237 20.1254851,19.7760987 20.1254851,19.0470569 L20.1254851,19.0470569 L20.1254851,10.2273587 L20.1177907,10.0779557 C20.0769951,9.68325297 19.8759128,9.32208831 19.5608746,9.08791971 L19.5608746,9.08791971 L12.2045243,3.61851399 L12.1402672,3.58065321 Z" id="形状结合" fill="#000"></path>
            </g>
        </g>
    </g>
 </svg>
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2023-01-04 10:29:39
 * @LastEditors: zwq
- * @LastEditTime: 2023-01-05 16:14:45
+ * @LastEditTime: 2023-07-19 16:33:56
 * @Description: 
 */
 import Vue from 'vue'
@@ -28,11 +28,11 @@ export default new Vuex.Store({
    contentIsNeedRefresh: false,
    // 内容, 标签页(默认添加首页)
    contentTabs: [
-      {
+      // {
-        ...window.SITE_CONFIG['contentTabDefault'],
+      //   ...window.SITE_CONFIG['contentTabDefault'],
-        'name': 'home',
+      //   'name': 'home',
-        'title': '首页'
+      //   'title': '首页'
-      }
+      // }
    ],
    contentTabsActiveName: 'home'
  },
--- a/src/views/main-content.vue
+++ b/src/views/main-content.vue
@@ -1,3 +1,10 @@
 <!--
 * @Author: zwq
 * @Date: 2023-07-13 15:31:21
 * @LastEditors: zwq
 * @LastEditTime: 2023-07-20 09:05:48
 * @Description: 
 -->
 <template>
  <main :class="['aui-content', { 'aui-content--tabs': $route.meta.isTab }]">
    <!-- tab展示内容 -->
@@ -16,11 +23,13 @@
          :key="item.name"
          :name="item.name"
          :label="item.title"
-          :closable="item.name !== 'home'"
+          closable
          :class="{ 'is-iframe': tabIsIframe(item.iframeURL) }">
-          <template v-if="item.name === 'home'">
+          <!-- <template v-if="item.name === 'home'">
-            <svg slot="label" class="icon-svg aui-content--tabs-icon-nav" aria-hidden="true"><use xlink:href="#icon-home"></use></svg>
+            <svg slot="label" class="icon-svg aui-content--tabs-icon-nav" aria-hidden="true">
-          </template>
+              <use xlink:href="#首页"></use>
            </svg>
          </template> -->
          <iframe v-if="tabIsIframe(item.iframeURL)" :src="item.iframeURL" width="100%" height="100%" frameborder="0" scrolling="yes"></iframe>
          <!-- <keep-alive > -->
            <router-view v-if="item.name === $store.state.contentTabsActiveName" />
@@ -62,9 +71,9 @@ export default {
    },
    // tabs, 删除tab
    tabRemoveHandle (tabName) {
-      if (tabName === 'home') {
+      // if (tabName === 'home') {
-        return false
+      //   return false
-      }
+      // }
      this.$store.state.contentTabs = this.$store.state.contentTabs.filter(item => item.name !== tabName)
      if (this.$store.state.contentTabs.length <= 0) {
        this.$store.state.sidebarMenuActiveName = this.$store.state.contentTabsActiveName = 'home'
--- a/src/views/main-navbar.vue
+++ b/src/views/main-navbar.vue
@@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2022-08-22 14:57:51
 * @LastEditors: zwq
- * @LastEditTime: 2023-05-12 12:46:50
+ * @LastEditTime: 2023-07-19 09:27:53
 * @Description: 
 -->
 <template>
@@ -36,10 +36,11 @@
        <el-menu-item index="6" @click="$router.push({ name: 'home' })">
          <svg class="icon-svg aui-navbar__icon-menu" aria-hidden="true">
-            <use xlink:href="#icon-home"></use>
+            <use xlink:href="#首页"></use>
          </svg>
        </el-menu-item>
-        <el-menu-item index="7">
+        <!-- 中英文 -->
        <!-- <el-menu-item index="7">
          <el-dropdown trigger="click" class="international" @command="handleSetLanguage">
            <div>
              <svg class="icon-svg aui-navbar__icon-menu" aria-hidden="true">
@@ -55,7 +56,7 @@
              </el-dropdown-item>
            </el-dropdown-menu>
          </el-dropdown>
-        </el-menu-item>
+        </el-menu-item> -->
        <el-menu-item index="4" @click="fullscreenHandle()">
          <svg class="icon-svg aui-navbar__icon-menu" aria-hidden="true">
            <use xlink:href="#icon-fullscreen"></use>
--- a/src/views/modules/basic/components/control-add.vue
+++ b/src/views/modules/basic/components/control-add.vue
@@ -1,20 +1,21 @@
 <!--
 * @Author: zhp
 * @Date: 2023-02-14 15:02:26
- * @LastEditTime: 2023-07-12 13:49:47
+ * @LastEditTime: 2023-07-18 16:55:42
 * @LastEditors: zhp
 * @Description: 
 -->
 <template>
-  <el-form :model="dataForm" ref="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
+  <el-form :model="dataForm" ref="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmitHandle()"
    label-width="120px">
    <el-form-item prop="controlCode" :label="$t('basic.code')">
-      <el-input v-model="dataForm.controlCode" :placeholder="$t('basic.code')"></el-input>
+      <el-input clearable v-model="dataForm.controlCode" :placeholder="$t('basic.code')"></el-input>
    </el-form-item>
    <el-form-item prop="controlName" :label="$t('basic.name')">
-      <el-input v-model="dataForm.controlName" :placeholder="$t('basic.name')"></el-input>
+      <el-input clearable v-model="dataForm.controlName" :placeholder="$t('basic.name')"></el-input>
    </el-form-item>
    <el-form-item prop="specifications" :label="$t('basic.specification')">
-      <el-input v-model="dataForm.specifications" :placeholder="$t('basic.specification')"></el-input>
+      <el-input clearable v-model="dataForm.specifications" :placeholder="$t('basic.specification')"></el-input>
    </el-form-item>
    <el-form-item prop="incomingInspection" :label="$t('basic.stock')">
      <el-switch v-model="dataForm.incomingInspection" :active-value="1" :inactive-value="0">
@@ -33,13 +34,13 @@
      </el-switch>
    </el-form-item>
    <el-form-item prop="controlStatus" :label="$t('basic.status')">
-      <el-select v-model="dataForm.controlStatus" :placeholder="$t('basic.status')">
+      <el-select clearable v-model="dataForm.controlStatus" :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-item prop="remark" :label="$t('basic.remark')">
-      <el-input v-model="dataForm.remark" :placeholder="$t('basic.remark')"></el-input>
+      <el-input clearable v-model="dataForm.remark" :placeholder="$t('basic.remark')"></el-input>
    </el-form-item>
  </el-form>
 </template>
--- a/src/views/modules/basic/components/customer-add.vue
+++ b/src/views/modules/basic/components/customer-add.vue
@@ -1,26 +1,27 @@
 <!--
 * @Author: zhp
 * @Date: 2023-02-14 15:02:26
- * @LastEditTime: 2023-07-12 13:57:14
+ * @LastEditTime: 2023-07-18 16:55:57
 * @LastEditors: zhp
 * @Description: 
 -->
 <template>
-  <el-form :model="dataForm" ref="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
+  <el-form :model="dataForm" ref="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmitHandle()"
    label-width="120px">
    <el-form-item prop="customerCode" :label="$t('basic.code')">
-      <el-input v-model="dataForm.customerCode" :placeholder="$t('basic.code')"></el-input>
+      <el-input clearable v-model="dataForm.customerCode" :placeholder="$t('basic.code')"></el-input>
    </el-form-item>
    <el-form-item prop="customerName" :label="$t('basic.name')">
      <el-input v-model="dataForm.customerName" :placeholder="$t('basic.name')"></el-input>
    </el-form-item>
    <el-form-item prop="customerTypeId" :label="$t('basic.customerTypeName')">
-      <el-select v-model="dataForm.customerTypeId" :placeholder="$t('basic.customerTypeName')">
+      <el-select clearable v-model="dataForm.customerTypeId" :placeholder="$t('basic.customerTypeName')">
        <el-option v-for="item in customerTypeList" :key="item.id" :label="item.customerTypeName" :value="item.id">
        </el-option>
      </el-select>
    </el-form-item>
    <el-form-item prop="customerTypeStatus" :label="$t('basic.status')">
-      <el-select v-model="dataForm.customerTypeStatus" :placeholder="$t('basic.status')">
+      <el-select clearable v-model="dataForm.customerTypeStatus" :placeholder="$t('basic.status')">
        <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
        </el-option>
      </el-select>
--- a/src/views/modules/basic/components/customerType-add.vue
+++ b/src/views/modules/basic/components/customerType-add.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-02-14 15:02:26
- * @LastEditTime: 2023-07-12 13:55:20
+ * @LastEditTime: 2023-07-18 16:56:08
 * @LastEditors: zhp
 * @Description: 
 -->
@@ -9,13 +9,13 @@
  <el-form :model="dataForm" ref="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmitHandle()"
    label-width="120px">
    <el-form-item prop="customerTypeCode" :label="$t('basic.code')">
-      <el-input v-model="dataForm.customerTypeCode" :placeholder="$t('basic.code')"></el-input>
+      <el-input clearable v-model="dataForm.customerTypeCode" :placeholder="$t('basic.code')"></el-input>
    </el-form-item>
    <el-form-item prop="customerTypeName" :label="$t('basic.name')">
-      <el-input v-model="dataForm.customerTypeName" :placeholder="$t('basic.name')"></el-input>
+      <el-input clearable v-model="dataForm.customerTypeName" :placeholder="$t('basic.name')"></el-input>
    </el-form-item>
    <el-form-item prop="customerTypeStatus" :label="$t('basic.status')">
-      <el-select v-model="dataForm.customerTypeStatus" :placeholder="$t('basic.status')">
+      <el-select clearable v-model="dataForm.customerTypeStatus" :placeholder="$t('basic.status')">
        <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
        </el-option>
      </el-select>
--- a/src/views/modules/basic/components/failureType-add.vue
+++ b/src/views/modules/basic/components/failureType-add.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-02-14 15:02:26
- * @LastEditTime: 2023-07-12 13:52:25
+ * @LastEditTime: 2023-07-18 16:56:16
 * @LastEditors: zhp
 * @Description: 
 -->
@@ -9,13 +9,13 @@
  <el-form :model="dataForm" ref="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmitHandle()"
    label-width="120px">
    <el-form-item prop="failureTypeCode" :label="$t('basic.code')">
-      <el-input v-model="dataForm.failureTypeCode" :placeholder="$t('basic.code')"></el-input>
+      <el-input clearable v-model="dataForm.failureTypeCode" :placeholder="$t('basic.code')"></el-input>
    </el-form-item>
    <el-form-item prop="failureTypeName" :label="$t('basic.name')">
-      <el-input v-model="dataForm.failureTypeName" :placeholder="$t('basic.name')"></el-input>
+      <el-input clearable v-model="dataForm.failureTypeName" :placeholder="$t('basic.name')"></el-input>
    </el-form-item>
    <el-form-item prop="failureTypeStatus" :label="$t('basic.status')">
-      <el-select v-model="dataForm.failureTypeStatus" :placeholder="$t('basic.status')">
+      <el-select clearable v-model="dataForm.failureTypeStatus" :placeholder="$t('basic.status')">
        <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
        </el-option>
      </el-select>
--- a/src/views/modules/basic/components/process-add.vue
+++ b/src/views/modules/basic/components/process-add.vue
@@ -0,0 +1,152 @@
 <!--
 * @Author: zhp
 * @Date: 2023-07-13 11:18:36
 * @LastEditTime: 2023-07-13 13:49:00
 * @LastEditors: zhp
 * @Description: 
 -->
 <!--
 * @Author: zhp
 * @Date: 2023-02-14 15:02:26
 * @LastEditTime: 2023-07-12 14:04:19
 * @LastEditors: zhp
 * @Description: 
 -->
 <template>
  <el-form :model="dataForm" ref="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmitHandle()"
    label-width="120px">
    <el-form-item prop="processCode" :label="$t('basic.code')">
      <el-input v-model="dataForm.processCode" :placeholder="$t('basic.code')"></el-input>
    </el-form-item>
    <el-form-item prop="processName" :label="$t('basic.name')">
      <el-input v-model="dataForm.processName" :placeholder="$t('basic.name')"></el-input>
    </el-form-item>
    <el-form-item prop="remark" :label="$t('basic.remark')">
      <el-input v-model="dataForm.remark" :placeholder="$t('basic.remark')"></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: "/basic/qmsProcess",
        infoURL: "/basic/qmsProcess/{id}",
        getCodeURL: '/basic/qmsProcess/getCode'
      },
      options: [{
        value: 0,
        label: '不可用'
      },
      {
        value: 1,
        label: '可用'
      }],
      visible: false,
      dataForm: {
        id: "",
        processCode:null,
        processName:null,
        remark:null
      },
    };
  },
  computed: {
    dataRule() {
      return {
        processName: [
          {
            required: true,
            message: this.$t("validate.required"),
            trigger: "blur",
          },
        ],
        processCode: [
          {
            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() {
      // console.log(111111);
      this.$http
        .post(this.urlOptions.getCodeURL)
        .then(({ data: res }) => {
          if (res.code === 0) {
            console.log(res);
            this.dataForm.processCode = res.data
          }
        })
        .catch(() => {
        });
    },
    // 获取信息
    getInfo() {
      this.$http
        .get(`/basic/qmsProcess/${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>
--- a/src/views/modules/basic/process.vue
+++ b/src/views/modules/basic/process.vue
@@ -0,0 +1,314 @@
 <!--
 * @Author: zhp
 * @Date: 2023-02-21 14:30:17
 * @LastEditTime: 2023-07-13 13:49: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="3" 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">
        <process-add ref="addOrUpdate" @refreshDataList="successSubmit">
          </process-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">
        <productType-search ref="searchOrUpdate" @successSubmit="conditionSearchSubmit"></productType-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 processAdd from "./components/process-add";
 // import productTypeSearch from "./components/productTypeSearch.vue";
 import available from "./components/available.vue";
 import Cookies from 'js-cookie'
 import qs from 'qs'
 // import radio from "./components/radio.vue";
 import i18n from "@/i18n";
 // import i18n from "@/i18n";
 const tableProps = [
  {
    prop: "processCode",
    label: '编码'
  },
  {
    prop: "processName",
    label: "名称"
  },
  {
    prop: "remark",
    label: "备注"
  }
 ];
 const tableBtn = [
  {
    type: "edit",
    btnName: "修改"
  },
  {
    type: "delete",
    btnName: "删除"
  }
 ];
 export default {
  mixins: [basicPage],
  data() {
    return {
      urlOptions: {
        getDataListURL: "/basic/qmsProcess/page",
        deleteURL: "/basic/qmsProcess",
        exportURL: "/basic/qmsProcess/export",
      },
      tableProps,
      tableBtn,
      productData: {},
      addOrUpdateVisible:false,
      searchOrEditTitle: "",
      addOrEditTitle:'',
      searchOrUpdateVisible: false,
      productOrEditTitle: "",
      productOrUpdateVisible: false,
      formConfig: [
        {
          type: 'input',
          label: i18n.t('basic.name'),
          placeholder: i18n.t('basic.name'),
          param: 'name',
          clearable: true
        },
        {
          type: 'input',
          label: i18n.t('basic.code'),
          placeholder: i18n.t('basic.code'),
          param: 'code',
          clearable: true
        },
        // {
        //   type: 'select',
        //   label: i18n.t('basic.status'),
        //   placeholder: i18n.t('basic.status'),
        //   param: 'status',
        //   selectOptions: [
        //     {
        //       id: '0',
        //       name: '不可用'
        //     },
        //     {
        //       id: 1,
        //       name: '可用'
        //     }
        //   ],
        //   clearable: true,
        //   filterable: true
        // },
        {
          type: "button",
          btnName: "搜索",
          name: "search",
          color: "primary",
          // plain: true,
        },
        {
          type: "button",
          btnName: "新增",
          name: "add",
          color: 'success',
          plain: true
          // plain: true,
        },
        {
          type: "button",
          btnName: "导出",
          name: "export",
          color: "primary",
          plain: true
          // plain: true,
        }
      ],
    };
  },
  components: {
    processAdd
  },
  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();
      });
    },
    // 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.status = dataForm.status
      this.listQuery.page = 1;
      this.getDataList();
      this.searchOrUpdateVisible = false;
      // console.log(11111);
      // this.conditionSearchSubmit();
    },
    // handleCancel() {
    // },
    // handleConfirm() {
    //   this.$refs.addOrUpdate.dataFormSubmit()
    // },
    successSubmit() {
      console.log(11111);
      this.$refs.addOrUpdate.formClear()
      this.addOrUpdateVisible = false
      this.addOrEditTitle = ''
      this.getDataList();
    },
    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) {
      console.log(val);
      if (val.type === "delete") {
        this.$confirm(`确定对[名称=${val.data.productTypeName}]进行删除操作?`, "提示", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning",
        })
          .then(() => {
            console.log(val);
            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) {
      console.log(val);
      switch (val.btnName) {
        case "search":
          // this.listQuery.paramCode = val.paramCode;
          this.listQuery.name = val.name ?val.name : null
          this.listQuery.code = val.code ? val.code : null
          // this.listQuery.status = val.status ? val.status : null
          // console.log(i18n);
          this.listQuery.page = 1
          // console.log(basicPage)
          this.getDataList();
          break;
        case "export":
          this.exportHandle();
          break;
        case "add":
          this.addOrEditTitle = "新增";
          this.addOrUpdateVisible = true;
          this.$nextTick(() => {
            this.$refs.addOrUpdate.init();
          });
          break;
        // case "correlation":
        //   this.productOrEditTitle = "产品";
        //   this.productOrUpdateVisible = true;
        //   this.addOrUpdateHandle(this.productData);
        //   console.log(this.productId);
        //   break;
        // case "cancel":
        //   this.$refs.palletTable1.setCurrent("palletTable", -1);
        //   break;
        default:
          console.log(val);
      }
    },
  },
 };
 </script>
--- a/src/views/modules/basic/qmsControlMode.vue
+++ b/src/views/modules/basic/qmsControlMode.vue
@@ -121,13 +121,6 @@ export default {
          param: 'name',
          clearable:true
        },
        {
          type: "button",
          btnName: "新增",
          name: "add",
          color: 'success',
          plain:true
        },
        {
          type: "button",
          btnName: "搜索",
@@ -135,6 +128,13 @@ export default {
          color: "primary",
          // plain: true,
        },
        {
          type: "button",
          btnName: "新增",
          name: "add",
          color: 'success',
          plain:true
        },
        {
          type: "button",
          btnName: "关联产品列表",
--- a/src/views/modules/basic/qmsCustomer.vue
+++ b/src/views/modules/basic/qmsCustomer.vue
@@ -147,17 +147,17 @@ export default {
        },
        {
          type: "button",
-          btnName: "新增",
+          btnName: "搜索",
-          name: "add",
+          name: "search",
-          color: 'success',
+          color: "primary",
          plain: true
          // plain: true,
        },
        {
          type: "button",
-          btnName: "搜索",
+          btnName: "新增",
-          name: "search",
+          name: "add",
-          color: "primary",
+          color: 'success',
          plain: true
          // plain: true,
        },
        {
--- a/src/views/modules/basic/qmsCustomerType.vue
+++ b/src/views/modules/basic/qmsCustomerType.vue
@@ -128,17 +128,17 @@ export default {
        },
        {
          type: "button",
-          btnName: "新增",
+          btnName: "搜索",
-          name: "add",
+          name: "search",
-          color: 'success',
+          color: "primary",
          plain: true
          // plain: true,
        },
        {
          type: "button",
-          btnName: "搜索",
+          btnName: "新增",
-          name: "search",
+          name: "add",
-          color: "primary",
+          color: 'success',
          plain: true
          // plain: true,
        },
        {
--- 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-07-11 10:07:22
+ * @LastEditTime: 2023-07-18 10:19:11
 * @LastEditors: zhp
 * @Description: 
 -->
@@ -128,17 +128,17 @@ export default {
        },
        {
          type: "button",
-          btnName: "新增",
+          btnName: "搜索",
-          name: "add",
+          name: "search",
-          color: 'success',
+          color: "primary",
          plain: true
          // plain: true,
        },
        {
          type: "button",
-          btnName: "搜索",
+          btnName: "新增",
-          name: "search",
+          name: "add",
-          color: "primary",
+          color: 'success',
          plain: true
          // plain: true,
        }
      ],
--- a/src/views/modules/basic/qmsProduct.vue
+++ b/src/views/modules/basic/qmsProduct.vue
@@ -92,6 +92,7 @@ export default {
      urlOptions: {
        getDataListURL: "/basic/qmsProduct/page",
        deleteURL: "/basic/qmsProduct",
        exportURL: '/basic/qmsProduct/export',
      },
      tableProps,
      tableBtn,
@@ -117,6 +118,13 @@ export default {
          param: 'code',
          clearable: true
        },
        {
          type: "button",
          btnName: "搜索",
          name: "search",
          color: "primary",
          // plain: true,
        },
        {
          type: "button",
          btnName: "新增",
@@ -127,10 +135,10 @@ export default {
        },
        {
          type: "button",
-          btnName: "搜索",
+          btnName: "导出",
-          name: "search",
+          name: "export",
          color: "primary",
-          // plain: true,
+          plain: true
        }
      ],
    };
@@ -238,11 +246,11 @@ export default {
          break;
        case "add":
          this.addOrEditTitle = '新增'
-          this.addOrUpdateVisible = true;
+          this.addOrUpdateVisible = true
          this.addOrUpdateHandle()
          break;
-        case "cancel":
+        case "export":
-          this.$refs.palletTable1.setCurrent("palletTable", -1);
+          this.exportHandle()
          break;
        default:
          console.log(val);
--- 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-07-11 10:24:01
+ * @LastEditTime: 2023-07-18 10:19:37
 * @LastEditors: zhp
 * @Description: 
 -->
@@ -135,17 +135,17 @@ export default {
        // },
        {
          type: "button",
-          btnName: "新增",
+          btnName: "搜索",
-          name: "add",
+          name: "search",
-          color: 'success',
+          color: "primary",
          plain: true
          // plain: true,
        },
        {
          type: "button",
-          btnName: "搜索",
+          btnName: "新增",
-          name: "search",
+          name: "add",
-          color: "primary",
+          color: 'success',
          plain: true
          // plain: true,
        },
        {
--- 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-07-11 10:16:26
+ * @LastEditTime: 2023-07-18 10:19:49
 * @LastEditors: zhp
 * @Description: 
 -->
@@ -151,17 +151,17 @@ export default {
        },
        {
          type: "button",
-          btnName: "新增",
+          btnName: "搜索",
-          name: "add",
+          name: "search",
-          color: 'success',
+          color: "primary",
          plain: true
          // plain: true,
        },
        {
          type: "button",
-          btnName: "搜索",
+          btnName: "新增",
-          name: "search",
+          name: "add",
-          color: "primary",
+          color: 'success',
          plain: true
          // plain: true,
        },
        {
--- a/src/views/modules/basic/qmsTeamMember.vue
+++ b/src/views/modules/basic/qmsTeamMember.vue
@@ -1,109 +0,0 @@
 <!--
 * @Author: zhp
 * @Date: 2023-01-11 09:24:58
 * @LastEditTime: 2023-06-26 13:39:19
 * @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-button type="primary" size="small" plain>导入</el-button> -->
      </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">
        <teamMember-add ref="addOrUpdate" @successSubmit="successSubmit"></teamMember-add>
      </base-dialog>
    </div>
  </el-card>
 </template>
 <script>
 import basicPage from "@/mixins/basic-page";
 import teamMemberAdd from './components/teamMember-add'
 import i18n from "@/i18n";
 const tableProps = [
  {
    prop: "paramCode",
    label: i18n.t("params.paramCode"),
  },
  {
    prop: "paramValue",
    label: i18n.t("params.paramValue"),
  },
  {
    prop: "remark",
    label: i18n.t("params.remark"),
  },
 ];
 const tableBtn = [
  {
    type: "edit",
    btnName: "编辑",
  },
  {
    type: "delete",
    btnName: "删除",
  },
 ];
 export default {
  mixins: [basicPage],
  data() {
    return {
      urlOptions: {
        getDataListURL: "/basic/qmsTeamMember/page",
        deleteURL: "/basic/qmsControlMode",
      },
      tableProps,
      tableBtn,
      formConfig: [
        // {
        //   type: "",
        //   label: i18n.t("params.paramCode"),
        //   placeholder: i18n.t("params.paramCode"),
        //   param: "paramCode",
        // },
        // {
        //   type: "separate",
        // },
        {
          type: "button",
          btnName: "新增",
          name: "add",
          color: "primary",
        },
      ],
    };
  },
  components: {
    teamMemberAdd,
  },
  methods:{
    //search-bar点击
    buttonClick(val) {
      switch (val.btnName) {
        case "search":
          // this.listQuery.paramCode = val.paramCode;
          this.listQuery.page = 1;
          this.getDataList();
          break;
        case "add":
          this.addOrEditTitle = '新增'
          this.addOrUpdateVisible = true;   
          this.addOrUpdateHandle()
          break;
        default:
          console.log(val)
       }
    },
  }
 };
 </script>
--- a/src/views/modules/code/components/available.vue
+++ b/src/views/modules/code/components/available.vue
@@ -1,13 +1,13 @@
 <!--
 * @Author: zhp
 * @Date: 2023-01-31 09:49:36
- * @LastEditTime: 2023-05-31 15:50:02
+ * @LastEditTime: 2023-07-14 13:46:42
- * @LastEditors: zhp
+ * @LastEditors: zwq
 * @Description: 
 -->
 <template>
  <span>
-    <el-tag v-if="injectData.eightDisciplineStatus === 1" type="success">可用</el-tag>
+    <el-tag v-if="injectData.eightDisciplineStatus === 1||injectData.problemStatus === 1" type="success">可用</el-tag>
    <el-tag v-else type="warning">不可用</el-tag>
  </span>
 </template>
--- a/src/views/modules/code/components/deliveryInspection-add.vue
+++ b/src/views/modules/code/components/deliveryInspection-add.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-02-14 15:02:26
- * @LastEditTime: 2023-06-20 15:04:28
+ * @LastEditTime: 2023-07-17 10:24:03
 * @LastEditors: zhp
 * @Description: 
 -->
@@ -10,7 +10,7 @@
    <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-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>
@@ -18,26 +18,26 @@
      </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')"
+          <el-date-picker  v-model="dataForm.inspectionTime" type="datetime"
-            format='yyyy-MM-dd HH:mm:ss' valueFormat='yyyy-MM-ddTHH:mm:ss'>
+            :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-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-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-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>
@@ -53,7 +53,7 @@
    <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-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>
@@ -61,7 +61,7 @@
      </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-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>
@@ -69,31 +69,34 @@
      </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-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-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-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-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-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>
@@ -101,15 +104,15 @@
      </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-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 v-for="item in userList" :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-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>
@@ -119,7 +122,7 @@
    <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-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>
@@ -321,7 +324,6 @@ export default {
        })
        .then(({ data: res }) => {
          if (res.code === 0) {
            console.log(res);
            this.samplingPlanList = res.data.list
          }
        })
@@ -332,25 +334,13 @@ export default {
          params: this.listQuery
        })
        .then(({ data: res }) => {
          ;console.log(res.data.list)
          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: {
@@ -361,7 +351,6 @@ export default {
        })
        .then(({ data: res }) => {
          if (res.code === 0) {
            console.log(res);
            this.unitList = res.data.list
          }
        })
@@ -373,7 +362,6 @@ export default {
        })
        .then(({ data: res }) => {
          if (res.code === 0) {
            console.log(res);
            this.supplierList = res.data.list
          }
        })
@@ -385,12 +373,22 @@ export default {
        })
        .then(({ data: res }) => {
          if (res.code === 0) {
            console.log(res);
            this.factoryList = res.data.list
          }
        })
        .catch(() => {
        })
      this.$http
        .get(this.urlOptions.getProductURL, {
          params: this.listQuery
        })
        .then(({ data: res }) => {
          if (res.code === 0) {
            this.productList = res.data.list
          }
        })
        .catch(() => {
        })
      // console.log(111111);
    },
    // 表单提交
@@ -411,7 +409,6 @@ export default {
                duration: 500,
                onClose: () => {
                  this.visible = false;
                  console.log(1111);
                  this.$emit("successSubmit");
                },
              });
--- a/src/views/modules/code/components/deliveryInspectionSearch.vue
+++ b/src/views/modules/code/components/deliveryInspectionSearch.vue
@@ -1,8 +1,8 @@
 <!--
 * @Author: zwq
 * @Date: 2023-01-04 10:29:40
- * @LastEditors: zhp
+ * @LastEditors: zwq
- * @LastEditTime: 2023-06-20 15:20:53
+ * @LastEditTime: 2023-07-14 10:17:37
 * @Description: 
 -->
 <template>
@@ -211,7 +211,6 @@ export default {
        })
        .then(({ data: res }) => {
          if (res.code === 0) {
            console.log(res);
            this.samplingPlanList = res.data.list
          }
        })
@@ -223,7 +222,6 @@ export default {
        })
        .then(({ data: res }) => {
          if (res.code === 0) {
            console.log(res);
            this.productList = res.data.list
          }
        })
@@ -235,7 +233,6 @@ export default {
        })
        .then(({ data: res }) => {
          if (res.code === 0) {
            console.log(res);
            this.supplierList = res.data.list
          }
        })
@@ -247,7 +244,6 @@ export default {
        })
        .then(({ data: res }) => {
          if (res.code === 0) {
            console.log(res);
            this.factoryList = res.data.list
          }
        })
--- a/src/views/modules/code/components/eightDiscipline-add.vue
+++ b/src/views/modules/code/components/eightDiscipline-add.vue
@@ -1,15 +1,20 @@
 <!--
 * @Author: zhp
 * @Date: 2023-02-14 15:02:26
- * @LastEditTime: 2023-06-28 16:51:03
+ * @LastEditTime: 2023-07-17 10:21:47
 * @LastEditors: zwq
 * @Description: 
 -->
 <template>
-  <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="130px">
+  <el-form
    :model="dataForm"
    ref="dataForm"
    :rules="dataRule"
    @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 v-model="dataForm.name" :placeholder="$t('code.name')"> </el-input>
      </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>
@@ -19,8 +24,16 @@
      </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-select
-        <el-option v-for="item in eightDisciplineTypeList" :key="item.value" :label="item.label" :value="item.value">
+        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>
@@ -36,36 +49,38 @@ export default {
    return {
      urlOptions: {
        submitURL: "/code/eightDiscipline",
-        infoURL: "/code/eightDiscipline"
+        infoURL: "/code/eightDiscipline",
      },
-      options: [{
+      options: [
-        value: 0,
+        {
-        label: '不可用'
+          value: 0,
-      },
+          label: "不可用",
-      {
+        },
-        value: 1,
+        {
-        label: '可用'
+          value: 1,
-        }],
+          label: "可用",
        },
      ],
      eightDisciplineTypeList: [
        {
-          value: '0',
+          value: "0",
-          label: '重复发生问题 '
+          label: "重复发生问题 ",
        },
        {
-          value: '1',
+          value: "1",
-          label: '客诉问题'
+          label: "客诉问题",
        },
        {
-          value: '2',
+          value: "2",
-          label: '重大质量问题'
+          label: "重大质量问题",
-        }
+        },
      ],
      visible: false,
      dataForm: {
        id: null,
        name: null,
-        code:null,	
+        code: null,
-        eightDisciplineType:null,
+        eightDisciplineType: null,
        eightDisciplineStatus: 0,
      },
    };
@@ -73,40 +88,33 @@ export default {
  computed: {
    dataRule() {
      return {
-        // dictLabel: [
+        code: [
-        //   {
+          {
-        //     required: true,
+            required: true,
-        //     message: this.$t("validate.required"),
+            message: "请输入编码",
-        //     trigger: "blur",
+            trigger: "blur",
-        //   },
+          },
-        // ],
+        ],
-        // dictValue: [
+        name: [
-        //   {
+          {
-        //     required: true,
+            required: true,
-        //     message: this.$t("validate.required"),
+            message: "请输入名称",
-        //     trigger: "blur",
+            trigger: "blur",
-        //   },
+          },
-        // ],
+        ],
        // sort: [
        //   {
        //     required: true,
        //     message: this.$t("validate.required"),
        //     trigger: "blur",
        //   },
        // ],
      };
    },
  },
  methods: {
-    init(id, ) {
+    init(id) {
-      this.dataForm.id = id || ""
+      this.dataForm.id = id || "";
      // console.log(11111)
      // this.dataForm.dictTypeId = dictTypeId || "";
-      this.visible = true
+      this.visible = true;
      this.$nextTick(() => {
        this.$refs["dataForm"].resetFields();
        if (this.dataForm.id) {
-          this.getInfo()
+          this.getInfo();
        } else {
          // this.getCode()
        }
@@ -155,7 +163,6 @@ export default {
                type: "success",
                duration: 500,
                onClose: () => {
                  console.log(1111);
                  this.visible = false;
                  this.$emit("successSubmit");
                },
--- a/src/views/modules/code/components/eightDiscipline-searchs.vue
+++ b/src/views/modules/code/components/eightDiscipline-searchs.vue
@@ -0,0 +1,69 @@
 <!--
 * @Author: zwq
 * @Date: 2023-01-04 10:29:40
 * @LastEditors: zwq
 * @LastEditTime: 2023-07-14 14:03:43
 * @Description: 
 -->
 <template>
    <el-form :model="dataForm" ref="dataForm" label-width="120px">
        <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>
  </template>
  <script>
  import basicAdd from "@/mixins/basic-add";
  export default {
    mixins: [basicAdd],
    data() {
      return {
        urlOptions: {
          optionArrUrl: [],
        },
        visible: false,
        dataForm: {
          code: "",
          name: "",
          eightDisciplineStatus: 0
        },
      };
    },
    computed: {
      dataRule() {
        return {
          // paramCode: [
          //   {
          //     required: true,
          //     message: this.$t("validate.required"),
          //     trigger: "blur",
          //   },
          // ],
        };
      },
    },
    methods: {
      init() {
        this.visible = true;
        this.$nextTick(() => {
          this.$refs["dataForm"].resetFields();
          this.getArr();
        });
      },
      dataFormSubmit() {
        this.$emit("refreshDataList", this.dataForm);
      },
    },
  };
  </script>
--- a/src/views/modules/code/components/problemType-add.vue
+++ b/src/views/modules/code/components/problemType-add.vue
@@ -0,0 +1,74 @@
 <!--
 * @Author: zhp
 * @Date: 2023-02-14 15:02:26
 * @LastEditTime: 2023-07-17 10:23:23
 * @LastEditors: zwq
 * @Description: 
 -->
 <template>
  <el-form
    :model="dataForm"
    :rules="dataRule"
    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="problemStatus" label="状态">
      <el-switch v-model="dataForm.problemStatus" :active-value="1" :inactive-value="0">
      </el-switch>
    </el-form-item>
    <el-form-item prop="description" label="描述">
      <el-input v-model="dataForm.description" placeholder="描述"></el-input>
    </el-form-item>
  </el-form>
 </template>
 <script>
 import basicAdd from "@/mixins/basic-add";
 export default {
  mixins: [basicAdd],
  data() {
    return {
      urlOptions: {
        submitURL: "/code/problemType",
        infoURL: "/code/problemType",
      },
      visible: false,
      dataForm: {
        id: null,
        name: null,
        code: null,
        description: null,
        problemStatus: 0,
      },
    };
  },
  computed: {
    dataRule() {
      return {
        code: [
          {
            required: true,
            message: "请输入编码",
            trigger: "blur",
          },
        ],
        name: [
          {
            required: true,
            message: "请输入名称",
            trigger: "blur",
          },
        ],
      };
    },
  },
  methods: {},
 };
 </script>
--- a/src/views/modules/code/components/productInspection-add.vue
+++ b/src/views/modules/code/components/productInspection-add.vue
@@ -2,7 +2,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-02-14 15:02:26
- * @LastEditTime: 2023-06-20 15:05:29
+ * @LastEditTime: 2023-07-17 10:24:07
 * @LastEditors: zhp
 * @Description: 
 -->
@@ -11,7 +11,7 @@
    <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-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>
@@ -19,26 +19,26 @@
      </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')"
+          <el-date-picker  v-model="dataForm.inspectionTime" type="datetime"
-            format='yyyy-MM-dd HH:mm:ss' valueFormat='yyyy-MM-ddTHH:mm:ss'>
+            :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-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-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-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>
@@ -54,7 +54,7 @@
    <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-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>
@@ -62,7 +62,7 @@
      </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-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>
@@ -70,31 +70,34 @@
      </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-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-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-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-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-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>
@@ -102,15 +105,15 @@
      </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-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 v-for="item in userList" :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-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>
@@ -120,7 +123,7 @@
    <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-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>
@@ -322,7 +325,6 @@ export default {
        })
        .then(({ data: res }) => {
          if (res.code === 0) {
            console.log(res);
            this.samplingPlanList = res.data.list
          }
        })
@@ -334,7 +336,6 @@ export default {
        })
        .then(({ data: res }) => {
          if (res.code === 0) {
            console.log(res);
            this.userList = res.data.list
          }
        })
@@ -346,7 +347,6 @@ export default {
        })
        .then(({ data: res }) => {
          if (res.code === 0) {
            console.log(res);
            this.productList = res.data.list
          }
        })
@@ -362,7 +362,6 @@ export default {
        })
        .then(({ data: res }) => {
          if (res.code === 0) {
            console.log(res);
            this.unitList = res.data.list
          }
        })
@@ -374,7 +373,6 @@ export default {
        })
        .then(({ data: res }) => {
          if (res.code === 0) {
            console.log(res);
            this.supplierList = res.data.list
          }
        })
@@ -386,7 +384,6 @@ export default {
        })
        .then(({ data: res }) => {
          if (res.code === 0) {
            console.log(res);
            this.factoryList = res.data.list
          }
        })
@@ -412,7 +409,6 @@ export default {
                duration: 500,
                onClose: () => {
                  this.visible = false;
                  console.log(1111);
                  this.$emit("successSubmit");
                },
              });
--- a/src/views/modules/code/components/productInspectionSearch.vue
+++ b/src/views/modules/code/components/productInspectionSearch.vue
@@ -1,8 +1,8 @@
 <!--
 * @Author: zwq
 * @Date: 2023-01-04 10:29:40
- * @LastEditors: zhp
+ * @LastEditors: zwq
- * @LastEditTime: 2023-06-20 15:23:54
+ * @LastEditTime: 2023-07-14 10:18:16
 * @Description: 
 -->
 <template>
@@ -211,7 +211,6 @@ export default {
        })
        .then(({ data: res }) => {
          if (res.code === 0) {
            console.log(res);
            this.samplingPlanList = res.data.list
          }
        })
@@ -223,7 +222,6 @@ export default {
        })
        .then(({ data: res }) => {
          if (res.code === 0) {
            console.log(res);
            this.productList = res.data.list
          }
        })
@@ -235,7 +233,6 @@ export default {
        })
        .then(({ data: res }) => {
          if (res.code === 0) {
            console.log(res);
            this.supplierList = res.data.list
          }
        })
@@ -247,7 +244,6 @@ export default {
        })
        .then(({ data: res }) => {
          if (res.code === 0) {
            console.log(res);
            this.factoryList = res.data.list
          }
        })
--- a/src/views/modules/code/components/productRegistration-add.vue
+++ b/src/views/modules/code/components/productRegistration-add.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-02-14 15:02:26
- * @LastEditTime: 2023-06-20 15:18:54
+ * @LastEditTime: 2023-07-17 10:24:12
 * @LastEditors: zhp
 * @Description: 
 -->
@@ -11,7 +11,7 @@
      <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-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>
@@ -19,26 +19,26 @@
        </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')"
+            <el-date-picker  v-model="dataForm.inspectionTime" type="datetime"
-              format='yyyy-MM-dd HH:mm:ss' valueFormat='yyyy-MM-ddTHH:mm:ss'>
+              :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-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-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-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>
@@ -54,7 +54,7 @@
      <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-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>
@@ -62,7 +62,7 @@
        </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-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>
@@ -70,31 +70,34 @@
        </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-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-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-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-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-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>
@@ -102,15 +105,15 @@
        </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-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 v-for="item in userList" :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-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>
@@ -120,7 +123,7 @@
      <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-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>
@@ -133,27 +136,29 @@
      <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-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-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-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-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  v-model="GBTDataForm.criticalDefectiveNumber"
              :placeholder="$t('code.defectiveQuantity')">
            </el-input>
          </el-form-item>
        </el-col>
@@ -161,27 +166,29 @@
      <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-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-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-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-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  v-model="GBTDataForm.majorDefectiveNumber"
              :placeholder="$t('code.defectiveQuantity')">
            </el-input>
          </el-form-item>
        </el-col>
@@ -189,27 +196,29 @@
      <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-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-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-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-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  v-model="GBTDataForm.minorDefectiveNumber"
              :placeholder="$t('code.defectiveQuantity')">
            </el-input>
          </el-form-item>
        </el-col>
@@ -217,27 +226,29 @@
      <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-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-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-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-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  v-model="GBTDataForm.totalDefectiveNumber"
              :placeholder="$t('code.defectiveQuantity')">
            </el-input>
          </el-form-item>
        </el-col>
@@ -475,43 +486,40 @@ export default {
    },
    getDict() {
      this.$http
-        .post(this.urlOptions.getSamplingPlanURL, {
+        .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
-        .post(this.urlOptions.getUserURL, {
+        .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
-        .post(this.urlOptions.getProductURL, {
+        .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
-        .post(this.urlOptions.getDictDataList, {
+        .get(this.urlOptions.getDictDataList, {
          params: {
            limit: 999,
            page: 1,
@@ -520,31 +528,28 @@ export default {
        })
        .then(({ data: res }) => {
          if (res.code === 0) {
            console.log(res);
            this.unitList = res.data.list
          }
        })
        .catch(() => {
        })
      this.$http
-        .post(this.urlOptions.getSupplierURL, {
+        .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
-        .post(this.urlOptions.getFactoryURL, {
+        .get(this.urlOptions.getFactoryURL, {
          params: this.listQuery
        })
        .then(({ data: res }) => {
          if (res.code === 0) {
            console.log(res);
            this.factoryList = res.data.list
          }
        })
--- a/src/views/modules/code/components/productRegistrationSearch.vue
+++ b/src/views/modules/code/components/productRegistrationSearch.vue
@@ -1,8 +1,8 @@
 <!--
 * @Author: zwq
 * @Date: 2023-01-04 10:29:40
- * @LastEditors: zhp
+ * @LastEditors: zwq
- * @LastEditTime: 2023-06-20 15:26:47
+ * @LastEditTime: 2023-07-14 10:19:47
 * @Description: 
 -->
 <template>
@@ -244,7 +244,6 @@ export default {
        })
        .then(({ data: res }) => {
          if (res.code === 0) {
            console.log(res);
            this.samplingPlanList = res.data.list
          }
        })
@@ -256,7 +255,6 @@ export default {
        })
        .then(({ data: res }) => {
          if (res.code === 0) {
            console.log(res);
            this.productList = res.data.list
          }
        })
@@ -268,7 +266,6 @@ export default {
        })
        .then(({ data: res }) => {
          if (res.code === 0) {
            console.log(res);
            this.supplierList = res.data.list
          }
        })
@@ -280,7 +277,6 @@ export default {
        })
        .then(({ data: res }) => {
          if (res.code === 0) {
            console.log(res);
            this.userList = res.data.list
          }
        })
@@ -292,7 +288,6 @@ export default {
        })
        .then(({ data: res }) => {
          if (res.code === 0) {
            console.log(res);
            this.factoryList = res.data.list
          }
        })
--- a/src/views/modules/code/components/shipmentRegistration-add.vue
+++ b/src/views/modules/code/components/shipmentRegistration-add.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-02-14 15:02:26
- * @LastEditTime: 2023-06-20 15:27:51
+ * @LastEditTime: 2023-07-17 10:24:16
 * @LastEditors: zhp
 * @Description: 
 -->
@@ -11,7 +11,7 @@
      <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-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>
@@ -19,26 +19,26 @@
        </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')"
+            <el-date-picker  v-model="dataForm.inspectionTime" type="datetime"
-              format='yyyy-MM-dd HH:mm:ss' valueFormat='yyyy-MM-ddTHH:mm:ss'>
+              :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-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-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-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>
@@ -54,7 +54,7 @@
      <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-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>
@@ -62,7 +62,7 @@
        </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-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>
@@ -70,31 +70,34 @@
        </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-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-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-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-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-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>
@@ -102,15 +105,15 @@
        </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-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 v-for="item in userList" :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-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>
@@ -120,7 +123,7 @@
      <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-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>
@@ -133,27 +136,29 @@
      <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-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-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-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-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  v-model="GBTDataForm.criticalDefectiveNumber"
              :placeholder="$t('code.defectiveQuantity')">
            </el-input>
          </el-form-item>
        </el-col>
@@ -161,27 +166,29 @@
      <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-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-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-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-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  v-model="GBTDataForm.majorDefectiveNumber"
              :placeholder="$t('code.defectiveQuantity')">
            </el-input>
          </el-form-item>
        </el-col>
@@ -189,27 +196,29 @@
      <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-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-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-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-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  v-model="GBTDataForm.minorDefectiveNumber"
              :placeholder="$t('code.defectiveQuantity')">
            </el-input>
          </el-form-item>
        </el-col>
@@ -217,27 +226,29 @@
      <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-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-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-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-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  v-model="GBTDataForm.totalDefectiveNumber"
              :placeholder="$t('code.defectiveQuantity')">
            </el-input>
          </el-form-item>
        </el-col>
@@ -475,43 +486,40 @@ export default {
    },
    getDict() {
      this.$http
-        .post(this.urlOptions.getSamplingPlanURL, {
+        .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
-        .post(this.urlOptions.getUserURL, {
+        .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
-        .post(this.urlOptions.getProductURL, {
+        .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
-        .post(this.urlOptions.getDictDataList, {
+        .get(this.urlOptions.getDictDataList, {
          params: {
            limit: 999,
            page: 1,
@@ -520,31 +528,28 @@ export default {
        })
        .then(({ data: res }) => {
          if (res.code === 0) {
            console.log(res);
            this.unitList = res.data.list
          }
        })
        .catch(() => {
        })
      this.$http
-        .post(this.urlOptions.getSupplierURL, {
+        .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
-        .post(this.urlOptions.getFactoryURL, {
+        .get(this.urlOptions.getFactoryURL, {
          params: this.listQuery
        })
        .then(({ data: res }) => {
          if (res.code === 0) {
            console.log(res);
            this.factoryList = res.data.list
          }
        })
--- a/src/views/modules/code/components/shipmentRegistrationSearch.vue
+++ b/src/views/modules/code/components/shipmentRegistrationSearch.vue
@@ -1,8 +1,8 @@
 <!--
 * @Author: zwq
 * @Date: 2023-01-04 10:29:40
- * @LastEditors: zhp
+ * @LastEditors: zwq
- * @LastEditTime: 2023-06-20 15:27:11
+ * @LastEditTime: 2023-07-14 10:19:42
 * @Description: 
 -->
 <template>
@@ -244,7 +244,6 @@ export default {
        })
        .then(({ data: res }) => {
          if (res.code === 0) {
            console.log(res);
            this.samplingPlanList = res.data.list
          }
        })
@@ -256,7 +255,6 @@ export default {
        })
        .then(({ data: res }) => {
          if (res.code === 0) {
            console.log(res);
            this.productList = res.data.list
          }
        })
@@ -268,7 +266,6 @@ export default {
        })
        .then(({ data: res }) => {
          if (res.code === 0) {
            console.log(res);
            this.supplierList = res.data.list
          }
        })
@@ -280,7 +277,6 @@ export default {
        })
        .then(({ data: res }) => {
          if (res.code === 0) {
            console.log(res);
            this.userList = res.data.list
          }
        })
@@ -292,7 +288,6 @@ export default {
        })
        .then(({ data: res }) => {
          if (res.code === 0) {
            console.log(res);
            this.factoryList = res.data.list
          }
        })
--- a/src/views/modules/code/components/startEightDiscipline-add.vue
+++ b/src/views/modules/code/components/startEightDiscipline-add.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-02-14 15:02:26
- * @LastEditTime: 2023-07-03 16:24:52
+ * @LastEditTime: 2023-07-17 10:27:00
 * @LastEditors: zwq
 * @Description: 
 -->
@@ -9,6 +9,7 @@
  <el-form
    :model="dataForm"
    ref="dataForm"
    :rules="dataRule" 
    @keyup.enter.native="dataFormSubmitHandle()"
    label-width="100px"
  >
@@ -84,9 +85,9 @@
          >
            <el-option
              v-for="item in defectList"
-              :key="item.dictTypeId"
+              :key="item.id"
-              :label="item.dictLabel"
+              :label="item.name"
-              :value="item.dictTypeId"
+              :value="item.id"
            >
            </el-option>
          </el-select>
@@ -271,7 +272,7 @@ export default {
        },
        {
          value: '1',
-          label: "1客诉问题",
+          label: "客诉问题",
        },
        {
          value: '2',
@@ -317,27 +318,48 @@ export default {
  computed: {
    dataRule() {
      return {
-        // dictLabel: [
+        code: [
-        //   {
+          {
-        //     required: true,
+            required: true,
-        //     message: this.$t("validate.required"),
+            message: "请输入编码",
-        //     trigger: "blur",
+            trigger: "blur",
-        //   },
+          },
-        // ],
+        ],
-        // dictValue: [
+        title: [
-        //   {
+          {
-        //     required: true,
+            required: true,
-        //     message: this.$t("validate.required"),
+            message: "请输入标题",
-        //     trigger: "blur",
+            trigger: "blur",
-        //   },
+          },
-        // ],
+        ],
-        // sort: [
+        eightDisciplineType: [
-        //   {
+          {
-        //     required: true,
+            required: true,
-        //     message: this.$t("validate.required"),
+            message: "请选择8D类型",
-        //     trigger: "blur",
+            trigger: "change",
-        //   },
+          },
-        // ],
+        ],
        defectSourceId: [
          {
            required: true,
            message: "请选择缺陷来源",
            trigger: "change",
          },
        ],
        occurrenceDate: [
          {
            required: true,
            message: "请选择发生日期",
            trigger: "change",
          },
        ],
        product: [
          {
            required: true,
            message: "请选择产品",
            trigger: "change",
          },
        ],
      };
    },
  },
@@ -386,13 +408,12 @@ export default {
        })
        .then(({ data: res }) => {
          if (res.code === 0) {
            console.log(res);
            this.teamList = res.data.list;
          }
        })
        .catch(() => {});
      this.$http
-        .get(this.urlOptions.getDictURL, {
+        .get("code/problemType/page", {
          params: {
            limit: 999,
            page: 1,
@@ -401,7 +422,6 @@ export default {
        })
        .then(({ data: res }) => {
          if (res.code === 0) {
            console.log(res);
            this.defectList = res.data.list;
          }
        })
@@ -416,7 +436,6 @@ export default {
        })
        .then(({ data: res }) => {
          if (res.code === 0) {
            console.log(res);
            this.dutyList = res.data.list;
          }
        })
@@ -455,7 +474,6 @@ export default {
                type: "success",
                duration: 500,
                onClose: () => {
                  console.log(1111);
                  this.visible = false;
                  this.$emit("successSubmit");
                },
--- a/src/views/modules/code/components/startEightDisciplineTemporaryTreatmentMeasures-add.vue
+++ b/src/views/modules/code/components/startEightDisciplineTemporaryTreatmentMeasures-add.vue
@@ -3,7 +3,7 @@
 * @Author: zwq
 * @Date: 2023-06-29 14:12:48
 * @LastEditors: zwq
- * @LastEditTime: 2023-06-30 09:07:57
+ * @LastEditTime: 2023-07-14 10:20:11
 * @Description: 
 -->
 <template>
@@ -151,7 +151,6 @@ export default {
    formClear() {},
    // 表单提交
    dataFormSubmit() {
      console.log(this.tableData);
          let putData = {
            eightDisciplineStatus: 4,
            examineStatus: 1,
--- a/src/views/modules/code/components/startEightGrade-add.vue
+++ b/src/views/modules/code/components/startEightGrade-add.vue
@@ -2,11 +2,17 @@
 * @Author: zwq
 * @Date: 2023-06-29 14:12:48
 * @LastEditors: zwq
- * @LastEditTime: 2023-06-30 10:58:16
+ * @LastEditTime: 2023-07-17 13:30:04
 * @Description: 
 -->
 <template>
-  <base-table border show-summary :table-props="tableProps" :table-data="tableData" @emitFun="inputChange" />
+  <base-table
    border
    show-summary
    :table-props="tableProps"
    :table-data="tableData"
    @emitFun="inputChange"
  />
 </template>
 <script>
@@ -134,7 +140,7 @@ export default {
          if (this.tableData[data._pageIndex - 1].gradeStatus) {
            this.$set(
              this.tableData[data._pageIndex - 1],
-              'grade',
+              "grade",
              this.score[this.tableData[data._pageIndex - 1].gradeStatus - 1]
            );
          }
@@ -146,24 +152,33 @@ export default {
    formClear() {},
    // 表单提交
    dataFormSubmit() {
-        this.tableData.forEach((item) => {
+      this.tableData.forEach((item) => {
-          item.startEightDisciplineId = this.id;
+        item.startEightDisciplineId = this.id;
      });
      let putData = {
        gradeFinish: 1,
        id: this.id,
      };
      this.$http.put("/code/startEightDiscipline", putData).then(({ data }) => {
        if (data && data.code === 0) {
        } else {
          this.$message.error(data.msg);
        }
      });
      this.$http.post("/code/startEightGrade/save/list", this.tableData).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.$http.post("/code/startEightGrade/save/list", this.tableData)
+      });
          .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");
              },
            });
          });
    },
  },
 };
--- a/src/views/modules/code/deliveryInspection.vue
+++ b/src/views/modules/code/deliveryInspection.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-06-19 15:52:51
- * @LastEditTime: 2023-06-20 15:37:10
+ * @LastEditTime: 2023-07-17 10:31:16
 * @LastEditors: zhp
 * @Description: 
 -->
@@ -21,14 +21,14 @@
      <pagination :limit.sync="listQuery.limit" :page.sync="listQuery.page" :total="listQuery.total"
        @pagination="getDataList" />
      <!-- 弹窗, 新增 / 修改 -->
-      <base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="addOrUpdateVisible" @cancel="handleCancel"
+      <base-dialog width="70%" :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"
+      <base-dialog width="70%" :dialogTitle="searchOrEditTitle" :dialogVisible="searchOrUpdateVisible"
-        @confirm="handleSearchConfirm" :before-close="handleSearchCancel">
+        @cancel="handleSearchCancel" @confirm="handleSearchConfirm" :before-close="handleSearchCancel">
        <deliveryInspection-search ref="searchOrUpdate" @refreshDataList="conditionSearchSubmit">
        </deliveryInspection-search>
        <el-row slot="footer" type="flex" justify="end">
@@ -187,7 +187,6 @@ export default {
      this.productOrEditTitle = "";
    },
    handleCurrentChange(val) {
      console.log(val);
      this.productData = val.newVal ? val.newVal: {}
    },
    setCurrent(index) {
@@ -286,12 +285,10 @@ export default {
        })
    },
    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;
@@ -303,7 +300,6 @@ export default {
          this.$nextTick(() => {
            this.$refs.productOrUpdate.init(this.productData);
          });
          console.log(this.productId);
          break;
        case "add":
          this.addOrEditTitle = '新增'
--- a/src/views/modules/code/eightDiscipline.vue
+++ b/src/views/modules/code/eightDiscipline.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-06-30 11:16:43
+ * @LastEditTime: 2023-07-17 09:08:38
 * @LastEditors: zwq
 * @Description: 
 -->
@@ -9,60 +9,85 @@
  <el-card shadow="never" class="aui-card--fill">
    <div class="mod-sys__user">
      <SearchBar :formConfigs="formConfig" ref="ruleForm" @headBtnClick="buttonClick">
        <el-badge :value="3" 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">
+      <base-table
-        <method-btn v-if="tableBtn.length" slot="handleBtn" :width="100" label="操作" :method-list="tableBtn"
+        :table-props="tableProps"
-          @clickBtn="handleClick" />
+        :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
-        @pagination="getDataList" />
+        :limit.sync="listQuery.limit"
        :page.sync="listQuery.page"
        :total="listQuery.total"
        @pagination="getDataList"
      />
      <!-- 弹窗, 条件搜索-->
      <!-- <base-dialog
        :dialogTitle="searchsTitle"
        :dialogVisible="searchsVisible"
        @cancel="searchsCancel"
        @confirm="searchsConfirm"
        :before-close="searchsCancel"
      >
        <searchs ref="searchsRef" @refreshDataList="searchsSubmit"></searchs>
      </base-dialog> -->
      <!-- 弹窗, 新增 / 修改 -->
-      <base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="addOrUpdateVisible" @cancel="handleCancel"
+      <base-dialog
-        @confirm="handleConfirm" :before-close="handleCancel">
+        :dialogTitle="addOrEditTitle"
        :dialogVisible="addOrUpdateVisible"
        @cancel="handleCancel"
        @confirm="handleConfirm"
        :before-close="handleCancel"
      >
        <eightDiscipline-add ref="addOrUpdate" @refreshDataList="successSubmit">
-          </eightDiscipline-add>
+        </eightDiscipline-add>
-          <!-- <el-row slot="footer" type="flex" justify="end"> </el-row> -->
+        <!-- <el-row slot="footer" type="flex" justify="end"> </el-row> -->
      </base-dialog>
    </div>
  </el-card>
 </template>
 <script>
-import basicPage from "@/mixins/basic-page"
+import basicPage from "@/mixins/basic-page";
-import eightDisciplineAdd from "./components/eightDiscipline-add"
+import eightDisciplineAdd from "./components/eightDiscipline-add";
-// import AddOrUpdate from './params-add-or-update'
+import available from "./components/available.vue";
-// import disposalMethodSearch from "./components/disposalMethodSearch"
+// import Searchs from "./components/eightDiscipline-searchs";
-import available from "./components/available.vue"
+import codeFilter from "@/filters/code-filter";
-import basicSearch from "@/mixins/basic-search"
+import i18n from "@/i18n";
 import codeFilter from '@/filters/code-filter'
 import i18n from "@/i18n"
 const tableProps = [
  {
-    prop: 'name',
+    prop: "name",
    label: i18n.t("code.name"),
-    align: 'center'
+    align: "center",
  },
  {
-    prop: 'code',
+    prop: "code",
    label: i18n.t("code.code"),
-    align: 'center'
+    align: "center",
  },
  {
-    prop: 'eightDisciplineType',
+    prop: "eightDisciplineType",
    label: i18n.t("code.eightDisciplineType"),
-    align: 'center',
+    align: "center",
-    filter: codeFilter('eightDisciplineType'),
+    filter: codeFilter("eightDisciplineType"),
  },
-   {
+  {
-     prop: 'problemStatus',
+    prop: "problemStatus",
-     label: i18n.t("code.problemStatus"),
+    label: i18n.t("code.problemStatus"),
-     align: 'center',
+    align: "center",
-     subcomponent: available
+    subcomponent: available,
-  }
+  },
-]
+];
 const tableBtn = [
  {
    type: "edit",
@@ -74,10 +99,10 @@ const tableBtn = [
  },
 ];
 export default {
-  mixins: [basicPage, basicSearch],
+  mixins: [basicPage],
  components: {
-    // disposalMethodSearch,
+    eightDisciplineAdd,
-    eightDisciplineAdd
+    // Searchs,
  },
  data() {
    return {
@@ -87,113 +112,69 @@ export default {
      },
      tableProps,
      tableBtn,
      searchOrEditTitle: '',
      searchOrUpdateVisible: false,
      formConfig: [
        // {
        //   type: "",
        //   label: i18n.t("params.paramCode"),
        //   placeholder: i18n.t("params.paramCode"),
        //   param: "paramCode",
        // },
        // {
        //   type: "separate",
        // },
        {
-          type: "button",
+          type: "input",
-          btnName: "新增",
+          label: i18n.t("code.name"),
-          name: "add",
+          placeholder: i18n.t("code.name"),
-          color: "primary",
+          param: "name",
        },
        {
          type: "input",
          label: i18n.t("code.code"),
          placeholder: i18n.t("code.code"),
          param: "code",
        },
        {
          type: "select",
          label: i18n.t('code.eightDisciplineStatus'),
          selectOptions: [
            { id: 1, name: "可用" },
            { id: 0, name: "不可用" },
          ],
          param: "eightDisciplineStatus",
          defaultSelect: "",
        },
        {
          type: "button",
          btnName: "搜索",
          name: "search",
          color: "primary",
-        }
+        },
        {
          type: "button",
          btnName: "新增",
          name: "add",
          color: "primary",
        },
      ],
    };
  },
  // components: {
  //   AddOrUpdate,
  // },
  methods: {
    //search-bar点击
-    handleProductCancel() {
+    searchsClick() {
-      this.productOrUpdateVisible = false;
+      this.searchsTitle = "条件搜索";
-      this.productOrEditTitle = "";
+      this.searchsHandle();
    },
    // 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.code = val.code;
-          this.listQuery.name = null
+          this.listQuery.name = val.name;
-          this.listQuery.failureTypeStatus = null
+          this.listQuery.eightDisciplineStatus = val.eightDisciplineStatus;
          this.getDataList();
          break;
        case "add":
-          this.addOrEditTitle = this.$t('add')
+          this.addOrEditTitle = this.$t("add");
          this.addOrUpdateVisible = true;
-          this.addOrUpdateHandle()
+          this.addOrUpdateHandle();
          break;
        default:
-          console.log(val)
+          console.log(val);
      }
    },
-  }
+  },
 };
 </script>
--- a/src/views/modules/code/examineAndApprove.vue
+++ b/src/views/modules/code/examineAndApprove.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-06-29 11:02:36
+ * @LastEditTime: 2023-07-17 10:38:22
 * @LastEditors: zwq
 * @Description: 
 -->
@@ -66,20 +66,20 @@ const tableProps = [
    align: 'center'
  },
  {
-    prop: 'userId',
+    prop: 'userName',
    label: i18n.t("code.userId"),
    align: 'center'
  }
 ]
 const tableBtn = [
-  {
+  // {
-    type: "edit",
+  //   type: "edit",
-    btnName: "编辑",
+  //   btnName: "编辑",
-  },
+  // },
-  {
+  // {
-    type: "delete",
+  //   type: "delete",
-    btnName: "删除",
+  //   btnName: "删除",
-  },
+  // },
  {
    type: "approve",
    btnName: "审批",
@@ -167,7 +167,6 @@ export default {
      // this.conditionSearchSubmit();
    },
    handleClick(val) {
      console.log(val);
      if (val.type === "delete") {
        this.$confirm(`确定对[名称=${val.data.failureTypeName}]进行删除操作?`, "提示", {
          confirmButtonText: "确定",
--- a/src/views/modules/code/problemType.vue
+++ b/src/views/modules/code/problemType.vue
@@ -0,0 +1,143 @@
 <!--
 * @Author: zhp
 * @Date: 2023-01-11 09:24:58
 * @LastEditTime: 2023-07-14 13:53:02
 * @LastEditors: zwq
 * @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
        :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"
      >
        <add-or-update ref="addOrUpdate" @refreshDataList="successSubmit"></add-or-update>
      </base-dialog>
    </div>
  </el-card>
 </template>
 <script>
 import basicPage from "@/mixins/basic-page";
 import AddOrUpdate from "./components/problemType-add";
 import available from "./components/available.vue";
 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: "description",
    label: "描述",
    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],
  components: {
    AddOrUpdate,
  },
  data() {
    return {
      urlOptions: {
        getDataListURL: "/code/problemType/page",
        deleteURL: "/code/problemType",
      },
      tableProps,
      tableBtn,
      formConfig: [
        {
          type: "select",
          label: "状态",
          selectOptions: [
            { id: 1, name: "可用" },
            { id: 0, name: "不可用" },
          ],
          param: "problemStatus",
          defaultSelect: "",
        },
        {
          type: "button",
          btnName: "搜索",
          name: "search",
          color: "primary",
        },
        {
          type: "button",
          btnName: "新增",
          name: "add",
          color: "primary",
        },
      ],
    };
  },
  methods: {
    buttonClick(val) {
      switch (val.btnName) {
        case "search":
          this.listQuery.page = 1;
          this.listQuery.problemStatus = val.problemStatus;
          this.getDataList();
          break;
        case "add":
          this.addOrEditTitle = this.$t("add");
          this.addOrUpdateVisible = true;
          this.addOrUpdateHandle();
          break;
        default:
          console.log(val);
      }
    },
  },
 };
 </script>
--- a/src/views/modules/code/productInspection.vue
+++ b/src/views/modules/code/productInspection.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-06-19 15:52:51
- * @LastEditTime: 2023-06-20 15:37:02
+ * @LastEditTime: 2023-07-17 10:30:40
 * @LastEditors: zhp
 * @Description: 
 -->
@@ -21,13 +21,13 @@
      <pagination :limit.sync="listQuery.limit" :page.sync="listQuery.page" :total="listQuery.total"
        @pagination="getDataList" />
      <!-- 弹窗, 新增 / 修改 -->
-      <base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="addOrUpdateVisible" @cancel="handleCancel"
+      <base-dialog width="70%" :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"
+      <base-dialog width="70%" :dialogTitle="searchOrEditTitle" :dialogVisible="searchOrUpdateVisible"
-        @confirm="handleSearchConfirm" :before-close="handleSearchCancel">
+        @cancel="handleSearchCancel" @confirm="handleSearchConfirm" :before-close="handleSearchCancel">
        <productInspection-search ref="searchOrUpdate" @refreshDataList="conditionSearchSubmit">
        </productInspection-search>
        <el-row slot="footer" type="flex" justify="end">
@@ -186,7 +186,6 @@ export default {
      this.productOrEditTitle = "";
    },
    handleCurrentChange(val) {
      console.log(val);
      this.productData = val.newVal ? val.newVal: {}
    },
    setCurrent(index) {
@@ -285,12 +284,10 @@ export default {
        })
    },
    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;
@@ -302,7 +299,6 @@ export default {
          this.$nextTick(() => {
            this.$refs.productOrUpdate.init(this.productData);
          });
          console.log(this.productId);
          break;
        case "add":
          this.addOrEditTitle = '新增'
--- a/src/views/modules/code/productRegistration.vue
+++ b/src/views/modules/code/productRegistration.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-06-12 13:22:50
- * @LastEditTime: 2023-06-20 15:36:58
+ * @LastEditTime: 2023-07-17 10:29:25
 * @LastEditors: zhp
 * @Description: 
 -->
@@ -21,40 +21,41 @@
      <pagination :limit.sync="listQuery.limit" :page.sync="listQuery.page" :total="listQuery.total"
        @pagination="getDataList" />
      <!-- 弹窗, 新增 / 修改 -->
-      <base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="addOrUpdateVisible" @cancel="handleCancel"
+      <base-dialog width="70%" :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"
+      <base-dialog width="70%" :dialogTitle="searchOrEditTitle" :dialogVisible="searchOrUpdateVisible"
-        @confirm="handleSearchConfirm" :before-close="handleSearchCancel">
+        @cancel="handleSearchCancel" @confirm="handleSearchConfirm" :before-close="handleSearchCancel">
        <productRegistration-search ref="searchOrUpdate" @refreshDataList="conditionSearchSubmit">
-          </productRegistration-search>
+        </productRegistration-search>
-          <el-row slot="footer" type="flex" justify="end">
+        <el-row slot="footer" type="flex" justify="end">
-            <el-col :span="12">
+          <el-col :span="12">
-              <el-button size="small" type="primary" plain class="btnTextStyle" @click="handleSearchCancel">
+            <el-button size="small" type="primary" plain class="btnTextStyle" @click="handleSearchCancel">
-                {{ $t("close") }}
+              {{ $t("close") }}
-              </el-button>
+            </el-button>
-              <el-button size="small" class="btnTextStyle" type="primary" plain @click="handleSearchReset">{{
+            <el-button size="small" class="btnTextStyle" type="primary" plain @click="handleSearchReset">{{
-                $t("reset")
+              $t("reset")
-                }}</el-button>
+              }}</el-button>
-              <el-button type="primary" size="small" class="btnTextStyle" @click="handleSearchConfirm">
+            <el-button type="primary" size="small" class="btnTextStyle" @click="handleSearchConfirm">
-                {{ $t("search") }}
+              {{ $t("search") }}
-              </el-button>
+            </el-button>
-            </el-col>
+          </el-col>
-          </el-row>
+        </el-row>
      </base-dialog>
    </div>
  </el-card>
 </template>
 <script>
-import basicPage from "@/mixins/basic-page";
+import basicPage from "@/mixins/basic-page"
-import basicSearch from "@/mixins/basic-search";
+import basicSearch from "@/mixins/basic-search"
-import productRegistrationSearch from "./components/productRegistrationSearch.vue";
+import productRegistrationSearch from "./components/productRegistrationSearch.vue"
-import productRegistrationAdd from "./components/productRegistration-add.vue";
+import productRegistrationAdd from "./components/productRegistration-add.vue"
-import i18n from "@/i18n";
+import i18n from "@/i18n"
 import incoming from "@/filters/incoming"
 // import i18n from "@/i18n";
 const tableProps = [
  {
@@ -76,10 +77,12 @@ const tableProps = [
  {
    prop: "upload",
    label: i18n.t('code.upload'),
    filter: incoming('upload'),
  },
  {
    prop: "judgmentResult",
    label: i18n.t('code.judgmentResult'),
    filter: incoming('judgmentResult'),
  },
  {
    prop: "productCode",
@@ -149,7 +152,7 @@ export default {
  data() {
    return {
      urlOptions: {
-        getDataListURL: "code/productRegistration/page/term",
+        getDataListURL: "/code/productRegistration/page/term",
        deleteURL: "/code/productRegistration",
        exportURL: "/code/productRegistration/export",
      },
@@ -203,7 +206,6 @@ export default {
      this.productOrEditTitle = "";
    },
    handleCurrentChange(val) {
      console.log(val);
      this.productData = val.newVal ? val.newVal: {}
    },
    setCurrent(index) {
@@ -302,12 +304,10 @@ export default {
        })
    },
    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;
@@ -319,7 +319,6 @@ export default {
          this.$nextTick(() => {
            this.$refs.productOrUpdate.init(this.productData);
          });
          console.log(this.productId);
          break;
        case "add":
          this.addOrEditTitle = '新增'
--- a/src/views/modules/code/shipmentRegistration.vue
+++ b/src/views/modules/code/shipmentRegistration.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-06-12 13:22:50
- * @LastEditTime: 2023-06-20 15:36:53
+ * @LastEditTime: 2023-07-17 10:29:35
 * @LastEditors: zhp
 * @Description: 
 -->
@@ -21,14 +21,14 @@
      <pagination :limit.sync="listQuery.limit" :page.sync="listQuery.page" :total="listQuery.total"
        @pagination="getDataList" />
      <!-- 弹窗, 新增 / 修改 -->
-      <base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="addOrUpdateVisible" @cancel="handleCancel"
+      <base-dialog width="70%" :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"
+      <base-dialog width="70%" :dialogTitle="searchOrEditTitle" :dialogVisible="searchOrUpdateVisible"
-        @confirm="handleSearchConfirm" :before-close="handleSearchCancel">
+        @cancel="handleSearchCancel" @confirm="handleSearchConfirm" :before-close="handleSearchCancel">
        <shipmentRegistration-search ref="searchOrUpdate" @refreshDataList="conditionSearchSubmit">
        </shipmentRegistration-search>
        <el-row slot="footer" type="flex" justify="end">
@@ -55,6 +55,7 @@ import basicSearch from "@/mixins/basic-search";
 import shipmentRegistrationSearch from "./components/shipmentRegistrationSearch.vue";
 import shipmentRegistrationAdd from "./components/shipmentRegistration-add.vue";
 import i18n from "@/i18n";
 import incoming from "@/filters/incoming";
 // import i18n from "@/i18n";
 const tableProps = [
  {
@@ -76,10 +77,12 @@ const tableProps = [
  {
    prop: "upload",
    label: i18n.t('code.upload'),
    filter: incoming('upload'),
  },
  {
    prop: "judgmentResult",
    label: i18n.t('code.judgmentResult'),
    filter: incoming('judgmentResult'),
  },
  {
    prop: "productCode",
@@ -149,7 +152,7 @@ export default {
  data() {
    return {
      urlOptions: {
-        getDataListURL: "code/shipmentRegistration/page/term",
+        getDataListURL: "/code/shipmentRegistration/page/term",
        deleteURL: "/code/shipmentRegistration",
        exportURL: "/code/shipmentRegistration/export",
      },
@@ -203,7 +206,6 @@ export default {
      this.productOrEditTitle = "";
    },
    handleCurrentChange(val) {
      console.log(val);
      this.productData = val.newVal ? val.newVal: {}
    },
    setCurrent(index) {
@@ -302,12 +304,10 @@ export default {
        })
    },
    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;
@@ -319,7 +319,6 @@ export default {
          this.$nextTick(() => {
            this.$refs.productOrUpdate.init(this.productData);
          });
          console.log(this.productId);
          break;
        case "add":
          this.addOrEditTitle = '新增'
--- a/src/views/modules/code/startEightDiscipline.vue
+++ b/src/views/modules/code/startEightDiscipline.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-06-29 11:15:25
+ * @LastEditTime: 2023-07-14 10:16:34
 * @LastEditors: zwq
 * @Description: 
 -->
@@ -208,7 +208,6 @@ export default {
      // this.conditionSearchSubmit();
    },
    handleClick(val) {
      console.log(val);
      if (val.type === "delete") {
        this.$confirm(`确定对[名称=${val.data.failureTypeName}]进行删除操作?`, "提示", {
          confirmButtonText: "确定",
--- a/src/views/modules/code/startEightDisciplineCreateTeam.vue
+++ b/src/views/modules/code/startEightDisciplineCreateTeam.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-06-29 15:56:04
+ * @LastEditTime: 2023-07-20 10:50:58
 * @LastEditors: zwq
 * @Description: 
 -->
@@ -41,6 +41,7 @@
        @cancel="handleCancel"
        @confirm="handleConfirm"
        :before-close="handleCancel"
        :destroy-on-close="true"
      >
        <add-or-update
          ref="teamSet"
@@ -96,20 +97,20 @@ const tableProps = [
    align: "center",
  },
  {
-    prop: "userId",
+    prop: 'userName',
    label: i18n.t("code.userId"),
    align: "center",
  },
 ];
 const tableBtn = [
-  {
+  // {
-    type: "edit",
+  //   type: "edit",
-    btnName: "编辑",
+  //   btnName: "编辑",
-  },
+  // },
-  {
+  // {
-    type: "delete",
+  //   type: "delete",
-    btnName: "删除",
+  //   btnName: "删除",
-  },
+  // },
  {
    type: "team",
    btnName: "团队",
@@ -189,7 +190,6 @@ export default {
      // this.conditionSearchSubmit();
    },
    handleClick(val) {
      console.log(val);
      if (val.type === "delete") {
        this.$confirm(`确定对[名称=${val.data.failureTypeName}]进行删除操作?`, "提示", {
          confirmButtonText: "确定",
--- a/src/views/modules/code/startEightDisciplineDescriptionCorrectiveAction.vue
+++ b/src/views/modules/code/startEightDisciplineDescriptionCorrectiveAction.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-06-30 09:26:26
+ * @LastEditTime: 2023-07-17 10:38:45
 * @LastEditors: zwq
 * @Description: 
 -->
@@ -84,20 +84,20 @@ const tableProps = [
    align: 'center'
  },
  {
-    prop: 'userId',
+    prop: 'userName',
    label: i18n.t("code.userId"),
    align: 'center'
  }
 ]
 const tableBtn = [
-  {
+  // {
-    type: "edit",
+  //   type: "edit",
-    btnName: "编辑",
+  //   btnName: "编辑",
-  },
+  // },
-  {
+  // {
-    type: "delete",
+  //   type: "delete",
-    btnName: "删除",
+  //   btnName: "删除",
-  },
+  // },
  {
    type: "corrective",
    btnName: "纠正",
@@ -168,7 +168,6 @@ export default {
      // this.conditionSearchSubmit();
    },
    handleClick(val) {
      console.log(val);
      if (val.type === "delete") {
        this.$confirm(`确定对[名称=${val.data.failureTypeName}]进行删除操作?`, "提示", {
          confirmButtonText: "确定",
--- a/src/views/modules/code/startEightDisciplinePreliminaryAnalysis.vue
+++ b/src/views/modules/code/startEightDisciplinePreliminaryAnalysis.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-06-29 13:57:15
+ * @LastEditTime: 2023-07-17 10:39:03
 * @LastEditors: zwq
 * @Description: 
 -->
@@ -82,7 +82,7 @@ const tableProps = [
    align: 'center'
  },
  {
-    prop: 'userId',
+    prop: 'userName',
    label: i18n.t("code.userId"),
    align: 'center'
  }
@@ -92,10 +92,10 @@ const tableBtn = [
  //   type: "edit",
  //   btnName: "编辑",
  // },
-  {
+  // {
-    type: "delete",
+  //   type: "delete",
-    btnName: "删除",
+  //   btnName: "删除",
-  },
+  // },
  {
    type: "analysis",
    btnName: "分析",
@@ -175,7 +175,6 @@ export default {
      // this.conditionSearchSubmit();
    },
    handleClick(val) {
      console.log(val);
      if (val.type === "delete") {
        this.$confirm(`确定对[名称=${val.data.failureTypeName}]进行删除操作?`, "提示", {
          confirmButtonText: "确定",
--- a/src/views/modules/code/startEightDisciplinePreventRecurrence.vue
+++ b/src/views/modules/code/startEightDisciplinePreventRecurrence.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-06-30 09:34:16
+ * @LastEditTime: 2023-07-17 10:38:34
 * @LastEditors: zwq
 * @Description: 
 -->
@@ -84,20 +84,20 @@ const tableProps = [
    align: 'center'
  },
  {
-    prop: 'userId',
+    prop: 'userName',
    label: i18n.t("code.userId"),
    align: 'center'
  }
 ]
 const tableBtn = [
-  {
+  // {
-    type: "edit",
+  //   type: "edit",
-    btnName: "编辑",
+  //   btnName: "编辑",
-  },
+  // },
-  {
+  // {
-    type: "delete",
+  //   type: "delete",
-    btnName: "删除",
+  //   btnName: "删除",
-  },
+  // },
  {
    type: "prevent",
    btnName: "预防",
@@ -168,7 +168,6 @@ export default {
      // this.conditionSearchSubmit();
    },
    handleClick(val) {
      console.log(val);
      if (val.type === "delete") {
        this.$confirm(`确定对[名称=${val.data.failureTypeName}]进行删除操作?`, "提示", {
          confirmButtonText: "确定",
--- a/src/views/modules/code/startEightDisciplineRootCauseAnalysis.vue
+++ b/src/views/modules/code/startEightDisciplineRootCauseAnalysis.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-06-30 09:21:25
+ * @LastEditTime: 2023-07-17 10:38:50
 * @LastEditors: zwq
 * @Description: 
 -->
@@ -83,20 +83,20 @@ const tableProps = [
    align: 'center'
  },
  {
-    prop: 'userId',
+    prop: 'userName',
    label: i18n.t("code.userId"),
    align: 'center'
  }
 ]
 const tableBtn = [
-  {
+  // {
-    type: "edit",
+  //   type: "edit",
-    btnName: "编辑",
+  //   btnName: "编辑",
-  },
+  // },
-  {
+  // {
-    type: "delete",
+  //   type: "delete",
-    btnName: "删除",
+  //   btnName: "删除",
-  },
+  // },
  {
    type: "analysis",
    btnName: "分析",
--- a/src/views/modules/code/startEightDisciplineSummaryExperience.vue
+++ b/src/views/modules/code/startEightDisciplineSummaryExperience.vue
@@ -2,7 +2,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-06-30 09:37:58
+ * @LastEditTime: 2023-07-17 10:38:29
 * @LastEditors: zwq
 * @Description: 
 -->
@@ -84,20 +84,20 @@ const tableProps = [
    align: 'center'
  },
  {
-    prop: 'userId',
+    prop: 'userName',
    label: i18n.t("code.userId"),
    align: 'center'
  }
 ]
 const tableBtn = [
-  {
+  // {
-    type: "edit",
+  //   type: "edit",
-    btnName: "编辑",
+  //   btnName: "编辑",
-  },
+  // },
-  {
+  // {
-    type: "delete",
+  //   type: "delete",
-    btnName: "删除",
+  //   btnName: "删除",
-  },
+  // },
  {
    type: "summary",
    btnName: "总结",
--- a/src/views/modules/code/startEightDisciplineTemporaryTreatmentMeasures.vue
+++ b/src/views/modules/code/startEightDisciplineTemporaryTreatmentMeasures.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-06-29 16:48:05
+ * @LastEditTime: 2023-07-20 10:49:29
 * @LastEditors: zwq
 * @Description: 
 -->
@@ -27,6 +27,7 @@
        @cancel="handleCancel"
        @confirm="handleConfirm"
        :before-close="handleCancel"
        :destroy-on-close="true"
        width=70%
      >
        <add-or-update
@@ -89,20 +90,20 @@ const tableProps = [
    align: 'center'
  },
  {
-    prop: 'userId',
+    prop: 'userName',
    label: i18n.t("code.userId"),
    align: 'center'
  }
 ]
 const tableBtn = [
-  {
+  // {
-    type: "edit",
+  //   type: "edit",
-    btnName: "编辑",
+  //   btnName: "编辑",
-  },
+  // },
-  {
+  // {
-    type: "delete",
+  //   type: "delete",
-    btnName: "删除",
+  //   btnName: "删除",
-  },
+  // },
  {
    type: "measure",
    btnName: "措施",
@@ -185,7 +186,6 @@ export default {
      // this.conditionSearchSubmit();
    },
    handleClick(val) {
      console.log(val);
      if (val.type === "delete") {
        this.$confirm(`确定对[名称=${val.data.failureTypeName}]进行删除操作?`, "提示", {
          confirmButtonText: "确定",
--- a/src/views/modules/code/startEightDisciplineValidation.vue
+++ b/src/views/modules/code/startEightDisciplineValidation.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-06-30 09:31:04
+ * @LastEditTime: 2023-07-17 10:38:40
 * @LastEditors: zwq
 * @Description: 
 -->
@@ -83,20 +83,20 @@ const tableProps = [
    align: 'center'
  },
  {
-    prop: 'userId',
+    prop: 'userName',
    label: i18n.t("code.userId"),
    align: 'center'
  }
 ]
 const tableBtn = [
-  {
+  // {
-    type: "edit",
+  //   type: "edit",
-    btnName: "编辑",
+  //   btnName: "编辑",
-  },
+  // },
-  {
+  // {
-    type: "delete",
+  //   type: "delete",
-    btnName: "删除",
+  //   btnName: "删除",
-  },
+  // },
  {
    type: "validation",
    btnName: "验证",
--- a/src/views/modules/code/startEightGrade.vue
+++ b/src/views/modules/code/startEightGrade.vue
@@ -1,7 +1,7 @@
 <template>
  <el-card shadow="never" class="aui-card--fill">
    <div class="mod-sys__user">
-      <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
+      <!-- <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" /> -->
      <base-table
        :table-props="tableProps"
        :page="listQuery.page"
@@ -30,6 +30,7 @@
        @cancel="handleCancel"
        @confirm="handleConfirm"
        :before-close="handleCancel"
        :destroy-on-close="true"
      >
        <add-or-update ref="addOrUpdate" @refreshDataList="successSubmit"></add-or-update>
      </base-dialog>
@@ -73,10 +74,10 @@ const tableProps = [
    align: "center",
  },
  {
-    prop: "examineStatus",
+    prop: "gradeFinish",
-    label: i18n.t("code.examineStatus"),
+    label: "打分状态",
    align: "center",
-    filter: codeFilter("examineStatus"),
+    filter: codeFilter("gradeFinish"),
  },
 ];
 const tableBtn = [
@@ -130,9 +131,16 @@ export default {
      }
    },
    otherMethods(val) {
      if(val.data.gradeFinish){
        this.$message({
          message: '该数据已完成打分操作，请勿重复打分！',
          type: 'warning'
        });
      }else{
      this.addOrEditTitle = "打分";
      this.addOrUpdateVisible = true;
      this.addOrUpdateHandle(val.data.id);
      }
    },
  },
 };
--- a/src/views/modules/customerquality/components/available.vue
+++ b/src/views/modules/customerquality/components/available.vue
@@ -0,0 +1,41 @@
 <!--
 * @Author: zhp
 * @Date: 2023-01-31 09:49:36
 * @LastEditTime: 2023-07-11 14:31:18
 * @LastEditors: zhp
 * @Description: 
 -->
 <template>
  <span>
    <el-tag v-if="injectData.supplierTypeStatus === 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>
--- a/src/views/modules/customerquality/components/baseConfig-add.vue
+++ b/src/views/modules/customerquality/components/baseConfig-add.vue
@@ -0,0 +1,177 @@
 <!--
 * @Author: zhp
 * @Date: 2023-07-14 13:44:46
 * @LastEditTime: 2023-07-21 09:34:55
 * @LastEditors: zhp
 * @Description: 
 -->
 <template>
  <div>
    <el-drawer close-on-press-escape :title="!dataForm.id ? $t('add') : $t('add')" :append-to-body="true"
      @closed="handleClose" :visible.sync="innerDrawer">
      <el-form :model="dataForm" ref="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmitHandle()"
        label-width="120px">
        <el-form-item prop="requirementListId" :label="$t('customerquality.requirementListName')">
          <el-select clearable v-model="dataForm.requirementListId"
            :placeholder="$t('customerquality.requirementListName')">
            <el-option v-for="item in requirementList" :key="item.id" :label="item.requirementListName"
              :value="item.id">
            </el-option>
          </el-select>
        </el-form-item>
        <el-form-item prop="knowledgeBaseId" :label="$t('customerquality.knowledgeBaseName')">
          <el-select clearable v-model="dataForm.knowledgeBaseId"
            :placeholder="$t('customerquality.knowledgeBaseName')">
            <el-option v-for="item in knowledgeBaseList" :key="item.id" :label="item.knowledgeBaseName"
              :value="item.id">
            </el-option>
          </el-select>
        </el-form-item>
        <el-form-item>
          <el-button @click="innerDrawer = false">{{ $t('cancel') }} </el-button>
          <el-button type="primary" @click="dataFormSubmit"> {{ $t('confirm') }}</el-button>
        </el-form-item>
      </el-form>
    </el-drawer>
  </div>
 </template>
 <script>
 import i18n from "@/i18n"
 import basicAdd from "@/mixins/basic-add"
 import debounce from "lodash/debounce"
 export default {
  mixins: [basicAdd],
    data() {
      return {
        urlOptions: {
          submitURL: "/customerquality/qmsKnowledgeBaseRequirementList",
          getRequirementListURL: "/customerquality/qmsCustomerQualityRequirementList/page",
          getKnowledgeBaseURL: "/customerquality/qmsKnowledgeBase/page"
        },
        dataForm: {
          knowledgeBaseId: null,
          requirementListId:null
        },
        innerDrawer: false,
        listQuery: {
          limit: 10,
          page:1,
        },
        requirementList: [],
        knowledgeBaseList:[],
      }
  },
  computed: {
    dataRule() {
      return {
        knowledgeBaseId: [
          {
            required: true,
            message: this.$t("validate.required"),
            trigger: "change",
          },
        ],
        requirementListId: [
          {
            required: true,
            message: this.$t("validate.required"),
            trigger: "change",
          },
        ]
      };
    },
  },
  mounted () {
    this.getDict()
  },
    methods: {
      init(obj) {
        this.dataForm.knowledgeBaseId = obj.knowledgeBaseId || ''
        this.dataForm.requirementListId = obj.requirementListId || ''
        this.dataForm.id = obj.id || ''
        this.innerDrawer = true
        this.$nextTick(() => {
          this.$refs["dataForm"].resetFields()
          if (this.dataForm.id) {
            this.getInfo()
          } else {
            // this.getCode()
          }
        })
      },
      handleClose() {
        this.innerDrawer = false
        this.$refs.dataForm.resetFields()
      },
      getInfo() {
        this.$http
          .get(`/customerquality/qmsKnowledgeBaseRequirementList/${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.getRequirementListURL, {
            params: this.listQuery
          })
          .then(({ data: res }) => {
            if (res.code === 0) {
              console.log(res);
              this.requirementList = res.data.list
            }
          })
          .catch(() => {
          })
        this.$http
          .get(this.urlOptions.getKnowledgeBaseURL, {
            params: this.listQuery
          })
          .then(({ data: res }) => {
            if (res.code === 0) {
              console.log(res);
              this.knowledgeBaseList = res.data.list
            }
          })
          .catch(() => {
          })
      },
      // 表单提交
      dataFormSubmit() {
        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.innerDrawer = false;
                  this.$emit("refreshDataList");
                },
              });
            })
            .catch(() => { });
        });
      },
    },
  }
 </script>
 <style lang="scss" scoped>
 </style>
--- a/src/views/modules/customerquality/components/baseConfig.vue
+++ b/src/views/modules/customerquality/components/baseConfig.vue
@@ -0,0 +1,214 @@
 <!--
 * @Author: zhp
 * @Date: 2023-07-14 13:44:46
 * @LastEditTime: 2023-07-18 14:25:05
 * @LastEditors: zhp
 * @Description: 
 -->
 <template>
  <div>
    <el-drawer :title="$t('customerquality.knowledgeBase')" :visible.sync="drawer" size="50%">
      <div>
        <SearchBar :formConfigs="formConfig" ref="ruleForm" @headBtnClick="buttonClick">
          <!-- <el-badge :value="5" 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" />
      </div>
      <baseConfig-add ref="baseConfigAddList" v-if="baseConfigAddShow" @refreshDataList="getDataList"></baseConfig-add>
    </el-drawer>
  </div>
 </template>
 <script>
 import basicPage from "@/mixins/basic-page"
 // import basicSearch from "@/mixins/basic-search"
 // import projectTypeSearch from "./components/projectTypeSearch.vue"
 import baseConfigAdd from "./baseConfig-add"
 import customerquality from '@/filters/customerquality'
 // import qmsKnowledgeBaseAdd from "./components/qmsKnowledgeBase-add.vue"
 import InnerTable from "./innerTable"
 import i18n from "@/i18n"
 // import i18n from "@/i18n";
 const tableProps = [
  {
    prop: "requirementListName",
    label: i18n.t('customerquality.requirementListName'),
  },
  {
    prop: "uploadFiles",
    label: i18n.t('customerquality.uploadFiles'),
  },
  {
    prop: "categoryName",
    label: i18n.t('uploadFile'),
  },
  {
    prop: "code",
    label: i18n.t('customerquality.file'),
    subcomponent: InnerTable
  },
 ];
 const tableBtn = [
  {
    type: "edit",
    btnName: i18n.t('edit'),
  },
  {
    type: "delete",
    btnName: i18n.t('delete'),
  }
 ];
 export default {
  mixins: [basicPage],
  components: {
    baseConfigAdd,
  },
    data() {
      return {
        urlOptions: {
          getDataListURL: "/customerquality/qmsKnowledgeBaseRequirementList/page",
          deleteURL: "/customerquality/qmsKnowledgeBase",
          exportURL: '/customerquality/qmsKnowledgeBase/export'
        },
        tableBtn,
        baseConfigAddShow:[],
        formConfig: [
          {
            type: "button",
            btnName: i18n.t('search'),
            name: "search",
            color: "primary",
            // plain: true,
          },
          {
            type: "button",
            btnName: i18n.t('add'),
            name: "add",
            color: "success",
            plain: true
          },
        ],
        tableProps,
        tableData: [],
        drawer: false,
        listQuery: {
          limit: 10,
          page:1,
        }
      }
  },
    methods: {
      init(obj) {
        this.listQuery.knowledgeBaseId = obj.knowledgeBaseId || ""
        this.listQuery.requirementListId = obj.requirementListId || ""
        // this.dataForm.dictTypeId = dictTypeId || "";
        this.drawer = true
        this.$nextTick(() => {
          this.getDataList()
        });
      },
      buttonClick(val) {
        console.log(val)
        switch (val.btnName) {
          case "search":
            // this.listQuery.paramCode = val.paramCode;
            // this.listQuery.supplierName = val.supplierName ? val.supplierName : undefined
            // this.listQuery.supplierStatus = val.supplierStatus ? val.supplierStatus : undefined
            // this.listQuery.supplierTypeId = val.supplierTypeId ? val.supplierTypeId : undefined
            // this.listQuery.ment = this.ment ? this.ment : undefined
            // console.log(i18n);
            this.listQuery.page = 1;
            this.getDataList()
            break;
          // case "export":
          //   // this.listQuery.paramCode = val.paramCode;
          //   this.exportHandle()
          //   break;
          case "add":
            // this.addOrEditTitle = '新增'
            // this.addOrUpdateVisible = true;
            this.baseConfigAddShow = true
            const obj = {
              knowledgeBaseId:   this.listQuery.knowledgeBaseId,
              requirementListId: this.listQuery.requirementListId 
            }
            this.$nextTick(() => {
              this.$refs.baseConfigAddList.init(obj)
            })
            // this.addOrUpdateHandle()
            break;
          default:
        }
      },
      getDataList() {
        this.dataListLoading = true;
        this.$http
          .get(this.urlOptions.getDataListURL, {
            params: 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;
          })
      },
      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.baseConfigAddShow = true
          const obj = {
            knowledgeBaseId: this.listQuery.knowledgeBaseId,
            requirementListId: this.listQuery.requirementListId,
            id:val.data.id
          }
          this.$nextTick(() => {
            this.$refs.baseConfigAddList.init(obj)
          })
        }
      },
    },
  }
 </script>
 <style lang="scss" scoped>
 </style>
--- a/src/views/modules/customerquality/components/baseConfigFile-add.vue
+++ b/src/views/modules/customerquality/components/baseConfigFile-add.vue
@@ -0,0 +1,187 @@
 <!--
 * @Author: zhp
 * @Date: 2023-07-14 13:44:46
 * @LastEditTime: 2023-07-18 16:53:36
 * @LastEditors: zhp
 * @Description: 
 -->
 <template>
  <div>
    <el-drawer close-on-press-escape :title="$t('add')" :append-to-body="true" :before-close="handleClose"
      :visible.sync="innerDrawer">
      <el-form :model="dataForm" ref="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmitHandle()"
        label-width="120px">
        <el-form-item prop="knowledgeBaseFileId" :label="$t('customerquality.knowledgeBaseFileId')">
          <el-select clearable v-model="dataForm.knowledgeBaseFileId"
            :placeholder="$t('customerquality.knowledgeBaseFileId')">
            <el-option v-for="item in categoryList" :key="item.id" :label="item.dataDictionaryDetailName"
              :value="item.id">
            </el-option>
          </el-select>
        </el-form-item>
        <el-form-item prop="title" :label="$t('customerquality.title')">
          <el-input clearable v-model="dataForm.title" :placeholder="$t('customerquality.title')">
          </el-input>
        </el-form-item>
        <el-form-item prop="accessPath" :label="$t('customerquality.accessPath')">
          <el-input clearable v-model="dataForm.accessPath" :placeholder="$t('customerquality.accessPath')">
          </el-input>
        </el-form-item>
        <el-form-item>
          <el-button @click="innerDrawer = false">{{ $t('cancel') }} </el-button>
          <el-button type="primary" @click="dataFormSubmit"> {{ $t('confirm') }}</el-button>
        </el-form-item>
      </el-form>
    </el-drawer>
  </div>
 </template>
 <script>
 import i18n from "@/i18n"
 import basicAdd from "@/mixins/basic-add"
 import debounce from "lodash/debounce"
 export default {
  mixins: [basicAdd],
    data() {
      return {
        urlOptions: {
          submitURL: "/customerquality/knowledgeBaseRequirementListData",
          getDictDataDetail: '/mutual/qmsDataDictionaryDetail/page'
        },
        dataForm: {
          accessPath:null,
          id: null,
          knowledgeBaseFileId: null,
          knowledgeBaseRequirementListId: null,
          title: null,
        },
        innerDrawer: false,
        listQuery: {
          limit: 10,
          page:1,
        },
        categoryList:[],
        requirementList: [],
        knowledgeBaseList:[],
      }
  },
  computed: {
    dataRule() {
      return {
        knowledgeBaseId: [
          {
            required: true,
            message: this.$t("validate.required"),
            trigger: "change",
          },
        ],
        requirementListId: [
          {
            required: true,
            message: this.$t("validate.required"),
            trigger: "change",
          },
        ]
      };
    },
  },
  mounted () {
    this.getDict()
    this.getAccessPath()
  },
    methods: {
      init(obj) {
        this.dataForm.knowledgeBaseRequirementListId = obj.knowledgeBaseRequirementListId || ''
        this.dataForm.knowledgeBaseRequirementListId = obj.knowledgeBaseRequirementListId || ''
        this.dataForm.id = obj.id || ''
        this.innerDrawer = true
        this.$nextTick(() => {
          this.$refs["dataForm"].resetFields()
          if (this.dataForm.id) {
            this.getInfo()
          } else {
            // this.getCode()
          }
        })
      },
      getDict() {
        this.$http
          .get(this.urlOptions.getDictDataDetail, {
            params: {
              limit: 999,
              page: 1,
              dataDictionaryId: '1679670942635122690',
            }
          })
          .then(({ data: res }) => {
            // this.dataListLoading = false;
            if (res.code === 0) {
              this.categoryList = res.data.list
            }
          })
      },
      getAccessPath() {
        const now = new Date();
        const year = now.getFullYear();
        const month = ('0' + (now.getMonth() + 1)).slice(-2);
        const day = ('0' + now.getDate()).slice(-2);
        const hours = ('0' + now.getHours()).slice(-2);
        const minutes = ('0' + now.getMinutes()).slice(-2);
        const formattedTime = year + month + day + hours + minutes
        console.log(formattedTime)
        var str = Math.random().toString(36).slice(-5)
        // console.log(str)
        this.dataForm.accessPath = formattedTime+ str
      },
      handleClose() {
        this.innerDrawer = true
        this.$refs.dataForm.resetFields()
      },
      getInfo() {
        this.$http
          .get(`/customerquality/knowledgeBaseRequirementListData/${this.dataForm.id}`)
          .then(({ data: res }) => {
            if (res.code !== 0) {
              return this.$message.error(res.msg);
            }
            this.dataForm = {
              ...this.dataForm,
              ...res.data,
            };
          })
          .catch(() => { });
      },
      // 表单提交
      dataFormSubmit() {
        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.innerDrawer = false;
                  this.$emit("refreshDataList");
                },
              });
            })
            .catch(() => { });
        });
      },
    },
  }
 </script>
 <style lang="scss" scoped>
 </style>
--- a/src/views/modules/customerquality/components/change-add.vue
+++ b/src/views/modules/customerquality/components/change-add.vue
@@ -0,0 +1,146 @@
 <!--
 * @Author: zhp
 * @Date: 2023-07-14 13:44:46
 * @LastEditTime: 2023-07-19 14:48:19
 * @LastEditors: zhp
 * @Description: 
 -->
 <template>
  <div>
    <el-drawer close-on-press-escape :title="!dataForm.id ? $t('add') : $t('edit')" size="40%" :append-to-body="true"
      :closed="handleClose" :visible.sync="innerDrawer">
      <el-form :model="dataForm" ref="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmitHandle()"
        label-width="140px">
        <el-form-item prop="changeHistory" label="Change History of this PPAP record">
          <el-input clearable v-model="dataForm.changeHistory" placeholder="Change History of this PPAP record">
          </el-input>
        </el-form-item>
        <el-form-item prop="name" label="	name">
          <el-input clearable v-model="dataForm.name" placeholder="name">
          </el-input>
        </el-form-item>
        <el-form-item prop="date" label="date">
          <el-date-picker v-model="dataForm.date" type="datetime" format='yyyy-MM-dd HH:mm:ss'
            valueFormat='yyyy-MM-ddTHH:mm:ss' placeholder="date">
          </el-date-picker>
        </el-form-item>
        <el-form-item>
          <el-button @click="innerDrawer = false">{{ $t('cancel') }} </el-button>
          <el-button type="primary" @click="dataFormSubmit"> {{ $t('confirm') }}</el-button>
        </el-form-item>
      </el-form>
    </el-drawer>
  </div>
 </template>
 <script>
 import i18n from "@/i18n"
 import basicAdd from "@/mixins/basic-add"
 import debounce from "lodash/debounce"
 export default {
  mixins: [basicAdd],
    data() {
      return {
        urlOptions: {
          submitURL: "/customerquality/qmsCustomerQualityProjectListChangeRecord",
        },
        dataForm: {
          date:null,
          name: null,
          id: null,
          changeHistory: null,
        },
        innerDrawer: false,
        listQuery: {
          limit: 10,
          page:1,
        },
        requirementList: [],
        knowledgeBaseList:[],
      }
  },
  computed: {
    dataRule() {
      return {
        knowledgeBaseId: [
          {
            required: true,
            message: this.$t("validate.required"),
            trigger: "change",
          },
        ],
        requirementListId: [
          {
            required: true,
            message: this.$t("validate.required"),
            trigger: "change",
          },
        ]
      };
    },
  },
    methods: {
      init(obj) {
        // this.dataForm.knowledgeBaseId = obj.knowledgeBaseId || ''
        // this.dataForm.requirementListId = obj.requirementListId || ''
        this.dataForm.id = obj.id?  obj.id :null
        this.dataForm.customerQualityProjectListId = obj.customerQualityProjectListId ? obj.customerQualityProjectListId :null
        this.innerDrawer = true
        this.$nextTick(() => {
          this.$refs["dataForm"].resetFields()
          if (this.dataForm.id) {
            this.getInfo()
          } else {
            // this.getCode()
          }
        })
      },
      handleClose() {
        this.innerDrawer = true
        this.$refs.dataForm.resetFields()
      },
      getInfo() {
        this.$http
          .get(`/customerquality/qmsCustomerQualityProjectListChangeRecord/${this.dataForm.id}`)
          .then(({ data: res }) => {
            if (res.code !== 0) {
              return this.$message.error(res.msg);
            }
            this.dataForm = {
              ...this.dataForm,
              ...res.data,
            };
          })
          .catch(() => { });
      },
      // 表单提交
      dataFormSubmit() {
        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.innerDrawer = false;
                  this.$emit("refreshDataList");
                },
              });
            })
            .catch(() => { });
        });
      },
    },
  }
 </script>
 <style lang="scss" scoped>
 </style>
--- a/src/views/modules/customerquality/components/customerQualityProjectList-add.vue
+++ b/src/views/modules/customerquality/components/customerQualityProjectList-add.vue
@@ -0,0 +1,832 @@
    <!--
 * @Author: zhp
 * @Date: 2023-02-14 15:02:26
 * @LastEditTime: 2023-07-21 10:07:47
 * @LastEditors: zhp
 * @Description: 
 -->
 <template>
  <el-drawer close-on-press-escape title="项目清单" :visible.sync="visible" size="50%" :before-close="handleClose()">
    <el-tabs @tab-click="handleClickTab" v-model="title" tab-position="left" style="margin-bottom: 30px;">
      <el-tab-pane label="项目概述" name="first">
        <el-form :model="dataForm" ref="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmitHandle()"
          label-width="120px">
          <el-form-item prop="productId" :label="$t('basic.productName')">
            <el-select v-model="dataForm.productId" :placeholder="$t('basic.productName')" clearable>
              <el-option v-for="item in productList" :key="item.id" :label="item.productName" :value="item.id">
              </el-option>
            </el-select>
          </el-form-item>
          <el-form-item prop="knowledgeBaseId" :label="$t('customerquality.knowledgeBase')">
            <el-select v-model="dataForm.knowledgeBaseId" :placeholder="$t('customerquality.knowledgeBase')" clearable>
              <el-option v-for="item in knowledgeBaseList" :key="item.id" :label="item.knowledgeBaseName"
                :value="item.id">
              </el-option>
            </el-select>
          </el-form-item>
          <el-form-item prop="customerId" :label="$t('customerquality.customerName')">
            <el-select v-model="dataForm.customerId" :placeholder="$t('customerquality.customerName')" clearable>
              <el-option v-for="item in customerList" :key="item.id" :label="item.customerName" :value="item.id">
              </el-option>
            </el-select>
          </el-form-item>
          <el-form-item prop="qualityAcceptanceDate" :label="$t('customerquality.qualityAcceptanceDate')">
            <el-date-picker clearable v-model="dataForm.qualityAcceptanceDate" type="datetime"
              :placeholder="$t('customerquality.qualityAcceptanceDate')">
            </el-date-picker>
          </el-form-item>
          <el-form-item prop="deliveryRequiredDate" :label="$t('customerquality.deliveryRequiredDate')">
            <el-date-picker clearable v-model="dataForm.deliveryRequiredDate" type="datetime"
              :placeholder="$t('customerquality.deliveryRequiredDate')">
            </el-date-picker>
          </el-form-item>
          <el-form-item prop="confirmDeliveryDate" :label="$t('customerquality.confirmDeliveryDate')">
            <el-date-picker clearable v-model="dataForm.confirmDeliveryDate" type="datetime"
              :placeholder="$t('customerquality.confirmDeliveryDate')">
            </el-date-picker>
          </el-form-item>
          <el-form-item prop="first" :label="$t('customerquality.first')">
            <el-select clearable v-model="dataForm.first" :placeholder="$t('customerquality.first')">
              <el-option v-for="item in firstList" :key="item.id" :label="item.name" :value="item.id">
              </el-option>
            </el-select>
          </el-form-item>
          <el-form-item prop="previousVersionCode" :label="$t('customerquality.previousVersionCode')">
            <el-input clearable v-model="dataForm.previousVersionCode"
              :placeholder="$t('customerquality.previousVersionCode')">
            </el-input>
          </el-form-item>
          <el-form-item prop="author" label="Author/Owner">
            <el-input clearable v-model="dataForm.author" placeholder="Author/Owner">
            </el-input>
          </el-form-item>
          <el-form-item prop="releaser" label="releaser">
            <el-input clearable v-model="dataForm.releaser" placeholder="releaser">
            </el-input>
          </el-form-item>
          <el-form-item prop="confidentialityAgreement" :label="$t('customerquality.first')">
            <el-select clearable v-model="dataForm.confidentialityAgreement" :placeholder="$t('customerquality.first')">
              <el-option v-for="item in confidentialityAgreementList" :key="item.id" :label="item.name"
                :value="item.id">
              </el-option>
            </el-select>
          </el-form-item>
          <el-form-item prop="nda" label="nda">
            <el-select clearable v-model="dataForm.nda" placeholder="nda">
              <el-option v-for="item in ndaList" :key="item.id" :label="item.name" :value="item.id">
              </el-option>
            </el-select>
          </el-form-item>
          <el-form-item prop="status" label="状态">
            <el-select clearable v-model="dataForm.status" placeholder="状态">
              <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.id">
              </el-option>
            </el-select>
          </el-form-item>
          <el-form-item prop="ppapGrade" :label="$t('customerquality.ppapGrade')">
            <el-select clearable v-model="dataForm.ppapGrade" :placeholder="$t('customerquality.ppapGrade')">
              <el-option v-for="item in ppapGradeList" :key="item.id" :label="item.dataDictionaryDetailName"
                :value="item.id">
              </el-option>
            </el-select>
          </el-form-item>
          <el-form-item prop="version" :label="$t('customerquality.version')">
            <el-input clearable v-model="dataForm.version" :placeholder="$t('customerquality.version')">
            </el-input>
          </el-form-item>
          <el-form-item prop="amendment" :label="$t('customerquality.amendment')">
            <el-input clearable v-model="dataForm.amendment" :placeholder="$t('customerquality.amendment')">
            </el-input>
          </el-form-item>
          <el-form-item prop="description" :label="$t('customerquality.description')">
            <el-input clearable v-model="dataForm.description" :placeholder="$t('customerquality.description')">
            </el-input>
          </el-form-item>
        </el-form>
        <span style="float: right;" class="dialog-footer">
          <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
          <el-button type="primary" @click="dataFormSubmit()"> {{ $t('save') }} </el-button>
        </span>
      </el-tab-pane>
      <el-tab-pane :disabled="tabDisable" label="要求清单" name="second">
        <el-tree :default-checked-keys="defaultData" :data="treeData" show-checkbox @check="handleCheckChange"
          node-key="id">
        </el-tree>
        <span style="float: right;" class="dialog-footer">
          <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
          <el-button type="primary" @click="projectListRequirementListDataFormSubmit()"> {{ $t('save')
          }} </el-button>
        </span>
      </el-tab-pane>
      <el-tab-pane :disabled="tabDisable" label="封面生成" name="three">
        <el-divider content-position="center">修订记录</el-divider>
        <SearchBar :formConfigs="reviseFormConfig" 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" />
        <revise-add ref="reviseAddList" v-if="reviseAddShow" @refreshDataList="getDataList">
        </revise-add>
        <el-divider content-position="center">变更记录</el-divider>
        <SearchBar :formConfigs="changeFormConfig" ref="ruleForm" @headBtnClick="changeButtonClick">
        </SearchBar>
        <base-table id="palletTable" :table-props="changeTableProps" :page="changeListQuery.page" ref="palletTable1"
          :limit="changeListQuery.limit" :table-data="changeTableData">
          <method-btn v-if="changeTableBtn.length" slot="handleBtn" :width="100" label="操作"
            :method-list="changeTableBtn" @clickBtn="changeHandleClick" />
        </base-table>
        <pagination :limit.sync="changeListQuery.limit" :page.sync="changeListQuery.page" :total="changeListQuery.total"
          @pagination="changeGetDataList" />
        <change-add ref="changeAddList" v-if="changeAddShow" @refreshDataList="changeGetDataList">
        </change-add>
      </el-tab-pane>
    </el-tabs>
  </el-drawer>
 </template>
 <script>
 import debounce from "lodash/debounce"
 import basicAdd from "@/mixins/basic-add"
 import reviseAdd from "./revise-add"
 import changeAdd from "./change-add"
 import i18n from "@/i18n"
 import { timeFormatter } from '@/filters'
 const tableProps = [
  {
    prop: "revision",
    label: 'revision',
  },
  {
    prop: "date",
    label: 'date',
    filter: timeFormatter
  },
  {
    prop: "item",
    label: 'Item/Section',
  },
  {
    prop: "essential",
    label: 'Essential Changes',
    // filter: timeFormatter
  },
 ];
 const tableBtn = [
  {
    type: "edit",
    btnName: i18n.t('edit'),
  },
  {
    type: "delete",
    btnName: i18n.t('delete'),
  },
  // {
  //   type: "configuration",
  //   btnName: i18n.t('configuration'),
  // }
 ];
 const changeTableProps = [
  {
    prop: "changeHistory",
    label: '	Change History of this PPAP record',
  },
  {
    prop: "date",
    label: 'date',
    filter: timeFormatter
  },
  {
    prop: "name",
    label: 'name',
  },
 ];
 const changeTableBtn = [
  {
    type: "edit",
    btnName: i18n.t('edit'),
  },
  {
    type: "delete",
    btnName: i18n.t('delete'),
  },
  // {
  //   type: "configuration",
  //   btnName: i18n.t('configuration'),
  // }
 ];
 export default {
  mixins: [basicAdd],
  components: {
    reviseAdd,
    changeAdd
  },
  data() {
    return {
      urlOptions: {
        getReviseDataListURL: '/customerquality/qmsCustomerQualityProjectListRevisionRecord/page',
        getChangeDataListURL: '/customerquality/qmsCustomerQualityProjectListChangeRecord/page',
        changeDeleteURL: '/customerquality/qmsCustomerQualityProjectListChangeRecord',
        reviseDeleteURL: '/customerquality/qmsCustomerQualityProjectListRevisionRecord',
        submitURL: "/customerquality/qmsCustomerQualityProjectList",
        infoURL: "/customerquality/qmsCustomerQualityProjectList//{id}",
        getDictDataDetail: '/mutual/qmsDataDictionaryDetail/page',
        getProductURL: '/basic/qmsProduct/page',
        getKnowledgeBaseURL: '/customerquality/qmsKnowledgeBase/page',
        getCustomerURL: '/basic/qmsCustomer/page',
        getRequirementListURL: '/customerquality/qmsCustomerQualityRequirementList/page',
        getProjectRequirementListURL: '/customerquality/qmsCustomerQualityProjectListRequirementList/page',
        projectListRequirementListSubmitURL: '/customerquality/qmsCustomerQualityProjectListRequirementList/savelist',
        projectListRequirementListEditURL: '/customerquality/qmsCustomerQualityProjectListRequirementList/updatelist',
      },
      tableBtn,
      reviseAddShow: false,
      changeAddShow: false,
      ndaList: [
        {
          id: '0',
          name: '错号',
        },
        {
          id: '1',
          name: '对号',
        }
      ],
      statusList: [
        {
          id: '0',
          name: '待审核',
        },
        {
          id: '1',
          name: '已完成',
        },
        {
          id: '2',
          name: '交付退回',
        },
        {
          id: '3',
          name: '审核拒绝',
        }
      ],
      reviseFormConfig: [
        {
          type: "button",
          btnName: i18n.t('search'),
          name: "search",
          color: "primary",
          // plain: true,
        },
        {
          type: "button",
          btnName: i18n.t('add'),
          name: "add",
          color: "success",
          plain: true
        }
      ],
      changeFormConfig: [
        {
          type: "button",
          btnName: i18n.t('search'),
          name: "search",
          color: "primary",
          // plain: true,
        },
        {
          type: "button",
          btnName: i18n.t('add'),
          name: "add",
          color: "success",
          plain: true
        }
      ],
      tableProps,
      tableData: [],
      changeTableProps,
      changeTableData: [],
      changeTableBtn,
      listQuery: {
        page: 1,
        limit:10
      },
      checkArr:[],
      customerQualityProjectListId:null,
      productList: [],
      title:'first',
      customerList: [],
      ppapGradeList:[],
      knowledgeBaseList: [],
      firstList: [
        {
          id: '0',
          name:'否',
        },
        {
          id: '1',
          name: '是',
        }
      ],
      defaultData:[],
      confidentialityAgreementList: [
        {
          id: '0',
          name: '否',
        },
        {
          id: '1',
          name: '是',
        }
      ],
      categoryList:[],
      typeList:[],
      visible: false,
      listQuery: {
        limit: 999,
        page: 1,
        total:0,
      },
      changeListQuery: {
        limit: 999,
        page: 1,
        total: 0,
      },
      treeData: [],
      tabDisable:true,
      dataForm: {
        nda: null,
        amendment: null,
        status:null,
        confidentialityAgreement:null,
        confirmDeliveryDate: null,
        customerId: null,
        deliveryRequiredDate: null,
        description: null,
        releaser: null,
        author:null,
        first: null,
        id: undefined,
        knowledgeBaseId: null,
        ppapGrade: null,
        previousVersionCode: null,
        productId: null,
        qualityAcceptanceDate: null,
        version: null,
      },
    };
  },
  computed: {
    dataRule() {
      return {
        productId: [
          {
            required: true,
            message: this.$t("validate.required"),
            trigger: "change",
          },
        ],
        knowledgeBaseId: [
          {
            required: true,
            message: this.$t("validate.required"),
            trigger: "change",
          },
        ],
        customerId: [
          {
            required: true,
            message: this.$t("validate.required"),
            trigger: "change",
          },
        ],
        qualityAcceptanceDate: [
          {
            required: true,
            message: this.$t("validate.required"),
            trigger: "change",
          },
        ],
        deliveryRequiredDate: [
          {
            required: true,
            message: this.$t("validate.required"),
            trigger: "change",
          },
        ],
        ppapGrade: [
          {
            required: true,
            message: this.$t("validate.required"),
            trigger: "blur",
          },
        ]
      };
    },
  },
  mounted () {
    this.getDict()
    this.getSecondData()
  },
  methods: {
    changeGetDataList() {
      this.listQuery.customerQualityProjectListId = this.dataForm.id ? this.dataForm.id : this.customerQualityProjectListId
      this.dataListLoading = true;
      this.$http
        .get(this.urlOptions.getChangeDataListURL, {
          params: this.listQuery,
        })
        .then(({ data: res }) => {
          this.dataListLoading = false;
          if (res.code !== 0) {
            this.changeTableData = [];
            this.listQuery.total = 0;
            return this.$message.error(res.msg);
          }
          this.changeTableData = res.data.list;
          this.changeListQuery.total = res.data.total;
        })
        .catch(() => {
          this.dataListLoading = false;
        })
    },
     changeHandleClick(val) {
      if (val.type === "delete") {
        this.$confirm(`确定对[名称=${val.data.customerTypeName}]进行删除操作?`, "提示", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning",
        })
          .then(() => {
            this.$http.delete(this.urlOptions.reviseDeleteURL, { 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') {
        let obj = {
          customerQualityProjectListId: this.dataForm.id ? this.dataForm.id : this.customerQualityProjectListId,
          id: val.data.id
        }
        this.$nextTick(() => {
          this.$refs.reviseAddList.init(obj)
        })
      }
    },
     changeButtonClick(val) {
      console.log(this.dataForm.id)
      console.log(val);
      switch (val.btnName) {
        case "search":
          this.listQuery.page = 1
          this.getDataList()
          break;
        case "add":
          this.changeAddShow = true
          let obj = {
            customerQualityProjectListId: this.dataForm.id ? this.dataForm.id : this.customerQualityProjectListId
          }
          this.$nextTick(() => {
            this.$refs.changeAddList.init(obj)
          })
          break;
        default:
      }
    },
    getDataList() {
      this.dataListLoading = true
      this.listQuery.customerQualityProjectListId = this.dataForm.id ? this.dataForm.id : this.customerQualityProjectListId
      this.$http
        .get(this.urlOptions.getReviseDataListURL, {
          params: 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;
        })
    },
    handleClick(val) {
      if (val.type === "delete") {
        this.$confirm(`确定对[revision为${val.data.revision}]进行删除操作?`, "提示", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning",
        })
          .then(() => {
            this.$http.delete(this.urlOptions.changeDeleteURL, { 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') {
        let obj = {
          customerQualityProjectListId: this.dataForm.id ? this.dataForm.id : this.customerQualityProjectListId,
          id:val.data.id
        }
        this.$nextTick(() => {
          this.$refs.reviseAddList.init(obj)
        })
      }
    },
    buttonClick(val) {
      console.log(this.dataForm.id)
      console.log(val);
      switch (val.btnName) {
        case "search":
          // this.listQuery.paramCode = val.paramCode;
          // console.log(i18n);
          this.listQuery.page = 1
          this.getDataList()
          break;
        case "add":
          this.reviseAddShow = true
          let obj = {
            customerQualityProjectListId: this.dataForm.id ? this.dataForm.id : this.customerQualityProjectListId
          }
          this.$nextTick(() => {
            this.$refs.reviseAddList.init(obj)
          })
          break;
        default:
      }
    },
    handleClickTab(val) {
      console.log(val);
      if (val.name === 'second') {
        this.$http
          .get(this.urlOptions.getProjectRequirementListURL, {
            params: {
              limit: 999,
              page: 1,
              projectListId: this.dataForm.id ? this.dataForm.id : this.customerQualityProjectListId
            }
          })
          .then(({ data: res }) => {
            // this.dataListLoading = false;
            if (res.code === 0) {
              let arr = []
              console.log(res.data.list)
              res.data.list.forEach((item) => {
                arr.push(item.customerQualityRequirementListId)
              })
              this.defaultData = arr 
            }
          })
      } else if (val.name === 'third') {
        this.changeGetDataList()
        this.getDataList()
      }
    },
    init(id) {
      this.dataForm.id = id || ""
      // this.dataForm.dictTypeId = dictTypeId || "";
      this.visible = true;
      this.$nextTick(() => {
        // console.log(this.$refs.dataForm)
        this.$refs["dataForm"].resetFields()
        if (this.dataForm.id) {
          this.getInfo()
        } else {
          // this.getCode()
        }
      });
    },
    // 获取信息
    handleClose() {
      this.$emit("refreshDataList")
      // console.log(this.$refs.dataForm)
      // this.$refs.dataForm.resetFields()
    },
    getInfo() {
      this.$http
        .get(`/customerquality/qmsCustomerQualityProjectList/${this.dataForm.id}`)
        .then(({ data: res }) => {
          if (res.code !== 0) {
            return this.$message.error(res.msg);
          }
          this.dataForm = {
            ...this.dataForm,
            ...res.data,
          }
          this.customerQualityProjectListId = res.data.id
          this.tabDisable = false
        })
        .catch(() => {})
    },
    getSecondData() {
      this.$http
        .get(this.urlOptions.getRequirementListURL, {
          params: {
            limit: 999,
            page: 1,
          }
        })
        .then(({ data: res }) => {
          // this.dataListLoading = false;
          if (res.code === 0) {
            this.treeData = res.data.list.map((item) => {
              return {
                label: item.requirementListName,
                id:item.id
              }
            })
            console.log(this.treeData);
          }
        })
    },
    getDict() {
      this.$http
        .get(this.urlOptions.getDictDataDetail, {
          params: {
            limit: 999,
            page: 1,
            dataDictionaryId:'1681202200846499841',
          }
        })
        .then(({ data: res }) => {
          // this.dataListLoading = false;
          if (res.code === 0) {
            this.ppapGradeList = res.data.list 
          }
        })
      this.$http
        .get(this.urlOptions.getProductURL, {
          params: {
            limit: 999,
            page: 1,
          }
        })
        .then(({ data: res }) => {
          // this.dataListLoading = false;
          if (res.code === 0) {
            this.productList = res.data.list
          }
        })
      this.$http
        .get(this.urlOptions.getKnowledgeBaseURL, {
          params: {
            limit: 999,
            page: 1,
          }
        })
        .then(({ data: res }) => {
          // this.dataListLoading = false;
          if (res.code === 0) {
            this.knowledgeBaseList = res.data.list
          }
        })
      this.$http
        .get(this.urlOptions.getCustomerURL, {
          params: {
            limit: 999,
            page: 1,
          }
        })
        .then(({ data: res }) => {
          // this.dataListLoading = false;
          if (res.code === 0) {
            this.customerList = res.data.list
          }
        })
    },
    handleCheckChange(data, v) {
      this.checkArr = v.checkedKeys.map((item) => {
        return {
          customerQualityProjectListId: this.dataForm.id ? this.dataForm.id : this.customerQualityProjectListId,
          customerQualityRequirementListId:item
        }
      })
      console.log(this.checkArr)
    },
    // handleNodeClick(data) {
    //   console.log(data)
    // },
    projectListRequirementListDataFormSubmit() {
      if (this.defaultData.length !== 0) {
        let customerQualityProjectListId = this.dataForm.id ? this.dataForm.id : this.customerQualityProjectListId
          let list= this.checkArr
        this.$http.put('/customerquality/qmsCustomerQualityProjectListRequirementList/updatelist?id='+customerQualityProjectListId,list )
            .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.title = 'second'
                  // this.tabDisable = false
                  // this.customerQualityProjectListId = res.data
                },
              })
            })
        } else {
          this.$http.post(this.urlOptions.projectListRequirementListSubmitURL, this.checkArr)
            .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.title = 'second'
                  // this.tabDisable = false
                  // this.customerQualityProjectListId = res.data
                },
              })
            })
        }
    },
    dataFormSubmit() {
      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.tabDisable = false
                this.customerQualityProjectListId = 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>
--- a/src/views/modules/customerquality/components/customerQualityRequirementList-add.vue
+++ b/src/views/modules/customerquality/components/customerQualityRequirementList-add.vue
@@ -0,0 +1,198 @@
  <!--
 * @Author: zhp
 * @Date: 2023-02-14 15:02:26
 * @LastEditTime: 2023-07-18 16:54:14
 * @LastEditors: zhp
 * @Description: 
 -->
 <template>
  <el-form :model="dataForm" ref="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmitHandle()"
    label-width="120px">
    <el-form-item prop="code" :label="$t('customerquality.code')">
      <el-input clearable v-model="dataForm.code" :placeholder="$t('customerquality.code')"></el-input>
    </el-form-item>
    <el-form-item prop="requirementListName" :label="$t('customerquality.requirementListName')">
      <el-input clearable v-model="dataForm.requirementListName"
        :placeholder="$t('customerquality.requirementListName')">
      </el-input>
    </el-form-item>
    <el-form-item prop="uploadFiles" :label="$t('customerquality.uploadFiles')">
      <el-radio-group v-model="dataForm.uploadFiles">
        <el-radio :label="0">否</el-radio>
        <el-radio :label="1">是</el-radio>
      </el-radio-group>
    </el-form-item>
    <!-- <el-form-item prop="knowledgeBaseName" :label="$t('basic.status')">
      <el-select v-model="dataForm.currentStage" :placeholder="$t('basic.status')">
        <el-option v-for="item in currentStageList" :key="item.value" :label="item.label" :value="item.value">
        </el-option>
      </el-select>
    </el-form-item>
    <el-form-item prop="serialNumber" :label="$t('customerquality.serialNumber')">
      <el-input v-model="dataForm.serialNumber" :placeholder="$t('customerquality.serialNumber')"></el-input>
    </el-form-item>
    <el-form-item prop="description" :label="$t('customerquality.description')">
      <el-input v-model="dataForm.description" :placeholder="$t('customerquality.description')"></el-input>
    </el-form-item>
    <el-form-item prop="questionType" :label="$t('customerquality.questionType')">
      <el-select v-model="dataForm.questionType" :placeholder="$t('customerquality.questionType')">
        <el-option v-for="item in questionTypeList" :key="item.value" :label="item.label" :value="item.value">
        </el-option>
      </el-select>
    </el-form-item> -->
    <el-form-item prop="category" :label="$t('customerquality.category')">
      <el-select clearable v-model="dataForm.category" :placeholder="$t('customerquality.category')">
        <el-option v-for="item in categoryList" :key="item.id" :label="item.dataDictionaryDetailName" :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: "/customerquality/qmsCustomerQualityRequirementList",
        infoURL: "/customerquality/qmsCustomerQualityRequirementList//{id}",
        getCodeURL: '/customerquality/qmsCustomerQualityRequirementList/getCode',
        getDictDataDetail: '/mutual/qmsDataDictionaryDetail/page'
      },
      categoryList:[],
      visible: false,
      listQuery: {
        limit: 999,
        page:1
      },
      dataForm: {
        id: "",
        code: null,
        category: null,
        requirementListName: null,
        uploadFiles: null,
      },
    };
  },
  computed: {
    dataRule() {
      return {
        code: [
          {
            required: true,
            message: this.$t("validate.required"),
            trigger: "blur",
          },
        ],
        requirementListName: [
          {
            required: true,
            message: this.$t("validate.required"),
            trigger: "blur",
          },
        ],
        uploadFiles: [
          {
            required: true,
            message: this.$t("validate.required"),
            trigger: "change",
          },
        ]
      };
    },
  },
  mounted() {
    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();
        } 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(() => {
        })
    },
    getDict() {
      this.$http
        .get(this.urlOptions.getDictDataDetail, {
          params: {
            limit: 999,
            page: 1,
            dataDictionaryId: '1679670942635122690',
          }
        })
        .then(({ data: res }) => {
          this.dataListLoading = false;
          if (res.code === 0) {
            this.categoryList = res.data.list
          }
        })
    },
    // 获取信息
    getInfo() {
      this.$http
        .get(`/customerquality/qmsCustomerQualityRequirementList/${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>
--- a/src/views/modules/customerquality/components/innerTable.vue
+++ b/src/views/modules/customerquality/components/innerTable.vue
@@ -0,0 +1,189 @@
 <!--
 * @Author: zhp
 * @Date: 2023-04-18 09:19:02
 * @LastEditTime: 2023-07-18 09:52:45
 * @LastEditors: zhp
 * @Description: 
 -->
 <template>
  <div>
    <el-popover placement="right" width="400" trigger="click">
      <SearchBar :formConfigs="formConfig" ref="ruleForm" @headBtnClick="buttonClick">
        <!-- <el-badge :value="5" class="item">
            <el-button type="primary" size="small" @click="conditionSearch">条件搜索</el-button>
          </el-badge> -->
      </SearchBar>
      <base-table id="palletTable" :table-props="tableProps" ref="palletTable1" :table-data="tableData">
        <method-btn v-if="tableBtn.length" slot="handleBtn" :width="100" label="操作" :method-list="tableBtn"
          @clickBtn="handleClick" />
      </base-table>
      <i slot="reference" class="el-icon-plus" @click="showInnerTable(injectData.id)" />
    </el-popover>
    <baseConfigFile-add ref="baseConfigFileAddList" v-if="baseConfigFileAddShow" @refreshDataList="getDataList">
    </baseConfigFile-add>
  </div>
 </template>
 <script>
 import i18n from "@/i18n"
 import { timeFormatter } from '@/filters'
 import baseConfigFileAdd from "./baseConfigFile-add"
 const tableBtn = [
  {
    type: "edit",
    btnName: i18n.t('edit'),
  },
  {
    type: "delete",
    btnName: i18n.t('delete'),
  },
  {
    type: "configuration",
    btnName: i18n.t('configuration'),
  }
 ];
 const tableProps = [
  {
    prop: "title",
    label: i18n.t('customerquality.title'),
  },
  {
    prop: "accessPath",
    label: i18n.t('customerquality.accessPath'),
  }
 ];
 export default {
  name: 'InnerTable',
  props: {
    injectData: {
      type: Object,
      default: () => ({})
    },
    itemProp: {
      type: String
    }
  },
  data() {
    return {
      tableProps,
      list: this.injectData,
      urlOptions: {
        getDataListURL: '/customerquality/knowledgeBaseRequirementListData/page',
        deleteURL: '/customerquality/knowledgeBaseRequirementListData/page'
      },
      tableBtn,
      baseConfigFileAddShow:false,
      tableData: [],
      listQuery: {
        limit: 10,
        page:1,
      },
      formConfig: [
        {
          type: "button",
          btnName: i18n.t('search'),
          name: "search",
          color: "primary",
          // plain: true,
        },
        {
          type: "button",
          btnName: i18n.t('add'),
          name: "add",
          color: "success",
          plain: true
        },
      ],
    }
  },
  components: {
    baseConfigFileAdd,
  },
  methods: {
    buttonClick(val) {
      console.log(val)
      switch (val.btnName) {
        case "search":
          this.listQuery.page = 1;
          this.getDataList()
          break;
        // case "export":
        //   // this.listQuery.paramCode = val.paramCode;
        //   this.exportHandle()
        //   break;
        case "add":
          // this.addOrEditTitle = '新增'
          // this.addOrUpdateVisible = true;
          this.baseConfigFileAddShow = true
          this.$nextTick(() => {
            const obj = {
              knowledgeBaseRequirementListId :this.injectData.id
          }
            this.$refs.baseConfigFileAddList.init(obj)
          })
          // this.addOrUpdateHandle()
          break;
        default:
      }
    },
    handleClick(val) {
      if (val.type === "delete") {
        this.$confirm(`确定对[标题为${val.data.title}]进行删除操作?`, "提示", {
          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.baseConfigFileAddShow = true
        this.$nextTick(() => {
          const obj = {
            knowledgeBaseRequirementListId: this.injectData.id,
            id:val.data.id
          }
          this.$refs.baseConfigFileAddList.init(obj)
        })
      }
    },
    showInnerTable() {
      this.listQuery.knowledgeBaseRequirementListId = this.injectData.id
      this.getDataList()
    },
    getDataList() {
      this.dataListLoading = true;
      this.$http
        .get(this.urlOptions.getDataListURL, {
          params: 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;
        })
    },
  }
 }
 </script>
--- a/src/views/modules/customerquality/components/publicDocuments-add.vue
+++ b/src/views/modules/customerquality/components/publicDocuments-add.vue
@@ -0,0 +1,200 @@
  <!--
 * @Author: zhp
 * @Date: 2023-02-14 15:02:26
 * @LastEditTime: 2023-07-18 16:54:28
 * @LastEditors: zhp
 * @Description: 
 -->
 <template>
  <el-form :model="dataForm" ref="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmitHandle()"
    label-width="120px">
    <el-form-item prop="title" :label="$t('customerquality.title')">
      <el-input clearable :disabled="isDetail" v-model="dataForm.title" :placeholder="$t('customerquality.title')">
      </el-input>
    </el-form-item>
    <el-form-item prop="accessPath" :label="$t('customerquality.accessPath')">
      <el-input clearable :disabled="isDetail" v-model="dataForm.accessPath"
        :placeholder="$t('customerquality.accessPath')">
      </el-input>
    </el-form-item>
    <!-- <el-form-item prop="knowledgeBaseName" :label="$t('basic.status')">
      <el-select v-model="dataForm.currentStage" :placeholder="$t('basic.status')">
        <el-option v-for="item in currentStageList" :key="item.value" :label="item.label" :value="item.value">
        </el-option>
      </el-select>
    </el-form-item>
    <el-form-item prop="serialNumber" :label="$t('customerquality.serialNumber')">
      <el-input v-model="dataForm.serialNumber" :placeholder="$t('customerquality.serialNumber')"></el-input>
    </el-form-item>
    <el-form-item prop="description" :label="$t('customerquality.description')">
      <el-input v-model="dataForm.description" :placeholder="$t('customerquality.description')"></el-input>
    </el-form-item>
    <el-form-item prop="questionType" :label="$t('customerquality.questionType')">
      <el-select v-model="dataForm.questionType" :placeholder="$t('customerquality.questionType')">
        <el-option v-for="item in questionTypeList" :key="item.value" :label="item.label" :value="item.value">
        </el-option>
      </el-select>
    </el-form-item> -->
    <el-form-item prop="knowledgeBaseFileId" :label="$t('customerquality.knowledgeBaseFileId')">
      <el-select clearable :disabled="isDetail" v-model="dataForm.knowledgeBaseFileId"
        :placeholder="$t('customerquality.knowledgeBaseFileId')">
        <el-option v-for="item in categoryList" :key="item.id" :label="item.dataDictionaryDetailName" :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: "/customerquality/qmsPublicDocuments",
        infoURL: "/customerquality/qmsPublicDocuments//{id}",
        getCodeURL: '/customerquality/qmsPublicDocuments/getCode',
        getDictDataDetail: '/mutual/qmsDataDictionaryDetail/page'
      },
      categoryList:[],
      visible: false,
      isDetail:false,
      listQuery: {
        limit: 999,
        page:1
      },
      dataForm: {
        id: "",
        title: null,
        accessPath: null,
        knowledgeBaseFileId: null
      },
    };
  },
  computed: {
    dataRule() {
      return {
        title: [
          {
            required: true,
            message: this.$t("validate.required"),
            trigger: "blur",
          },
        ],
        accessPath: [
          {
            required: true,
            message: this.$t("validate.required"),
            trigger: "blur",
          },
        ],
        knowledgeBaseFileId: [
          {
            required: true,
            message: this.$t("validate.required"),
            trigger: "change",
          },
        ]
      };
    },
  },
  mounted() {
    this.getDict()
  },
  methods: {
    init(obj) {
      if (obj) {
        this.dataForm.id = obj.id
        this.isDetail = obj.detail
      } else {
        this.dataForm.id = null
        this.isDetail = false
      }
      // 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(() => {
    //     })
    // },
    getDict() {
      this.$http
        .get(this.urlOptions.getDictDataDetail, {
          params: {
            limit: 999,
            page: 1,
            dataDictionaryId: '1679668845256630274',
          }
        })
        .then(({ data: res }) => {
          // this.dataListLoading = false;
          if (res.code === 0) {
            this.categoryList = res.data.list
          }
        })
    },
    // 获取信息
    getInfo() {
      this.$http
        .get(`/customerquality/qmsPublicDocuments/${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>
--- a/src/views/modules/customerquality/components/qmsCustomerComplaintManagement-add.vue
+++ b/src/views/modules/customerquality/components/qmsCustomerComplaintManagement-add.vue
@@ -0,0 +1,200 @@
  <!--
 * @Author: zhp
 * @Date: 2023-02-14 15:02:26
 * @LastEditTime: 2023-07-13 15:35:17
 * @LastEditors: zhp
 * @Description: 
 -->
 <template>
  <el-form :model="dataForm" ref="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmitHandle()"
    label-width="120px">
    <el-form-item prop="customerName" :label="$t('customerquality.customerName')">
      <el-input v-model="dataForm.customerName" :placeholder="$t('customerquality.customerName')"></el-input>
    </el-form-item>
    <el-form-item prop="currentStage" :label="$t('basic.status')">
      <el-select v-model="dataForm.currentStage" :placeholder="$t('basic.status')">
        <el-option v-for="item in currentStageList" :key="item.value" :label="item.label" :value="item.value">
        </el-option>
      </el-select>
    </el-form-item>
    <el-form-item prop="serialNumber" :label="$t('customerquality.serialNumber')">
      <el-input v-model="dataForm.serialNumber" :placeholder="$t('customerquality.serialNumber')"></el-input>
    </el-form-item>
    <el-form-item prop="description" :label="$t('customerquality.description')">
      <el-input v-model="dataForm.description" :placeholder="$t('customerquality.description')"></el-input>
    </el-form-item>
    <el-form-item prop="questionType" :label="$t('customerquality.questionType')">
      <el-select v-model="dataForm.questionType" :placeholder="$t('customerquality.questionType')">
        <el-option v-for="item in questionTypeList" :key="item.value" :label="item.label" :value="item.value">
        </el-option>
      </el-select>
    </el-form-item>
    <el-form-item prop="status" :label="$t('basic.status')">
      <el-select v-model="dataForm.status" :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: "/customerquality/qmsCustomerComplaintManagement/",
        infoURL: "/customerquality/qmsCustomerComplaintManagement//{id}"
        // getTypeListURL: '/basic/qmsProductType/page'
      },
      currentStageList: [
        {
          value: 0,
          label: '接受投诉阶段'
        },
        {
          value: 1,
          label: '解释澄清阶段'
        },
        {
          value: 2,
          label: '提出解决方案阶段'
        },
        {
          value: 3,
          label: '回访阶段'
        }
      ],
      questionTypeList: [
        {
          value: 0,
          label: '产品质量题'
        },
        {
          value: 1,
          label: '售后服务题'
        },
        {
          value: 2,
          label: '物流配送问题'
        },
        {
          value: 3,
          label: '单关问题'
        },
        {
          value: 4,
          label: '4系统故问题'
        }
      ],
      options: [
        {
        value: 0,
        label: '不可用'
      },
      {
        value: 1,
        label: '可用'
        }
      ],
      typeList:[],
      visible: false,
      listQuery: {
        limit: 999,
        page:1
      },
      dataForm: {
        id: "",
        currentStage:null,
        customerName: null,
        description: null,
        questionType: null,
        serialNumber: null,
        status: null,
      },
    };
  },
  computed: {
    dataRule() {
      return {
        code: [
          {
            required: true,
            message: this.$t("validate.required"),
            trigger: "blur",
          },
        ],
        name: [
          {
            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()
        }
      });
    },
    // 获取信息
    getInfo() {
      this.$http
        .get(`/customerquality/qmsCustomerComplaintManagement/${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>
--- a/src/views/modules/customerquality/components/qmsKnowledgeBase-add.vue
+++ b/src/views/modules/customerquality/components/qmsKnowledgeBase-add.vue
@@ -0,0 +1,153 @@
  <!--
 * @Author: zhp
 * @Date: 2023-02-14 15:02:26
 * @LastEditTime: 2023-07-19 15:28:46
 * @LastEditors: zhp
 * @Description: 
 -->
 <template>
  <el-form :model="dataForm" ref="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmitHandle()"
    label-width="120px">
    <el-form-item prop="code" :label="$t('customerquality.code')">
      <el-input clearable v-model="dataForm.code" :placeholder="$t('customerquality.code')"></el-input>
    </el-form-item>
    <el-form-item prop="knowledgeBaseName" :label="$t('customerquality.knowledgeBaseName')">
      <el-input clearable v-model="dataForm.knowledgeBaseName" :placeholder="$t('customerquality.knowledgeBaseName')">
      </el-input>
    </el-form-item>
    <el-form-item prop="category" :label="$t('customerquality.category')">
      <el-select clearable v-model="dataForm.category" :placeholder="$t('customerquality.category')">
        <el-option v-for="item in categoryList" :key="item.id" :label="item.dataDictionaryDetailName" :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: "/customerquality/qmsKnowledgeBase",
        infoURL: "/customerquality/qmsKnowledgeBase//{id}",
        getDictDataDetail: '/mutual/qmsDataDictionaryDetail/page'
      },
      categoryList:[],
      typeList:[],
      visible: false,
      listQuery: {
        limit: 999,
        page:1
      },
      dataForm: {
        id: "",
        code: null,
        category: null,
        knowledgeBaseName:null
      },
    };
  },
  computed: {
    dataRule() {
      return {
        code: [
          {
            required: true,
            message: this.$t("validate.required"),
            trigger: "blur",
          },
        ],
        knowledgeBaseName: [
          {
            required: true,
            message: this.$t("validate.required"),
            trigger: "blur",
          },
        ]
      };
    },
  },
  mounted () {
    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();
        } else {
          // this.getCode()
        }
      });
    },
    // 获取信息
    getInfo() {
      this.$http
        .get(`/customerquality/qmsKnowledgeBase/${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.getDictDataDetail, {
          params: {
            limit: 999,
            page: 1,
            dataDictionaryId:'1679670942635122690',
          }
        })
        .then(({ data: res }) => {
          // this.dataListLoading = false;
          if (res.code === 0) {
            this.categoryList = res.data.list 
          }
        })
    },
    // 表单提交
    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>
--- a/src/views/modules/customerquality/components/qualityChangeSearch.vue
+++ b/src/views/modules/customerquality/components/qualityChangeSearch.vue
@@ -0,0 +1,125 @@
 <!--
 * @Author: zhp
 * @Date: 2023-02-21 14:44:31
 * @LastEditTime: 2023-04-14 16:29:53
 * @LastEditors: zhp
 * @Description: 
 -->
 <template>
  <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
    <el-form-item prop="supplierName" :label="$t('supplier.supplierName')">
      <el-input v-model="dataForm.supplierName" :placeholder="$t('supplier.supplierName')" 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: {
        supplierName: 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>
--- a/src/views/modules/customerquality/components/qualityProjectList-show.vue
+++ b/src/views/modules/customerquality/components/qualityProjectList-show.vue
@@ -0,0 +1,241 @@
 <!--
 * @Author: zhp
 * @Date: 2023-07-14 13:44:46
 * @LastEditTime: 2023-07-19 16:58:46
 * @LastEditors: zhp
 * @Description: 
 -->
 <template>
  <div>
    <el-dialog close-on-press-escape :title="$t('configuration')" :append-to-body="true" :visible.sync="innerDrawer">
      <el-divider content-position="center">项目清单详情</el-divider>
      <el-table style="width: 100%" :data="getValues" :show-header="false">
        <el-table-column v-for="(item, index) in getHeaders" :key="index" :prop="item">
        </el-table-column>
      </el-table>
      <el-divider content-position="center">修订记录</el-divider>
      <el-table style="width: 100%" :data="getReviseValues" :show-header="false">
        <el-table-column v-for="(item, index) in getReviseHeaders" :key="index" :prop="item">
        </el-table-column>
      </el-table>
      <el-divider content-position="center">更改记录</el-divider>
      <el-table style="width: 100%" :data="getChangeValues" :show-header="false">
        <el-table-column v-for="(item, index) in getChangeHeaders" :key="index" :prop="item">
        </el-table-column>
      </el-table>
    </el-dialog>
  </div>
 </template>
 <script>
 import i18n from "@/i18n"
 // import basicAdd from "@/mixins/basic-add"
 // import debounce from "lodash/debounce"
 export default {
  // mixins: [basicAdd],
    data() {
      return {
        urlOptions: {
          getReviseDataListURL: '/customerquality/qmsCustomerQualityProjectListRevisionRecord/page',
          getChangeDataListURL: '/customerquality/qmsCustomerQualityProjectListChangeRecord/page',
          submitURL: "/customerquality/knowledgeBaseRequirementListData",
          getDictDataDetail: '/mutual/qmsDataDictionaryDetail/page'
        },
        headers: [
          {
            prop: 'productCode',
            label: '产品编码',
          },
          {
            prop: 'productName',
            label: '产品名称',
          },
          {
            prop: 'customerCode',
            label: '客户编码',
          },
          {
            prop: 'customerName',
            label: '客户名称',
          },
          {
            prop: 'author',
            label: '作者',
          },
          {
            prop: 'releaser',
            label: '发布人',
          }
        ],
        reviseHeaders: [
          {
            prop: 'item',
            label: 'Item/Section',
          },
          {
            prop: 'revision',
            label: 'revision',
          },
          {
            prop: 'essential',
            label: 'Essential Changes',
          },
          {
            prop: 'date',
            label: 'date',
          },
        ],
        reviseTableData: [],
        changeHeaders: [
          {
            prop: 'name',
            label: 'name',
          },
          {
            prop: 'changeHistory',
            label: 'Change History of this PPAP record',
          },
          {
            prop: 'date',
            label: 'date',
          },
        ],
        changeTableData: [],
        tableData: [],
        innerDrawer: false,
        listQuery: {
          limit: 3,
          page: 1,
          customerQualityProjectListId:null
        },
        categoryList:[],
        requirementList: [],
        knowledgeBaseList:[],
      }
  },
  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, });
      });
    },
    getReviseHeaders() {
      return this.reviseTableData.reduce((pre, cur, index) => pre.concat(`value${index}`), ['title'])
    },
    getReviseValues() {
      return this.reviseHeaders.map(item => {
        return this.reviseTableData.reduce((pre, cur, index) => Object.assign(pre, { ['value' + index]: cur[item.prop] }), { 'title': item.label, });
      });
    },
    getChangeHeaders() {
      return this.changeTableData.reduce((pre, cur, index) => pre.concat(`value${index}`), ['title'])
    },
    getChangeValues() {
      return this.changeHeaders.map(item => {
        return this.changeTableData.reduce((pre, cur, index) => Object.assign(pre, { ['value' + index]: cur[item.prop] }), { 'title': item.label, });
      });
    }
  },
  mounted () {
    // this.getDict()
    // this.getAccessPath()
  },
    methods: {
      init(obj) {
        // this.dataForm.knowledgeBaseRequirementListId = obj.knowledgeBaseRequirementListId || ''
        // this.dataForm.knowledgeBaseRequirementListId = obj.knowledgeBaseRequirementListId || ''
        this.id = obj.id || ''
        this.listQuery.customerQualityProjectListId = obj.id
        this.tableData.push(obj)
        this.innerDrawer = true
        this.$nextTick(() => {
          // this.$refs["dataForm"].resetFields()
          // if (this.dataForm.id) {
            this.getInfo()
          // } else {
            // this.getCode()
          // }
        })
      },
      getInfo() {
        this.$http
          .get(this.urlOptions.getReviseDataListURL, {
            params: 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.reviseTableData = res.data.list;
            this.listQuery.total = res.data.total;
          })
        this.$http
          .get(this.urlOptions.getChangeDataListURL, {
            params: 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.changeTableData = res.data.list;
            this.listQuery.total = res.data.total;
          })
      },
      // getDict() {
      //   this.$http
      //     .get(this.urlOptions.getDictDataDetail, {
      //       params: {
      //         limit: 999,
      //         page: 1,
      //         dataDictionaryId: '1679670942635122690',
      //       }
      //     })
      //     .then(({ data: res }) => {
      //       // this.dataListLoading = false;
      //       if (res.code === 0) {
      //         this.categoryList = res.data.list
      //       }
      //     })
      // },
      // 表单提交
      // dataFormSubmit() {
      //   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.innerDrawer = false;
      //             this.$emit("refreshDataList");
      //           },
      //         });
      //       })
      //       .catch(() => { });
      //   });
      // },
    },
  }
 </script>
 <style lang="scss" scoped>
 </style>
--- a/src/views/modules/customerquality/components/qualityRequirementList-add.vue
+++ b/src/views/modules/customerquality/components/qualityRequirementList-add.vue
@@ -0,0 +1,194 @@
 <!--
 * @Author: zhp
 * @Date: 2023-02-14 15:02:26
 * @LastEditTime: 2023-07-18 16:55:16
 * @LastEditors: zhp
 * @Description: 
 -->
 <template>
  <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
    <el-form-item prop="title" :label="$t('researchquality.title')">
      <el-input clearable v-model="dataForm.title" :placeholder="$t('researchquality.title')">
      </el-input>
    </el-form-item>
    <el-form-item prop="requirementListGroupId" :label="$t('researchquality.requirementListGroupId')">
      <el-select clearable v-model="dataForm.requirementListGroupId"
        :placeholder="$t('researchquality.requirementListGroupId')">
        <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="description" :label="$t('researchquality.description')">
      <el-input clearable v-model="dataForm.description" :placeholder="$t('researchquality.description')">
      </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: "/researchquality/qmsQualityRequirementList",
        infoURL: "/researchquality/qmsQualityRequirementList/{id}",
        getProjectTypeURL: '/researchquality/qmsQualityRequirementListGroup/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,
        requirementListGroupId: undefined,
        description: 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()
        }
      });
    },
    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>
--- a/src/views/modules/customerquality/components/radio.vue
+++ b/src/views/modules/customerquality/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>
--- a/src/views/modules/customerquality/components/revise-add.vue
+++ b/src/views/modules/customerquality/components/revise-add.vue
@@ -0,0 +1,152 @@
 <!--
 * @Author: zhp
 * @Date: 2023-07-14 13:44:46
 * @LastEditTime: 2023-07-19 14:38:48
 * @LastEditors: zhp
 * @Description: 
 -->
 <template>
  <div>
    <el-drawer close-on-press-escape :title="!dataForm.id ? $t('add') : $t('edit')" size="40%" :append-to-body="true"
      :closed="handleClose" :visible.sync="innerDrawer">
      <el-form :model="dataForm" ref="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmitHandle()"
        label-width="140px">
        <el-form-item prop="essential" label="Essential Changes">
          <el-input clearable v-model="dataForm.essential" placeholder="Essential Changes">
          </el-input>
        </el-form-item>
        <el-form-item prop="item" label="	Item / Section">
          <el-input clearable v-model="dataForm.item" placeholder="Item/Section">
          </el-input>
        </el-form-item>
        <el-form-item prop="revision" label="revision">
          <el-input clearable v-model="dataForm.revision" placeholder="Revision">
          </el-input>
        </el-form-item>
        <el-form-item prop="date" label="date">
          <el-date-picker v-model="dataForm.date" type="datetime" format='yyyy-MM-dd HH:mm:ss'
            valueFormat='yyyy-MM-ddTHH:mm:ss' placeholder="date">
          </el-date-picker>
        </el-form-item>
        <el-form-item>
          <el-button @click="innerDrawer = false">{{ $t('cancel') }} </el-button>
          <el-button type="primary" @click="dataFormSubmit"> {{ $t('confirm') }}</el-button>
        </el-form-item>
      </el-form>
    </el-drawer>
  </div>
 </template>
 <script>
 import i18n from "@/i18n"
 import basicAdd from "@/mixins/basic-add"
 import debounce from "lodash/debounce"
 export default {
  mixins: [basicAdd],
    data() {
      return {
        urlOptions: {
          submitURL: "/customerquality/qmsCustomerQualityProjectListRevisionRecord",
        },
        dataForm: {
          date:null,
          essential: null,
          id: null,
          item: null,
          revision: null,
          customerQualityProjectListId:null,
        },
        innerDrawer: false,
        listQuery: {
          limit: 10,
          page:1,
        },
        requirementList: [],
        knowledgeBaseList:[],
      }
  },
  computed: {
    dataRule() {
      return {
        knowledgeBaseId: [
          {
            required: true,
            message: this.$t("validate.required"),
            trigger: "change",
          },
        ],
        requirementListId: [
          {
            required: true,
            message: this.$t("validate.required"),
            trigger: "change",
          },
        ]
      };
    },
  },
    methods: {
      init(obj) {
        // this.dataForm.knowledgeBaseId = obj.knowledgeBaseId || ''
        // this.dataForm.requirementListId = obj.requirementListId || ''
        this.dataForm.id = obj.id?  obj.id :null
        this.dataForm.customerQualityProjectListId = obj.customerQualityProjectListId ? obj.customerQualityProjectListId :null
        this.innerDrawer = true
        this.$nextTick(() => {
          this.$refs["dataForm"].resetFields()
          if (this.dataForm.id) {
            this.getInfo()
          } else {
            // this.getCode()
          }
        })
      },
      handleClose() {
        this.innerDrawer = true
        this.$refs.dataForm.resetFields()
      },
      getInfo() {
        this.$http
          .get(`/customerquality/qmsCustomerQualityProjectListRevisionRecord/${this.dataForm.id}`)
          .then(({ data: res }) => {
            if (res.code !== 0) {
              return this.$message.error(res.msg);
            }
            this.dataForm = {
              ...this.dataForm,
              ...res.data,
            };
          })
          .catch(() => { });
      },
      // 表单提交
      dataFormSubmit() {
        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.innerDrawer = false;
                  this.$emit("refreshDataList");
                },
              });
            })
            .catch(() => { });
        });
      },
    },
  }
 </script>
 <style lang="scss" scoped>
 </style>
--- a/src/views/modules/customerquality/qmsCustomerComplaintManagement.vue
+++ b/src/views/modules/customerquality/qmsCustomerComplaintManagement.vue
@@ -0,0 +1,344 @@
 <!--
 * @Author: zhp
 * @Date: 2023-06-08 14:29:46
 * @LastEditTime: 2023-07-13 16:49:24
 * @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">
        <qmsCustomerComplaintManagement-add ref="addOrUpdate" @refreshDataList="successSubmit">
          </qmsCustomerComplaintManagement-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 customerquality from '@/filters/customerquality'
 import qmsCustomerComplaintManagementAdd from "./components/qmsCustomerComplaintManagement-add.vue"
 import i18n from "@/i18n"
 // import i18n from "@/i18n";
 const tableProps = [
  {
    prop: "questionType",
    label: i18n.t('customerquality.questionType'),
    filter: customerquality('questionType')
  },
  {
    prop: "customerName",
    label: i18n.t('customerquality.customerName'),
  },
  {
    prop: "currentStage",
    label: i18n.t('customerquality.currentStage'),
    filter: customerquality('currentStage')
  },
  {
    prop: "serialNumber",
    label: i18n.t('customerquality.serialNumber'),
  },
  {
    prop: "status",
    label: i18n.t('basic.status'),
    filter: customerquality('status'),
  },
 ];
 const tableBtn = [
  {
    type: "edit",
    btnName: i18n.t('edit'),
  },
  {
    type: "delete",
    btnName: i18n.t('delete'),
  }
 ];
 export default {
  mixins: [basicPage],
  data() {
    return {
      urlOptions: {
        getDataListURL: "/customerquality/qmsCustomerComplaintManagement/page",
        deleteURL: "/customerquality/qmsCustomerComplaintManagement",
        exportURL: '/customerquality/qmsCustomerComplaintManagement/export'
      },
      tableProps,
      tableBtn,
      productData: {},
      dataForm:{
        limit: 999,
        page:1
      },
      searchOrEditTitle: "",
      searchOrUpdateVisible: false,
      productOrEditTitle: "",
      addOrEditTitle: '',
      addOrUpdateVisible: false,
      productOrUpdateVisible: false,
      formConfig: [
        {
          type: 'input',
          label: i18n.t('customerquality.customerName'),
          placeholder: i18n.t('customerquality.customerName'),
          param: 'customerName'
        },
        {
          type: 'select',
          label: i18n.t('customerquality.questionType'),
          placeholder: i18n.t('customerquality.questionType'),
          selectOptions: [
            {
              id: 0,
              name: '产品质量题'
            },
            {
              id: 1,
              name: '售后服务题'
            },
            {
              id: 2,
              name: '物流配送问题'
            },
            {
              id: 3,
              name: '单关问题'
            },
            {
              id: 4,
              name: '4系统故问题'
            }
          ],
          param: 'questionType'
        },
        {
          type: 'select',
          label: i18n.t('customerquality.currentStage'),
          placeholder: i18n.t('customerquality.currentStage'),
          selectOptions: [
            {
              id: 0,
              name: '接受投诉阶段'
            },
            {
              id: 1,
              name: '解释澄清阶段'
            },
            {
              id: 2,
              name: '提出解决方案阶段'
            },
            {
              id: 3,
              name: '回访阶段'
            }
          ],
          param: 'currentStage'
        },
        {
          type: 'select',
          label: i18n.t('basic.status'),
          placeholder: i18n.t('basic.status'),
          selectOptions: [
            {
              id: 0,
              name: '不可用'
            },
            {
              id: 1,
              name: '可用'
            }
          ],
          param: 'status'
        },
        {
          type: "button",
          btnName: i18n.t('search'),
          name: "search",
          color: "primary",
          // plain: true,
        },
        {
          type: "button",
          btnName: i18n.t('add'),
          name: "add",
          color: "success",
          plain:true
        }
      ],
    };
  },
  components: {
    qmsCustomerComplaintManagementAdd
  },
  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.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.currentStage = val.currentStage ? val.currentStage : null
          this.listQuery.customerName = val.customerName ? val.customerName : null
          this.listQuery.questionType = val.name ? val.questionType : null
          this.listQuery.status = val.code ? val.status : null
          this.listQuery.page = 1
          this.getDataList()
          break;
        case "export":
         this.exportHandle()
          break;
        case "add":
          this.addOrEditTitle = '新增'
          this.addOrUpdateVisible = true;
          this.addOrUpdateHandle()
          break;
        default:
      }
    },
  },
 };
 </script>
--- a/src/views/modules/customerquality/qmsCustomerQualityProjectList.vue
+++ b/src/views/modules/customerquality/qmsCustomerQualityProjectList.vue
@@ -0,0 +1,432 @@
 <!--
 * @Author: zhp
 * @Date: 2023-06-08 14:29:46
 * @LastEditTime: 2023-07-21 14:03:20
 * @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>
      <el-table :data="tableData" style="width: 100%">
        <el-table-column type="expand">
          <template slot-scope="props">
            <el-form label-position="left" inline class="demo-table-expand">
              <el-form-item :label="$t('customerquality.previousVersionCode')">
                <span>{{ props.row.previousVersionCode }}</span>
              </el-form-item>
              <el-form-item :label="$t('customerquality.ppapGrade')">
                <span>{{ props.row.ppapGradeName }}</span>
              </el-form-item>
              <el-form-item :label="$t('customerquality.description')">
                <span>{{ props.row.description }}</span>
              </el-form-item>
              <el-form-item label="nda">
                <span>{{ props.row.nda ===0? '错号' : '对号'}}</span>
              </el-form-item>
              <el-form-item :label="$t('customerquality.amendment')">
                <span>{{ props.row.amendment }}</span>
              </el-form-item>
            </el-form>
          </template>
        </el-table-column>
        <el-table-column :label="$t('customerquality.productName')" prop="productName">
        </el-table-column>
        <el-table-column :label="$t('customerquality.customerName')" prop="customerName">
        </el-table-column>
        <el-table-column :formatter="timeFormatter" :label="$t('customerquality.qualityAcceptanceDate')"
          prop="qualityAcceptanceDate">
        </el-table-column>
        <el-table-column :formatter="timeFormatter" :label="$t('customerquality.confirmDeliveryDate')"
          prop="confirmDeliveryDate">
        </el-table-column>
        <el-table-column :formatter="timeFormatter" :label="$t('customerquality.deliveryRequiredDate')"
          prop="deliveryRequiredDate">
        </el-table-column>
        <el-table-column :label="$t('customerquality.status')" prop="status">
          <template slot-scope="slot">
            <!-- <el-button type="text" @click="start(slot.row)">启动</el-button> -->
            <el-tag v-if="slot.row.status == 0" type="success"> 待审核</el-tag>
            <el-tag v-if="slot.row.status == 1" type="success"> 已完成</el-tag>
            <el-tag v-if="slot.row.status == 2" type="success"> 交付退回</el-tag>
            <el-tag v-if="slot.row.status == 3" type="success"> 审核拒绝</el-tag>
          </template>
        </el-table-column>
        <el-table-column label="操作" width="160" prop="desc">
          <template slot-scope="slot">
            <!-- <el-button type="text" @click="start(slot.row)">启动</el-button> -->
            <el-button type="text" @click="handleEdit(slot.row)">
              <i class="el-icon-edit"></i>
            </el-button>
            <el-button type="text" @click="handleDelete(slot.row)" style="color: red">
              <i class="el-icon-delete"></i>
            </el-button>
            <el-button type="text" @click="handleShow(slot.row)">
              {{ $t('configuration')}}
            </el-button>
          </template>
        </el-table-column>
      </el-table>
      <pagination :limit.sync="listQuery.limit" :page.sync="listQuery.page" :total="listQuery.total"
        @pagination="getDataList" />
      <!-- 弹窗, 新增 / 修改 -->
      <customerQualityProjectList-add v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList">
      </customerQualityProjectList-add>
      <qualityProjectList-show v-if="qualityProjectListShow" ref="qualityProjectListShow"
        @refreshDataList="getDataList">
      </qualityProjectList-show>
      <!-- <el-row slot="footer" type="flex" justify="end"> </el-row> -->
      <!-- </base-dialog> -->
      <!-- <baseConfig ref="baseConfigOrList" v-if="baseConfigShow"></baseConfig> -->
      <!-- <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 customerquality from '@/filters/customerquality'
 import customerQualityProjectListAdd from "./components/customerQualityProjectList-add.vue"
 // import baseConfig from "./components/baseConfig"
 import qualityProjectListShow from "./components/qualityProjectList-show.vue"
 import { timeFormatter } from '@/filters'
 import i18n from "@/i18n"
 // import i18n from "@/i18n";
 const tableBtn = [
  {
    type: "edit",
    btnName: i18n.t('edit'),
  },
  {
    type: "delete",
    btnName: i18n.t('delete'),
  },
  // {
  //   type: "configuration",
  //   btnName: i18n.t('configuration'),
  // }
 ];
 export default {
  // mixins: [basicPage],
  data() {
    return {
      urlOptions: {
        getDataListURL: "/customerquality/qmsCustomerQualityProjectList/page",
        deleteURL: "/customerquality/qmsCustomerQualityProjectList",
        exportURL: '/customerquality/qmsCustomerQualityProjectList/export',
        getProductURL: '/basic/qmsProduct/page',
        getCustomerURL: '/basic/qmsCustomer/page'
      },
      tableData:[],
      productData: {},
      listQuery:{
        limit: 999,
        page: 1,
        total:0
      },
      timeFormatter,
      baseConfigShow:false,
      searchOrEditTitle: "",
      searchOrUpdateVisible: false,
      productOrEditTitle: "",
      addOrEditTitle: '',
      addOrUpdateVisible: false,
      productOrUpdateVisible: false,
      qualityProjectListShow:false,
      formConfig: [
        {
          type: 'select',
          label: i18n.t('basic.productName'),
          placeholder: i18n.t('basic.productName'),
          selectOptions: [],
          param: 'productId'
        },
        {
          type: 'select',
          label: i18n.t('customerquality.customerName'),
          placeholder: i18n.t('customerquality.customerName'),
          selectOptions: [],
          param: 'customerId'
        },
        {
          type: 'select',
          label: i18n.t('customerquality.status'),
          placeholder: i18n.t('customerquality.status'),
          selectOptions: [
            {
              id: '0',
              name: '待审核'
            },
            {
              id: '1',
              name: '已完成'
            },
            {
              id: '2',
              name: '交付退回'
            },
            {
              id: '3',
              name: '审核拒绝'
            }
          ],
          param: 'status'
        },
        {
          type: 'datePicker',
          label: i18n.t('time'),
          dateType: 'datetimerange',
          format: 'yyyy-MM-dd HH:mm:ss',
          valueFormat: 'yyyy-MM-ddTHH:mm:ss',
          rangeSeparator: '-',
          startPlaceholder: '开始时间',
          endPlaceholder: '结束时间',
          param: 'timeSlot',
          width: 350
        },
        {
          type: "button",
          btnName: i18n.t('search'),
          name: "search",
          color: "primary",
          // plain: true,
        },
        {
          type: "button",
          btnName: i18n.t('add'),
          name: "add",
          color: "success",
          plain:true
        }
      ],
    };
  },
  components: {
    customerQualityProjectListAdd,
    qualityProjectListShow
    // baseConfig
  },
  mounted () {
    this.getDataList()
    this.getDict()
  },
  methods: {
    //search-bar点击
    getDataList() {
      this.dataListLoading = true;
      this.$http
        .get(this.urlOptions.getDataListURL, {
          params: 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;
        })
    },
    getDict() {
      this.$http
        .get(this.urlOptions.getProductURL, {
          params: {
            limit: 999,
            page: 1,
          }
        })
        .then(({ data: res }) => {
          // this.dataListLoading = false;
          if (res.code === 0) {
            this.formConfig[0].selectOptions = res.data.list.map((item) => {
              return {
                id: item.id,
                name:item.productName
              }
            })
          }
        })
      this.$http
        .get(this.urlOptions.getCustomerURL, {
          params: {
            limit: 999,
            page: 1,
          }
        })
        .then(({ data: res }) => {
          // this.dataListLoading = false;
          this.formConfig[1].selectOptions = res.data.list.map((item) => {
            return {
              id: item.id,
              name: item.customerName
            }
          })
        })
    },
    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.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(() => { })
    },
    handleDelete(val) {
        this.$confirm(`确定对[名称${val.productName}]进行删除操作?`, "提示", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning",
        })
          .then(() => {
            this.$http.delete(this.urlOptions.deleteURL, { data: [val.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(val) {
      this.addOrUpdateVisible = true
      this.addOrEditTitle = this.$t('edit')
      this.$nextTick(() => {
        this.$refs.addOrUpdate.init(val.id);
      })
    },
    handleShow(val) {
      this.qualityProjectListShow = true
      this.$nextTick(() => {
        this.$refs.qualityProjectListShow.init(val)
      })
    },
    // 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.status = val.status ? val.status : null
          this.listQuery.productId = val.productId ? val.productId : null
          this.listQuery.customerId = val.customerId ? val.customerId : null
          this.listQuery.startTime = val.timeSlot ? val.timeSlot[0] : null
          this.listQuery.endTime = val.timeSlot ? val.timeSlot[1] : null
          this.listQuery.page = 1
          this.getDataList()
          break;
        case "export":
         this.exportHandle()
          break;
        case "add":
          this.addOrUpdateVisible = true
          this.$nextTick(() => {
            this.$refs.addOrUpdate.init()
          })
          break;
        default:
      }
    },
  },
 };
 </script>
--- a/src/views/modules/customerquality/qmsCustomerQualityRequirementList.vue
+++ b/src/views/modules/customerquality/qmsCustomerQualityRequirementList.vue
@@ -0,0 +1,314 @@
 <!--
 * @Author: zhp
 * @Date: 2023-06-08 14:29:46
 * @LastEditTime: 2023-07-18 14:20:43
 * @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">
        <customerQualityRequirementList-add ref="addOrUpdate" @refreshDataList="successSubmit">
        </customerQualityRequirementList-add>
        <!-- <el-row slot="footer" type="flex" justify="end"> </el-row> -->
      </base-dialog>
      <baseConfig ref="baseConfigOrList" v-if="baseConfigShow"></baseConfig>
      <!-- <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 customerquality from '@/filters/customerquality'
 import customerQualityRequirementListAdd from "./components/customerQualityRequirementList-add.vue"
 import i18n from "@/i18n"
 import baseConfig from "./components/baseConfig"
 // import i18n from "@/i18n";
 const tableProps = [
  {
    prop: "code",
    label: i18n.t('customerquality.code'),
  },
  {
    prop: "requirementListName",
    label: i18n.t('customerquality.requirementListName'),
  },
  {
    prop: "uploadFiles",
    label: i18n.t('customerquality.uploadFiles'),
  },
  {
    prop: "categoryName",
    label: i18n.t('customerquality.category'),
  }
 ];
 const tableBtn = [
  {
    type: "edit",
    btnName: i18n.t('edit'),
  },
  {
    type: "delete",
    btnName: i18n.t('delete'),
  },
  {
    type: "configuration",
    btnName: i18n.t('configuration'),
  }
 ];
 export default {
  mixins: [basicPage],
  data() {
    return {
      urlOptions: {
        getDataListURL: "/customerquality/qmsCustomerQualityRequirementList/page",
        deleteURL: "/customerquality/qmsCustomerQualityRequirementList",
        exportURL: '/customerquality/qmsCustomerQualityRequirementList/export'
      },
      tableProps,
      baseConfigShow:false,
      tableBtn,
      productData: {},
      dataForm:{
        limit: 999,
        page:1
      },
      searchOrEditTitle: "",
      searchOrUpdateVisible: false,
      productOrEditTitle: "",
      addOrEditTitle: '',
      addOrUpdateVisible: false,
      productOrUpdateVisible: false,
      formConfig: [
        {
          type: 'input',
          label: i18n.t('customerquality.requirementListName'),
          placeholder: i18n.t('customerquality.requirementListName'),
          param: 'name'
        },
        {
          type: 'input',
          label: i18n.t('customerquality.code'),
          placeholder: i18n.t('customerquality.code'),
          param: 'code'
        },
        // {
        //   type: 'select',
        //   label: i18n.t('customerquality.questionType'),
        //   placeholder: i18n.t('customerquality.questionType'),
        //   selectOptions: [
        //     {
        //       id: 0,
        //       name: '产品质量题'
        //     },
        //     {
        //       id: 1,
        //       name: '售后服务题'
        //     },
        //     {
        //       id: 2,
        //       name: '物流配送问题'
        //     },
        //     {
        //       id: 3,
        //       name: '单关问题'
        //     },
        //     {
        //       id: 4,
        //       name: '4系统故问题'
        //     }
        //   ],
        //   param: 'questionType'
        // },
        {
          type: "button",
          btnName: i18n.t('search'),
          name: "search",
          color: "primary",
          // plain: true,
        },
        {
          type: "button",
          btnName: i18n.t('add'),
          name: "add",
          color: "success",
          plain:true
        }
      ],
    };
  },
  components: {
    customerQualityRequirementListAdd,
    baseConfig
  },
  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() {
      // console.log(key);
      // console.log(key);
      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) => {
        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);
        });
      } else if (val.type === 'configuration') {
        this.baseConfigShow = true
        const obj = {
          requirementListId:val.data.id
        }
        this.$nextTick(() => {
          this.$refs.baseConfigOrList.init(obj)
        });
      }
    },
    // 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.code = val.code ? val.code : null
          this.listQuery.name = val.name ? val.name : null
          this.listQuery.page = 1
          this.getDataList()
          break;
        case "export":
         this.exportHandle()
          break;
        case "add":
          this.addOrEditTitle = '新增'
          this.addOrUpdateVisible = true;
          this.addOrUpdateHandle()
          break;
        default:
      }
    },
  },
 };
 </script>
--- a/src/views/modules/customerquality/qmsKnowledgeBase.vue
+++ b/src/views/modules/customerquality/qmsKnowledgeBase.vue
@@ -0,0 +1,323 @@
 <!--
 * @Author: zhp
 * @Date: 2023-06-08 14:29:46
 * @LastEditTime: 2023-07-18 14:20:57
 * @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">
        <qmsKnowledgeBase-add ref="addOrUpdate" @refreshDataList="successSubmit">
        </qmsKnowledgeBase-add>
        <!-- <el-row slot="footer" type="flex" justify="end"> </el-row> -->
      </base-dialog>
      <baseConfig ref="baseConfigOrList" v-if="baseConfigShow"></baseConfig>
      <!-- <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 customerquality from '@/filters/customerquality'
 import qmsKnowledgeBaseAdd from "./components/qmsKnowledgeBase-add.vue"
 import baseConfig from "./components/baseConfig"
 import i18n from "@/i18n"
 // import i18n from "@/i18n";
 const tableProps = [
  {
    prop: "code",
    label: i18n.t('customerquality.code'),
  },
  {
    prop: "knowledgeBaseName",
    label: i18n.t('customerquality.knowledgeBaseName'),
  },
  {
    prop: "categoryName",
    label: i18n.t('customerquality.category'),
  }
 ];
 const tableBtn = [
  {
    type: "edit",
    btnName: i18n.t('edit'),
  },
  {
    type: "delete",
    btnName: i18n.t('delete'),
  },
  {
    type: "configuration",
    btnName: i18n.t('configuration'),
  }
 ];
 export default {
  mixins: [basicPage],
  data() {
    return {
      urlOptions: {
        getDataListURL: "/customerquality/qmsKnowledgeBase/page",
        deleteURL: "/customerquality/qmsKnowledgeBase",
        exportURL: '/customerquality/qmsKnowledgeBase/export'
      },
      tableProps,
      tableBtn,
      productData: {},
      dataForm:{
        limit: 999,
        page:1
      },
      baseConfigShow:false,
      searchOrEditTitle: "",
      searchOrUpdateVisible: false,
      productOrEditTitle: "",
      addOrEditTitle: '',
      addOrUpdateVisible: false,
      productOrUpdateVisible: false,
      formConfig: [
        // {
        //   type: 'input',
        //   label: i18n.t('customerquality.customerName'),
        //   placeholder: i18n.t('customerquality.customerName'),
        //   param: 'customerName'
        // },
        // {
        //   type: 'select',
        //   label: i18n.t('customerquality.questionType'),
        //   placeholder: i18n.t('customerquality.questionType'),
        //   selectOptions: [
        //     {
        //       id: 0,
        //       name: '产品质量题'
        //     },
        //     {
        //       id: 1,
        //       name: '售后服务题'
        //     },
        //     {
        //       id: 2,
        //       name: '物流配送问题'
        //     },
        //     {
        //       id: 3,
        //       name: '单关问题'
        //     },
        //     {
        //       id: 4,
        //       name: '4系统故问题'
        //     }
        //   ],
        //   param: 'questionType'
        // },
        // {
        //   type: 'select',
        //   label: i18n.t('basic.status'),
        //   placeholder: i18n.t('basic.status'),
        //   selectOptions: [
        //     {
        //       id: 0,
        //       name: '不可用'
        //     },
        //     {
        //       id: 1,
        //       name: '可用'
        //     }
        //   ],
        //   param: 'status'
        // },
        {
          type: "button",
          btnName: i18n.t('search'),
          name: "search",
          color: "primary",
          // plain: true,
        },
        {
          type: "button",
          btnName: i18n.t('add'),
          name: "add",
          color: "success",
          plain:true
        }
      ],
    };
  },
  components: {
    qmsKnowledgeBaseAdd,
    baseConfig
  },
  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.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);
        })
      } else if (val.type === 'configuration') {
        this.baseConfigShow = true
        const obj = {
          knowledgeBaseId: val.data.id
        }
        this.$nextTick(() => {
          this.$refs.baseConfigOrList.init(obj)
        });
      }
    },
    // 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>
--- a/src/views/modules/customerquality/qmsPublicDocuments.vue
+++ b/src/views/modules/customerquality/qmsPublicDocuments.vue
@@ -0,0 +1,277 @@
 <!--
 * @Author: zhp
 * @Date: 2023-06-08 14:29:46
 * @LastEditTime: 2023-07-14 10:23: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="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">
        <publicDocuments-add ref="addOrUpdate" @refreshDataList="successSubmit">
          </publicDocuments-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 customerquality from '@/filters/customerquality'
 import publicDocumentsAdd from "./components/publicDocuments-add.vue"
 import i18n from "@/i18n"
 // import i18n from "@/i18n";
 const tableProps = [
  {
    prop: "title",
    label: i18n.t('customerquality.title'),
  },
  {
    prop: "accessPath",
    label: i18n.t('customerquality.accessPath'),
  },
  {
    prop: "knowledgeBaseFileId",
    label: i18n.t('customerquality.knowledgeBaseFileId'),
  }
 ];
 const tableBtn = [
  {
    type: "edit",
    btnName: i18n.t('edit'),
  },
  {
    type: "delete",
    btnName: i18n.t('delete'),
  },
  {
    type: "detail",
    btnName: i18n.t('detail'),
  }
 ];
 export default {
  mixins: [basicPage],
  data() {
    return {
      urlOptions: {
        getDataListURL: "/customerquality/qmsPublicDocuments/page",
        deleteURL: "/customerquality/qmsPublicDocuments",
        exportURL: '/customerquality/qmsPublicDocuments/export'
      },
      tableProps,
      tableBtn,
      productData: {},
      dataForm:{
        limit: 999,
        page:1
      },
      searchOrEditTitle: "",
      searchOrUpdateVisible: false,
      productOrEditTitle: "",
      addOrEditTitle: '',
      addOrUpdateVisible: false,
      productOrUpdateVisible: false,
      formConfig: [
        {
          type: "button",
          btnName: i18n.t('search'),
          name: "search",
          color: "primary",
          // plain: true,
        },
        {
          type: "button",
          btnName: i18n.t('add'),
          name: "add",
          color: "success",
          plain:true
        }
      ],
    };
  },
  components: {
    publicDocumentsAdd
  },
  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.$t('t.search');
      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.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')
        const obj = {
          id: val.data.id,
          detail:false
        }
        this.$nextTick(() => {
          this.$refs.addOrUpdate.init(obj)
        })
      } else if (val.type === 'detail') {
        this.addOrUpdateVisible = true
        this.addOrEditTitle = this.$t('detail')
        const obj = {
          id: val.data.id,
          detail: true
        }
        this.$nextTick(() => {
          this.$refs.addOrUpdate.init(obj)
        });
      }
    },
    // 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.code = val.code ? val.code : null
          // this.listQuery.name = val.name ? val.name : null
          this.listQuery.page = 1
          this.getDataList()
          break;
        case "export":
         this.exportHandle()
          break;
        case "add":
          this.addOrEditTitle = this.$t('t.add')
          this.addOrUpdateVisible = true
          this.$nextTick(() => {
            this.$refs.addOrUpdate.init();
          });
          break;
        default:
      }
    },
  },
 };
 </script>
--- a/src/views/modules/customerquality/qmsQualityRequirementList.vue
+++ b/src/views/modules/customerquality/qmsQualityRequirementList.vue
@@ -0,0 +1,292 @@
 <!--
 * @Author: zhp
 * @Date: 2023-04-17 14:23:17
 * @LastEditTime: 2023-07-13 11:00:21
 * @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">
        <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">
        <qualityRequirementList-add ref="addOrUpdate" @refreshDataList="successSubmit">
          </qualityRequirementList-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 qualityRequirementListAdd from "./components/qualityRequirementList-add.vue"
 import { timeFormatter } from '@/filters'
 import i18n from "@/i18n"
 // import i18n from "@/i18n";
 const tableProps = [
  {
    prop: "title",
    label: i18n.t('researchquality.title')
  },
  {
    prop: "description",
    label: i18n.t('researchquality.description')
  },
 ];
 const tableBtn = [
  {
    type: "edit",
    btnName: i18n.t('t.edit'),
  },
  {
    type: "delete",
    btnName: i18n.t('t.delete'),
  }
 ];
 export default {
  mixins: [basicPage],
  data() {
    return {
      urlOptions: {
        getDataListURL: "/researchquality/qmsQualityRequirementList/page",
        deleteURL: "/researchquality/qmsQualityRequirementList",
        getProjectTypeList: '/researchquality/qmsQualityRequirementListGroup/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: 'title'
        },
        {
          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: "success",
          plain: true,
        },
      ],
    };
  },
  components: {
    // supplierProductSearch,
    // supplierProduct,
    qualityRequirementListAdd
  },
  mounted () {
    this.getData()
  },
  methods: {
    clickTabs(e) {
      console.log(e)
      this.requirementListGroupId = e.name
      this.listQuery.requirementListGroupId = 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.title = val.title ? val.title : 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>
--- a/src/views/modules/gage/components/gage-add.vue
+++ b/src/views/modules/gage/components/gage-add.vue
@@ -1,12 +1,12 @@
 <!--
 * @Author: zhp
 * @Date: 2023-02-14 15:02:26
- * @LastEditTime: 2023-05-17 14:21:45
+ * @LastEditTime: 2023-07-13 09:11:55
 * @LastEditors: zhp
 * @Description: 
 -->
 <template>
-  <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="150px">
+  <el-form :model="dataForm" ref="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmitHandle()" label-width="150px">
    <el-form-item prop="client" :label="$t('gage.client')">
      <el-input v-model="dataForm.client" :placeholder="$t('gage.client')">
      </el-input>
@@ -241,27 +241,20 @@ export default {
  computed: {
    dataRule() {
      return {
-        // dictLabel: [
+        name: [
-        //   {
+          {
-        //     required: true,
+            required: true,
-        //     message: this.$t("validate.required"),
+            message: this.$t("validate.required"),
-        //     trigger: "blur",
+            trigger: "blur",
-        //   },
+          },
-        // ],
+        ],
-        // dictValue: [
+        code: [
-        //   {
+          {
-        //     required: true,
+            required: true,
-        //     message: this.$t("validate.required"),
+            message: this.$t("validate.required"),
-        //     trigger: "blur",
+            trigger: "blur",
-        //   },
+          },
-        // ],
+        ]
        // sort: [
        //   {
        //     required: true,
        //     message: this.$t("validate.required"),
        //     trigger: "blur",
        //   },
        // ],
      };
    },
  },
@@ -285,7 +278,9 @@ export default {
    },
    getData() {
      this.$http
-        .get(this.urlOptions.getUserList, this.listQuery)
+        .get(this.urlOptions.getUserList, {
          params: this.listQuery
        })
        .then(({ data: res }) => {
          if (res.code === 0) {
            console.log(res.data);
@@ -295,7 +290,9 @@ export default {
        .catch(() => {
        });
      this.$http
-        .get(this.urlOptions.dictionaryDetailList, this.listQuery)
+        .get(this.urlOptions.dictionaryDetailList, {
          params: this.listQuery
        })
        .then(({ data: res }) => {
          if (res.code === 0) {
            console.log(res.data);
@@ -305,7 +302,9 @@ export default {
        .catch(() => {
        })
      this.$http
-        .get(this.urlOptions.getGageTypeList, this.listQuery)
+        .get(this.urlOptions.getGageTypeList, {
          params: this.listQuery
        })
        .then(({ data: res }) => {
          if (res.code === 0) {
            console.log(res.data);
--- a/src/views/modules/gage/components/gageGrr-add.vue
+++ b/src/views/modules/gage/components/gageGrr-add.vue
@@ -0,0 +1,374 @@
 <!--
 * @Author: zhp
 * @Date: 2023-02-14 15:02:26
 * @LastEditTime: 2023-07-13 09:22:24
 * @LastEditors: zhp
 * @Description: 
 -->
 <template>
  <el-form :model="dataForm" ref="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmitHandle()" label-width="150px">
    <el-form-item prop="client" :label="$t('gage.client')">
      <el-input v-model="dataForm.client" :placeholder="$t('gage.client')">
      </el-input>
    </el-form-item>
    <el-form-item prop="code" :label="$t('gage.code')">
      <el-input v-model="dataForm.code" :placeholder="$t('gage.code')">
      </el-input>
    </el-form-item>
    <el-form-item prop="name" :label="$t('gage.name')">
      <el-input v-model="dataForm.name" :placeholder="$t('gage.name')">
      </el-input>
    </el-form-item>
    <el-form-item prop="certificateType" :label="$t('gage.certificateType')">
      <el-select v-model="dataForm.certificateType" :placeholder="$t('gage.certificateType')">
        <el-option v-for="item in certificateTypeList" :key="item.id" :label="item.name" :value="item.id">
        </el-option>
      </el-select>
    </el-form-item>
    <el-form-item prop="certificateCodeBh" :label="$t('gage.certificateCodeBh')">
      <el-input v-model="dataForm.certificateCodeBh" :placeholder="$t('gage.certificateCodeBh')">
      </el-input>
    </el-form-item>
    <el-form-item prop="certificateCode" :label="$t('gage.certificateCode')">
      <el-input v-model="dataForm.certificateCode" :placeholder="$t('gage.certificateCode')">
      </el-input>
    </el-form-item>
    <el-form-item prop="gageTypeId" :label="$t('gage.gageTypeName')">
      <el-select v-model="dataForm.gageTypeId" :placeholder="$t('gage.gageTypeName')">
        <el-option v-for="item in gageTypeList" :key="item.id" :label="item.name" :value="item.id">
        </el-option>
      </el-select>
    </el-form-item>
    <el-form-item prop="measuringToolSpecification" :label="$t('gage.measuringToolSpecification')">
      <el-input v-model="dataForm.measuringToolSpecification" :placeholder="$t('gage.measuringToolSpecification')">
      </el-input>
    </el-form-item>
    <el-form-item prop="measuringToolAccuracy" :label="$t('gage.measuringToolAccuracy')">
      <el-input v-model="dataForm.measuringToolAccuracy" :placeholder="$t('gage.measuringToolAccuracy')">
      </el-input>
    </el-form-item>
    <el-form-item prop="description" :label="$t('gage.description')">
      <el-input v-model="dataForm.description" :placeholder="$t('gage.description')">
      </el-input>
    </el-form-item>
    <el-form-item prop="equipmentSupplier" :label="$t('gage.supplierName')">
      <el-input v-model="dataForm.equipmentSupplier" :placeholder="$t('gage.supplierName')">
      </el-input>
    </el-form-item>
    <el-form-item prop="internalInspectionCycle" :label="$t('gage.internalInspectionCycle')">
      <el-input v-model="dataForm.internalInspectionCycle" :placeholder="$t('gage.internalInspectionCycle')">
      </el-input>
    </el-form-item>
    <el-form-item prop="externalInspectionCycle" :label="$t('gage.externalInspectionCycle')">
      <el-input v-model="dataForm.externalInspectionCycle" :placeholder="$t('gage.externalInspectionCycle')">
      </el-input>
    </el-form-item>
    <el-form-item prop="internalInspectionTime" :label="$t('gage.internalInspectionTime')">
      <el-date-picker v-model="dataForm.internalInspectionTime" type="datetime"
        :placeholder="$t('gage.internalInspectionTime')" format='yyyy-MM-dd HH:mm:ss' valueFormat='yyyy-MM-ddTHH:mm:ss'>
      </el-date-picker>
    </el-form-item>
    <el-form-item prop="externalInspectionTime" :label="$t('gage.externalInspectionTime')">
      <el-date-picker v-model="dataForm.externalInspectionTime" type="datetime"
        :placeholder="$t('gage.externalInspectionTime')" format='yyyy-MM-dd HH:mm:ss' valueFormat='yyyy-MM-ddTHH:mm:ss'>
      </el-date-picker>
    </el-form-item>
    <el-form-item prop="nextInternalInspectionTime" :label="$t('gage.nextInternalInspectionTime')">
      <el-date-picker v-model="dataForm.nextInternalInspectionTime" type="datetime"
        :placeholder="$t('gage.nextInternalInspectionTime')" format='yyyy-MM-dd HH:mm:ss'
        valueFormat='yyyy-MM-ddTHH:mm:ss'>
      </el-date-picker>
    </el-form-item>
    <el-form-item prop="nextExternalInspectionTime" :label="$t('gage.nextExternalInspectionTime')">
      <el-date-picker v-model="dataForm.nextExternalInspectionTime" type="datetime"
        :placeholder="$t('gage.nextExternalInspectionTime')" format='yyyy-MM-dd HH:mm:ss'
        valueFormat='yyyy-MM-ddTHH:mm:ss'>
      </el-date-picker>
    </el-form-item>
    <el-form-item prop="userDepartment" :label="$t('gage.userDepartment')">
      <el-select v-model="dataForm.userDepartment" :placeholder="$t('gage.userDepartment')">
        <el-option v-for="item in departmentList" :key="item.id" :label="item.name" :value="item.id">
        </el-option>
      </el-select>
    </el-form-item>
    <el-form-item prop="useLocation" :label="$t('gage.useLocation')">
      <el-input v-model="dataForm.useLocation" :placeholder="$t('gage.useLocation')">
      </el-input>
    </el-form-item>
    <el-form-item prop="recipient" :label="$t('gage.recipientName')">
      <el-select v-model="dataForm.recipient" :placeholder="$t('gage.recipientName')">
        <el-option v-for="item in userList" :key="item.id" :label="item.realName" :value="item.id">
        </el-option>
      </el-select>
    </el-form-item>
    <el-form-item prop="benchmarkMeasurTool" :label="$t('gage.benchmarkMeasurTool')">
      <el-radio-group v-model="dataForm.benchmarkMeasurTool">
        <el-radio :label="0">否</el-radio>
        <el-radio :label="1">是</el-radio>
      </el-radio-group>
    </el-form-item>
    <el-form-item prop="belongPerson" :label="$t('gage.belongPersonName')">
      <el-select v-model="dataForm.belongPerson" :placeholder="$t('gage.belongPersonName')">
        <el-option v-for="item in userList" :key="item.id" :label="item.realName" :value="item.id">
        </el-option>
      </el-select>
    </el-form-item>
    <el-form-item prop="gageStatus" :label="$t('gage.gageStatus')">
      <el-select v-model="dataForm.gageStatus" :placeholder="$t('gage.gageStatus')">
        <el-option v-for="item in gageStatusList" :key="item.id" :label="item.name" :value="item.id">
        </el-option>
      </el-select>
    </el-form-item>
    <el-form-item prop="remark" :label="$t('gage.remark')">
      <el-input v-model="dataForm.remark" :placeholder="$t('gage.remark')">
      </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: "/gage/qmsGage",
        infoURL: "/gage/qmsGage/{ id }",
        dictionaryDetailList: '/mutual/qmsDataDictionaryDetail/page',
        getUserList: '/sys/user/page',
        getGageTypeList: '/gage/qmsGageType/page',
      },
      gageList: [],
      userList: [],
      gageTypeList:[],
      departmentList: [],
      processList: [
        {
          id: 0,
          name: '未审核'
        },
        {
          id: 1,
          name: '不同意'
        },
        {
          id: 2,
          name: '同意'
        }
      ],
      listQuery: {
        limit: 999,
        gape: 1
      },
      gageStatusList: [
        {
          id: 0,
          name:'在用'
        },
        {
          id: 1,
          name: '备用'
        },
        {
          id: 2,
          name: '停用'
        },
        {
          id: 3,
          name: '封存'
        },
        {
          id: 4,
          name: '报废'
        },
        {
          id: 5,
          name: '降级使用'
        }
      ],
      certificateTypeList: [
        {
          id: 0,
          name: '检定证书'
        },
        {
          id: 1,
          name: '校准证书'
        },
        {
          id: 2,
          name: '检测报告'
        },
        {
          id: 3,
          name: '自校报告'
        }
      ],
      visible: false,
      dataForm: {
        belongPerson:'1067246875800000001',
        benchmarkMeasurTool: null,
        certificateCode: null,
        certificateCodeBh: null,
        certificateType: null,
        client: null,
        code: null,
        createDate: null,
        description: null,
        equipmentSupplier: null,
        externalInspectionCycle: null,
        externalInspectionTime: null,
        gageStatus: null,
        gageTypeId: null,
        id: null,
        internalInspectionCycle: null,
        internalInspectionTime: null,
        measuringToolAccuracy: null,
        measuringToolSpecification: null,
        name: null,
        nextExternalInspectionTime: null,
        nextInternalInspectionTime: null,
        recipient: '1067246875800000001',
        remark: null,
        updateDate: null,
        useLocation: null,
        userDepartment: null,
      },
    };
  },
  computed: {
    dataRule() {
      return {
        name: [
          {
            required: true,
            message: this.$t("validate.required"),
            trigger: "blur",
          },
        ],
        code: [
          {
            required: true,
            message: this.$t("validate.required"),
            trigger: "blur",
          },
        ]
      };
    },
  },
  mounted () {
    this.getData();
  },
  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()
        }
      });
    },
    getData() {
      this.$http
        .get(this.urlOptions.getUserList, {
          params: this.listQuery
        })
        .then(({ data: res }) => {
          if (res.code === 0) {
            console.log(res.data);
            this.userList = res.data.list
          }
        })
        .catch(() => {
        });
      this.$http
        .get(this.urlOptions.dictionaryDetailList, {
          params: this.listQuery
        })
        .then(({ data: res }) => {
          if (res.code === 0) {
            console.log(res.data);
            this.departmentList = res.data.list
          }
        })
        .catch(() => {
        })
      this.$http
        .get(this.urlOptions.getGageTypeList, {
          params: this.listQuery
        })
        .then(({ data: res }) => {
          if (res.code === 0) {
            console.log(res.data);
            this.gageTypeList = res.data.list
          }
        })
        .catch(() => {
        })
    },
    // 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(`/gage/qmsGage/${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>
--- a/src/views/modules/gage/components/gageGrs-add.vue
+++ b/src/views/modules/gage/components/gageGrs-add.vue
@@ -1,138 +1,159 @@
 <!--
 * @Author: zhp
 * @Date: 2023-02-14 15:02:26
- * @LastEditTime: 2023-07-06 14:59:27
+ * @LastEditTime: 2023-07-21 16:35:04
 * @LastEditors: zhp
 * @Description: 
 -->
 <template>
-  <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="150px">
+  <el-drawer :title="dataForm.id ? $t('edit') : $t('add')" :visible.sync="drawer" size="50%">
-    <el-row>
+    <el-form :model="dataForm" ref="dataForm" :rules="dataRule" label-width="150px">
-      <el-col :span="8">
+      <el-row>
-        <el-form-item prop="partName" :label="$t('gage.partName')">
+        <el-col :span="8">
-          <el-input v-model="dataForm.partName" :placeholder="$t('gage.partName')">
+          <el-form-item prop="partName" :label="$t('gage.partName')">
-          </el-input>
+            <el-input v-model="dataForm.partName" :placeholder="$t('gage.partName')">
            </el-input>
          </el-form-item>
        </el-col>
        <el-col :span="8">
          <el-form-item prop="gageId" :label="$t('gage.gageName')">
            <el-select v-model="dataForm.gageId" :placeholder="$t('gage.gageName')" @change="getGageType">
              <el-option v-for="item in gageList" :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="corporation" :label="$t('gage.corporation')">
            <el-input v-model="dataForm.corporation" :placeholder="$t('gage.corporation')">
            </el-input>
          </el-form-item>
        </el-col>
      </el-row>
      <el-row>
        <el-col :span="8">
          <el-form-item prop="itemNo" :label="$t('gage.itemNo')">
            <el-input v-model="dataForm.itemNo" :placeholder="$t('gage.itemNo')">
            </el-input>
          </el-form-item>
        </el-col>
        <el-col :span="8">
          <el-form-item prop="gageTypeName" :label="$t('gage.gageTypeName')">
            <el-input v-model="dataForm.gageTypeName" :placeholder="$t('gage.gageTypeName')" disabled>
            </el-input>
          </el-form-item>
        </el-col>
        <el-col :span="8">
          <el-form-item prop="partNumber" :label="$t('gage.partNumber')">
            <el-input v-model="dataForm.partNumber" :placeholder="$t('gage.partNumber')">
            </el-input>
          </el-form-item>
        </el-col>
      </el-row>
      <el-row>
        <el-col :span="8">
          <el-form-item prop="specification" :label="$t('gage.specification')">
            <el-input v-model="dataForm.specification" :placeholder="$t('gage.specification')">
            </el-input>
          </el-form-item>
        </el-col>
        <el-col :span="8">
          <el-form-item prop="measuringToolSpecification" :label="$t('gage.measuringToolSpecification')">
            <el-input v-model="dataForm.measuringToolSpecification" :placeholder="$t('gage.measuringToolSpecification')"
              disabled>
            </el-input>
          </el-form-item>
        </el-col>
        <el-col :span="8">
          <el-form-item prop="process" :label="$t('gage.process')">
            <el-input v-model="dataForm.process" :placeholder="$t('gage.process')">
            </el-input>
          </el-form-item>
        </el-col>
      </el-row>
      <el-row>
        <el-col :span="8">
          <el-form-item prop="measurementNumber" :label="$t('gage.measurementNumber')">
            <el-input v-model="dataForm.measurementNumber" :placeholder="$t('gage.measurementNumber')">
            </el-input>
          </el-form-item>
        </el-col>
        <el-col :span="8">
          <el-form-item prop="measuringToolAccuracy" :label="$t('gage.measuringToolAccuracy')">
            <el-input v-model="dataForm.measuringToolAccuracy" :placeholder="$t('gage.measuringToolAccuracy')">
            </el-input>
          </el-form-item>
        </el-col>
        <el-col :span="8">
          <el-form-item prop="fabrication" :label="$t('gage.fabrication')">
            <el-input v-model="dataForm.fabrication" :placeholder="$t('gage.fabrication')">
            </el-input>
          </el-form-item>
        </el-col>
      </el-row>
      <el-row>
        <el-col :span="8">
          <el-form-item prop="publicErrand" :label="$t('gage.publicErrand')">
            <el-input v-model="dataForm.publicErrand" :placeholder="$t('gage.publicErrand')">
            </el-input>
          </el-form-item>
        </el-col>
        <el-col :span="8">
          <el-form-item prop="precisionDecimalPlace" :label="$t('gage.precisionDecimalPlace')">
            <el-input v-model="dataForm.precisionDecimalPlace" :placeholder="$t('gage.precisionDecimalPlace')">
            </el-input>
          </el-form-item>
        </el-col>
        <el-col :span="8">
          <el-form-item prop="tester" :label="$t('gage.tester')">
            <el-input v-model="dataForm.tester" :placeholder="$t('gage.tester')">
            </el-input>
          </el-form-item>
        </el-col>
      </el-row>
      <el-row>
        <el-col :span="8">
          <el-form-item prop="precisionDecimalPlace" :label="$t('gage.precisionDecimalPlace')">
            <el-input v-model="dataForm.precisionDecimalPlace" :placeholder="$t('gage.precisionDecimalPlace')">
            </el-input>
          </el-form-item>
        </el-col>
        <el-col :span="8">
          <el-form-item prop="measurementTime" :label="$t('gage.measurementTime')">
            <el-date-picker v-model="dataForm.measurementTime" type="datetime" :placeholder="$t('gage.measurementTime')"
              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>
        <el-form-item style="float: right;margin-right: 30px;">
          <el-button @click="handleClose()">{{ $t('cancel') }}</el-button>
          <el-button type="primary" @click="dataFormSubmit()">{{ $t('confirm') }} </el-button>
        </el-form-item>
-      </el-col>
+      </el-row>
-      <el-col :span="8">
+    </el-form>
-        <el-form-item prop="gageId" :label="$t('gage.gageName')">
+    <div v-if="dataForm.id? true :false" style='margin-left: 30px;'>
-          <el-select v-model="dataForm.gageId" :placeholder="$t('gage.gageName')" @change="getGageType">
+      <el-button @click="getTableData()" type="primary">{{ $t('gage.tabularComputations') }}</el-button>
-            <el-option v-for="item in gageList" :key="item.id" :label="item.name" :value="item.id">
+      <el-button @click="tabularComputationsAdd()" type="primary">{{ $t('gage.tabularComputationsAdd') }}</el-button>
-            </el-option>
+      <base-table :span-method="objectSpanMethod" :table-props="tableProps" :table-data="tableData" />
-          </el-select>
+      <el-table style="width: 100%" :data="getValues" :show-header="false">
-        </el-form-item>
+        <el-table-column v-for="(item, index) in getHeaders" :key="index" :prop="item">
-      </el-col>
+        </el-table-column>
-      <el-col :span="8">
+      </el-table>
-        <el-form-item prop="corporation" :label="$t('gage.corporation')">
+    </div>
-          <el-input v-model="dataForm.corporation" :placeholder="$t('gage.corporation')">
+    <tabularComputations-add ref="tabularComputationsAddOrUpdate" v-if="tabularComputationsAddShow"
-          </el-input>
+      @refreshDataList="getTableData">
-        </el-form-item>
+    </tabularComputations-add>
-      </el-col>
+  </el-drawer>
    </el-row>
    <el-row>
      <el-col :span="8">
        <el-form-item prop="itemNo" :label="$t('gage.itemNo')">
          <el-input v-model="dataForm.itemNo" :placeholder="$t('gage.itemNo')">
          </el-input>
        </el-form-item>
      </el-col>
      <el-col :span="8">
        <el-form-item prop="gageTypeName" :label="$t('gage.gageTypeName')">
          <el-input v-model="dataForm.gageTypeName" :placeholder="$t('gage.gageTypeName')" disabled>
          </el-input>
        </el-form-item>
      </el-col>
      <el-col :span="8">
        <el-form-item prop="partNumber" :label="$t('gage.partNumber')">
          <el-input v-model="dataForm.partNumber" :placeholder="$t('gage.partNumber')">
          </el-input>
        </el-form-item>
      </el-col>
    </el-row>
    <el-row>
      <el-col :span="8">
        <el-form-item prop="specification" :label="$t('gage.specification')">
          <el-input v-model="dataForm.specification" :placeholder="$t('gage.specification')">
          </el-input>
        </el-form-item>
      </el-col>
      <el-col :span="8">
        <el-form-item prop="measuringToolSpecification" :label="$t('gage.measuringToolSpecification')">
          <el-input v-model="dataForm.measuringToolSpecification" :placeholder="$t('gage.measuringToolSpecification')"
            disabled>
          </el-input>
        </el-form-item>
      </el-col>
      <el-col :span="8">
        <el-form-item prop="process" :label="$t('gage.process')">
          <el-input v-model="dataForm.process" :placeholder="$t('gage.process')">
          </el-input>
        </el-form-item>
      </el-col>
    </el-row>
    <el-row>
      <el-col :span="8">
        <el-form-item prop="measurementNumber" :label="$t('gage.measurementNumber')">
          <el-input v-model="dataForm.measurementNumber" :placeholder="$t('gage.measurementNumber')">
          </el-input>
        </el-form-item>
      </el-col>
      <el-col :span="8">
        <el-form-item prop="measuringToolAccuracy" :label="$t('gage.measuringToolAccuracy')">
          <el-input v-model="dataForm.measuringToolAccuracy" :placeholder="$t('gage.measuringToolAccuracy')">
          </el-input>
        </el-form-item>
      </el-col>
      <el-col :span="8">
        <el-form-item prop="fabrication" :label="$t('gage.fabrication')">
          <el-input v-model="dataForm.fabrication" :placeholder="$t('gage.fabrication')">
          </el-input>
        </el-form-item>
      </el-col>
    </el-row>
    <el-row>
      <el-col :span="8">
        <el-form-item prop="publicErrand" :label="$t('gage.publicErrand')">
          <el-input v-model="dataForm.publicErrand" :placeholder="$t('gage.publicErrand')">
          </el-input>
        </el-form-item>
      </el-col>
      <el-col :span="8">
        <el-form-item prop="precisionDecimalPlace" :label="$t('gage.precisionDecimalPlace')">
          <el-input v-model="dataForm.precisionDecimalPlace" :placeholder="$t('gage.precisionDecimalPlace')">
          </el-input>
        </el-form-item>
      </el-col>
      <el-col :span="8">
        <el-form-item prop="tester" :label="$t('gage.tester')">
          <el-input v-model="dataForm.tester" :placeholder="$t('gage.tester')">
          </el-input>
        </el-form-item>
      </el-col>
    </el-row>
    <el-row>
      <el-col :span="8">
        <el-form-item prop="precisionDecimalPlace" :label="$t('gage.precisionDecimalPlace')">
          <el-input v-model="dataForm.precisionDecimalPlace" :placeholder="$t('gage.precisionDecimalPlace')">
          </el-input>
        </el-form-item>
      </el-col>
      <el-col :span="8">
        <el-form-item prop="measurementTime" :label="$t('gage.measurementTime')">
          <el-date-picker v-model="dataForm.measurementTime" type="datetime" :placeholder="$t('gage.measurementTime')"
            format='yyyy-MM-dd HH:mm:ss' valueFormat='yyyy-MM-ddTHH:mm:ss'>
          </el-date-picker>
        </el-form-item>
      </el-col>
    </el-row>
    <el-button @click="getTableData()" type="primary">{{ $t('gage.tabularComputations') }}</el-button>
    <base-table :table-props="tableProps" :table-data="tableData" />
  </el-form>
 </template>
 <script>
 import debounce from "lodash/debounce";
 import basicAdd from "@/mixins/basic-add";
 import InnerTable from "./innerTable"
 import tabularComputationsAdd from "./tabularComputations-add"
 import available from "./available";
 // const tableProps = [
 //   {
@@ -200,29 +221,14 @@ import available from "./available";
 //   //   ]
 //   // }
 // ]
 const tableProps = [
  {
    prop: 'testUserName',
    label: '人员',
    align: 'center'
  },
  {
    prop: 'orderNumber',
    label: '序号',
    align:'center'
  },
  {
    prop: 'test',
    label: '零件',
    align: 'center',
    children: [
    ]
  }
 ]
 export default {
  mixins: [basicAdd],
  components: {
    tabularComputationsAdd,
  },
  data() {
    return {
      tabularComputationsAddShow:false,
      urlOptions: {
        submitURL: "/gage/qmsGageGrr",
        infoURL: "/gage/qmsGageGrr/{ id }",
@@ -233,10 +239,11 @@ export default {
        getCustomerListURL: '/basic/qmsCustomer/page',
        getTabularComputationsURL: '/gage/qmsGageGrrTester/table'
      },
      drawer:false,
      trueTableProps: [],
      gageList: [],
      userList: [],
-      tableProps,
+      tableProps:[],
      customerList: [],
      tableData:[],
      gageTypeList:[],
@@ -303,7 +310,30 @@ export default {
          name: '自校报告'
        }
      ],
      column1Arr:[],
      column1Index: 0,
      column2Arr: {},
      column2Index: 0,
      visible: false,
      data: [],
      headers: [
        {
          prop: 'meanRange',
          label: '极差均值',
        },
        {
          prop: 'meanDifference',
          label: '均值差',
        },
        {
          prop: 'upperControlLimit',
          label: '控制上限',
        },
        {
          prop: 'lowerControlLimit',
          label: '控制下限',
        },
      ],
      // tableProp2,
      chartDataArr: [],
      dataForm: {
@@ -331,29 +361,44 @@ export default {
    };
  },
  computed: {
    getHeaders() {
      return this.data.reduce((pre, cur, index) => pre.concat(`value${index}`), ['title'])
    },
    getValues() {
      return this.headers.map(item => {
        return this.data.reduce((pre, cur, index) => Object.assign(pre, { ['value' + index]: cur[item.prop] }), { 'title': item.label, });
      });
    },
    dataRule() {
      return {
-        // dictLabel: [
+        publicErrand: [
-        //   {
+          {
-        //     required: true,
+            required: true,
-        //     message: this.$t("validate.required"),
+            message: this.$t("validate.required"),
-        //     trigger: "blur",
+            trigger: "blur",
-        //   },
+          },
-        // ],
+        ],
-        // dictValue: [
+        gageId: [
-        //   {
+          {
-        //     required: true,
+            required: true,
-        //     message: this.$t("validate.required"),
+            message: this.$t("validate.required"),
-        //     trigger: "blur",
+            trigger: "change",
-        //   },
+          },
-        // ],
+        ],
-        // sort: [
+        measurementNumber: [
-        //   {
+          {
-        //     required: true,
+            required: true,
-        //     message: this.$t("validate.required"),
+            message: this.$t("validate.required"),
-        //     trigger: "blur",
+            trigger: "blur",
-        //   },
+          },
-        // ],
+        ],
        partNumber: [
          {
            required: true,
            message: this.$t("validate.required"),
            trigger: "blur",
          },
        ]
      };
    },
  },
@@ -365,7 +410,62 @@ export default {
    this.tableProps = []
  },
  methods: {
    tabularComputationsAdd() {
      this.tabularComputationsAddShow = true 
      this.$nextTick(() => {
        this.$refs.tabularComputationsAddOrUpdate.init(this.dataForm.id)
      })
    },
    setrowspans() {
      // 先给所有的数据都加一个v.rowspan = 1
      this.tableData.forEach(v => {
        v.rowspan = 1;
        v.rangeAverageRowspan = 1;
      });
      // 双层循环
      for (let i = 0; i < this.tableData.length; i++) {
        // 内层循环，上面已经给所有的行都加了v.rowspan = 1
        // 这里进行判断
        // 如果当前行的id和下一行的id相等
        // 就把当前v.rowspan + 1
        // 下一行的v.rowspan - 1
        for (let j = i + 1; j < this.tableData.length; j++) {
          //此处可根据相同字段进行合并，此处是根据的id
          if (this.tableData[i].finalAverage === this.tableData[j].finalAverage) {
            this.tableData[i].rowspan++;
            this.tableData[j].rowspan--;
          }
          if (this.tableData[i].rangeAverage === this.tableData[j].rangeAverage) {
            this.tableData[i].rangeAverageRowspan++;
            this.tableData[j].rangeAverageRowspan--;
          }
        }
        // 这里跳过已经重复的数据
        i = i + this.tableData[i].rowspan - 1;
      }
    },
    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
      // console.log(column)
      if (columnIndex === 0) {
        return {
          rowspan: row.rowspan,
          colspan: 1
        };
      } else if (column.label === '最终均值') {
        return {
          rowspan: row.rowspan,
          colspan: 1
        };
      }
      if (column.label === '极差均值') {
        return {
          rowspan: row.rangeAverageRowspan,
          colspan: 1
        };
      }
    },
    getTableData() {
      this.tableData = []
      this.$http.get(this.urlOptions.getTabularComputationsURL, {
        params: {
          gageGrrId:this.dataForm.id
@@ -399,42 +499,117 @@ export default {
            //   //   ]
            //   // },
            // ]
            let propsData = [
              {
                prop: 'testUserName',
                label: '人员',
                align: 'center',
                subcomponent: InnerTable
              },
              {
                prop: 'orderNumber',
                label: '序号',
                align: 'center',
              },
              {
                prop: 'test',
                label: '零件',
                align: 'center',
                children: [
                  {
                    prop: 'orderAverage',
                    label: '序号均值',
                    align: 'center',
                  },
                ]
              },
              {
                prop: 'finalAverage',
                label: '最终均值',
                align: 'center'
              },
              {
                prop: 'rangeAverage',
                label: '极差均值',
                align: 'center'
              },
              {
                prop: 'partAverageMean',
                label: 'Rp零件均值极差',
                align: 'center'
              }
            ]
            Object.keys(result.data.finalPartMapList).forEach((item) => {
              propsData[2].children.push({
                label: String(item),
                prop: 'measuredData' + String(item),
                align: 'center'
              })
            })
            this.tableProps = propsData
            let orderAverageArr = []
            let rangeArr = []
            for (let i = 0; i < result.data.qmsGageGrrTesterDTOList.length; i++){
-              // console.log(result.data.qmsGageGrrTesterDTOList[i].orderMapList)
+              // console.log(result.data.qmsGageGrrTesterDTOLis[i])
-              Object.keys(result.data.qmsGageGrrTesterDTOList[i].partMapList).forEach((item) => {
+              Object.keys(result.data.qmsGageGrrTesterDTOList[i].orderAverage).forEach((item) => {
-                this.tableProps[2].children.push({
+                orderAverageArr.push(result.data.qmsGageGrrTesterDTOList[i].orderAverage[item])
                  label: String(item),
                  prop: 'measuredData' + String(item),
                  align: 'center'
                })
              })
              Object.keys(result.data.qmsGageGrrTesterDTOList[i].orderMapList).forEach((item) => {
                console.log(item)
               let measuredDataProp = 'measuredData' + String(item)
-                this.tableData.push({
+                arr.push({
                  testUserName: result.data.qmsGageGrrTesterDTOList[i].testUserName,
                  orderNumber: item,
                  finalAverage: '',
                  gageGrrId: result.data.qmsGageGrrTesterDTOList[i].gageGrrId,
                  partAverageMean: '',
                  [measuredDataProp]: '',
                })
-                })
+              })
-                Object.keys(result.data.qmsGageGrrTesterDTOList[i].orderMapList).forEach((item) => {
+              Object.keys(result.data.qmsGageGrrTesterDTOList[i].range).forEach((item) => {
-                  result.data.qmsGageGrrTesterDTOList[i].orderMapList[item].forEach((ele, index, arr) => {
+                rangeArr.push(result.data.qmsGageGrrTesterDTOList[i].range[item])
                    let measuredData = 'measuredData' + String(index + 1)
                    console.log(item)
                    // console.log(arr)
                    // console.log(ele)
                    // console.log(this.tableProps[2].children.prop);
                    // console.log(this.tableProps[2].children[item - 1].prop)
                    console.log(index)
                    console.log(measuredData)
                    console.log(ele)
                    // console.log(this.tableData[index + 1])
                    this.tableData[item-1][measuredData] = ele
                    // console.log(this.tableData[item - 1])       
                  })
              })
            }
            this.tableData = arr
            // console.log(Object.keys(result.data.finalPartMapList))
            Object.keys(result.data.finalPartMapList).forEach((item) => {
              // console.log(item)
              let measuredData = 'measuredData' + String(item)
              console.log(result.data.finalPartMapList[item])
              result.data.finalPartMapList[item].forEach((ele, index) => {
                this.tableData[index][measuredData] = ele
              })
            })
            orderAverageArr.forEach((ele, index) => {
              this.tableData[index]['orderAverage'] = ele
            })
            this.tableData.forEach((ele, index) => {
              ele.partAverageMean = result.data.partAverageMean
              result.data.qmsGageGrrTesterDTOList.forEach((item, i) => {
                // console.log(item.finalAverage)
                if (this.tableData[index].testUserName === result.data.qmsGageGrrTesterDTOList[i].testUserName) {
                  ele.finalAverage = item.finalAverage
                  ele.rangeAverage = item.rangeAverage
                }
              })
            })
            // rangeArr.forEach((ele, index) => {
            //   this.data.push({
            //     range:ele
            //   })
            // })
            // console.log()
            let dataDetail = []
            dataDetail.push({
              meanRange: result.data.meanRange,
              lowerControlLimit: result.data.lowerControlLimit,
              meanDifference: result.data.meanDifference,
              upperControlLimit: result.data.upperControlLimit,
            })
            this.data = dataDetail
            console.log(this.tableProps)
            console.log(this.tableData)
            this.setrowspans()
            // console.log(this.table)
            // console.log(moreData,'1111')
            // for (let i = 0; i < 30; i++) {
@@ -532,7 +707,7 @@ export default {
      this.dataForm.id = id || ""
      // console.log(11111)
      // this.dataForm.dictTypeId = dictTypeId || "";
-      this.visible = true
+      this.drawer = true
      this.$nextTick(() => {
        this.$refs["dataForm"].resetFields();
        if (this.dataForm.id) {
@@ -563,16 +738,16 @@ export default {
        })
        .catch(() => {
        })
-      this.$http
+      // this.$http
-        .get(this.urlOptions.getUserList, this.listQuery)
+      //   .get(this.urlOptions.getUserList, this.listQuery)
-        .then(({ data: res }) => {
+      //   .then(({ data: res }) => {
-          if (res.code === 0) {
+      //     if (res.code === 0) {
-            console.log(res.data);
+      //       console.log(res.data);
-            this.userList = res.data.list
+      //       this.userList = res.data.list
-          }
+      //     }
-        })
+      //   })
-        .catch(() => {
+      //   .catch(() => {
-        })
+      //   })
    },
    // getCode() {
    //   this.$http.post(this.urlOptions.getCodeURL)
@@ -600,6 +775,34 @@ export default {
        })
        .catch(() => { })
    },
    handleClose() {
      this.drawer = false
      this.$refs.dataForm.resetFields()
    },
    dataFormSubmit() {
      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.drawer = false
                this.$refs.dataForm.resetFields()
                this.$emit("refreshDataList")
              },
            });
          })
          .catch(() => { });
      });
    },
    // 表单提交
    dataFormSubmitHandle: debounce(
      function () {
--- a/src/views/modules/gage/components/gageResumeSearch.vue
+++ b/src/views/modules/gage/components/gageResumeSearch.vue
@@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2023-01-04 10:29:40
 * @LastEditors: zhp
- * @LastEditTime: 2023-05-10 16:18:12
+ * @LastEditTime: 2023-07-13 09:19:08
 * @Description: 
 -->
 <template>
@@ -151,7 +151,9 @@ export default {
    // 表单提交
    getDict() {
      this.$http
-        .get(this.urlOptions.getGageTypeList, this.listQuery)
+        .get(this.urlOptions.getGageTypeList, {
          params: this.listQuery
        })
        .then(({ data: res }) => {
          if (res.code === 0) {
            console.log(res.data);
--- a/src/views/modules/gage/components/gageSearch.vue
+++ b/src/views/modules/gage/components/gageSearch.vue
@@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2023-01-04 10:29:40
 * @LastEditors: zhp
- * @LastEditTime: 2023-05-10 16:17:59
+ * @LastEditTime: 2023-07-13 09:13:44
 * @Description: 
 -->
 <template>
@@ -126,6 +126,9 @@ export default {
    //   };
    // },
  },
  mounted () {
    this.getDict();
  },
  methods: {
    // init(id) {
    //   this.dataForm.id = id || "";
@@ -155,7 +158,9 @@ export default {
    // 表单提交
    getDict() {
      this.$http
-        .get(this.urlOptions.getGageTypeList, this.listQuery)
+        .get(this.urlOptions.getGageTypeList, {
          params: this.listQuery
        })
        .then(({ data: res }) => {
          if (res.code === 0) {
            console.log(res.data);
@@ -165,7 +170,9 @@ export default {
        .catch(() => {
        })
      this.$http
-        .get(this.urlOptions.getUserList, this.listQuery)
+        .get(this.urlOptions.getUserList, {
          params: this.listQuery
        })
        .then(({ data: res }) => {
          if (res.code === 0) {
            console.log(res.data);
--- a/src/views/modules/gage/components/gageType-add.vue
+++ b/src/views/modules/gage/components/gageType-add.vue
@@ -1,12 +1,12 @@
 <!--
 * @Author: zhp
 * @Date: 2023-02-14 15:02:26
- * @LastEditTime: 2023-05-30 14:39:38
+ * @LastEditTime: 2023-07-13 09:01:54
 * @LastEditors: zhp
 * @Description: 
 -->
 <template>
-  <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="150px">
+  <el-form :model="dataForm" ref="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmitHandle()" label-width="150px">
    <el-form-item prop="code" :label="$t('gage.code')">
      <el-input v-model="dataForm.code" :placeholder="$t('gage.code')">
      </el-input>
@@ -75,27 +75,20 @@ export default {
  computed: {
    dataRule() {
      return {
-        // dictLabel: [
+        code: [
-        //   {
+          {
-        //     required: true,
+            required: true,
-        //     message: this.$t("validate.required"),
+            message: this.$t("validate.required"),
-        //     trigger: "blur",
+            trigger: "blur",
-        //   },
+          },
-        // ],
+        ],
-        // dictValue: [
+        name: [
-        //   {
+          {
-        //     required: true,
+            required: true,
-        //     message: this.$t("validate.required"),
+            message: this.$t("validate.required"),
-        //     trigger: "blur",
+            trigger: "blur",
-        //   },
+          },
-        // ],
+        ]
        // sort: [
        //   {
        //     required: true,
        //     message: this.$t("validate.required"),
        //     trigger: "blur",
        //   },
        // ],
      };
    },
  },
--- a/src/views/modules/gage/components/gageTypeDifferenceParameter-add.vue
+++ b/src/views/modules/gage/components/gageTypeDifferenceParameter-add.vue
@@ -1,12 +1,13 @@
 <!--
 * @Author: zhp
 * @Date: 2023-02-14 15:02:26
- * @LastEditTime: 2023-05-17 14:50:02
+ * @LastEditTime: 2023-07-13 09:03:49
 * @LastEditors: zhp
 * @Description: 
 -->
 <template>
-  <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="150px">
+  <el-form :model="dataForm" ref="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmitHandle()"
    label-width="150px">
    <el-form-item prop="code" :label="$t('gage.code')">
      <el-input v-model="dataForm.code" :placeholder="$t('gage.code')">
      </el-input>
@@ -88,34 +89,28 @@ export default {
        serialNo: null,
        sl: null,
        updateDate: null,
-        usl: null,	
+        usl: null,
        code:null
      },
    };
  },
  computed: {
    dataRule() {
      return {
-        // dictLabel: [
+        name: [
-        //   {
+          {
-        //     required: true,
+            required: true,
-        //     message: this.$t("validate.required"),
+            message: this.$t("validate.required"),
-        //     trigger: "blur",
+            trigger: "blur",
-        //   },
+          },
-        // ],
+        ],
-        // dictValue: [
+        code: [
-        //   {
+          {
-        //     required: true,
+            required: true,
-        //     message: this.$t("validate.required"),
+            message: this.$t("validate.required"),
-        //     trigger: "blur",
+            trigger: "blur",
-        //   },
+          },
-        // ],
+        ]
        // sort: [
        //   {
        //     required: true,
        //     message: this.$t("validate.required"),
        //     trigger: "blur",
        //   },
        // ],
      };
    },
  },
--- a/src/views/modules/gage/components/gageVerification-add.vue
+++ b/src/views/modules/gage/components/gageVerification-add.vue
@@ -1,12 +1,13 @@
 <!--
 * @Author: zhp
 * @Date: 2023-02-14 15:02:26
- * @LastEditTime: 2023-05-11 09:50:14
+ * @LastEditTime: 2023-07-13 09:42:52
 * @LastEditors: zhp
 * @Description: 
 -->
 <template>
-  <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="150px">
+  <el-form :model="dataForm" ref="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmitHandle()"
    label-width="150px">
    <el-form-item prop="client" :label="$t('gage.client')">
      <el-input v-model="dataForm.client" :placeholder="$t('gage.client')">
      </el-input>
@@ -118,7 +119,7 @@ export default {
      ],
      listQuery: {
        limit: 999,
-        gape: 1
+        page: 1
      },
      gageStatusList: [
        {
@@ -190,32 +191,18 @@ export default {
  computed: {
    dataRule() {
      return {
-        // dictLabel: [
+        gageId: [
-        //   {
+          {
-        //     required: true,
+            required: true,
-        //     message: this.$t("validate.required"),
+            message: this.$t("validate.required"),
-        //     trigger: "blur",
+            trigger: "blur",
-        //   },
+          },
-        // ],
+        ]
        // dictValue: [
        //   {
        //     required: true,
        //     message: this.$t("validate.required"),
        //     trigger: "blur",
        //   },
        // ],
        // sort: [
        //   {
        //     required: true,
        //     message: this.$t("validate.required"),
        //     trigger: "blur",
        //   },
        // ],
      };
    },
  },
  mounted () {
-    this.getData();
+    this.getData()
  },
  methods: {
    init(id, ) {
@@ -234,7 +221,9 @@ export default {
    },
    getData() {
      this.$http
-        .get(this.urlOptions.getUserList, this.listQuery)
+        .get(this.urlOptions.getUserList, {
          params: this.listQuery
        })
        .then(({ data: res }) => {
          if (res.code === 0) {
            console.log(res.data);
@@ -244,7 +233,9 @@ export default {
        .catch(() => {
        });
      this.$http
-        .get(this.urlOptions.dictionaryDetailList, this.listQuery)
+        .get(this.urlOptions.dictionaryDetailList, {
          params: this.listQuery
        })
        .then(({ data: res }) => {
          if (res.code === 0) {
            console.log(res.data);
@@ -254,7 +245,9 @@ export default {
        .catch(() => {
        })
      this.$http
-        .get(this.urlOptions.getGageList, this.listQuery)
+        .get(this.urlOptions.getGageList, {
          params: this.listQuery
        })
        .then(({ data: res }) => {
          if (res.code === 0) {
            console.log(res.data);
--- a/src/views/modules/gage/components/gageVerificationSearch.vue
+++ b/src/views/modules/gage/components/gageVerificationSearch.vue
@@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2023-01-04 10:29:40
 * @LastEditors: zhp
- * @LastEditTime: 2023-05-11 10:13:33
+ * @LastEditTime: 2023-07-13 09:14:34
 * @Description: 
 -->
 <template>
@@ -83,7 +83,7 @@ export default {
        gageId: null,
        startTime: null,
        endTime: null,
-
+        parityBit:null
      },
      options: [{
        value: 0,
--- a/src/views/modules/gage/components/innerTable.vue
+++ b/src/views/modules/gage/components/innerTable.vue
@@ -0,0 +1,113 @@
 <!--
 * @Author: zhp
 * @Date: 2023-04-18 09:19:02
 * @LastEditTime: 2023-07-20 16:34:04
 * @LastEditors: zhp
 * @Description: 
 -->
 <template>
  <el-popover placement="right" width="400" trigger="click">
    <base-table id="palletTable" :table-props="tableProps" ref="palletTable1" :table-data="tableData">
    </base-table>
    <!-- <i slot="reference" class="el-icon-plus" @click="showInnerTable(injectData.id)" /> -->
    <span slot="reference" @click="showInnerTable(injectData.id)">{{ injectData.testUserName}} </span>
  </el-popover>
 </template>
 <script>
 import i18n from "@/i18n"
 import { timeFormatter } from '@/filters'
 const tableProps = [
  {
    prop: "partAverage",
    label: '零件均值',
  },
  {
    prop: "range",
    label:'零件极差',
    // filter: timeFormatter
  },
 ];
 export default {
  name: 'InnerTable',
  props: {
    injectData: {
      type: Object,
      default: () => ({})
    },
    itemProp: {
      type: String
    }
  },
  data() {
    return {
      tableProps,
      list: this.injectData,
      tableData: [],
      urlOptions: {
        getTabularComputationsURL: '/gage/qmsGageGrrTester/table'
      },
    }
  },
  methods: {
    showInnerTable() {
      this.tableData = []
      this.$http.get(this.urlOptions.getTabularComputationsURL, {
        params: {
          gageGrrId: this.injectData.gageGrrId
        },
      })
        .then(({ data: result }) => {
          if (result.code === 0) {
            console.log(result)
            let partAverageArr = []
            let rangeArr = []
            // let aa = []
            // let moreData = [
            //   // {
            //   //   testUserName: null,
            //   //   data: [
            //   //     {
            //   //       orderNumber: result.data.qmsGageGrrTesterDTOList[i].list[j].orderNumber,
            //   //       data: aa
            //   //     },
            //   //     {
            //   //       equipmentName: '机器人投入数',
            //   //       data: aa
            //   //     },
            //   //     {
            //   //       equipmentName: '良品总投入数',
            //   //       data: aa
            //   //     },
            //   //     {
            //   //       equipmentName: '工序损耗',
            //   //       data: aa
            //   //     }
            //   //   ]
            //   // },
            // ]
            for (let i = 0; i < result.data.qmsGageGrrTesterDTOList.length; i++) {
              if (this.injectData.testUserName === result.data.qmsGageGrrTesterDTOList[i].testUserName) {
                Object.keys(result.data.qmsGageGrrTesterDTOList[i].partAverage).forEach((item) => {
                  partAverageArr.push({
                    partAverage:result.data.qmsGageGrrTesterDTOList[i].partAverage[item]
                  })
                })
                Object.keys(result.data.qmsGageGrrTesterDTOList[i].range).forEach((item) => {
                  rangeArr.push(result.data.qmsGageGrrTesterDTOList[i].range[item])
                })
              }
            }
            this.tableData = partAverageArr
            rangeArr.forEach((item,index) => {
              this.tableData[index]['range'] = item
            })
          }
        })
        .catch(() => {
        })
    }
  }
 }
 </script>
--- a/src/views/modules/gage/components/qmsGageResume-add.vue
+++ b/src/views/modules/gage/components/qmsGageResume-add.vue
@@ -1,13 +1,14 @@
 <!--
 * @Author: zhp
 * @Date: 2023-02-14 15:02:26
- * @LastEditTime: 2023-05-18 15:30:28
+ * @LastEditTime: 2023-07-13 09:50:25
 * @LastEditors: zhp
 * @Description: 
 -->
 <template>
  <div>
-    <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="150px">
+    <el-form :model="dataForm" ref="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmitHandle()"
      label-width="150px">
      <el-form-item prop="gageId" :label="$t('gage.gageName')">
        <el-select v-model="dataForm.gageId" :placeholder="$t('gage.gageName')">
          <el-option v-for="item in gageList" :key="item.id" :label="item.name" :value="item.id">
@@ -76,7 +77,8 @@
        </el-input>
      </el-form-item>
    </el-form>
-    <el-form v-if="detectionShow && showForm" :model="parameterData" ref="parameterData" label-width="150px">
+    <el-form v-if="detectionShow && showForm"  :model="parameterData" ref="parameterData"
      label-width="150px">
      <el-form-item prop="parameter" :label="$t('gage.parameter')">
        <el-select v-model="dataForm.parameter" :placeholder="$t('gage.parameter')">
          <el-option v-for="item in parameterList" :key="item.id" :label="item.name" :value="item.id">
@@ -201,7 +203,7 @@ export default {
        id: null,
        expectedReturnDate:null,
        gageCode: null,
-        gageId: '',
+        gageId: null,
        measuringToolSpecification:null,
        measurToolEvent: null,
        process: null,
@@ -218,27 +220,27 @@ export default {
  computed: {
    dataRule() {
      return {
-        // dictLabel: [
+        gageId: [
-        //   {
+          {
-        //     required: true,
+            required: true,
-        //     message: this.$t("validate.required"),
+            message: this.$t("validate.required"),
-        //     trigger: "blur",
+            trigger: "blur",
-        //   },
+          },
-        // ],
+        ],
-        // dictValue: [
+        measurToolEvent: [
-        //   {
+          {
-        //     required: true,
+            required: true,
-        //     message: this.$t("validate.required"),
+            message: this.$t("validate.required"),
-        //     trigger: "blur",
+            trigger: "change",
-        //   },
+          },
-        // ],
+        ],
-        // sort: [
+        process: [
-        //   {
+          {
-        //     required: true,
+            required: true,
-        //     message: this.$t("validate.required"),
+            message: this.$t("validate.required"),
-        //     trigger: "blur",
+            trigger: "blur",
-        //   },
+          },
-        // ],
+        ],
      };
    },
  },
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
helloDy	9f485a35e9	Merge branch 'master' into dy	2023-08-25 14:46:33 +08:00
helloDy	b1749486fe	提交	2023-08-25 11:11:34 +08:00
zhp	2859ec78c4	Merge pull request 'zhp' (#30 ) from zhp into master Reviewed-on: #30	2023-07-21 17:04:29 +08:00
‘937886381’	a17d258934	Merge branch 'master' into zhp	2023-07-21 17:03:56 +08:00
‘937886381’	837991ee91	表格计算新增	2023-07-21 17:03:25 +08:00
hellody	258b9f1256	Merge pull request 'dy' (#29 ) from dy into master Reviewed-on: #29	2023-07-21 16:47:13 +08:00
helloDy	bcdb04059b	冲突	2023-07-21 16:46:28 +08:00
helloDy	2ba0a42a1f	供应商	2023-07-21 16:45:10 +08:00
朱文强	94a359fe1e	Merge pull request '更新8Dbug' (#28 ) from zwq into master Reviewed-on: #28	2023-07-20 15:07:35 +08:00
zwq	d942fd83f8	更新8Dbug	2023-07-20 15:07:20 +08:00
朱文强	931fb70ee9	Merge pull request '更新nav-tab标签首页可以关闭' (#27 ) from zwq into master Reviewed-on: #27	2023-07-20 09:08:09 +08:00
zwq	97fe6d23b3	更新nav-tab标签首页可以关闭	2023-07-20 09:07:53 +08:00
zhp	93f92f42c5	Merge pull request '客户质量新增' (#26 ) from zhp into master Reviewed-on: #26	2023-07-19 17:03:32 +08:00
‘937886381’	ab30435246	客户质量新增	2023-07-19 17:02:32 +08:00
朱文强	26a0d9827c	Merge pull request '改变navbar小图标样式' (#25 ) from zwq into master Reviewed-on: #25	2023-07-19 16:50:11 +08:00
zwq	7d1e82b818	改变navbar小图标样式	2023-07-19 16:49:48 +08:00
朱文强	005143cd2d	Merge pull request 'zhp' (#24 ) from zhp into master Reviewed-on: #24	2023-07-19 09:38:08 +08:00
‘937886381’	05c4374d36	Merge branch 'master' into zhp	2023-07-19 09:24:03 +08:00
‘937886381’	b810720fbd	修改bug	2023-07-19 09:23:37 +08:00
zhp	cdca6407ff	Merge pull request 'zhp' (#23 ) from zhp into master Reviewed-on: #23	2023-07-17 17:01:46 +08:00
‘937886381’	f002123cf5	Merge branch 'master' into zhp	2023-07-17 17:00:50 +08:00
‘937886381’	bc6ae3a005	修改bug	2023-07-17 17:00:11 +08:00
朱文强	7cee18e20d	Merge pull request '更新8D的bug' (#22 ) from zwq into master Reviewed-on: #22	2023-07-17 15:50:23 +08:00
zwq	675b716a32	更新8D的bug	2023-07-17 15:50:12 +08:00
朱文强	7acd83e501	Merge pull request '更新8D' (#21 ) from zwq into master Reviewed-on: #21	2023-07-17 10:18:51 +08:00
zwq	0626237912	更新8D	2023-07-17 10:18:06 +08:00
朱文强	bef845eb3d	Merge pull request 'dy' (#20 ) from dy into master Reviewed-on: #20	2023-07-17 08:56:23 +08:00
‘937886381’	f8dd086cf9	修改页面	2023-07-14 16:01:10 +08:00
helloDy	3e9e5f82db	解决冲突	2023-07-14 15:57:47 +08:00
helloDy	229b59f424	更新	2023-07-14 15:50:58 +08:00
zhp	2866927528	Merge pull request 'zhp' (#19 ) from zhp into master Reviewed-on: #19	2023-07-14 15:37:23 +08:00
‘937886381’	9702f23d55	Merge branch 'master' into zhp	2023-07-14 15:36:44 +08:00
‘937886381’	87957315b3	客户质量模块	2023-07-14 15:36:21 +08:00
朱文强	ec4f3fcf04	Merge pull request '更新8d处理和管理' (#18 ) from zwq into master Reviewed-on: #18	2023-07-14 14:42:48 +08:00
zwq	e27ef93af9	更新8d处理和管理	2023-07-14 14:42:31 +08:00