From b303726d65c465a5d9df403082327572e30698a9 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 1 Jul 2024 13:48:05 +0800
Subject: [PATCH 1/3] =?UTF-8?q?bug:WMS=E3=80=81SCP=E4=B8=AD=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E5=BC=B9=E5=87=BA=E9=A1=B5=E6=9C=80=E5=A4=A7=E5=8C=96?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E5=AE=BD=E5=BA=A6=E5=92=8C=E9=AB=98=E5=BA=A6?=
 =?UTF-8?q?=E9=83=BD=E8=A6=81=E5=B1=95=E7=A4=BA=E5=88=B0=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=99=A8=E7=9A=84=E6=9C=80=E5=A4=A7=E5=AE=BD=E5=BA=A6=E5=92=8C?=
 =?UTF-8?q?=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue | 7 ++++++-
 src/components/Dialog/src/Dialog.vue       | 5 +++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 5444c2218..8fdf5e7e3 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -5,10 +5,11 @@
     :width="dialogWidth"
     :close-on-click-modal="false"
     :vLoading="formLoading"
+    @updateFullscreen="updateFullscreen"
   >
   
   <div 
-    style="max-height: 60vh;overflow-y: auto;">
+    style="overflow-y: auto;" :style="{'height':formHeight}">
     <Form
       ref="formRef"
       :rules="rules"
@@ -329,6 +330,10 @@ if (props.basicFormWidth) {
 } else {
   dialogWidth.value = props.isBusiness ? '60%' : '40%'
 }
+const formHeight = ref('60vh')
+const updateFullscreen = (isFullscreen)=>{
+  formHeight.value = isFullscreen?'auto':'60vh'
+}
 
 const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
diff --git a/src/components/Dialog/src/Dialog.vue b/src/components/Dialog/src/Dialog.vue
index 0d52642de..8ad2e6a52 100644
--- a/src/components/Dialog/src/Dialog.vue
+++ b/src/components/Dialog/src/Dialog.vue
@@ -3,6 +3,10 @@ import { propTypes } from '@/utils/propTypes'
 import { isNumber } from '@/utils/is'
 defineOptions({ name: 'Dialog' })
 
