From 3def5220eb6cb2308632257587e97cbe056d0ecb Mon Sep 17 00:00:00 2001
From: songguoqiang <765017469@qq.com>
Date: Thu, 1 Aug 2024 08:37:10 +0800
Subject: [PATCH 01/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E7=A5=A8?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=AD=97=E6=AE=B5=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoiceRequestMain.data.ts                          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index 874fb4d99..8533b879d 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -1369,7 +1369,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isDetail: true,
   },
   {
-    label: '差尾',
+    label: '尾差',
     field: '',
     sortTableDefault: 6,
     isForm: false,

From 8cee8546febb94d2e42a240e8303ac0e19f20ec7 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 1 Aug 2024 09:57:01 +0800
Subject: [PATCH 02/18] =?UTF-8?q?=E7=82=B9=E5=87=BBBom=EF=BC=8C=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E4=B8=8D=E5=AF=B9=E3=80=82=E5=A6=82=E6=B3=A8=E9=87=8A?=
 =?UTF-8?q?=E6=9C=89=E9=97=AE=E9=A2=98=EF=BC=8C=E5=86=8D=E6=94=B9=E3=80=82?=
 =?UTF-8?q?bug=EF=BC=9A=E9=95=BF=E6=98=A5=E6=B5=B7=E6=8B=89=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E7=8E=AF=E5=A2=83WMS=E5=88=B6=E5=93=81=E5=AD=90?=
 =?UTF-8?q?=E4=BB=B6=E6=8A=A5=E5=BA=9F=E7=94=B3=E8=AF=B7Boom=E4=B8=AD?=
 =?UTF-8?q?=E6=89=B9=E6=AC=A1=E5=92=8C=E6=95=B0=E9=87=8F=E4=B8=8D=E5=BA=94?=
 =?UTF-8?q?=E8=AF=A5=E5=8F=AF=E7=BC=96=E8=BE=91=EF=BC=8C=E4=B8=94=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E7=94=B3=E8=AF=B7=E6=97=B6=E5=8E=BB=E6=8E=89=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E5=BF=85=E9=A1=BB=E7=82=B9Boom=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productscrapRequestMain/index.vue            | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
index 310ab5d88..c8e7673f6 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
@@ -272,15 +272,15 @@ const buttonOperationClick = async (row, label, index,isSave = false)=> {
       }
     })
     item.rowId = index
-    if(tableData.value[index].childList.length > 0) {
-      tableData.value[index].childList.forEach(itemChild => {
-        if (itemChild.itemCode == item.itemCode) {
-          item.qty = itemChild.qty
-        }
-      })
-    }else {
+    // if(tableData.value[index].childList.length > 0) {
+    //   tableData.value[index].childList.forEach(itemChild => {
+    //     if (itemChild.itemCode == item.itemCode) {
+    //       item.qty = itemChild.qty
+    //     }
+    //   })
+    // }else {
       item.qty = item.bomQty * row.qty
-    }
+    // }
     const obj = await banchBomPage(row.fromLocationCode, item)
     item.batch = obj.batch
   })

