From 2c519389d39acee23435678df7ba4b576c086895 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Sun, 7 Apr 2024 10:57:35 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E5=A4=87=E4=BB=B6=E9=A2=86=E7=94=A8?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/unplannedissueRecordMain/index.ts | 25 +++++++++++++++++++
 .../sparepartsrequisitionJobMain/index.vue    |  2 +-
 .../sparepartsrequisitionRecordMain/index.vue |  4 +--
 .../index.vue                                 |  2 +-
 4 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/src/api/wms/unplannedissueRecordMain/index.ts b/src/api/wms/unplannedissueRecordMain/index.ts
index 41c4cac1b..772b38813 100644
--- a/src/api/wms/unplannedissueRecordMain/index.ts
+++ b/src/api/wms/unplannedissueRecordMain/index.ts
@@ -29,8 +29,33 @@ export const getUnplannedissueRecordMainPage = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
+    const dataTypeCondition = {
+      'column':'dataType',
+      'action':'==',
+      'value':'1'
+    }
+    data.filters.push(dataTypeCondition)
     return await request.post({ url: '/wms/unplannedissue-record-main/senior', data })
   } else {
+    params.dataType='1'
+    return await request.get({ url: `/wms/unplannedissue-record-main/page`, params })
+  }
+}
+
+// 查询计划外出库记录主列表
+export const getUnplannedissueRecordMainPageSpare = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    const dataTypeCondition = {
+      'column':'dataType',
+      'action':'==',
+      'value':'2'
+    }
+    data.filters.push(dataTypeCondition)
+    return await request.post({ url: '/wms/unplannedissue-record-main/senior', data })
+  } else {
+    params.dataType='2'
     return await request.get({ url: `/wms/unplannedissue-record-main/page`, params })
   }
 }
diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue
index 582c86a2e..3d5419c2d 100644
--- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue
+++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue
@@ -73,7 +73,7 @@ import * as UnplannedissueJobDetailApi from '@/api/wms/unplannedissueJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 计划外出库任务主
-defineOptions({ name: 'UnplannedissueJobMain' })
+defineOptions({ name: 'UnplannedissueJobMainSpare' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue
index d07d2ec17..215d8c4df 100644
--- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue
@@ -68,7 +68,7 @@ import * as UnplannedissueRecordDetailApi from '@/api/wms/unplannedissueRecordDe
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 计划外出库记录主
-defineOptions({ name: 'UnplannedissueRecordMain' })
+defineOptions({ name: 'UnplannedissueRecordMainSpare' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
@@ -84,7 +84,7 @@ const updataTableColumns = (val) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: UnplannedissueRecordMainApi.getUnplannedissueRecordMainPage // 分页接口
+  getListApi: UnplannedissueRecordMainApi.getUnplannedissueRecordMainPageSpare // 备件领用分页接口
 })
 
 // 获得表格的各种操作
diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
index 21e0599a3..6e9b150e5 100644
--- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
@@ -88,7 +88,7 @@ import * as UnplannedissueRequestDetailApi from '@/api/wms/unplannedissueRequest
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 
 // 计划外出库申请
-defineOptions({ name: 'UnplannedissueRequestMain' })
+defineOptions({ name: 'UnplannedissueRequestMainSpare' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化

From 7e003d0231050db0f5d9f966827f98bde8d7fca3 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Sun, 7 Apr 2024 11:32:48 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?=
 =?UTF-8?q?=E7=A5=A8=E7=94=B3=E8=AF=B7--=E6=96=B0=E5=A2=9E--=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=E5=B7=AE=E9=A2=9D=EF=BC=8C=E7=A8=8E=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue    | 31 ++++++++++++++-----
 src/components/TableForm/src/TableForm.vue    |  3 ++
 .../supplierinvoiceRequestMain/index.vue      | 29 ++++++++++++++---
 .../supplierinvoiceRequestMain.data.ts        |  2 ++
 4 files changed, 52 insertions(+), 13 deletions(-)

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 17ebdb7ae..37c569f8b 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -89,7 +89,11 @@
         @inputNumberChange="inputNumberChange"
         @tableFormSelectOnBlur="tableFormSelectOnBlur"
         @formFormDateChange="formFormDateChange"
-      />
+      >
+      <template v-slot="{row}">
+        <slot :row="row"></slot>
+      </template>
+    </TableForm>
     </div>
     <div v-if="isBusiness && formType == 'create' && fromeWhere == 'countPlan'">
       <TableFormCountPlan 
@@ -275,12 +279,17 @@ const props = defineProps({
   //表单中展示的数据，需要用searchTable中字段计算
   /***[{
     formField:form中对应的field,
-    valueField:searchtable中对应的field,
+    tableField:searchtable中对应的field,
   }]*/
-  sumFormData:{
+  sumFormDataField:{
     type: Array,
     required: false,
     default: null
+  },
+  sumFormDataByForm:{
+    type:Function,
+    required: false,
+    default: null
   }
 })
 
@@ -395,11 +404,11 @@ const opensearchTable = (
 }
 
 
-const changeSumFormData = () => {
-  if(props.sumFormData){
+const sumFormDataByTable = () => {
+  if(props.sumFormDataField){
     const sumObject = {}
-    props.sumFormData.forEach(sumItem=>{
-      sumObject[sumItem?.formField]= props.tableData.reduce((prev, item) => prev + item[sumItem?.valueField],0)
+    props.sumFormDataField.forEach(sumItem=>{
+      sumObject[sumItem?.formField]= props.tableData.reduce((prev, item) => prev + item[sumItem?.tableField],0)
     })
     nextTick(()=>{
       formRef.value.setValues(sumObject)
@@ -407,7 +416,13 @@ const changeSumFormData = () => {
   }
 }
 watch(()=>props.tableData,() => {
-  changeSumFormData()
+  sumFormDataByTable()
+
+},{
+  deep:true
+})
+watch(()=>unref(formRef)?.formModel,() => {
+  props?.sumFormDataByForm(formRef,unref(formRef)?.formModel)
 },{
   deep:true
 })
diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
index ee1a8b6c2..c70baed07 100644
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@@ -69,6 +69,9 @@
             />
             <el-button  v-if="headerItem?.tableForm?.isInpuFocusShow" @click="inpuFocus(headerItem,row,index)"><Icon icon="ep:search" size="14"/></el-button>
           </el-form-item>
+          <el-form-item  v-if="headerItem?.tableForm?.type == 'slot'">
+            <slot :row="row"></slot>
+          </el-form-item>
           <!-- 金额输入框 -->
             <el-form-item 
               v-if="headerItem?.tableForm?.type == 'number'"
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 5415a44be..b99ed94a3 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -43,18 +43,28 @@
     :tableAllSchemas="SupplierinvoiceRequestDetail.allSchemas" 
     :tableFormRules="SupplierinvoiceRequestDetailRules"
     :tableData="tableData" 
-    :sumFormData = "[{
+    :sumFormDataField = "[{
       formField:'amount',
-      valueField:'singlePrice'
+      tableField:'singlePrice'
     }]"
+    :sumFormDataByForm ="(formRef,formModel)=>{
+      const {taxRate=0,amount=0} = formModel
+      formRef.value.setValues({
+        taxAmount:taxRate*amount
+      })
+    }"
     :apiUpdate="SupplierinvoiceRequestMainApi.updateSupplierinvoiceRequestMain"
     :apiCreate="SupplierinvoiceRequestMainApi.createSupplierinvoiceRequestMain" 
     :isBusiness="true"
     @handleAddTable="handleAddTable" 
     @handleDeleteTable="handleDeleteTable" 
     @searchTableSuccess="searchTableSuccess"
-    @submitForm="submitForm" 
-  />
+    @submitForm="submitForm"
+  >      
+    <template v-slot="{row}">
+      <el-input :disabled="true" :class="{'is-red': row['singlePrice'] - row['purchasePrice'] > 0}" :modelValue="row['singlePrice'] - row['purchasePrice']"/>
+    </template>
+  </BasicForm>
 
   <!-- 详情 -->
   <Detail
@@ -134,7 +144,7 @@
       searchTablePage: SupplierApi.getSupplierPage
     }
   ])
-
+ 
   // 查询页面返回
   const searchTableSuccess = (formField, searchField, val, searchFormRef, type, row) => {
     nextTick(() => {
@@ -566,3 +576,12 @@ const importSuccess = () => {
     importTemplateData.templateUrl = await SupplierinvoiceRequestMainApi.importTemplate()
   })
 </script>
+
+<style lang="scss" scoped>
+.is-red{
+  border-radius:var(--el-border-radius-base);
+  border:1px solid var(--el-color-danger);
+  box-shadow: 0 0 0 1px var(--el-color-danger) inset;
+
+}
+</style>
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index 9feb3aa58..6952d3c09 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -187,6 +187,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       componentProps: {
         min: 0,
         precision: 6,
+        disabled: true,
       }
     },
     tableForm: {
@@ -734,6 +735,7 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       }
     },
     tableForm:{
+      type: 'slot',
       disabled: true
     }
   },

From e0dcbea51f241a9eeccc5aec18a6f830814af9c9 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Sun, 7 Apr 2024 11:39:27 +0800
Subject: [PATCH 3/9] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 37c569f8b..950cbeaf7 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -422,7 +422,9 @@ watch(()=>props.tableData,() => {
   deep:true
 })
 watch(()=>unref(formRef)?.formModel,() => {
-  props?.sumFormDataByForm(formRef,unref(formRef)?.formModel)
+  if(props?.sumFormDataByForm&&unref(formRef)?.formModel){
+    props?.sumFormDataByForm(formRef,unref(formRef)?.formModel)
+  }
 },{
   deep:true
 })

From 744125699d638749e74798d7a678b7848c1ec1ee Mon Sep 17 00:00:00 2001
From: bjang03 <wenwu901@icloud.com>
Date: Sun, 7 Apr 2024 11:50:52 +0800
Subject: [PATCH 4/9] =?UTF-8?q?1=E3=80=81=E8=AE=A2=E5=8D=95=E6=9C=88?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E7=BA=A7=E8=81=94=E5=88=A0=E9=99=A4=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/ordermonthplan/index.ts           |  53 ++++++
 src/views/mes/ordermonthplan/index.vue        |  44 +++--
 .../ordermonthplan/mesOrderMonthMain.data.ts  |  51 +++---
 .../ordermonthplan/mesOrderMonthSub.data.ts   | 162 ++++++++++++++++++
 4 files changed, 271 insertions(+), 39 deletions(-)
 create mode 100644 src/views/mes/ordermonthplan/mesOrderMonthSub.data.ts

diff --git a/src/api/mes/ordermonthplan/index.ts b/src/api/mes/ordermonthplan/index.ts
index 3c86a1a5c..d3fc9bfd1 100644
--- a/src/api/mes/ordermonthplan/index.ts
+++ b/src/api/mes/ordermonthplan/index.ts
@@ -58,3 +58,56 @@ export const exportMesOrderMonthMain = async (params) => {
 export const importTemplate = () => {
   return request.download({ url: '/plan/mes-order-month-main/get-import-template' })
 }
+
+export interface MesOrderMonthSubVO {
+  status: string
+  remark: string
+  productCode: string
+  bomCode: string
+  inStoreCode: string
+  planBegin: Date
+  planEnd: Date
+  realStart: string
+  realFinish: Date
+  planCount: number
+  finishCount: number
+  qualifiedCount: number
+  unqualifiedCount: number
+  flagBackwash: string
+  productBatchcode: string
+}
+// 查询订单月计划子列表
+export const getMesOrderMonthSubPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/plan/mes-order-month-sub/senior', data })
+  } else {
+    return await request.get({ url: `/plan/mes-order-month-sub/page`, params })
+  }
+}
+
+// 查询订单月计划子详情
+export const getMesOrderMonthSub = async (id: number) => {
+  return await request.get({ url: `/plan/mes-order-month-sub/get?id=` + id })
+}
+
+// 新增订单月计划子
+export const createMesOrderMonthSub = async (data: MesOrderMonthSubVO) => {
+  return await request.post({ url: `/plan/mes-order-month-sub/create`, data })
+}
+
+// 修改订单月计划子
+export const updateMesOrderMonthSub = async (data: MesOrderMonthSubVO) => {
+  return await request.put({ url: `/plan/mes-order-month-sub/update`, data })
+}
+
+// 删除订单月计划子
+export const deleteMesOrderMonthSub = async (id: number) => {
+  return await request.delete({ url: `/plan/mes-order-month-sub/delete?id=` + id })
+}
+
+// 导出订单月计划子 Excel
+export const exportMesOrderMonthSub = async (params) => {
+  return await request.download({ url: `/plan/mes-order-month-sub/export-excel`, params })
+}
diff --git a/src/views/mes/ordermonthplan/index.vue b/src/views/mes/ordermonthplan/index.vue
index bea98e710..eaf3a3cde 100644
--- a/src/views/mes/ordermonthplan/index.vue
+++ b/src/views/mes/ordermonthplan/index.vue
@@ -27,9 +27,9 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #code="{row}">
-        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
-          <span>{{ row.code }}</span>
+      <template #planMasterCode="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.planMasterCode)">
+          <span>{{ row.planMasterCode }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
@@ -44,17 +44,26 @@
     @success="formsSuccess"
     :rules="MesOrderMonthMainRules"
     :formAllSchemas="MesOrderMonthMain.allSchemas"
-    :apiUpdate="MesOrderMonthMainApi.updateMesOrderMonthMain"
-    :apiCreate="MesOrderMonthMainApi.createMesOrderMonthMain"
-    @searchTableSuccess="searchTableSuccess"
+    :apiUpdate="MesOrderMonthApi.updateMesOrderMonthMain"
+    :apiCreate="MesOrderMonthApi.createMesOrderMonthMain"
+    :apiDelete="MesOrderMonthApi.deleteMesOrderMonthMain"
     :isBusiness="false"
   />
 
   <!-- 详情 -->
   <Detail ref="detailRef"
           :isBasic="false"
-          :detailAllSchemasRules="MesOrderMonthMainRules"
           :allSchemas="MesOrderMonthMain.allSchemas"
+          :detailAllSchemas="MesOrderMonthSub.allSchemas"
+          :detailAllSchemasRules="MesOrderMonthSubRules"
+          :apiPage="MesOrderMonthApi.getMesOrderMonthSubPage"
+          :apiCreate="MesOrderMonthApi.createMesOrderMonthSub"
+          :apiUpdate="MesOrderMonthApi.updateMesOrderMonthSub"
+          :apiDelete="MesOrderMonthApi.deleteMesOrderMonthSub"
+          :tabs="TabsList"
+          :detailButtonIsShowAdd="true"
+          :detailButtonIsShowDelete="true"
+          :detailButtonIsShowEdit="false"
   />
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/plan/mes-order-month-main/import"
@@ -63,18 +72,21 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import {MesOrderMonthMain, MesOrderMonthMainRules} from './mesOrderMonthMain.data'
-import * as MesOrderMonthMainApi from '@/api/mes/ordermonthplan'
+import {MesOrderMonthMain, MesOrderMonthMainRules,TabsList} from './mesOrderMonthMain.data'
+import * as MesOrderMonthApi from '@/api/mes/ordermonthplan'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
+import {
+  MesOrderMonthSub,
+  MesOrderMonthSubRules
+} from "@/views/mes/ordermonthplan/mesOrderMonthSub.data";
 
 defineOptions({ name: 'MesOrderMonthMain' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
-
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
@@ -95,7 +107,7 @@ const updataTableColumns = (val) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: MesOrderMonthMainApi.getMesOrderMonthMainPage // 分页接口
+  getListApi: MesOrderMonthApi.getMesOrderMonthMainPage // 分页接口
 })
 
 // 获得表格的各种操作
@@ -170,10 +182,10 @@ const formsSuccess = async (formType,data) => {
   if(data.activeTime==0)data.activeTime = null;
   if(data.expireTime==0)data.expireTime = null;
   if (formType === 'create') {
-    await MesOrderMonthMainApi.createMesOrderMonthMain(data)
+    await MesOrderMonthApi.createMesOrderMonthMain(data)
     message.success(t('common.createSuccess'))
   } else {
-    await MesOrderMonthMainApi.updateMesOrderMonthMain(data)
+    await MesOrderMonthApi.updateMesOrderMonthMain(data)
     message.success(t('common.updateSuccess'))
   }
   basicFormRef.value.dialogVisible = false
@@ -192,7 +204,7 @@ const handleDelete = async (id: number) => {
     // 删除的二次确认
     await message.delConfirm()
     // 发起删除
-    await MesOrderMonthMainApi.deleteMesOrderMonthMain(id)
+    await MesOrderMonthApi.deleteMesOrderMonthMain(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
     await getList()
@@ -207,7 +219,7 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await MesOrderMonthMainApi.exportMesOrderMonthMain(tableObject.params)
+    const data = await MesOrderMonthApi.exportMesOrderMonthMain(tableObject.params)
     download.excel(data, '订单计划月主.xlsx')
   } catch {
   } finally {
@@ -242,7 +254,7 @@ const searchFormClick = (searchData) => {
 /** 初始化 **/
 onMounted(async () => {
   getList()
-  importTemplateData.templateUrl = await MesOrderMonthMainApi.importTemplate()
+  importTemplateData.templateUrl = await MesOrderMonthApi.importTemplate()
 })
 
 </script>
diff --git a/src/views/mes/ordermonthplan/mesOrderMonthMain.data.ts b/src/views/mes/ordermonthplan/mesOrderMonthMain.data.ts
index 0fc21aaf8..66be46d39 100644
--- a/src/views/mes/ordermonthplan/mesOrderMonthMain.data.ts
+++ b/src/views/mes/ordermonthplan/mesOrderMonthMain.data.ts
@@ -1,39 +1,43 @@
-import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import type {CrudSchema} from '@/hooks/web/useCrudSchemas'
+import {dateFormatter} from '@/utils/formatTime'
 
 // 表单校验
 export const MesOrderMonthMainRules = reactive({
   planMasterCode: [required],
-  planSubCode:[required],
-  planType:[required],
-  factoryCode:[required]
+  planSubCode: [required],
+  planType: [required],
+  factoryCode: [required]
 })
 
 export const MesOrderMonthMain = useCrudSchemas(reactive<CrudSchema[]>([
+
   {
-    label: '计划类型',
-    field: 'planType',
+    label: '主计划编码',
+    field: 'planMasterCode',
     sort: 'custom',
     isSearch: true
   },
   {
+    label: '计划辅助编码',
+    field: 'planSubCode',
+    sort: 'custom',
+    isSearch: true
+  }, {
     label: '工厂编码',
     field: 'factoryCode',
     sort: 'custom',
     isTable: false
   },
   {
-    label: '主计划编码',
-    field: 'planMasterCode',
+    label: '工厂名称',
+    field: 'factoryName',
     sort: 'custom',
-    isTable: false,
-    isSearch: true
-  },
-  {
-    label: '计划辅助编码',
-    field: 'planSubCode',
+    isSearch: true,
+    isForm: false
+  }, {
+    label: '计划类型',
+    field: 'planType',
     sort: 'custom',
-    isTable: true,
     isSearch: true
   },
   {
@@ -48,6 +52,9 @@ export const MesOrderMonthMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     formatter: dateFormatter,
     isSearch: true,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -65,13 +72,6 @@ export const MesOrderMonthMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
     isForm: false
   },
-  {
-    label: '工厂名称',
-    field: 'factoryName',
-    sort: 'custom',
-    isSearch: true,
-    isForm: false
-  },
   {
     label: '操作',
     field: 'action',
@@ -82,3 +82,8 @@ export const MesOrderMonthMain = useCrudSchemas(reactive<CrudSchema[]>([
     }
   }
 ]))
+export const TabsList = [{
+  label: "子计划",
+  prop: 'mesOrderMonthSub',
+}
+]
diff --git a/src/views/mes/ordermonthplan/mesOrderMonthSub.data.ts b/src/views/mes/ordermonthplan/mesOrderMonthSub.data.ts
new file mode 100644
index 000000000..e24c58e31
--- /dev/null
+++ b/src/views/mes/ordermonthplan/mesOrderMonthSub.data.ts
@@ -0,0 +1,162 @@
+import type {CrudSchema} from '@/hooks/web/useCrudSchemas'
+import {dateFormatter} from '@/utils/formatTime'
+
+// 表单校验
+export const MesOrderMonthSubRules = reactive({
+  productCode: [required],
+  productName: [required],
+  bomCode: [required],
+  inStoreCode: [required],
+  planBegin: [required],
+  planEnd: [required],
+  planCount: [required],
+  productBatchcode: [required]
+})
+
+export const MesOrderMonthSub = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '产品编码',
+    field: 'productCode',
+    sort: 'custom',
+    isTable: false,
+    isSearch: true,
+    form: {
+      component: 'SelectV2'
+    }
+  },
+  {
+    label: '产品名称',
+    field: 'productName',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  },
+  {
+    label: 'BOM编号',
+    field: 'bomCode',
+    sort: 'custom',
+    isTable: false,
+    isSearch: true
+  },
+  {
+    label: '入库仓库编码',
+    field: 'inStoreCode',
+    sort: 'custom',
+    isSearch: true
+  },
+  {
+    label: '计划数量',
+    field: 'planCount',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    }
+  },
+  {
+    label: '完成数量',
+    field: 'finishCount',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    }
+  },
+  {
+    label: '合格数量',
+    field: 'qualifiedCount',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    }
+  },
+  {
+    label: '不合格数量',
+    field: 'unqualifiedCount',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    }
+  },
+  {
+    label: '是否回冲',
+    field: 'flagBackwash',
+    sort: 'custom',
+    isSearch: true
+  },
+  {
+    label: '产品批次号',
+    field: 'productBatchcode',
+    sort: 'custom',
+    isSearch: true
+  }, {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '计划开始日期',
+    field: 'planBegin',
+    sort: 'custom',
+    isSearch: true
+  },
+  {
+    label: '计划结束日期',
+    field: 'planEnd',
+    sort: 'custom',
+    isSearch: true
+  },
+  {
+    label: '实际开工日期',
+    field: 'realStart',
+    sort: 'custom',
+    isSearch: true
+  },
+  {
+    label: '实际完工日期',
+    field: 'realFinish',
+    sort: 'custom',
+    isSearch: true
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isTable: false
+  },
+  {
+    label: '状态',
+    field: 'status',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'Radio'
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))

From 93435c15efbff5247d5103dfd37e8c933c7bfb98 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Sun, 7 Apr 2024 12:40:50 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86--=20=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?=
 =?UTF-8?q?=E7=A5=A8=E7=94=B3=E8=AF=B7--=E6=96=B0=E5=A2=9E--=E7=A8=8E?=
 =?UTF-8?q?=E5=90=8E=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoice/supplierinvoiceRequestMain/index.vue       | 3 ++-
 .../supplierinvoiceRequestMain.data.ts                         | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index b99ed94a3..4ea2598d4 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -50,7 +50,8 @@
     :sumFormDataByForm ="(formRef,formModel)=>{
       const {taxRate=0,amount=0} = formModel
       formRef.value.setValues({
-        taxAmount:taxRate*amount
+        taxAmount:taxRate*amount,
+        afterTaxAmount:amount+taxRate*amount
       })
     }"
     :apiUpdate="SupplierinvoiceRequestMainApi.updateSupplierinvoiceRequestMain"
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index 6952d3c09..72408243f 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -207,6 +207,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       componentProps: {
         min: 0,
         precision: 6,
+        disabled: true,
       }
     },
     tableForm: {

From 69353772268751597596949fdebe4e188369e07a Mon Sep 17 00:00:00 2001
From: bjang03 <wenwu901@icloud.com>
Date: Sun, 7 Apr 2024 13:03:57 +0800
Subject: [PATCH 6/9] =?UTF-8?q?1=E3=80=81=E8=AE=A2=E5=8D=95=E6=9C=88?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=EF=BC=8C=E8=AE=A1=E5=88=92=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=AD=97=E5=85=B8=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/dict.ts                                      | 2 +-
 src/views/mes/ordermonthplan/mesOrderMonthMain.data.ts | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index c90f1b236..0d403d742 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -285,7 +285,7 @@ export enum DICT_TYPE {
   MES_WORKBILL_MODEL='mes_workbill_model',// 工单模式 单工单（根据产品数量生成多个工单）、批量工单（一个产品一个工单）
   MES_TASK_MODE='mes_task_mode', //生产模式 派工方式、领工方式
   MES_PLANDO_STATUS='mes_plando_status', //计划执行状
-  
+  PLAN_TYPE_MES='plan_type_mes',
 
   //========== QMS ==========
   SAMPLING_TYPE = "sampling_type", // 取样类型
diff --git a/src/views/mes/ordermonthplan/mesOrderMonthMain.data.ts b/src/views/mes/ordermonthplan/mesOrderMonthMain.data.ts
index 66be46d39..62cdd8d45 100644
--- a/src/views/mes/ordermonthplan/mesOrderMonthMain.data.ts
+++ b/src/views/mes/ordermonthplan/mesOrderMonthMain.data.ts
@@ -38,7 +38,12 @@ export const MesOrderMonthMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '计划类型',
     field: 'planType',
     sort: 'custom',
-    isSearch: true
+    dictType: DICT_TYPE.PLAN_TYPE_MES,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    isSearch: true,
+    form: {
+      component: 'SelectV2'
+    }
   },
   {
     label: '备注',

From 080a8023c4cee319c54d4054e8f7ee3d44dea7cf Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Sun, 7 Apr 2024 13:21:59 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=EF=BC=8C=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inspectionJobDetail/index.ts              |   20 +-
 .../inspectionJob/inspectionJobMain/index.ts  |   16 +-
 .../inspectionPlan/addForm.vue                |    3 +-
 .../basicDataManage/inspectionPlan/index.vue  |    1 -
 .../inspectionTemplate/addForm.vue            |   16 +-
 .../qms/inspection/inspectionJob/addForm.vue  | 1010 +++++++++++++++++
 .../qms/inspection/inspectionJob/index.vue    |   39 +-
 .../inspectionJob/inspectionJobMain.data.ts   |   12 +-
 8 files changed, 1077 insertions(+), 40 deletions(-)
 create mode 100644 src/views/qms/inspection/inspectionJob/addForm.vue

diff --git a/src/api/qms/inspectionJob/inspectionJobDetail/index.ts b/src/api/qms/inspectionJob/inspectionJobDetail/index.ts
index 742627e2b..12679e310 100644
--- a/src/api/qms/inspectionJob/inspectionJobDetail/index.ts
+++ b/src/api/qms/inspectionJob/inspectionJobDetail/index.ts
@@ -28,38 +28,42 @@ export const getInspectionJobDetailPage = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
-    return await request.post({ url: '/inspection/inspection-job-detail/senior', data })
+    return await request.post({ url: '/qms/inspection-job-detail/senior', data })
   } else {
-    return await request.get({ url: `/inspection/inspection-job-detail/page`, params })
+    return await request.get({ url: `/qms/inspection-job-detail/page`, params })
   }
 }
+//查询检验申请列表
+export const getInspectionJobDetailList = async (id: number) => {
+  return await request.get({ url: `/qms/inspection-job-detail/list?masterId=` + id })
+}
 
 // 查询检验申请详情
 export const getInspectionJobDetail = async (id: number) => {
-  return await request.get({ url: `/inspection/inspection-job-detail/get?id=` + id })
+  return await request.get({ url: `/qms/inspection-job-detail/get?id=` + id })
 }
 
 // 新增检验申请
 export const createInspectionJobDetail = async (data: InspectionJobDetailVO) => {
-  return await request.post({ url: `/inspection/inspection-job-detail/create`, data })
+  return await request.post({ url: `/qms/inspection-job-detail/create`, data })
 }
 
 // 修改检验申请
 export const updateInspectionJobDetail = async (data: InspectionJobDetailVO) => {
-  return await request.put({ url: `/inspection/inspection-job-detail/update`, data })
+  return await request.put({ url: `/qms/inspection-job-detail/update`, data })
 }
 
 // 删除检验申请
 export const deleteInspectionJobDetail = async (id: number) => {
-  return await request.delete({ url: `/inspection/inspection-job-detail/delete?id=` + id })
+  return await request.delete({ url: `/qms/inspection-job-detail/delete?id=` + id })
 }
 
 // 导出检验申请 Excel
 export const exportInspectionJobDetail = async (params) => {
-  return await request.download({ url: `/inspection/inspection-job-detail/export-excel`, params })
+  return await request.download({ url: `/qms/inspection-job-detail/export-excel`, params })
 }
 
 // 下载用户导入模板
 export const importTemplate = () => {
-  return request.download({ url: '/inspection/inspection-job-detail/get-import-template' })
+  return request.download({ url: '/qms/inspection-job-detail/get-import-template' })
 }
diff --git a/src/api/qms/inspectionJob/inspectionJobMain/index.ts b/src/api/qms/inspectionJob/inspectionJobMain/index.ts
index 7bb8b4411..96170650a 100644
--- a/src/api/qms/inspectionJob/inspectionJobMain/index.ts
+++ b/src/api/qms/inspectionJob/inspectionJobMain/index.ts
@@ -28,38 +28,38 @@ export const getInspectionJobMainPage = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
-    return await request.post({ url: '/inspection/inspection-job-main/senior', data })
+    return await request.post({ url: '/qms/inspection-job-main/senior', data })
   } else {
-    return await request.get({ url: `/inspection/inspection-job-main/page`, params })
+    return await request.get({ url: `/qms/inspection-job-main/page`, params })
   }
 }
 
 // 查询检验申请详情
 export const getInspectionJobMain = async (id: number) => {
-  return await request.get({ url: `/inspection/inspection-job-main/get?id=` + id })
+  return await request.get({ url: `/qms/inspection-job-main/get?id=` + id })
 }
 
 // 新增检验申请
 export const createInspectionJobMain = async (data: InspectionJobMainVO) => {
-  return await request.post({ url: `/inspection/inspection-job-main/create`, data })
+  return await request.post({ url: `/qms/inspection-job-main/create`, data })
 }
 
 // 修改检验申请
 export const updateInspectionJobMain = async (data: InspectionJobMainVO) => {
-  return await request.put({ url: `/inspection/inspection-job-main/update`, data })
+  return await request.put({ url: `/qms/inspection-job-main/update`, data })
 }
 
 // 删除检验申请
 export const deleteInspectionJobMain = async (id: number) => {
-  return await request.delete({ url: `/inspection/inspection-job-main/delete?id=` + id })
+  return await request.delete({ url: `/qms/inspection-job-main/delete?id=` + id })
 }
 
 // 导出检验申请 Excel
 export const exportInspectionJobMain = async (params) => {
-  return await request.download({ url: `/inspection/inspection-job-main/export-excel`, params })
+  return await request.download({ url: `/qms/inspection-job-main/export-excel`, params })
 }
 
 // 下载用户导入模板
 export const importTemplate = () => {
-  return request.download({ url: '/inspection/inspection-job-main/get-import-template' })
+  return request.download({ url: '/qms/inspection-job-main/get-import-template' })
 }
diff --git a/src/views/qms/basicDataManage/inspectionPlan/addForm.vue b/src/views/qms/basicDataManage/inspectionPlan/addForm.vue
index 591a4a6cb..f427dbd65 100644
--- a/src/views/qms/basicDataManage/inspectionPlan/addForm.vue
+++ b/src/views/qms/basicDataManage/inspectionPlan/addForm.vue
@@ -7,7 +7,7 @@
       :close-on-click-modal="false"
       :vLoading="formLoading"
     >
-      <div style="max-height: 60vh; overflow-y: auto; padding: 0px 20px">
+      <div style="max-height: 80vh; overflow-y: auto; padding: 0px 20px">
         <el-form :model="data" label-width="auto" :rules="rules" ref="formMainRef">
           <el-row gutter="20">
             <el-col :span="12">
@@ -879,6 +879,7 @@ const submitForm = async () => {
   try {
     const validateForm1 = await validateForm(formProcessRef.value)
     console.log(validateForm1)
+    console.log(data.value)
     await formMainRef.value.validate()
     if (!data.value.process || data.value.process.length == 0) {
       message.error(`请添加工序`)
diff --git a/src/views/qms/basicDataManage/inspectionPlan/index.vue b/src/views/qms/basicDataManage/inspectionPlan/index.vue
index a77b24eb8..787063cb2 100644
--- a/src/views/qms/basicDataManage/inspectionPlan/index.vue
+++ b/src/views/qms/basicDataManage/inspectionPlan/index.vue
@@ -60,7 +60,6 @@ import TableHead from '@/components/TableHead/src/TableHead.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
 import AddForm from './addForm.vue'
 import * as InspectionPlanApi from '@/api/qms/inspectionPlan'
-import { json } from 'stream/consumers'
 
 defineOptions({ name: 'AgvLocationrelation' })
 
diff --git a/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue b/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue
index 28d00ba06..2d701589d 100644
--- a/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue
+++ b/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue
@@ -6,7 +6,7 @@
     :close-on-click-modal="false"
     :vLoading="formLoading"
   >
-    <div style="max-height: 60vh; overflow-y: auto; padding: 0px 20px">
+    <div style="max-height: 80vh; overflow-y: auto; padding: 0px 20px">
       <!-- <Form ref="formRefMain" :schema="formAllSchemasMain" :is-col="true" :rules="rules" /> -->
       <el-form :model="data" label-width="auto" :rules="rules" ref="formMainRef">
         <el-row gutter="20">
@@ -571,6 +571,9 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
       version: '',
       process: []
     }
+    rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = false
+        rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = false
+        rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = false
   }
 
   tabIndex = data.value.process.length + 1
@@ -625,9 +628,9 @@ const buttonBaseClick1 = (val) => {
             isDestructionInspection: '',
             resultEntryMethod: '',
             featureType: '',
-            quantifyIsCapping: '',
-            quantifyIsLowlimit: '',
-            quantifyIsTarget: '',
+            quantifyIsCapping: false,
+            quantifyIsLowlimit: false,
+            quantifyIsTarget: false,
             quantifyTarget: '',
             quantifyCapping: '',
             quantifyLowlimit: '',
@@ -636,8 +639,9 @@ const buttonBaseClick1 = (val) => {
             quantifyQuantifyCode: ''
           }
         })
-        console.log(data.value.process)
-
+        rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = false
+        rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = false
+        rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = false
         editableTabsValue.value = newTabName
         dialogVisibleName.value = false
       } else {
diff --git a/src/views/qms/inspection/inspectionJob/addForm.vue b/src/views/qms/inspection/inspectionJob/addForm.vue
new file mode 100644
index 000000000..3f8177d67
--- /dev/null
+++ b/src/views/qms/inspection/inspectionJob/addForm.vue
@@ -0,0 +1,1010 @@
+<template>
+  <div>
+    <Dialog
+      :title="dialogTitle"
+      v-model="dialogVisible"
+      :width="dialogWidth"
+      :close-on-click-modal="false"
+      :vLoading="formLoading"
+    >
+      <div style="max-height: 80vh; overflow-y: auto; padding: 0px 20px">
+        <!-- <el-form :model="data" label-width="auto" :rules="rules" ref="formMainRef">
+         
+        </el-form> -->
+        <Form
+          ref="formMainRef"
+          :rules="rules"
+          :schema="formSchema"
+          :is-col="true"
+          :disabled="true"
+          @opensearchTable="opensearchTable"
+        />
+        <el-tabs
+          v-model="editableTabsValue"
+          editable
+          class="demo-tabs"
+          @edit="handleTabsEdit"
+          type="border-card"
+          tab-position="left"
+          :stretch="false"
+        >
+          <el-tab-pane
+            v-for="item in data.process"
+            :key="item.name"
+            :label="item.processCode"
+            :name="item.name"
+          >
+            <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.inspectionCode"
+                      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-col :span="12">
+                  <el-form-item label="检验特性编码">
+                    <el-input
+                      v-model="item.inspectionCharCode"
+                      placeholder="根据系统生成"
+                      :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">
+              <el-row :gutter="20">
+                <el-col :span="12">
+                  <el-form-item label="编码">
+                    <el-input
+                      v-model="item.inspectionCharacteristicsBaseVO.number"
+                      placeholder="根据系统生成"
+                      :disabled="true"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="描述" prop="inspectionCharacteristicsBaseVO.description">
+                    <el-input v-model="item.inspectionCharacteristicsBaseVO.description"  :disabled="true" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                <el-form-item
+                  label="检验方法"
+                  prop="inspectionCharacteristicsBaseVO.inspectionMethodCode"
+                >
+                  <div style="display: flex; width: 100%">
+                    <el-input
+                      v-model="item.inspectionCharacteristicsBaseVO.inspectionMethodName"
+                      disabled
+                      placeholder="请选择检验方法"
+                    />
+                    <el-button
+                      type="info"
+                      plain
+                      style="width: 40px"
+                      @click="
+                        opensearchTable(
+                          'inspectionMethodCode',
+                          null,
+                          '检验方法',
+                          InspectionMethod.allSchemas,
+                          InspectionMethodApi.getInspectionMethodPage,
+                          [
+                            {
+                              key: 'available',
+                              value: 'TRUE',
+                              isMainValue: false
+                            }
+                          ],
+                          false,
+                          'features',
+                          item
+                        )
+                      "
+                      ><Icon icon="ep:search"
+                    /></el-button>
+                  </div>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  label="采样过程编码"
+                  prop="inspectionCharacteristicsBaseVO.inspectionMethod"
+                >
+                  <div style="display: flex; width: 100%">
+                    <el-input
+                      v-model="item.inspectionCharacteristicsBaseVO.inspectionName"
+                      disabled
+                      placeholder="请选择采样过程编码"
+                    />
+                    <el-button
+                      type="info"
+                      plain
+                      style="width: 40px"
+                      @click="
+                        opensearchTable(
+                          'inspectionMethod',
+                          null,
+                          '采样过程编码',
+                          SamplingProcess.allSchemas,
+                          SamplingProcessApi.getSamplingProcessPage,
+                          [
+                            {
+                              key: 'available',
+                              value: 'TRUE',
+                              isMainValue: false
+                            }
+                          ],
+                          false,
+                          'features',
+                          item
+                        )
+                      "
+                      ><Icon icon="ep:search"
+                    /></el-button>
+                  </div>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  label="动态修改规则编码"
+                  prop="inspectionCharacteristicsBaseVO.dynamicUpdateCode"
+                >
+                  <div style="display: flex; width: 100%">
+                    <el-input
+                      v-model="item.inspectionCharacteristicsBaseVO.dynamicUpdateName"
+                      disabled
+                      placeholder="请选择动态修改规则编码"
+                    />
+                    <el-button
+                      type="info"
+                      plain
+                      style="width: 40px"
+                      @click="
+                        opensearchTable(
+                          'dynamicUpdateCode',
+                          null,
+                          '动态修改规则编码',
+                          DynamicRule.allSchemas,
+                          DynamicRuleApi.getDynamicRulePage,
+                          [
+                            {
+                              key: 'available',
+                              value: 'TRUE',
+                              isMainValue: false
+                            }
+                          ],
+                          false,
+                          'features',
+                          item
+                        )
+                      "
+                      ><Icon icon="ep:search"
+                    /></el-button>
+                  </div>
+                </el-form-item>
+              </el-col>
+                <el-col :span="12">
+                  <el-form-item
+                    label="是否允许修改特征值"
+                    prop="inspectionCharacteristicsBaseVO.isCanUpdate"
+                  >
+                    <el-switch
+                      v-model="item.inspectionCharacteristicsBaseVO.isCanUpdate"
+                      disabled
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item
+                    label="结果录入方式"
+                    prop="inspectionCharacteristicsBaseVO.resultEntryMethod"
+                  >
+                    <el-select
+                      v-model="item.inspectionCharacteristicsBaseVO.resultEntryMethod"
+                      placeholder="请选择结果录入方式"
+                    >
+                      <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="inspectionCharacteristicsBaseVO.featureType">
+                    <!-- <el-input v-model="item.featureType" /> -->
+                    <el-select
+                      v-model="item.inspectionCharacteristicsBaseVO.featureType"
+                      placeholder="请选择特征类型"
+                      @change="changeFeatureType"
+                      :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"
+                    >
+                      <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.inspectionCharacteristicsBaseVO.featureType == 0">
+                  <el-form-item
+                    label="是否设定上限"
+                    prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
+                  >
+                    <el-switch
+                      v-model="item.inspectionCharacteristicsBaseVO.quantifyIsCapping"
+                      @change="changeIsCapping"
+                      :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item
+                    label="上限值"
+                    prop="inspectionCharacteristicsBaseVO.quantifyCapping"
+                    v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
+                  >
+                    <el-input
+                      v-model="item.inspectionCharacteristicsBaseVO.quantifyCapping"
+                      :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item
+                    prop="inspectionCharacteristicsBaseVO.quantifyIsLowlimit"
+                    label="是否设定下限"
+                    v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
+                  >
+                    <el-switch
+                      v-model="item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit"
+                      @change="changeLowlimit"
+                      :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item
+                    label="下限值"
+                    prop="inspectionCharacteristicsBaseVO.quantifyLowlimit"
+                    v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
+                  >
+                    <el-input
+                      v-model="item.inspectionCharacteristicsBaseVO.quantifyLowlimit"
+                      :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item
+                    prop="inspectionCharacteristicsBaseVO.quantifyIsTarget"
+                    label="是否设定目标值"
+                    v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
+                  >
+                    <el-switch
+                      v-model="item.inspectionCharacteristicsBaseVO.quantifyIsTarget"
+                      @change="changeIsTarget"
+                      :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item
+                    label="目标值"
+                    prop="inspectionCharacteristicsBaseVO.quantifyTarget"
+                    v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
+                  >
+                    <el-input
+                      v-model="item.inspectionCharacteristicsBaseVO.quantifyTarget"
+                      :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"
+                    />
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="12">
+                  <el-form-item
+                    label="计量单位"
+                    prop="inspectionCharacteristicsBaseVO.quantifyUom"
+                    v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
+                  >
+                    <el-input
+                      v-model="item.inspectionCharacteristicsBaseVO.quantifyUom"
+                      :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item
+                    label="小数位"
+                    prop="inspectionCharacteristicsBaseVO.quantifyDecimal"
+                    v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
+                  >
+                    <el-input
+                      v-model="item.inspectionCharacteristicsBaseVO.quantifyDecimal"
+                      :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item
+                    label="选择集编码"
+                    prop="inspectionCharacteristicsBaseVO.quantifyQuantifyCode"
+                    v-if="item.inspectionCharacteristicsBaseVO.featureType == 1"
+                  >
+                    <div style="display: flex; width: 100%">
+                      <el-input
+                        v-model="item.inspectionCharacteristicsBaseVO.quantifyQuantifyCode"
+                        disabled
+                        placeholder="请选择选择集编码"
+                      />
+                      <el-button
+                        type="info"
+                        plain
+                        style="width: 40px"
+                        @click="
+                          opensearchTable(
+                            'quantifyQuantifyCode',
+                            null,
+                            '选择集编码',
+                            SelectedSet.allSchemas,
+                            SelectedSetApi.getSelectedSetPage,
+                          [
+                            {
+                              key: 'available',
+                              value: 'TRUE',
+                              isMainValue: false
+                            }
+                          ],
+                            false,
+                            null,
+                            item
+                          )
+                        "
+                        v-if="item.inspectionCharacteristicsBaseVO.isCanUpdate"
+                        ><Icon icon="ep:search"
+                      /></el-button>
+                    </div>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </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 { SamplingProcess } from '@/views/qms/samplingProcess/samplingProcess.data'
+// import { InspectionTemplateMain } from '@/views/qms/basicDataManage/inspectionTemplate/inspectionTemplate.data'
+// import * as InspectionTemplateApi from '@/api/qms/inspectionTemplate'
+// import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
+// import * as ItemBasicApi from '@/api/wms/itembasic'
+import * as SamplingProcessApi from '@/api/qms/samplingProcess' //采样过程
+import * as InspectionMethodApi from '@/api/qms/inspectionMethod' //检验方法
+import { InspectionMethod } from '@/views/qms/inspectionMethod/inspectionMethod.data' //检验方法
+import * as DynamicRuleApi from '@/api/qms/dynamicRule' //动态修改规则
+import { DynamicRule } from '@/views/qms/basicDataManage/dynamicRule/dynamicRule.data' //动态修改规则
+import * as SelectedSetApi from '@/api/qms/selectedSet' //选择集
+import { SelectedSet } from '@/views/qms/basicDataManage/selectedSet/selectedSet.data' //选择集
+
+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
+  },
+})
+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 data = ref({
+  code: '',
+  itemCode: '',
+  version: '',
+  testTypeCode: '',
+  programmeTemplateCode: '',
+  splitRule: '',
+  aql: '',
+  inspectionLevel: '',
+  effectiveDate: '',
+  expirationDate: '',
+  available: 'TRUE',
+  process: []
+})
+
+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,
+    'inspectionCharacteristicsBaseVO.description': [
+    { required: true, message: '请填写描述', trigger: ['blur', 'change'] }
+  ],
+  'inspectionCharacteristicsBaseVO.inspectionMethodCode': [
+    { required: true, message: '请选择检验方法编码', trigger: 'blur' }
+  ],
+  'inspectionCharacteristicsBaseVO.dynamicUpdateCode': [
+    { required: true, message: '请选择采样过程编码', trigger: ['blur', 'change'] }
+  ],
+  'inspectionCharacteristicsBaseVO.inspectionMethod': [
+    { required: true, message: '请选择动态修改规则编码', trigger: ['blur', 'change'] }
+  ],
+  'inspectionCharacteristicsBaseVO.resultEntryMethod': [
+    { required: true, message: '请选择结果录入方式', trigger: ['blur', 'change'] }
+  ],
+  'inspectionCharacteristicsBaseVO.featureType': [
+    { required: true, message: '请选择特征类型', trigger: ['blur', 'change'] }
+  ],
+  'inspectionCharacteristicsBaseVO.quantifyTarget': [
+    { required: true, message: '请输入目标值', trigger: 'blur' }
+  ],
+  'inspectionCharacteristicsBaseVO.quantifyCapping': [
+    { required: true, message: '请输入上限值', trigger: 'blur' }
+  ],
+  'inspectionCharacteristicsBaseVO.quantifyLowlimit': [
+    { required: true, message: '请输入下限值', trigger: 'blur' }
+  ],
+  'inspectionCharacteristicsBaseVO.quantifyUom': [
+    { required: true, message: '请选择计量单位', trigger: 'blur' }
+  ],
+  'inspectionCharacteristicsBaseVO.quantifyDecimal': [
+    { required: true, message: '请输入小数位', trigger: 'blur' }
+  ],
+  'inspectionCharacteristicsBaseVO.quantifyQuantifyCode': [
+    { required: true, message: '请输入选择集编码', trigger: 'blur' }
+  ]
+})
+// const rules = ref({
+//   itemCode: [{ required: true, message: '请选择物料编码', trigger: 'blur' }],
+//   version: [{ required: true, message: '请填写版本', trigger: 'blur' }],
+//   testTypeCode: [{ required: true, message: '请选择检验类型编码', trigger: ['blur', 'change'] }],
+//   programmeTemplateCode: [
+//     { required: true, message: '请选择检验模板编码', trigger: ['blur', 'change'] }
+//   ],
+//   splitRule: [{ required: true, message: '请选择拆分规则', trigger: ['blur', 'change'] }],
+//   aql: [{ required: true, message: '请选择aql', trigger: ['blur', 'change'] }],
+//   inspectionLevel: [{ required: true, message: '请选择检验水平', trigger: ['blur', 'change'] }],
+//   effectiveDate: [{ required: true, message: '请选择生效时间', trigger: ['blur', 'change'] }],
+//   expirationDate: [{ required: true, message: '请选择失效时间', trigger: ['blur', 'change'] }],
+//   'inspectionCharacteristicsBaseVO.description': [
+//     { required: true, message: '请填写描述', trigger: ['blur', 'change'] }
+//   ],
+//   'inspectionCharacteristicsBaseVO.inspectionMethodCode': [
+//     { required: true, message: '请选择检验方法编码', trigger: 'blur' }
+//   ],
+//   'inspectionCharacteristicsBaseVO.dynamicUpdateCode': [
+//     { required: true, message: '请选择采样过程编码', trigger: ['blur', 'change'] }
+//   ],
+//   'inspectionCharacteristicsBaseVO.inspectionMethod': [
+//     { required: true, message: '请选择动态修改规则编码', trigger: ['blur', 'change'] }
+//   ],
+//   'inspectionCharacteristicsBaseVO.resultEntryMethod': [
+//     { required: true, message: '请选择结果录入方式', trigger: ['blur', 'change'] }
+//   ],
+//   'inspectionCharacteristicsBaseVO.featureType': [
+//     { required: true, message: '请选择特征类型', trigger: ['blur', 'change'] }
+//   ],
+//   'inspectionCharacteristicsBaseVO.quantifyTarget': [
+//     { required: true, message: '请输入目标值', trigger: 'blur' }
+//   ],
+//   'inspectionCharacteristicsBaseVO.quantifyCapping': [
+//     { required: true, message: '请输入上限值', trigger: 'blur' }
+//   ],
+//   'inspectionCharacteristicsBaseVO.quantifyLowlimit': [
+//     { required: true, message: '请输入下限值', trigger: 'blur' }
+//   ],
+//   'inspectionCharacteristicsBaseVO.quantifyUom': [
+//     { required: true, message: '请选择计量单位', trigger: 'blur' }
+//   ],
+//   'inspectionCharacteristicsBaseVO.quantifyDecimal': [
+//     { required: true, message: '请输入小数位', trigger: 'blur' }
+//   ],
+//   'inspectionCharacteristicsBaseVO.quantifyQuantifyCode': [
+//     { required: true, message: '请输入选择集编码', trigger: 'blur' }
+//   ]
+// })
+
+/** 打开弹窗 */
+let tabIndex = 1
+const open = async (type: string, row?: any, masterParmas?: any, titleName?: any) => {
+  dialogVisible.value = true
+  if (titleName) {
+    dialogTitle.value = t('action.' + titleName)
+  } else {
+    dialogTitle.value = t('action.' + type)
+  }
+  formType.value = type
+  if (row) {
+    data.value = JSON.parse(JSON.stringify(row))
+    let list = []
+    list = await InspectionJobDetailPageApi.getInspectionJobDetailList(row.id)
+    // if (row.inspectionSchemeJson) {
+    //   list = JSON.parse(JSON.parse(row.inspectionSchemeJson))
+    // } else {
+    //   list = await InspectionJobDetailPageApi.getListByTempleteCode(row.programmeTemplateCode)
+    // }
+console.log(list)
+console.log(typeof list)
+    list.forEach((item, index) => {
+      editableTabsValue.value = index + 1
+      item.name = index + 1
+      item.inspectionCharacteristicsBaseVO = item.inspectionJobCharacteristicsRespVO
+      // 编辑判断上限下限目标值是否必填
+      if (item.inspectionCharacteristicsBaseVO.quantifyIsCapping) {
+        rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = true
+      } else {
+        rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = false
+      }
+      if (item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit) {
+        rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = true
+      } else {
+        rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = false
+      }
+      if (item.inspectionCharacteristicsBaseVO.quantifyIsTarget) {
+        rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = true
+      } else {
+        rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = false
+      }
+    })
+    data.value.process = list
+    formMainRef.value.setValues(row)
+  } else {
+    data.value = {
+      code: '',
+      itemCode: '',
+      version: '',
+      testTypeCode: '',
+      programmeTemplateCode: '',
+      splitRule: '',
+      aql: '',
+      inspectionLevel: '',
+      effectiveDate: '',
+      expirationDate: '',
+      available: 'TRUE',
+      process: []
+    }
+  }
+
+  tabIndex = data.value.process.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.process
+    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.process = tabs.filter((tab) => tab.name !== targetName)
+  }
+}
+/** 修改名称时间 */
+const buttonBaseClick1 = (val) => {
+  // 保存
+  if (val == 'save') {
+    if (!nameRef.value) return
+    nameRef.value.validate((valid, fields) => {
+      if (valid) {
+        const newTabName = `${++tabIndex}`
+        data.value.process.push({
+          description: nameForm.value.name,
+          name: newTabName,
+          inspectionCode: '',
+          sequenceCode: '',
+          inspectionCharCode: '',
+          inspectionJobCharacteristicsRespVO: {
+            describe: '',
+            inspectionMethodCode: '',
+            dynamicUpdateCode: '',
+            inspectionMethod: '',
+            isCanUpdate: '',
+            isDestructionInspection: '',
+            resultEntryMethod: '',
+            featureType: '',
+            quantifyIsCapping: '',
+            quantifyIsLowlimit: '',
+            quantifyIsTarget: '',
+            quantifyTarget: '',
+            quantifyCapping: '',
+            quantifyLowlimit: '',
+            quantifyUom: '',
+            quantifyDecimal: '',
+            quantifyQuantifyCode: ''
+          }
+        })
+        console.log(data.value.process)
+
+        editableTabsValue.value = newTabName
+        dialogVisibleName.value = false
+      } else {
+        console.log('error submit!')
+        return false
+      }
+    })
+  }
+  // 关闭
+  else if (val == 'close') {
+    dialogVisibleName.value = false
+  }
+}
+const buttonBaseClick = (val) => {
+  // 保存
+  if (val == 'save') {
+    submitForm()
+  }
+  // 关闭
+  else if (val == 'close') {
+    dialogVisible.value = false
+  }
+}
+// 传递给父类
+const emit = defineEmits(['submitForm', 'searchTableSuccess'])
+const validateForm = (formRef) => {
+  // console.log(TableBaseForm_Ref.value)
+  let _lists = formRef?.map((v) => v.validate())
+  return Promise.all(_lists)
+    .then(() => {
+      return true
+    })
+    .catch(() => {
+      return false
+    })
+}
+
+const submitForm = async () => {
+  try {
+    const validateForm1 = await validateForm(formProcessRef.value)
+    console.log(validateForm1)
+    await formMainRef.value.validate()
+    if (!data.value.process || data.value.process.length == 0) {
+      message.error(`请添加工序`)
+      return
+    }
+    const bol1 = await validateForm(formProcessRef.value)
+    const bol2 = await validateForm(formFeaturesRef.value)
+    if (!bol1 || !bol2) {
+      message.error(`模板中有检验工序和检验特性未填写完全`)
+      return
+    }
+    const arr = data.value.process.filter(
+      (item) =>
+        !item.inspectionCharacteristicsBaseVO.quantifyIsCapping &&
+        !item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit &&
+        !item.inspectionCharacteristicsBaseVO.quantifyIsTarget &&
+        item.inspectionCharacteristicsBaseVO.featureType == 0
+    )
+    console.log(arr)
+    if (arr && arr.length > 0) {
+      const str = arr.map((item) => item.description).join(',')
+      message.error(`${str}是否设定上线,是否设定下限,是否是定目标值至少一项为是`)
+      return
+    }
+    if (formType.value == 'create') {
+      // 主子表——提交请求
+      emit('submitForm', formType.value, data.value)
+    } else {
+      // 编辑
+      emit('submitForm', formType.value, data.value)
+    }
+  } catch {
+    console.log(111)
+  }
+}
+/** 弹窗按钮 */
+let Butttondata: any = []
+if (props.footButttondata) {
+  Butttondata = props.footButttondata
+} else {
+  Butttondata = [
+    defaultButtons.formSaveBtn(null), // 保存
+    defaultButtons.formCloseBtn(null) // 关闭
+  ]
+}
+// 选择特征类型
+const changeFeatureType = (e) => {
+  console.log(e)
+  // if (e) {
+  //   rules.value['inspectionCharacteristicsBaseVO.quantifyQuantifyCode'][0].required = true
+  // } else {
+  //   rules.value['inspectionCharacteristicsBaseVO.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.inspectionCharacteristicsBaseVO[formField] = val[0].code
+    if(formField == 'inspectionMethodCode'){
+      row.inspectionCharacteristicsBaseVO.inspectionMethodName = val[0].description
+    }else if(formField == 'dynamicUpdateCode'){
+      row.inspectionCharacteristicsBaseVO.dynamicUpdateName = val[0].description
+    }else if(formField == 'inspectionMethod'){
+      row.inspectionCharacteristicsBaseVO.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.inspectionCharacteristicsBaseVO.quantifyIsCapping) {
+          rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = true
+        } else {
+          rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = false
+        }
+        if (item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit) {
+          rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = true
+        } else {
+          rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = false
+        }
+        if (item.inspectionCharacteristicsBaseVO.quantifyIsTarget) {
+          rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = true
+        } else {
+          rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = false
+        }
+      })
+      data.value.process = list
+    }
+  }
+
+  // emit('searchTableSuccess', formField, searchField, val, formRef.value, type, row)
+}
+// 选择是否设定上限值
+const changeIsCapping = (e) => {
+  if (e) {
+    rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = true
+  } else {
+    rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = false
+  }
+}
+// 选择是否设定下限值
+const changeLowlimit = (e) => {
+  if (e) {
+    rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = true
+  } else {
+    rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = false
+  }
+}
+// 选择是否设定目标值
+const changeIsTarget = (e) => {
+  if (e) {
+    rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = true
+  } else {
+    rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = false
+  }
+}
+</script>
+<style scoped>
+.small-title {
+  font-weight: bold;
+  padding: 0px 10px 10px;
+  color: #1a8bfc;
+  font-size: 16px;
+}
+</style>
+<style>
+.el-tabs--left .el-tabs__header.is-left {
+  min-height: 700px !important;
+  min-width: 150px !important;
+}
+.el-tabs--left.el-tabs--border-card .el-tabs__item.is-left {
+  min-width: 120px !important;
+}
+</style>
diff --git a/src/views/qms/inspection/inspectionJob/index.vue b/src/views/qms/inspection/inspectionJob/index.vue
index 48b31afaa..6b393c63d 100644
--- a/src/views/qms/inspection/inspectionJob/index.vue
+++ b/src/views/qms/inspection/inspectionJob/index.vue
@@ -27,13 +27,22 @@
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <BasicForm ref="formRef" @success="getList" :rules="InspectionJobMainRules"
+  <!-- <BasicForm ref="formRef" @success="getList" :rules="InspectionJobMainRules"
     :formAllSchemas="InspectionJobMain.allSchemas" :tableAllSchemas="InspectionJobDetail.allSchemas"
     :tableFormRules="InspectionJobDetailRules" :tableData="tableData"
     :apiUpdate="InspectionJobMainApi.updateInspectionJobMain" :apiCreate="InspectionJobMainApi.createInspectionJobMain"
     :isBusiness="true" @handleAddTable="handleAddTable" @handleDeleteTable="handleDeleteTable"