+// 传递给父类
+const emit = defineEmits([
+  'updateFullscreen'
+])
 const slots = useSlots()
 
 const props = defineProps({
@@ -32,6 +36,7 @@ const isFullscreen = ref(false)
 
 const toggleFull = () => {
   isFullscreen.value = !unref(isFullscreen)
+  emit('updateFullscreen',isFullscreen.value)
 }
 
 const dialogHeight = ref(isNumber(props.maxHeight) ? `${props.maxHeight}px` : props.maxHeight)

From 67324b93078f3614f5ad4b4cc4f66275ade7209c Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Mon, 1 Jul 2024 15:41:58 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/inspectionScheme/addForm.vue   | 320 +++++++++++++------
 src/views/qms/inspectionTemplate/addForm.vue |   7 +-
 2 files changed, 217 insertions(+), 110 deletions(-)

diff --git a/src/views/qms/inspectionScheme/addForm.vue b/src/views/qms/inspectionScheme/addForm.vue
index c96d8ffa4..cfbc54c4c 100644
--- a/src/views/qms/inspectionScheme/addForm.vue
+++ b/src/views/qms/inspectionScheme/addForm.vue
@@ -42,10 +42,10 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-            <el-form-item label="描述" prop="description">
-              <el-input v-model="data.description" placeholder="请填写描述" />
-            </el-form-item>
-          </el-col>
+              <el-form-item label="描述" prop="description">
+                <el-input v-model="data.description" placeholder="请填写描述" />
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
               <el-form-item label="版本" prop="version">
                 <el-input v-model="data.version" placeholder="请填写版本" />
@@ -169,7 +169,7 @@
                 </el-select>
               </el-form-item>
             </el-col> -->
-            <el-col :span="12" v-if="isShowField !=0">
+            <el-col :span="12" v-if="isShowField != 0">
               <el-form-item label="aql" prop="aql">
                 <el-select v-model="data.aql" placeholder="请选择aql">
                   <el-option
@@ -181,7 +181,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="12" v-if="isShowField!=0">
+            <el-col :span="12" v-if="isShowField != 0">
               <el-form-item label="检验水平" prop="inspectionLevel">
                 <el-select v-model="data.inspectionLevel" placeholder="请选择检验水平">
                   <el-option
@@ -195,7 +195,11 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="每份样品量" prop="samplePieceSize">
-                <el-input v-model="data.samplePieceSize" placeholder="请填写每份样品量" :disabled='isSamplePieceSizeDisabled'/>
+                <el-input
+                  v-model="data.samplePieceSize"
+                  placeholder="请填写每份样品量"
+                  :disabled="isSamplePieceSizeDisabled"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -229,6 +233,7 @@
         </el-form>
         <el-tabs
           v-model="editableTabsValue"
+          editable
           class="demo-tabs"
           @edit="handleTabsEdit"
           type="border-card"
@@ -241,7 +246,7 @@
             :label="item.description"
             :name="item.name"
           >
-          <!-- <el-col :span="12">
+            <!-- <el-col :span="12">
               <el-form-item label="动态修改规则" prop="dynamicUpdateCode">
                 <div style="display: flex; width: 100%">
                   <el-input
@@ -447,7 +452,7 @@
                     <el-select
                       v-model="item.inspectionCharacteristicsBaseVO.featureType"
                       placeholder="请选择特征类型"
-                      @change="changeFeatureType($event,item)"
+                      @change="changeFeatureType($event, item)"
                       :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"
                     >
                       <el-option
@@ -461,11 +466,8 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
-                <el-col :span="12"  v-if="item.inspectionCharacteristicsBaseVO.featureType == 0">
-                  <el-form-item
-                    label="计量单位"
-                    prop="inspectionCharacteristicsBaseVO.quantifyUom"
-                  >
+                <el-col :span="12" v-if="item.inspectionCharacteristicsBaseVO.featureType == 0">
+                  <el-form-item label="计量单位" prop="inspectionCharacteristicsBaseVO.quantifyUom">
                     <el-input
                       v-model="item.inspectionCharacteristicsBaseVO.quantifyUom"
                       :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"
@@ -490,7 +492,7 @@
                   >
                     <el-switch
                       v-model="item.inspectionCharacteristicsBaseVO.quantifyIsCapping"
-                      @change="changeIsCapping($event,item)"
+                      @change="changeIsCapping($event, item)"
                       :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"
                     />
                   </el-form-item>
@@ -502,24 +504,30 @@
                   >
                     <el-switch
                       v-model="item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit"
-                      @change="changeLowlimit($event,item)"
+                      @change="changeLowlimit($event, item)"
                       :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"
                     />
                   </el-form-item>
                 </el-col>
-                <el-col :span="12"  v-if="item.inspectionCharacteristicsBaseVO.featureType == 0">
+                <el-col :span="12" v-if="item.inspectionCharacteristicsBaseVO.featureType == 0">
                   <el-form-item
                     prop="inspectionCharacteristicsBaseVO.quantifyIsTarget"
                     label="是否设定目标值"
                   >
                     <el-switch
                       v-model="item.inspectionCharacteristicsBaseVO.quantifyIsTarget"
-                      @change="changeIsTarget($event,item)"
+                      @change="changeIsTarget($event, item)"
                       :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"
                     />
                   </el-form-item>
                 </el-col>
-                <el-col :span="12" v-if="item.inspectionCharacteristicsBaseVO.featureType == 0 && item.inspectionCharacteristicsBaseVO. quantifyIsCapping">
+                <el-col
+                  :span="12"
+                  v-if="
+                    item.inspectionCharacteristicsBaseVO.featureType == 0 &&
+                    item.inspectionCharacteristicsBaseVO.quantifyIsCapping
+                  "
+                >
                   <el-form-item
                     label="上限值"
                     prop="inspectionCharacteristicsBaseVO.quantifyCapping"
@@ -527,11 +535,18 @@
                     <el-input
                       v-model="item.inspectionCharacteristicsBaseVO.quantifyCapping"
                       :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"
+                      type="number"
                     />
                   </el-form-item>
                 </el-col>
-                
-                <el-col :span="12" v-if="item.inspectionCharacteristicsBaseVO.featureType == 0 && item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit">
+
+                <el-col
+                  :span="12"
+                  v-if="
+                    item.inspectionCharacteristicsBaseVO.featureType == 0 &&
+                    item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit
+                  "
+                >
                   <el-form-item
                     label="下限值"
                     prop="inspectionCharacteristicsBaseVO.quantifyLowlimit"
@@ -539,11 +554,18 @@
                     <el-input
                       v-model="item.inspectionCharacteristicsBaseVO.quantifyLowlimit"
                       :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"
+                      type="number"
                     />
                   </el-form-item>
                 </el-col>
-                
-                <el-col :span="12" v-if="item.inspectionCharacteristicsBaseVO.featureType == 0 && item.inspectionCharacteristicsBaseVO. quantifyIsTarget">
+
+                <el-col
+                  :span="12"
+                  v-if="
+                    item.inspectionCharacteristicsBaseVO.featureType == 0 &&
+                    item.inspectionCharacteristicsBaseVO.quantifyIsTarget
+                  "
+                >
                   <el-form-item
                     label="目标值"
                     prop="inspectionCharacteristicsBaseVO.quantifyTarget"
@@ -551,16 +573,15 @@
                     <el-input
                       v-model="item.inspectionCharacteristicsBaseVO.quantifyTarget"
                       :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"
+                      type="number"
                     />
                   </el-form-item>
                 </el-col>
 
-                
                 <el-col :span="12" v-if="item.inspectionCharacteristicsBaseVO.featureType == 1">
                   <el-form-item
                     label="选定集"
                     prop="inspectionCharacteristicsBaseVO.quantifyQuantifyCode"
-                    
                   >
                     <div style="display: flex; width: 100%">
                       <el-input
@@ -648,7 +669,7 @@ import * as DynamicRuleApi from '@/api/qms/dynamicRule' //动态修改规则
 import { DynamicRule } from '@/views/qms/dynamicRule/dynamicRule.data' //动态修改规则
 import * as SelectedSetApi from '@/api/qms/selectedSet' //选择集
 import { SelectedSet } from '@/views/qms/selectedSet/selectedSet.data' //选择集
-import {validateTwoNum} from '@/utils/validator'
+import { validateInteger, validateMaxNumber5, validateTwoNum } from '@/utils/validator'
 
 const message = useMessage() // 消息弹窗
 
@@ -698,7 +719,7 @@ const data = ref({
   code: '',
   itemCode: '',
   version: '',
-  inspectionType:'',
+  inspectionType: '',
   programmeTemplateCode: '',
   splitRule: '',
   aql: '',
@@ -707,9 +728,9 @@ const data = ref({
   expirationDate: '',
   available: 'TRUE',
   dynamicUpdateCode: '',
-  description:'',
-  samplePieceSize:'',
-  uom:'',
+  description: '',
+  samplePieceSize: '',
+  uom: '',
   process: []
 })
 
@@ -730,20 +751,21 @@ const rules = ref({
   programmeTemplateCode: [
     { required: true, message: '请选择检验模板', trigger: ['blur', 'change'] }
   ],
-  description: [
-    { required: true, message: '请选择描述', trigger: 'blur' }
-  ],
+  description: [{ required: true, message: '请选择描述', trigger: 'blur' }],
   // splitRule: [{ required: true, message: '请选择拆分规则', trigger: ['blur', 'change'] }],
   aql: [{ required: true, message: '请选择aql', trigger: ['blur', 'change'] }],
-  inspectionLevel: [
-    { required: true, message: '请选择检验水平', trigger: ['blur', 'change'] },
-  ],
+  inspectionLevel: [{ required: true, message: '请选择检验水平', trigger: ['blur', 'change'] }],
   samplePieceSize: [
-    { required: true, message: '请输入每份样品量', trigger: ['blur', 'change']},
-    { validator:validateTwoNum, message: '小数点后最多2位', trigger: 'blur'},
+    { required: true, message: '请输入每份样品量', trigger: ['blur', 'change'] },
+    { validator: validateTwoNum, message: '小数点后最多2位', trigger: 'blur' }
   ],
+
   effectiveDate: [{ required: true, message: '请选择生效时间', trigger: ['blur', 'change'] }],
   expirationDate: [{ required: true, message: '请选择失效时间', trigger: ['blur', 'change'] }],
+  sequenceCode: [
+    { required: true, message: '请填写顺序号', trigger: 'blur' },
+    { validator: validateInteger, message: '请输入正确的整数', trigger: 'blur' }
+  ],
   'inspectionCharacteristicsBaseVO.description': [
     { required: true, message: '请填写描述', trigger: ['blur', 'change'] }
   ],
@@ -766,7 +788,7 @@ const rules = ref({
     { required: true, message: '请输入目标值', trigger: 'blur' }
   ],
   'inspectionCharacteristicsBaseVO.quantifyCapping': [
-    { required: true, message: '请输入上限值', trigger: ['blur','change'] }
+    { required: true, message: '请输入上限值', trigger: ['blur', 'change'] }
   ],
   'inspectionCharacteristicsBaseVO.quantifyLowlimit': [
     { required: true, message: '请输入下限值', trigger: 'blur' }
@@ -775,13 +797,15 @@ const rules = ref({
     { required: true, message: '请选择计量单位', trigger: 'blur' }
   ],
   'inspectionCharacteristicsBaseVO.quantifyDecimal': [
-    { required: true, message: '请输入小数位', trigger: 'blur' }
+    { required: true, message: '请输入小数位', trigger: 'blur' },
+    { validator: validateInteger, message: '请输入正确的整数', trigger: 'blur' },
+    { validator: validateMaxNumber5, message: '不能大于5', trigger: 'blur' }
   ],
   'inspectionCharacteristicsBaseVO.quantifyQuantifyCode': [
     { required: true, message: '请输入选定集', trigger: 'blur' }
   ]
 })
-const isShowField = ref(0)//是否显示aql和检验水平字段 0隐藏 大于0显示
+const isShowField = ref(0) //是否显示aql和检验水平字段 0隐藏 大于0显示
 /** 打开弹窗 */
 let tabIndex = 1
 const open = async (type: string, row?: any, masterParmas?: any, titleName?: any) => {
@@ -792,7 +816,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
     dialogTitle.value = t('action.' + type)
   }
   formType.value = type
-  isShowField.value=0//设置isShowField == 0隐藏aql和检验水平字段
+  isShowField.value = 0 //设置isShowField == 0隐藏aql和检验水平字段
   if (row) {
     data.value = JSON.parse(JSON.stringify(row))
     let list = []
@@ -802,34 +826,37 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
       list = await InspectionProcessPageApi.getListByTempleteCode(row.programmeTemplateCode)
     }
     rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = false
-      rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = false
-      rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = false
-      list.forEach((item, index) => {
-        editableTabsValue.value = index+1
-        item.name = index + 1
-        // rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = true
-        // 编辑判断上限下限目标值是否必填
-        if (item.inspectionCharacteristicsBaseVO.featureType == 0 && item.inspectionCharacteristicsBaseVO.quantifyIsCapping) {
-          rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = true
-        } 
-        if (item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit) {
-          rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = true
-        } 
-        if (item.inspectionCharacteristicsBaseVO.quantifyIsTarget) {
-          rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = true
-        } 
-        if(item.inspectionCharacteristicsBaseVO.sampleType == 4){
-          isShowField.value+=1//设置isShowField > 0显示aql和检验水平字段
-        }
-      })
-      // 显示aql和检验水平字段的时候添加必填规则
-      if( isShowField.value>0){
-       rules.value.aql[0].required = true
-       rules.value.aql[0].required = true
-      }else{
-        rules.value.aql[0].required = false
-       rules.value.aql[0].required = false
+    rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = false
+    rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = false
+    list.forEach((item, index) => {
+      editableTabsValue.value = index + 1
+      item.name = index + 1
+      // rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = true
+      // 编辑判断上限下限目标值是否必填
+      if (
+        item.inspectionCharacteristicsBaseVO.featureType == 0 &&
+        item.inspectionCharacteristicsBaseVO.quantifyIsCapping
+      ) {
+        rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = true
       }
+      if (item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit) {
+        rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = true
+      }
+      if (item.inspectionCharacteristicsBaseVO.quantifyIsTarget) {
+        rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = true
+      }
+      if (item.inspectionCharacteristicsBaseVO.sampleType == 4) {
+        isShowField.value += 1 //设置isShowField > 0显示aql和检验水平字段
+      }
+    })
+    // 显示aql和检验水平字段的时候添加必填规则
+    if (isShowField.value > 0) {
+      rules.value.aql[0].required = true
+      rules.value.aql[0].required = true
+    } else {
+      rules.value.aql[0].required = false
+      rules.value.aql[0].required = false
+    }
     data.value.process = list
   } else {
     data.value = {
@@ -844,10 +871,10 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
       effectiveDate: '',
       expirationDate: '',
       available: 'TRUE',
-      dynamicUpdateCode:'',
-      description:"",
-      samplePieceSize:"",
-      uom:"",
+      dynamicUpdateCode: '',
+      description: '',
+      samplePieceSize: '',
+      uom: '',
       process: []
     }
   }
@@ -894,20 +921,20 @@ const buttonBaseClick1 = (val) => {
           name: newTabName,
           inspectionCode: '',
           sequenceCode: '',
-          dynamicUpdateCode:'',
+          dynamicUpdateCode: '',
           inspectionCharCode: '',
           inspectionCharacteristicsBaseVO: {
             describe: '',
             inspectionMethodCode: '',
             dynamicUpdateCode: '',
             inspectionMethod: '',
-            isCanUpdate: '',
+            isCanUpdate: true,
             isDestructionInspection: '',
             resultEntryMethod: '',
             featureType: '',
-            quantifyIsCapping: '',
-            quantifyIsLowlimit: '',
-            quantifyIsTarget: '',
+            quantifyIsCapping: false,
+            quantifyIsLowlimit: false,
+            quantifyIsTarget: false,
             quantifyTarget: '',
             quantifyCapping: '',
             quantifyLowlimit: '',
@@ -954,10 +981,29 @@ const validateForm = (formRef) => {
       return false
     })
 }
+// 判断对象数组是否有相同属性 相同：true \ 不相同：false
+const hasDuplicates = (array) => {
+  const seen = new Set()
+  const repeatCode = new Set()
+  let arr = array.map((item) => parseInt(item.sequenceCode))
+  arr.forEach((item) => {
+    if (seen.has(item)) {
+      repeatCode.add(item)
+    } else {
+      seen.add(item)
+    }
+  })
+  const arr1 = Array.from(repeatCode)
+  if (arr1.length > 0) {
+    return true
+  } else {
+    return false
+  }
+}
 
 const submitForm = async () => {
   try {
-    const aa = await getStrDictOptions(DICT_TYPE.SPLIT_RULES);//拆分规则隐藏默认给第一字典值
+    const aa = await getStrDictOptions(DICT_TYPE.SPLIT_RULES) //拆分规则隐藏默认给第一字典值
     data.value.splitRule = aa[0].value
     const validateForm1 = await validateForm(formProcessRef.value)
     await formMainRef.value.validate()
@@ -965,6 +1011,11 @@ const submitForm = async () => {
       message.error(`请添加工序`)
       return
     }
+    // debugger
+    if (hasDuplicates(data.value.process)) {
+      message.error(`检验工序顺序号不能相同`)
+      return
+    }
     const bol1 = await validateForm(formProcessRef.value)
     const bol2 = await validateForm(formFeaturesRef.value)
     if (!bol1 || !bol2) {
@@ -984,8 +1035,65 @@ const submitForm = async () => {
       message.error(`${str}是否设定上线,是否设定下限,是否是定目标值至少一项为是`)
       return
     }
+    // 检验上限值,下限值,目标值小数位数不可以大于小数位
+    console.log(data.value.process)
+    const arr1 = data.value.process.filter(
+      (item) =>
+        ((item.inspectionCharacteristicsBaseVO.quantifyIsCapping &&
+          String(item.inspectionCharacteristicsBaseVO.quantifyCapping).split('.')[1]?.length >
+            Number(item.inspectionCharacteristicsBaseVO.quantifyDecimal)) ||
+          (item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit &&
+            String(item.inspectionCharacteristicsBaseVO.quantifyLowlimit).split('.')[1]?.length >
+              Number(item.inspectionCharacteristicsBaseVO.quantifyDecimal)) ||
+          (item.inspectionCharacteristicsBaseVO.quantifyIsTarget &&
+            String(item.inspectionCharacteristicsBaseVO.quantifyTarget).split('.')[1]?.length >
+              Number(item.inspectionCharacteristicsBaseVO.quantifyDecimal))) &&
+        item.inspectionCharacteristicsBaseVO.featureType == 0
+    )
+    if (arr1 && arr1.length > 0) {
+      const str = arr1.map((item) => item.description).join(',')
+      message.error(`${str}工序上限值,下限值,目标值小数位数不可以大于小数位`)
+      return
+    }
+    // 检验上限值应大目标值大于下限值
+    const arr2 = data.value.process.filter((item) => {
+      // 上限值存在并且下限值存在时,目标值不存在，上限值应大于下限值
+      return (
+        (item.inspectionCharacteristicsBaseVO.quantifyIsCapping &&
+          item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit &&
+          !item.inspectionCharacteristicsBaseVO.quantifyIsTarget &&
+          parseFloat(item.inspectionCharacteristicsBaseVO.quantifyCapping) <=
+            parseFloat(item.inspectionCharacteristicsBaseVO.quantifyLowlimit)) ||
+        // 上限值存在并且目标值存在时，下限值不存在，上限值应大于目标值
+        (item.inspectionCharacteristicsBaseVO.quantifyIsCapping &&
+          item.inspectionCharacteristicsBaseVO.quantifyIsTarget &&
+          !item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit &&
+          parseFloat(item.inspectionCharacteristicsBaseVO.quantifyCapping) <=
+            parseFloat(item.inspectionCharacteristicsBaseVO.quantifyTarget)) ||
+        // 下限值存在并且目标值存在时，上限值不存在，下限值应小于目标值
+        (item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit &&
+          item.inspectionCharacteristicsBaseVO.quantifyIsTarget &&
+          !item.inspectionCharacteristicsBaseVO.quantifyIsCapping &&
+          parseFloat(item.inspectionCharacteristicsBaseVO.quantifyLowlimit) >=
+            parseFloat(item.inspectionCharacteristicsBaseVO.quantifyTarget)) ||
+        // 上限值，下限值，目标值都存在时，上限值应大于目标值大于下限值
+        (item.inspectionCharacteristicsBaseVO.quantifyIsCapping &&
+          item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit &&
+          item.inspectionCharacteristicsBaseVO.quantifyIsTarget &&
+          (parseFloat(item.inspectionCharacteristicsBaseVO.quantifyCapping) <=
+            parseFloat(item.inspectionCharacteristicsBaseVO.quantifyLowlimit) ||
+            parseFloat(item.inspectionCharacteristicsBaseVO.quantifyCapping) <=
+              parseFloat(item.inspectionCharacteristicsBaseVO.quantifyTarget) ||
+            parseFloat(item.inspectionCharacteristicsBaseVO.quantifyLowlimit) >=
+              parseFloat(item.inspectionCharacteristicsBaseVO.quantifyTarget)))
+      )
+    })
+    if (arr2 && arr2.length > 0) {
+      const str = arr2.map((item) => item.description).join(',')
+      message.error(`${str}工序上限值应大于目标值大于下限值`)
+      return
+    }
     if (formType.value == 'create') {
-      
       // 主子表——提交请求
       emit('submitForm', formType.value, data.value)
     } else {
@@ -1007,15 +1115,15 @@ if (props.footButttondata) {
   ]
 }
 // 选择特征类型
-const changeFeatureType = (e,item) => {
+const changeFeatureType = (e, item) => {
   item.inspectionCharacteristicsBaseVO.quantifyIsCapping = false
   item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit = false
   item.inspectionCharacteristicsBaseVO.quantifyIsTarget = false
   item.inspectionCharacteristicsBaseVO.quantifyCapping = ''
   item.inspectionCharacteristicsBaseVO.quantifyLowlimit = ''
-  item.inspectionCharacteristicsBaseVO.quantifyTarget= ''
-  item.inspectionCharacteristicsBaseVO.quantifyQuantifyCode= ''
-  item.inspectionCharacteristicsBaseVO.quantifyQuantifyName= ''
+  item.inspectionCharacteristicsBaseVO.quantifyTarget = ''
+  item.inspectionCharacteristicsBaseVO.quantifyQuantifyCode = ''
+  item.inspectionCharacteristicsBaseVO.quantifyQuantifyName = ''
   console.log(e)
   if (e) {
     rules.value['inspectionCharacteristicsBaseVO.quantifyQuantifyCode'][0].required = true
@@ -1098,7 +1206,7 @@ const opensearchTable = (
     _searchCondition
   )
 }
-const isSamplePieceSizeDisabled = ref(false)//判断每份样品朗是否可输入
+const isSamplePieceSizeDisabled = ref(false) //判断每份样品朗是否可输入
 // 弹层确定返回所选数据
 // val ： 弹层列表row 数据
 const searchTableSuccess = async (formField, searchField, val, type, row) => {
@@ -1120,17 +1228,17 @@ const searchTableSuccess = async (formField, searchField, val, type, row) => {
     if (formField == 'itemCode') {
       data.value.itemName = val[0].name
       data.value.uom = val[0].uom
-      if(data.value.uom == 'EA'){
+      if (data.value.uom == 'EA') {
         data.value.samplePieceSize = 1
         isSamplePieceSizeDisabled.value = true
-      }else{
+      } else {
         data.value.samplePieceSize = ''
         isSamplePieceSizeDisabled.value = false
       }
     } else if (formField == 'inspectionType') {
       data.value.testTypeName = val[0].description
     } else if (formField == 'programmeTemplateCode') {
-      isShowField.value=0//设置isShowField == 0隐藏aql和检验水平字段
+      isShowField.value = 0 //设置isShowField == 0隐藏aql和检验水平字段
       data.value.programmeTemplateName = val[0].description
       data.value['dynamicUpdateCode'] = val[0].dynamicUpdateCode
       data.value.dynamicUpdateName = val[0].dynamicUpdateName
@@ -1139,33 +1247,36 @@ const searchTableSuccess = async (formField, searchField, val, type, row) => {
       rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = false
       rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = false
       list.forEach((item, index) => {
-        editableTabsValue.value = index+1
+        editableTabsValue.value = index + 1
         item.name = index + 1
         // rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = true
         // 编辑判断上限下限目标值是否必填
-        if (item.inspectionCharacteristicsBaseVO.featureType == 0 && item.inspectionCharacteristicsBaseVO.quantifyIsCapping) {
+        if (
+          item.inspectionCharacteristicsBaseVO.featureType == 0 &&
+          item.inspectionCharacteristicsBaseVO.quantifyIsCapping
+        ) {
           rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = true
-        } 
+        }
         if (item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit) {
           rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = true
-        } 
+        }
         if (item.inspectionCharacteristicsBaseVO.quantifyIsTarget) {
           rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = true
-        } 
-        if(item.inspectionCharacteristicsBaseVO.sampleType == 4){
-          isShowField.value+=1//设置isShowField > 0显示aql和检验水平字段
+        }
+        if (item.inspectionCharacteristicsBaseVO.sampleType == 4) {
+          isShowField.value += 1 //设置isShowField > 0显示aql和检验水平字段
         }
       })
       // 显示aql和检验水平字段的时候添加必填规则
-      if( isShowField.value>0){
-       rules.value.aql[0].required = true
-       rules.value.aql[0].required = true
-      }else{
+      if (isShowField.value > 0) {
+        rules.value.aql[0].required = true
+        rules.value.aql[0].required = true
+      } else {
+        rules.value.aql[0].required = false
         rules.value.aql[0].required = false
-       rules.value.aql[0].required = false
       }
       data.value.process = list
-    }else if (formField == 'dynamicUpdateCode') {
+    } else if (formField == 'dynamicUpdateCode') {
       data.value[formField] = val[0].code
       data.value.dynamicUpdateName = val[0].description
     }
@@ -1174,17 +1285,16 @@ const searchTableSuccess = async (formField, searchField, val, type, row) => {
   // emit('searchTableSuccess', formField, searchField, val, formRef.value, type, row)
 }
 // 选择是否设定上限值
-const changeIsCapping = (e,item) => {
+const changeIsCapping = (e, item) => {
   item.inspectionCharacteristicsBaseVO.quantifyCapping = ''
   if (e) {
     rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = true
   } else {
     rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = false
   }
-  
 }
 // 选择是否设定下限值
-const changeLowlimit = (e,item) => {
+const changeLowlimit = (e, item) => {
   item.inspectionCharacteristicsBaseVO.quantifyLowlimit = ''
   if (e) {
     rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = true
@@ -1193,7 +1303,7 @@ const changeLowlimit = (e,item) => {
   }
 }
 // 选择是否设定目标值
-const changeIsTarget = (e,item) => {
+const changeIsTarget = (e, item) => {
   item.inspectionCharacteristicsBaseVO.quantifyTarget = ''
   if (e) {
     rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = true
diff --git a/src/views/qms/inspectionTemplate/addForm.vue b/src/views/qms/inspectionTemplate/addForm.vue
index 2affd912a..e3e983539 100644
--- a/src/views/qms/inspectionTemplate/addForm.vue
+++ b/src/views/qms/inspectionTemplate/addForm.vue
@@ -297,7 +297,8 @@
                   prop="inspectionCharacteristicsBaseVO.quantifyDecimal"
                   v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
                 >
-                  <el-input v-model="item.inspectionCharacteristicsBaseVO.quantifyDecimal" />
+                  <el-input v-model="item.inspectionCharacteristicsBaseVO.quantifyDecimal" 
+                  type="number"/>
                 </el-form-item>
               </el-col>
               <el-col :span="12" v-if="item.inspectionCharacteristicsBaseVO.featureType == 0">
@@ -822,10 +823,6 @@ const submitForm = async () => {
     console.log(data.value.process)
     const arr1 = data.value.process.filter(
       (item) =>
-    //   {
-    //    console.log(String(item.inspectionCharacteristicsBaseVO.quantifyCapping).split('.')[1]?.length)
-    //    console.log(Number(item.inspectionCharacteristicsBaseVO.quantifyDecimal))
-    // }
       ((item.inspectionCharacteristicsBaseVO.quantifyIsCapping && (String(item.inspectionCharacteristicsBaseVO.quantifyCapping).split('.')[1]?.length>Number(item.inspectionCharacteristicsBaseVO.quantifyDecimal)))||
       (item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit && (String(item.inspectionCharacteristicsBaseVO.quantifyLowlimit).split('.')[1]?.length>Number(item.inspectionCharacteristicsBaseVO.quantifyDecimal)))||
       (item.inspectionCharacteristicsBaseVO.quantifyIsTarget && (String(item.inspectionCharacteristicsBaseVO.quantifyTarget).split('.')[1]?.length>Number(item.inspectionCharacteristicsBaseVO.quantifyDecimal)))) &&

From cdca3a674f0322b7cf0ffe73334749901fa5182a Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 1 Jul 2024 16:27:53 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 8fdf5e7e3..5fa0fbd9a 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -9,7 +9,7 @@
   >
   
   <div 
-    style="overflow-y: auto;" :style="{'height':formHeight}">
+    style="overflow-y: auto;" :style="{'max-height':formHeight}">
     <Form
       ref="formRef"
       :rules="rules"