From 5a295d1c1f62f428b3452bdfaccbbbd07c6ce676 Mon Sep 17 00:00:00 2001
From: songguoqiang <765017469@qq.com>
Date: Thu, 1 Aug 2024 10:00:07 +0800
Subject: [PATCH 03/18] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8F=91=E7=A5=A8?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=B0=BE=E5=B7=AE=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoiceRequestMain.data.ts                          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index 8533b879d..bd154da96 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -1370,7 +1370,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
   },
   {
     label: '尾差',
-    field: '',
+    field: 'totalDifference',
     sortTableDefault: 6,
     isForm: false,
     isTable: false,

From fc909c0d0ced9dd2919981c5be62a288a89059ee Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 1 Aug 2024 10:37:06 +0800
Subject: [PATCH 04/18] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/inspectionRecord/addForm.vue | 1481 ++++++++++++++++++++
 src/views/qms/inspectionRecord/index.vue   |    4 +-
 2 files changed, 1484 insertions(+), 1 deletion(-)
 create mode 100644 src/views/qms/inspectionRecord/addForm.vue

diff --git a/src/views/qms/inspectionRecord/addForm.vue b/src/views/qms/inspectionRecord/addForm.vue
new file mode 100644
index 000000000..c627fede3
--- /dev/null
+++ b/src/views/qms/inspectionRecord/addForm.vue
@@ -0,0 +1,1481 @@
+<template>
+  <div>
+    <Dialog
+      :title="dialogTitle"
+      v-model="dialogVisible"
+      :width="dialogWidth"
+      :close-on-click-modal="false"
+      :vLoading="formLoading"
+    >
+      <div
+        class="box"
+        style="max-height: 80vh; overflow-y: auto; padding: 0px 20px"
+        ref="mianscroll"
+      >
+        <!-- <el-backtop :right="40" :bottom="100" target=".box" @click="topScrollClick" /> -->
+        <Form
+          ref="formMainRef"
+          :rules="rules"
+          :schema="formSchema"
+          :is-col="true"
+          @opensearchTable="opensearchTable"
+        />
+        <div ref="boxList">
+          <div class="small-title">包装列表</div>
+          <div style="border: 1px solid #dedede; margin-bottom: 20px; display: flex">
+            <TableForm
+              ref="tableFormRef"
+              style="width: 100%"
+              :maxHeight="490"
+              :tableFields="tableAllSchemas.tableFormColumns"
+              :tableFormRules="tableFormRules"
+              :tableData="data.packageList"
+              :isShowButton="false"
+              :isShowReduceButton="false"
+            />
+          </div>
+        </div>
+        
+        <el-tabs
+          v-model="editableTabsValue"
+          class="demo-tabs"
+          @edit="handleTabsEdit"
+          type="border-card"
+          tab-position="left"
+          :stretch="false"
+        >
+          <el-tab-pane
+            v-for="item in data.subList"
+            :key="item.name"
+            :label="item.processDescribe"
+            :name="item.name"
+            v-next-focus
+          >
+            <template #label>
+              <span class="custom-tabs-label" style="display: flex; align-items: center">
+                <Icon
+                  class="mr-5px"
+                  icon="ep:circle-check-filled"
+                  v-if="item.isPass === true"
+                  color="#67C23A"
+                  style="margin-top: 4px"
+                />
+                <Icon
+                  class="mr-5px"
+                  icon="ep:circle-close-filled"
+                  v-if="item.isPass === false"
+                  color="#ff0000"
+                  style="margin-top: 4px"
+                />
+                <span>{{ item.processDescribe }}</span>
+              </span>
+            </template>
+            <div class="tabs-box">
+            <div class="small-title">检验工序</div>
+            <el-form :model="item" label-width="auto" :rules="rules" ref="formProcessRef">
+              <el-row :gutter="20">
+                <el-col :span="12">
+                  <el-form-item label="编码" prop="processCode">
+                    <el-input
+                      v-model="item.processCode"
+                      placeholder="根据系统生成"
+                      :disabled="true"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="检验特性编号">
+                    <el-input
+                      v-model="item.inspectionFeatureCode"
+                      placeholder="根据系统生成"
+                      :disabled="true"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="描述" prop="processDescribe">
+                    <el-input v-model="item.processDescribe" :disabled="true" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="顺序号" prop="sequenceCode">
+                    <el-input v-model="item.sequenceCode" :disabled="true" />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+            <div class="small-title">检验特性</div>
+            <el-form :model="item" label-width="auto" :rules="rules" ref="formFeaturesRef">
+            <div>
+                <el-row :gutter="20">
+                <el-col :span="12">
+                  <el-form-item label="编码">
+                    <el-input
+                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.number"
+                      placeholder="根据系统生成"
+                      :disabled="true"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item
+                    label="描述"
+                    prop="inspectionJobCharacteristicsUpdateReqVO.description"
+                  >
+                    <el-input
+                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.description"
+                      :disabled="true"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item
+                    label="检验方法"
+                    prop="inspectionJobCharacteristicsUpdateReqVO.inspectionMethodCode"
+                  >
+                    <div style="display: flex; width: 100%">
+                      <el-input
+                        v-model="item.inspectionJobCharacteristicsUpdateReqVO.inspectionMethodName"
+                        disabled
+                        placeholder="请选择检验方法"
+                      />
+                    </div>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item
+                    label="采样过程编码"
+                    prop="inspectionJobCharacteristicsUpdateReqVO.samplingProcessCode"
+                  >
+                    <div style="display: flex; width: 100%">
+                      <el-input
+                        v-model="item.inspectionJobCharacteristicsUpdateReqVO.samplingProcessName"
+                        disabled
+                        placeholder="请选择采样过程编码"
+                      />
+                    </div>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item
+                    label="样品份数"
+                    prop="inspectionJobCharacteristicsUpdateReqVO.sampleQty"
+                  >
+                    <div style="display: flex; width: 100%">
+                      <el-input
+                        v-model="item.inspectionJobCharacteristicsUpdateReqVO.sampleQty"
+                        disabled
+                        placeholder="请输入样品份数"
+                      />
+                    </div>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="12">
+                  <el-form-item
+                    label="每份样品量"
+                    prop="inspectionJobCharacteristicsUpdateReqVO.samplePieceSize"
+                  >
+                    <div style="display: flex; width: 100%">
+                      <el-input
+                        v-model="item.inspectionJobCharacteristicsUpdateReqVO.samplePieceSize"
+                        disabled
+                        placeholder="请输入样品份数"
+                      />
+                    </div>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item
+                    label="是否允许修改特征值"
+                    prop="inspectionJobCharacteristicsUpdateReqVO.isCanUpdate"
+                  >
+                    <el-switch
+                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.isCanUpdate"
+                      disabled
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item
+                    label="结果录入方式"
+                    prop="inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod"
+                  >
+                    <el-select
+                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod"
+                      placeholder="请选择结果录入方式"
+                      @change="resultEntryMethodChange($event, item)"
+                      disabled
+                    >
+                      <el-option
+                        v-for="dict in getStrDictOptions(
+                          DICT_TYPE.INSPECTION_CHARACTERISTICS_RESULT_ENTRY
+                        )"
+                        :key="dict.value"
+                        :label="dict.label"
+                        :value="dict.value"
+                      />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item
+                    label="特征类型"
+                    prop="inspectionJobCharacteristicsUpdateReqVO.featureType"
+                  >
+                    <el-select
+                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.featureType"
+                      placeholder="请选择特征类型"
+                      @change="changeFeatureType"
+                      disabled
+                    >
+                      <el-option
+                        v-for="dict in getStrDictOptions(
+                          DICT_TYPE.INSPECTION_CHARACTERISTICS_FEATURE_TYPE
+                        )"
+                        :key="dict.value"
+                        :label="dict.label"
+                        :value="dict.value"
+                      />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+
+                <el-col
+                  :span="12"
+                  v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
+                >
+                  <el-form-item
+                    label="是否设定上限"
+                    prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
+                  >
+                    <el-switch
+                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping"
+                      :disabled="true"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col
+                  :span="12"
+                  v-if="
+                    item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 &&
+                    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping
+                  "
+                >
+                  <el-form-item
+                    label="上限值"
+                    prop="inspectionCharacteristicsBaseVO.quantifyCapping"
+                  >
+                    <el-input
+                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping"
+                      :disabled="true"
+                    />
+                  </el-form-item>
+                </el-col>
+
+                <el-col
+                  :span="12"
+                  v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
+                >
+                  <el-form-item
+                    label="是否设定下限"
+                    prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
+                  >
+                    <el-switch
+                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit"
+                      :disabled="true"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col
+                  :span="12"
+                  v-if="
+                    item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 &&
+                    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit
+                  "
+                >
+                  <el-form-item
+                    label="下限值"
+                    prop="inspectionCharacteristicsBaseVO.quantifyCapping"
+                  >
+                    <el-input
+                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit"
+                      :disabled="true"
+                    />
+                  </el-form-item>
+                </el-col>
+
+                <el-col
+                  :span="12"
+                  v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
+                >
+                  <el-form-item
+                    label="是否设定目标值"
+                    prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
+                  >
+                    <el-switch
+                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget"
+                      :disabled="true"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col
+                  :span="12"
+                  v-if="
+                    item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 &&
+                    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget
+                  "
+                >
+                  <el-form-item
+                    label="目标值"
+                    prop="inspectionCharacteristicsBaseVO.quantifyCapping"
+                  >
+                    <el-input
+                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget"
+                      :disabled="true"
+                    />
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="12">
+                  <el-form-item
+                    label="开始时间"
+                    prop="inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime"
+                  >
+                    <el-date-picker
+                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime"
+                      type="datetime"
+                      placeholder="请选择开始时间"
+                      style="width: 100%"
+                      value-format="x"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item
+                    label="结束时间"
+                    prop="inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime"
+                  >
+                    <el-date-picker
+                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime"
+                      type="datetime"
+                      placeholder="请选择结束时间"
+                      style="width: 100%"
+                      value-format="x"
+                    />
+                  </el-form-item>
+                </el-col>
+                <!-- 手动评估的时候显示 -->
+                <el-col :span="12" v-if="item.samplingProcessRespVO.evaluationMode == 1">
+                  <el-form-item
+                    label="评估代码"
+                    required
+                    prop="inspectionJobCharacteristicsUpdateReqVO.estimateCode"
+                  >
+                    <el-select
+                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.estimateCode"
+                      placeholder="请选择评估代码"
+                      @change="changeFeatureType"
+                    >
+                      <el-option
+                        v-for="dict in getStrDictOptions(DICT_TYPE.EVALUATION_CODE)"
+                        :key="dict.value"
+                        :label="dict.label"
+                        :value="dict.value"
+                      />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col
+                  :span="24"
+                  v-for="(cur, i) in item.inspectionJobCharacteristicsUpdateReqVO
+                    .recordInspectionQuantifyList"
+                  :key="i"
+                 
+                >
+                <div
+                  style="
+                    border: 1px solid #dedede;
+                    border-radius: 4px;
+                    padding-top: 16px;
+                    margin-bottom: 10px;
+                  ">
+                  <el-row :gutter="20">
+                    <!-- 汇总录入的时候显示 -->
+                    <el-col
+                      :span="12"
+                      v-if="item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1"
+                    >
+                      <el-form-item label="合格数量" required>
+                        <el-input
+                          v-model="cur.qualifiedQuantity"
+                          placeholder="请输入合格数量"
+                          type="number"
+                        />
+                      </el-form-item>
+                    </el-col>
+                    <el-col
+                      :span="12"
+                      v-if="item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1"
+                    >
+                      <el-form-item label="不合格数量" required>
+                        <el-input
+                          v-model="cur.unqualifiedQuantity"
+                          type="number"
+                          placeholder="请输入不合格数量"
+                        />
+                      </el-form-item>
+                    </el-col>
+                    <el-col
+                      :span="12"
+                      v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == '0'"
+                    >
+                      <el-form-item label="检验值" required>
+                        <el-input
+                          v-model="cur.inspectionValue"
+                          placeholder="请输入检验值"
+                          type="number"
+                          @blur="inspectionValueInput(item, cur)"
+                        />
+                      </el-form-item>
+                    </el-col>
+                    <el-col
+                      :span="12"
+                      v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == '1'"
+                    >
+                      <el-form-item label="选定集" required>
+                        <el-select
+                          v-model="cur.qualitativeCode"
+                          placeholder="请选择选定集"
+                          @change="changeQualitativeCode($event, item, cur)"
+                        >
+                          <el-option
+                            v-for="dict in item.selectedProjectRespVOList"
+                            :key="dict.dictionaryValue"
+                            :label="dict.dictionaryLabel"
+                            :value="dict.dictionaryValue"
+                          />
+                        </el-select>
+                      </el-form-item>
+                    </el-col>
+                      <el-col
+                      :span="12"
+                    >
+                      <el-form-item label="备注">
+                        <el-input
+                          v-model="cur.remark"
+                          placeholder="请输入备注"
+                          type="text" maxlength="200"
+                        />
+                      </el-form-item>
+                    </el-col>
+                    <!-- <el-col :span="12" v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == '1'" >
+                      <el-form-item label="缺陷级别" required>
+                        <el-select v-model="cur.defectLevel" placeholder="请选择缺陷级别" disabled>
+                          <el-option v-for="dict in getStrDictOptions(DICT_TYPE.DEFECT_LEVEL)" :key="dict.value" :label="dict.label" :value="dict.value" />
+                        </el-select>
+                      </el-form-item>
+                    </el-col> -->
+                  </el-row>
+                  </div>
+                </el-col>
+              </el-row>
+            </div>
+            </el-form>
+            </div>
+          </el-tab-pane>
+        </el-tabs>
+        
+      </div>
+      <template #footer>
+        <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick" />
+      </template>
+    </Dialog>
+    <Dialog
+      title="修改名称"
+      v-model="dialogVisibleName"
+      width="500px"
+      :close-on-click-modal="false"
+    >
+      <div style="padding: 0px 20px">
+        <el-form ref="nameRef" :model="nameForm">
+          <el-form-item
+            :rules="[{ required: true, message: '请输入名称', trigger: 'blur' }]"
+            prop="name"
+          >
+            <el-input v-model="nameForm.name" style="width: 240px" placeholder="请输入名称" />
+          </el-form-item>
+        </el-form>
+      </div>
+      <template #footer>
+        <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick1" />
+      </template>
+    </Dialog>
+    <SearchTable ref="searchTableRef" @searchTableSuccess="searchTableSuccess" />
+  </div>
+</template>
+<script setup lang="ts">
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { getCurrentInstance } from 'vue'
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+import * as InspectionJobDetailPageApi from '@/api/qms/inspectionJob/inspectionJobDetail'
+import { SearchTable } from '@/components/SearchTable'
+import * as InspectionJobMainApi from '@/api/qms/inspectionJob/inspectionJobMain'
+import * as InspectionJobPackageApi from '@/api/qms/inspectionJob/InspectionJobPackage/InspectionJobPackage'
+import * as InspectionRecordDetailPageApi from '@/api/qms/inspectionRecord/inspectionRecordDetail'
+
+  import * as InspectionRecordPackageApi from '@/api/qms/inspectionRecord/InspectionRecordPackage/InspectionRecordPackage'
+const { proxy } = getCurrentInstance()
+
+const message = useMessage() // 消息弹窗
+
+const props = defineProps({
+  // 显示窗口宽度设置
+  basicFormWidth: {
+    type: String,
+    default: ''
+  },
+  // 检验特性表单，列表 相关信息
+  formAllSchemasFeatures: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 检验工序表单，列表 相关信息
+  formAllSchemasProcess: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 检验模板表单，列表 相关信息
+  formAllSchemasMain: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 底部按钮集合
+  footButttondata: {
+    type: Array,
+    required: false,
+    default: null
+  },
+  // 表单，列表 相关信息
+  formAllSchemas: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 校验rules
+  rules: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 包装 列表 相关信息
+  tableAllSchemas: {
+    type: Array,
+    required: true,
+    default: null
+  },
+  tableFormRules: {
+    type: Array,
+    required: true,
+    default: null
+  }
+})
+const { t } = useI18n() // 国际化
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const dialogWidth = ref()
+const formMainRef = ref()
+const formFeaturesRef = ref()
+const formProcessRef = ref()
+const formSchema = ref(props.formAllSchemas?.formSchema)
+const tableAllSchemas = ref(props.tableAllSchemas)
+const tableFormRules = ref(props.tableFormRules)
+
+const data = ref({
+  code: '',
+  itemCode: '',
+  version: '',
+  testTypeCode: '',
+  programmeTemplateCode: '',
+  splitRule: '',
+  aql: '',
+  inspectionLevel: '',
+  effectiveDate: '',
+  expirationDate: '',
+  available: 'TRUE',
+  subList: []
+})
+
+const dialogVisibleName = ref(false)
+const nameForm = ref({
+  name: ''
+})
+const nameRef = ref()
+if (props.basicFormWidth) {
+  dialogWidth.value = props.basicFormWidth + '%'
+} else {
+  dialogWidth.value = props.isBusiness ? '60%' : '40%'
+}
+const rules = ref({
+  ...props.rules,
+  'inspectionJobCharacteristicsUpdateReqVO.description': [
+    { required: true, message: '请填写描述', trigger: ['blur', 'change'] }
+  ],
+  'inspectionJobCharacteristicsUpdateReqVO.inspectionMethodCode': [
+    { required: true, message: '请选择检验方法编码', trigger: 'blur' }
+  ],
+  'inspectionJobCharacteristicsUpdateReqVO.dynamicUpdateCode': [
+    { required: true, message: '请选择采样过程编码', trigger: ['blur', 'change'] }
+  ],
+  'inspectionJobCharacteristicsUpdateReqVO.inspectionMethod': [
+    { required: true, message: '请选择动态修改规则编码', trigger: ['blur', 'change'] }
+  ],
+  'inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod': [
+    { required: true, message: '请选择结果录入方式', trigger: ['blur', 'change'] }
+  ],
+  'inspectionJobCharacteristicsUpdateReqVO.featureType': [
+    { required: true, message: '请选择特征类型', trigger: ['blur', 'change'] }
+  ],
+  'inspectionJobCharacteristicsUpdateReqVO.quantifyTarget': [
+    { required: true, message: '请输入目标值', trigger: 'blur' }
+  ],
+  'inspectionJobCharacteristicsUpdateReqVO.quantifyCapping': [
+    { required: true, message: '请输入上限值', trigger: 'blur' }
+  ],
+  'inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit': [
+    { required: true, message: '请输入下限值', trigger: 'blur' }
+  ],
+  'inspectionJobCharacteristicsUpdateReqVO.quantifyUom': [
+    { required: true, message: '请选择计量单位', trigger: 'blur' }
+  ],
+  'inspectionJobCharacteristicsUpdateReqVO.quantifyDecimal': [
+    { required: true, message: '请输入小数位', trigger: 'blur' }
+  ],
+  'inspectionJobCharacteristicsUpdateReqVO.quantifyQuantifyCode': [
+    { required: true, message: '请选择集编码', trigger: 'change' }
+  ],
+  'inspectionJobCharacteristicsUpdateReqVO.estimateCode': [
+    { required: true, message: '请选择评估代码', trigger: 'blur' }
+  ],
+  'inspectionJobCharacteristicsUpdateReqVO.sampleQty': [
+    { required: true, message: '请输入样品份数', trigger: 'blur' }
+  ],
+  qualifiedQuantity: [{ required: true, message: '请输入选择结束时间', trigger: 'blur' }]
+})
+const allSamplePieceSize = ref(0)
+/** 打开弹窗 */
+let tabIndex = 1
+const open = async (type: string, row?: any, masterParmas?: any, titleName?: any) => {
+  if (titleName) {
+    dialogTitle.value = t('action.' + titleName)
+  } else {
+    dialogTitle.value = t('action.' + type)
+  }
+  formType.value = type
+  allSamplePieceSize.value = 0 //打开时候归0
+  if (row) {
+    data.value = JSON.parse(JSON.stringify(row))
+    //   await InspectionJobMainApi.acceptInspectionJobMain(row.id)
+    let list = []
+    const masterId =row.id
+      list = await InspectionRecordDetailPageApi.getInspectionRecordDetailList(row.id)
+    data.value.packageList = await InspectionRecordPackageApi.getInspectionRecordPackageList(masterId)
+    list.forEach((item, index) => {
+      editableTabsValue.value = 1
+      item.name = index + 1
+      item.inspectionJobCharacteristicsUpdateReqVO = item.inspectionRecordCharacteristicsRespVO
+      item.isPass = '' //判断是否显示对号错误图标
+      // 总数量值是 样品份数 乘 每份样品量
+      allSamplePieceSize.value += parseFloat(
+        (
+          parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty) *
+          parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.samplePieceSize)
+        ).toFixed(6)
+      )
+      // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
+      item.inspectionRecordCharacteristicsRespVO.recordInspectionQuantifyList = item.inspectionRecordCharacteristicsRespVO.featureType == 1 ? item.inspectionRecordCharacteristicsRespVO.qualitativeRespVOList : item.inspectionRecordCharacteristicsRespVO.quantifyRespVOList
+      if (!item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList) {
+        // 单个录入时
+        if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 2) {
+          // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
+          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = []
+          for (
+            let i = 0;
+            i < parseInt(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty);
+            i++
+          ) {
+            item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({
+              inspectionValue: '', //检验值
+              qualitativeCode: '', //定性字典项值
+              defectLevel: '', //缺陷级别
+              qualifiedQuantity: '', //合格数量
+              unqualifiedQuantity: '' //不合格数量
+            })
+          }
+        } else {
+          // 汇总录入时
+          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = []
+          rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = false
+          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({
+            inspectionValue: '', //检验值
+            qualitativeCode: '', //定性字典项值
+            defectLevel: '', //缺陷级别
+            qualifiedQuantity: parseFloat(
+              (
+                parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty) *
+                parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.samplePieceSize)
+              ).toFixed(6)
+            ), //合格数量
+            unqualifiedQuantity: '0' //不合格数量
+          })
+        }
+      }
+
+      // 编辑判断上限下限目标值是否必填
+      if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping) {
+        rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
+      } else {
+        rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = false
+      }
+      if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit) {
+        rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit'][0].required = true
+      } else {
+        rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit'][0].required = false
+      }
+      if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget) {
+        rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyTarget'][0].required = true
+      } else {
+        rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyTarget'][0].required = false
+      }
+      if (item.samplingProcessRespVO.evaluationMode == 1) {
+        rules.value['inspectionJobCharacteristicsUpdateReqVO.estimateCode'][0].required = true
+      } else {
+        rules.value['inspectionJobCharacteristicsUpdateReqVO.estimateCode'][0].required = false
+      }
+    })
+    list.forEach((item) => {
+      item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime = new Date()
+    })
+    data.value.subList = list
+    /**
+        设置采样数量，默认第一个包装采样数量<总数量，显示数量字段，第二个包装和剩下的总数量对比，以此类推，
+        第一个包装采样数量>总数量 则显示总数量
+      */
+
+    for (let i = 0; i < data.value?.packageList?.length; i++) {
+      if (data.value.packageList[i].sampleAmount == null) {
+        if (allSamplePieceSize.value > data.value.packageList[i].amount) {
+          data.value.packageList[i].sampleAmount = data.value.packageList[i].amount
+          allSamplePieceSize.value = parseFloat(
+            (allSamplePieceSize.value - data.value.packageList[i].amount).toFixed(6)
+          )
+        } else {
+          data.value.packageList[i].sampleAmount = allSamplePieceSize.value
+          allSamplePieceSize.value = 0
+          // return;
+        }
+      }
+    }
+    // data.value.packageList.forEach(item=>{
+
+    // })
+    dialogVisible.value = true
+    nextTick(() => {
+      formMainRef.value.setValues(row)
+    })
+  } else {
+    data.value = {
+      code: '',
+      itemCode: '',
+      version: '',
+      testTypeCode: '',
+      programmeTemplateCode: '',
+      splitRule: '',
+      aql: '',
+      inspectionLevel: '',
+      effectiveDate: '',
+      expirationDate: '',
+      available: 'TRUE',
+      subList: []
+    }
+  }
+  dialogVisible.value = true
+  tabIndex = data.value.subList.length + 1
+}
+defineExpose({ open, dialogVisible, formLoading }) // 提供 open 方法，用于打开弹窗
+import type { TabPaneName } from 'element-plus'
+
+const editableTabsValue = ref(1)
+// const editableTabs = ref([])
+const handleTabsEdit = (targetName: TabPaneName | undefined, action: 'remove' | 'add') => {
+  if (action === 'add') {
+    nameForm.value.name = ''
+    dialogVisibleName.value = true
+  } else if (action === 'remove') {
+    const tabs = data.value.subList
+    let activeName = editableTabsValue.value
+    if (activeName === targetName) {
+      tabs.forEach((tab, index) => {
+        if (tab.name === targetName) {
+          const nextTab = tabs[index + 1] || tabs[index - 1]
+          if (nextTab) {
+            activeName = nextTab.name
+          }
+        }
+      })
+    }
+    editableTabsValue.value = activeName
+    data.value.subList = tabs.filter((tab) => tab.name !== targetName)
+  }
+}
+/** 修改名称时间 */
+const buttonBaseClick1 = async (val) => {
+  // 保存
+  if (val == 'save') {
+    if (!nameRef.value) return
+    nameRef.value.validate((valid, fields) => {
+      if (valid) {
+        const newTabName = `${++tabIndex}`
+        data.value.subList.push({
+          description: nameForm.value.name,
+          name: newTabName,
+          inspectionCode: '',
+          sequenceCode: '',
+          inspectionCharCode: '',
+          inspectionJobCharacteristicsUpdateReqVO: {
+            describe: '',
+            inspectionMethodCode: '',
+            dynamicUpdateCode: '',
+            inspectionMethod: '',
+            isCanUpdate: '',
+            isDestructionInspection: '',
+            resultEntryMethod: '',
+            featureType: '',
+            quantifyIsCapping: '',
+            quantifyIsLowlimit: '',
+            quantifyIsTarget: '',
+            quantifyTarget: '',
+            quantifyCapping: '',
+            quantifyLowlimit: '',
+            quantifyUom: '',
+            quantifyDecimal: '',
+            quantifyQuantifyCode: ''
+          }
+        })
+
+        editableTabsValue.value = newTabName
+        dialogVisibleName.value = false
+      } else {
+        return false
+      }
+    })
+  }
+  // 关闭
+  else if (val == 'close') {
+    dialogVisibleName.value = false
+  }
+}
+const buttonBaseClick = async (val) => {
+  // 保存
+  if (val == 'save') {
+    submitForm()
+  }
+  // 关闭
+  else if (val == 'close') {
+    //  await InspectionJobMainApi.abandonInspectionJobMain(data.value.id)
+    dialogVisible.value = false
+  }
+  // 暂存
+  // else if (val == 'staging') {
+  //   staging()
+  // }
+}
+// 传递给父类
+const emit = defineEmits(['submitForm', 'searchTableSuccess'])
+const validateForm = (formRef) => {
+  let _lists = formRef?.map((v) => v.validate())
+  return Promise.all(_lists)
+    .then(() => {
+      return true
+    })
+    .catch(() => {
+      return false
+    })
+}
+const tableFormRef = ref()
+const submitForm = async () => {
+  try {
+    const elForm = unref(formMainRef)?.getElFormRef()
+    // 校验表单
+    if (!elForm) return
+    const valid = await elForm.validate()
+    if (!valid) return
+    // 校验包装列表
+    if (data.value.packageList?.length > 0) {
+      const validateForm1 = await tableFormRef.value.validateForm()
+      if (!validateForm1) return
+      let isPass = data.value.packageList.some(
+        (cur) => parseFloat(cur.sampleAmount) > parseFloat(cur.amount)
+      )
+      if (isPass) {
+        message.error(`采样数量不能大于数量`)
+        return
+      }
+
+      // let number = 0
+      // data.value.packageList.forEach(cur=>{
+      //   number += parseFloat(cur.sampleAmount)
+      // })
+      // number = number.toFixed('2')
+      // if(number != data.value.sampleTotalAmount){
+      //   message.error(`采样数量之和必须等于采样总数量`)
+      //   return
+      // }
+    }
+
+    const bol2 = await validateForm(formFeaturesRef.value)
+    if (!bol2) {
+      message.error(`模板中有检验工序和检验特性未填写完全`)
+      return
+    }
+    // 判断数组是否有未填的选项
+    let arrBol = []
+    let isOutweigh = [] //结束时间是否大于开始时间
+    let numberList = [] //判断合格数量和不合格数量之和是否等于主表数量
+    let parseFloatList = [] //判断合格数量和不合格数量是否是整数
+    data.value.subList.forEach((item, index) => {
+      if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1) {
+        arrBol.push(
+          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
+            (cur, key) => {
+              return cur.qualifiedQuantity === '' || cur.unqualifiedQuantity === ''
+            }
+          )
+        )
+      }
+      if (item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0) {
+        arrBol.push(
+          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
+            (cur, key) => {
+              return !cur.inspectionValue
+            }
+          )
+        )
+      }
+      if (item.inspectionJobCharacteristicsUpdateReqVO.featureType == 1) {
+        arrBol.push(
+          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
+            (cur, key) => {
+              return !cur.qualitativeCode
+            }
+          )
+        )
+      }
+      // 开始时间大于结束时间放入数组中
+      if (
+        item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime >
+        item.inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime
+      ) {
+        isOutweigh.push(item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime)
+      }
+      // 合格数量和不合格数量之和不能是小数
+      if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1) {
+        parseFloatList.push(
+          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
+            (cur, key) => {
+              return (
+                String(cur.qualifiedQuantity).indexOf('.') > -1 ||
+                String(cur.unqualifiedQuantity).indexOf('.') > -1
+              )
+            }
+          )
+        )
+        // 合格数量和不合格数量之和不等于总数量
+        numberList.push(
+          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
+            (cur, key) => {
+              return (
+                parseFloat(cur.qualifiedQuantity) + parseFloat(cur.unqualifiedQuantity) !=
+                parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty)
+              )
+            }
+          )
+        )
+      }
+    })
+    let isEmpty1 = arrBol.some((item) => item == true)
+    let isEmptyNumberList = numberList.some((item) => item == true)
+    let isParseFloat = parseFloatList.some((item) => item == true)
+    if (isEmpty1) {
+      message.error('检验工序和检验特性有字段未填写完全')
+      return
+    }
+    // if (isOutweigh?.length > 0) {
+    //   message.error('检验特性中有开始时间大于结束时间')
+    //   return
+    // }
+    if (isParseFloat) {
+      message.error('合格数量和不合格数量之和不可以是小数')
+      return
+    }
+    if (isEmptyNumberList) {
+      message.error('合格数量和不合格数量之和必须等于样品份数')
+      return
+    }
+    data.value.id = data.value.jobId || data.value.id
+    if (formType.value == 'create') {
+      // 主子表——提交请求
+      emit('submitForm', formType.value, data.value)
+    } else {
+      // 编辑/执行
+      emit('submitForm', formType.value, data.value)
+    }
+  } catch {}
+}
+
+const staging = async () => {
+  try {
+    const elForm = unref(formMainRef)?.getElFormRef()
+    // 校验表单
+    if (!elForm) return
+    const valid = await elForm.validate()
+    if (!valid) return
+    // 校验包装列表
+
+    if (data.value.packageList?.length > 0) {
+      const validateForm1 = await tableFormRef.value.validateForm()
+      if (!validateForm1) return
+      let isPass = data.value.packageList.some(
+        (cur) => parseFloat(cur.sampleAmount) > parseFloat(cur.amount)
+      )
+      if (isPass) {
+        message.error(`采样数量不能大于数量`)
+        return
+      }
+      // let number = 0
+      // data.value.packageList.forEach(cur=>{
+      //   number += parseFloat(cur.sampleAmount)
+      // })
+      // number = number.toFixed('2')
+      // if(number != data.value.sampleTotalAmount){
+      //   message.error(`采样数量之和必须等于采样总数量`)
+      //   return
+      // }
+    }
+
+    const bol2 = await validateForm(formFeaturesRef.value)
+    if (!bol2) {
+      message.error(`模板中有检验工序和检验特性未填写完全`)
+      return
+    }
+    // 判断数组是否有未填的选项
+    let arrBol = []
+    let isOutweigh = [] //结束时间是否大于开始时间
+    let numberList = [] //判断合格数量和不合格数量之和是否等于主表数量
+    let parseFloatList = [] //判断合格数量和不合格数量是否是整数
+    data.value.subList.forEach((item, index) => {
+      if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1) {
+        arrBol.push(
+          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
+            (cur, key) => {
+              return cur.qualifiedQuantity === '' || cur.unqualifiedQuantity === ''
+            }
+          )
+        )
+      }
+      if (item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0) {
+        arrBol.push(
+          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
+            (cur, key) => {
+              return !cur.inspectionValue
+            }
+          )
+        )
+      }
+      if (item.inspectionJobCharacteristicsUpdateReqVO.featureType == 1) {
+        arrBol.push(
+          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
+            (cur, key) => {
+              return !cur.qualitativeCode
+            }
+          )
+        )
+      }
+      // 开始时间大于结束时间放入数组中
+      if (
+        item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime >
+        item.inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime
+      ) {
+        isOutweigh.push(item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime)
+      }
+      // 合格数量和不合格数量之和不能是小数
+      if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1) {
+        parseFloatList.push(
+          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
+            (cur, key) => {
+              return (
+                String(cur.qualifiedQuantity).indexOf('.') > -1 ||
+                String(cur.unqualifiedQuantity).indexOf('.') > -1
+              )
+            }
+          )
+        )
+        // 合格数量和不合格数量之和不等于总数量
+        numberList.push(
+          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
+            (cur, key) => {
+              return (
+                parseFloat(cur.qualifiedQuantity) + parseFloat(cur.unqualifiedQuantity) !=
+                parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty)
+              )
+            }
+          )
+        )
+      }
+    })
+    let isEmpty1 = arrBol.some((item) => item == true)
+    let isEmptyNumberList = numberList.some((item) => item == true)
+    let isParseFloat = parseFloatList.some((item) => item == true)
+    if (isEmpty1) {
+      message.error('检验工序和检验特性有字段未填写完全')
+      return
+    }
+    // if (isOutweigh?.length > 0) {
+    //   message.error('检验特性中有开始时间大于结束时间')
+    //   return
+    // }
+    if (isParseFloat) {
+      message.error('合格数量和不合格数量之和不可以是小数')
+      return
+    }
+    if (isEmptyNumberList) {
+      message.error('合格数量和不合格数量之和必须等于样品份数')
+      return
+    }
+    await InspectionJobMainApi.stagingInspectionJobMain(data.value)
+    message.success('暂存成功')
+  } catch {}
+}
+
+/** 弹窗按钮 */
+let Butttondata: any = []
+if (props.footButttondata) {
+  Butttondata = props.footButttondata
+} else {
+  Butttondata = [
+    // defaultButtons.formStagingBtn(null), // 暂存
+    defaultButtons.formSaveBtn(null), // 保存
+    defaultButtons.formCloseBtn(null) // 关闭
+  ]
+}
+// 选择特征类型
+const changeFeatureType = (e) => {
+  // if (e) {
+  //   rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyQuantifyCode'][0].required = true
+  // } else {
+  //   rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyQuantifyCode'][0].required = false
+  // }
+}
+const searchTableRef = ref()
+const opensearchTable = (
+  formField,
+  searchField,
+  searchTitle,
+  searchAllSchemas,
+  searchPage,
+  searchCondition,
+  multiple,
+  type,
+  row
+) => {
+  const _searchCondition = {}
+  // 判断查询条件中，是否存在指向主表的数据
+  if (searchCondition && searchCondition.length > 0) {
+    // 转换筛选条件所需
+    let filters: any[] = []
+    for (var i = 0; i < searchCondition.length; i++) {
+      // searchCondition.forEach((item) => {
+      // 查询条件为主表某字段，需要赋值主表数据，数据来源是详情的，赋值需要从row中获取
+      if (searchCondition[i].isMainValue) {
+        _searchCondition[searchCondition[i].key] = formRef.value.formModel[searchCondition[i].value]
+          ? formRef.value.formModel[searchCondition[i].value]
+          : props.detailData
+          ? props.detailData[searchCondition[i].value]
+          : row
+          ? row[searchCondition[i].value]
+          : ''
+        // 是否含有空参数情况
+        let isNull = false
+        if (
+          _searchCondition[searchCondition[i].key] == '' ||
+          _searchCondition[searchCondition[i].key] == undefined
+        ) {
+          isNull = true
+        }
+        if (isNull) {
+          message.warning(
+            searchCondition[i].message ? searchCondition[i].message : '前置条件未选择！'
+          )
+          return
+        }
+      } else {
+        // 扩展 转换为筛选条件进行查询
+        if (searchCondition[i].isSearch) {
+          filters.push({
+            action: searchCondition[i].action,
+            column: searchCondition[i].key,
+            value: searchCondition[i].value
+          })
+        } else {
+          _searchCondition[searchCondition[i].key] = searchCondition[i].value
+        }
+      }
+    }
+    if (filters.length > 0) {
+      _searchCondition.isSearch = true
+      _searchCondition.filters = filters
+    }
+  }
+  const _searchTableTitle = searchTitle
+  const _searchTableAllSchemas = searchAllSchemas
+  const _searchTablePage = searchPage
+  searchTableRef.value.open(
+    _searchTableTitle,
+    _searchTableAllSchemas,
+    _searchTablePage,
+    formField,
+    searchField,
+    multiple,
+    type,
+    row,
+    _searchCondition
+  )
+}
+// 弹层确定返回所选数据
+// val ： 弹层列表row 数据
+const searchTableSuccess = async (formField, searchField, val, type, row) => {
+  if (type == 'features') {
+    row.inspectionJobCharacteristicsUpdateReqVO[formField] = val[0].code
+    if (formField == 'inspectionMethodCode') {
+      row.inspectionJobCharacteristicsUpdateReqVO.inspectionMethodName = val[0].description
+    } else if (formField == 'dynamicUpdateCode') {
+      row.inspectionJobCharacteristicsUpdateReqVO.dynamicUpdateName = val[0].description
+    } else if (formField == 'inspectionMethod') {
+      row.inspectionJobCharacteristicsUpdateReqVO.inspectionName = val[0].description
+    }
+  } else if (type == 'main') {
+    data.value[formField] = val[0].code
+    if (formField == 'itemCode') {
+      data.value.itemName = val[0].name
+    } else if (formField == 'testTypeCode') {
+      data.value.testTypeName = val[0].description
+    } else if (formField == 'programmeTemplateCode') {
+      data.value.programmeTemplateName = val[0].description
+    }
+    if (formField == 'programmeTemplateCode') {
+      let list = await InspectionProcessPageApi.getListByTempleteCode(val[0].code)
+      list.forEach((item, index) => {
+        editableTabsValue.value = index + 1
+        item.name = index + 1
+        // 编辑判断上限下限目标值是否必填
+        if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping) {
+          rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
+        } else {
+          rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = false
+        }
+        if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit) {
+          rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit'][0].required = true
+        } else {
+          rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit'][0].required =
+            false
+        }
+        if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget) {
+          rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyTarget'][0].required = true
+        } else {
+          rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyTarget'][0].required = false
+        }
+      })
+      data.value.subList = list
+    }
+  }
+
+  // emit('searchTableSuccess', formField, searchField, val, formRef.value, type, row)
+}
+// 请选择结果录入方式
+const resultEntryMethodChange = (e, item) => {
+  item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = []
+  if (e == 0) {
+    // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
+    for (let i = 0; i < parseInt(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty); i++) {
+      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({
+        inspectionValue: '', //检验值
+        qualitativeCode: '', //定性字典项值
+        defectLevel: '', //缺陷级别
+        qualifiedQuantity: '', //合格数量
+        unqualifiedQuantity: '' //不合格数量
+      })
+    }
+  } else {
+    // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = false
+    item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = [
+      {
+        inspectionValue: '', //检验值
+        qualitativeCode: '', //定性字典项值
+        defectLevel: '', //缺陷级别
+        qualifiedQuantity: '', //合格数量
+        unqualifiedQuantity: '' //不合格数量
+      }
+    ]
+  }
+}
+// 选择选定级
+const changeQualitativeCode = (e, item, cur) => {
+  let obj = item.selectedProjectRespVOList.find((cur) => cur.dictionaryValue == e)
+  cur.defectLevel = obj.defectLevel
+  cur.estimateCode = obj.estimateCode
+  // 显示图标
+  for (
+    let i = 0;
+    i < item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList?.length;
+    i++
+  ) {
+    item.isPass = true
+    if (
+      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].estimateCode ==
+      '2'
+    ) {
+      item.isPass = false
+      return
+    }
+  }
+}
+const mianscroll = ref()
+const boxList = ref()
+
+// const topScrollClick = () => {
+//   nextTick(() => {
+//     mianscroll.value.scrollTo({ top: boxList.value.clientHeight + 550, behavior: 'smooth' })
+//   })
+// }
+const inspectionValueInput = (item, cur) => {
+  for ( let i = 0;i < item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.length;i++) {
+    item.isPass = true
+//  如果上限值存在,下限值和目标值不存在 大于上限值显示红色图标
+  if (
+    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
+    !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
+    !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
+    item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue&&
+    parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping)
+  ) {
+    item.isPass = false
+    return
+  } 
+  // 如果下限值存在,上限值和目标值不存在 小于下限值显示红色图标
+  if (
+    !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
+    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
+    !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
+    item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue&&
+    parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit)
+  ) {
+    item.isPass = false
+    return
+  }
+  // 如果目标值存在,上限值和下限值不存在 小于目标值显示红色图标
+  if (
+    !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
+    !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
+    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
+    item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue&&
+    parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) != parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget)
+  ) {
+    item.isPass = false
+    return
+  }
+   // 如果上限值和下限值存在,目标值不存在 大于上限并且小于下限值显示红色图标
+   if (
+    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
+    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
+    !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
+    item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue&&
+   ( parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) ||
+    parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
+  ) {
+    item.isPass = false
+    return
+  }
+  // 如果上限值和目标值存在,下限值不存在 大于上限并且小于目标值显示红色图标
+  if (
+    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
+    !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
+    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
+    item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue&&
+    (parseFloat(cur.inspectionValue) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping)||
+    parseFloat(cur.inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget))
+  ) {
+    item.isPass = false
+    return
+  }
+   // 如果下限值和目标值存在,下限值不存在 大于上限并且小于目标值显示红色图标
+   if (
+    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
+    !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
+    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
+    (parseFloat(cur.inspectionValue) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget)||
+    parseFloat(cur.inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
+  ) {
+    item.isPass = false
+    return
+  }
+    // 如果上限值和下限值,目标值存在 大于上限并且小于下限值显示红色图标
+    if (
+      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
+      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
+      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
+      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue&&
+      (parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) ||
+      parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
+    ) {
+      item.isPass = false
+      return
+    }
+  }
+}
+</script>
+<style scoped>
+.small-title {
+  font-weight: bold;
+  padding: 0px 10px 10px;
+  color: #1a8bfc;
+  font-size: 16px;
+}
+.tabs-box{
+  max-height:calc(80vh - 40px) ;
+  overflow-x: hidden;
+  overflow-y: auto;
+}
+</style>
+<style>
+.el-tabs--left .el-tabs__header.is-left {
+  padding-bottom: 5000px;
+  margin-bottom: -5000px;
+  min-width: 150px !important;
+}
+
+.el-tabs--left.el-tabs--border-card .el-tabs__item.is-left {
+  min-width: 120px !important;
+}
+.el-backtop {
+  position: absolute !important;
+}
+.red .el-input__inner {
+  color: red !important;
+}
+</style>
diff --git a/src/views/qms/inspectionRecord/index.vue b/src/views/qms/inspectionRecord/index.vue
index e7de85302..864e16ff6 100644
--- a/src/views/qms/inspectionRecord/index.vue
+++ b/src/views/qms/inspectionRecord/index.vue
@@ -75,7 +75,7 @@
   import ListTable from '@/components/ListTable/src/ListTable.vue'
   import TableHead from '@/components/TableHead/src/TableHead.vue'
   import UseAddForm from './useAddForm.vue'
-  import AddForm from '../inspectionJob/addForm.vue'
+  import AddForm from './addForm.vue'
   import Detail from './detail.vue'
   import * as InspectionJobMainApi from '@/api/qms/inspectionJob/inspectionJobMain'
 