-    @searchTableSuccess="searchTableSuccess" @submitForm="submitForm" />
-
+    @searchTableSuccess="searchTableSuccess" @submitForm="submitForm" /> -->
+    <AddForm
+    ref="basicFormRef"
+    basicFormWidth="80"
+    :formAllSchemasFeatures="InspectionTemplateFeatures.allSchemas"
+    :formAllSchemasProcess="InspectionTemplateProcess.allSchemas"
+    :formAllSchemasMain="InspectionTemplateMain.allSchemas"
+    :rules="InspectionTemplateRules"
+    :formAllSchemas="InspectionJobMain.allSchemas"
+    @submitForm="submitForm"
+  />
   <!-- 详情 -->
   <Detail ref="detailRef" :isBasic="false" :allSchemas="InspectionJobMain.allSchemas"
     :detailAllSchemas="InspectionJobDetail.allSchemas" :detailAllSchemasRules="InspectionJobDetailRules"
@@ -51,11 +60,15 @@
 <script setup lang="ts">
   import download from '@/utils/download'
   import { InspectionJobMain, InspectionJobMainRules, InspectionJobDetail, InspectionJobDetailRules } from './inspectionJobMain.data'
+  import { InspectionTemplateMain,InspectionTemplateProcess,InspectionTemplateFeatures,InspectionTemplateRules } from '../../basicDataManage/inspectionTemplate/inspectionTemplate.data'
+
   import * as InspectionJobMainApi from '@/api/qms/inspectionJob/inspectionJobMain'
   import * as InspectionJobDetailApi from '@/api/qms/inspectionJob/inspectionJobDetail'
   import * as defaultButtons from '@/utils/disposition/defaultButtons'
   import TableHead from '@/components/TableHead/src/TableHead.vue'
   import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+  import AddForm from './addForm.vue'
