From b46f2cfb4a11d83d56f436918c25721da7de7764 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com>
Date: Wed, 3 Apr 2024 13:49:32 +0800
Subject: [PATCH 01/35] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inspectionRecordDetail/index.ts           |  65 +++
 .../inspectionRecordMain/index.ts             |  65 +++
 .../inspectionJob/inspectionJobMain.data.ts   |  22 +-
 .../qms/inspection/inspectionRecord/index.vue | 289 +++++++++++
 .../inspectionJobMain.data.ts                 | 461 ++++++++++++++++++
 .../inspectionRequest/inspectionMain.data.ts  |   2 +-
 6 files changed, 883 insertions(+), 21 deletions(-)
 create mode 100644 src/api/qms/inspectionRecord/inspectionRecordDetail/index.ts
 create mode 100644 src/api/qms/inspectionRecord/inspectionRecordMain/index.ts
 create mode 100644 src/views/qms/inspection/inspectionRecord/index.vue
 create mode 100644 src/views/qms/inspection/inspectionRecord/inspectionJobMain.data.ts

diff --git a/src/api/qms/inspectionRecord/inspectionRecordDetail/index.ts b/src/api/qms/inspectionRecord/inspectionRecordDetail/index.ts
new file mode 100644
index 000000000..ad565f913
--- /dev/null
+++ b/src/api/qms/inspectionRecord/inspectionRecordDetail/index.ts
@@ -0,0 +1,65 @@
+import request from '@/config/axios'
+
+export interface InspectionRecordDetailVO {
+  number: string
+  applicationDate: localdate
+  applicationTime: Date
+  requestStartTime: Date
+  requestEndTime: Date
+  finishTime: Date
+  supplierCode: string
+  materialCode: string
+  batch: string
+  requestInspectionNum: number
+  referenceOrderCode: string
+  referenceOrderRow: number
+  referenceCertificateCode: string
+  referenceCertificateRow: number
+  inspectionSchemeCode: string
+  inspectionStageCode: string
+  applicationPackageCode: string
+  inspectionLevel: string
+  aqlValue: number
+  available: string
+}
+
+// 查询检验申请列表
+export const getInspectionRecordDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/inspection/inspection-recordord-detail/senior', data })
+  } else {
+    return await request.get({ url: `/inspection/inspectirecordrecord-detail/page`, params })
+  }
+}
+
+// 查询检验申请详情
+export const getInspectionRecordDetail = async (id: number) => {
+  return await request.get({ url: `/inspection/insperecordon-record-detail/get?id=` + id })
+}
+
+// 新增检验申请
+export const createInspectionRecordDetail = async (data: InspectionRecordDetailVO) => {
+  return await request.post({ url: `/inspection/inrecordction-record-detail/create`, data })
+}
+
+// 修改检验申请
+export const updateInspectionRecordDetail = async (data: InspectionRecordDetailVO) => {
+  return await request.put({ url: `/inspectionrecordspection-record-detail/update`, data })
+}
+
+// 删除检验申请
+export const deleteInspectionRecordDetail = async (id: number) => {
+  return await request.delete({ url: `/inspectrecord/inspection-record-detail/delete?id=` + id })
+}
+
+// 导出检验申请 Excel
+export const exportInspectionRecordDetail = async (params) => {
+  return await request.download({ url: `/insprecordion/inspection-record-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/irecordection/inspection-record-detail/get-import-template' })
+}
diff --git a/src/api/qms/inspectionRecord/inspectionRecordMain/index.ts b/src/api/qms/inspectionRecord/inspectionRecordMain/index.ts
new file mode 100644
index 000000000..225443425
--- /dev/null
+++ b/src/api/qms/inspectionRecord/inspectionRecordMain/index.ts
@@ -0,0 +1,65 @@
+import request from '@/config/axios'
+
+export interface InspectionRecordMainVO {
+  number: string
+  applicationDate: localdate
+  applicationTime: Date
+  requestStartTime: Date
+  requestEndTime: Date
+  finishTime: Date
+  supplierCode: string
+  materialCode: string
+  batch: string
+  requestInspectionNum: number
+  referenceOrderCode: string
+  referenceOrderRow: number
+  referenceCertificateCode: string
+  referenceCertificateRow: number
+  inspectionSchemeCode: string
+  inspectionStageCode: string
+  applicationPackageCode: string
+  inspectionLevel: string
+  aqlValue: number
+  available: string
+}
+
+// 查询检验申请列表
+export const getInspectionRecordMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/inspection/inspection-record-main/senior', data })
+  } else {
+    return await request.get({ url: `/inspection/inspection-record-main/page`, params })
+  }
+}
+
+// 查询检验申请详情
+export const getInspectionRecordMain = async (id: number) => {
+  return await request.get({ url: `/inspection/inspection-record-main/get?id=` + id })
+}
+
+// 新增检验申请
+export const createInspectionRecordMain = async (data: InspectionRecordMainVO) => {
+  return await request.post({ url: `/inspection/inspection-record-main/create`, data })
+}
+
+// 修改检验申请
+export const updateInspectionRecordMain = async (data: InspectionRecordMainVO) => {
+  return await request.put({ url: `/inspection/inspection-record-main/update`, data })
+}
+
+// 删除检验申请
+export const deleteInspectionRecordMain = async (id: number) => {
+  return await request.delete({ url: `/inspection/inspection-record-main/delete?id=` + id })
+}
+
+// 导出检验申请 Excel
+export const exportInspectionRecordMain = async (params) => {
+  return await request.download({ url: `/inspection/inspection-record-main/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/inspection/inspection-record-main/get-import-template' })
+}
diff --git a/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts b/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts
index 39900a607..dc1afae72 100644
--- a/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts
+++ b/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts
@@ -9,7 +9,7 @@ const { t } = useI18n() // 国际化
  */
 export const InspectionJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '编码',
+    label: '工序编号',
     field: 'number',
     sort: 'custom',
     isSearch: true,
@@ -106,7 +106,7 @@ export const InspectionJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: false,
     form: {
-      component: 'SelectV2'
+      component: 'Select'
     },
   },
   {
@@ -243,30 +243,12 @@ export const InspectionJobMainRules = reactive({
  * @returns {Array} 备件申请子表
  */
 export const InspectionJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: 'id',
-    field: 'id',
-    sort: 'custom',
-    isTable: false,
-    isSearch: true,
-    isForm: false,
-  },
   {
     label: '单据号',
     field: 'number',
     sort: 'custom',
     isSearch: true,
   },
-  {
-    label: '主表ID',
-    field: 'masterId',
-    sort: 'custom',
-    isSearch: true,
-    form: {
-      component: 'InputNumber',
-      value: 0
-    },
-  },
   {
     label: '任务编码',
     field: 'taskCode',
diff --git a/src/views/qms/inspection/inspectionRecord/index.vue b/src/views/qms/inspection/inspectionRecord/index.vue
new file mode 100644
index 000000000..b73e9ddfd
--- /dev/null
+++ b/src/views/qms/inspection/inspectionRecord/index.vue
@@ -0,0 +1,289 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="InspectionRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
+    @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick"
+    :allSchemas="InspectionRecordMain.allSchemas" />
+
+  <!-- 列表 -->
+  <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 #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm ref="formRef" @success="getList" :rules="InspectionRecordMainRules"
+    :formAllSchemas="InspectionRecordMain.allSchemas" :tableAllSchemas="InspectionRecordDetail.allSchemas"
+    :tableFormRules="InspectionRecordDetailRules" :tableData="tableData"
+    :apiUpdate="InspectionRecordMainApi.updateInspectionRecordMain" :apiCreate="InspectionRecordMainApi.createInspectionRecordMain"
+    :isBusiness="true" @handleAddTable="handleAddTable" @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess" @submitForm="submitForm" />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="false" :allSchemas="InspectionRecordMain.allSchemas"
+    :detailAllSchemas="InspectionRecordDetail.allSchemas" :detailAllSchemasRules="InspectionRecordDetailRules"
+    :apiCreate="InspectionRecordDetailApi.createInspectionRecordDetail"
+    :apiUpdate="InspectionRecordDetailApi.updateInspectionRecordDetail"
+    :apiPage="InspectionRecordDetailApi.getInspectionRecordDetailPage"
+    :apiDelete="InspectionRecordDetailApi.deleteInspectionRecordDetail" @searchTableSuccessDetail="searchTableSuccessDetail"
+    :isShowAddBtn="false" :detailButtonIsShow="true" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/purchase-main/import" :importTemplateData="importTemplateData"
+    @success="importSuccess" :isShowOut="true" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+</template>
+
+<script setup lang="ts">
+  import download from '@/utils/download'
+  import { InspectionRecordMain, InspectionRecordMainRules, InspectionRecordDetail, InspectionRecordDetailRules } from './inspectionRecordMain.data'
+  import * as InspectionRecordMainApi from '@/api/qms/inspectionRecord/inspectionRecordMain'
+  import * as InspectionRecordDetailApi from '@/api/qms/inspectionRecord/inspectionRecordDetail'
+  import * as defaultButtons from '@/utils/disposition/defaultButtons'
+  import TableHead from '@/components/TableHead/src/TableHead.vue'
+  import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+
+  // 采购订单
+  defineOptions({ name: 'InspectionRecordMain' })
+
+  const message = useMessage() // 消息弹窗
+  const { t } = useI18n() // 国际化
+  const route = useRoute() // 路由信息
+  const routeName = ref()
+  routeName.value = route.name
+  const tableColumns = ref(InspectionRecordMain.allSchemas.tableColumns)
+
+  // 字段设置 更新主列表字段
+  const updataTableColumns = (val) => {
+    tableColumns.value = val
+  }
+
+  // 查询页面返回
+  const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
+    nextTick(async () => {
+      if (type == 'tableForm') {
+        // 明细查询页赋值
+        row[formField] = val[0][searchField]
+        // row['itemNumber'] = val[0]['number']
+        // row['itemName'] = val[0]['name']
+        // row['uom'] = val[0]['uom']
+        // row['isRadeIn'] = val[0]['isRadeIn']
+        // row['available'] = val[0]['available']
+      } else {
+        const setV = {}
+        setV[formField] = val[0][searchField]
+        formRef.setValues(setV)
+      }
+    })
+  }
+  // 查询页面返回——详情
+  const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
+    nextTick(async () => {
+      const setV = {}
+      // if(formField == 'itemCode'){
+      //     await ItembasicApi.getItembasicPage({
+      //       code: setV['itemCode']
+      //     }).then(res => {
+      //       setV['uom'] = res.list[0].uom
+      //       setV[formField] = val[0][searchField]
+      //     })
+      //   }
+      formRef.setValues(setV)
+    })
+  }
+
+  // 子表新增的时候选择表格之后需要会显得字段
+  const Echo = []
+  const { tableObject, tableMethods } = useTable({
+    getListApi: InspectionRecordMainApi.getInspectionRecordMainPage // 分页接口
+  })
+
+  // 获得表格的各种操作
+  const { getList, setSearchParams } = tableMethods
+
+  // 列表头部按钮
+  const HeadButttondata = [
+    defaultButtons.defaultAddBtn(null), // 新增
+    // defaultButtons.defaultExportBtn(null), // 导出
+    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 isShowMainButton = (row, val) => {
+    if (val.indexOf(row.status) > -1) {
+      return false
+    } else {
+      return true
+    }
+  }
+
+  // 列表-操作按钮
+  const butttondata = (row) => {
+    return [
+      // defaultButtons.mainListOrderCOMPLETEBtn({ hide: isShowMainButton(row, ['INCOMPLETE']) }), // 完成
+      // defaultButtons.mainListEditBtn(null), // 编辑
+      // defaultButtons.mainListDeleteBtn(null), // 删除
+    ]
+  }
+
+  // 列表-操作按钮事件
+  const buttonTableClick = async (val, row) => {
+    if (val == 'edit') { // 编辑
+      openForm('update', row)
+    }
+    else if (val == 'delete') { // 删除
+      handleDelete(row.id)
+    }
+  }
+
+  /** 添加/修改操作 */
+  const formRef = ref()
+  const openForm = async (type : string, row ?: number) => {
+    tableData.value = [] // 重置明细数据
+    formRef.value.open(type, row)
+  }
+
+  /** 详情操作 */
+  const detailRef = ref()
+  const openDetail = (row : any, titleName : any, titleValue : any) => {
+    detailRef.value.openDetail(row, titleName, titleValue, 'basicInspectionRecordMain')
+  }
+
+  /** 删除按钮操作 */
+  const handleDelete = async (id : number) => {
+    try {
+      // 删除的二次确认
+      await message.delConfirm()
+      // 发起删除
+      await InspectionRecordMainApi.deleteInspectionRecordMain(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 InspectionRecordMainApi.exportInspectionRecordMain(tableObject.params)
+      download.excel(data, '备件申领记录主.xlsx')
+    } catch {
+    } finally {
+      exportLoading.value = false
+    }
+  }
+
+  /**
+    * tableForm方法
+  */
+  const tableFormKeys = {}
+  InspectionRecordDetail.allSchemas.tableFormColumns.forEach(item => {
+    tableFormKeys[item.field] = item.default ? item.default : ''
+  })
+  const tableData = ref([])
+
+  // 添加明细
+  const handleAddTable = () => {
+    tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+  }
+  // 删除明细
+  const handleDeleteTable = (item, index) => {
+    tableData.value.splice(index, 1)
+  }
+
+  // 主子数据 提交
+  const submitForm = async (formType, data) => {
+    data.subList = tableData.value // 拼接子表数据参数
+    try {
+      if (formType === 'create') {
+        await InspectionRecordMainApi.createInspectionRecordMain(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await InspectionRecordMainApi.updateInspectionRecordMain(data)
+        message.success(t('common.updateSuccess'))
+      }
+      formRef.value.dialogVisible = false
+      // 刷新当前列表
+      getList()
+    } finally {
+      formRef.value.formLoading = false
+    }
+  }
+
+  /** 导入 */
+  const 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 InspectionRecordMainApi.importTemplate()
+  })
+</script>
diff --git a/src/views/qms/inspection/inspectionRecord/inspectionJobMain.data.ts b/src/views/qms/inspection/inspectionRecord/inspectionJobMain.data.ts
new file mode 100644
index 000000000..c3545b399
--- /dev/null
+++ b/src/views/qms/inspection/inspectionRecord/inspectionJobMain.data.ts
@@ -0,0 +1,461 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter2 } from '@/utils/formatTime'
+import { validateHanset, validateEmail } from '@/utils/validator'
+import { dateFormatter } from '@/utils/formatTime'
+const { t } = useI18n() // 国际化
+
+/**
+ * @returns {Array} 备件申请主表
+ */
+export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: 'id',
+    field: 'id',
+    sort: 'custom',
+    isTable: false,
+    isSearch: true,
+    isForm: false,
+  },
+  {
+    label: '编码',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '申请编码',
+    field: 'applicationCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '任务编码',
+    field: 'taskCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '供应商编码',
+    field: 'supplierCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '物料编码',
+    field: 'materialCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '检验方案编码',
+    field: 'inspectionSchemeCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '检验方案Json',
+    field: 'inspectionSchemeJson',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '检验批次',
+    field: 'inspectionBatch',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '检验批数量',
+    field: 'inspectionBatchAmount',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '采样总数量',
+    field: 'sampleTatalAmount',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '检验类型',
+    field: 'inspectionType',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'SelectV2'
+    },
+  },
+  {
+    label: '检验批来源',
+    field: 'inspectionBatchSource',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '订单号',
+    field: 'orderCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '订单行',
+    field: 'orderRow',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '凭证号',
+    field: 'certificateCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '凭证行',
+    field: 'certificateRow',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '检验阶段',
+    field: 'inspectionStage',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '检验严格性',
+    field: 'inspectionStringency',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '使用决策',
+    field: 'useDecision',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '计划开始时间',
+    field: 'planStartTime',
+    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')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '计划结束时间',
+    field: 'planEndTime',
+    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')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '实际开始时间',
+    field: 'realStartTime',
+    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')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '实际结束时间',
+    field: 'realEndTime',
+    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')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '检验水平',
+    field: 'inspectionLevel',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: 'AQL值',
+    field: 'aqlValue',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    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: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 200,
+      fixed: 'right'
+    }
+  }
+]))
+
+//表单校验
+export const InspectionRecordMainRules = reactive({
+  number: [required],
+  applicationCode: [required],
+  taskCode: [required],
+  supplierCode: [required],
+  materialCode: [required],
+  batch: [required],
+  inspectionSchemeCode: [required],
+  inspectionBatch: [required],
+  inspectionBatchAmount: [required],
+  sampleTatalAmount: [required],
+  inspectionType: [required],
+  inspectionBatchSource: [required],
+  orderCode: [required],
+  orderRow: [required],
+  inspectionStage: [required],
+  inspectionStringency: [required],
+  useDecision: [required],
+  inspectionLevel: [required],
+  available: [required],
+
+})
+
+/**
+ * @returns {Array} 备件申请子表
+ */
+export const InspectionRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: 'id',
+    field: 'id',
+    sort: 'custom',
+    isTable: false,
+    isSearch: true,
+    isForm: false,
+  },
+  {
+    label: '记录编码',
+    field: 'recordCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '工序编码',
+    field: 'processCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '工序描述',
+    field: 'processDescribe',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '顺序号',
+    field: 'sequenceCode',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '是否破坏性检验',
+    field: 'isDestroyInspection',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'Radio'
+    },
+  },
+  {
+    label: '检验开始时间',
+    field: 'inspectionStartTime',
+    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')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '检验结束时间',
+    field: 'inspectionEndTime',
+    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')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '检验人',
+    field: 'inspectionOperator',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '检验特性编码',
+    field: 'inspectionFeaturesCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    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: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm: false,
+  }
+]))
+
+//表单校验
+export const InspectionRecordDetailRules = reactive({
+  recordCode: [required],
+  processCode: [required],
+  sequenceCode: [required],
+  isDestroyInspection: [required],
+  available: [required],
+})
diff --git a/src/views/qms/inspection/inspectionRequest/inspectionMain.data.ts b/src/views/qms/inspection/inspectionRequest/inspectionMain.data.ts
index a7ba6ec9c..a134c9f21 100644
--- a/src/views/qms/inspection/inspectionRequest/inspectionMain.data.ts
+++ b/src/views/qms/inspection/inspectionRequest/inspectionMain.data.ts
@@ -20,7 +20,7 @@ export const InspectionMainRules = reactive({
 export const InspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
 
   {
-    label: '编码',
+    label: '申请编码',
     field: 'number',
     sort: 'custom',
     isSearch: true,

From 1bf5e32273eb33a86cb179db69fd9acb3b930f78 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 3 Apr 2024 14:11:49 +0800
Subject: [PATCH 02/35] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E6=96=B9=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inspectionPlan/addForm.vue                | 29 +++++++------------
 .../inspectionPlan/inspectionPlan.data.ts     | 16 ++++++++++
 .../inspectionTemplate/addForm.vue            | 16 ----------
 3 files changed, 27 insertions(+), 34 deletions(-)

diff --git a/src/views/qms/basicDataManage/inspectionPlan/addForm.vue b/src/views/qms/basicDataManage/inspectionPlan/addForm.vue
index 2523ea79f..2609724b6 100644
--- a/src/views/qms/basicDataManage/inspectionPlan/addForm.vue
+++ b/src/views/qms/basicDataManage/inspectionPlan/addForm.vue
@@ -162,7 +162,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="是否可用" prop="available">
-              <el-switch v-model="data.available" />
+              <el-switch v-model="data.available" active-value="TRUE" inactive-value='FALSE'/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -606,7 +606,7 @@ const data = ref({
   inspectionLevel:'',
   effectiveDate:'',
   expirationDate:'',
-  available: true,
+  available: 'TRUE',
   process: []
 })
 
@@ -642,24 +642,12 @@ const rules = ref({
   'inspectionCharacteristicsBaseVO.inspectionMethod': [
     { required: true, message: '请选择动态修改规则编码', trigger: ['blur', 'change'] }
   ],
-  'inspectionCharacteristicsBaseVO.isCanUpdate': [
-    { required: true, message: '请选择是否允许修改特征值', trigger: ['blur', 'change'] }
-  ],
-  'inspectionCharacteristicsBaseVO.isDestructionInspection': [
-    { required: true, message: '请选择是否破坏性检验', trigger: ['blur', 'change'] }
-  ],
   'inspectionCharacteristicsBaseVO.resultEntryMethod': [
     { required: true, message: '请选择结果录入方式', trigger: ['blur', 'change'] }
   ],
   'inspectionCharacteristicsBaseVO.featureType': [
     { required: true, message: '请选择特征类型', trigger: ['blur', 'change'] }
   ],
-  'inspectionCharacteristicsBaseVO.quantifyIsCapping': [
-    { required: true, message: '请选择是否设定上限', trigger: ['blur', 'change'] }
-  ],
-  'inspectionCharacteristicsBaseVO.quantifyIsLowlimit': [
-    { required: true, message: '请选择是否设定下限', trigger: ['blur', 'change'] }
-  ],
   'inspectionCharacteristicsBaseVO.quantifyIsTarget': [
     { required: true, message: '请选择是否设定目标值', trigger: ['blur', 'change'] }
   ],
@@ -695,8 +683,13 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
   formType.value = type
   if (row) {
     data.value = row
-
-    let list = await InspectionProcessPageApi.getListByTempleteCode(row.code)
+    let list =[]
+    if(row.content){
+      list = JSON.parse(row.content)
+    }else{
+      list = await InspectionProcessPageApi.getListByTempleteCode(row.programmeTemplateCode)
+    }
+    
     list.forEach((item, index) => {
       editableTabsValue.value = index + 1
       item.name = index + 1
@@ -721,7 +714,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
   } else {
     data.value = {
       code: '',
-      description: '',
+      itemCode: '',
       version: '',
       testTypeCode:'',
       programmeTemplateCode:'',
@@ -730,7 +723,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
       inspectionLevel:'',
       effectiveDate:'',
       expirationDate:'',
-      available: true,
+      available: 'TRUE',
       process: []
     }
   }
diff --git a/src/views/qms/basicDataManage/inspectionPlan/inspectionPlan.data.ts b/src/views/qms/basicDataManage/inspectionPlan/inspectionPlan.data.ts
index ae54b1875..b4306d930 100644
--- a/src/views/qms/basicDataManage/inspectionPlan/inspectionPlan.data.ts
+++ b/src/views/qms/basicDataManage/inspectionPlan/inspectionPlan.data.ts
@@ -127,14 +127,30 @@ export const InspectionPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '生效时间',
     field: 'effectiveDate',
     sort: 'custom',
+    formatter: dateFormatter,
   },{
     label: '失效时间',
     field: 'expirationDate',
     sort: 'custom',
+    formatter: dateFormatter,
   },{
     label: '是否可用',
     field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
   },
   {
     label: '操作',
diff --git a/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue b/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue
index 7209b0225..e9e0fb289 100644
--- a/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue
+++ b/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue
@@ -502,28 +502,12 @@ const rules = ref({
   'inspectionCharacteristicsBaseVO.inspectionMethod': [
     { required: true, message: '请选择动态修改规则编码', trigger: ['blur', 'change'] }
   ],
-  'inspectionCharacteristicsBaseVO.isCanUpdate': [
-    { required: true, message: '请选择是否允许修改特征值', trigger: ['blur', 'change'] }
-  ],
-  'inspectionCharacteristicsBaseVO.isDestructionInspection': [
-    { required: true, message: '请选择是否破坏性检验', trigger: ['blur', 'change'] }
-  ],
   'inspectionCharacteristicsBaseVO.resultEntryMethod': [
     { required: true, message: '请选择结果录入方式', trigger: ['blur', 'change'] }
   ],
   'inspectionCharacteristicsBaseVO.featureType': [
     { required: true, message: '请选择特征类型', trigger: ['blur', 'change'] }
   ],
-  'inspectionCharacteristicsBaseVO.quantifyIsCapping': [
-    { required: true, message: '请选择是否设定上限', trigger: ['blur', 'change'] }
-  ],
-  'inspectionCharacteristicsBaseVO.quantifyIsLowlimit': [
-    { required: true, message: '请选择是否设定下限', trigger: ['blur', 'change'] }
-  ],
-  'inspectionCharacteristicsBaseVO.quantifyIsTarget': [
-    { required: true, message: '请选择是否设定目标值', trigger: ['blur', 'change'] }
-  ],
-
   'inspectionCharacteristicsBaseVO.quantifyTarget': [
     { required: true, message: '请输入目标值', trigger: 'blur' }
   ],

From 9eb8146bd70070f494eece95f58590199e26aa1e Mon Sep 17 00:00:00 2001
From: zhaoyiran <zhaoyrd@yonyou.com>
Date: Wed, 3 Apr 2024 14:13:44 +0800
Subject: [PATCH 03/35] aql

---
 src/api/qms/aql/index.ts                      | 62 ++++++++---------
 src/api/qms/inspectionMethod/index.ts         |  3 +-
 src/views/qms/aql/aql.data.ts                 | 67 ++++++++++---------
 src/views/qms/aql/index.vue                   | 10 +--
 src/views/qms/inspectionMethod/index.vue      | 10 +--
 .../inspectionMethod/inspectionMethod.data.ts | 15 ++---
 6 files changed, 82 insertions(+), 85 deletions(-)

diff --git a/src/api/qms/aql/index.ts b/src/api/qms/aql/index.ts
index 2f1cef229..b97578878 100644
--- a/src/api/qms/aql/index.ts
+++ b/src/api/qms/aql/index.ts
@@ -6,36 +6,36 @@ export interface AqlVO {
   inspectionQualification: string
   sampleCharacterCode: string
   sampleSize: number
-  a0010: number
-  r0010: number
-  a0015: number
-  r0015: number
-  a0025: number
-  r0025: number
-  a0040: number
-  r0040: number
-  a0065: number
-  r0065: number
-  a010: number
-  r010: number
-  a015: number
-  r015: number
-  a025: number
-  r025: number
-  a040: number
-  r040: number
-  a065: number
-  r065: number
-  a10: number
-  r10: number
-  a15: number
-  r15: number
-  a25: number
-  r25: number
-  a40: number
-  r40: number
-  a65: number
-  r65: number
+  a0Separator010: number
+  r0Separator010: number
+  a0Separator015: number
+  r0Separator015: number
+  a0Separator025: number
+  r0Separator025: number
+  a0Separator040: number
+  r0Separator040: number
+  a0Separator065: number
+  r0Separator065: number
+  a0Separator10: number
+  r0Separator10: number
+  a0Separator15: number
+  r0Separator15: number
+  a0Separator25: number
+  r0Separator25: number
+  a0Separator40: number
+  r0Separator40: number
+  a0Separator65: number
+  r0Separator65: number
+  a1Separator0: number
+  r1Separator0: number
+  a1Separator5: number
+  r1Separator5: number
+  a2Separator5: number
+  r2Separator5: number
+  a4Separator0: number
+  r4Separator0: number
+  a6Separator5: number
+  r6Separator5: number
   a10: number
   r10: number
   a15: number
@@ -100,4 +100,4 @@ export const exportAql = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/qms/aql/get-import-template' })
-}
\ No newline at end of file
+}
diff --git a/src/api/qms/inspectionMethod/index.ts b/src/api/qms/inspectionMethod/index.ts
index dec4aa7dc..145aa4b3f 100644
--- a/src/api/qms/inspectionMethod/index.ts
+++ b/src/api/qms/inspectionMethod/index.ts
@@ -5,7 +5,6 @@ export interface InspectionMethodVO {
   code: string
   describe: string
   version: string
-  status: string
   operationGuidance: string
   videoAddress: string
   available: string
@@ -50,4 +49,4 @@ export const exportInspectionMethod = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/qms/inspection-method/get-import-template' })
-}
\ No newline at end of file
+}
diff --git a/src/views/qms/aql/aql.data.ts b/src/views/qms/aql/aql.data.ts
index 9f72b97cf..8913820d5 100644
--- a/src/views/qms/aql/aql.data.ts
+++ b/src/views/qms/aql/aql.data.ts
@@ -48,154 +48,152 @@ export const Aql = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: 'A0_010',
-    field: 'a0010',
+    field: 'a0Separator010',
     sort: 'custom',
   },
   {
     label: 'R0_010',
-    field: 'r0010',
+    field: 'r0Separator010',
     sort: 'custom',
   },
   {
     label: 'A0_015',
-    field: 'a0015',
+    field: 'a0Separator015',
     sort: 'custom',
   },
   {
     label: 'R0_015',
-    field: 'r0015',
+    field: 'r0Separator015',
     sort: 'custom',
   },
   {
     label: 'A0_025',
-    field: 'a0025',
+    field: 'a0Separator025',
     sort: 'custom',
-    isSearch: true,
   },
   {
     label: 'R0_025',
-    field: 'r0025',
+    field: 'r0Separator025',
     sort: 'custom',
   },
   {
     label: 'A0_040',
-    field: 'a0040',
+    field: 'a0Separator040',
     sort: 'custom',
   },
   {
     label: 'R0_040',
-    field: 'r0040',
+    field: 'r0Separator040',
     sort: 'custom',
   },
   {
     label: 'A0_065',
-    field: 'a0065',
+    field: 'a0Separator065',
     sort: 'custom',
-    isSearch: true,
   },
   {
     label: 'R0_065',
-    field: 'r0065',
+    field: 'r0Separator065',
     sort: 'custom',
   },
   {
     label: 'A0_10',
-    field: 'a010',
+    field: 'a0Separator10',
     sort: 'custom',
   },
   {
     label: 'R0_10',
-    field: 'r010',
+    field: 'r0Separator10',
     sort: 'custom',
   },
   {
     label: 'A0_15',
-    field: 'a015',
+    field: 'a0Separator15',
     sort: 'custom',
   },
   {
     label: 'R0_15',
-    field: 'r015',
+    field: 'r0Separator15',
     sort: 'custom',
   },
   {
     label: 'A0_25',
-    field: 'a025',
+    field: 'a0Separator25',
     sort: 'custom',
   },
   {
     label: 'R0_25',
-    field: 'r025',
+    field: 'r0Separator25',
     sort: 'custom',
   },
   {
     label: 'A0_40',
-    field: 'a040',
+    field: 'a0Separator40',
     sort: 'custom',
   },
   {
     label: 'R0_40',
-    field: 'r040',
+    field: 'r0Separator40',
     sort: 'custom',
   },
   {
     label: 'A0_65',
-    field: 'a065',
+    field: 'a0Separator65',
     sort: 'custom',
   },
   {
     label: 'R0_65',
-    field: 'r065',
+    field: 'r0Separator65',
     sort: 'custom',
   },
   {
     label: 'A1_0',
-    field: 'a10',
+    field: 'a1Separator0',
     sort: 'custom',
   },
   {
     label: 'R1_0',
-    field: 'r10',
+    field: 'r1Separator0',
     sort: 'custom',
   },
   {
     label: 'A1_5',
-    field: 'a15',
+    field: 'a1Separator5',
     sort: 'custom',
   },
   {
     label: 'R1_5',
-    field: 'r15',
+    field: 'r1Separator5',
     sort: 'custom',
   },
   {
     label: 'A2_5',
-    field: 'a25',
+    field: 'a2Separator5',
     sort: 'custom',
   },
   {
     label: 'R2_5',
-    field: 'r25',
+    field: 'r2Separator5',
     sort: 'custom',
   },
   {
     label: 'A4_0',
-    field: 'a40',
+    field: 'a4Separator0',
     sort: 'custom',
   },
   {
     label: 'R4_0',
-    field: 'r40',
+    field: 'r4Separator0',
     sort: 'custom',
   },
   {
     label: 'A6_5',
-    field: 'a65',
+    field: 'a6Separator5',
     sort: 'custom',
   },
   {
     label: 'R6_5',
-    field: 'r65',
+    field: 'r6Separator5',
     sort: 'custom',
   },
   {
@@ -312,6 +310,11 @@ export const Aql = useCrudSchemas(reactive<CrudSchema[]>([
     label: '是否可用',
     field: 'available',
     sort: 'custom',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+        form: {
+          component: 'SelectV2'
+        },
   },
   {
     label: '创建时间',
diff --git a/src/views/qms/aql/index.vue b/src/views/qms/aql/index.vue
index aabb6a087..b5d0446a4 100644
--- a/src/views/qms/aql/index.vue
+++ b/src/views/qms/aql/index.vue
@@ -99,9 +99,9 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:aql:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:aql:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'wms:aql:export'}), // 导出
+  defaultButtons.defaultAddBtn({hasPermi:'qms:aql:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'qms:aql:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'qms:aql:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -133,8 +133,8 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'wms:aql:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:aql:delete'}), // 删除
+  defaultButtons.mainListEditBtn({hasPermi:'qms:aql:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'qms:aql:delete'}), // 删除
 ]
 
 // 列表-操作按钮事件
diff --git a/src/views/qms/inspectionMethod/index.vue b/src/views/qms/inspectionMethod/index.vue
index 51227fc4a..f126f6799 100644
--- a/src/views/qms/inspectionMethod/index.vue
+++ b/src/views/qms/inspectionMethod/index.vue
@@ -99,9 +99,9 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:inspectionMethod:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:inspectionMethod:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'wms:inspectionMethod:export'}), // 导出
+  defaultButtons.defaultAddBtn({hasPermi:'qms:inspectionMethod:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'qms:inspectionMethod:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'qms:inspectionMethod:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -133,8 +133,8 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'wms:inspectionMethod:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:inspectionMethod:delete'}), // 删除
+  defaultButtons.mainListEditBtn({hasPermi:'qms:inspectionMethod:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'qms:inspectionMethod:delete'}), // 删除
 ]
 
 // 列表-操作按钮事件
diff --git a/src/views/qms/inspectionMethod/inspectionMethod.data.ts b/src/views/qms/inspectionMethod/inspectionMethod.data.ts
index 984bb143b..c279dd053 100644
--- a/src/views/qms/inspectionMethod/inspectionMethod.data.ts
+++ b/src/views/qms/inspectionMethod/inspectionMethod.data.ts
@@ -4,7 +4,6 @@ import { dateFormatter } from '@/utils/formatTime'
 // 表单校验
 export const InspectionMethodRules = reactive({
   code: [required],
-  status: [required],
   available: [required],
 })
 
@@ -32,15 +31,6 @@ export const InspectionMethod = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'version',
     sort: 'custom',
   },
-  {
-    label: '状态',
-    field: 'status',
-    sort: 'custom',
-    isSearch: true,
-    form: {
-      component: 'Radio'
-    },
-  },
   {
     label: '操作指导',
     field: 'operationGuidance',
@@ -55,6 +45,11 @@ export const InspectionMethod = useCrudSchemas(reactive<CrudSchema[]>([
     label: '是否可用',
     field: 'available',
     sort: 'custom',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+        form: {
+          component: 'SelectV2'
+        },
   },
   {
     label: '创建时间',

From 3ae9655ccf111c0feb3cc1fe4354e92ff0298aa2 Mon Sep 17 00:00:00 2001
From: bjang03 <wenwu901@icloud.com>
Date: Wed, 3 Apr 2024 14:14:43 +0800
Subject: [PATCH 04/35] =?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=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/ordermonthplan/index.vue        | 40 ++++++-----
 .../ordermonthplan/mesOrderMonthMain.data.ts  | 66 +++++++++----------
 2 files changed, 54 insertions(+), 52 deletions(-)

diff --git a/src/views/mes/ordermonthplan/index.vue b/src/views/mes/ordermonthplan/index.vue
index 31e9bca22..bea98e710 100644
--- a/src/views/mes/ordermonthplan/index.vue
+++ b/src/views/mes/ordermonthplan/index.vue
@@ -4,15 +4,15 @@
     <Search :schema="MesOrderMonthMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
-    <!-- 列表头部 -->
-    <TableHead
-      :HeadButttondata="HeadButttondata"
-      @button-base-click="buttonBaseClick"
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="MesOrderMonthMain.allSchemas"
-    />
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="MesOrderMonthMain.allSchemas"
+  />
 
   <!-- 列表 -->
   <ContentWrap>
@@ -51,15 +51,19 @@
   />
 
   <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="true" :allSchemas="MesOrderMonthMain.allSchemas" />
-
+  <Detail ref="detailRef"
+          :isBasic="false"
+          :detailAllSchemasRules="MesOrderMonthMainRules"
+          :allSchemas="MesOrderMonthMain.allSchemas"
+  />
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/plan/mes-order-month-main/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportForm ref="importFormRef" url="/plan/mes-order-month-main/import"
+              :importTemplateData="importTemplateData" @success="importSuccess"/>
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { MesOrderMonthMain,MesOrderMonthMainRules } from './mesOrderMonthMain.data'
+import {MesOrderMonthMain, MesOrderMonthMainRules} from './mesOrderMonthMain.data'
 import * as MesOrderMonthMainApi from '@/api/mes/ordermonthplan'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
@@ -99,9 +103,9 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:mesOrderMonthMain:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:mesOrderMonthMain:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'wms:mesOrderMonthMain:export'}), // 导出
+  defaultButtons.defaultAddBtn({hasPermi: 'mes:ordermonthplan:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi: 'mes:ordermonthplan:import'}), // 导入
+  // defaultButtons.defaultExportBtn({hasPermi:'mes:ordermonthplan:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -133,8 +137,8 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'wms:mesOrderMonthMain:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:mesOrderMonthMain:delete'}), // 删除
+  defaultButtons.mainListEditBtn({hasPermi: 'mes:ordermonthplan:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi: 'mes:ordermonthplan:delete'}), // 删除
 ]
 
 // 列表-操作按钮事件
diff --git a/src/views/mes/ordermonthplan/mesOrderMonthMain.data.ts b/src/views/mes/ordermonthplan/mesOrderMonthMain.data.ts
index b30b0fc88..0fc21aaf8 100644
--- a/src/views/mes/ordermonthplan/mesOrderMonthMain.data.ts
+++ b/src/views/mes/ordermonthplan/mesOrderMonthMain.data.ts
@@ -3,9 +3,39 @@ import { dateFormatter } from '@/utils/formatTime'
 
 // 表单校验
 export const MesOrderMonthMainRules = reactive({
+  planMasterCode: [required],
+  planSubCode:[required],
+  planType:[required],
+  factoryCode:[required]
 })
 
 export const MesOrderMonthMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '计划类型',
+    field: 'planType',
+    sort: 'custom',
+    isSearch: true
+  },
+  {
+    label: '工厂编码',
+    field: 'factoryCode',
+    sort: 'custom',
+    isTable: false
+  },
+  {
+    label: '主计划编码',
+    field: 'planMasterCode',
+    sort: 'custom',
+    isTable: false,
+    isSearch: true
+  },
+  {
+    label: '计划辅助编码',
+    field: 'planSubCode',
+    sort: 'custom',
+    isTable: true,
+    isSearch: true
+  },
   {
     label: '备注',
     field: 'remark',
@@ -35,44 +65,12 @@ export const MesOrderMonthMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
     isForm: false
   },
-  {
-    label: '主计划编码',
-    field: 'planMasterCode',
-    sort: 'custom',
-    isSearch: true
-  },
-  {
-    label: '计划辅助编码',
-    field: 'planSubCode',
-    sort: 'custom',
-    isSearch: true
-  },
-  {
-    label: '计划类型',
-    field: 'planType',
-    sort: 'custom',
-    isSearch: true,
-                form: {
-                  component: 'SelectV2'
-                }
-  },
-  {
-    label: '审核人',
-    field: 'checker',
-    sort: 'custom',
-    isSearch: true
-  },
-  {
-    label: '工厂编码',
-    field: 'factoryCode',
-    sort: 'custom',
-    isSearch: true
-  },
   {
     label: '工厂名称',
     field: 'factoryName',
     sort: 'custom',
-    isSearch: true
+    isSearch: true,
+    isForm: false
   },
   {
     label: '操作',

From b0d83c232b4b74ea62bf524a79e8c50b24016fb3 Mon Sep 17 00:00:00 2001
From: bjang03 <wenwu901@icloud.com>
Date: Wed, 3 Apr 2024 14:15:00 +0800
Subject: [PATCH 05/35] =?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=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mes/workstation/mesOrderMonthMain.data.ts | 83 -------------------
 1 file changed, 83 deletions(-)
 delete mode 100644 src/views/mes/workstation/mesOrderMonthMain.data.ts

diff --git a/src/views/mes/workstation/mesOrderMonthMain.data.ts b/src/views/mes/workstation/mesOrderMonthMain.data.ts
deleted file mode 100644
index d766ae00a..000000000
--- a/src/views/mes/workstation/mesOrderMonthMain.data.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
-
-// 表单校验
-export const MesOrderMonthMainRules = reactive({
-})
-
-export const MesOrderMonthMain = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    isTable: false
-  },
-  {
-    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: 'creator',
-    sort: 'custom',
-    isSearch: true,
-    isForm: false
-  },
-  {
-    label: '主计划编码',
-    field: 'planMasterCode',
-    sort: 'custom',
-    isTable: false,
-    isSearch: true
-  },
-  {
-    label: '计划辅助编码',
-    field: 'planSubCode',
-    sort: 'custom',
-    isTable: false,
-    isSearch: true
-  },
-  {
-    label: '计划类型',
-    field: 'planType',
-    sort: 'custom',
-    isSearch: true,
-                form: {
-                  component: 'SelectV2'
-                }
-  },
-  {
-    label: '工厂编码',
-    field: 'factoryCode',
-    sort: 'custom',
-    isTable: false
-  },
-  {
-    label: '工厂名称',
-    field: 'factoryName',
-    sort: 'custom',
-    isSearch: true,
-    isForm: false
-  },
-  {
-    label: '操作',
-    field: 'action',
-    isForm: false,
-    table: {
-      width: 150,
-      fixed: 'right'
-    }
-  }
-]))

From 8ddbf3ff6b93f64fc9df177ffc2864160048500c Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 3 Apr 2024 14:33:18 +0800
Subject: [PATCH 06/35] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=96=B9=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inspectionPlan/addForm.vue                |  2 +-
 .../inspectionPlan/inspectionPlan.data.ts     | 27 +++++++++++++++++--
 .../inspectionTemplate/addForm.vue            |  3 +--
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/src/views/qms/basicDataManage/inspectionPlan/addForm.vue b/src/views/qms/basicDataManage/inspectionPlan/addForm.vue
index 2609724b6..21b987ee4 100644
--- a/src/views/qms/basicDataManage/inspectionPlan/addForm.vue
+++ b/src/views/qms/basicDataManage/inspectionPlan/addForm.vue
@@ -682,7 +682,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
   }
   formType.value = type
   if (row) {
-    data.value = row
+    data.value = JSON.parse(JSON.stringify(row))
     let list =[]
     if(row.content){
       list = JSON.parse(row.content)
diff --git a/src/views/qms/basicDataManage/inspectionPlan/inspectionPlan.data.ts b/src/views/qms/basicDataManage/inspectionPlan/inspectionPlan.data.ts
index b4306d930..e1e8da612 100644
--- a/src/views/qms/basicDataManage/inspectionPlan/inspectionPlan.data.ts
+++ b/src/views/qms/basicDataManage/inspectionPlan/inspectionPlan.data.ts
@@ -73,6 +73,10 @@ export const InspectionPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '编码',
     field: 'code',
     sort: 'custom',
+    table: {
+      width: 220,
+      fixed: 'left'
+    },
     form:{
       componentProps:{
         disabled:true,
@@ -84,18 +88,30 @@ export const InspectionPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '物料编码',
     field: 'itemCode',
     sort: 'custom',
+    table: {
+      width: 150
+    }
   },{
     label: '版本',
     field: 'version',
     sort: 'custom',
+    table: {
+      width: 150
+    }
   },{
     label: '检验类型编码',
     field: 'testTypeCode',
     sort: 'custom',
+    table: {
+      width: 150
+    }
   },{
     label: '检验模板编码',
     field: 'programmeTemplateCode',
     sort: 'custom',
+    table: {
+      width: 150
+    }
   },{
     label: '拆分规则',
     field: 'splitRule',
@@ -128,11 +144,17 @@ export const InspectionPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'effectiveDate',
     sort: 'custom',
     formatter: dateFormatter,
+    table: {
+      width: 180
+    }
   },{
     label: '失效时间',
     field: 'expirationDate',
     sort: 'custom',
     formatter: dateFormatter,
+    table: {
+      width: 180
+    }
   },{
     label: '是否可用',
     field: 'available',
@@ -155,10 +177,11 @@ export const InspectionPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '操作',
     field: 'action',
-    isForm: false,
+    isDetail: false,
+    isForm: false ,
     table: {
       width: 150,
       fixed: 'right'
-    }
+    },
   }
 ]))
diff --git a/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue b/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue
index e9e0fb289..bd5aa233b 100644
--- a/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue
+++ b/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue
@@ -538,8 +538,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
   }
   formType.value = type
   if (row) {
-    data.value = row
-
+    data.value = JSON.parse(JSON.stringify(row))
     let list = await InspectionProcessPageApi.getListByTempleteCode(row.code)
     list.forEach((item, index) => {
       editableTabsValue.value = index + 1

From 2b485b299d0735db5818b58481db7dfa5d61eb75 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 3 Apr 2024 14:34:44 +0800
Subject: [PATCH 07/35] =?UTF-8?q?=E9=AA=8C=E8=AF=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/basicDataManage/inspectionPlan/addForm.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/views/qms/basicDataManage/inspectionPlan/addForm.vue b/src/views/qms/basicDataManage/inspectionPlan/addForm.vue
index 21b987ee4..13f5fe8cd 100644
--- a/src/views/qms/basicDataManage/inspectionPlan/addForm.vue
+++ b/src/views/qms/basicDataManage/inspectionPlan/addForm.vue
@@ -648,10 +648,6 @@ const rules = ref({
   'inspectionCharacteristicsBaseVO.featureType': [
     { required: true, message: '请选择特征类型', trigger: ['blur', 'change'] }
   ],
-  'inspectionCharacteristicsBaseVO.quantifyIsTarget': [
-    { required: true, message: '请选择是否设定目标值', trigger: ['blur', 'change'] }
-  ],
-
   'inspectionCharacteristicsBaseVO.quantifyTarget': [
     { required: true, message: '请输入目标值', trigger: 'blur' }
   ],

From 4fd8b25c21bbde406c27ee7ec62f41071f643f19 Mon Sep 17 00:00:00 2001
From: zhaoyiran <zhaoyrd@yonyou.com>
Date: Wed, 3 Apr 2024 14:37:48 +0800
Subject: [PATCH 08/35] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=8F=E8=BF=B0?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/qms/inspectionMethod/index.ts                   | 2 +-
 src/api/qms/samplingScheme/index.ts                     | 2 +-
 src/views/qms/inspectionMethod/inspectionMethod.data.ts | 2 +-
 src/views/qms/samplingProcess/samplingProcess.data.ts   | 2 +-
 src/views/qms/samplingScheme/samplingScheme.data.ts     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/api/qms/inspectionMethod/index.ts b/src/api/qms/inspectionMethod/index.ts
index 145aa4b3f..dae6cc6bc 100644
--- a/src/api/qms/inspectionMethod/index.ts
+++ b/src/api/qms/inspectionMethod/index.ts
@@ -3,7 +3,7 @@ import request from '@/config/axios'
 export interface InspectionMethodVO {
   id: number
   code: string
-  describe: string
+  description: string
   version: string
   operationGuidance: string
   videoAddress: string
diff --git a/src/api/qms/samplingScheme/index.ts b/src/api/qms/samplingScheme/index.ts
index 34dfe4d83..f60047e97 100644
--- a/src/api/qms/samplingScheme/index.ts
+++ b/src/api/qms/samplingScheme/index.ts
@@ -3,7 +3,7 @@ import request from '@/config/axios'
 export interface SamplingSchemeVO {
   id: number
   code: string
-  describe: string
+  description: string
   available: string
 }
 
diff --git a/src/views/qms/inspectionMethod/inspectionMethod.data.ts b/src/views/qms/inspectionMethod/inspectionMethod.data.ts
index c279dd053..8464df82b 100644
--- a/src/views/qms/inspectionMethod/inspectionMethod.data.ts
+++ b/src/views/qms/inspectionMethod/inspectionMethod.data.ts
@@ -23,7 +23,7 @@ export const InspectionMethod = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '描述',
-    field: 'describe',
+    field: 'description',
     sort: 'custom',
   },
   {
diff --git a/src/views/qms/samplingProcess/samplingProcess.data.ts b/src/views/qms/samplingProcess/samplingProcess.data.ts
index f9e28f4cf..30b2ff8fc 100644
--- a/src/views/qms/samplingProcess/samplingProcess.data.ts
+++ b/src/views/qms/samplingProcess/samplingProcess.data.ts
@@ -25,7 +25,7 @@ export const SamplingProcess = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '描述',
-    field: 'describe',
+    field: 'description',
     sort: 'custom',
     isSearch: true,
   },
diff --git a/src/views/qms/samplingScheme/samplingScheme.data.ts b/src/views/qms/samplingScheme/samplingScheme.data.ts
index 77816682b..cd022a923 100644
--- a/src/views/qms/samplingScheme/samplingScheme.data.ts
+++ b/src/views/qms/samplingScheme/samplingScheme.data.ts
@@ -24,7 +24,7 @@ export const SamplingScheme = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '描述',
-    field: 'describe',
+    field: 'description',
     sort: 'custom',
     isSearch: true,
   },

From 709f714e8df4e80569a862e5c55b7c19bacf91bf Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Wed, 3 Apr 2024 15:00:03 +0800
Subject: [PATCH 09/35] =?UTF-8?q?=E5=A4=87=E4=BB=B6=E9=A2=86=E7=94=A8?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/balance/index.ts                  | 12 +++++++++
 .../wms/unplannedissueRequestMain/index.ts    | 27 +++++++++++++++++++
 .../index.vue                                 |  3 ++-
 .../sparepartsrequisitionRequestMain.data.ts  | 24 +++--------------
 .../unplannedissueRequestMain/index.vue       |  2 +-
 5 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/src/api/wms/balance/index.ts b/src/api/wms/balance/index.ts
index 58dc31c42..432b14a1a 100644
--- a/src/api/wms/balance/index.ts
+++ b/src/api/wms/balance/index.ts
@@ -82,6 +82,18 @@ export const getBalancePageByBusinessType = async (params) => {
   }
 }
 
+
+// 备件出库查询库存余额列表
+export const getBalancePageSpare = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/balance/seniorSpareItems', data })
+  } else {
+    return await request.get({ url: `/wms/balance/pageSpareItem`, params })
+  }
+}
+
 // 查询库存余额详情
 export const getBalance = async (id: number) => {
   return await request.get({ url: `/wms/balance/get?id=` + id })
diff --git a/src/api/wms/unplannedissueRequestMain/index.ts b/src/api/wms/unplannedissueRequestMain/index.ts
index 62738b340..be6d7eb07 100644
--- a/src/api/wms/unplannedissueRequestMain/index.ts
+++ b/src/api/wms/unplannedissueRequestMain/index.ts
@@ -27,12 +27,39 @@ export const getUnplannedissueRequestMainPage = 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-request-main/senior', data })
   } else {
+    params.dataType='1'
     return await request.get({ url: `/wms/unplannedissue-request-main/page`, params })
   }
 }
 
+
+// 查询计划外出库申请主列表
+export const getUnplannedissueRequestMainPageSpare = 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-request-main/senior', data })
+  } else {
+    params.dataType='2'
+    return await request.get({ url: `/wms/unplannedissue-request-main/page`, params })
+  }
+}
+
+
 // 查询计划外出库申请主详情
 export const getUnplannedissueRequestMain = async (id: number) => {
   return await request.get({ url: `/wms/unplannedissue-request-main/get?id=` + id })
diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
index 94eb8a380..21e0599a3 100644
--- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
@@ -142,7 +142,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
 const Echo =  []
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: UnplannedissueRequestMainApi.getUnplannedissueRequestMainPage // 分页接口
+  getListApi: UnplannedissueRequestMainApi.getUnplannedissueRequestMainPageSpare // 分页接口
 })
 
 // 获得表格的各种操作
@@ -387,6 +387,7 @@ const submitForm = async (formType, data) => {
         formRef.value.formLoading = false
         return
       }
+      data.dataType='2'
       await UnplannedissueRequestMainApi.createUnplannedissueRequestMain(data)
       message.success(t('common.createSuccess'))
     } else {
diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts
index 2c0d3080f..bcea142f4 100644
--- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts
@@ -433,7 +433,7 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       searchField: 'packingNumber',
       searchTitle: '库存余额信息',
       searchAllSchemas: Balance.allSchemas,
-      searchPage: BalanceApi.getBalancePage
+      searchPage: BalanceApi.getBalancePageSpare
     },
     form: {
       // labelMessage: '信息提示说明！！！',
@@ -443,7 +443,7 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
         searchField: 'packingNumber',
         searchTitle: '库存余额信息',
         searchAllSchemas: Balance.allSchemas,
-        searchPage: BalanceApi.getBalancePage
+        searchPage: BalanceApi.getBalancePageSpare
       }
     }
   },
@@ -512,25 +512,11 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '原因',
+    label: '领用原因',
     field: 'reason',
-    dictType: DICT_TYPE.UNPLANNED_ISSUE_REASON,
-    dictClass: 'string',
-    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-      return cellValue
-    },
     table: {
       width: 150
     },
-    form: {
-      componentProps: {
-        filterable: true
-      }
-    },
-    tableForm: {
-      type: 'Select',
-      filterable: true
-    }
   },
   {
     label: '项目代码',
@@ -641,10 +627,6 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
 
 //表单校验
 export const UnplannedissueRequestDetailRules = reactive({
-  packingNumber: [
-    { required: true, message: '请选择包装号', trigger: 'change' },
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
-  ],
   batch: [
     { required: true, message: '请输入批次', trigger: 'blur' },
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue
index fcefc2809..bb9351405 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue
@@ -86,7 +86,6 @@ import { UnplannedissueRequestMain,UnplannedissueRequestMainRules,Unplannedissue
 import * as UnplannedissueRequestMainApi from '@/api/wms/unplannedissueRequestMain'
 import * as UnplannedissueRequestDetailApi from '@/api/wms/unplannedissueRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import * as TransferissueRequestMainApi from "@/api/wms/transferissueRequestMain";
 
 // 计划外出库申请
 defineOptions({ name: 'UnplannedissueRequestMain' })
@@ -388,6 +387,7 @@ const submitForm = async (formType, data) => {
         formRef.value.formLoading = false
         return
       }
+      data.dataType='1'
       await UnplannedissueRequestMainApi.createUnplannedissueRequestMain(data)
       message.success(t('common.createSuccess'))
     } else {

From 8f47f4446491223fea34434ce1a7dd47badd32ae Mon Sep 17 00:00:00 2001
From: songguoqiang <765017469@qq.com>
Date: Wed, 3 Apr 2024 15:17:02 +0800
Subject: [PATCH 10/35] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=A8=A1=E7=89=88?=
 =?UTF-8?q?=E5=92=8C=E6=A3=80=E9=AA=8C=E6=96=B9=E6=A1=88=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=BC=96=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inspectionPlan/addForm.vue                | 1146 +++++++++--------
 .../inspectionTemplate/addForm.vue            |   17 +-
 2 files changed, 607 insertions(+), 556 deletions(-)

diff --git a/src/views/qms/basicDataManage/inspectionPlan/addForm.vue b/src/views/qms/basicDataManage/inspectionPlan/addForm.vue
index 13f5fe8cd..d41d922db 100644
--- a/src/views/qms/basicDataManage/inspectionPlan/addForm.vue
+++ b/src/views/qms/basicDataManage/inspectionPlan/addForm.vue
@@ -1,542 +1,582 @@
 <template>
   <div>
-  <Dialog
-    :title="dialogTitle"
-    v-model="dialogVisible"
-    :width="dialogWidth"
-    :close-on-click-modal="false"
-    :vLoading="formLoading"
-  >
-    <div style="max-height: 60vh; 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">
-            <el-form-item label="编码" prop="code">
-              <el-input v-model="data.code" placeholder="根据系统生成" :disabled="true" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="物料编码" prop="itemCode">
-              <div style="display: flex; width: 100%">
-                <el-input v-model="data.itemCode" disabled placeholder="请选择物料编码" />
-                <el-button
-                  type="info"
-                  plain
-                  style="width: 40px"
-                  @click="
-                    opensearchTable(
-                      'itemCode',
-                      null,
-                      '物料编码',
-                      Itembasic.allSchemas,
-                      ItemBasicApi.getItembasicPage,
-                      null,
-                      false,
-                      'form',
-                      null
-                    )
-                  "
-                  ><Icon icon="ep:search" />
-                </el-button>
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="版本" prop="version">
-              <el-input v-model="data.version" placeholder="请填写版本" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="检验类型编码" prop="testTypeCode">
-              <div style="display: flex; width: 100%">
-                <el-input v-model="data.testTypeCode" disabled placeholder="请选择检验类型编码" />
-                <el-button
-                  type="info"
-                  plain
-                  style="width: 40px"
-                  @click="
-                    opensearchTable(
-                      'testTypeCode',
-                      null,
-                      '检验类型',
-                      SamplingProcess.allSchemas,
-                      SamplingProcessApi.getSamplingProcessPage,
-                      null,
-                      false,
-                      'form',
-                      null
-                    )
-                  "
-                  ><Icon icon="ep:search" />
-                </el-button>
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="检验模板编码" prop="programmeTemplateCode">
-              <div style="display: flex; width: 100%">
-                <el-input
-                  v-model="data.programmeTemplateCode"
-                  disabled
-                  placeholder="请选择检验模板编码"
-                />
-                <el-button
-                  type="info"
-                  plain
-                  style="width: 40px"
-                  @click="
-                    opensearchTable(
-                      'programmeTemplateCode',
-                      null,
-                      '检验模板编码',
-                      InspectionTemplateMain.allSchemas,
-                      InspectionTemplateApi.inspectionTemplatePage,
-                      null,
-                      false,
-                      'form',
-                      null
-                    )
-                  "
-                  ><Icon icon="ep:search" />
-                </el-button>
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="拆分规则" prop="splitRule">
-              <el-select v-model="data.splitRule" placeholder="请选择拆分规则">
-                <el-option
-                  v-for="dict in getStrDictOptions(DICT_TYPE.SPLIT_RULES)"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="aql" prop="aql">
-              <el-select v-model="data.aql" placeholder="请选择aql">
-                <el-option
-                  v-for="dict in getStrDictOptions(DICT_TYPE.BASIC_AQL)"
-                  :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="inspectionLevel">
-              <el-select v-model="data.inspectionLevel" placeholder="请选择检验水平">
-                <el-option
-                  v-for="dict in getStrDictOptions(DICT_TYPE.INSPECTION_LEVEL)"
-                  :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="effectiveDate">
-              <el-date-picker
-                v-model="data.effectiveDate"
-                type="datetime"
-                placeholder="请选择生效时间"
-                style="width: 100%"
-                value-format="x"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="失效时间" prop="expirationDate">
-              <el-date-picker
-                v-model="data.expirationDate"
-                type="datetime"
-                placeholder="请选择失效时间"
-                style="width: 100%"
-                value-format="x"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="是否可用" prop="available">
-              <el-switch v-model="data.available" active-value="TRUE" inactive-value='FALSE'/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <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.description"
-          :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="code">
-                  <el-input v-model="item.code" placeholder="根据系统生成" :disabled="true" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="检验方案模板编码">
+    <Dialog
+      :title="dialogTitle"
+      v-model="dialogVisible"
+      :width="dialogWidth"
+      :close-on-click-modal="false"
+      :vLoading="formLoading"
+    >
+      <div style="max-height: 60vh; 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">
+              <el-form-item label="编码" prop="code">
+                <el-input v-model="data.code" placeholder="根据系统生成" :disabled="true" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="物料编码" prop="itemCode">
+                <div style="display: flex; width: 100%">
+                  <el-input v-model="data.itemCode" disabled placeholder="请选择物料编码" />
+                  <el-button
+                    type="info"
+                    plain
+                    style="width: 40px"
+                    @click="
+                      opensearchTable(
+                        'itemCode',
+                        null,
+                        '物料编码',
+                        Itembasic.allSchemas,
+                        ItemBasicApi.getItembasicPage,
+                        null,
+                        false,
+                        'form',
+                        null
+                      )
+                    "
+                    ><Icon icon="ep:search" />
+                  </el-button>
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="版本" prop="version">
+                <el-input v-model="data.version" placeholder="请填写版本" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="检验类型编码" prop="testTypeCode">
+                <div style="display: flex; width: 100%">
+                  <el-input v-model="data.testTypeCode" disabled placeholder="请选择检验类型编码" />
+                  <el-button
+                    type="info"
+                    plain
+                    style="width: 40px"
+                    @click="
+                      opensearchTable(
+                        'testTypeCode',
+                        null,
+                        '检验类型',
+                        SamplingProcess.allSchemas,
+                        SamplingProcessApi.getSamplingProcessPage,
+                        null,
+                        false,
+                        'form',
+                        null
+                      )
+                    "
+                    ><Icon icon="ep:search" />
+                  </el-button>
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="检验模板编码" prop="programmeTemplateCode">
+                <div style="display: flex; width: 100%">
                   <el-input
-                    v-model="item.inspectionCode"
-                    placeholder="根据系统生成"
-                    :disabled="true"
+                    v-model="data.programmeTemplateCode"
+                    disabled
+                    placeholder="请选择检验模板编码"
                   />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="描述" prop="description">
-                  <el-input v-model="item.description" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="顺序号" prop="sequenceCode">
-                  <el-input v-model="item.sequenceCode" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="检验特性编码">
-                  <el-input
-                    v-model="item.inspectionCharCode"
-                    placeholder="根据系统生成"
-                    :disabled="true"
+                  <el-button
+                    type="info"
+                    plain
+                    style="width: 40px"
+                    @click="
+                      opensearchTable(
+                        'programmeTemplateCode',
+                        null,
+                        '检验模板编码',
+                        InspectionTemplateMain.allSchemas,
+                        InspectionTemplateApi.inspectionTemplatePage,
+                        null,
+                        false,
+                        'form',
+                        null
+                      )
+                    "
+                    ><Icon icon="ep:search" />
+                  </el-button>
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="拆分规则" prop="splitRule">
+                <el-select v-model="data.splitRule" placeholder="请选择拆分规则">
+                  <el-option
+                    v-for="dict in getStrDictOptions(DICT_TYPE.SPLIT_RULES)"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
                   />
-                </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.code"
-                    placeholder="根据系统生成"
-                    :disabled="true"
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="aql" prop="aql">
+                <el-select v-model="data.aql" placeholder="请选择aql">
+                  <el-option
+                    v-for="dict in getStrDictOptions(DICT_TYPE.BASIC_AQL)"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
                   />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="描述" prop="inspectionCharacteristicsBaseVO.description">
-                  <el-input v-model="item.inspectionCharacteristicsBaseVO.description" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item
-                  label="检验方法编码"
-                  prop="inspectionCharacteristicsBaseVO.inspectionMethodCode"
-                >
-                  <div style="display: flex; width: 100%">
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="检验水平" prop="inspectionLevel">
+                <el-select v-model="data.inspectionLevel" placeholder="请选择检验水平">
+                  <el-option
+                    v-for="dict in getStrDictOptions(DICT_TYPE.INSPECTION_LEVEL)"
+                    :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="effectiveDate">
+                <el-date-picker
+                  v-model="data.effectiveDate"
+                  type="datetime"
+                  placeholder="请选择生效时间"
+                  style="width: 100%"
+                  value-format="x"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="失效时间" prop="expirationDate">
+                <el-date-picker
+                  v-model="data.expirationDate"
+                  type="datetime"
+                  placeholder="请选择失效时间"
+                  style="width: 100%"
+                  value-format="x"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否可用" prop="available">
+                <el-switch v-model="data.available" active-value="TRUE" inactive-value="FALSE" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <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.description"
+            :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="code">
+                    <el-input v-model="item.code" placeholder="根据系统生成" :disabled="true" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="检验方案模板编码">
                     <el-input
-                      v-model="item.inspectionCharacteristicsBaseVO.inspectionMethodCode"
-                      disabled
-                      placeholder="请选择检验方法编码"
+                      v-model="item.inspectionCode"
+                      placeholder="根据系统生成"
+                      :disabled="true"
                     />
-                    <el-button
-                      type="info"
-                      plain
-                      style="width: 40px"
-                      @click="
-                        opensearchTable(
-                          'inspectionMethodCode',
-                          null,
-                          '检验方法',
-                          SamplingProcess.allSchemas,
-                          SamplingProcessApi.getSamplingProcessPage,
-                          null,
-                          false,
-                          null,
-                          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-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="描述" prop="description">
+                    <el-input v-model="item.description" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="顺序号" prop="sequenceCode">
+                    <el-input v-model="item.sequenceCode" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="检验特性编码">
                     <el-input
-                      v-model="item.inspectionCharacteristicsBaseVO.dynamicUpdateCode"
-                      disabled
-                      placeholder="请选择采样过程编码"
+                      v-model="item.inspectionCharCode"
+                      placeholder="根据系统生成"
+                      :disabled="true"
                     />
-                    <el-button
-                      type="info"
-                      plain
-                      style="width: 40px"
-                      @click="
-                        opensearchTable(
-                          'dynamicUpdateCode',
-                          null,
-                          '采样过程编码',
-                          SamplingProcess.allSchemas,
-                          SamplingProcessApi.getSamplingProcessPage,
-                          null,
-                          false,
-                          null,
-                          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-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.inspectionMethod"
+                      v-model="item.inspectionCharacteristicsBaseVO.code"
+                      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" />
+                  </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.inspectionMethodCode"
+                        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,
+                            null,
+                            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.dynamicUpdateCode"
+                        disabled
+                        placeholder="请选择采样过程编码"
+                      />
+                      <el-button
+                        type="info"
+                        plain
+                        style="width: 40px"
+                        @click="
+                          opensearchTable(
+                            'dynamicUpdateCode',
+                            null,
+                            '采样过程编码',
+                            SamplingProcess.allSchemas,
+                            SamplingProcessApi.getSamplingProcessPage,
+                            [
+                              {
+                                key: 'available',
+                                value: 'TRUE',
+                                isMainValue: false
+                              }
+                            ],
+                            false,
+                            null,
+                            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.inspectionMethod"
+                        disabled
+                        placeholder="请选择动态修改规则编码"
+                      />
+                      <el-button
+                        type="info"
+                        plain
+                        style="width: 40px"
+                        @click="
+                          opensearchTable(
+                            'inspectionMethod',
+                            null,
+                            '动态修改规则编码',
+                            DynamicRule.allSchemas,
+                            DynamicRuleApi.getDynamicRulePage,
+                            [
+                            {
+                              key: 'available',
+                              value: 'TRUE',
+                              isMainValue: false
+                            }
+                          ],
+                            false,
+                            null,
+                            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
-                      placeholder="请选择动态修改规则编码"
                     />
-                    <el-button
-                      type="info"
-                      plain
-                      style="width: 40px"
-                      @click="
-                        opensearchTable(
-                          'inspectionMethod',
-                          null,
-                          '动态修改规则编码',
-                          SamplingProcess.allSchemas,
-                          SamplingProcessApi.getSamplingProcessPage,
-                          null,
-                          false,
-                          null,
-                          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-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item
+                    label="结果录入方式"
+                    prop="inspectionCharacteristicsBaseVO.resultEntryMethod"
                   >
-                    <el-option
-                      v-for="dict in getStrDictOptions(
-                        DICT_TYPE.INSPECTION_CHARACTERISTICS_RESULT_ENTRY
-                      )"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
+                    <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-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-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item
+                    label="上限值"
+                    prop="inspectionCharacteristicsBaseVO.quantifyCapping"
+                    v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
                   >
-                    <el-option
-                      v-for="dict in getStrDictOptions(
-                        DICT_TYPE.INSPECTION_CHARACTERISTICS_FEATURE_TYPE
-                      )"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
+                    <el-input
+                      v-model="item.inspectionCharacteristicsBaseVO.quantifyCapping"
+                      :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"
                     />
-                  </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-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-col :span="12">
+                  <el-form-item
+                    label="计量单位"
+                    prop="inspectionCharacteristicsBaseVO.quantifyUom"
+                    v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
+                  >
                     <el-input
-                      v-model="item.inspectionCharacteristicsBaseVO.quantifyQuantifyCode"
-                      disabled
-                      placeholder="请选择选择集编码"
+                      v-model="item.inspectionCharacteristicsBaseVO.quantifyUom"
+                      :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"
                     />
-                    <el-button
-                      type="info"
-                      plain
-                      style="width: 40px"
-                      @click="
-                        opensearchTable(
-                          'quantifyQuantifyCode',
-                          null,
-                          '选择集编码',
-                          SamplingProcess.allSchemas,
-                          SamplingProcessApi.getSamplingProcessPage,
-                          null,
-                          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>
+                  </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">
@@ -546,11 +586,18 @@ import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 import * as InspectionProcessPageApi from '@/api/qms/inspectionTemplate'
 import { SearchTable } from '@/components/SearchTable'
 import { SamplingProcess } from '@/views/qms/samplingProcess/samplingProcess.data'
-import * as SamplingProcessApi from '@/api/qms/samplingProcess'
 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 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({
@@ -599,13 +646,13 @@ const data = ref({
   code: '',
   itemCode: '',
   version: '',
-  testTypeCode:'',
-  programmeTemplateCode:'',
-  splitRule:'',
-  aql:'',
-  inspectionLevel:'',
-  effectiveDate:'',
-  expirationDate:'',
+  testTypeCode: '',
+  programmeTemplateCode: '',
+  splitRule: '',
+  aql: '',
+  inspectionLevel: '',
+  effectiveDate: '',
+  expirationDate: '',
   available: 'TRUE',
   process: []
 })
@@ -624,12 +671,14 @@ 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']}],
+  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'] }
   ],
@@ -679,13 +728,13 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
   formType.value = type
   if (row) {
     data.value = JSON.parse(JSON.stringify(row))
-    let list =[]
-    if(row.content){
+    let list = []
+    if (row.content) {
       list = JSON.parse(row.content)
-    }else{
+    } else {
       list = await InspectionProcessPageApi.getListByTempleteCode(row.programmeTemplateCode)
     }
-    
+
     list.forEach((item, index) => {
       editableTabsValue.value = index + 1
       item.name = index + 1
@@ -712,13 +761,13 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
       code: '',
       itemCode: '',
       version: '',
-      testTypeCode:'',
-      programmeTemplateCode:'',
-      splitRule:'',
-      aql:'',
-      inspectionLevel:'',
-      effectiveDate:'',
-      expirationDate:'',
+      testTypeCode: '',
+      programmeTemplateCode: '',
+      splitRule: '',
+      aql: '',
+      inspectionLevel: '',
+      effectiveDate: '',
+      expirationDate: '',
       available: 'TRUE',
       process: []
     }
@@ -962,15 +1011,14 @@ const opensearchTable = (
 // 弹层确定返回所选数据
 // val ： 弹层列表row 数据
 const searchTableSuccess = async (formField, searchField, val, type, row) => {
- 
   if (type == 'tableForm') {
     // 明细查询页赋值
     row[formField] = val[0][searchField]
   } else {
     console.log(formField)
-  console.log(val[0].code)
-  console.log(type)
-      data.value[formField] = val[0].code
+    console.log(val[0].code)
+    console.log(type)
+    data.value[formField] = val[0].code
     if (formField == 'programmeTemplateCode') {
       let list = await InspectionProcessPageApi.getListByTempleteCode(val[0].code)
       list.forEach((item, index) => {
diff --git a/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue b/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue
index bd5aa233b..d73e00ebb 100644
--- a/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue
+++ b/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue
@@ -124,7 +124,7 @@
                           'inspectionMethodCode',
                           null,
                           '检验方法',
-                          SamplingProcess.allSchemas,
+                          InspectionMethod.allSchemas,
                           InspectionMethodApi.getInspectionMethodPage,
                           [
                             {
@@ -202,7 +202,7 @@
                           'inspectionMethod',
                           null,
                           '动态修改规则编码',
-                          SamplingProcess.allSchemas,
+                          DynamicRule.allSchemas,
                           DynamicRuleApi.getDynamicRulePage,
                           [
                             {
@@ -366,7 +366,7 @@
                           'quantifyQuantifyCode',
                           null,
                           '选择集编码',
-                          SamplingProcess.allSchemas,
+                          SelectedSet.allSchemas,
                           SelectedSetApi.getSelectedSetPage,
                           [
                             {
@@ -419,10 +419,13 @@ import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 import * as InspectionProcessPageApi from '@/api/qms/inspectionTemplate'
 import { SearchTable } from '@/components/SearchTable'
 import { SamplingProcess } from '@/views/qms/samplingProcess/samplingProcess.data'
-import * as SamplingProcessApi from '@/api/qms/samplingProcess'//采样过程
-import * as InspectionMethodApi from '@/api/qms/inspectionMethod'//检验方法
-import * as DynamicRuleApi from '@/api/qms/dynamicRule'//动态修改规则
-import * as SelectedSetApi from '@/api/qms/selectedSet'//选择集
+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({

From 46f0ca1bafe9fab44afe0c7f7901b39fb9ecd9ea Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 3 Apr 2024 15:44:55 +0800
Subject: [PATCH 11/35] =?UTF-8?q?=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qms/basicDataManage/inspectionPlan/addForm.vue   | 12 ++++++------
 .../basicDataManage/inspectionTemplate/addForm.vue   |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/views/qms/basicDataManage/inspectionPlan/addForm.vue b/src/views/qms/basicDataManage/inspectionPlan/addForm.vue
index d41d922db..f8cf4ff51 100644
--- a/src/views/qms/basicDataManage/inspectionPlan/addForm.vue
+++ b/src/views/qms/basicDataManage/inspectionPlan/addForm.vue
@@ -739,17 +739,17 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
       editableTabsValue.value = index + 1
       item.name = index + 1
       // 编辑判断上限下限目标值是否必填
-      if (item.quantifyIsCapping) {
+      if (item.inspectionCharacteristicsBaseVO.quantifyIsCapping) {
         rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = true
       } else {
         rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = false
       }
-      if (item.quantifyIsLowlimit) {
+      if (item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit) {
         rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = true
       } else {
         rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = false
       }
-      if (item.quantifyIsTarget) {
+      if (item.inspectionCharacteristicsBaseVO.quantifyIsTarget) {
         rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = true
       } else {
         rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = false
@@ -1025,17 +1025,17 @@ const searchTableSuccess = async (formField, searchField, val, type, row) => {
         editableTabsValue.value = index + 1
         item.name = index + 1
         // 编辑判断上限下限目标值是否必填
-        if (item.quantifyIsCapping) {
+        if (item.inspectionCharacteristicsBaseVO.quantifyIsCapping) {
           rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = true
         } else {
           rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = false
         }
-        if (item.quantifyIsLowlimit) {
+        if (item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit) {
           rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = true
         } else {
           rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = false
         }
-        if (item.quantifyIsTarget) {
+        if (item.inspectionCharacteristicsBaseVO.quantifyIsTarget) {
           rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = true
         } else {
           rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = false
diff --git a/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue b/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue
index d73e00ebb..686f41670 100644
--- a/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue
+++ b/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue
@@ -547,17 +547,17 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
       editableTabsValue.value = index + 1
       item.name = index + 1
       // 编辑判断上限下限目标值是否必填
-      if (item.quantifyIsCapping) {
+      if (item.inspectionCharacteristicsBaseVO.quantifyIsCapping) {
         rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = true
       } else {
         rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = false
       }
-      if (item.quantifyIsLowlimit) {
+      if (item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit) {
         rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = true
       } else {
         rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = false
       }
-      if (item.quantifyIsTarget) {
+      if (item.inspectionCharacteristicsBaseVO.quantifyIsTarget) {
         rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = true
       } else {
         rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = false

From f99b42437b426614a8d84594e08c43e838c68bf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com>
Date: Wed, 3 Apr 2024 16:03:14 +0800
Subject: [PATCH 12/35] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qms/inspection/inspectionRecord/index.vue |  10 +-
 ...n.data.ts => inspectionRecordMain.data.ts} |  88 ++--
 .../inspection/inspectionRequest/index.vue    | 387 +++++++++---------
 3 files changed, 229 insertions(+), 256 deletions(-)
 rename src/views/qms/inspection/inspectionRecord/{inspectionJobMain.data.ts => inspectionRecordMain.data.ts} (89%)

diff --git a/src/views/qms/inspection/inspectionRecord/index.vue b/src/views/qms/inspection/inspectionRecord/index.vue
index b73e9ddfd..7116df0d8 100644
--- a/src/views/qms/inspection/inspectionRecord/index.vue
+++ b/src/views/qms/inspection/inspectionRecord/index.vue
@@ -30,9 +30,9 @@
   <BasicForm ref="formRef" @success="getList" :rules="InspectionRecordMainRules"
     :formAllSchemas="InspectionRecordMain.allSchemas" :tableAllSchemas="InspectionRecordDetail.allSchemas"
     :tableFormRules="InspectionRecordDetailRules" :tableData="tableData"
-    :apiUpdate="InspectionRecordMainApi.updateInspectionRecordMain" :apiCreate="InspectionRecordMainApi.createInspectionRecordMain"
-    :isBusiness="true" @handleAddTable="handleAddTable" @handleDeleteTable="handleDeleteTable"
-    @searchTableSuccess="searchTableSuccess" @submitForm="submitForm" />
+    :apiUpdate="InspectionRecordMainApi.updateInspectionRecordMain"
+    :apiCreate="InspectionRecordMainApi.createInspectionRecordMain" :isBusiness="true" @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable" @searchTableSuccess="searchTableSuccess" @submitForm="submitForm" />
 
   <!-- 详情 -->
   <Detail ref="detailRef" :isBasic="false" :allSchemas="InspectionRecordMain.allSchemas"
@@ -40,8 +40,8 @@
     :apiCreate="InspectionRecordDetailApi.createInspectionRecordDetail"
     :apiUpdate="InspectionRecordDetailApi.updateInspectionRecordDetail"
     :apiPage="InspectionRecordDetailApi.getInspectionRecordDetailPage"
-    :apiDelete="InspectionRecordDetailApi.deleteInspectionRecordDetail" @searchTableSuccessDetail="searchTableSuccessDetail"
-    :isShowAddBtn="false" :detailButtonIsShow="true" />
+    :apiDelete="InspectionRecordDetailApi.deleteInspectionRecordDetail"
+    @searchTableSuccessDetail="searchTableSuccessDetail" :isShowAddBtn="false" :detailButtonIsShow="true" />
 
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/wms/purchase-main/import" :importTemplateData="importTemplateData"
diff --git a/src/views/qms/inspection/inspectionRecord/inspectionJobMain.data.ts b/src/views/qms/inspection/inspectionRecord/inspectionRecordMain.data.ts
similarity index 89%
rename from src/views/qms/inspection/inspectionRecord/inspectionJobMain.data.ts
rename to src/views/qms/inspection/inspectionRecord/inspectionRecordMain.data.ts
index c3545b399..11ea76270 100644
--- a/src/views/qms/inspection/inspectionRecord/inspectionJobMain.data.ts
+++ b/src/views/qms/inspection/inspectionRecord/inspectionRecordMain.data.ts
@@ -9,15 +9,7 @@ const { t } = useI18n() // 国际化
  */
 export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: 'id',
-    field: 'id',
-    sort: 'custom',
-    isTable: false,
-    isSearch: true,
-    isForm: false,
-  },
-  {
-    label: '编码',
+    label: '记录编号',
     field: 'number',
     sort: 'custom',
     isSearch: true,
@@ -32,82 +24,82 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '任务编码',
     field: 'taskCode',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '供应商编码',
     field: 'supplierCode',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '物料编码',
     field: 'materialCode',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '批次',
     field: 'batch',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '检验方案编码',
     field: 'inspectionSchemeCode',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '检验方案Json',
     field: 'inspectionSchemeJson',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '检验批次',
     field: 'inspectionBatch',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '检验批数量',
     field: 'inspectionBatchAmount',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '采样总数量',
     field: 'sampleTatalAmount',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '检验类型',
     field: 'inspectionType',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
     form: {
-      component: 'SelectV2'
+      component: 'Select'
     },
   },
   {
     label: '检验批来源',
     field: 'inspectionBatchSource',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '订单号',
     field: 'orderCode',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '订单行',
     field: 'orderRow',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
     form: {
       component: 'InputNumber',
       value: 0
@@ -117,13 +109,13 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '凭证号',
     field: 'certificateCode',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '凭证行',
     field: 'certificateRow',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
     form: {
       component: 'InputNumber',
       value: 0
@@ -133,7 +125,7 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '检验阶段',
     field: 'inspectionStage',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
     form: {
       component: 'InputNumber',
       value: 0
@@ -143,20 +135,20 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '检验严格性',
     field: 'inspectionStringency',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '使用决策',
     field: 'useDecision',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '计划开始时间',
     field: 'planStartTime',
     sort: 'custom',
     formatter: dateFormatter,
-    isSearch: true,
+    isSearch: false,
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -178,7 +170,7 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'planEndTime',
     sort: 'custom',
     formatter: dateFormatter,
-    isSearch: true,
+    isSearch: false,
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -200,7 +192,7 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'realStartTime',
     sort: 'custom',
     formatter: dateFormatter,
-    isSearch: true,
+    isSearch: false,
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -222,7 +214,7 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'realEndTime',
     sort: 'custom',
     formatter: dateFormatter,
-    isSearch: true,
+    isSearch: false,
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -243,26 +235,26 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '检验水平',
     field: 'inspectionLevel',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: 'AQL值',
     field: 'aqlValue',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '是否可用',
     field: 'available',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '创建时间',
     field: 'createTime',
     sort: 'custom',
     formatter: dateFormatter,
-    isSearch: true,
+    isSearch: false,
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -319,32 +311,32 @@ export const InspectionRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'id',
     sort: 'custom',
     isTable: false,
-    isSearch: true,
+    isSearch: false,
     isForm: false,
   },
   {
     label: '记录编码',
     field: 'recordCode',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '工序编码',
     field: 'processCode',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '工序描述',
     field: 'processDescribe',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '顺序号',
     field: 'sequenceCode',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
     form: {
       component: 'InputNumber',
       value: 0
@@ -354,7 +346,7 @@ export const InspectionRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '是否破坏性检验',
     field: 'isDestroyInspection',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
     form: {
       component: 'Radio'
     },
@@ -364,7 +356,7 @@ export const InspectionRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'inspectionStartTime',
     sort: 'custom',
     formatter: dateFormatter,
-    isSearch: true,
+    isSearch: false,
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -386,7 +378,7 @@ export const InspectionRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'inspectionEndTime',
     sort: 'custom',
     formatter: dateFormatter,
-    isSearch: true,
+    isSearch: false,
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -407,26 +399,26 @@ export const InspectionRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '检验人',
     field: 'inspectionOperator',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '检验特性编码',
     field: 'inspectionFeaturesCode',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '是否可用',
     field: 'available',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '创建时间',
     field: 'createTime',
     sort: 'custom',
     formatter: dateFormatter,
-    isSearch: true,
+    isSearch: false,
     search: {
       component: 'DatePicker',
       componentProps: {
diff --git a/src/views/qms/inspection/inspectionRequest/index.vue b/src/views/qms/inspection/inspectionRequest/index.vue
index 74269bfa7..002343e54 100644
--- a/src/views/qms/inspection/inspectionRequest/index.vue
+++ b/src/views/qms/inspection/inspectionRequest/index.vue
@@ -4,29 +4,17 @@
     <Search :schema="InspectionMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
-    <!-- 列表头部 -->
-    <TableHead
-      :HeadButttondata="HeadButttondata"
-      @button-base-click="buttonBaseClick"
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="InspectionMain.allSchemas"
-    />
+  <!-- 列表头部 -->
+  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
+    @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick"
+    :allSchemas="InspectionMain.allSchemas" />
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table
-      :columns="tableColumns"
-      :data="tableObject.tableList"
-      :loading="tableObject.loading"
-      :pagination="{
+    <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"
-    >
+      }" 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>
@@ -39,206 +27,199 @@
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <BasicForm
-    ref="basicFormRef"
-    @success="formsSuccess"
-    :rules="InspectionMainRules"
-    :formAllSchemas="InspectionMain.allSchemas"
-    :apiUpdate="InspectionMainApi.updateInspectionMain"
-    :apiCreate="InspectionMainApi.createInspectionMain"
-    @searchTableSuccess="searchTableSuccess"
-    :isBusiness="false"
-  />
+  <BasicForm ref="basicFormRef" @success="formsSuccess" :rules="InspectionMainRules"
+    :formAllSchemas="InspectionMain.allSchemas" :apiUpdate="InspectionMainApi.updateInspectionMain"
+    :apiCreate="InspectionMainApi.createInspectionMain" @searchTableSuccess="searchTableSuccess" :isBusiness="false" />
 
   <!-- 详情 -->
   <Detail ref="detailRef" :isBasic="true" :allSchemas="InspectionMain.allSchemas" />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/request/inspection-main/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportForm ref="importFormRef" url="/request/inspection-main/import" :importTemplateData="importTemplateData"
+    @success="importSuccess" />
 </template>
 
 <script setup lang="ts">
-import download from '@/utils/download'
-import { InspectionMain,InspectionMainRules } from './inspectionMain.data'
-import * as InspectionMainApi from '@/api/qms/inspectionRequest'
-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: 'InspectionMain' })
-
-const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
-
-const route = useRoute() // 路由信息
-const routeName = ref()
-routeName.value = route.name
-const tableColumns = ref(InspectionMain.allSchemas.tableColumns)
-
-// 查询页面返回
-const searchTableSuccess = (formField, searchField, val, formRef) => {
-  nextTick(() => {
-    const setV = {}
-    setV[formField] = val[0][searchField]
-    formRef.setValues(setV)
+  import download from '@/utils/download'
+  import { InspectionMain, InspectionMainRules } from './inspectionMain.data'
+  import * as InspectionMainApi from '@/api/qms/inspectionRequest'
+  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: 'InspectionMain' })
+
+  const message = useMessage() // 消息弹窗
+  const { t } = useI18n() // 国际化
+
+  const route = useRoute() // 路由信息
+  const routeName = ref()
+  routeName.value = route.name
+  const tableColumns = ref(InspectionMain.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: InspectionMainApi.getInspectionMainPage // 分页接口
   })
-}
-
-// 字段设置 更新主列表字段
-const updataTableColumns = (val) => {
-  tableColumns.value = val
-}
-
-const { tableObject, tableMethods } = useTable({
-  getListApi: InspectionMainApi.getInspectionMainPage // 分页接口
-})
-
-// 获得表格的各种操作
-const { getList, setSearchParams } = tableMethods
-
-// 列表头部按钮
-const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:inspectionMain:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:inspectionMain:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'wms:inspectionMain: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 { getList, setSearchParams } = tableMethods
+
+  // 列表头部按钮
+  const HeadButttondata = [
+    defaultButtons.defaultAddBtn(null), // 新增
+    defaultButtons.defaultImportBtn({ hasPermi: 'wms:inspectionMain:import' }), // 导入
+    defaultButtons.defaultExportBtn({ hasPermi: 'wms:inspectionMain: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:'wms:inspectionMain:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:inspectionMain:delete'}), // 删除
-]
-
-// 列表-操作按钮事件
-const buttonTableClick = async (val, row) => {
-  if (val == 'edit') { // 编辑
-    openForm('update', row)
-  } else if (val == 'delete') { // 删除
-    handleDelete(row.id)
+
+  // 列表-操作按钮
+  const butttondata = [
+    defaultButtons.mainListEditBtn({ hasPermi: 'wms:inspectionMain:update' }), // 编辑
+    defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:inspectionMain: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)
   }
-}
-
-/** 添加/修改操作 */
-const basicFormRef = ref()
-const openForm = (type: string, row?: any) => {
-  basicFormRef.value.open(type, row)
-}
-
-// form表单提交
-const formsSuccess = async (formType,data) => {
-  var isHave =InspectionMain.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;
+
+  // form表单提交
+  const formsSuccess = async (formType, data) => {
+    var isHave = InspectionMain.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 InspectionMainApi.createInspectionMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await InspectionMainApi.updateInspectionMain(data)
+      message.success(t('common.updateSuccess'))
     }
+    basicFormRef.value.dialogVisible = false
+    getList()
   }
-  if(data.activeTime==0)data.activeTime = null;
-  if(data.expireTime==0)data.expireTime = null;
-  if (formType === 'create') {
-    await InspectionMainApi.createInspectionMain(data)
-    message.success(t('common.createSuccess'))
-  } else {
-    await InspectionMainApi.updateInspectionMain(data)
-    message.success(t('common.updateSuccess'))
+
+  /** 详情操作 */
+  const detailRef = ref()
+  const openDetail = (row : any, titleName : any, titleValue : any) => {
+    detailRef.value.openDetail(row, titleName, titleValue, 'basicInspectionMain')
   }
-  basicFormRef.value.dialogVisible = false
-  getList()
-}
-
-/** 详情操作 */
-const detailRef = ref()
-const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue, 'basicInspectionMain')
-}
-
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await InspectionMainApi.deleteInspectionMain(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 InspectionMainApi.exportInspectionMain(tableObject.params)
-    download.excel(data, '检验申请.xlsx')
-  } catch {
-  } finally {
-    exportLoading.value = false
+
+  /** 删除按钮操作 */
+  const handleDelete = async (id : number) => {
+    try {
+      // 删除的二次确认
+      await message.delConfirm()
+      // 发起删除
+      await InspectionMainApi.deleteInspectionMain(id)
+      message.success(t('common.delSuccess'))
+      // 刷新列表
+      await getList()
+    } catch { }
   }
-}
-
-/** 导入 */
-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
+
+  /** 导出按钮操作 */
+  const exportLoading = ref(false) // 导出的加载中
+  const handleExport = async () => {
+    try {
+      // 导出的二次确认
+      await message.exportConfirm()
+      // 发起导出
+      exportLoading.value = true
+      const data = await InspectionMainApi.exportInspectionMain(tableObject.params)
+      download.excel(data, '检验申请.xlsx')
+    } catch {
+    } finally {
+      exportLoading.value = false
+    }
   }
-  getList() // 刷新当前列表
-}
 
-/** 初始化 **/
-onMounted(async () => {
-  getList()
-  importTemplateData.templateUrl = await InspectionMainApi.importTemplate()
-})
+  /** 导入 */
+  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 InspectionMainApi.importTemplate()
+  })
 </script>

From 82d58894b60227e4605ec665be50833d74bd3479 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Wed, 3 Apr 2024 16:11:15 +0800
Subject: [PATCH 13/35] =?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--=E6=96=B0=E5=A2=9E--form=E9=87=91?=
 =?UTF-8?q?=E9=A2=9D=E8=AE=A1=E7=AE=97=EF=BC=9Asearchtable=E4=B8=AD?=
 =?UTF-8?q?=E5=8D=95=E4=BB=B7=E6=80=BB=E5=92=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue    | 24 +++++++++++++++++++
 .../supplierinvoiceRequestMain/index.vue      |  5 ++++
 .../supplierinvoiceRequestMain.data.ts        |  1 +
 3 files changed, 30 insertions(+)

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 4977efef5..bd9bdbf47 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -271,6 +271,11 @@ const props = defineProps({
     type: Number,
     required: false,
     default: 0
+  },
+  sumFormData:{
+    type: Array,
+    required: false,
+    default: null
   }
 })
 
@@ -383,6 +388,25 @@ const opensearchTable = (
     _searchCondition
   )
 }
+
+
+const changeSumFormData = () => {
+  if(props.sumFormData){
+    const sumObject = {}
+    props.sumFormData.forEach(sumItem=>{
+      sumObject[sumItem?.formField]= props.tableData.reduce((prev, item) => prev + item[sumItem?.valueField],0)
+    })
+    nextTick(()=>{
+      formRef.value.setValues(sumObject)
+    })
+  }
+}
+watch(()=>props.tableData,() => {
+  changeSumFormData()
+},{
+  deep:true
+})
+
 // 弹层确定返回所选数据
 // val ： 弹层列表row 数据
 const searchTableSuccess = (formField, searchField, val, type, row) => {
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 30e09f66a..5415a44be 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -43,6 +43,10 @@
     :tableAllSchemas="SupplierinvoiceRequestDetail.allSchemas" 
     :tableFormRules="SupplierinvoiceRequestDetailRules"
     :tableData="tableData" 
+    :sumFormData = "[{
+      formField:'amount',
+      valueField:'singlePrice'
+    }]"
     :apiUpdate="SupplierinvoiceRequestMainApi.updateSupplierinvoiceRequestMain"
     :apiCreate="SupplierinvoiceRequestMainApi.createSupplierinvoiceRequestMain" 
     :isBusiness="true"
@@ -148,6 +152,7 @@
             newRow['recvBillNum'] = item['recvBillNum']
             newRow['asnBillNum'] = item['asnBillNum']
             newRow['supplierCode'] = item['supplierCode']
+            newRow['singlePrice'] = item['purchasePrice']//单价默认值 = 采购价格
             newRow['purchasePrice'] = item['purchasePrice']
             newRow['invoicableQuantity'] = item['invoicableQuantity']
             newRow['itemCode'] = item['itemCode']
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index a6f9f7e6d..8ad864b0a 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -148,6 +148,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       componentProps: {
         min: 0,
         precision: 6,
+        disabled: true,
       }
     },
     tableForm: {

From 251a96cc58a1a1055dbd1606010ebc3f0056af8e Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Wed, 3 Apr 2024 16:29:46 +0800
Subject: [PATCH 14/35] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index bd9bdbf47..17ebdb7ae 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -272,6 +272,11 @@ const props = defineProps({
     required: false,
     default: 0
   },
+  //表单中展示的数据，需要用searchTable中字段计算
+  /***[{
+    formField:form中对应的field,
+    valueField:searchtable中对应的field,
+  }]*/
   sumFormData:{
     type: Array,
     required: false,

From 055cc509d079c36510e01430f7a79d58e8262155 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 3 Apr 2024 17:12:07 +0800
Subject: [PATCH 15/35] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=96=B9=E6=A1=88?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=9B=9E=E6=98=BE=E6=98=BE=E7=A4=BA=E6=8F=8F?=
 =?UTF-8?q?=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inspectionPlan/addForm.vue                | 256 +++++++++---------
 .../inspectionTemplate/addForm.vue            |  41 +--
 .../inspectionTemplate.data.ts                |   4 +-
 .../qms/inspection/inspectionJob/index.vue    |   6 +-
 .../inspectionJob/inspectionJobMain.data.ts   |   8 +-
 5 files changed, 164 insertions(+), 151 deletions(-)

diff --git a/src/views/qms/basicDataManage/inspectionPlan/addForm.vue b/src/views/qms/basicDataManage/inspectionPlan/addForm.vue
index f8cf4ff51..591a4a6cb 100644
--- a/src/views/qms/basicDataManage/inspectionPlan/addForm.vue
+++ b/src/views/qms/basicDataManage/inspectionPlan/addForm.vue
@@ -18,7 +18,7 @@
             <el-col :span="12">
               <el-form-item label="物料编码" prop="itemCode">
                 <div style="display: flex; width: 100%">
-                  <el-input v-model="data.itemCode" disabled placeholder="请选择物料编码" />
+                  <el-input v-model="data.itemName" disabled placeholder="请选择物料编码" />
                   <el-button
                     type="info"
                     plain
@@ -32,7 +32,7 @@
                         ItemBasicApi.getItembasicPage,
                         null,
                         false,
-                        'form',
+                        'main',
                         null
                       )
                     "
@@ -49,7 +49,7 @@
             <el-col :span="12">
               <el-form-item label="检验类型编码" prop="testTypeCode">
                 <div style="display: flex; width: 100%">
-                  <el-input v-model="data.testTypeCode" disabled placeholder="请选择检验类型编码" />
+                  <el-input v-model="data.testTypeName" disabled placeholder="请选择检验类型编码" />
                   <el-button
                     type="info"
                     plain
@@ -63,7 +63,7 @@
                         SamplingProcessApi.getSamplingProcessPage,
                         null,
                         false,
-                        'form',
+                        'main',
                         null
                       )
                     "
@@ -76,7 +76,7 @@
               <el-form-item label="检验模板编码" prop="programmeTemplateCode">
                 <div style="display: flex; width: 100%">
                   <el-input
-                    v-model="data.programmeTemplateCode"
+                    v-model="data.programmeTemplateName"
                     disabled
                     placeholder="请选择检验模板编码"
                   />
@@ -93,7 +93,7 @@
                         InspectionTemplateApi.inspectionTemplatePage,
                         null,
                         false,
-                        'form',
+                        'main',
                         null
                       )
                     "
@@ -238,122 +238,122 @@
                   </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.inspectionMethodCode"
-                        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,
-                            null,
-                            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.dynamicUpdateCode"
-                        disabled
-                        placeholder="请选择采样过程编码"
-                      />
-                      <el-button
-                        type="info"
-                        plain
-                        style="width: 40px"
-                        @click="
-                          opensearchTable(
-                            'dynamicUpdateCode',
-                            null,
-                            '采样过程编码',
-                            SamplingProcess.allSchemas,
-                            SamplingProcessApi.getSamplingProcessPage,
-                            [
-                              {
-                                key: 'available',
-                                value: 'TRUE',
-                                isMainValue: false
-                              }
-                            ],
-                            false,
-                            null,
-                            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.inspectionMethod"
-                        disabled
-                        placeholder="请选择动态修改规则编码"
-                      />
-                      <el-button
-                        type="info"
-                        plain
-                        style="width: 40px"
-                        @click="
-                          opensearchTable(
-                            'inspectionMethod',
-                            null,
-                            '动态修改规则编码',
-                            DynamicRule.allSchemas,
-                            DynamicRuleApi.getDynamicRulePage,
-                            [
+                <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,
-                            null,
-                            item
-                          )
-                        "
-                        ><Icon icon="ep:search"
-                      /></el-button>
-                    </div>
-                  </el-form-item>
-                </el-col>
+                          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="是否允许修改特征值"
@@ -1011,14 +1011,24 @@ const opensearchTable = (
 // 弹层确定返回所选数据
 // val ： 弹层列表row 数据
 const searchTableSuccess = async (formField, searchField, val, type, row) => {
-  if (type == 'tableForm') {
-    // 明细查询页赋值
-    row[formField] = val[0][searchField]
-  } else {
-    console.log(formField)
-    console.log(val[0].code)
-    console.log(type)
+  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) => {
diff --git a/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue b/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue
index 686f41670..28d00ba06 100644
--- a/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue
+++ b/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue
@@ -106,14 +106,14 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item
-                  label="检验方法编码"
+                  label="检验方法"
                   prop="inspectionCharacteristicsBaseVO.inspectionMethodCode"
                 >
                   <div style="display: flex; width: 100%">
                     <el-input
-                      v-model="item.inspectionCharacteristicsBaseVO.inspectionMethodCode"
+                      v-model="item.inspectionCharacteristicsBaseVO.inspectionMethodName"
                       disabled
-                      placeholder="请选择检验方法编码"
+                      placeholder="请选择检验方法"
                     />
                     <el-button
                       type="info"
@@ -134,7 +134,7 @@
                             }
                           ],
                           false,
-                          null,
+                          'features',
                           item
                         )
                       "
@@ -146,11 +146,11 @@
               <el-col :span="12">
                 <el-form-item
                   label="采样过程编码"
-                  prop="inspectionCharacteristicsBaseVO.dynamicUpdateCode"
+                  prop="inspectionCharacteristicsBaseVO.inspectionMethod"
                 >
                   <div style="display: flex; width: 100%">
                     <el-input
-                      v-model="item.inspectionCharacteristicsBaseVO.dynamicUpdateCode"
+                      v-model="item.inspectionCharacteristicsBaseVO.inspectionName"
                       disabled
                       placeholder="请选择采样过程编码"
                     />
@@ -160,7 +160,7 @@
                       style="width: 40px"
                       @click="
                         opensearchTable(
-                          'dynamicUpdateCode',
+                          'inspectionMethod',
                           null,
                           '采样过程编码',
                           SamplingProcess.allSchemas,
@@ -173,7 +173,7 @@
                             }
                           ],
                           false,
-                          null,
+                          'features',
                           item
                         )
                       "
@@ -185,11 +185,11 @@
               <el-col :span="12">
                 <el-form-item
                   label="动态修改规则编码"
-                  prop="inspectionCharacteristicsBaseVO.inspectionMethod"
+                  prop="inspectionCharacteristicsBaseVO.dynamicUpdateCode"
                 >
                   <div style="display: flex; width: 100%">
                     <el-input
-                      v-model="item.inspectionCharacteristicsBaseVO.inspectionMethod"
+                      v-model="item.inspectionCharacteristicsBaseVO.dynamicUpdateName"
                       disabled
                       placeholder="请选择动态修改规则编码"
                     />
@@ -199,7 +199,7 @@
                       style="width: 40px"
                       @click="
                         opensearchTable(
-                          'inspectionMethod',
+                          'dynamicUpdateCode',
                           null,
                           '动态修改规则编码',
                           DynamicRule.allSchemas,
@@ -212,7 +212,7 @@
                             }
                           ],
                           false,
-                          null,
+                          'features',
                           item
                         )
                       "
@@ -813,14 +813,17 @@ const opensearchTable = (
 // val ： 弹层列表row 数据
 const searchTableSuccess = (formField, searchField, val, type, row) => {
   console.log(row)
-  data.value.process.forEach((item) => {
-    if (item.description == row.description) {
-      item.inspectionCharacteristicsBaseVO[formField] = val[0].code
+  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
     }
-  })
-
-  // row.inspectionCharacteristicsBaseVO.inspectionMethodCode = val[0].code
-  // emit('searchTableSuccess', formField, searchField, val, formRef.value, type, row)
+  }
+ 
 }
 // 选择是否设定上限值
 const changeIsCapping = (e) => {
diff --git a/src/views/qms/basicDataManage/inspectionTemplate/inspectionTemplate.data.ts b/src/views/qms/basicDataManage/inspectionTemplate/inspectionTemplate.data.ts
index 62e6c9f7c..769da9224 100644
--- a/src/views/qms/basicDataManage/inspectionTemplate/inspectionTemplate.data.ts
+++ b/src/views/qms/basicDataManage/inspectionTemplate/inspectionTemplate.data.ts
@@ -151,11 +151,11 @@ export const InspectionTemplateFeatures= useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
   },{
     label: '采样过程编码',
-    field: 'dynamicUpdateCode',
+    field: 'inspectionMethod',
     sort: 'custom',
   },{
     label: '动态修改规则编码',
-    field: 'inspectionMethod',
+    field: 'dynamicUpdateCode',
     sort: 'custom',
   },{
     label: '是否允许修改特征值',
diff --git a/src/views/qms/inspection/inspectionJob/index.vue b/src/views/qms/inspection/inspectionJob/index.vue
index e893d4510..48b31afaa 100644
--- a/src/views/qms/inspection/inspectionJob/index.vue
+++ b/src/views/qms/inspection/inspectionJob/index.vue
@@ -117,8 +117,8 @@
 
   // 列表头部按钮
   const HeadButttondata = [
-    defaultButtons.defaultAddBtn(null), // 新增
-    // defaultButtons.defaultExportBtn(null), // 导出
+    // defaultButtons.defaultAddBtn(null), // 新增
+    defaultButtons.defaultExportBtn(null), // 导出
     defaultButtons.defaultFreshBtn(null), // 刷新
     defaultButtons.defaultFilterBtn(null), // 筛选
     defaultButtons.defaultSetBtn(null), // 设置
@@ -284,6 +284,6 @@
   /** 初始化 **/
   onMounted(async () => {
     getList()
-    importTemplateData.templateUrl = await InspectionJobMainApi.importTemplate()
+    // importTemplateData.templateUrl = await InspectionJobMainApi.importTemplate()
   })
 </script>
diff --git a/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts b/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts
index dc1afae72..42da7a50d 100644
--- a/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts
+++ b/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts
@@ -5,18 +5,18 @@ import { dateFormatter } from '@/utils/formatTime'
 const { t } = useI18n() // 国际化
 
 /**
- * @returns {Array} 备件申请主表
+ * @returns {Array} 检验任务主表
  */
 export const InspectionJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '工序编号',
+    label: '编码',
     field: 'number',
     sort: 'custom',
     isSearch: true,
   },
   {
-    label: '申请编码',
-    field: 'inspectionCode',
+    label: '申请单号',
+    field: 'requestNumber',
     sort: 'custom',
     isSearch: true,
   },

From 26f2af17eb5b22adcc7d456c822f90c77d217f39 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Wed, 3 Apr 2024 17:36:26 +0800
Subject: [PATCH 16/35] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index a6f9f7e6d..acb32621b 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -219,6 +219,9 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    isTable:false,
+    isTableForm:false,
+    isForm:false,
     form: {
       component: 'InputNumber',
       componentProps: {
@@ -272,7 +275,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
   },
   {
     label: '金税票号',
-    field: 'afterTaxAmount',
+    field: 'goldenTaxInvoiceNumber',
     table: {
       width: 150
     },

From 64ba767a89b25baee668a7d9584fe20d9a69c50f Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Sun, 7 Apr 2024 08:51:49 +0800
Subject: [PATCH 17/35] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B7=AE=E9=A2=9D?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoiceRequestMain.data.ts            | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index cca552ebc..bb35c19c4 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -721,6 +721,21 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       disabled: true
     }
   },
+  {
+    label: '差额',
+    field: 'differencePrice',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
   {
     label: '可开票数量',
     field: 'invoicableQuantity',

From 53a4bcf111a492d0bd97d6c4a8d5306719bdeefc Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Sun, 7 Apr 2024 08:54:30 +0800
Subject: [PATCH 18/35] =?UTF-8?q?=E9=9A=90=E8=97=8F=E7=B4=A2=E8=B5=94?=
 =?UTF-8?q?=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index bb35c19c4..9feb3aa58 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -223,6 +223,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     isTable:false,
     isTableForm:false,
     isForm:false,
+    isDetail:false,
     form: {
       component: 'InputNumber',
       componentProps: {

From 3f92f3843b31fd9e639ff7a37234af6be333ef2d Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Sun, 7 Apr 2024 10:14:19 +0800
Subject: [PATCH 19/35] =?UTF-8?q?app=E5=8D=87=E7=BA=A7=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/systemInstallPackage/index.ts     |  57 ++++++
 .../system/systemInstallPackage/index.vue     | 183 ++++++++++++++++++
 .../systemInstallPackage.data.ts              |  84 ++++++++
 3 files changed, 324 insertions(+)
 create mode 100644 src/api/wms/systemInstallPackage/index.ts
 create mode 100644 src/views/system/systemInstallPackage/index.vue
 create mode 100644 src/views/system/systemInstallPackage/systemInstallPackage.data.ts

diff --git a/src/api/wms/systemInstallPackage/index.ts b/src/api/wms/systemInstallPackage/index.ts
new file mode 100644
index 000000000..b92b09604
--- /dev/null
+++ b/src/api/wms/systemInstallPackage/index.ts
@@ -0,0 +1,57 @@
+import request from '@/config/axios'
+
+export interface SystemInstallPackageVO {
+  id: number
+  installPackageName: string
+  installPackageVersion: number
+  installPackageUrl: string
+  isForcedUpdate: string
+  updateContent: string
+  remark: string
+}
+
+// 查询安装包信息列表
+export const getSystemInstallPackagePage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/system-install-package/senior', data })
+  } else {
+    return await request.get({ url: `/wms/system-install-package/page`, params })
+  }
+}
+
+// 查询安装包信息详情
+export const getSystemInstallPackage = async (id: number) => {
+  return await request.get({ url: `/wms/system-install-package/get?id=` + id })
+}
+
+// 新增安装包信息
+export const createSystemInstallPackage = async (data: SystemInstallPackageVO) => {
+  return await request.post({ url: `/wms/system-install-package/create`, data })
+}
+
+// 修改安装包信息
+export const updateSystemInstallPackage = async (data: SystemInstallPackageVO) => {
+  return await request.put({ url: `/wms/system-install-package/update`, data })
+}
+
+// 删除安装包信息
+export const deleteSystemInstallPackage = async (id: number) => {
+  return await request.delete({ url: `/wms/system-install-package/delete?id=` + id })
+}
+
+// 导出安装包信息 Excel
+export const exportSystemInstallPackage = async (params) => {
+  return await request.download({ url: `/wms/system-install-package/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/system-install-package/get-import-template' })
+}
+
+// 返回最新版本安装包信息
+export const returnNewFileSystemInstallPackage = async (data: SystemInstallPackageVO) => {
+  return await request.post({ url: `/wms/system-install-package/returnNewFile`, data })
+}
\ No newline at end of file
diff --git a/src/views/system/systemInstallPackage/index.vue b/src/views/system/systemInstallPackage/index.vue
new file mode 100644
index 000000000..f6b9543ac
--- /dev/null
+++ b/src/views/system/systemInstallPackage/index.vue
@@ -0,0 +1,183 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="SystemInstallPackage.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="SystemInstallPackage.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 #installPackageName="{row}">
+        <el-button type="primary" link @click="openDetail(row, '安装包名称', row.installPackageName)">
+          <span>{{ row.installPackageName }}</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="SystemInstallPackageRules"
+    :formAllSchemas="SystemInstallPackage.allSchemas"
+    :apiUpdate="SystemInstallPackageApi.updateSystemInstallPackage"
+    :apiCreate="SystemInstallPackageApi.createSystemInstallPackage"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="SystemInstallPackage.allSchemas" />
+
+</template>
+
+<script setup lang="ts">
+// import download from '@/utils/download'
+import { SystemInstallPackage,SystemInstallPackageRules } from './systemInstallPackage.data'
+import * as SystemInstallPackageApi from '@/api/wms/systemInstallPackage'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'SystemInstallPackage' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(SystemInstallPackage.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: SystemInstallPackageApi.getSystemInstallPackagePage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:system-install-package:importFile'}), // 新增
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+]
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:system-install-package:update'}), // 编辑
+  // defaultButtons.mainListDeleteBtn({hasPermi:'wms:system-install-package: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) => {
+  if (formType === 'create') {
+    await SystemInstallPackageApi.createSystemInstallPackage(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await SystemInstallPackageApi.updateSystemInstallPackage(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, 'basicSystemInstallPackage')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await SystemInstallPackageApi.deleteSystemInstallPackage(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+
+</script>
diff --git a/src/views/system/systemInstallPackage/systemInstallPackage.data.ts b/src/views/system/systemInstallPackage/systemInstallPackage.data.ts
new file mode 100644
index 000000000..5af715118
--- /dev/null
+++ b/src/views/system/systemInstallPackage/systemInstallPackage.data.ts
@@ -0,0 +1,84 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const SystemInstallPackageRules = reactive({
+  installPackageName: [required],
+  installPackageVersion: [required],
+  installPackageUrl: [required],
+  isForcedUpdate: [required],
+})
+
+export const SystemInstallPackage = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '安装包名称',
+    field: 'installPackageName',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '安装包版本',
+    field: 'installPackageVersion',
+    sort: 'custom',
+  },
+  {
+    label: '安装路径',
+    field: 'installPackageUrl',
+    sort: 'custom',
+  },
+  {
+    label: '是否强制更新',
+    field: 'isForcedUpdate',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    table: {
+      width: 120
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '更新内容',
+    field: 'updateContent',
+    sort: 'custom',
+  
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+  },
+  {
+    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: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))

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 20/35] =?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 21/35] =?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 22/35] =?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 23/35] =?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 24/35] =?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 25/35] =?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 26/35] =?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 27/35] =?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 28/35] =?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()

From 873f0190db2882e82d20b50304ea60558267704a Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Sun, 7 Apr 2024 14:07:07 +0800
Subject: [PATCH 29/35] =?UTF-8?q?=E9=9A=90=E8=97=8F=E9=83=A8=E9=97=A8?=
 =?UTF-8?q?=EF=BC=8C=E7=8A=B6=E6=80=81=EF=BC=8C=E4=B8=9A=E5=8A=A1=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E8=87=AA=E5=8A=A8=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../countManage/count/countPlanMain/countPlanMain.data.ts  | 6 ------
 .../count/countRequestMain/countRequestMain.data.ts        | 6 ------
 .../countadjustRequestMain/countadjustRequestMain.data.ts  | 7 +------
 .../customerreceiptRequestMain.data.ts                     | 6 ------
 .../customersettleRequestMain.data.ts                      | 6 ------
 .../deliver/deliverRequestMain/deliverRequestMain.data.ts  | 6 ------
 .../deliverplan/deliverPlanMain/deliverPlanMain.data.ts    | 6 ------
 .../inventoryinitRequestMain.data.ts                       | 6 ------
 .../issue/issueRequestMain/issueRequestMain.data.ts        | 5 +++++
 .../preparetoissueMain/preparetoissueMain.data.ts          | 4 ++++
 .../productionreturnRequestMain.data.ts                    | 5 +++++
 .../repleinshRequestMain/repleinshRequestMain.data.ts      | 5 +++++
 .../offlinesettlementRequestMain.data.ts                   | 5 +++++
 .../productdismantleRequestMain.data.ts                    | 5 +++++
 .../productionplan/productionMain/productionMain.data.ts   | 4 ++++
 .../productionMainAssemble/productionMainAssemble.data.ts  | 4 ++++
 .../productionMainAssembleSparePart.data.ts                | 5 ++++-
 .../productionMainPredictSparePart.data.ts                 | 4 ++++
 .../productputawayRequestMain.data.ts                      | 5 +++++
 .../productreceiptRequestMain.data.ts                      | 5 +++++
 .../productreceiptAssembleRequestMain.data.ts              | 5 +++++
 .../productreceiptscrapRequestMain.data.ts                 | 5 +++++
 .../productredressRequestMain.data.ts                      | 1 +
 .../productrepairRequestMain.data.ts                       | 5 +++++
 .../productscrapRequestMain.data.ts                        | 5 +++++
 .../inspect/inspectRequestMain/inspectRequestMain.data.ts  | 5 +++++
 .../purchasereceiptRequestMain.data.ts                     | 4 ++++
 .../purchasereturnRequestMain.data.ts                      | 4 ++++
 .../putaway/putawayRequestMain/putawayRequestMain.data.ts  | 4 ++++
 .../sparereceiptRequestMain.data.ts                        | 4 ++++
 .../demandforecastingMain/demandforecastingMain.data.ts    | 1 +
 .../supplierdeliver/purchaseMain/purchaseMain.data.ts      | 1 +
 .../purchasePlanMain/purchasePlanMain.data.ts              | 1 +
 .../supplierdeliverRequestMain.data.ts                     | 6 +++++-
 .../purchaseclaimRequestMain.data.ts                       | 4 ++++
 .../supplierinvoiceRequestMain.data.ts                     | 1 +
 36 files changed, 111 insertions(+), 50 deletions(-)

diff --git a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
index a82d33cf7..e4e00be07 100644
--- a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
+++ b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
@@ -343,12 +343,6 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    form: {
-      value: '1',
-      componentProps: {
-        disabled: true
-      }
-    }
   },
   {
     label: '是否可用',
diff --git a/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts b/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts
index 64182f0a7..cc5794f51 100644
--- a/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts
+++ b/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts
@@ -52,12 +52,6 @@ export const CountRequestMain = useCrudSchemas(<CrudSchema[]>([
     table: {
       width: 150
     },
-    form: {
-      value: '1',
-      componentProps: {
-        disabled: true
-      }
-    }
   },
   {
     label: '申请单号',
diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
index 56d36cbc3..fc7db78b7 100644
--- a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
+++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
@@ -52,12 +52,7 @@ export const CountadjustRequestMain = useCrudSchemas(<CrudSchema[]>([
     table: {
       width: 150
     },
-    form: {
-      value: '1',
-      componentProps: {
-        disabled: true
-      }
-    }
+
   },
   {
     label: '申请单号',
diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts
index b76b727ed..c05cee187 100644
--- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts
@@ -48,12 +48,6 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
-    form: {
-      value: '1',
-      componentProps: {
-        disabled: true
-      }
-    }
   },
   {
     label: '发货记录单号',
diff --git a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts
index 291efbddc..af56503e3 100644
--- a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts
@@ -53,12 +53,6 @@ export const CustomersettleRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    form: {
-      value: '1',
-      componentProps: {
-        disabled: true
-      }
-    }
   },
   {
     label: '发货记录单号',
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
index 16eb1f6d7..e07c81c6d 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
@@ -67,12 +67,6 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    form: {
-      value: '1',
-      componentProps: {
-        disabled: true
-      }
-    }
   },
   {
     label: '发货计划单号',
diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
index 0ab9228ad..1d26b1da1 100644
--- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
@@ -206,12 +206,6 @@ export const DeliverPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.PLAN_STATUS,
     dictClass: 'string',
     isSearch: true,
-    form: {
-      value: '1',
-      componentProps: {
-        disabled: true
-      }
-    }
   },
   {
     label: '是否可用',
diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
index 74b944bd9..add7ac0e7 100644
--- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
@@ -60,12 +60,6 @@ export const InventoryinitRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    form: {
-      value: '1',
-      componentProps: {
-        disabled: true
-      }
-    }
   },
   {
     label: '仓库代码',
diff --git a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
index f650a5238..55138e01e 100644
--- a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
@@ -85,6 +85,7 @@ export const IssueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.REQUEST_STATUS,
     dictClass: 'string',
     isSearch: true,
+    isForm:false,
     isTable: true,
     sort: 'custom',
     table: {
@@ -238,6 +239,7 @@ export const IssueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '部门',
     field: 'departmentCode',
     sort: 'custom',
+    isForm:false,
     table: {
       width: 150
     },
@@ -292,6 +294,7 @@ export const IssueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -311,6 +314,7 @@ export const IssueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoAgree',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
+    isForm:false,
     isTable: true,
     sort: 'custom',
     table: {
@@ -331,6 +335,7 @@ export const IssueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoExecute',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
+    isForm:false,
     isTable: true,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts
index 2337788fe..a4f1f451e 100644
--- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts
+++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts
@@ -167,6 +167,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.PLAN_STATUS,
     dictClass: 'string',
     isSearch: true,
+    isForm:false,
     form: {
       value: '1',
       componentProps: {
@@ -287,6 +288,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -307,6 +309,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -327,6 +330,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
index ae283b571..137787ca5 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
@@ -92,6 +92,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     dictClass: 'string',
     isSearch: true,
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -229,6 +230,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     label: '部门',
     field: 'departmentCode',
     sort: 'custom',
+    isForm:false,
     table: {
       width: 150
     },
@@ -254,6 +256,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -274,6 +277,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -294,6 +298,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
index ec3e1b9f5..09e89a52a 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
@@ -52,6 +52,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.REQUEST_STATUS,
     dictClass: 'string',
     isSearch: true,
+    isForm:false,
     isTable: true,
     sort: 'custom',
     table: {
@@ -154,6 +155,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '部门',
     field: 'departmentCode',
     sort: 'custom',
+    isForm:false,
     table: {
       width: 150
     },
@@ -240,6 +242,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -259,6 +262,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoAgree',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
+    isForm:false,
     isTable: true,
     sort: 'custom',
     table: {
@@ -279,6 +283,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoExecute',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
+    isForm:false,
     isTable: true,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/offlinesettlementRequestMain.data.ts b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/offlinesettlementRequestMain.data.ts
index df080e227..89eb93ccb 100644
--- a/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/offlinesettlementRequestMain.data.ts
+++ b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/offlinesettlementRequestMain.data.ts
@@ -144,6 +144,7 @@ export const OfflinesettlementRequestMain = useCrudSchemas(reactive<CrudSchema[]
     label: '部门',
     field: 'departmentCode',
     sort: 'custom',
+    isForm:false,
     table: {
       width: 150
     },
@@ -169,6 +170,7 @@ export const OfflinesettlementRequestMain = useCrudSchemas(reactive<CrudSchema[]
     dictType: DICT_TYPE.REQUEST_STATUS,
     dictClass: 'string',
     isSearch: true,
+    isForm:false,
     isTable: true,
     sort: 'custom',
     table: {
@@ -217,6 +219,7 @@ export const OfflinesettlementRequestMain = useCrudSchemas(reactive<CrudSchema[]
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -237,6 +240,7 @@ export const OfflinesettlementRequestMain = useCrudSchemas(reactive<CrudSchema[]
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -257,6 +261,7 @@ export const OfflinesettlementRequestMain = useCrudSchemas(reactive<CrudSchema[]
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
index 42f93e103..9550f36cf 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
@@ -269,6 +269,7 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isForm:false,
     formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
       return userDeptArray.find((account) => account.id == cellValue)?.name
     },
@@ -292,6 +293,7 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     dictClass: 'string',
     isSearch: true,
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -340,6 +342,7 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -360,6 +363,7 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -380,6 +384,7 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
index 0f0444c03..47d819512 100644
--- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
@@ -51,6 +51,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.PLAN_STATUS,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     table: {
       width: 150
     },
@@ -326,6 +327,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -346,6 +348,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -366,6 +369,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
index d7d82f5b9..74599137f 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
@@ -51,6 +51,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.PLAN_STATUS,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     table: {
       width: 150
     },
@@ -326,6 +327,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -346,6 +348,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -366,6 +369,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
index d7bb6a6b6..24fccc76d 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
@@ -51,6 +51,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.PLAN_STATUS,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     table: {
       width: 150
     },
@@ -60,7 +61,6 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     //     disabled: true
     //   }
     // },
-    isForm:false,
     isSearch: true,
   },
   {
@@ -326,6 +326,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -346,6 +347,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -366,6 +368,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
index 7ab3206c9..7218d1db0 100644
--- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
@@ -50,6 +50,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     dictType: DICT_TYPE.PLAN_STATUS,
     dictClass: 'string',
+    isForm:false,
     isTable: true,
     table: {
       width: 150
@@ -326,6 +327,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -346,6 +348,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -366,6 +369,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
index f1bd40f28..cac2a4055 100644
--- a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
+++ b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
@@ -181,6 +181,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '部门',
     field: 'departmentCode',
     sort: 'custom',
+    isForm:false,
     table: {
       width: 150
     },
@@ -206,6 +207,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.REQUEST_STATUS,
     dictClass: 'string',
     isSearch: true,
+    isForm:false,
     isTable: true,
     sort: 'custom',
     table: {
@@ -285,6 +287,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -305,6 +308,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -325,6 +329,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
index e5926c672..163be4416 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
@@ -293,6 +293,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '部门',
     field: 'departmentCode',
     sort: 'custom',
+    isForm:false,
     table: {
       width: 150
     },
@@ -319,6 +320,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictClass: 'string',
     isSearch: true,
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -367,6 +369,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -387,6 +390,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -407,6 +411,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
index e5926c672..163be4416 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
@@ -293,6 +293,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '部门',
     field: 'departmentCode',
     sort: 'custom',
+    isForm:false,
     table: {
       width: 150
     },
@@ -319,6 +320,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictClass: 'string',
     isSearch: true,
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -367,6 +369,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -387,6 +390,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -407,6 +411,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
index 535b4adc7..a7e639626 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
@@ -282,6 +282,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '部门',
     field: 'departmentCode',
     sort: 'custom',
+    isForm:false,
     table: {
       width: 150
     },
@@ -308,6 +309,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictClass: 'string',
     isSearch: true,
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -356,6 +358,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -376,6 +379,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -396,6 +400,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
index 633782a63..b06172a41 100644
--- a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
+++ b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
@@ -35,6 +35,7 @@ export const ProductredressRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.REQUEST_STATUS,
     dictClass: 'string',
     isSearch: true,
+    isForm:false,
     isTable: true,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
index 539b14b05..4be9217de 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
+++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
@@ -266,6 +266,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '部门',
     field: 'departmentCode',
     sort: 'custom',
+    isForm:false,
     table: {
       width: 150
     },
@@ -292,6 +293,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictClass: 'string',
     isSearch: true,
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -340,6 +342,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -360,6 +363,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -380,6 +384,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
index a59b9e10a..141b513c2 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
@@ -188,6 +188,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.REQUEST_STATUS,
     dictClass: 'string',
     isSearch: true,
+    isForm:false,
     isTable: true,
     sort: 'custom',
     table: {
@@ -287,6 +288,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '部门',
     field: 'departmentCode',
     sort: 'custom',
+    isForm:false,
     table: {
       width: 150
     },
@@ -343,6 +345,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -363,6 +366,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -383,6 +387,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts
index 38787a872..fc53f7b3a 100644
--- a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts
@@ -296,6 +296,7 @@ export const InspectRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '部门',
     field: 'departmentCode',
     sort: 'custom',
+    isForm:false,
     table: {
       width: 150
     },
@@ -321,6 +322,7 @@ export const InspectRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.REQUEST_STATUS,
     dictClass: 'string',
     isSearch: true,
+    isForm:false,
     isTable: true,
     sort: 'custom',
     table: {
@@ -379,6 +381,7 @@ export const InspectRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -399,6 +402,7 @@ export const InspectRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -419,6 +423,7 @@ export const InspectRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
index d9686d459..e913161c7 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
@@ -354,6 +354,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     dictClass: 'string',
     isSearch: true,
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -371,6 +372,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -391,6 +393,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -411,6 +414,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
index 195f8df31..0712f2814 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
@@ -297,6 +297,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictClass: 'string',
     isSearch: true,
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -354,6 +355,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -374,6 +376,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -394,6 +397,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
index dda309149..8f1aa5341 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
@@ -301,6 +301,7 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictClass: 'string',
     isSearch: true,
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -339,6 +340,7 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -359,6 +361,7 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -379,6 +382,7 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
index 1a0cc7b73..bc0b477cd 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
@@ -355,6 +355,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     dictClass: 'string',
     isSearch: true,
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -373,6 +374,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
+    isForm:false,
     table: {
       width: 150
     },
@@ -392,6 +394,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -412,6 +415,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
index 48b05bcd3..b508ee69f 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
@@ -146,6 +146,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.PURCHASE_ORDER_STATUS,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     isSearch: true,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
index ecd12d461..8ee02b3a1 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
@@ -65,6 +65,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.PURCHASE_ORDER_STATUS,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     isSearch: true,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
index 01a6dbe7b..30af09ab2 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
@@ -144,6 +144,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.PURCHASE_PLAN_STATUS,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     isSearch: true,
     table: {
       width: 150
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index 4e6aaa649..1f34ebe5b 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -351,11 +351,12 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     dictType: DICT_TYPE.REQUEST_STATUS,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
+    isSearch: true,
     sort: 'custom',
     table: {
       width: 150
     },
-    isSearch: true,
     form: {
       value: '1',
       componentProps: {
@@ -401,6 +402,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
+    isForm:false,
     table: {
       width: 150
     },
@@ -424,6 +426,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    isForm:false,
     form: {
       component: 'Switch',
       value: requestsettingData.autoAgree,
@@ -444,6 +447,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    isForm:false,
     form: {
       component: 'Switch',
       value: requestsettingData.autoExecute,
diff --git a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts
index 410da7d8f..ee0cfcef5 100644
--- a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts
+++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts
@@ -98,6 +98,7 @@ export const PurchaseclaimRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictClass: 'string',
     isSearch: true,
     isTable: true,
+    isForm:false,
      form: {
       value:'1',
       componentProps:{
@@ -193,6 +194,7 @@ export const PurchaseclaimRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     table: {
       width: 100
     },
@@ -212,6 +214,7 @@ export const PurchaseclaimRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     table: {
       width: 100
     },
@@ -231,6 +234,7 @@ export const PurchaseclaimRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     table: {
       width: 100
     },
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index 9feb3aa58..60937b9d9 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -125,6 +125,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     dictType: DICT_TYPE.SUPPLIERINVOICE_REQUEST_STATUS,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150

From 8cb9a3c877521256f43c0e138fd898ad367e5292 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Sun, 7 Apr 2024 14:38:08 +0800
Subject: [PATCH 30/35] =?UTF-8?q?=E9=9A=90=E8=97=8F=E9=83=A8=E9=97=A8?=
 =?UTF-8?q?=EF=BC=8C=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../countManage/count/countPlanMain/countPlanMain.data.ts    | 4 ++++
 .../count/countRequestMain/countRequestMain.data.ts          | 5 +++++
 .../countadjustRequestMain/countadjustRequestMain.data.ts    | 5 +++++
 .../customerreceiptRequestMain.data.ts                       | 5 +++++
 .../customerreturnRequestMain.data.ts                        | 5 +++++
 .../customersettleRequestMain.data.ts                        | 5 +++++
 .../deliver/deliverRequestMain/deliverRequestMain.data.ts    | 5 +++++
 .../deliverplan/deliverPlanMain/deliverPlanMain.data.ts      | 3 +++
 .../stockup/stockupMainRequest/stockupMainRequest.data.ts    | 4 ++++
 .../inventoryinitRequestMain.data.ts                         | 5 +++++
 .../packageoverRequestMain/packageoverRequestMain.data.ts    | 5 +++++
 .../scrap/scrapRequestMain/scrapRequestMain.data.ts          | 5 +++++
 .../sparepartsrequisitionRequestMain.data.ts                 | 5 +++++
 .../transferissueRequestMain.data.ts                         | 5 +++++
 .../transferreceiptRequestMain.data.ts                       | 5 +++++
 .../unplannedissueRequestMain.data.ts                        | 5 +++++
 .../unplannedreceiptRequestMain.data.ts                      | 5 +++++
 .../inventorychangeRequestMain.data.ts                       | 5 +++++
 .../inventorymoveRequestMain.data.ts                         | 5 +++++
 19 files changed, 91 insertions(+)

diff --git a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
index e4e00be07..2af966e54 100644
--- a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
+++ b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
@@ -338,6 +338,7 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.PLAN_STATUS,
     dictClass: 'string',
     isSearch: true,
+    isForm: false,
     isTable: true,
     sort: 'custom',
     table: {
@@ -366,6 +367,7 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
@@ -386,6 +388,7 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
@@ -406,6 +409,7 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts b/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts
index cc5794f51..5143949d2 100644
--- a/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts
+++ b/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts
@@ -48,6 +48,7 @@ export const CountRequestMain = useCrudSchemas(<CrudSchema[]>([
     dictClass: 'string',
     isSearch: true,
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
@@ -169,6 +170,7 @@ export const CountRequestMain = useCrudSchemas(<CrudSchema[]>([
     label: '部门',
     field: 'departmentCode',
     sort: 'custom',
+    isForm: false,
     table: {
       width: 150
     },
@@ -202,6 +204,7 @@ export const CountRequestMain = useCrudSchemas(<CrudSchema[]>([
     field: 'autoCommit',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
+    isForm: false,
     isTable: true,
     form: {
       component: 'Switch',
@@ -223,6 +226,7 @@ export const CountRequestMain = useCrudSchemas(<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm: false,
     form: {
       component: 'Switch',
       value: requestsettingData.autoAgree,
@@ -243,6 +247,7 @@ export const CountRequestMain = useCrudSchemas(<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm: false,
     form: {
       component: 'Switch',
       value: requestsettingData.autoExecute,
diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
index fc7db78b7..1f92d5613 100644
--- a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
+++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
@@ -48,6 +48,7 @@ export const CountadjustRequestMain = useCrudSchemas(<CrudSchema[]>([
     dictClass: 'string',
     isSearch: true,
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
@@ -156,6 +157,7 @@ export const CountadjustRequestMain = useCrudSchemas(<CrudSchema[]>([
     label: '部门',
     field: 'departmentCode',
     sort: 'custom',
+    isForm: false,
     table: {
       width: 150
     },
@@ -190,6 +192,7 @@ export const CountadjustRequestMain = useCrudSchemas(<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm: false,
     form: {
       component: 'Switch',
       value: requestsettingData.autoCommit,
@@ -210,6 +213,7 @@ export const CountadjustRequestMain = useCrudSchemas(<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm: false,
     form: {
       component: 'Switch',
       value: requestsettingData.autoAgree,
@@ -230,6 +234,7 @@ export const CountadjustRequestMain = useCrudSchemas(<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm: false,
     form: {
       component: 'Switch',
       value: requestsettingData.autoExecute,
diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts
index c05cee187..6ac929cec 100644
--- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts
@@ -44,6 +44,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     dictClass: 'string',
     isSearch: true,
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
@@ -220,6 +221,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     label: '部门',
     field: 'departmentCode',
     sort: 'custom',
+    isForm: false,
     table: {
       width: 150
     },
@@ -254,6 +256,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
@@ -274,6 +277,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
@@ -294,6 +298,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
index 5ab8c3a1d..a224d783a 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
@@ -64,6 +64,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.REQUEST_STATUS,
     dictClass: 'string',
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
@@ -343,6 +344,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '部门',
     field: 'departmentCode',
     sort: 'custom',
+    isForm: false,
     table: {
       width: 150
     },
@@ -377,6 +379,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
@@ -397,6 +400,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
@@ -417,6 +421,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts
index af56503e3..ef3a18a36 100644
--- a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts
@@ -49,6 +49,7 @@ export const CustomersettleRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictClass: 'string',
     isSearch: true,
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
@@ -166,6 +167,7 @@ export const CustomersettleRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '部门',
     field: 'departmentCode',
     sort: 'custom',
+    isForm: false,
     table: {
       width: 150
     },
@@ -200,6 +202,7 @@ export const CustomersettleRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
@@ -220,6 +223,7 @@ export const CustomersettleRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
@@ -240,6 +244,7 @@ export const CustomersettleRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
index e07c81c6d..80acd67bc 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
@@ -62,6 +62,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.REQUEST_STATUS,
     dictClass: 'string',
     isSearch: true,
+    isForm: false,
     isTable: true,
     sort: 'custom',
     table: {
@@ -346,6 +347,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '部门',
     field: 'departmentCode',
     sort: 'custom',
+    isForm: false,
     table: {
       width: 150
     },
@@ -371,6 +373,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
@@ -391,6 +394,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
@@ -411,6 +415,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
index 1d26b1da1..b0e0a87fc 100644
--- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
@@ -234,6 +234,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
@@ -254,6 +255,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
@@ -274,6 +276,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
index ee348fd14..c9f1f60d3 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
@@ -277,6 +277,7 @@ export const StockupMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.REQUEST_STATUS,
     dictClass: 'string',
     isSearch: true,
+    isForm: false,
     isTable: true,
     sort: 'custom',
     table: {
@@ -296,6 +297,7 @@ export const StockupMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
       dictType: DICT_TYPE.TRUE_FALSE,
       dictClass: 'string',
       isTable: true,
+      isForm: false,
       sort: 'custom',
       table: {
         width: 150
@@ -316,6 +318,7 @@ export const StockupMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
       dictType: DICT_TYPE.TRUE_FALSE,
       dictClass: 'string',
       isTable: true,
+      isForm: false,
       sort: 'custom',
       table: {
         width: 150
@@ -336,6 +339,7 @@ export const StockupMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
       dictType: DICT_TYPE.TRUE_FALSE,
       dictClass: 'string',
       isTable: true,
+      isForm: false,
       sort: 'custom',
       table: {
         width: 150
diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
index add7ac0e7..aea3fa842 100644
--- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
@@ -55,6 +55,7 @@ export const InventoryinitRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.REQUEST_STATUS,
     dictClass: 'string',
     isSearch: true,
+    isForm: false,
     isTable: true,
     sort: 'custom',
     table: {
@@ -148,6 +149,7 @@ export const InventoryinitRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '部门',
     field: 'departmentCode',
     sort: 'custom',
+    isForm: false,
     table: {
       width: 150
     },
@@ -173,6 +175,7 @@ export const InventoryinitRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
@@ -193,6 +196,7 @@ export const InventoryinitRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
@@ -213,6 +217,7 @@ export const InventoryinitRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts
index 3bf617148..bebab56c9 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts
@@ -48,6 +48,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictClass: 'string',
     isSearch: true,
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
@@ -199,6 +200,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '部门',
     field: 'departmentCode',
     sort: 'custom',
+    isForm: false,
     table: {
       width: 150
     },
@@ -248,6 +250,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
@@ -268,6 +271,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
@@ -287,6 +291,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoExecute',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
+    isForm: false,
     isTable: true,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
index 6ae1a9a94..aa6f2930c 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
@@ -49,6 +49,7 @@ export const ScrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.REQUEST_STATUS,
     dictClass: 'string',
     isSearch: true,
+    isForm: false,
     isTable: true,
     sort: 'custom',
     table: {
@@ -183,6 +184,7 @@ export const ScrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '部门',
     field: 'departmentCode',
     sort: 'custom',
+    isForm: false,
     table: {
       width: 150
     },
@@ -217,6 +219,7 @@ export const ScrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
@@ -237,6 +240,7 @@ export const ScrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
@@ -257,6 +261,7 @@ export const ScrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts
index bcea142f4..56dee32d7 100644
--- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts
@@ -46,6 +46,7 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.REQUEST_STATUS,
     dictClass: 'string',
     isSearch: true,
+    isForm: false,
     isTable: true,
     sort: 'custom',
     table: {
@@ -151,6 +152,7 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '部门',
     field: 'departmentCode',
     sort: 'custom',
+    isForm: false,
     table: {
       width: 150
     },
@@ -176,6 +178,7 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
@@ -196,6 +199,7 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
@@ -216,6 +220,7 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
index 8ecbc07aa..49e2b8bab 100644
--- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
@@ -60,6 +60,7 @@ export const TransferissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictClass: 'string',
     isSearch: true,
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
@@ -311,6 +312,7 @@ export const TransferissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '部门',
     field: 'departmentCode',
     sort: 'custom',
+    isForm: false,
     table: {
       width: 150
     },
@@ -336,6 +338,7 @@ export const TransferissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
@@ -356,6 +359,7 @@ export const TransferissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
@@ -376,6 +380,7 @@ export const TransferissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts
index e8f6ee261..58fa9a02a 100644
--- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts
@@ -43,6 +43,7 @@ export const TransferreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     dictClass: 'string',
     isSearch: true,
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
@@ -200,6 +201,7 @@ export const TransferreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     label: '部门',
     field: 'departmentCode',
     sort: 'custom',
+    isForm: false,
     table: {
       width: 150
     },
@@ -234,6 +236,7 @@ export const TransferreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
@@ -254,6 +257,7 @@ export const TransferreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
@@ -274,6 +278,7 @@ export const TransferreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
index 2c0d3080f..ba669b9a1 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
@@ -47,6 +47,7 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictClass: 'string',
     isSearch: true,
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
@@ -151,6 +152,7 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '部门',
     field: 'departmentCode',
     sort: 'custom',
+    isForm: false,
     table: {
       width: 150
     },
@@ -176,6 +178,7 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
@@ -196,6 +199,7 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
@@ -215,6 +219,7 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoExecute',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
+    isForm: false,
     isTable: true,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
index aa8bbcd00..145c1496e 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
@@ -62,6 +62,7 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     dictType: DICT_TYPE.REQUEST_STATUS,
     dictClass: 'string',
     isSearch: true,
+    isForm: false,
     isTable: true,
     sort: 'custom',
     table: {
@@ -191,6 +192,7 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     label: '部门',
     field: 'departmentCode',
     sort: 'custom',
+    isForm: false,
     table: {
       width: 150
     },
@@ -216,6 +218,7 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
@@ -236,6 +239,7 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
@@ -256,6 +260,7 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
index 3b9d03647..b8ad76de5 100644
--- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
@@ -51,6 +51,7 @@ export const InventorychangeRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     dictClass: 'string',
     isSearch: true,
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
@@ -127,6 +128,7 @@ export const InventorychangeRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     label: '部门',
     field: 'departmentCode',
     sort: 'custom',
+    isForm: false,
     table: {
       width: 150
     },
@@ -161,6 +163,7 @@ export const InventorychangeRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
@@ -181,6 +184,7 @@ export const InventorychangeRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
@@ -200,6 +204,7 @@ export const InventorychangeRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'autoExecute',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
+    isForm: false,
     isTable: true,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
index 78fc398a4..9a1178d44 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
@@ -52,6 +52,7 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.REQUEST_STATUS,
     dictClass: 'string',
     isSearch: true,
+    isForm: false,
     isTable: true,
     sort: 'custom',
     table: {
@@ -215,6 +216,7 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '部门',
     field: 'departmentCode',
     sort: 'custom',
+    isForm: false,
     table: {
       width: 150
     },
@@ -249,6 +251,7 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
@@ -269,6 +272,7 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
@@ -289,6 +293,7 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150

From 0b2abbca2d1d99ed92dd2531f3a2bf6542ed4518 Mon Sep 17 00:00:00 2001
From: bjang03 <wenwu901@icloud.com>
Date: Sun, 7 Apr 2024 15:21:22 +0800
Subject: [PATCH 31/35] =?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/views/mes/ordermonthplan/index.vue        | 10 ++-
 .../ordermonthplan/mesOrderMonthSub.data.ts   | 63 ++++++++++++-------
 2 files changed, 43 insertions(+), 30 deletions(-)

diff --git a/src/views/mes/ordermonthplan/index.vue b/src/views/mes/ordermonthplan/index.vue
index eaf3a3cde..b2ac5fff8 100644
--- a/src/views/mes/ordermonthplan/index.vue
+++ b/src/views/mes/ordermonthplan/index.vue
@@ -54,16 +54,16 @@
   <Detail ref="detailRef"
           :isBasic="false"
           :allSchemas="MesOrderMonthMain.allSchemas"
-          :detailAllSchemas="MesOrderMonthSub.allSchemas"
+          :detailAllSchemas="detailAllSchemas"
           :detailAllSchemasRules="MesOrderMonthSubRules"
           :apiPage="MesOrderMonthApi.getMesOrderMonthSubPage"
           :apiCreate="MesOrderMonthApi.createMesOrderMonthSub"
           :apiUpdate="MesOrderMonthApi.updateMesOrderMonthSub"
           :apiDelete="MesOrderMonthApi.deleteMesOrderMonthSub"
           :tabs="TabsList"
-          :detailButtonIsShowAdd="true"
           :detailButtonIsShowDelete="true"
-          :detailButtonIsShowEdit="false"
+          :detailButtonIsShowEdit="true"
+          :detailButtonIsShowAdd="true"
   />
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/plan/mes-order-month-main/import"
@@ -77,7 +77,6 @@ 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
@@ -100,7 +99,6 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
     formRef.setValues(setV)
   })
 }
-
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
   tableColumns.value = val
@@ -256,5 +254,5 @@ onMounted(async () => {
   getList()
   importTemplateData.templateUrl = await MesOrderMonthApi.importTemplate()
 })
-
+const detailAllSchemas = ref(MesOrderMonthSub.allSchemas)
 </script>
diff --git a/src/views/mes/ordermonthplan/mesOrderMonthSub.data.ts b/src/views/mes/ordermonthplan/mesOrderMonthSub.data.ts
index e24c58e31..d61da01ac 100644
--- a/src/views/mes/ordermonthplan/mesOrderMonthSub.data.ts
+++ b/src/views/mes/ordermonthplan/mesOrderMonthSub.data.ts
@@ -19,10 +19,7 @@ export const MesOrderMonthSub = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'productCode',
     sort: 'custom',
     isTable: false,
-    isSearch: true,
-    form: {
-      component: 'SelectV2'
-    }
+    isSearch: true
   },
   {
     label: '产品名称',
@@ -59,36 +56,28 @@ export const MesOrderMonthSub = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'finishCount',
     sort: 'custom',
     isSearch: true,
-    form: {
-      component: 'InputNumber',
-      value: 0
-    }
+    isForm: false
   },
   {
     label: '合格数量',
     field: 'qualifiedCount',
     sort: 'custom',
     isSearch: true,
-    form: {
-      component: 'InputNumber',
-      value: 0
-    }
+    isForm: false
   },
   {
     label: '不合格数量',
     field: 'unqualifiedCount',
     sort: 'custom',
     isSearch: true,
-    form: {
-      component: 'InputNumber',
-      value: 0
-    }
+    isForm: false
   },
   {
     label: '是否回冲',
     field: 'flagBackwash',
     sort: 'custom',
-    isSearch: true
+    isSearch: true,
+    isForm: false
   },
   {
     label: '产品批次号',
@@ -115,25 +104,53 @@ export const MesOrderMonthSub = useCrudSchemas(reactive<CrudSchema[]>([
     label: '计划开始日期',
     field: 'planBegin',
     sort: 'custom',
-    isSearch: true
+    isSearch: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
   },
   {
     label: '计划结束日期',
     field: 'planEnd',
     sort: 'custom',
-    isSearch: true
+    isSearch: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
   },
   {
     label: '实际开工日期',
     field: 'realStart',
     sort: 'custom',
-    isSearch: true
+    isSearch: true,
+    isForm: false
   },
   {
     label: '实际完工日期',
     field: 'realFinish',
     sort: 'custom',
-    isSearch: true
+    isSearch: true,
+    isForm: false
   },
   {
     label: '备注',
@@ -146,9 +163,7 @@ export const MesOrderMonthSub = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'status',
     sort: 'custom',
     isSearch: true,
-    form: {
-      component: 'Radio'
-    }
+    isForm: false
   },
   {
     label: '操作',

From 4ea9d1edada21e6635d6e35edfcc9eef2c8f8fb1 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Sun, 7 Apr 2024 15:42:18 +0800
Subject: [PATCH 32/35] =?UTF-8?q?app=E5=8D=87=E7=BA=A7=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../systemInstallPackage/systemInstallPackage.data.ts    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/views/system/systemInstallPackage/systemInstallPackage.data.ts b/src/views/system/systemInstallPackage/systemInstallPackage.data.ts
index 5af715118..148027b7b 100644
--- a/src/views/system/systemInstallPackage/systemInstallPackage.data.ts
+++ b/src/views/system/systemInstallPackage/systemInstallPackage.data.ts
@@ -34,7 +34,7 @@ export const SystemInstallPackage = useCrudSchemas(reactive<CrudSchema[]>([
     dictClass: 'string',
     isTable: true,
     table: {
-      width: 120
+      width: 140
     },
     form: {
       component: 'Switch',
@@ -49,7 +49,12 @@ export const SystemInstallPackage = useCrudSchemas(reactive<CrudSchema[]>([
     label: '更新内容',
     field: 'updateContent',
     sort: 'custom',
-  
+  },
+  {
+    label: '附件id',
+    field: 'fileId',
+    isForm:false,
+    sort: 'custom',
   },
   {
     label: '备注',

From 38f7bce772a741daac9e9db953f3ab8810146995 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Sun, 7 Apr 2024 16:03:57 +0800
Subject: [PATCH 33/35] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86/\APP?=
 =?UTF-8?q?=E5=8D=87=E7=BA=A7/=E5=AE=89=E8=A3=85=E5=8C=85=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E7=AE=A1=E7=90=86=20---=20=E6=96=B0=E5=A2=9E=EF=BC=9A?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=99=84=E4=BB=B6=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/UploadFile/src/UploadFile.vue  |  8 +++---
 .../system/systemInstallPackage/index.vue     | 15 +++++++++++
 .../systemInstallPackage.data.ts              | 27 ++++++++++++++++++-
 3 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/src/components/UploadFile/src/UploadFile.vue b/src/components/UploadFile/src/UploadFile.vue
index ed92c4c18..1f8b90948 100644
--- a/src/components/UploadFile/src/UploadFile.vue
+++ b/src/components/UploadFile/src/UploadFile.vue
@@ -129,11 +129,11 @@ const excelUploadError: UploadProps['onError'] = (): void => {
 }
 // 删除上传文件
 const handleRemove = (file) => {
-  const findex = fileList.value.map((f) => f.name).indexOf(file.name)
-  if (findex > -1) {
-    fileList.value.splice(findex, 1)
+  // const findex = fileList.value.map((f) => f.name).indexOf(file.name)
+  // if (findex > -1) {
+  //   fileList.value.splice(findex, 1)
     emit('update:modelValue', listToString(fileList.value))
-  }
+  // }
 }
 const handlePreview: UploadProps['onPreview'] = (uploadFile) => {
   console.log(uploadFile)
diff --git a/src/views/system/systemInstallPackage/index.vue b/src/views/system/systemInstallPackage/index.vue
index f6b9543ac..e6475b35e 100644
--- a/src/views/system/systemInstallPackage/index.vue
+++ b/src/views/system/systemInstallPackage/index.vue
@@ -41,6 +41,13 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
     ref="basicFormRef"
+    :sumFormDataByForm ="(formRef,formModel)=>{
+      console.log(formModel)
+      const {uploadFile} = formModel
+      formRef.value.setValues({
+        installPackageUrl:uploadFile
+      })
+    }"
     @success="formsSuccess"
     :rules="SystemInstallPackageRules"
     :formAllSchemas="SystemInstallPackage.allSchemas"
@@ -131,12 +138,20 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
+  if('create'==type){
+    const currentTime = new Date().getTime()
+    const fileId = SystemInstallPackage.allSchemas.formSchema.find(item=>item.field=='fileId')
+    fileId['value'] = currentTime
+    const uploadFile = SystemInstallPackage.allSchemas.formSchema.find(item=>item.field=='uploadFile')
+    uploadFile['componentProps']['upData']['tableId'] = currentTime
+  }
   basicFormRef.value.open(type, row)
 }
 
 // form表单提交
 const formsSuccess = async (formType,data) => {
   if (formType === 'create') {
+    delete data['uploadFile']
     await SystemInstallPackageApi.createSystemInstallPackage(data)
     message.success(t('common.createSuccess'))
   } else {
diff --git a/src/views/system/systemInstallPackage/systemInstallPackage.data.ts b/src/views/system/systemInstallPackage/systemInstallPackage.data.ts
index 148027b7b..580aadb6d 100644
--- a/src/views/system/systemInstallPackage/systemInstallPackage.data.ts
+++ b/src/views/system/systemInstallPackage/systemInstallPackage.data.ts
@@ -25,6 +25,11 @@ export const SystemInstallPackage = useCrudSchemas(reactive<CrudSchema[]>([
     label: '安装路径',
     field: 'installPackageUrl',
     sort: 'custom',
+    form: {
+      componentProps: {
+        disabled: true
+      },
+    }
   },
   {
     label: '是否强制更新',
@@ -53,14 +58,34 @@ export const SystemInstallPackage = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '附件id',
     field: 'fileId',
-    isForm:false,
     sort: 'custom',
+    form: {
+      componentProps: {
+        disabled: true
+      },
+      value:'',
+    }
   },
   {
     label: '备注',
     field: 'remark',
     sort: 'custom',
   },
+  {
+    label: '上传附件',
+    field: 'uploadFile',
+    sort: 'custom',
+    form: {
+      component: 'UploadFile',
+      componentProps: {
+        upData:{
+          tableId: '',
+          tableName: ''
+        },
+        limit:1
+      }
+    },
+  },
   {
     label: '创建时间',
     field: 'createTime',

From e2c88d181756a91495717c71829cf66fd319fa6e Mon Sep 17 00:00:00 2001
From: gaojs <js.gao@ccwin-in.com>
Date: Sun, 7 Apr 2024 16:05:00 +0800
Subject: [PATCH 34/35] =?UTF-8?q?=E6=A8=A1=E5=85=B7=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=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/api/mes/pattern/index.ts                  |  66 +++++
 src/api/mes/patternType/index.ts              |  54 ++++
 src/views/mes/pattern/index.vue               | 244 ++++++++++++++++++
 src/views/mes/pattern/pattern.data.ts         | 217 ++++++++++++++++
 .../{partternType => patternType}/index.vue   |  50 ++--
 .../patternType.data.ts}                      |   5 +-
 7 files changed, 609 insertions(+), 81 deletions(-)
 delete mode 100644 src/api/mes/partternType/index.ts
 create mode 100644 src/api/mes/pattern/index.ts
 create mode 100644 src/api/mes/patternType/index.ts
 create mode 100644 src/views/mes/pattern/index.vue
 create mode 100644 src/views/mes/pattern/pattern.data.ts
 rename src/views/mes/{partternType => patternType}/index.vue (76%)
 rename src/views/mes/{partternType/partternType.data.ts => patternType/patternType.data.ts} (95%)

diff --git a/src/api/mes/partternType/index.ts b/src/api/mes/partternType/index.ts
deleted file mode 100644
index 29002581a..000000000
--- a/src/api/mes/partternType/index.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-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/api/mes/pattern/index.ts b/src/api/mes/pattern/index.ts
new file mode 100644
index 000000000..2ee80689b
--- /dev/null
+++ b/src/api/mes/pattern/index.ts
@@ -0,0 +1,66 @@
+import request from '@/config/axios'
+
+export interface PatternVO {
+  deleteTime: Date
+  id: number
+  status: string
+  concurrencyStamp: number
+  remark: string
+  deleter: string
+  siteId: number
+  code: string
+  name: string
+  partternName: string
+  productCode: string
+  dateUseStart: Date
+  dateUseStop: Date
+  partternFrom: string
+  partternGo: string
+  initCout: number
+  effectStart: Date
+  effectEnd: Date
+  factoryCode: string
+  factoryName: string
+  factoryType: string
+}
+
+// 查询模具基本信息列表
+export const getPatternPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/mes/pattern/senior', data })
+  } else {
+    return await request.get({ url: `/mes/pattern/page`, params })
+  }
+}
+
+// 查询模具基本信息详情
+export const getPattern = async (id: number) => {
+  return await request.get({ url: `/mes/pattern/get?id=` + id })
+}
+
+// 新增模具基本信息
+export const createPattern = async (data: PatternVO) => {
+  return await request.post({ url: `/mes/pattern/create`, data })
+}
+
+// 修改模具基本信息
+export const updatePattern = async (data: PatternVO) => {
+  return await request.put({ url: `/mes/pattern/update`, data })
+}
+
+// 删除模具基本信息
+export const deletePattern = async (id: number) => {
+  return await request.delete({ url: `/mes/pattern/delete?id=` + id })
+}
+
+// 导出模具基本信息 Excel
+export const exportPattern = async (params) => {
+  return await request.download({ url: `/mes/pattern/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/mes/pattern/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/mes/patternType/index.ts b/src/api/mes/patternType/index.ts
new file mode 100644
index 000000000..f4bf226df
--- /dev/null
+++ b/src/api/mes/patternType/index.ts
@@ -0,0 +1,54 @@
+import request from '@/config/axios'
+
+export interface PatternTypeVO {
+  deleteTime: Date
+  id: number
+  status: string
+  concurrencyStamp: number
+  remark: string
+  deleter: string
+  siteId: number
+  code: string
+  name: string
+}
+
+// 查询模具类型列表
+export const getPatternTypePage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/mes/pattern-type/senior', data })
+  } else {
+    return await request.get({ url: `/mes/pattern-type/page`, params })
+  }
+}
+
+// 查询模具类型详情
+export const getPatternType = async (id: number) => {
+  return await request.get({ url: `/mes/pattern-type/get?id=` + id })
+}
+
+// 新增模具类型
+export const createPatternType = async (data: PatternTypeVO) => {
+  return await request.post({ url: `/mes/pattern-type/create`, data })
+}
+
+// 修改模具类型
+export const updatePatternType = async (data: PatternTypeVO) => {
+  return await request.put({ url: `/mes/pattern-type/update`, data })
+}
+
+// 删除模具类型
+export const deletePatternType = async (id: number) => {
+  return await request.delete({ url: `/mes/pattern-type/delete?id=` + id })
+}
+
+// 导出模具类型 Excel
+export const exportPatternType = async (params) => {
+  return await request.download({ url: `/mes/pattern-type/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/mes/pattern-type/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/views/mes/pattern/index.vue b/src/views/mes/pattern/index.vue
new file mode 100644
index 000000000..7d201886a
--- /dev/null
+++ b/src/views/mes/pattern/index.vue
@@ -0,0 +1,244 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Pattern.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="Pattern.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="PatternRules"
+    :formAllSchemas="Pattern.allSchemas"
+    :apiUpdate="PatternApi.updatePattern"
+    :apiCreate="PatternApi.createPattern"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Pattern.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/mes/pattern/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { Pattern,PatternRules } from './pattern.data'
+import * as PatternApi from '@/api/mes/pattern'
+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: 'Pattern' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Pattern.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: PatternApi.getPatternPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'mes:pattern:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'mes:pattern:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'mes:pattern: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:pattern:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'mes:pattern: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 =Pattern.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 PatternApi.createPattern(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await PatternApi.updatePattern(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, 'basicPattern')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await PatternApi.deletePattern(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 PatternApi.exportPattern(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 PatternApi.importTemplate()
+})
+
+</script>
diff --git a/src/views/mes/pattern/pattern.data.ts b/src/views/mes/pattern/pattern.data.ts
new file mode 100644
index 000000000..35d2afb1d
--- /dev/null
+++ b/src/views/mes/pattern/pattern.data.ts
@@ -0,0 +1,217 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const PatternRules = reactive({
+  concurrencyStamp: [required],
+})
+
+export const Pattern = 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')]
+      }
+    },
+    isForm: false,
+  },
+  {
+    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: 'partternName',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '产品编码',
+    field: 'productCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '启用时间',
+    field: 'dateUseStart',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '停用时间',
+    field: 'dateUseStop',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '模具来源',
+    field: 'partternFrom',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '模具去向',
+    field: 'partternGo',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '模具初始数量',
+    field: 'initCout',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '有效期开始时间',
+    field: 'effectStart',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '有效期结束时间',
+    field: 'effectEnd',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '所属单位编码',
+    field: 'factoryCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '所属单位名称',
+    field: 'factoryName',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '所属单位类别',
+    field: 'factoryType',
+    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
+  }
+]))
diff --git a/src/views/mes/partternType/index.vue b/src/views/mes/patternType/index.vue
similarity index 76%
rename from src/views/mes/partternType/index.vue
rename to src/views/mes/patternType/index.vue
index 77a6cefb8..acedd71fe 100644
--- a/src/views/mes/partternType/index.vue
+++ b/src/views/mes/patternType/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="PartternType.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="PatternType.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -11,7 +11,7 @@
       :routeName="routeName"
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
-      :allSchemas="PartternType.allSchemas"
+      :allSchemas="PatternType.allSchemas"
     />
 
   <!-- 列表 -->
@@ -42,31 +42,31 @@
   <BasicForm
     ref="basicFormRef"
     @success="formsSuccess"
-    :rules="PartternTypeRules"
-    :formAllSchemas="PartternType.allSchemas"
-    :apiUpdate="PartternTypeApi.updatePartternType"
-    :apiCreate="PartternTypeApi.createPartternType"
+    :rules="PatternTypeRules"
+    :formAllSchemas="PatternType.allSchemas"
+    :apiUpdate="PatternTypeApi.updatePatternType"
+    :apiCreate="PatternTypeApi.createPatternType"
     @searchTableSuccess="searchTableSuccess"
     :isBusiness="false"
   />
 
   <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="true" :allSchemas="PartternType.allSchemas" />
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="PatternType.allSchemas" />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/mes/parttern-type/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportForm ref="importFormRef" url="/mes/pattern-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 { PatternType,PatternTypeRules } from './patternType.data'
+import * as PatternTypeApi from '@/api/mes/patternType'
 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' })
+defineOptions({ name: 'PatternType' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
@@ -74,7 +74,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(PartternType.allSchemas.tableColumns)
+const tableColumns = ref(PatternType.allSchemas.tableColumns)
 
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
@@ -91,7 +91,7 @@ const updataTableColumns = (val) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: PartternTypeApi.getPartternTypePage // 分页接口
+  getListApi: PatternTypeApi.getPatternTypePage // 分页接口
 })
 
 // 获得表格的各种操作
@@ -99,9 +99,9 @@ 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.defaultAddBtn({hasPermi:'mes:patternType:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'mes:patternType:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'mes:patternType:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -133,8 +133,8 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'mes:partternType:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'mes:partternType:delete'}), // 删除
+  defaultButtons.mainListEditBtn({hasPermi:'mes:patternType:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'mes:patternType:delete'}), // 删除
 ]
 
 // 列表-操作按钮事件
@@ -154,7 +154,7 @@ const openForm = (type: string, row?: any) => {
 
 // form表单提交
 const formsSuccess = async (formType,data) => {
-  var isHave =PartternType.allSchemas.formSchema.some(function (item) {
+  var isHave =PatternType.allSchemas.formSchema.some(function (item) {
     return item.field === 'activeTime' || item.field === 'expireTime';
   });
   if(isHave){
@@ -166,10 +166,10 @@ const formsSuccess = async (formType,data) => {
   if(data.activeTime==0)data.activeTime = null;
   if(data.expireTime==0)data.expireTime = null;
   if (formType === 'create') {
-    await PartternTypeApi.createPartternType(data)
+    await PatternTypeApi.createPatternType(data)
     message.success(t('common.createSuccess'))
   } else {
-    await PartternTypeApi.updatePartternType(data)
+    await PatternTypeApi.updatePatternType(data)
     message.success(t('common.updateSuccess'))
   }
   basicFormRef.value.dialogVisible = false
@@ -179,7 +179,7 @@ const formsSuccess = async (formType,data) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue, 'basicPartternType')
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicPatternType')
 }
 
 /** 删除按钮操作 */
@@ -188,7 +188,7 @@ const handleDelete = async (id: number) => {
     // 删除的二次确认
     await message.delConfirm()
     // 发起删除
-    await PartternTypeApi.deletePartternType(id)
+    await PatternTypeApi.deletePatternType(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
     await getList()
@@ -203,7 +203,7 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await PartternTypeApi.exportPartternType(tableObject.params)
+    const data = await PatternTypeApi.exportPatternType(tableObject.params)
     download.excel(data, '模具类型.xlsx')
   } catch {
   } finally {
@@ -238,7 +238,7 @@ const searchFormClick = (searchData) => {
 /** 初始化 **/
 onMounted(async () => {
   getList()
-  importTemplateData.templateUrl = await PartternTypeApi.importTemplate()
+  importTemplateData.templateUrl = await PatternTypeApi.importTemplate()
 })
 
 </script>
diff --git a/src/views/mes/partternType/partternType.data.ts b/src/views/mes/patternType/patternType.data.ts
similarity index 95%
rename from src/views/mes/partternType/partternType.data.ts
rename to src/views/mes/patternType/patternType.data.ts
index 2cf9df99c..3ec104df8 100644
--- a/src/views/mes/partternType/partternType.data.ts
+++ b/src/views/mes/patternType/patternType.data.ts
@@ -2,11 +2,12 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
 
 // 表单校验
-export const PartternTypeRules = reactive({
+export const PatternTypeRules = reactive({
   code: [required],
+  name: [required]
 })
 
-export const PartternType = useCrudSchemas(reactive<CrudSchema[]>([
+export const PatternType = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '删除时间',
     field: 'deleteTime',

From 38e7987a326e0ecf7aee936d6bb86f6807f5b964 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Sun, 7 Apr 2024 16:11:32 +0800
Subject: [PATCH 35/35] =?UTF-8?q?=E9=9A=90=E8=97=8F=E9=83=A8=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoiceRequestMain.data.ts        | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index 9dce779af..ebdecf62d 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -215,6 +215,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       type: 'InputNumber',
       min: 0,
       precision: 6,
+      disabled: true,
     }
   },
   {
@@ -342,6 +343,9 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    isTable:false,
+    isTableForm:false,
+    isForm:false,
     formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
       return userDeptArray.find((account) => account.id == cellValue)?.name
     },
@@ -616,21 +620,6 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       ]
     }
   },
-  {
-    label: '供应商税率',
-    field: 'tax',
-    table: {
-      width: 150
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    },
-    tableForm:{
-      disabled: true
-    }
-  },
   {
     label: '项目编码',
     field: 'projectCode',