@@ -330,6 +330,7 @@ const submitFormExecute = async (formType, data) => {
   console.log(formType, data)
   data.status = '2'
   try {
+    basicFormRef.value.formLoading = true
     if (formType === 'create') {
       await InspectionJobMainApi.createInspectionJobMain(data)
       message.success(t('common.createSuccess'))
@@ -338,6 +339,7 @@ const submitFormExecute = async (formType, data) => {
       message.success(t('common.updateSuccess'))
     }
     basicFormRef.value.dialogVisible = false
+    basicFormRef.value.formLoading = false
     // 刷新当前列表
     getList()
   } finally {

From b01120730da203ef5e0a1bacc5d0a4cf489d23a1 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 1 Aug 2024 10:45:31 +0800
Subject: [PATCH 05/18] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/inspectionRecord/index.vue | 561 +++++++++++++----------
 1 file changed, 311 insertions(+), 250 deletions(-)

diff --git a/src/views/qms/inspectionRecord/index.vue b/src/views/qms/inspectionRecord/index.vue
index 864e16ff6..01685356f 100644
--- a/src/views/qms/inspectionRecord/index.vue
+++ b/src/views/qms/inspectionRecord/index.vue
@@ -1,33 +1,53 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="InspectionRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search
+      :schema="InspectionRecordMain.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
   </ContentWrap>
 
   <!-- 列表头部 -->
-  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
-    @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick"
-    :allSchemas="InspectionRecordMain.allSchemas" />
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="InspectionRecordMain.allSchemas"
+  />
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table v-clientTable :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
+    <Table
+      v-clientTable
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
         total: tableObject.total
-      }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
-      v-model:sort="tableObject.sort">
-      <template #number="{row}">
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{ row }">
         <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
           <span>{{ row.number }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase
+          :Butttondata="butttondata(row)"
+          @button-base-click="buttonTableClick($event, row)"
+        />
       </template>
     </Table>
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-    <UseAddForm
+  <UseAddForm
     ref="formRef"
     basicFormWidth="80"
     :tableAllSchemas="InspectionRecordPackage.allSchemas"
@@ -38,7 +58,7 @@
   />
 
   <!-- 新增  -->
-     <AddForm
+  <AddForm
     ref="basicFormRef"
     basicFormWidth="80"
     :formAllSchemas="InspectionRecordMain.allSchemas"
@@ -46,38 +66,56 @@
     :tableFormRules="InspectionJobPackageRules"
     :rules="InspectionTemplateRules"
     @submitForm="submitFormExecute"
-    
   />
 
-   <Detail
-    ref="detailRef" :isBasic="false" :allSchemas="InspectionRecordMain.allSchemas"
-    :detailAllSchemas="InspectionRecordDetail.allSchemas" :detailAllSchemasRules="InspectionRecordDetailRules"
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="InspectionRecordMain.allSchemas"
+    :detailAllSchemas="InspectionRecordDetail.allSchemas"
+    :detailAllSchemasRules="InspectionRecordDetailRules"
     :apiCreate="InspectionRecordDetailApi.createInspectionRecordDetail"
     :apiUpdate="InspectionRecordDetailApi.updateInspectionRecordDetail"
     :apiPage="InspectionRecordDetailApi.getInspectionRecordDetailPage"
-    :apiDelete="InspectionRecordDetailApi.deleteInspectionRecordDetail" @searchTableSuccessDetail="searchTableSuccessDetail"
-    :isShowAddBtn="false" :detailButtonIsShow="true"
-  /> 
-  <!-- 包装信息 --> 
-  <ListTable ref="listTableRef" titleName="包装信息" :allSchemas="InspectionRecordMain.allSchemas"
-    :detailAllSchemas="InspectionRecordPackage.allSchemas" :detailAllSchemasRules="InspectionRecordPackageRules"
-    :list="list"/>
+    :apiDelete="InspectionRecordDetailApi.deleteInspectionRecordDetail"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+    :isShowAddBtn="false"
+    :detailButtonIsShow="true"
+  />
+  <!-- 包装信息 -->
+  <ListTable
+    ref="listTableRef"
+    titleName="包装信息"
+    :allSchemas="InspectionRecordMain.allSchemas"
+    :detailAllSchemas="InspectionRecordPackage.allSchemas"
+    :detailAllSchemasRules="InspectionRecordPackageRules"
+    :list="list"
+  />
 </template>
 
 <script setup lang="ts">
-  import download from '@/utils/download'
-  import { InspectionRecordMain, InspectionRecordMainRules, InspectionRecordDetail, InspectionRecordDetailRules,InspectionRecordPackage, InspectionRecordPackageRules,InspectionRecordUser,InspectionRecordUserRules} from './inspectionRecordMain.data'
-  // import { InspectionJobPackage,InspectionJobPackageRules} from '../inspectionJob/inspectionJobMain.data'
-  import * as InspectionRecordPackageApi from '@/api/qms/inspectionRecord/InspectionRecordPackage/InspectionRecordPackage'
-  import * as InspectionRecordMainApi from '@/api/qms/inspectionRecord/inspectionRecordMain'
-  import * as InspectionRecordDetailApi from '@/api/qms/inspectionRecord/inspectionRecordDetail'
-  import * as defaultButtons from '@/utils/disposition/defaultButtons'
-  import ListTable from '@/components/ListTable/src/ListTable.vue'
-  import TableHead from '@/components/TableHead/src/TableHead.vue'
-  import UseAddForm from './useAddForm.vue'
-  import AddForm from './addForm.vue'
-  import Detail from './detail.vue'
-  import * as InspectionJobMainApi from '@/api/qms/inspectionJob/inspectionJobMain'
+import download from '@/utils/download'
+import {
+  InspectionRecordMain,
+  InspectionRecordMainRules,
+  InspectionRecordDetail,
+  InspectionRecordDetailRules,
+  InspectionRecordPackage,
+  InspectionRecordPackageRules,
+  InspectionRecordUser,
+  InspectionRecordUserRules
+} from './inspectionRecordMain.data'
+// import { InspectionJobPackage,InspectionJobPackageRules} from '../inspectionJob/inspectionJobMain.data'
+import * as InspectionRecordPackageApi from '@/api/qms/inspectionRecord/InspectionRecordPackage/InspectionRecordPackage'
+import * as InspectionRecordMainApi from '@/api/qms/inspectionRecord/inspectionRecordMain'
+import * as InspectionRecordDetailApi from '@/api/qms/inspectionRecord/inspectionRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import ListTable from '@/components/ListTable/src/ListTable.vue'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import UseAddForm from './useAddForm.vue'
+import AddForm from './addForm.vue'
+import Detail from './detail.vue'
+import * as InspectionJobMainApi from '@/api/qms/inspectionJob/inspectionJobMain'
 
 import {
   InspectionJobMain,
@@ -90,241 +128,255 @@ import {
 
 import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 
-  // 采购订单
-  defineOptions({ name: 'InspectionRecordMain' })
+// 采购订单
+defineOptions({ name: 'InspectionRecordMain' })
 
-  const message = useMessage() // 消息弹窗
-  const { t } = useI18n() // 国际化
-  const route = useRoute() // 路由信息
-  const routeName = ref()
-  routeName.value = route.name
-  const tableColumns = ref(InspectionRecordMain.allSchemas.tableColumns)
-  if(routeName.value=='InspectRecordMain'){
-    tableColumns.value = tableColumns.value.filter(item=>{
-      return item.label!='操作'
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(InspectionRecordMain.allSchemas.tableColumns)
+if (routeName.value == 'InspectRecordMain') {
+  tableColumns.value = tableColumns.value.filter((item) => {
+    return item.label != '操作'
+  })
+}
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  if (routeName.value == 'InspectRecordMain') {
+    tableColumns.value = val.filter((item) => {
+      return item.label != '操作'
     })
+  } else {
+    tableColumns.value = val
   }
-  // 字段设置 更新主列表字段
-  const updataTableColumns = (val) => {
-    if(routeName.value=='InspectRecordMain'){
-      tableColumns.value = val.filter(item=>{
-        return item.label!='操作'
-      })
-    }else{
-      tableColumns.value = val
-    }
-  }
-
-  
+}
 
-  // 子表新增的时候选择表格之后需要会显得字段
-  const { tableObject, tableMethods } = useTable({
-    getListApi: InspectionRecordMainApi.getInspectionRecordMainPage // 分页接口
-  })
+// 子表新增的时候选择表格之后需要会显得字段
+const { tableObject, tableMethods } = useTable({
+  getListApi: InspectionRecordMainApi.getInspectionRecordMainPage // 分页接口
+})
 
-  // 获得表格的各种操作
-  const { getList, setSearchParams } = tableMethods
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
 
-  // 列表头部按钮
-  let HeadButttondata = [
-    // defaultButtons.defaultExportBtn(null), // 导出
-    defaultButtons.defaultFreshBtn(null), // 刷新
-    defaultButtons.defaultFilterBtn(null), // 筛选
-    defaultButtons.defaultSetBtn(null), // 设置
+// 列表头部按钮
+let HeadButttondata = [
+  // defaultButtons.defaultExportBtn(null), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null) // 设置
 ]
 
-
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
-    if (val == 'add') { // 新增
-      openForm('create')
-    } else if (val == 'import') { // 导入
-      handleImport()
-    } else if (val == 'export') { // 导出
-      handleExport()
-    } else if (val == 'refresh') { // 刷新
-      getList()
-    } else if (val == 'filtrate') { // 筛选
-    } else { // 其他按钮
-      console.log('其他按钮', item)
-    }
+  if (val == 'add') {
+    // 新增
+    openForm('create')
+  } else if (val == 'import') {
+    // 导入
+    handleImport()
+  } else if (val == 'export') {
+    // 导出
+    handleExport()
+  } else if (val == 'refresh') {
+    // 刷新
+    getList()
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
+    console.log('其他按钮', item)
   }
+}
 
-  const isShowMainButton = (row, val) => {
-    if(!row.callbackRequestNumber) {//callbackRequestNumber为空是手工创建订单，不需要使用决策和发布
-      return true;
-    }
-    if(row.useDecision) {
-      return row.isPublished
-    } else {
-      return val ? true : false
-    }
+const isShowMainButton = (row, val) => {
+  if (!row.callbackRequestNumber) {
+    //callbackRequestNumber为空是手工创建订单，不需要使用决策和发布
+    return true
+  }
+  if (row.useDecision) {
+    return row.isPublished
+  } else {
+    return val ? true : false
   }
-  const isShowEditBtn = (row, val) => {
-     if (val.indexOf(row.inspectionType) > -1) {
-        return true
-      } else {
-        return row.useDecision
-      }
 }
-    const isShowPackageBtn = (row, val) => {
-     if (val.indexOf(row.inspectionType) > -1) {
-        return true
-      } else {
-        return false
-      }
+const isShowEditBtn = (row, val) => {
+  if (val.indexOf(row.inspectionType) > -1) {
+    return true
+  } else {
+    return row.useDecision
   }
-  // 列表-操作按钮
-  const butttondata = (row) => {
-    return [
-      // defaultButtons.mainListOrderCOMPLETEBtn({ hide: isShowMainButton(row, ['INCOMPLETE']) }), // 完成
-      defaultButtons.mainApplyDecisionBtn({ hide: isShowMainButton(row, null), hasPermi:'qms:inspection-recode-main:edit'}), // 使用决策
-      // defaultButtons.mainListDeleteBtn(null), // 删除
-      defaultButtons.mainListOrderPubBtn({ hide: isShowMainButton(row, 'publish'), hasPermi:'qms:inspection-recode-main:pub'}), // 发布
-      defaultButtons.mainListPackageBtn({hide: isShowPackageBtn(row,['11'])}), // 包装
-      // defaultButtons.mainListJobExeBtn({
-      // hide:row.useDecision,
-      // hasPermi: 'qms:inspection-recode-main:execute',
-      //  }), // 执行
-      defaultButtons.mainListEditBtn({ hide:isShowEditBtn(row,['11'])}), // 编辑
-    ]
+}
+const isShowPackageBtn = (row, val) => {
+  if (val.indexOf(row.inspectionType) > -1) {
+    return true
+  } else {
+    return false
   }
+}
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    // defaultButtons.mainListOrderCOMPLETEBtn({ hide: isShowMainButton(row, ['INCOMPLETE']) }), // 完成
+    defaultButtons.mainApplyDecisionBtn({
+      hide: isShowMainButton(row, null),
+      hasPermi: 'qms:inspection-recode-main:edit'
+    }), // 使用决策
+    // defaultButtons.mainListDeleteBtn(null), // 删除
+    defaultButtons.mainListOrderPubBtn({
+      hide: isShowMainButton(row, 'publish'),
+      hasPermi: 'qms:inspection-recode-main:pub'
+    }), // 发布
+    defaultButtons.mainListPackageBtn({ hide: isShowPackageBtn(row, ['11']) }), // 包装
+    // defaultButtons.mainListJobExeBtn({
+    // hide:row.useDecision,
+    // hasPermi: 'qms:inspection-recode-main:execute',
+    //  }), // 执行
+    defaultButtons.mainListEditBtn({ hide: isShowEditBtn(row, ['11']) }) // 编辑
+  ]
+}
 
-  const listTableRef = ref()
-  const list = ref([])
-  const useDecisionList =  getStrDictOptions(DICT_TYPE.USAGE_DECISION)
-  // const useDecisionList = InspectionRecordMain.allSchemas.formSchema.filter(item=>item.field == "useDecision")
-  // 列表-操作按钮事件
-  const buttonTableClick = async (val, row) => {
-    if (val == 'applyDecision') { // 编辑
-      // 评估代码值是1，接收时候，使用决策下拉列表是全部合格
-      if(row.estimateCode == 1){
-        InspectionRecordMain.allSchemas.formSchema.forEach((itemColumn) =>{
-          if(itemColumn.field == "useDecision"){
-            itemColumn.componentProps.options=useDecisionList?.filter(item=>item.value==1)
-          }
-        })
-      }else if(row.estimateCode == 2){
-        InspectionRecordMain.allSchemas.formSchema.forEach((itemColumn) =>{
-          if(itemColumn.field == "useDecision"){
-            itemColumn.componentProps.options=useDecisionList?.filter(item=>item.value!=1)
-          }
-        })
-      }
-      openUseForm('update', row)
-    }else if (val == 'mainPackage') { // 包装
-      list.value = await InspectionRecordPackageApi.getInspectionRecordPackageList(row.id)
-      list.value.forEach(item=>{
-        item.qualifiedAmount = item.qualifiedAmount ?item.qualifiedAmount :0
-        item.noQualifiedAmount = item.noQualifiedAmount ?item.noQualifiedAmount :0
-        item.destroyAmount = item.destroyAmount ?item.destroyAmount :0
-        item.frozenAmount = item.frozenAmount ?item.frozenAmount :0
+const listTableRef = ref()
+const list = ref([])
+const useDecisionList = getStrDictOptions(DICT_TYPE.USAGE_DECISION)
+// const useDecisionList = InspectionRecordMain.allSchemas.formSchema.filter(item=>item.field == "useDecision")
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'applyDecision') {
+    // 编辑
+    // 评估代码值是1，接收时候，使用决策下拉列表是全部合格
+    if (row.estimateCode == 1) {
+      InspectionRecordMain.allSchemas.formSchema.forEach((itemColumn) => {
+        if (itemColumn.field == 'useDecision') {
+          itemColumn.componentProps.options = useDecisionList?.filter((item) => item.value == 1)
+        }
+      })
+    } else if (row.estimateCode == 2) {
+      InspectionRecordMain.allSchemas.formSchema.forEach((itemColumn) => {
+        if (itemColumn.field == 'useDecision') {
+          itemColumn.componentProps.options = useDecisionList?.filter((item) => item.value != 1)
+        }
       })
-      // row.status = '1'
-      listTableRef.value.openPackage(row,'包装信息',InspectionRecordPackage.allSchemas.tableColumns)
-    }else if (val == 'delete') { // 删除
-      handleDelete(row.id)
-    }else if (val == 'mainOrderPub') { //发布
-      handleOrderPub(row)
-    }else if (val == 'edit') { //修改
-       // 执行
-    execute('execute', row)
     }
+    openUseForm('update', row)
+  } else if (val == 'mainPackage') {
+    // 包装
+    list.value = await InspectionRecordPackageApi.getInspectionRecordPackageList(row.id)
+    list.value.forEach((item) => {
+      item.qualifiedAmount = item.qualifiedAmount ? item.qualifiedAmount : 0
+      item.noQualifiedAmount = item.noQualifiedAmount ? item.noQualifiedAmount : 0
+      item.destroyAmount = item.destroyAmount ? item.destroyAmount : 0
+      item.frozenAmount = item.frozenAmount ? item.frozenAmount : 0
+    })
+    // row.status = '1'
+    listTableRef.value.openPackage(row, '包装信息', InspectionRecordPackage.allSchemas.tableColumns)
+  } else if (val == 'delete') {
+    // 删除
+    handleDelete(row.id)
+  } else if (val == 'mainOrderPub') {
+    //发布
+    handleOrderPub(row)
+  } else if (val == 'edit') {
+    //修改
+    // 执行
+    execute('execute', row)
   }
- /** 添加/修改操作 */
-  const basicFormRef = ref()
-  // const openForm = async (type : string, row ?: number) => {
-  //   tableData.value = [] // 重置明细数据
-  //   basicFormRef.value.open(type, row)
-  // }
-  /** 使用决策操作操作 */
-  const formRef = ref()
-  const openUseForm = async (type : string, row ?: number) => {
-    tableData.value = [] // 重置明细数据
-    formRef.value.open(type, row)
-  }
+}
+/** 添加/修改操作 */
+const basicFormRef = ref()
+// const openForm = async (type : string, row ?: number) => {
+//   tableData.value = [] // 重置明细数据
+//   basicFormRef.value.open(type, row)
+// }
+/** 使用决策操作操作 */
+const formRef = ref()
+const openUseForm = async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  formRef.value.open(type, row)
+}
 
-  /** 详情操作 */
-  const detailRef = ref()
-  const openDetail = (row : any, titleName : any, titleValue : any) => {
-    detailRef.value.openDetail(row, titleName, titleValue, 'basicInspectionRecordMain')
-  }
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicInspectionRecordMain')
+}
 
-  /** 删除按钮操作 */
-  const handleDelete = async (id : number) => {
-    try {
-      // 删除的二次确认
-      await message.delConfirm()
-      // 发起删除
-      await InspectionRecordMainApi.deleteInspectionRecordMain(id)
-      message.success(t('common.delSuccess'))
-      // 刷新列表
-      await getList()
-    } catch { }
-  }
-  /** 发布按钮操作 */
-  const handleOrderPub = async (row : object) => {
-    try {
-      // 删除的二次确认
-      await message.confirm(t('common.confirmPublish'))
-      // 发起删除
-      await InspectionRecordMainApi.publishInspectionRecordMain(row.id)
-      message.success(t('common.publishSuccess'))
-      // 刷新列表
-      await getList()
-    } catch { }
-  }
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await InspectionRecordMainApi.deleteInspectionRecordMain(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+/** 发布按钮操作 */
+const handleOrderPub = async (row: object) => {
+  try {
+    // 删除的二次确认
+    await message.confirm(t('common.confirmPublish'))
+    // 发起删除
+    await InspectionRecordMainApi.publishInspectionRecordMain(row.id)
+    message.success(t('common.publishSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
 
-  
 //执行
 
 const execute = async (type: string, row?: number) => {
   basicFormRef.value.open(type, row)
 }
-  /** 导出按钮操作 */
-  const exportLoading = ref(false) // 导出的加载中
-  const handleExport = async () => {
-    try {
-      // 导出的二次确认
-      await message.exportConfirm()
-      // 发起导出
-      exportLoading.value = true
-      const data = await InspectionRecordMainApi.exportInspectionRecordMain(tableObject.params)
-      download.excel(data, '备件申领记录主.xlsx')
-    } catch {
-    } finally {
-      exportLoading.value = false
-    }
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await InspectionRecordMainApi.exportInspectionRecordMain(tableObject.params)
+    download.excel(data, '备件申领记录主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
   }
+}
 
-  /**
-    * tableForm方法
-  */
-  const tableFormKeys = {}
-  InspectionRecordDetail.allSchemas.tableFormColumns.forEach(item => {
-    tableFormKeys[item.field] = item.default ? item.default : ''
-  })
-  const tableData = ref([])
+/**
+ * tableForm方法
+ */
+const tableFormKeys = {}
+InspectionRecordDetail.allSchemas.tableFormColumns.forEach((item) => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
 
 //   // 主子数据 提交
-  const submitForm = async (formType, data) => {
-    // data.subList = tableData.value // 拼接子表数据参数
-    try {
-      if (formType === 'create') {
-        await InspectionRecordMainApi.createInspectionRecordMain(data)
-        message.success(t('common.createSuccess'))
-      }else {
-        await InspectionRecordMainApi.updateInspectionRecordMain(data)
-        message.success(t('common.updateSuccess'))
-      }
-      formRef.value.dialogVisible = false
-      // 刷新当前列表
-      getList()
-    } finally {
-      formRef.value.formLoading = false
+const submitForm = async (formType, data) => {
+  // data.subList = tableData.value // 拼接子表数据参数
+  try {
+    if (formType === 'create') {
+      await InspectionRecordMainApi.createInspectionRecordMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await InspectionRecordMainApi.updateInspectionRecordMain(data)
+      message.success(t('common.updateSuccess'))
     }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
 }
-  // 执行
+// 执行
 const submitFormExecute = async (formType, data) => {
   // return
   console.log(formType, data)
@@ -345,22 +397,31 @@ const submitFormExecute = async (formType, data) => {
   } finally {
     basicFormRef.value.formLoading = false
   }
-  }
+}
 
-  // 筛选提交
-  const searchFormClick = (searchData) => {
-    tableObject.params = {
-      isSearch: true,
-      filters: searchData.filters
-    }
-    getList() // 刷新当前列表
+// 筛选提交
+const searchFormClick = (searchData) => {
+  let isHave = searchData?.filters?.some((item) => item.column == 'inspectionType')
+  if (!isHave) {
+    searchData.filters.push({
+      action: '!=',
+      column: 'inspectionType',
+      value: '11'
+    })
+  }
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
   }
+  getList() // 刷新当前列表
+}
 
-  /** 初始化 **/
+/** 初始化 **/
 onMounted(async () => {
-    tableObject.params = {
-      available: true
-    }
-    getList()
-  })
+  tableObject.params = {
+    available: true,
+    excludeInspectionType: '11'
+  }
+  getList()
+})
 </script>

From 9b11af8a5abe241388bd27616133e0592eb690df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com>
Date: Thu, 1 Aug 2024 11:12:17 +0800
Subject: [PATCH 06/18] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qms/inspectionQ1/inspectionQ1.data.ts     | 18 ++++---
 .../qms/inspectionQ2/inspectionQ2.data.ts     | 52 +++++++++++--------
 .../qms/inspectionQ3/inspectionQ3.data.ts     | 13 +++--
 3 files changed, 48 insertions(+), 35 deletions(-)

diff --git a/src/views/qms/inspectionQ1/inspectionQ1.data.ts b/src/views/qms/inspectionQ1/inspectionQ1.data.ts
index e4e396c42..39fc07837 100644
--- a/src/views/qms/inspectionQ1/inspectionQ1.data.ts
+++ b/src/views/qms/inspectionQ1/inspectionQ1.data.ts
@@ -63,8 +63,7 @@ export const Q1 = useCrudSchemas(
       field: 'customerCode',
       sort: 'custom',
       table: {
-        width: 150,
-        fixed: 'left'
+        width: 150
       },
       form: {
         // labelMessage: '信息提示说明！！！',
@@ -145,7 +144,7 @@ export const Q1 = useCrudSchemas(
       label: '数量',
       field: 'qty',
       sort: 'custom',
-      isTable: false,
+      isTable: true,
       isSearch: false,
       table: {
         width: 150
@@ -184,6 +183,9 @@ export const Q1 = useCrudSchemas(
       dictClass: 'string',
       isSearch: false,
       isTable: true,
+      table: {
+        width: 180
+      },
       tableForm: {
         type: 'Select'
       }
@@ -195,7 +197,7 @@ export const Q1 = useCrudSchemas(
       dictType: DICT_TYPE.QUALITY_NOTIFICATION_PRIORITY,
       dictClass: 'string',
       isSearch: false,
-      isTable: true,
+      isTable: false,
       tableForm: {
         type: 'Select'
       }
@@ -205,7 +207,7 @@ export const Q1 = useCrudSchemas(
       field: 'responUser',
       sort: 'custom',
       isSearch: false,
-      isForm: true,
+      isForm: false,
       form: {
         componentProps: {
           value: userStore.getUser.nickname,
@@ -232,7 +234,7 @@ export const Q1 = useCrudSchemas(
     },
 
     {
-      label: '成本中心',
+      label: '成本中心代码',
       field: 'costCode',
       sort: 'custom',
       isSearch: false,
@@ -274,7 +276,7 @@ export const Q1 = useCrudSchemas(
       dictType: DICT_TYPE.CLAIM_REASON,
       dictClass: 'string',
       isSearch: false,
-      isTable: true,
+      isTable: false,
       tableForm: {
         type: 'Select'
       }
@@ -283,7 +285,7 @@ export const Q1 = useCrudSchemas(
       label: '索赔日期',
       field: 'claimTime',
       isSearch: false,
-      isTable: false,
+      isTable: true,
       table: {
         width: 180
       },
diff --git a/src/views/qms/inspectionQ2/inspectionQ2.data.ts b/src/views/qms/inspectionQ2/inspectionQ2.data.ts
index 84f67557c..55df4ad9f 100644
--- a/src/views/qms/inspectionQ2/inspectionQ2.data.ts
+++ b/src/views/qms/inspectionQ2/inspectionQ2.data.ts
@@ -112,7 +112,7 @@ export const Q2 = useCrudSchemas(
       }
     },
     {
-      label: '供应商编码',
+      label: '供应商代码',
       field: 'supplierCode',
       sort: 'custom',
       isSearch: true,
@@ -192,6 +192,23 @@ export const Q2 = useCrudSchemas(
         }
       }
     },
+    {
+      label: '数量',
+      field: 'qty',
+      sort: 'custom',
+      isTable: true,
+      isSearch: false,
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'InputNumber',
+        componentProps: {
+          min: 0,
+          precision: 2
+        }
+      }
+    },
     {
       label: '单位',
       field: 'uom',
@@ -214,6 +231,7 @@ export const Q2 = useCrudSchemas(
       label: '采购收货单号',
       field: 'purchaseReceiptNumber',
       sort: 'custom',
+      isTable: false,
       table: {
         width: 180
       },
@@ -263,23 +281,7 @@ export const Q2 = useCrudSchemas(
       isTable: false,
       isDetail: false
     },
-    {
-      label: '数量',
-      field: 'qty',
-      sort: 'custom',
-      isTable: false,
-      isSearch: false,
-      table: {
-        width: 150
-      },
-      form: {
-        component: 'InputNumber',
-        componentProps: {
-          min: 0,
-          precision: 2
-        }
-      }
-    },
+
     {
       label: '编码',
       field: 'code',
@@ -288,6 +290,9 @@ export const Q2 = useCrudSchemas(
       dictClass: 'string',
       isSearch: false,
       isTable: true,
+      table: {
+        width: 180
+      },
       tableForm: {
         type: 'Select'
       }
@@ -300,7 +305,7 @@ export const Q2 = useCrudSchemas(
       dictType: DICT_TYPE.QUALITY_NOTIFICATION_PRIORITY,
       dictClass: 'string',
       isSearch: false,
-      isTable: true,
+      isTable: false,
       tableForm: {
         type: 'Select'
       }
@@ -311,6 +316,9 @@ export const Q2 = useCrudSchemas(
       sort: 'custom',
       isSearch: false,
       isForm: true,
+      table: {
+        width: 120
+      },
       form: {
         componentProps: {
           value: userStore.getUser.nickname,
@@ -340,7 +348,7 @@ export const Q2 = useCrudSchemas(
       field: 'costCode',
       sort: 'custom',
       isSearch: false,
-      isTable: true,
+      isTable: false,
       isForm: true,
       form: {
         // labelMessage: '信息提示说明！！！',
@@ -375,7 +383,7 @@ export const Q2 = useCrudSchemas(
     {
       label: '索赔日期',
       field: 'claimTime',
-      isForm: false,
+      isTable: true,
       table: {
         width: 180
       },
@@ -396,7 +404,7 @@ export const Q2 = useCrudSchemas(
     {
       label: '处理时间',
       field: 'handleTime',
-      isForm: false,
+      isTable: false,
       table: {
         width: 180
       },
diff --git a/src/views/qms/inspectionQ3/inspectionQ3.data.ts b/src/views/qms/inspectionQ3/inspectionQ3.data.ts
index b53a2c90b..ad671293b 100644
--- a/src/views/qms/inspectionQ3/inspectionQ3.data.ts
+++ b/src/views/qms/inspectionQ3/inspectionQ3.data.ts
@@ -173,7 +173,7 @@ export const Q3 = useCrudSchemas(
       label: '数量',
       field: 'qty',
       sort: 'custom',
-      isTable: false,
+      isTable: true,
       isSearch: false,
       table: {
         width: 150
@@ -223,7 +223,7 @@ export const Q3 = useCrudSchemas(
       dictType: DICT_TYPE.DEFECT_LOCATION,
       dictClass: 'string',
       isSearch: false,
-      isTable: true,
+      isTable: false,
       tableForm: {
         type: 'Select'
       }
@@ -235,7 +235,7 @@ export const Q3 = useCrudSchemas(
       dictType: DICT_TYPE.DEFECT_TYPE,
       dictClass: 'string',
       isSearch: false,
-      isTable: true,
+      isTable: false,
       tableForm: {
         type: 'Select'
       }
@@ -247,7 +247,7 @@ export const Q3 = useCrudSchemas(
       dictType: DICT_TYPE.PROBLEM_REASON,
       dictClass: 'string',
       isSearch: false,
-      isTable: true,
+      isTable: false,
       tableForm: {
         type: 'Select'
       }
@@ -259,7 +259,7 @@ export const Q3 = useCrudSchemas(
       dictType: DICT_TYPE.QUALITY_NOTIFICATION_PRIORITY,
       dictClass: 'string',
       isSearch: false,
-      isTable: true,
+      isTable: false,
       tableForm: {
         type: 'Select'
       }
@@ -270,6 +270,9 @@ export const Q3 = useCrudSchemas(
       sort: 'custom',
       isSearch: false,
       isForm: true,
+      table: {
+        width: 120
+      },
       form: {
         componentProps: {
           value: userStore.getUser.nickname,

From 583571f2d9b6ffbf82b1c2c9b7f1f39b54753c30 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 1 Aug 2024 11:20:38 +0800
Subject: [PATCH 07/18] =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E7=AD=96=E7=95=A5--?=
 =?UTF-8?q?=E5=A4=9A=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../strategy/upShelfStrategy/AddForm.vue      | 173 ++++++++++++++++--
 1 file changed, 162 insertions(+), 11 deletions(-)

diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
index 5630a8f98..3923999a7 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
@@ -310,7 +310,6 @@
                   v-model="warehouseType"
                   placeholder=""
                   style="width: 110px; margin-right: 10px"
-                  @change="changeWarehouse"
                 >
                   <el-option
                     :label="cur.label"
@@ -318,8 +317,57 @@
                     v-for="(cur, index) in options.warehouseTypeOptions"
                     :key="'仓库'+cur.value"
                   />
-                </el-select> 
-                <el-select 
+                </el-select>
+                <!-- <el-row class="border-row" style="flex:1;display: flex; flex-direction: row;align-items: center;">
+                  <el-tag class="mr-5px mb-5px"
+                    v-for="tag in formData.configuration.WarehouseCodes"
+                    :key="tag"
+                    closable
+                    :disable-transitions="false"
+                    @close="tagHandleClose(tag,formData.configuration.WarehouseCodes)"
+                  >
+                    {{ tag }}
+                  </el-tag> -->
+                  
+
+                  <!-- 仓库 -->
+                  <el-input style="flex:1" v-show="warehouseType == 'WarehouseCode'" placeholder="请选择仓库" v-model="formData.configuration.WarehouseCode">
+                    <template #suffix>
+                      <el-button type="text" plain style="color:var(--el-button-text-color)" @click="searchWarehouse">
+                        <Icon icon="ep:search" class="mr-5px" /> 
+                      </el-button> 
+                    </template>
+                  </el-input>
+
+                  <!-- 库区 -->
+                  <el-input style="flex:1" v-show="warehouseType == 'AreaCode'" placeholder="请选择库区" v-model="formData.configuration.AreaCode">
+                    <template #suffix>
+                      <el-button type="text" plain style="color:var(--el-button-text-color)" @click="searchWarehouse">
+                        <Icon icon="ep:search" class="mr-5px" /> 
+                      </el-button> 
+                    </template>
+                  </el-input>
+
+                  <!-- 库位组 -->
+                  <el-input style="flex:1" v-show="warehouseType == 'LocationGroupCode'" placeholder="请选择库位组" v-model="formData.configuration.LocationGroupCode">
+                    <template #suffix>
+                      <el-button type="text" plain style="color:var(--el-button-text-color)" @click="searchWarehouse">
+                        <Icon icon="ep:search" class="mr-5px" /> 
+                      </el-button> 
+                    </template>
+                  </el-input>
+
+                  <!-- 库位 -->
+                  <el-input style="flex:1" v-show="warehouseType == 'LocationCode'" placeholder="请选择库位" v-model="formData.configuration.LocationCode">
+                    <template #suffix>
+                      <el-button type="text" plain style="color:var(--el-button-text-color)" @click="searchWarehouse">
+                        <Icon icon="ep:search" class="mr-5px" /> 
+                      </el-button> 
+                    </template>
+                  </el-input>
+                <!-- </el-row> -->
+                
+                <!-- <el-select 
                   v-model="formData.configuration.WarehouseCode"
                   v-if="warehouseType == 'WarehouseCode'"
                   placeholder="请选择仓库"
@@ -335,8 +383,8 @@
                     :label="cur.code"
                     :value="cur.code"
                   />
-                </el-select>
-                <el-select
+                </el-select> -->
+                <!-- <el-select
                   v-model="formData.configuration.AreaCode"
                   v-if="warehouseType == 'AreaCode'"
                   placeholder="请选择库区"
@@ -387,7 +435,7 @@
                     :label="cur.code"
                     :value="cur.code"
                   />
-                </el-select>
+                </el-select> -->
               </el-form-item>
             </el-col>
             <!-- 优先空位库 -->
@@ -509,6 +557,10 @@
       <TableHead :HeadButttondata="Butttondata" @buttonBaseClick="buttonBaseClick" />
     </template>
   </Dialog>
+  <SearchTable
+    ref="searchTableRef"
+    @searchTableSuccess="searchTableSuccess"
+  />
 </template>
 <script setup lang="ts">
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
@@ -520,7 +572,15 @@ import { getAreaList } from '@/api/wms/areabasic'
 import { getLocationgroupList } from '@/api/wms/locationgroup'
 import { getLocationList } from '@/api/wms/location'
 import * as RuleApi from '@/api/wms/rule'
+import * as WarehouseApi from '@/api/wms/warehouse'
+import { Warehouse } from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data'
+import * as AreaApi from '@/api/wms/areabasic'
+import { Area } from '@/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data'
+import * as LocationgroupApi from '@/api/wms/locationgroup'
+import { Locationgroup } from '@/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data'
 
+import * as LocationApi from '@/api/wms/location'
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
 import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 import { isString } from '@/utils/is'
 
@@ -564,6 +624,7 @@ const formData = ref({
   configuration: {
     // 仓库代码
     WarehouseCode: '',
+    WarehouseCodes: ['Tag 1', 'Tag 2', 'Tag 3', 'Tag 2', 'Tag 3', 'Tag 2', 'Tag 3', 'Tag 2', 'Tag 3', 'Tag 2', 'Tag 3'],
     // 库区代码
     AreaCode: '',
     // 库位组代码
@@ -674,6 +735,10 @@ const buttonBaseClick = (val, item) => {
     dialogVisible.value = false
   }
 }
+
+const tagHandleClose = (tag: string, list) => {
+  list.splice(list.indexOf(tag), 1)
+}
 // 获取供应商列表
 const getFormSupplierList = async () => {
 
@@ -756,6 +821,80 @@ const filterMethodWarehouseList = (query: string) => {
     options.warehouseList = options.originWarehouseList
   }
 }
+
+
+const searchTableRef = ref()
+const searchWarehouse = ()=>{
+
+
+  if(warehouseType.value == 'WarehouseCode'){
+    // 仓库
+    searchTableRef.value.open(
+      '请选择仓库',
+      Warehouse.allSchemas,
+      WarehouseApi.getWarehousePage,
+      'WarehouseCode',
+      'code',
+      true,
+      undefined,
+      undefined,
+      undefined
+    )
+  }else if(warehouseType.value == 'AreaCode'){
+    searchTableRef.value.open(
+      '请选择库区',
+      Area.allSchemas,
+      AreaApi.getAreaPage,
+      'WarehouseCode',
+      'code',
+      true,
+      undefined,
+      undefined,
+      undefined
+    )
+
+  }else if(warehouseType.value == 'LocationGroupCode'){
+    
+    searchTableRef.value.open(
+      '请选择库位组',
+      Locationgroup.allSchemas,
+      LocationgroupApi.getLocationgroupPage,
+      'WarehouseCode',
+      'code',
+      true,
+      undefined,
+      undefined,
+      undefined
+    )
+
+  }else if(warehouseType.value == 'LocationCode'){
+    searchTableRef.value.open(
+      '请选择库位',
+      Location.allSchemas,
+      LocationApi.getLocationPage,
+      'WarehouseCode',
+      'code',
+      true,
+      undefined,
+      undefined,
+      undefined
+    )
+
+  }
+  
+}
+const searchTableSuccess = (formField, searchField, val, type, row) => {
+  // let searchTableTitle  =  warehouseType.value == 'WarehouseCode'?'请选择仓库':warehouseType.value == 'AreaCode'?'请选择库区':warehouseType.value == 'LocationGroupCode'?'请选择库位组':warehouseType.value == 'LocationCode'?'请选择库位':''
+  console.log('searchTableSuccess',formField, searchField, val, type, row)
+  console.log(val.map(item=>(item['code'])).join(','))
+  formData.value.configuration[warehouseType.value] = val.map(item=>(item['code'])).join(',')
+  let fields = ['WarehouseCode','AreaCode','LocationGroupCode','LocationCode']
+  fields.forEach(item=>{
+    if(item!=warehouseType.value){
+      formData.value.configuration[item] = ''
+    }
+  })
+}
 // 选择仓库/库位/库位组/库区
 const changeWarehouse = (e) => {
   formData.value.configuration.WarehouseCode = ''
@@ -772,6 +911,7 @@ const changeWarehouse = (e) => {
     getFormLocationList()
   }
 }
+
 /** 打开弹窗 */
 const open = async (type: string, strategyCode: string, id?: number) => {
 
@@ -780,7 +920,7 @@ const open = async (type: string, strategyCode: string, id?: number) => {
   dialogTitle.value = t('action.' + type)
   formType.value = type
   warehouseType.value = 'WarehouseCode'
-  getFormWarehouseList()
+  // getFormWarehouseList()
 
   resetForm()
   // 修改时，设置数据
@@ -817,6 +957,7 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       if (data.configuration) {
         formData.value.configuration = JSON.parse(data.configuration)
       }
+      
       // 判断是获取客户列表还是供应上列表
       if (formData.value.condition[0].ParamCode == 'SupplierCode') {
         getFormSupplierList()
@@ -829,25 +970,25 @@ const open = async (type: string, strategyCode: string, id?: number) => {
         formData.value.configuration.WarehouseCode
       ) {
         warehouseType.value = 'WarehouseCode'
-        getFormWarehouseList()
+        // getFormWarehouseList()
       } else if (
         'AreaCode' in formData.value.configuration &&
         formData.value.configuration.AreaCode
       ) {
         warehouseType.value = 'AreaCode'
-        getFormAreaList()
+        // getFormAreaList()
       } else if (
         'LocationGroupCode' in formData.value.configuration &&
         formData.value.configuration.LocationGroupCode
       ) {
         warehouseType.value = 'LocationGroupCode'
-        getFormLocationgrouList()
+        // getFormLocationgrouList()
       } else if (
         'LocationCode' in formData.value.configuration &&
         formData.value.configuration.LocationCode
       ) {
         warehouseType.value = 'LocationCode'
-        getFormLocationList()
+        // getFormLocationList()
       }
     } finally {
       formLoading.value = false
@@ -858,6 +999,7 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       defaultButtons.formCloseBtn(null) // 关闭
     ]
   }
+
   
 
 }
@@ -965,6 +1107,7 @@ const resetForm = () => {
     configuration: {
       // 仓库代码
       WarehouseCode: '',
+      // WarehouseCodes: ['Tag 1', 'Tag 2', 'Tag 3', 'Tag 2', 'Tag 3', 'Tag 2', 'Tag 3', 'Tag 2', 'Tag 3', 'Tag 2', 'Tag 3'],
       // 库区代码
       AreaCode: '',
       // 库位组代码
@@ -1036,4 +1179,12 @@ const resetForm = () => {
     color: var(--el-color-danger);
     margin-right:4px;
 }
+
+.border-row{
+  padding:5px;
+  border:var(--el-border);
+  border-radius: var(--el-border-radius-base);
+
+}
+
 </style>

From 2c54138f77e957f187b78f8b26fcf5f4645b0c41 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 1 Aug 2024 11:23:38 +0800
Subject: [PATCH 08/18] =?UTF-8?q?=E5=B0=8F=E5=8D=9A=E6=8F=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereceiptRequestMain.data.ts                        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
index 7ef563f22..c9f5aa005 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
@@ -572,8 +572,8 @@ export const PurchasereceiptRequestMainRules = reactive({
   ppNumber: [
     { required: true, message: '请输入采购订单', trigger: 'blur' }
   ],
-  supplierCode: [
-    { required: true, message: '请输入供应商代码', trigger: 'blur' }
+  poNumber: [
+    { required: true, message: '请选择采购订单号', trigger: 'blur' }
   ],
   toWarehouseCode: [
     { required: true, message: '请输入到仓库代码', trigger: 'blur' }

From 4cafcb048cfd2ad62561e2111d17c72720b835bc Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 1 Aug 2024 11:34:09 +0800
Subject: [PATCH 09/18] =?UTF-8?q?=E6=96=B0=E5=8A=A0=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=EF=BC=8C=E6=9D=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoiceRecordMain.data.ts         | 47 ++++++++++++++++---
 ...pplierinvoiceRequestMainDifference.data.ts | 47 ++++++++++++++++---
 2 files changed, 82 insertions(+), 12 deletions(-)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
index 044afb0cc..e604edbb3 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
@@ -935,8 +935,9 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
     isDetail: true,
   },
   {
-    label: '',
-    field: '',
+    label: '系统采购价格',
+    field: 'purchaseAmountTotalMain',
+    formatter: accountantFormart,
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
@@ -966,8 +967,9 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
     isDetail: true,
   },
   {
-    label: '',
-    field: '',
+    label: '总价差',
+    field: 'differencePriceTotalMain',
+    formatter: accountantFormart,
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
@@ -1062,8 +1064,8 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
     isDetail: true,
   },
   {
-    label: '差额',
-    field: '',
+    label: '尾差',
+    field: 'totalDifference',
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
@@ -1400,6 +1402,39 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
       component: 'InputNumber',
     }
   },
+  {
+    label: '合同金额',
+    field: 'contractAmountTotal',
+    table: {
+      width: 150
+    },
+    isForm:false,
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '采购金额',
+    field: 'purchaseAmontTotal',
+    table: {
+      width: 150
+    },
+    isForm:false,
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '总差额',
+    field: 'differencePriceTotal',
+    table: {
+      width: 150
+    },
+    isForm:false,
+    tableForm:{
+      disabled: true
+    }
+  },
   {
     label: '差额',
     field: 'differencePrice',
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts
index 195bd3187..ccc246623 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts
@@ -1256,8 +1256,9 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isDetail: true,
   },
   {
-    label: '',
-    field: '',
+    label: '系统采购价格',
+    field: 'purchaseAmountTotalMain',
+    formatter: accountantFormart,
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
@@ -1287,8 +1288,9 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isDetail: true,
   },
   {
-    label: '',
-    field: '',
+    label: '总价差',
+    field: 'differencePriceTotalMain',
+    formatter: accountantFormart,
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
@@ -1383,8 +1385,8 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isDetail: true,
   },
   {
-    label: '差额',
-    field: '',
+    label: '尾差',
+    field: 'totalDifference',
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
@@ -1752,6 +1754,39 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       precision: 4,
     }
   },
+  {
+    label: '合同金额',
+    field: 'contractAmountTotal',
+    table: {
+      width: 150
+    },
+    isForm:false,
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '采购金额',
+    field: 'purchaseAmontTotal',
+    table: {
+      width: 150
+    },
+    isForm:false,
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '总差额',
+    field: 'differencePriceTotal',
+    table: {
+      width: 150
+    },
+    isForm:false,
+    tableForm:{
+      disabled: true
+    }
+  },
   {
     label: '单价差额',
     field: 'differencePrice',

From dd835c1d0d878811d44f9830ac4a796be4092ed8 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 1 Aug 2024 12:03:18 +0800
Subject: [PATCH 10/18] =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereturnRequestMain/index.vue       | 22 +++++++++++++------
 .../purchasereturnRequestMain.data.ts         |  9 +++++---
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
index f058f7772..773fcfd95 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
@@ -233,9 +233,11 @@ const searchTableSuccess = async (formField, searchField, val, formRef, type, ro
     if (type == 'tableForm') {
       // 明细查询页赋值
 
-      if (formField == 'purchaseReceiptRecordNumber') {
+      if (formField == 'asnNumber') {
         row[formField] = val[0][searchField]
         //搜索记录单号--回显数据
+        row['purchaseReceiptRecordNumber'] = val[0]['number']
+        row['asnNumber'] = val[0]['asnNumber']
         row['supplierCode'] = val[0]['supplierCode']
         row['poNumber'] = val[0]['poNumber']
         row['poLine'] = val[0]['poLine']
@@ -308,18 +310,24 @@ const searchTableSuccess = async (formField, searchField, val, formRef, type, ro
       }
     } else {
       const setV = {}
-       if (formField == 'supplierCode') {
+      if (formField == 'supplierCode') {
         console.log('formModelformModel',formRef.formModel)
         if( formRef.formModel['supplierCode'] != val[0]['code']){
-          setV['purchaseReceiptRecordNumber'] = ''
+          setV['asnNumber'] = ''
           setV['q2Number'] = ''
           tableData.value = []
         }
       }
+      if (formField == 'asnNumber') {
+          if( formRef.formModel['asnNumber'] != val[0]['asnNumber']){
+            setV['q2Number'] = ''
+            tableData.value = []
+          }
+        }
       if (formField == 'q2Number') {
       setV['q2Number'] = val[0]['number']
     }
-      if (formField == 'purchaseReceiptRecordNumber') {
+      if (formField == 'asnNumber') {
         // isShowButton.value = false
         setV[formField] = val[0][searchField]
         setV['purchaseReceiptRecordNumber'] = val[0]['number']
@@ -611,7 +619,7 @@ const openForm = async (type: string, row?: number) => {
         item.componentProps.disabled = true
         item.componentProps.isSearchList = true
       }
-      if (item.field == 'purchaseReceiptRecordNumber') {
+      if (item.field == 'asnNumber') {
         item.componentProps.disabled = true
         item.componentProps.isSearchList = true
       }
@@ -623,7 +631,7 @@ const openForm = async (type: string, row?: number) => {
         item.componentProps.disabled = true
         item.componentProps.isSearchList = false
       }
-      if (item.field == 'purchaseReceiptRecordNumber') {
+      if (item.field == 'asnNumber') {
         item.componentProps.disabled = true
         item.componentProps.isSearchList = false
       }
@@ -891,7 +899,7 @@ const tableSelectionDelete = (selection) => {
     })
     nextTick(() => {
       const setV = {}
-      setV['purchaseReceiptRecordNumber'] = ''
+      setV['asnNumber'] = ''
       setV['supplierCode'] = ''
       formRef.setValues(setV)
     })
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
index 5f751f458..c20dbff8f 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
@@ -213,9 +213,12 @@ export const PurchasereturnRequestMain = useCrudSchemas(
         }
       }
     },
+    
     {
-      label: '采购收货记录单号',
-      field: 'purchaseReceiptRecordNumber',
+      // label: '采购收货记录单号',
+      // field: 'purchaseReceiptRecordNumber',
+      label: '发货单号',
+      field: 'asnNumber',
       sort: 'custom',
       table: {
         width: 180
@@ -226,7 +229,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(
           enterSearch: true,
           disabled: true,
           isSearchList: true, // 开启查询弹窗
-          searchListPlaceholder: '请选择采购收货记录单号', // 输入框占位文本
+          searchListPlaceholder: '请选择发货单号', // 输入框占位文本
           searchField: 'number', // 查询弹窗赋值字段
           searchTitle: '采购收货记录', // 查询弹窗标题
           searchAllSchemas: PurchasereceiptRecordMain1.allSchemas, // 查询弹窗所需类

From 241201e6729db4b8aa21bf138d8080bb778fa0a9 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 1 Aug 2024 13:34:15 +0800
Subject: [PATCH 11/18] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/inspectionJob/addForm.vue       | 1031 ++++++++--------
 src/views/qms/inspectionRecord/addForm.vue    | 1044 +++++++++--------
 .../qms/inspectionRecordFirst/addForm.vue     |  671 ++++++-----
 3 files changed, 1470 insertions(+), 1276 deletions(-)

diff --git a/src/views/qms/inspectionJob/addForm.vue b/src/views/qms/inspectionJob/addForm.vue
index 05f6ff589..9d381fc02 100644
--- a/src/views/qms/inspectionJob/addForm.vue
+++ b/src/views/qms/inspectionJob/addForm.vue
@@ -35,7 +35,7 @@
             />
           </div>
         </div>
-        
+
         <el-tabs
           v-model="editableTabsValue"
           class="demo-tabs"
@@ -71,421 +71,470 @@
               </span>
             </template>
             <div class="tabs-box">
-            <div class="small-title">检验工序</div>
-            <el-form :model="item" label-width="auto" :rules="rules" ref="formProcessRef">
-              <el-row :gutter="20">
-                <el-col :span="12">
-                  <el-form-item label="编码" prop="processCode">
-                    <el-input
-                      v-model="item.processCode"
-                      placeholder="根据系统生成"
-                      :disabled="true"
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="检验特性编号">
-                    <el-input
-                      v-model="item.inspectionFeatureCode"
-                      placeholder="根据系统生成"
-                      :disabled="true"
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="描述" prop="processDescribe">
-                    <el-input v-model="item.processDescribe" :disabled="true" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="顺序号" prop="sequenceCode">
-                    <el-input v-model="item.sequenceCode" :disabled="true" />
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-form>
-            <div class="small-title">检验特性</div>
-            <el-form :model="item" label-width="auto" :rules="rules" ref="formFeaturesRef">
-            <div>
-                <el-row :gutter="20">
-                <el-col :span="12">
-                  <el-form-item label="编码">
-                    <el-input
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.number"
-                      placeholder="根据系统生成"
-                      :disabled="true"
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item
-                    label="描述"
-                    prop="inspectionJobCharacteristicsUpdateReqVO.description"
-                  >
-                    <el-input
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.description"
-                      :disabled="true"
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item
-                    label="检验方法"
-                    prop="inspectionJobCharacteristicsUpdateReqVO.inspectionMethodCode"
-                  >
-                    <div style="display: flex; width: 100%">
-                      <el-input
-                        v-model="item.inspectionJobCharacteristicsUpdateReqVO.inspectionMethodName"
-                        disabled
-                        placeholder="请选择检验方法"
-                      />
-                    </div>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item
-                    label="采样过程编码"
-                    prop="inspectionJobCharacteristicsUpdateReqVO.samplingProcessCode"
-                  >
-                    <div style="display: flex; width: 100%">
-                      <el-input
-                        v-model="item.inspectionJobCharacteristicsUpdateReqVO.samplingProcessName"
-                        disabled
-                        placeholder="请选择采样过程编码"
-                      />
-                    </div>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item
-                    label="样品份数"
-                    prop="inspectionJobCharacteristicsUpdateReqVO.sampleQty"
-                  >
-                    <div style="display: flex; width: 100%">
-                      <el-input
-                        v-model="item.inspectionJobCharacteristicsUpdateReqVO.sampleQty"
-                        disabled
-                        placeholder="请输入样品份数"
-                      />
-                    </div>
-                  </el-form-item>
-                </el-col>
+              <el-collapse accordion>
+                <el-collapse-item name="1">
+                  <template #title>
+                    <div class="small-title">检验工序</div>
+                  </template>
+                  <el-form :model="item" label-width="auto" :rules="rules" ref="formProcessRef">
+                    <el-row :gutter="20">
+                      <el-col :span="12">
+                        <el-form-item label="编码" prop="processCode">
+                          <el-input
+                            v-model="item.processCode"
+                            placeholder="根据系统生成"
+                            :disabled="true"
+                          />
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="12">
+                        <el-form-item label="检验特性编号">
+                          <el-input
+                            v-model="item.inspectionFeatureCode"
+                            placeholder="根据系统生成"
+                            :disabled="true"
+                          />
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="12">
+                        <el-form-item label="描述" prop="processDescribe">
+                          <el-input v-model="item.processDescribe" :disabled="true" />
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="12">
+                        <el-form-item label="顺序号" prop="sequenceCode">
+                          <el-input v-model="item.sequenceCode" :disabled="true" />
+                        </el-form-item>
+                      </el-col>
+                    </el-row>
+                  </el-form>
+                </el-collapse-item>
+                <el-collapse-item name="2">
+                  <template #title>
+                    <div class="small-title">检验特性</div>
+                  </template>
+                  <el-form :model="item" label-width="auto" :rules="rules" ref="formFeaturesRef">
+                    <div>
+                      <el-row :gutter="20">
+                        <el-col :span="12">
+                          <el-form-item label="编码">
+                            <el-input
+                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.number"
+                              placeholder="根据系统生成"
+                              :disabled="true"
+                            />
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item
+                            label="描述"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.description"
+                          >
+                            <el-input
+                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.description"
+                              :disabled="true"
+                            />
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item
+                            label="检验方法"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.inspectionMethodCode"
+                          >
+                            <div style="display: flex; width: 100%">
+                              <el-input
+                                v-model="
+                                  item.inspectionJobCharacteristicsUpdateReqVO.inspectionMethodName
+                                "
+                                disabled
+                                placeholder="请选择检验方法"
+                              />
+                            </div>
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item
+                            label="采样过程编码"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.samplingProcessCode"
+                          >
+                            <div style="display: flex; width: 100%">
+                              <el-input
+                                v-model="
+                                  item.inspectionJobCharacteristicsUpdateReqVO.samplingProcessName
+                                "
+                                disabled
+                                placeholder="请选择采样过程编码"
+                              />
+                            </div>
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item
+                            label="样品份数"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.sampleQty"
+                          >
+                            <div style="display: flex; width: 100%">
+                              <el-input
+                                v-model="item.inspectionJobCharacteristicsUpdateReqVO.sampleQty"
+                                disabled
+                                placeholder="请输入样品份数"
+                              />
+                            </div>
+                          </el-form-item>
+                        </el-col>
 
-                <el-col :span="12">
-                  <el-form-item
-                    label="每份样品量"
-                    prop="inspectionJobCharacteristicsUpdateReqVO.samplePieceSize"
-                  >
-                    <div style="display: flex; width: 100%">
-                      <el-input
-                        v-model="item.inspectionJobCharacteristicsUpdateReqVO.samplePieceSize"
-                        disabled
-                        placeholder="请输入样品份数"
-                      />
-                    </div>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item
-                    label="是否允许修改特征值"
-                    prop="inspectionJobCharacteristicsUpdateReqVO.isCanUpdate"
-                  >
-                    <el-switch
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.isCanUpdate"
-                      disabled
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item
-                    label="结果录入方式"
-                    prop="inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod"
-                  >
-                    <el-select
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod"
-                      placeholder="请选择结果录入方式"
-                      @change="resultEntryMethodChange($event, item)"
-                      disabled
-                    >
-                      <el-option
-                        v-for="dict in getStrDictOptions(
-                          DICT_TYPE.INSPECTION_CHARACTERISTICS_RESULT_ENTRY
-                        )"
-                        :key="dict.value"
-                        :label="dict.label"
-                        :value="dict.value"
-                      />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item
-                    label="特征类型"
-                    prop="inspectionJobCharacteristicsUpdateReqVO.featureType"
-                  >
-                    <el-select
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.featureType"
-                      placeholder="请选择特征类型"
-                      @change="changeFeatureType"
-                      disabled
-                    >
-                      <el-option
-                        v-for="dict in getStrDictOptions(
-                          DICT_TYPE.INSPECTION_CHARACTERISTICS_FEATURE_TYPE
-                        )"
-                        :key="dict.value"
-                        :label="dict.label"
-                        :value="dict.value"
-                      />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
+                        <el-col :span="12">
+                          <el-form-item
+                            label="每份样品量"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.samplePieceSize"
+                          >
+                            <div style="display: flex; width: 100%">
+                              <el-input
+                                v-model="
+                                  item.inspectionJobCharacteristicsUpdateReqVO.samplePieceSize
+                                "
+                                disabled
+                                placeholder="请输入样品份数"
+                              />
+                            </div>
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item
+                            label="是否允许修改特征值"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.isCanUpdate"
+                          >
+                            <el-switch
+                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.isCanUpdate"
+                              disabled
+                            />
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item
+                            label="结果录入方式"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod"
+                          >
+                            <el-select
+                              v-model="
+                                item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod
+                              "
+                              placeholder="请选择结果录入方式"
+                              @change="resultEntryMethodChange($event, item)"
+                              disabled
+                            >
+                              <el-option
+                                v-for="dict in getStrDictOptions(
+                                  DICT_TYPE.INSPECTION_CHARACTERISTICS_RESULT_ENTRY
+                                )"
+                                :key="dict.value"
+                                :label="dict.label"
+                                :value="dict.value"
+                              />
+                            </el-select>
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item
+                            label="特征类型"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.featureType"
+                          >
+                            <el-select
+                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.featureType"
+                              placeholder="请选择特征类型"
+                              @change="changeFeatureType"
+                              disabled
+                            >
+                              <el-option
+                                v-for="dict in getStrDictOptions(
+                                  DICT_TYPE.INSPECTION_CHARACTERISTICS_FEATURE_TYPE
+                                )"
+                                :key="dict.value"
+                                :label="dict.label"
+                                :value="dict.value"
+                              />
+                            </el-select>
+                          </el-form-item>
+                        </el-col>
 
-                <el-col
-                  :span="12"
-                  v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
-                >
-                  <el-form-item
-                    label="是否设定上限"
-                    prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
-                  >
-                    <el-switch
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping"
-                      :disabled="true"
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col
-                  :span="12"
-                  v-if="
-                    item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 &&
-                    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping
-                  "
-                >
-                  <el-form-item
-                    label="上限值"
-                    prop="inspectionCharacteristicsBaseVO.quantifyCapping"
-                  >
-                    <el-input
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping"
-                      :disabled="true"
-                    />
-                  </el-form-item>
-                </el-col>
+                        <el-col
+                          :span="12"
+                          v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
+                        >
+                          <el-form-item
+                            label="是否设定上限"
+                            prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
+                          >
+                            <el-switch
+                              v-model="
+                                item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping
+                              "
+                              :disabled="true"
+                            />
+                          </el-form-item>
+                        </el-col>
+                        <el-col
+                          :span="12"
+                          v-if="
+                            item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 &&
+                            item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping
+                          "
+                        >
+                          <el-form-item
+                            label="上限值"
+                            prop="inspectionCharacteristicsBaseVO.quantifyCapping"
+                          >
+                            <el-input
+                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping"
+                              :disabled="true"
+                            />
+                          </el-form-item>
+                        </el-col>
 
-                <el-col
-                  :span="12"
-                  v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
-                >
-                  <el-form-item
-                    label="是否设定下限"
-                    prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
-                  >
-                    <el-switch
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit"
-                      :disabled="true"
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col
-                  :span="12"
-                  v-if="
-                    item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 &&
-                    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit
-                  "
-                >
-                  <el-form-item
-                    label="下限值"
-                    prop="inspectionCharacteristicsBaseVO.quantifyCapping"
-                  >
-                    <el-input
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit"
-                      :disabled="true"
-                    />
-                  </el-form-item>
-                </el-col>
+                        <el-col
+                          :span="12"
+                          v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
+                        >
+                          <el-form-item
+                            label="是否设定下限"
+                            prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
+                          >
+                            <el-switch
+                              v-model="
+                                item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit
+                              "
+                              :disabled="true"
+                            />
+                          </el-form-item>
+                        </el-col>
+                        <el-col
+                          :span="12"
+                          v-if="
+                            item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 &&
+                            item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit
+                          "
+                        >
+                          <el-form-item
+                            label="下限值"
+                            prop="inspectionCharacteristicsBaseVO.quantifyCapping"
+                          >
+                            <el-input
+                              v-model="
+                                item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit
+                              "
+                              :disabled="true"
+                            />
+                          </el-form-item>
+                        </el-col>
 
-                <el-col
-                  :span="12"
-                  v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
-                >
-                  <el-form-item
-                    label="是否设定目标值"
-                    prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
-                  >
-                    <el-switch
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget"
-                      :disabled="true"
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col
-                  :span="12"
-                  v-if="
-                    item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 &&
-                    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget
-                  "
-                >
-                  <el-form-item
-                    label="目标值"
-                    prop="inspectionCharacteristicsBaseVO.quantifyCapping"
-                  >
-                    <el-input
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget"
-                      :disabled="true"
-                    />
-                  </el-form-item>
-                </el-col>
+                        <el-col
+                          :span="12"
+                          v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
+                        >
+                          <el-form-item
+                            label="是否设定目标值"
+                            prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
+                          >
+                            <el-switch
+                              v-model="
+                                item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget
+                              "
+                              :disabled="true"
+                            />
+                          </el-form-item>
+                        </el-col>
+                        <el-col
+                          :span="12"
+                          v-if="
+                            item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 &&
+                            item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget
+                          "
+                        >
+                          <el-form-item
+                            label="目标值"
+                            prop="inspectionCharacteristicsBaseVO.quantifyCapping"
+                          >
+                            <el-input
+                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget"
+                              :disabled="true"
+                            />
+                          </el-form-item>
+                        </el-col>
 
-                <el-col :span="12">
-                  <el-form-item
-                    label="开始时间"
-                    prop="inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime"
-                  >
-                    <el-date-picker
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime"
-                      type="datetime"
-                      placeholder="请选择开始时间"
-                      style="width: 100%"
-                      value-format="x"
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item
-                    label="结束时间"
-                    prop="inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime"
-                  >
-                    <el-date-picker
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime"
-                      type="datetime"
-                      placeholder="请选择结束时间"
-                      style="width: 100%"
-                      value-format="x"
-                    />
-                  </el-form-item>
-                </el-col>
-                <!-- 手动评估的时候显示 -->
-                <el-col :span="12" v-if="item.samplingProcessRespVO.evaluationMode == 1">
-                  <el-form-item
-                    label="评估代码"
-                    required
-                    prop="inspectionJobCharacteristicsUpdateReqVO.estimateCode"
-                  >
-                    <el-select
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.estimateCode"
-                      placeholder="请选择评估代码"
-                      @change="changeFeatureType"
-                    >
-                      <el-option
-                        v-for="dict in getStrDictOptions(DICT_TYPE.EVALUATION_CODE)"
-                        :key="dict.value"
-                        :label="dict.label"
-                        :value="dict.value"
-                      />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col
-                  :span="24"
-                  v-for="(cur, i) in item.inspectionJobCharacteristicsUpdateReqVO
-                    .recordInspectionQuantifyList"
-                  :key="i"
-                 
-                >
-                <div
-                  style="
-                    border: 1px solid #dedede;
-                    border-radius: 4px;
-                    padding-top: 16px;
-                    margin-bottom: 10px;
-                  ">
-                  <el-row :gutter="20">
-                    <!-- 汇总录入的时候显示 -->
-                    <el-col
-                      :span="12"
-                      v-if="item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1"
-                    >
-                      <el-form-item label="合格数量" required>
-                        <el-input
-                          v-model="cur.qualifiedQuantity"
-                          placeholder="请输入合格数量"
-                          type="number"
-                        />
-                      </el-form-item>
-                    </el-col>
-                    <el-col
-                      :span="12"
-                      v-if="item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1"
-                    >
-                      <el-form-item label="不合格数量" required>
-                        <el-input
-                          v-model="cur.unqualifiedQuantity"
-                          type="number"
-                          placeholder="请输入不合格数量"
-                        />
-                      </el-form-item>
-                    </el-col>
-                    <el-col
-                      :span="12"
-                      v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == '0'"
-                    >
-                      <el-form-item label="检验值" required>
-                        <el-input
-                          v-model="cur.inspectionValue"
-                          placeholder="请输入检验值"
-                          type="number"
-                          @blur="inspectionValueInput(item, cur)"
-                        />
-                      </el-form-item>
-                    </el-col>
-                    <el-col
-                      :span="12"
-                      v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == '1'"
-                    >
-                      <el-form-item label="选定集" required>
-                        <el-select
-                          v-model="cur.qualitativeCode"
-                          placeholder="请选择选定集"
-                          @change="changeQualitativeCode($event, item, cur)"
+                        <el-col :span="12">
+                          <el-form-item
+                            label="开始时间"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime"
+                          >
+                            <el-date-picker
+                              v-model="
+                                item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime
+                              "
+                              type="datetime"
+                              placeholder="请选择开始时间"
+                              style="width: 100%"
+                              value-format="x"
+                            />
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item
+                            label="结束时间"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime"
+                          >
+                            <el-date-picker
+                              v-model="
+                                item.inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime
+                              "
+                              type="datetime"
+                              placeholder="请选择结束时间"
+                              style="width: 100%"
+                              value-format="x"
+                            />
+                          </el-form-item>
+                        </el-col>
+                        <!-- 手动评估的时候显示 -->
+                        <el-col :span="12" v-if="item.samplingProcessRespVO.evaluationMode == 1">
+                          <el-form-item
+                            label="评估代码"
+                            required
+                            prop="inspectionJobCharacteristicsUpdateReqVO.estimateCode"
+                          >
+                            <el-select
+                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.estimateCode"
+                              placeholder="请选择评估代码"
+                              @change="changeFeatureType"
+                            >
+                              <el-option
+                                v-for="dict in getStrDictOptions(DICT_TYPE.EVALUATION_CODE)"
+                                :key="dict.value"
+                                :label="dict.label"
+                                :value="dict.value"
+                              />
+                            </el-select>
+                          </el-form-item>
+                        </el-col>
+                      </el-row>
+                    </div>
+                  </el-form>
+                </el-collapse-item>
+                <el-collapse-item name="3">
+                  <template #title>
+                    <div class="small-title">检验结果</div>
+                  </template>
+                  <el-form :model="item" label-width="auto" :rules="rules" ref="formFeaturesRef">
+                    <div>
+                      <el-row :gutter="20">
+                        <el-col
+                          :span="24"
+                          v-for="(cur, i) in item.inspectionJobCharacteristicsUpdateReqVO
+                            .recordInspectionQuantifyList"
+                          :key="i"
                         >
-                          <el-option
-                            v-for="dict in item.selectedProjectRespVOList"
-                            :key="dict.dictionaryValue"
-                            :label="dict.dictionaryLabel"
-                            :value="dict.dictionaryValue"
-                          />
-                        </el-select>
-                      </el-form-item>
-                    </el-col>
-                      <el-col
-                      :span="12"
-                    >
-                      <el-form-item label="备注">
-                        <el-input
-                          v-model="cur.remark"
-                          placeholder="请输入备注"
-                          type="text" maxlength="200"
-                        />
-                      </el-form-item>
-                    </el-col>
-                    <!-- <el-col :span="12" v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == '1'" >
+                          <div
+                            style="
+                              border: 1px solid #dedede;
+                              border-radius: 4px;
+                              padding-top: 16px;
+                              margin-bottom: 10px;
+                            "
+                          >
+                            <el-row :gutter="20">
+                              <!-- 汇总录入的时候显示 -->
+                              <el-col
+                                :span="12"
+                                v-if="
+                                  item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod ==
+                                  1
+                                "
+                              >
+                                <el-form-item label="合格数量" required>
+                                  <el-input
+                                    v-model="cur.qualifiedQuantity"
+                                    placeholder="请输入合格数量"
+                                    type="number"
+                                  />
+                                </el-form-item>
+                              </el-col>
+                              <el-col
+                                :span="12"
+                                v-if="
+                                  item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod ==
+                                  1
+                                "
+                              >
+                                <el-form-item label="不合格数量" required>
+                                  <el-input
+                                    v-model="cur.unqualifiedQuantity"
+                                    type="number"
+                                    placeholder="请输入不合格数量"
+                                  />
+                                </el-form-item>
+                              </el-col>
+                              <el-col
+                                :span="12"
+                                v-if="
+                                  item.inspectionJobCharacteristicsUpdateReqVO.featureType == '0'
+                                "
+                              >
+                                <el-form-item label="检验值" required>
+                                  <el-input
+                                    v-model="cur.inspectionValue"
+                                    placeholder="请输入检验值"
+                                    type="number"
+                                    @blur="inspectionValueInput(item, cur)"
+                                  />
+                                </el-form-item>
+                              </el-col>
+                              <el-col
+                                :span="12"
+                                v-if="
+                                  item.inspectionJobCharacteristicsUpdateReqVO.featureType == '1'
+                                "
+                              >
+                                <el-form-item label="选定集" required>
+                                  <el-select
+                                    v-model="cur.qualitativeCode"
+                                    placeholder="请选择选定集"
+                                    @change="changeQualitativeCode($event, item, cur)"
+                                  >
+                                    <el-option
+                                      v-for="dict in item.selectedProjectRespVOList"
+                                      :key="dict.dictionaryValue"
+                                      :label="dict.dictionaryLabel"
+                                      :value="dict.dictionaryValue"
+                                    />
+                                  </el-select>
+                                </el-form-item>
+                              </el-col>
+                              <el-col :span="12">
+                                <el-form-item label="备注">
+                                  <el-input
+                                    v-model="cur.remark"
+                                    placeholder="请输入备注"
+                                    type="text"
+                                    maxlength="200"
+                                  />
+                                </el-form-item>
+                              </el-col>
+                              <!-- <el-col :span="12" v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == '1'" >
                       <el-form-item label="缺陷级别" required>
                         <el-select v-model="cur.defectLevel" placeholder="请选择缺陷级别" disabled>
                           <el-option v-for="dict in getStrDictOptions(DICT_TYPE.DEFECT_LEVEL)" :key="dict.value" :label="dict.label" :value="dict.value" />
                         </el-select>
                       </el-form-item>
                     </el-col> -->
-                  </el-row>
-                  </div>
-                </el-col>
-              </el-row>
-            </div>
-            </el-form>
+                            </el-row>
+                          </div>
+                        </el-col>
+                      </el-row>
+                    </div>
+                  </el-form>
+                </el-collapse-item>
+              </el-collapse>
             </div>
           </el-tab-pane>
         </el-tabs>
-        
       </div>
       <template #footer>
         <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick" />
@@ -681,7 +730,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
     data.value = JSON.parse(JSON.stringify(row))
     //   await InspectionJobMainApi.acceptInspectionJobMain(row.id)
     let list = []
-    const masterId = row.jobId ||row.id
+    const masterId = row.jobId || row.id
     list = await InspectionJobDetailPageApi.getInspectionJobDetailList(masterId)
     data.value.packageList = await InspectionJobPackageApi.getInspectionJobPackageList(masterId)
     list.forEach((item, index) => {
@@ -1361,84 +1410,114 @@ const boxList = ref()
 //   })
 // }
 const inspectionValueInput = (item, cur) => {
-  for ( let i = 0;i < item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.length;i++) {
-    item.isPass = true
-//  如果上限值存在,下限值和目标值不存在 大于上限值显示红色图标
-  if (
-    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-    !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
-    !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-    item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue&&
-    parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping)
-  ) {
-    item.isPass = false
-    return
-  } 
-  // 如果下限值存在,上限值和目标值不存在 小于下限值显示红色图标
-  if (
-    !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
-    !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-    item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue&&
-    parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit)
-  ) {
-    item.isPass = false
-    return
-  }
-  // 如果目标值存在,上限值和下限值不存在 小于目标值显示红色图标
-  if (
-    !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-    !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
-    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-    item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue&&
-    parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) != parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget)
-  ) {
-    item.isPass = false
-    return
-  }
-   // 如果上限值和下限值存在,目标值不存在 大于上限并且小于下限值显示红色图标
-   if (
-    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
-    !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-    item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue&&
-   ( parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) ||
-    parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
-  ) {
-    item.isPass = false
-    return
-  }
-  // 如果上限值和目标值存在,下限值不存在 大于上限并且小于目标值显示红色图标
-  if (
-    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-    !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
-    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-    item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue&&
-    (parseFloat(cur.inspectionValue) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping)||
-    parseFloat(cur.inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget))
-  ) {
-    item.isPass = false
-    return
-  }
-   // 如果下限值和目标值存在,下限值不存在 大于上限并且小于目标值显示红色图标
-   if (
-    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-    !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
-    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-    (parseFloat(cur.inspectionValue) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget)||
-    parseFloat(cur.inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
+  for (
+    let i = 0;
+    i < item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.length;
+    i++
   ) {
-    item.isPass = false
-    return
-  }
+    item.isPass = true
+    //  如果上限值存在,下限值和目标值不存在 大于上限值显示红色图标
+    if (
+      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
+      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
+      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
+      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
+        .inspectionValue &&
+      parseFloat(
+        item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
+      ) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping)
+    ) {
+      item.isPass = false
+      return
+    }
+    // 如果下限值存在,上限值和目标值不存在 小于下限值显示红色图标
+    if (
+      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
+      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
+      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
+      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
+        .inspectionValue &&
+      parseFloat(
+        item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
+      ) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit)
+    ) {
+      item.isPass = false
+      return
+    }
+    // 如果目标值存在,上限值和下限值不存在 小于目标值显示红色图标
+    if (
+      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
+      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
+      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
+      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
+        .inspectionValue &&
+      parseFloat(
+        item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
+      ) != parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget)
+    ) {
+      item.isPass = false
+      return
+    }
+    // 如果上限值和下限值存在,目标值不存在 大于上限并且小于下限值显示红色图标
+    if (
+      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
+      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
+      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
+      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
+        .inspectionValue &&
+      (parseFloat(
+        item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
+      ) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) ||
+        parseFloat(
+          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
+            .inspectionValue
+        ) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
+    ) {
+      item.isPass = false
+      return
+    }
+    // 如果上限值和目标值存在,下限值不存在 大于上限并且小于目标值显示红色图标
+    if (
+      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
+      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
+      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
+      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
+        .inspectionValue &&
+      (parseFloat(cur.inspectionValue) >
+        parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) ||
+        parseFloat(cur.inspectionValue) <
+          parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget))
+    ) {
+      item.isPass = false
+      return
+    }
+    // 如果下限值和目标值存在,下限值不存在 大于上限并且小于目标值显示红色图标
+    if (
+      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
+      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
+      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
+      (parseFloat(cur.inspectionValue) >
+        parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget) ||
+        parseFloat(cur.inspectionValue) <
+          parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
+    ) {
+      item.isPass = false
+      return
+    }
     // 如果上限值和下限值,目标值存在 大于上限并且小于下限值显示红色图标
     if (
       item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
       item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
       item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue&&
-      (parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) ||
-      parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
+      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
+        .inspectionValue &&
+      (parseFloat(
+        item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
+      ) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) ||
+        parseFloat(
+          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
+            .inspectionValue
+        ) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
     ) {
       item.isPass = false
       return
@@ -1453,8 +1532,8 @@ const inspectionValueInput = (item, cur) => {
   color: #1a8bfc;
   font-size: 16px;
 }
-.tabs-box{
-  max-height:calc(80vh - 40px) ;
+.tabs-box {
+  max-height: calc(80vh - 40px);
   overflow-x: hidden;
   overflow-y: auto;
 }
diff --git a/src/views/qms/inspectionRecord/addForm.vue b/src/views/qms/inspectionRecord/addForm.vue
index c627fede3..6ca773464 100644
--- a/src/views/qms/inspectionRecord/addForm.vue
+++ b/src/views/qms/inspectionRecord/addForm.vue
@@ -35,7 +35,7 @@
             />
           </div>
         </div>
-        
+
         <el-tabs
           v-model="editableTabsValue"
           class="demo-tabs"
@@ -71,421 +71,470 @@
               </span>
             </template>
             <div class="tabs-box">
-            <div class="small-title">检验工序</div>
-            <el-form :model="item" label-width="auto" :rules="rules" ref="formProcessRef">
-              <el-row :gutter="20">
-                <el-col :span="12">
-                  <el-form-item label="编码" prop="processCode">
-                    <el-input
-                      v-model="item.processCode"
-                      placeholder="根据系统生成"
-                      :disabled="true"
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="检验特性编号">
-                    <el-input
-                      v-model="item.inspectionFeatureCode"
-                      placeholder="根据系统生成"
-                      :disabled="true"
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="描述" prop="processDescribe">
-                    <el-input v-model="item.processDescribe" :disabled="true" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="顺序号" prop="sequenceCode">
-                    <el-input v-model="item.sequenceCode" :disabled="true" />
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-form>
-            <div class="small-title">检验特性</div>
-            <el-form :model="item" label-width="auto" :rules="rules" ref="formFeaturesRef">
-            <div>
-                <el-row :gutter="20">
-                <el-col :span="12">
-                  <el-form-item label="编码">
-                    <el-input
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.number"
-                      placeholder="根据系统生成"
-                      :disabled="true"
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item
-                    label="描述"
-                    prop="inspectionJobCharacteristicsUpdateReqVO.description"
-                  >
-                    <el-input
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.description"
-                      :disabled="true"
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item
-                    label="检验方法"
-                    prop="inspectionJobCharacteristicsUpdateReqVO.inspectionMethodCode"
-                  >
-                    <div style="display: flex; width: 100%">
-                      <el-input
-                        v-model="item.inspectionJobCharacteristicsUpdateReqVO.inspectionMethodName"
-                        disabled
-                        placeholder="请选择检验方法"
-                      />
-                    </div>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item
-                    label="采样过程编码"
-                    prop="inspectionJobCharacteristicsUpdateReqVO.samplingProcessCode"
-                  >
-                    <div style="display: flex; width: 100%">
-                      <el-input
-                        v-model="item.inspectionJobCharacteristicsUpdateReqVO.samplingProcessName"
-                        disabled
-                        placeholder="请选择采样过程编码"
-                      />
-                    </div>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item
-                    label="样品份数"
-                    prop="inspectionJobCharacteristicsUpdateReqVO.sampleQty"
-                  >
-                    <div style="display: flex; width: 100%">
-                      <el-input
-                        v-model="item.inspectionJobCharacteristicsUpdateReqVO.sampleQty"
-                        disabled
-                        placeholder="请输入样品份数"
-                      />
-                    </div>
-                  </el-form-item>
-                </el-col>
+              <el-collapse accordion>
+                <el-collapse-item name="1">
+                  <template #title>
+                    <div class="small-title">检验工序</div>
+                  </template>
+                  <el-form :model="item" label-width="auto" :rules="rules" ref="formProcessRef">
+                    <el-row :gutter="20">
+                      <el-col :span="12">
+                        <el-form-item label="编码" prop="processCode">
+                          <el-input
+                            v-model="item.processCode"
+                            placeholder="根据系统生成"
+                            :disabled="true"
+                          />
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="12">
+                        <el-form-item label="检验特性编号">
+                          <el-input
+                            v-model="item.inspectionFeatureCode"
+                            placeholder="根据系统生成"
+                            :disabled="true"
+                          />
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="12">
+                        <el-form-item label="描述" prop="processDescribe">
+                          <el-input v-model="item.processDescribe" :disabled="true" />
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="12">
+                        <el-form-item label="顺序号" prop="sequenceCode">
+                          <el-input v-model="item.sequenceCode" :disabled="true" />
+                        </el-form-item>
+                      </el-col>
+                    </el-row>
+                  </el-form>
+                </el-collapse-item>
+                <el-collapse-item name="2">
+                  <template #title>
+                    <div class="small-title">检验特性</div>
+                  </template>
+                  <el-form :model="item" label-width="auto" :rules="rules" ref="formFeaturesRef">
+                    <div>
+                      <el-row :gutter="20">
+                        <el-col :span="12">
+                          <el-form-item label="编码">
+                            <el-input
+                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.number"
+                              placeholder="根据系统生成"
+                              :disabled="true"
+                            />
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item
+                            label="描述"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.description"
+                          >
+                            <el-input
+                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.description"
+                              :disabled="true"
+                            />
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item
+                            label="检验方法"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.inspectionMethodCode"
+                          >
+                            <div style="display: flex; width: 100%">
+                              <el-input
+                                v-model="
+                                  item.inspectionJobCharacteristicsUpdateReqVO.inspectionMethodName
+                                "
+                                disabled
+                                placeholder="请选择检验方法"
+                              />
+                            </div>
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item
+                            label="采样过程编码"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.samplingProcessCode"
+                          >
+                            <div style="display: flex; width: 100%">
+                              <el-input
+                                v-model="
+                                  item.inspectionJobCharacteristicsUpdateReqVO.samplingProcessName
+                                "
+                                disabled
+                                placeholder="请选择采样过程编码"
+                              />
+                            </div>
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item
+                            label="样品份数"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.sampleQty"
+                          >
+                            <div style="display: flex; width: 100%">
+                              <el-input
+                                v-model="item.inspectionJobCharacteristicsUpdateReqVO.sampleQty"
+                                disabled
+                                placeholder="请输入样品份数"
+                              />
+                            </div>
+                          </el-form-item>
+                        </el-col>
 
-                <el-col :span="12">
-                  <el-form-item
-                    label="每份样品量"
-                    prop="inspectionJobCharacteristicsUpdateReqVO.samplePieceSize"
-                  >
-                    <div style="display: flex; width: 100%">
-                      <el-input
-                        v-model="item.inspectionJobCharacteristicsUpdateReqVO.samplePieceSize"
-                        disabled
-                        placeholder="请输入样品份数"
-                      />
-                    </div>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item
-                    label="是否允许修改特征值"
-                    prop="inspectionJobCharacteristicsUpdateReqVO.isCanUpdate"
-                  >
-                    <el-switch
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.isCanUpdate"
-                      disabled
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item
-                    label="结果录入方式"
-                    prop="inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod"
-                  >
-                    <el-select
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod"
-                      placeholder="请选择结果录入方式"
-                      @change="resultEntryMethodChange($event, item)"
-                      disabled
-                    >
-                      <el-option
-                        v-for="dict in getStrDictOptions(
-                          DICT_TYPE.INSPECTION_CHARACTERISTICS_RESULT_ENTRY
-                        )"
-                        :key="dict.value"
-                        :label="dict.label"
-                        :value="dict.value"
-                      />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item
-                    label="特征类型"
-                    prop="inspectionJobCharacteristicsUpdateReqVO.featureType"
-                  >
-                    <el-select
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.featureType"
-                      placeholder="请选择特征类型"
-                      @change="changeFeatureType"
-                      disabled
-                    >
-                      <el-option
-                        v-for="dict in getStrDictOptions(
-                          DICT_TYPE.INSPECTION_CHARACTERISTICS_FEATURE_TYPE
-                        )"
-                        :key="dict.value"
-                        :label="dict.label"
-                        :value="dict.value"
-                      />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
+                        <el-col :span="12">
+                          <el-form-item
+                            label="每份样品量"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.samplePieceSize"
+                          >
+                            <div style="display: flex; width: 100%">
+                              <el-input
+                                v-model="
+                                  item.inspectionJobCharacteristicsUpdateReqVO.samplePieceSize
+                                "
+                                disabled
+                                placeholder="请输入样品份数"
+                              />
+                            </div>
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item
+                            label="是否允许修改特征值"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.isCanUpdate"
+                          >
+                            <el-switch
+                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.isCanUpdate"
+                              disabled
+                            />
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item
+                            label="结果录入方式"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod"
+                          >
+                            <el-select
+                              v-model="
+                                item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod
+                              "
+                              placeholder="请选择结果录入方式"
+                              @change="resultEntryMethodChange($event, item)"
+                              disabled
+                            >
+                              <el-option
+                                v-for="dict in getStrDictOptions(
+                                  DICT_TYPE.INSPECTION_CHARACTERISTICS_RESULT_ENTRY
+                                )"
+                                :key="dict.value"
+                                :label="dict.label"
+                                :value="dict.value"
+                              />
+                            </el-select>
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item
+                            label="特征类型"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.featureType"
+                          >
+                            <el-select
+                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.featureType"
+                              placeholder="请选择特征类型"
+                              @change="changeFeatureType"
+                              disabled
+                            >
+                              <el-option
+                                v-for="dict in getStrDictOptions(
+                                  DICT_TYPE.INSPECTION_CHARACTERISTICS_FEATURE_TYPE
+                                )"
+                                :key="dict.value"
+                                :label="dict.label"
+                                :value="dict.value"
+                              />
+                            </el-select>
+                          </el-form-item>
+                        </el-col>
 
-                <el-col
-                  :span="12"
-                  v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
-                >
-                  <el-form-item
-                    label="是否设定上限"
-                    prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
-                  >
-                    <el-switch
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping"
-                      :disabled="true"
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col
-                  :span="12"
-                  v-if="
-                    item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 &&
-                    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping
-                  "
-                >
-                  <el-form-item
-                    label="上限值"
-                    prop="inspectionCharacteristicsBaseVO.quantifyCapping"
-                  >
-                    <el-input
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping"
-                      :disabled="true"
-                    />
-                  </el-form-item>
-                </el-col>
+                        <el-col
+                          :span="12"
+                          v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
+                        >
+                          <el-form-item
+                            label="是否设定上限"
+                            prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
+                          >
+                            <el-switch
+                              v-model="
+                                item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping
+                              "
+                              :disabled="true"
+                            />
+                          </el-form-item>
+                        </el-col>
+                        <el-col
+                          :span="12"
+                          v-if="
+                            item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 &&
+                            item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping
+                          "
+                        >
+                          <el-form-item
+                            label="上限值"
+                            prop="inspectionCharacteristicsBaseVO.quantifyCapping"
+                          >
+                            <el-input
+                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping"
+                              :disabled="true"
+                            />
+                          </el-form-item>
+                        </el-col>
 
-                <el-col
-                  :span="12"
-                  v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
-                >
-                  <el-form-item
-                    label="是否设定下限"
-                    prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
-                  >
-                    <el-switch
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit"
-                      :disabled="true"
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col
-                  :span="12"
-                  v-if="
-                    item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 &&
-                    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit
-                  "
-                >
-                  <el-form-item
-                    label="下限值"
-                    prop="inspectionCharacteristicsBaseVO.quantifyCapping"
-                  >
-                    <el-input
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit"
-                      :disabled="true"
-                    />
-                  </el-form-item>
-                </el-col>
+                        <el-col
+                          :span="12"
+                          v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
+                        >
+                          <el-form-item
+                            label="是否设定下限"
+                            prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
+                          >
+                            <el-switch
+                              v-model="
+                                item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit
+                              "
+                              :disabled="true"
+                            />
+                          </el-form-item>
+                        </el-col>
+                        <el-col
+                          :span="12"
+                          v-if="
+                            item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 &&
+                            item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit
+                          "
+                        >
+                          <el-form-item
+                            label="下限值"
+                            prop="inspectionCharacteristicsBaseVO.quantifyCapping"
+                          >
+                            <el-input
+                              v-model="
+                                item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit
+                              "
+                              :disabled="true"
+                            />
+                          </el-form-item>
+                        </el-col>
 
-                <el-col
-                  :span="12"
-                  v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
-                >
-                  <el-form-item
-                    label="是否设定目标值"
-                    prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
-                  >
-                    <el-switch
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget"
-                      :disabled="true"
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col
-                  :span="12"
-                  v-if="
-                    item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 &&
-                    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget
-                  "
-                >
-                  <el-form-item
-                    label="目标值"
-                    prop="inspectionCharacteristicsBaseVO.quantifyCapping"
-                  >
-                    <el-input
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget"
-                      :disabled="true"
-                    />
-                  </el-form-item>
-                </el-col>
+                        <el-col
+                          :span="12"
+                          v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
+                        >
+                          <el-form-item
+                            label="是否设定目标值"
+                            prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
+                          >
+                            <el-switch
+                              v-model="
+                                item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget
+                              "
+                              :disabled="true"
+                            />
+                          </el-form-item>
+                        </el-col>
+                        <el-col
+                          :span="12"
+                          v-if="
+                            item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 &&
+                            item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget
+                          "
+                        >
+                          <el-form-item
+                            label="目标值"
+                            prop="inspectionCharacteristicsBaseVO.quantifyCapping"
+                          >
+                            <el-input
+                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget"
+                              :disabled="true"
+                            />
+                          </el-form-item>
+                        </el-col>
 
-                <el-col :span="12">
-                  <el-form-item
-                    label="开始时间"
-                    prop="inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime"
-                  >
-                    <el-date-picker
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime"
-                      type="datetime"
-                      placeholder="请选择开始时间"
-                      style="width: 100%"
-                      value-format="x"
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item
-                    label="结束时间"
-                    prop="inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime"
-                  >
-                    <el-date-picker
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime"
-                      type="datetime"
-                      placeholder="请选择结束时间"
-                      style="width: 100%"
-                      value-format="x"
-                    />
-                  </el-form-item>
-                </el-col>
-                <!-- 手动评估的时候显示 -->
-                <el-col :span="12" v-if="item.samplingProcessRespVO.evaluationMode == 1">
-                  <el-form-item
-                    label="评估代码"
-                    required
-                    prop="inspectionJobCharacteristicsUpdateReqVO.estimateCode"
-                  >
-                    <el-select
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.estimateCode"
-                      placeholder="请选择评估代码"
-                      @change="changeFeatureType"
-                    >
-                      <el-option
-                        v-for="dict in getStrDictOptions(DICT_TYPE.EVALUATION_CODE)"
-                        :key="dict.value"
-                        :label="dict.label"
-                        :value="dict.value"
-                      />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col
-                  :span="24"
-                  v-for="(cur, i) in item.inspectionJobCharacteristicsUpdateReqVO
-                    .recordInspectionQuantifyList"
-                  :key="i"
-                 
-                >
-                <div
-                  style="
-                    border: 1px solid #dedede;
-                    border-radius: 4px;
-                    padding-top: 16px;
-                    margin-bottom: 10px;
-                  ">
-                  <el-row :gutter="20">
-                    <!-- 汇总录入的时候显示 -->
-                    <el-col
-                      :span="12"
-                      v-if="item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1"
-                    >
-                      <el-form-item label="合格数量" required>
-                        <el-input
-                          v-model="cur.qualifiedQuantity"
-                          placeholder="请输入合格数量"
-                          type="number"
-                        />
-                      </el-form-item>
-                    </el-col>
-                    <el-col
-                      :span="12"
-                      v-if="item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1"
-                    >
-                      <el-form-item label="不合格数量" required>
-                        <el-input
-                          v-model="cur.unqualifiedQuantity"
-                          type="number"
-                          placeholder="请输入不合格数量"
-                        />
-                      </el-form-item>
-                    </el-col>
-                    <el-col
-                      :span="12"
-                      v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == '0'"
-                    >
-                      <el-form-item label="检验值" required>
-                        <el-input
-                          v-model="cur.inspectionValue"
-                          placeholder="请输入检验值"
-                          type="number"
-                          @blur="inspectionValueInput(item, cur)"
-                        />
-                      </el-form-item>
-                    </el-col>
-                    <el-col
-                      :span="12"
-                      v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == '1'"
-                    >
-                      <el-form-item label="选定集" required>
-                        <el-select
-                          v-model="cur.qualitativeCode"
-                          placeholder="请选择选定集"
-                          @change="changeQualitativeCode($event, item, cur)"
+                        <el-col :span="12">
+                          <el-form-item
+                            label="开始时间"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime"
+                          >
+                            <el-date-picker
+                              v-model="
+                                item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime
+                              "
+                              type="datetime"
+                              placeholder="请选择开始时间"
+                              style="width: 100%"
+                              value-format="x"
+                            />
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item
+                            label="结束时间"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime"
+                          >
+                            <el-date-picker
+                              v-model="
+                                item.inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime
+                              "
+                              type="datetime"
+                              placeholder="请选择结束时间"
+                              style="width: 100%"
+                              value-format="x"
+                            />
+                          </el-form-item>
+                        </el-col>
+                        <!-- 手动评估的时候显示 -->
+                        <el-col :span="12" v-if="item.samplingProcessRespVO.evaluationMode == 1">
+                          <el-form-item
+                            label="评估代码"
+                            required
+                            prop="inspectionJobCharacteristicsUpdateReqVO.estimateCode"
+                          >
+                            <el-select
+                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.estimateCode"
+                              placeholder="请选择评估代码"
+                              @change="changeFeatureType"
+                            >
+                              <el-option
+                                v-for="dict in getStrDictOptions(DICT_TYPE.EVALUATION_CODE)"
+                                :key="dict.value"
+                                :label="dict.label"
+                                :value="dict.value"
+                              />
+                            </el-select>
+                          </el-form-item>
+                        </el-col>
+                      </el-row>
+                    </div>
+                  </el-form>
+                </el-collapse-item>
+                <el-collapse-item name="3">
+                  <template #title>
+                    <div class="small-title">检验结果</div>
+                  </template>
+                  <el-form :model="item" label-width="auto" :rules="rules" ref="formFeaturesRef">
+                    <div>
+                      <el-row :gutter="20">
+                        <el-col
+                          :span="24"
+                          v-for="(cur, i) in item.inspectionJobCharacteristicsUpdateReqVO
+                            .recordInspectionQuantifyList"
+                          :key="i"
                         >
-                          <el-option
-                            v-for="dict in item.selectedProjectRespVOList"
-                            :key="dict.dictionaryValue"
-                            :label="dict.dictionaryLabel"
-                            :value="dict.dictionaryValue"
-                          />
-                        </el-select>
-                      </el-form-item>
-                    </el-col>
-                      <el-col
-                      :span="12"
-                    >
-                      <el-form-item label="备注">
-                        <el-input
-                          v-model="cur.remark"
-                          placeholder="请输入备注"
-                          type="text" maxlength="200"
-                        />
-                      </el-form-item>
-                    </el-col>
-                    <!-- <el-col :span="12" v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == '1'" >
+                          <div
+                            style="
+                              border: 1px solid #dedede;
+                              border-radius: 4px;
+                              padding-top: 16px;
+                              margin-bottom: 10px;
+                            "
+                          >
+                            <el-row :gutter="20">
+                              <!-- 汇总录入的时候显示 -->
+                              <el-col
+                                :span="12"
+                                v-if="
+                                  item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod ==
+                                  1
+                                "
+                              >
+                                <el-form-item label="合格数量" required>
+                                  <el-input
+                                    v-model="cur.qualifiedQuantity"
+                                    placeholder="请输入合格数量"
+                                    type="number"
+                                  />
+                                </el-form-item>
+                              </el-col>
+                              <el-col
+                                :span="12"
+                                v-if="
+                                  item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod ==
+                                  1
+                                "
+                              >
+                                <el-form-item label="不合格数量" required>
+                                  <el-input
+                                    v-model="cur.unqualifiedQuantity"
+                                    type="number"
+                                    placeholder="请输入不合格数量"
+                                  />
+                                </el-form-item>
+                              </el-col>
+                              <el-col
+                                :span="12"
+                                v-if="
+                                  item.inspectionJobCharacteristicsUpdateReqVO.featureType == '0'
+                                "
+                              >
+                                <el-form-item label="检验值" required>
+                                  <el-input
+                                    v-model="cur.inspectionValue"
+                                    placeholder="请输入检验值"
+                                    type="number"
+                                    @blur="inspectionValueInput(item, cur)"
+                                  />
+                                </el-form-item>
+                              </el-col>
+                              <el-col
+                                :span="12"
+                                v-if="
+                                  item.inspectionJobCharacteristicsUpdateReqVO.featureType == '1'
+                                "
+                              >
+                                <el-form-item label="选定集" required>
+                                  <el-select
+                                    v-model="cur.qualitativeCode"
+                                    placeholder="请选择选定集"
+                                    @change="changeQualitativeCode($event, item, cur)"
+                                  >
+                                    <el-option
+                                      v-for="dict in item.selectedProjectRespVOList"
+                                      :key="dict.dictionaryValue"
+                                      :label="dict.dictionaryLabel"
+                                      :value="dict.dictionaryValue"
+                                    />
+                                  </el-select>
+                                </el-form-item>
+                              </el-col>
+                              <el-col :span="12">
+                                <el-form-item label="备注">
+                                  <el-input
+                                    v-model="cur.remark"
+                                    placeholder="请输入备注"
+                                    type="text"
+                                    maxlength="200"
+                                  />
+                                </el-form-item>
+                              </el-col>
+                              <!-- <el-col :span="12" v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == '1'" >
                       <el-form-item label="缺陷级别" required>
                         <el-select v-model="cur.defectLevel" placeholder="请选择缺陷级别" disabled>
                           <el-option v-for="dict in getStrDictOptions(DICT_TYPE.DEFECT_LEVEL)" :key="dict.value" :label="dict.label" :value="dict.value" />
                         </el-select>
                       </el-form-item>
                     </el-col> -->
-                  </el-row>
-                  </div>
-                </el-col>
-              </el-row>
-            </div>
-            </el-form>
+                            </el-row>
+                          </div>
+                        </el-col>
+                      </el-row>
+                    </div>
+                  </el-form>
+                </el-collapse-item>
+              </el-collapse>
             </div>
           </el-tab-pane>
         </el-tabs>
-        
       </div>
       <template #footer>
         <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick" />
@@ -524,7 +573,7 @@ import * as InspectionJobMainApi from '@/api/qms/inspectionJob/inspectionJobMain
 import * as InspectionJobPackageApi from '@/api/qms/inspectionJob/InspectionJobPackage/InspectionJobPackage'
 import * as InspectionRecordDetailPageApi from '@/api/qms/inspectionRecord/inspectionRecordDetail'
 
-  import * as InspectionRecordPackageApi from '@/api/qms/inspectionRecord/InspectionRecordPackage/InspectionRecordPackage'
+import * as InspectionRecordPackageApi from '@/api/qms/inspectionRecord/InspectionRecordPackage/InspectionRecordPackage'
 const { proxy } = getCurrentInstance()
 
 const message = useMessage() // 消息弹窗
@@ -683,9 +732,11 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
     data.value = JSON.parse(JSON.stringify(row))
     //   await InspectionJobMainApi.acceptInspectionJobMain(row.id)
     let list = []
-    const masterId =row.id
-      list = await InspectionRecordDetailPageApi.getInspectionRecordDetailList(row.id)
-    data.value.packageList = await InspectionRecordPackageApi.getInspectionRecordPackageList(masterId)
+    const masterId = row.id
+    list = await InspectionRecordDetailPageApi.getInspectionRecordDetailList(row.id)
+    data.value.packageList = await InspectionRecordPackageApi.getInspectionRecordPackageList(
+      masterId
+    )
     list.forEach((item, index) => {
       editableTabsValue.value = 1
       item.name = index + 1
@@ -699,7 +750,10 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
         ).toFixed(6)
       )
       // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
-      item.inspectionRecordCharacteristicsRespVO.recordInspectionQuantifyList = item.inspectionRecordCharacteristicsRespVO.featureType == 1 ? item.inspectionRecordCharacteristicsRespVO.qualitativeRespVOList : item.inspectionRecordCharacteristicsRespVO.quantifyRespVOList
+      item.inspectionRecordCharacteristicsRespVO.recordInspectionQuantifyList =
+        item.inspectionRecordCharacteristicsRespVO.featureType == 1
+          ? item.inspectionRecordCharacteristicsRespVO.qualitativeRespVOList
+          : item.inspectionRecordCharacteristicsRespVO.quantifyRespVOList
       if (!item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList) {
         // 单个录入时
         if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 2) {
@@ -1364,84 +1418,114 @@ const boxList = ref()
 //   })
 // }
 const inspectionValueInput = (item, cur) => {
-  for ( let i = 0;i < item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.length;i++) {
-    item.isPass = true
-//  如果上限值存在,下限值和目标值不存在 大于上限值显示红色图标
-  if (
-    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-    !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
-    !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-    item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue&&
-    parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping)
-  ) {
-    item.isPass = false
-    return
-  } 
-  // 如果下限值存在,上限值和目标值不存在 小于下限值显示红色图标
-  if (
-    !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
-    !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-    item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue&&
-    parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit)
-  ) {
-    item.isPass = false
-    return
-  }
-  // 如果目标值存在,上限值和下限值不存在 小于目标值显示红色图标
-  if (
-    !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-    !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
-    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-    item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue&&
-    parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) != parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget)
-  ) {
-    item.isPass = false
-    return
-  }
-   // 如果上限值和下限值存在,目标值不存在 大于上限并且小于下限值显示红色图标
-   if (
-    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
-    !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-    item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue&&
-   ( parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) ||
-    parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
-  ) {
-    item.isPass = false
-    return
-  }
-  // 如果上限值和目标值存在,下限值不存在 大于上限并且小于目标值显示红色图标
-  if (
-    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-    !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
-    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-    item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue&&
-    (parseFloat(cur.inspectionValue) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping)||
-    parseFloat(cur.inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget))
-  ) {
-    item.isPass = false
-    return
-  }
-   // 如果下限值和目标值存在,下限值不存在 大于上限并且小于目标值显示红色图标
-   if (
-    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-    !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
-    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-    (parseFloat(cur.inspectionValue) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget)||
-    parseFloat(cur.inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
+  for (
+    let i = 0;
+    i < item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.length;
+    i++
   ) {
-    item.isPass = false
-    return
-  }
+    item.isPass = true
+    //  如果上限值存在,下限值和目标值不存在 大于上限值显示红色图标
+    if (
+      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
+      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
+      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
+      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
+        .inspectionValue &&
+      parseFloat(
+        item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
+      ) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping)
+    ) {
+      item.isPass = false
+      return
+    }
+    // 如果下限值存在,上限值和目标值不存在 小于下限值显示红色图标
+    if (
+      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
+      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
+      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
+      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
+        .inspectionValue &&
+      parseFloat(
+        item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
+      ) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit)
+    ) {
+      item.isPass = false
+      return
+    }
+    // 如果目标值存在,上限值和下限值不存在 小于目标值显示红色图标
+    if (
+      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
+      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
+      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
+      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
+        .inspectionValue &&
+      parseFloat(
+        item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
+      ) != parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget)
+    ) {
+      item.isPass = false
+      return
+    }
+    // 如果上限值和下限值存在,目标值不存在 大于上限并且小于下限值显示红色图标
+    if (
+      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
+      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
+      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
+      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
+        .inspectionValue &&
+      (parseFloat(
+        item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
+      ) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) ||
+        parseFloat(
+          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
+            .inspectionValue
+        ) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
+    ) {
+      item.isPass = false
+      return
+    }
+    // 如果上限值和目标值存在,下限值不存在 大于上限并且小于目标值显示红色图标
+    if (
+      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
+      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
+      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
+      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
+        .inspectionValue &&
+      (parseFloat(cur.inspectionValue) >
+        parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) ||
+        parseFloat(cur.inspectionValue) <
+          parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget))
+    ) {
+      item.isPass = false
+      return
+    }
+    // 如果下限值和目标值存在,下限值不存在 大于上限并且小于目标值显示红色图标
+    if (
+      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
+      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
+      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
+      (parseFloat(cur.inspectionValue) >
+        parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget) ||
+        parseFloat(cur.inspectionValue) <
+          parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
+    ) {
+      item.isPass = false
+      return
+    }
     // 如果上限值和下限值,目标值存在 大于上限并且小于下限值显示红色图标
     if (
       item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
       item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
       item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue&&
-      (parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) ||
-      parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
+      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
+        .inspectionValue &&
+      (parseFloat(
+        item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
+      ) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) ||
+        parseFloat(
+          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
+            .inspectionValue
+        ) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
     ) {
       item.isPass = false
       return
@@ -1456,8 +1540,8 @@ const inspectionValueInput = (item, cur) => {
   color: #1a8bfc;
   font-size: 16px;
 }
-.tabs-box{
-  max-height:calc(80vh - 40px) ;
+.tabs-box {
+  max-height: calc(80vh - 40px);
   overflow-x: hidden;
   overflow-y: auto;
 }
diff --git a/src/views/qms/inspectionRecordFirst/addForm.vue b/src/views/qms/inspectionRecordFirst/addForm.vue
index d4fed9f00..fd5b0390e 100644
--- a/src/views/qms/inspectionRecordFirst/addForm.vue
+++ b/src/views/qms/inspectionRecordFirst/addForm.vue
@@ -139,322 +139,353 @@
               </span>
             </template>
             <div class="tabs-box">
-              <div class="small-title">检验工序</div>
-              <el-form :model="item" label-width="auto" :rules="rules" ref="formProcessRef">
-                <el-row :gutter="20">
-                  <el-col :span="12">
-                    <el-form-item label="编码" prop="processCode">
-                      <el-input
-                        v-model="item.processCode"
-                        placeholder="根据系统生成"
-                        :disabled="true"
-                      />
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="12">
-                    <el-form-item label="检验特性编号">
-                      <el-input
-                        v-model="item.inspectionFeatureCode"
-                        placeholder="根据系统生成"
-                        :disabled="true"
-                      />
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="12">
-                    <el-form-item label="描述" prop="processDescribe">
-                      <el-input v-model="item.processDescribe" :disabled="true" />
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="12">
-                    <el-form-item label="顺序号" prop="sequenceCode">
-                      <el-input v-model="item.sequenceCode" :disabled="true" />
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-              </el-form>
-              <div class="small-title">检验特性</div>
-              <el-form :model="item" label-width="auto" :rules="rules" ref="formFeaturesRef">
-                <div>
-                  <el-row :gutter="20">
-                    <el-col :span="12">
-                      <el-form-item label="编码">
-                        <el-input
-                          v-model="item.inspectionJobCharacteristicsUpdateReqVO.number"
-                          placeholder="根据系统生成"
-                          :disabled="true"
-                        />
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                      <el-form-item
-                        label="描述"
-                        prop="inspectionJobCharacteristicsUpdateReqVO.description"
-                      >
-                        <el-input
-                          v-model="item.inspectionJobCharacteristicsUpdateReqVO.description"
-                          :disabled="true"
-                        />
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                      <el-form-item
-                        label="检验方法"
-                        prop="inspectionJobCharacteristicsUpdateReqVO.inspectionMethodCode"
-                      >
-                        <div style="display: flex; width: 100%">
+              <el-collapse accordion>
+                <el-collapse-item name="1">
+                  <template #title>
+                    <div class="small-title">检验工序</div>
+                  </template>
+                  <el-form :model="item" label-width="auto" :rules="rules" ref="formProcessRef">
+                    <el-row :gutter="20">
+                      <el-col :span="12">
+                        <el-form-item label="编码" prop="processCode">
                           <el-input
-                            v-model="
-                              item.inspectionJobCharacteristicsUpdateReqVO.inspectionMethodName
-                            "
-                            disabled
-                            placeholder="请选择检验方法"
+                            v-model="item.processCode"
+                            placeholder="根据系统生成"
+                            :disabled="true"
                           />
-                        </div>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                      <el-form-item
-                        label="采样过程编码"
-                        prop="inspectionJobCharacteristicsUpdateReqVO.samplingProcessCode"
-                      >
-                        <div style="display: flex; width: 100%">
-                          <el-input
-                            v-model="
-                              item.inspectionJobCharacteristicsUpdateReqVO.samplingProcessName
-                            "
-                            disabled
-                            placeholder="请选择采样过程编码"
-                          />
-                        </div>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                      <el-form-item label="样品份数" prop="samplingProcessRespVO.sampleQty">
-                        <div style="display: flex; width: 100%">
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="12">
+                        <el-form-item label="检验特性编号">
                           <el-input
-                            v-model="item.samplingProcessRespVO.sampleQty"
-                            disabled
-                            placeholder="请输入样品份数"
+                            v-model="item.inspectionFeatureCode"
+                            placeholder="根据系统生成"
+                            :disabled="true"
                           />
-                        </div>
-                      </el-form-item>
-                    </el-col>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="12">
+                        <el-form-item label="描述" prop="processDescribe">
+                          <el-input v-model="item.processDescribe" :disabled="true" />
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="12">
+                        <el-form-item label="顺序号" prop="sequenceCode">
+                          <el-input v-model="item.sequenceCode" :disabled="true" />
+                        </el-form-item>
+                      </el-col>
+                    </el-row>
+                  </el-form>
+                </el-collapse-item>
+                <el-collapse-item name="2">
+                  <template #title>
+                    <div class="small-title">检验特性</div>
+                  </template>
+                  <el-form :model="item" label-width="auto" :rules="rules" ref="formFeaturesRef">
+                    <div>
+                      <el-row :gutter="20">
+                        <el-col :span="12">
+                          <el-form-item label="编码">
+                            <el-input
+                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.number"
+                              placeholder="根据系统生成"
+                              :disabled="true"
+                            />
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item
+                            label="描述"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.description"
+                          >
+                            <el-input
+                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.description"
+                              :disabled="true"
+                            />
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item
+                            label="检验方法"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.inspectionMethodCode"
+                          >
+                            <div style="display: flex; width: 100%">
+                              <el-input
+                                v-model="
+                                  item.inspectionJobCharacteristicsUpdateReqVO.inspectionMethodName
+                                "
+                                disabled
+                                placeholder="请选择检验方法"
+                              />
+                            </div>
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item
+                            label="采样过程编码"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.samplingProcessCode"
+                          >
+                            <div style="display: flex; width: 100%">
+                              <el-input
+                                v-model="
+                                  item.inspectionJobCharacteristicsUpdateReqVO.samplingProcessName
+                                "
+                                disabled
+                                placeholder="请选择采样过程编码"
+                              />
+                            </div>
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item label="样品份数" prop="samplingProcessRespVO.sampleQty">
+                            <div style="display: flex; width: 100%">
+                              <el-input
+                                v-model="item.samplingProcessRespVO.sampleQty"
+                                disabled
+                                placeholder="请输入样品份数"
+                              />
+                            </div>
+                          </el-form-item>
+                        </el-col>
 
-                    <el-col :span="12">
-                      <el-form-item
-                        label="每份样品量"
-                        prop="inspectionJobCharacteristicsUpdateReqVO.samplePieceSize"
-                      >
-                        <div style="display: flex; width: 100%">
-                          <el-input
-                            v-model="data.samplePieceSize"
-                            disabled
-                            placeholder="请输入样品份数"
-                          />
-                        </div>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                      <el-form-item
-                        label="是否允许修改特征值"
-                        prop="inspectionJobCharacteristicsUpdateReqVO.isCanUpdate"
-                      >
-                        <el-switch
-                          v-model="item.inspectionJobCharacteristicsUpdateReqVO.isCanUpdate"
-                          disabled
-                        />
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                      <el-form-item
-                        label="结果录入方式"
-                        prop="inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod"
-                      >
-                        <el-select
-                          v-model="item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod"
-                          placeholder="请选择结果录入方式"
-                          @change="resultEntryMethodChange($event, item)"
-                          disabled
+                        <el-col :span="12">
+                          <el-form-item
+                            label="每份样品量"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.samplePieceSize"
+                          >
+                            <div style="display: flex; width: 100%">
+                              <el-input
+                                v-model="data.samplePieceSize"
+                                disabled
+                                placeholder="请输入样品份数"
+                              />
+                            </div>
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item
+                            label="是否允许修改特征值"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.isCanUpdate"
+                          >
+                            <el-switch
+                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.isCanUpdate"
+                              disabled
+                            />
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item
+                            label="结果录入方式"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod"
+                          >
+                            <el-select
+                              v-model="
+                                item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod
+                              "
+                              placeholder="请选择结果录入方式"
+                              @change="resultEntryMethodChange($event, item)"
+                              disabled
+                            >
+                              <el-option
+                                v-for="dict in getStrDictOptions(
+                                  DICT_TYPE.INSPECTION_CHARACTERISTICS_RESULT_ENTRY
+                                )"
+                                :key="dict.value"
+                                :label="dict.label"
+                                :value="dict.value"
+                              />
+                            </el-select>
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item
+                            label="特征类型"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.featureType"
+                          >
+                            <el-select
+                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.featureType"
+                              placeholder="请选择特征类型"
+                              @change="changeFeatureType"
+                              disabled
+                            >
+                              <el-option
+                                v-for="dict in getStrDictOptions(
+                                  DICT_TYPE.INSPECTION_CHARACTERISTICS_FEATURE_TYPE
+                                )"
+                                :key="dict.value"
+                                :label="dict.label"
+                                :value="dict.value"
+                              />
+                            </el-select>
+                          </el-form-item>
+                        </el-col>
+
+                        <el-col
+                          :span="12"
+                          v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
                         >
-                          <el-option
-                            v-for="dict in getStrDictOptions(
-                              DICT_TYPE.INSPECTION_CHARACTERISTICS_RESULT_ENTRY
-                            )"
-                            :key="dict.value"
-                            :label="dict.label"
-                            :value="dict.value"
-                          />
-                        </el-select>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                      <el-form-item
-                        label="特征类型"
-                        prop="inspectionJobCharacteristicsUpdateReqVO.featureType"
-                      >
-                        <el-select
-                          v-model="item.inspectionJobCharacteristicsUpdateReqVO.featureType"
-                          placeholder="请选择特征类型"
-                          @change="changeFeatureType"
-                          disabled
+                          <el-form-item
+                            label="是否设定上限"
+                            prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
+                          >
+                            <el-switch
+                              v-model="
+                                item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping
+                              "
+                              :disabled="true"
+                            />
+                          </el-form-item>
+                        </el-col>
+                        <el-col
+                          :span="12"
+                          v-if="
+                            item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 &&
+                            item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping
+                          "
                         >
-                          <el-option
-                            v-for="dict in getStrDictOptions(
-                              DICT_TYPE.INSPECTION_CHARACTERISTICS_FEATURE_TYPE
-                            )"
-                            :key="dict.value"
-                            :label="dict.label"
-                            :value="dict.value"
-                          />
-                        </el-select>
-                      </el-form-item>
-                    </el-col>
-
-                    <el-col
-                      :span="12"
-                      v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
-                    >
-                      <el-form-item
-                        label="是否设定上限"
-                        prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
-                      >
-                        <el-switch
-                          v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping"
-                          :disabled="true"
-                        />
-                      </el-form-item>
-                    </el-col>
-                    <el-col
-                      :span="12"
-                      v-if="
-                        item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 &&
-                        item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping
-                      "
-                    >
-                      <el-form-item
-                        label="上限值"
-                        prop="inspectionCharacteristicsBaseVO.quantifyCapping"
-                      >
-                        <el-input
-                          v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping"
-                          :disabled="true"
-                        />
-                      </el-form-item>
-                    </el-col>
-
-                    <el-col
-                      :span="12"
-                      v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
-                    >
-                      <el-form-item
-                        label="是否设定下限"
-                        prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
-                      >
-                        <el-switch
-                          v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit"
-                          :disabled="true"
-                        />
-                      </el-form-item>
-                    </el-col>
-                    <el-col
-                      :span="12"
-                      v-if="
-                        item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 &&
-                        item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit
-                      "
-                    >
-                      <el-form-item
-                        label="下限值"
-                        prop="inspectionCharacteristicsBaseVO.quantifyCapping"
-                      >
-                        <el-input
-                          v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit"
-                          :disabled="true"
-                        />
-                      </el-form-item>
-                    </el-col>
+                          <el-form-item
+                            label="上限值"
+                            prop="inspectionCharacteristicsBaseVO.quantifyCapping"
+                          >
+                            <el-input
+                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping"
+                              :disabled="true"
+                            />
+                          </el-form-item>
+                        </el-col>
 
-                    <el-col
-                      :span="12"
-                      v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
-                    >
-                      <el-form-item
-                        label="是否设定目标值"
-                        prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
-                      >
-                        <el-switch
-                          v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget"
-                          :disabled="true"
-                        />
-                      </el-form-item>
-                    </el-col>
-                    <el-col
-                      :span="12"
-                      v-if="
-                        item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 &&
-                        item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget
-                      "
-                    >
-                      <el-form-item
-                        label="目标值"
-                        prop="inspectionCharacteristicsBaseVO.quantifyCapping"
-                      >
-                        <el-input
-                          v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget"
-                          :disabled="true"
-                        />
-                      </el-form-item>
-                    </el-col>
+                        <el-col
+                          :span="12"
+                          v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
+                        >
+                          <el-form-item
+                            label="是否设定下限"
+                            prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
+                          >
+                            <el-switch
+                              v-model="
+                                item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit
+                              "
+                              :disabled="true"
+                            />
+                          </el-form-item>
+                        </el-col>
+                        <el-col
+                          :span="12"
+                          v-if="
+                            item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 &&
+                            item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit
+                          "
+                        >
+                          <el-form-item
+                            label="下限值"
+                            prop="inspectionCharacteristicsBaseVO.quantifyCapping"
+                          >
+                            <el-input
+                              v-model="
+                                item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit
+                              "
+                              :disabled="true"
+                            />
+                          </el-form-item>
+                        </el-col>
 
-                    <el-col :span="12">
-                      <el-form-item
-                        label="开始时间"
-                        prop="inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime"
-                      >
-                        <el-date-picker
-                          v-model="item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime"
-                          type="datetime"
-                          placeholder="请选择开始时间"
-                          style="width: 100%"
-                          value-format="x"
-                        />
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                      <el-form-item
-                        label="结束时间"
-                        prop="inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime"
-                      >
-                        <el-date-picker
-                          v-model="item.inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime"
-                          type="datetime"
-                          placeholder="请选择结束时间"
-                          style="width: 100%"
-                          value-format="x"
-                        />
-                      </el-form-item>
-                    </el-col>
-                    <!-- 手动评估的时候显示 -->
-                    <el-col :span="12" v-if="item.samplingProcessRespVO.evaluationMode == 1">
-                      <el-form-item
-                        label="评估代码"
-                        required
-                        prop="inspectionJobCharacteristicsUpdateReqVO.estimateCode"
-                      >
-                        <el-select
-                          v-model="item.inspectionJobCharacteristicsUpdateReqVO.estimateCode"
-                          placeholder="请选择评估代码"
-                          @change="changeFeatureType"
+                        <el-col
+                          :span="12"
+                          v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
                         >
-                          <el-option
-                            v-for="dict in getStrDictOptions(DICT_TYPE.EVALUATION_CODE)"
-                            :key="dict.value"
-                            :label="dict.label"
-                            :value="dict.value"
-                          />
-                        </el-select>
-                      </el-form-item>
-                    </el-col>
+                          <el-form-item
+                            label="是否设定目标值"
+                            prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
+                          >
+                            <el-switch
+                              v-model="
+                                item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget
+                              "
+                              :disabled="true"
+                            />
+                          </el-form-item>
+                        </el-col>
+                        <el-col
+                          :span="12"
+                          v-if="
+                            item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 &&
+                            item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget
+                          "
+                        >
+                          <el-form-item
+                            label="目标值"
+                            prop="inspectionCharacteristicsBaseVO.quantifyCapping"
+                          >
+                            <el-input
+                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget"
+                              :disabled="true"
+                            />
+                          </el-form-item>
+                        </el-col>
+
+                        <el-col :span="12">
+                          <el-form-item
+                            label="开始时间"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime"
+                          >
+                            <el-date-picker
+                              v-model="
+                                item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime
+                              "
+                              type="datetime"
+                              placeholder="请选择开始时间"
+                              style="width: 100%"
+                              value-format="x"
+                            />
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item
+                            label="结束时间"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime"
+                          >
+                            <el-date-picker
+                              v-model="
+                                item.inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime
+                              "
+                              type="datetime"
+                              placeholder="请选择结束时间"
+                              style="width: 100%"
+                              value-format="x"
+                            />
+                          </el-form-item>
+                        </el-col>
+                        <!-- 手动评估的时候显示 -->
+                        <el-col :span="12" v-if="item.samplingProcessRespVO.evaluationMode == 1">
+                          <el-form-item
+                            label="评估代码"
+                            required
+                            prop="inspectionJobCharacteristicsUpdateReqVO.estimateCode"
+                          >
+                            <el-select
+                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.estimateCode"
+                              placeholder="请选择评估代码"
+                              @change="changeFeatureType"
+                            >
+                              <el-option
+                                v-for="dict in getStrDictOptions(DICT_TYPE.EVALUATION_CODE)"
+                                :key="dict.value"
+                                :label="dict.label"
+                                :value="dict.value"
+                              />
+                            </el-select>
+                          </el-form-item>
+                        </el-col>
+                      </el-row>
+                    </div>
+                  </el-form>
+                </el-collapse-item>
+                <el-collapse-item name="3">
+                  <template #title>
+                    <div class="small-title">检验结果</div>
+                  </template>
+                  <el-form :model="item" label-width="auto" :rules="rules" ref="formFeaturesRef">
                     <el-col
                       :span="24"
                       v-for="(cur, i) in item.inspectionJobCharacteristicsUpdateReqVO
@@ -551,9 +582,9 @@
                         </el-row>
                       </div>
                     </el-col>
-                  </el-row>
-                </div>
-              </el-form>
+                  </el-form>
+                </el-collapse-item>
+              </el-collapse>
             </div>
           </el-tab-pane>
         </el-tabs>
@@ -1081,12 +1112,12 @@ const opensearchItemsTable = () => {
       column: 'type',
       action: 'in',
       value: 'BCP,CCP'
-    },
-    {
-      column: 'status',
-      action: 'in',
-      value: 'ENABLE'
     }
+    // {
+    //   column: 'status',
+    //   action: 'in',
+    //   value: 'ENABLE'
+    // }
   )
   // 参数整理
   _searchCondition.isSearch = true
@@ -1178,7 +1209,7 @@ const searchTableSuccess = async (formField, searchField, val, type, row) => {
       data.value.inspectionSchemeCode = InspectionSchemeObj?.code || ''
       if (!data.value.inspectionSchemeCode) {
         data.value.subList = []
-        return;
+        return
       }
       let list = await InspectionJobDetailApi.getBySchemeCode(data.value.inspectionSchemeCode)
       editableTabsValue.value = 1
@@ -1551,15 +1582,15 @@ const onItemBlur = async (field, pageApi) => {
     if (obj) {
       // data.value['itemName'] = obj.name
       // data.value['desc1'] = obj.desc1
-      // const searchTableSuccess = async(formField, searchField, val, type, row) 
-      searchTableSuccess(field,'code',array.list,'main')
+      // const searchTableSuccess = async(formField, searchField, val, type, row)
+      searchTableSuccess(field, 'code', array.list, 'main')
     } else {
       message.alert('暂无数据')
       data.value[field] = ''
       data.value['itemName'] = ''
       data.value['desc1'] = ''
       data.value['inspectionSchemeCode'] = ''
-      data.value.subList =[]
+      data.value.subList = []
     }
   } else {
     data.value[field] = ''
@@ -1611,12 +1642,12 @@ const onInspectionSchemeBlur = async (field, pageApi) => {
     count.value++
     const obj = array.list[0]
     if (obj) {
-      searchTableSuccess(field,'code',array.list,'main')
+      searchTableSuccess(field, 'code', array.list, 'main')
     } else {
       message.alert('暂无数据')
       data.value[field] = ''
       data.value['inspectionSchemeName'] = ''
-      data.value.subList =[]
+      data.value.subList = []
     }
   } else {
     data.value['inspectionSchemeName'] = ''

From c3424b6c35f00fa059963a7613298e8ea28e0869 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 1 Aug 2024 13:39:04 +0800
Subject: [PATCH 12/18] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=B1=95=E5=BC=80=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/inspectionJob/addForm.vue         | 3 ++-
 src/views/qms/inspectionRecord/addForm.vue      | 3 ++-
 src/views/qms/inspectionRecordFirst/addForm.vue | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/views/qms/inspectionJob/addForm.vue b/src/views/qms/inspectionJob/addForm.vue
index 9d381fc02..cbd83e82a 100644
--- a/src/views/qms/inspectionJob/addForm.vue
+++ b/src/views/qms/inspectionJob/addForm.vue
@@ -71,7 +71,7 @@
               </span>
             </template>
             <div class="tabs-box">
-              <el-collapse accordion>
+              <el-collapse v-model="collapseShow">
                 <el-collapse-item name="1">
                   <template #title>
                     <div class="small-title">检验工序</div>
@@ -643,6 +643,7 @@ const formProcessRef = ref()
 const formSchema = ref(props.formAllSchemas?.formSchema)
 const tableAllSchemas = ref(props.tableAllSchemas)
 const tableFormRules = ref(props.tableFormRules)
+const collapseShow = ref(['1','2','3'])
 
 const data = ref({
   code: '',
diff --git a/src/views/qms/inspectionRecord/addForm.vue b/src/views/qms/inspectionRecord/addForm.vue
index 6ca773464..337ae5b8d 100644
--- a/src/views/qms/inspectionRecord/addForm.vue
+++ b/src/views/qms/inspectionRecord/addForm.vue
@@ -71,7 +71,7 @@
               </span>
             </template>
             <div class="tabs-box">
-              <el-collapse accordion>
+              <el-collapse v-model="collapseShow">
                 <el-collapse-item name="1">
                   <template #title>
                     <div class="small-title">检验工序</div>
@@ -645,6 +645,7 @@ const formProcessRef = ref()
 const formSchema = ref(props.formAllSchemas?.formSchema)
 const tableAllSchemas = ref(props.tableAllSchemas)
 const tableFormRules = ref(props.tableFormRules)
+const collapseShow = ref(['1','2','3'])
 
 const data = ref({
   code: '',
diff --git a/src/views/qms/inspectionRecordFirst/addForm.vue b/src/views/qms/inspectionRecordFirst/addForm.vue
index fd5b0390e..f44ed7bc0 100644
--- a/src/views/qms/inspectionRecordFirst/addForm.vue
+++ b/src/views/qms/inspectionRecordFirst/addForm.vue
@@ -139,7 +139,7 @@
               </span>
             </template>
             <div class="tabs-box">
-              <el-collapse accordion>
+              <el-collapse v-model="collapseShow">
                 <el-collapse-item name="1">
                   <template #title>
                     <div class="small-title">检验工序</div>
@@ -693,6 +693,7 @@ const formMainRef = ref()
 const formFeaturesRef = ref()
 const formProcessRef = ref()
 const formSchema = ref(props.formAllSchemas?.formSchema)
+const collapseShow = ref(['1','2','3'])
 
 const data = ref({
   code: '',

From 445aed7b222143428b3e35c2fa9fdd838a268063 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 1 Aug 2024 13:57:06 +0800
Subject: [PATCH 13/18] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=9D=A1=E7=A0=81?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=AE=A1=E7=90=86=EF=BC=8C=E5=88=A0=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Descriptions/src/Descriptions.vue         |   5 +
 src/types/descriptions.d.ts                   |   1 +
 .../wms/buttMesManage/mesBarCode/index.vue    |   7 +
 .../mesBarCode/mesBarCode.data.ts             | 296 ++++++++++--------
 4 files changed, 176 insertions(+), 133 deletions(-)

diff --git a/src/components/Descriptions/src/Descriptions.vue b/src/components/Descriptions/src/Descriptions.vue
index 23ed47eb2..118cbcc9f 100644
--- a/src/components/Descriptions/src/Descriptions.vue
+++ b/src/components/Descriptions/src/Descriptions.vue
@@ -145,6 +145,11 @@ const showAll = () =>{
                   data[item.field] !== null ? dayjs(data[item.field]).format(item.dateFormat) : ''
                 }}
               </slot>
+              <slot v-if="item.valueFilter">
+                {{
+                  item.valueFilter(data[item.field])
+                }}
+              </slot>
               <slot v-else-if="item.dictType">
                 <div v-if="data[item.field]&&Array.isArray(data[item.field])" >
                   <DictTag :type="item.dictType" :value="cur" v-for="(cur,key) in data[item.field]" :key="key" style="margin-right: 6px;margin-bottom: 6px;"/>
diff --git a/src/types/descriptions.d.ts b/src/types/descriptions.d.ts
index 35c0b81be..70be082d8 100644
--- a/src/types/descriptions.d.ts
+++ b/src/types/descriptions.d.ts
@@ -9,5 +9,6 @@ export interface DescriptionsSchema {
   className?: string
   labelClassName?: string
   dateFormat?: string // add by 星语：支持时间的格式化
+  valueFilter?: function // 展示的过滤函数
   dictType?: string // add by 星语：支持 dict 字典数据
 }
diff --git a/src/views/wms/buttMesManage/mesBarCode/index.vue b/src/views/wms/buttMesManage/mesBarCode/index.vue
index 0a1eebafe..8fcfd22b5 100644
--- a/src/views/wms/buttMesManage/mesBarCode/index.vue
+++ b/src/views/wms/buttMesManage/mesBarCode/index.vue
@@ -27,6 +27,13 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
+    
+    <template #type="{row}">
+        <span v-if="row.type == 'P'||row.type == 'Q'">
+          {{ row.type == 'P'?'未加密标签':'加密标签'}}
+        </span>
+        <span v-else>{{ row.type }}</span>
+      </template>
       <template #plnt="{row}">
         <el-button type="primary" link @click="openDetail(row, '代码', row.plnt)">
           <span>{{ row.plnt }}</span>
diff --git a/src/views/wms/buttMesManage/mesBarCode/mesBarCode.data.ts b/src/views/wms/buttMesManage/mesBarCode/mesBarCode.data.ts
index 0124386fa..e59718da6 100644
--- a/src/views/wms/buttMesManage/mesBarCode/mesBarCode.data.ts
+++ b/src/views/wms/buttMesManage/mesBarCode/mesBarCode.data.ts
@@ -1,6 +1,8 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
-
+import {  getTenantId } from '@/utils/auth'
+let names =[{"text":"1379","value":1},{"text":"1397","value":2},{"text":"2379","value":3}]
+let tenant = names.find(item=>item.value == getTenantId())
 // 表单校验
 export const MesBarCodeRules = reactive({
   available: [required],
@@ -11,79 +13,106 @@ export const MesBarCodeRules = reactive({
 
 export const MesBarCode = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: 'Plnt',
+    label: '租户',
     field: 'plnt',
     sort: 'custom',
     table: {
       width: 120
     },
     form: {
-      component: 'InputNumber',
-      value: 0
-    },
-  },
-  {
-    label: 'Counter',
-    field: 'counter',
-    sort: 'custom',
-  table: {
-      width: 150
-    },
-    isSearch:true
-  },
-  {
-    label: 'SIGN',
-    field: 'sign',
-    sort: 'custom',
-  table: {
-      width: 120
-    },
-  },
-  {
-    label: 'Option',
-    field: 'option',
-    sort: 'custom',
-  table: {
-      width: 120
+      componentProps: {
+        disabled:true,
+        value: tenant?.text
+      },
     },
   },
+  // {
+  //   label: 'Counter',
+  //   field: 'counter',
+  //   sort: 'custom',
+  // table: {
+  //     width: 150
+  //   },
+  //   isSearch:true
+  // },
+  // {
+  //   label: 'SIGN',
+  //   field: 'sign',
+  //   sort: 'custom',
+  // table: {
+  //     width: 120
+  //   },
+  // },
+  // {
+  //   label: 'Option',
+  //   field: 'option',
+  //   sort: 'custom',
+  // table: {
+  //     width: 120
+  //   },
+  // },
   {
-    label: 'Lower Lim.',
+    label: 'WMS物料代码',
     field: 'lowerLim',
     sort: 'custom',
-  table: {
-      width: 150
-    },
-  },
-  {
-    label: 'UpperLimit',
-    field: 'upperLimit',
-    sort: 'custom',
-  table: {
+    isSearch: true,
+    table: {
       width: 150
     },
   },
+  // {
+  //   label: 'UpperLimit',
+  //   field: 'upperLimit',
+  //   sort: 'custom',
+  // table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: 'ITAC',
+  //   field: 'itac',
+  //   sort: 'custom',
+  // table: {
+  //     width: 120
+  //   },
+  // },
   {
-    label: 'ITAC',
-    field: 'itac',
-    sort: 'custom',
-  table: {
-      width: 120
-    },
-  },
-  {
-    label: 'Type',
+    label: '灯码标签类型',
     field: 'type',
     sort: 'custom',
-  table: {
+    table: {
       width: 120
     },
+    form: {
+      component: 'Select',
+      componentProps: {
+        options: [{
+          label:'未加密标签',
+          value:'P'
+        },{
+          label:'加密标签',
+          value:'Q'
+        }],
+      }
+    },
+    detail:{
+      valueFilter:(value)=>{
+        if(value=='P'){
+          return `未加密标签`
+        }else if(value=='Q'){
+          return '加密标签'
+        }else{
+          return value
+        }
+      }
+    }
+    
   },
   {
-    label: 'Length BC',
+    label: '灯码标签字符总长度',
     field: 'lengthBc',
     sort: 'custom',
-  table: {
+    table: {
       width: 150
     },
     form: {
@@ -91,19 +120,19 @@ export const MesBarCode = useCrudSchemas(reactive<CrudSchema[]>([
       value: 0
     },
   },
+  // {
+  //   label: 'Pos. mat',
+  //   field: 'posMat',
+  //   sort: 'custom',
+  // table: {
+  //     width: 150
+  //   },
+  // },
   {
-    label: 'Pos. mat',
-    field: 'posMat',
-    sort: 'custom',
-  table: {
-      width: 150
-    },
-  },
-  {
-    label: 'Length mat',
+    label: '客户物料代码字符长度',
     field: 'lengthMat',
     sort: 'custom',
-  table: {
+    table: {
       width: 150
     },
     form: {
@@ -111,76 +140,77 @@ export const MesBarCode = useCrudSchemas(reactive<CrudSchema[]>([
       value: 0
     },
   },
+  // {
+  //   label: 'Pos. revlv',
+  //   field: 'posRevlv',
+  //   sort: 'custom',
+  // table: {
+  //     width: 150
+  //   },
+  // },
   {
-    label: 'Pos. revlv',
-    field: 'posRevlv',
-    sort: 'custom',
-  table: {
-      width: 150
-    },
-  },
-  {
-    label: 'Part number',
+    label: '客户物料代码',
     field: 'partNumber',
     sort: 'custom',
-  table: {
-      width: 150
-    },
-  },
-  {
-    label: 'Pack Label',
-    field: 'packLabel',
-    sort: 'custom',
-  table: {
-      width: 150
-    },
-  },
-  {
-    label: 'OES-Label',
-    field: 'oesLabel',
-    sort: 'custom',
-  table: {
-      width: 150
-    },
-  },
-  {
-    label: 'Check Rvl',
-    field: 'checkRvl',
-    sort: 'custom',
-  table: {
-      width: 150
-    },
-  },
-  {
-    label: 'Days',
-    field: 'days',
-    sort: 'custom',
-  table: {
-      width: 120
-    },
-    form: {
-      component: 'InputNumber',
-      value: 0
-    },
-  },
-  {
-    label: '是否可用',
-    field: 'available',
-    sort: 'custom',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
+    isSearch: true,
     table: {
-      width: 120
+      width: 150
     },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
-      }
-    }
   },
+  // {
+  //   label: 'Pack Label',
+  //   field: 'packLabel',
+  //   sort: 'custom',
+  // table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: 'OES-Label',
+  //   field: 'oesLabel',
+  //   sort: 'custom',
+  // table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: 'Check Rvl',
+  //   field: 'checkRvl',
+  //   sort: 'custom',
+  // table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: 'Days',
+  //   field: 'days',
+  //   sort: 'custom',
+  // table: {
+  //     width: 120
+  //   },
+  //   form: {
+  //     component: 'InputNumber',
+  //     value: 0
+  //   },
+  // },
+  // {
+  //   label: '是否可用',
+  //   field: 'available',
+  //   sort: 'custom',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   table: {
+  //     width: 120
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: 'TRUE',
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE'
+  //     }
+  //   }
+  // },
   {
     label: '创建时间',
     field: 'createTime',
@@ -245,14 +275,14 @@ export const MesBarCode = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     }
   },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-  table: {
-      width: 120
-    },
-  },
+  // {
+  //   label: '备注',
+  //   field: 'remark',
+  //   sort: 'custom',
+  // table: {
+  //     width: 120
+  //   },
+  // },
   {
     label: '操作',
     field: 'action',

From 44db8ab69f9858dfca85bdeb737100c139d37c23 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 1 Aug 2024 14:03:17 +0800
Subject: [PATCH 14/18] =?UTF-8?q?=E7=89=A9=E6=96=99=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E5=B8=A6=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/basicDataManage/itemManage/bom/bom.data.ts | 5 +++++
 src/views/wms/basicDataManage/itemManage/bom/index.vue   | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts b/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts
index 31f22135a..a94d3709a 100644
--- a/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts
@@ -82,6 +82,11 @@ export const Bom = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: true,
     table: {
       width: 150
+    },
+    form:{
+      componentProps:{
+        disabled: true,
+      }
     }
   },
   {
diff --git a/src/views/wms/basicDataManage/itemManage/bom/index.vue b/src/views/wms/basicDataManage/itemManage/bom/index.vue
index 37400681d..7f21ff7b8 100644
--- a/src/views/wms/basicDataManage/itemManage/bom/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/bom/index.vue
@@ -216,6 +216,9 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
   nextTick(() => {
     const setV = {}
     setV[formField] = val[0][searchField]
+    if('componentItemCode'==formField){
+      setV['componentUom'] = val[0]['uom']
+    }
     formRef.setValues(setV)
   })
 }

From 0bfdd44bbf15d5dd04ac12307fbf1dd829e06deb Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 1 Aug 2024 14:06:15 +0800
Subject: [PATCH 15/18] =?UTF-8?q?=E5=B0=8F=E5=8D=9A=E6=8F=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sparereceiptRequestMain/sparereceiptRequestMain.data.ts  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
index 99db532f3..87959bca3 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
@@ -575,7 +575,7 @@ export const PurchasereceiptRequestMainRules = reactive({
   ppNumber: [
     { required: true, message: '请输入采购订单', trigger: 'blur' }
   ],
-  supplierCode: [
+  poNumber: [
     { required: true, message: '请输入供应商代码', trigger: 'blur' }
   ],
   toWarehouseCode: [
@@ -1376,6 +1376,9 @@ export const PurchasereceiptRequestDetailRules = reactive({
   itemCode: [
     { required: true, message: '请输入物料代码', trigger: 'change' }
   ],
+  qty: [
+    { required: true, message: '请输入收货数量', trigger: 'change' }
+  ],
   defaultToLocationCode: [
     { required: true, message: '请选择到库位代码', trigger: 'blur' }
   ],

From d72a56567e387676154efcc088f46067b6df1198 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 1 Aug 2024 14:10:49 +0800
Subject: [PATCH 16/18] =?UTF-8?q?=E5=96=9C=E5=A9=B7--=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8E=BB=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/inventoryManage/package/index.vue       | 2 +-
 src/views/wms/inventoryManage/package/package.data.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/inventoryManage/package/index.vue b/src/views/wms/inventoryManage/package/index.vue
index db7d03d83..df0e9e8e9 100644
--- a/src/views/wms/inventoryManage/package/index.vue
+++ b/src/views/wms/inventoryManage/package/index.vue
@@ -155,7 +155,7 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'wms:package:update'}), // 编辑
+  // defaultButtons.mainListEditBtn({hasPermi:'wms:package:update'}), // 编辑
   // defaultButtons.mainListDeleteBtn({hasPermi:'wms:package:delete'}), // 删除
   defaultButtons.mainListPointBtn(null), // 标签打印
 ]
diff --git a/src/views/wms/inventoryManage/package/package.data.ts b/src/views/wms/inventoryManage/package/package.data.ts
index b93c7d5d1..ee72aae78 100644
--- a/src/views/wms/inventoryManage/package/package.data.ts
+++ b/src/views/wms/inventoryManage/package/package.data.ts
@@ -458,7 +458,7 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'action',
     isForm: false,
     table: {
-      width: 150,
+      width: 120,
       fixed: 'right'
     }
   }

From a4cc7f638a83ef0cd9d584b782e809b1f70f83cd Mon Sep 17 00:00:00 2001
From: zhaoyiran <zhaoyrd@yonyou.com>
Date: Thu, 1 Aug 2024 14:13:24 +0800
Subject: [PATCH 17/18] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/qms/inspectionRecord/inspectionRecordMain/index.ts | 5 +++++
 src/views/qms/inspectionRecord/index.vue                   | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/api/qms/inspectionRecord/inspectionRecordMain/index.ts b/src/api/qms/inspectionRecord/inspectionRecordMain/index.ts
index dfd99059f..67ca4a31f 100644
--- a/src/api/qms/inspectionRecord/inspectionRecordMain/index.ts
+++ b/src/api/qms/inspectionRecord/inspectionRecordMain/index.ts
@@ -77,3 +77,8 @@ export const publishInspectionRecordMain = async (id) => {
   return await request.put({ url: `/qms/inspection-record-main/publish?id=`+id })
 }
 
+// 执行检验任务
+export const executeInspectionRecordMain = async (data) => {
+  return await request.put({ url: `/qms/inspection-record-main/execute`, data })
+}
+
diff --git a/src/views/qms/inspectionRecord/index.vue b/src/views/qms/inspectionRecord/index.vue
index 01685356f..efc788c35 100644
--- a/src/views/qms/inspectionRecord/index.vue
+++ b/src/views/qms/inspectionRecord/index.vue
@@ -387,7 +387,7 @@ const submitFormExecute = async (formType, data) => {
       await InspectionJobMainApi.createInspectionJobMain(data)
       message.success(t('common.createSuccess'))
     } else if (formType === 'execute') {
-      await InspectionJobMainApi.executeInspectionJobMain(data)
+      await InspectionRecordMainApi.executeInspectionRecordMain(data)
       message.success(t('common.updateSuccess'))
     }
     basicFormRef.value.dialogVisible = false

From 496d5ebb13e6b8a5c2b6893d60d7bb62850ee232 Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Thu, 1 Aug 2024 14:35:12 +0800
Subject: [PATCH 18/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=90=E8=BE=93?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereceiptJobMain/purchasereceiptJobMain.data.ts        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
index 3ca5061c7..c5bc9e337 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
@@ -96,6 +96,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(
     {
       label: '运输方式',
       field: 'transferMode',
+      dictType: DICT_TYPE.TRANSFER_MODE,
       sort: 'custom',
       table: {
         width: 150