+  import * as InspectionPlanApi from '@/api/qms/inspectionPlan'
 
   // 采购订单
   defineOptions({ name: 'InspectionJobMain' })
@@ -160,18 +173,19 @@
   // 列表-操作按钮
   const butttondata = (row) => {
     return [
-      // defaultButtons.mainListOrderCOMPLETEBtn({ hide: isShowMainButton(row, ['INCOMPLETE']) }), // 完成
-      // defaultButtons.mainListEditBtn(null), // 编辑
-      // defaultButtons.mainListDeleteBtn(null), // 删除
+      // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+      defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-job-main:close'}), // 关闭
+    // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+      defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
     ]
   }
 
   // 列表-操作按钮事件
   const buttonTableClick = async (val, row) => {
-    if (val == 'edit') { // 编辑
-      openForm('update', row)
+    if (val == 'mainJobExe') { // 执行
+      execute('update', row)
     }
-    else if (val == 'delete') { // 删除
+    else if (val == 'mainJobClo') { // 关闭
       handleDelete(row.id)
     }
   }
@@ -188,7 +202,12 @@
   const openDetail = (row : any, titleName : any, titleValue : any) => {
     detailRef.value.openDetail(row, titleName, titleValue, 'basicInspectionJobMain')
   }
-
+  //执行
+  
+  const basicFormRef = ref()
+  const execute = async (type : string, row ?: number) => {
+    basicFormRef.value.open(type, row)
+  }
   /** 删除按钮操作 */
   const handleDelete = async (id : number) => {
     try {
diff --git a/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts b/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts
index 42da7a50d..91d5ab456 100644
--- a/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts
+++ b/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts
@@ -76,12 +76,12 @@ export const InspectionJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: false,
   },
-  {
-    label: '检验方案Json',
-    field: 'inspectionSchemeJson',
-    sort: 'custom',
-    isSearch: false,
-  },
+  // {
+  //   label: '检验方案Json',
+  //   field: 'inspectionSchemeJson',
+  //   sort: 'custom',
+  //   isSearch: false,
+  // },
   {
     label: '检验批次',
     field: 'inspectionBatch',

From 11d58c3e18e5a45b9a2039f2d68705fe87ff2475 Mon Sep 17 00:00:00 2001
From: gaojs <js.gao@ccwin-in.com>
Date: Sun, 7 Apr 2024 13:48:45 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E6=A8=A1=E5=85=B7=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/partternType/index.ts             |  54 ++++
 src/views/mes/partternType/index.vue          | 244 ++++++++++++++++++
 .../mes/partternType/partternType.data.ts     | 144 +++++++++++
 3 files changed, 442 insertions(+)
 create mode 100644 src/api/mes/partternType/index.ts
 create mode 100644 src/views/mes/partternType/index.vue
 create mode 100644 src/views/mes/partternType/partternType.data.ts

diff --git a/src/api/mes/partternType/index.ts b/src/api/mes/partternType/index.ts
new file mode 100644
index 000000000..29002581a
--- /dev/null
+++ b/src/api/mes/partternType/index.ts
@@ -0,0 +1,54 @@
+import request from '@/config/axios'
+
+export interface PartternTypeVO {
+  deleteTime: Date
+  id: number
+  status: string
+  concurrencyStamp: number
+  remark: string
+  deleter: string
+  siteId: number
+  code: string
+  name: string
+}
+
+// 查询模具类型列表
+export const getPartternTypePage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/mes/parttern-type/senior', data })
+  } else {
+    return await request.get({ url: `/mes/parttern-type/page`, params })
+  }
+}
+
+// 查询模具类型详情
+export const getPartternType = async (id: number) => {
+  return await request.get({ url: `/mes/parttern-type/get?id=` + id })
+}
+
+// 新增模具类型
+export const createPartternType = async (data: PartternTypeVO) => {
+  return await request.post({ url: `/mes/parttern-type/create`, data })
+}
+
+// 修改模具类型
+export const updatePartternType = async (data: PartternTypeVO) => {
+  return await request.put({ url: `/mes/parttern-type/update`, data })
+}
+
+// 删除模具类型
+export const deletePartternType = async (id: number) => {
+  return await request.delete({ url: `/mes/parttern-type/delete?id=` + id })
+}
+
+// 导出模具类型 Excel
+export const exportPartternType = async (params) => {
+  return await request.download({ url: `/mes/parttern-type/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/mes/parttern-type/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/views/mes/partternType/index.vue b/src/views/mes/partternType/index.vue
new file mode 100644
index 000000000..77a6cefb8
--- /dev/null
+++ b/src/views/mes/partternType/index.vue
@@ -0,0 +1,244 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="PartternType.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="PartternType.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :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 #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="PartternTypeRules"
+    :formAllSchemas="PartternType.allSchemas"
+    :apiUpdate="PartternTypeApi.updatePartternType"
+    :apiCreate="PartternTypeApi.createPartternType"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="PartternType.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/mes/parttern-type/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { PartternType,PartternTypeRules } from './partternType.data'
+import * as PartternTypeApi from '@/api/mes/partternType'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'PartternType' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(PartternType.allSchemas.tableColumns)
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: PartternTypeApi.getPartternTypePage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'mes:partternType:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'mes:partternType:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'mes:partternType:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+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)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'mes:partternType:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'mes:partternType:delete'}), // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  var isHave =PartternType.allSchemas.formSchema.some(function (item) {
+    return item.field === 'activeTime' || item.field === 'expireTime';
+  });
+  if(isHave){
+    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+      message.error('失效时间要大于生效时间')
+      return;
+    }
+  }
+  if(data.activeTime==0)data.activeTime = null;
+  if(data.expireTime==0)data.expireTime = null;
+  if (formType === 'create') {
+    await PartternTypeApi.createPartternType(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await PartternTypeApi.updatePartternType(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicPartternType')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await PartternTypeApi.deletePartternType(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await PartternTypeApi.exportPartternType(tableObject.params)
+    download.excel(data, '模具类型.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '模具类型导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await PartternTypeApi.importTemplate()
+})
+
+</script>
diff --git a/src/views/mes/partternType/partternType.data.ts b/src/views/mes/partternType/partternType.data.ts
new file mode 100644
index 000000000..2cf9df99c
--- /dev/null
+++ b/src/views/mes/partternType/partternType.data.ts
@@ -0,0 +1,144 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const PartternTypeRules = reactive({
+  code: [required],
+})
+
+export const PartternType = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '删除时间',
+    field: 'deleteTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    isTable: false,
+    isForm:false,
+    isDetail:false,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '主键',
+    field: 'id',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm:false,
+    isDetail:false,
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm:false,
+    isDetail:false,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    isTable: false,
+    isForm:false,
+    isDetail:false,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+  },
+  {
+    label: '删除用户名',
+    field: 'deleter',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm:false,
+    isDetail:false,
+  },
+  {
+    label: '位置ID',
+    field: 'siteId',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm:false,
+    isDetail:false,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '类型编码',
+    field: 'code',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '类型名称',
+    field: 'name',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    sort: 'custom',
+    dictType: DICT_TYPE.QUALIFY_STATUS,
+    dictClass: 'string',
+    isForm: true,
+    isSearch: true,
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: '2',
+      componentProps: {
+        inactiveValue: '2',
+        activeValue: '1'
+      }
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    isDetail:false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false
+  }
+]))

From 2c7fd9ab24c75583c4aab8ac59c8459539fcd59e Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Sun, 7 Apr 2024 14:03:24 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86--=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?=
 =?UTF-8?q?=E7=A5=A8=E7=94=B3=E8=AF=B7--=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E6=89=A9=E5=B1=95=E6=96=B0=E5=A2=9E=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E4=BB=A5=E5=8F=8A=E7=82=B9=E5=87=BB=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Detail/src/Detail.vue              | 12 ++++++++++--
 .../supplierinvoiceRequestMain/index.vue          | 15 +++++++++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue
index 5a865fca5..3971d6463 100644
--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@@ -322,6 +322,12 @@ const props = defineProps({
     required: false,
     default: false
   },
+  //扩展其他按钮
+  otherHeadButttonData:{
+    type:Array,
+    required: false,
+    default: () => []
+  }
 })
 const isShowDrawer = ref(false)
 const detailLoading = ref(false)
@@ -544,7 +550,7 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName:
           defaultButtons.defaultFilterBtn(null) // 筛选
         ]
       }
-
+      HeadButttondata.value = [...HeadButttondata.value,...props.otherHeadButttonData]
       let detailButtonEdit: any = []
       let detailButtonDelete: any = []
       if (props.detailButtonIsShowEdit) {
@@ -654,6 +660,7 @@ const buttonBaseClick = (val, item) => {
   } else {
     // 其他按钮
     console.log('其他按钮', item)
+    emit('buttonBaseClick',val, item)
   }
 }
 
@@ -781,7 +788,8 @@ const emit = defineEmits([
   'openImage',
   'onBlur',
   'detailBasicFormOnChange',
-  'formFormDateChange'
+  'formFormDateChange',
+  'buttonBaseClick'
 ])
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 4ea2598d4..ed73ce4a9 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -83,6 +83,16 @@
       prop: 'Annex',
       tableName:'waybill'
     }]"
+    :otherHeadButttonData="[{
+        label: '打印',
+        name: 'kuozhan',
+        hide: false,
+        type: 'primary',
+        // icon: 'ep:operation',
+        color: '',
+        float:'left',
+        hasPermi: ''
+    }]"
     :isBasic="false" 
     :allSchemas="SupplierinvoiceRequestMain.allSchemas"
     :detailAllSchemas="SupplierinvoiceRequestDetail.allSchemas"
@@ -93,6 +103,7 @@
     :apiPage="SupplierinvoiceRequestDetailApi.getSupplierinvoiceRequestDetailPage"
     :apiDelete="SupplierinvoiceRequestDetailApi.deleteSupplierinvoiceRequestDetail" 
     :Echo="Echo" 
+    @buttonBaseClick="detailButtonBaseClick"
   />
 
   <!-- 导入 -->
@@ -571,6 +582,10 @@ const importSuccess = () => {
     getList() // 刷新当前列表
   }
 
+  // 详情--头部按钮事件
+  const detailButtonBaseClick = (val, item) => {
+    console.log(1111)
+  }
   /** 初始化 **/
   onMounted(async () => {
     getList()