Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

src/api/qms/counter/index.ts

@@ -26,38 +26,38 @@ export const getCounterPage = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
-    return await request.post({ url: '/basic/counter/senior', data })
+    return await request.post({ url: '/qms/counter/senior', data })
   } else {
-    return await request.get({ url: `/basic/counter/page`, params })
+    return await request.get({ url: `/qms/counter/page`, params })
   }
 }
 
 // 查询物料检验计数器详情
 export const getCounter = async (id: number) => {
-  return await request.get({ url: `/basic/counter/get?id=` + id })
+  return await request.get({ url: `/qms/counter/get?id=` + id })
 }
 
 // 新增物料检验计数器
 export const createCounter = async (data: CounterVO) => {
-  return await request.post({ url: `/basic/counter/create`, data })
+  return await request.post({ url: `/qms/counter/create`, data })
 }
 
 // 修改物料检验计数器
 export const updateCounter = async (data: CounterVO) => {
-  return await request.put({ url: `/basic/counter/update`, data })
+  return await request.put({ url: `/qms/counter/update`, data })
 }
 
 // 删除物料检验计数器
 export const deleteCounter = async (id: number) => {
-  return await request.delete({ url: `/basic/counter/delete?id=` + id })
+  return await request.delete({ url: `/qms/counter/delete?id=` + id })
 }
 
 // 导出物料检验计数器 Excel
 export const exportCounter = async (params) => {
-  return await request.download({ url: `/basic/counter/export-excel`, params })
+  return await request.download({ url: `/qms/counter/export-excel`, params })
 }
 
 // 下载用户导入模板
 export const importTemplate = () => {
-  return request.download({ url: '/basic/counter/get-import-template' })
+  return request.download({ url: '/qms/counter/get-import-template' })
 }

src/api/qms/dynamicRule/index.ts

@@ -1,7 +1,7 @@
 import request from '@/config/axios'
 
 export interface DynamicRuleVO {
-  code: string
+  number: string
   describe: string
   available: string
   deletionTime: Date
@@ -16,38 +16,38 @@ export const getDynamicRulePage = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
-    return await request.post({ url: '/basic/dynamic-rule/senior', data })
+    return await request.post({ url: '/qms/dynamic-rule/senior', data })
   } else {
-    return await request.get({ url: `/basic/dynamic-rule/page`, params })
+    return await request.get({ url: `/qms/dynamic-rule/page`, params })
   }
 }
 
 // 查询动态修改规则详情
 export const getDynamicRule = async (id: number) => {
-  return await request.get({ url: `/basic/dynamic-rule/get?id=` + id })
+  return await request.get({ url: `/qms/dynamic-rule/get?id=` + id })
 }
 
 // 新增动态修改规则
 export const createDynamicRule = async (data: DynamicRuleVO) => {
-  return await request.post({ url: `/basic/dynamic-rule/create`, data })
+  return await request.post({ url: `/qms/dynamic-rule/create`, data })
 }
 
 // 修改动态修改规则
 export const updateDynamicRule = async (data: DynamicRuleVO) => {
-  return await request.put({ url: `/basic/dynamic-rule/update`, data })
+  return await request.put({ url: `/qms/dynamic-rule/update`, data })
 }
 
 // 删除动态修改规则
 export const deleteDynamicRule = async (id: number) => {
-  return await request.delete({ url: `/basic/dynamic-rule/delete?id=` + id })
+  return await request.delete({ url: `/qms/dynamic-rule/delete?id=` + id })
 }
 
 // 导出动态修改规则 Excel
 export const exportDynamicRule = async (params) => {
-  return await request.download({ url: `/basic/dynamic-rule/export-excel`, params })
+  return await request.download({ url: `/qms/dynamic-rule/export-excel`, params })
 }
 
 // 下载用户导入模板
 export const importTemplate = () => {
-  return request.download({ url: '/basic/dynamic-rule/get-import-template' })
+  return request.download({ url: '/qms/dynamic-rule/get-import-template' })
 }

src/api/qms/inspectionPlan/index.ts

@@ -0,0 +1,30 @@
+import request from '@/config/axios'
+
+
+
+// 查询采样过程列表
+export const getListByTempleteCode = async (code) => {
+  return await request.get({ url: `/qms/inspection-process/getListByTempleteCode?code=`+code})
+}
+// 新增
+export const inspectionTemplateCreat = async (data) => {
+  return await request.post({ url: `/qms/programme-template/create`,data})
+}
+// 编辑
+export const inspectionTemplateUpdate = async (data) => {
+  return await request.put({ url: `/qms/programme-template/update`,data})
+}
+// 删除
+export const inspectionTemplateDelete = async (id) => {
+  return await request.delete({ url: `/qms/programme-template/delete?id=`+id})
+}
+// 列表
+export const inspectionTemplatePage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/accountcalendar/senior', data })
+  } else {
+    return await request.get({ url: `/qms/programme-template/page`, params })
+  }
+}

src/api/qms/inspectionStage/index.ts

@@ -1,7 +1,8 @@
 import request from '@/config/axios'
 
 export interface InspectionStageVO {
-  code: string
+  number: string
+  masterId: number
   dynamicModifyCode: string
   describe: string
   okTimes: number
@@ -24,38 +25,38 @@ export const getInspectionStagePage = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
-    return await request.post({ url: '/basic/inspection-stage/senior', data })
+    return await request.post({ url: '/qms/inspection-stage/senior', data })
   } else {
-    return await request.get({ url: `/basic/inspection-stage/page`, params })
+    return await request.get({ url: `/qms/inspection-stage/page`, params })
   }
 }
 
 // 查询检验阶段详情
 export const getInspectionStage = async (id: number) => {
-  return await request.get({ url: `/basic/inspection-stage/get?id=` + id })
+  return await request.get({ url: `/qms/inspection-stage/get?id=` + id })
 }
 
 // 新增检验阶段
 export const createInspectionStage = async (data: InspectionStageVO) => {
-  return await request.post({ url: `/basic/inspection-stage/create`, data })
+  return await request.post({ url: `/qms/inspection-stage/create`, data })
 }
 
 // 修改检验阶段
 export const updateInspectionStage = async (data: InspectionStageVO) => {
-  return await request.put({ url: `/basic/inspection-stage/update`, data })
+  return await request.put({ url: `/qms/inspection-stage/update`, data })
 }
 
 // 删除检验阶段
 export const deleteInspectionStage = async (id: number) => {
-  return await request.delete({ url: `/basic/inspection-stage/delete?id=` + id })
+  return await request.delete({ url: `/qms/inspection-stage/delete?id=` + id })
 }
 
 // 导出检验阶段 Excel
 export const exportInspectionStage = async (params) => {
-  return await request.download({ url: `/basic/inspection-stage/export-excel`, params })
+  return await request.download({ url: `/qms/inspection-stage/export-excel`, params })
 }
 
 // 下载用户导入模板
 export const importTemplate = () => {
-  return request.download({ url: '/basic/inspection-stage/get-import-template' })
+  return request.download({ url: '/qms/inspection-stage/get-import-template' })
 }

src/api/wms/productreceiptDetailb/index.ts

@@ -0,0 +1,51 @@
+import request from '@/config/axios'
+
+export interface ProductreceiptDetailbVO {
+  id: number
+  packingNumber: string
+  batch: string
+  masterId: number
+  number: string
+  itemCode: string
+  itemName: string
+  outsideItemCode: string
+  outsideProduceDate: string
+  outsideSerialNumber: string
+  remark: string
+}
+
+// 查询制品收货记录子列表
+export const getProductreceiptDetailbPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productreceipt-detailb/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productreceipt-detailb/page`, params })
+  }
+}
+
+// 查询制品收货记录子详情
+export const getProductreceiptDetailb = async (id: number) => {
+  return await request.get({ url: `/wms/productreceipt-detailb/get?id=` + id })
+}
+
+// 新增制品收货记录子
+export const createProductreceiptDetailb = async (data: ProductreceiptDetailbVO) => {
+  return await request.post({ url: `/wms/productreceipt-detailb/create`, data })
+}
+
+// 修改制品收货记录子
+export const updateProductreceiptDetailb = async (data: ProductreceiptDetailbVO) => {
+  return await request.put({ url: `/wms/productreceipt-detailb/update`, data })
+}
+
+// 删除制品收货记录子
+export const deleteProductreceiptDetailb = async (id: number) => {
+  return await request.delete({ url: `/wms/productreceipt-detailb/delete?id=` + id })
+}
+
+// 导出制品收货记录子 Excel
+export const exportProductreceiptDetailb = async (params) => {
+  return await request.download({ url: `/wms/productreceipt-detailb/export-excel`, params })
+}

src/components/BasicForm/src/BasicFormQms.vue

@@ -0,0 +1,696 @@
+<template>
+  <Dialog
+    :title="dialogTitle"
+    v-model="dialogVisible"
+    :width="dialogWidth"
+    :close-on-click-modal="false"
+    :vLoading="formLoading"
+  >
+  
+  <div 
+    style="max-height: 60vh;overflow-y: auto;">
+    <Form
+      ref="formRef"
+      :rules="rules"
+      :schema="formSchema"
+      :is-col="true"
+      @opensearchTable="opensearchTable"
+      @onChange="onChange"
+      @onBlur="onBlur"
+    >
+      <template #crontab="formSchema" v-if="fromeWhere == 'countPlan'">
+        <crontab v-model="formSchema.crontab" />
+      </template>
+      <template #type="formSchema" v-if="fromeWhere == 'countPlan'">
+        <el-select
+          v-model="formSchema.type"
+          placeholder="选择盘点类型"
+          @change="selectChange('type', $event)"
+          v-if="!isDetail"
+        >
+          <el-option
+            v-for="dict in getStrDictOptions(DICT_TYPE.COUNT_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+        <el-select
+          v-model="formSchema.type"
+          placeholder="选择盘点范围类型"
+          @change="selectChangeDetail('type', $event,formSchema)"
+          v-if="isDetail"
+        >
+          <el-option
+            v-for="dict in getStrDictOptions(DICT_TYPE.COUNT_SCOPE_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </template>
+      <template #value="formSchema" v-if="fromeWhere == 'countPlan'">
+        <el-select
+          v-model="formSchema.value"
+          placeholder="选择盘点范围值"
+          v-if="isDetail&& formTypeDetail =='Select'"
+        >
+          <el-option
+            v-for="dict in countPlanAllList"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+        <el-input v-model="formSchema.value" v-if="isDetail && formTypeDetail =='InputString'"/>
+      </template>
+    </Form>
+    <div class="table" v-if="isBusiness && formType == 'create' && fromeWhere != 'countPlan'">
+      <TableForm
+        ref="tableFormRef"
+        class="w-[100%]"
+        :tableFields="tableAllSchemas.tableFormColumns"
+        :tableData="tableData"
+        :tableFormRules="tableFormRules"
+        :isShowButton="isShowButton"
+        :isShowReduceButton="isShowReduceButton"
+        @handleAddTable="handleAddTable"
+        @handleDeleteTable="handleDeleteTable"
+        @tableSelectionChange="tableSelectionChange"
+        @extendedButtonsClick="extendedButtonsClick"
+        @formSelectChange="formSelectChange"
+        @formSelectvVisibleChange="formSelectvVisibleChange"
+        @tableSortChange="tableSortChange"
+        @selectCallback="selectCallback"
+        @handleTableSelect="handleTableSelect"
+        @inpuFocus="inpuFocus"
+        @buttonOperationClick="buttonOperationClick"
+        @inputStringBlur="inputStringBlur"
+        @inputNumberChange="inputNumberChange"
+        @tableFormSelectOnBlur="tableFormSelectOnBlur"
+        @formFormDateChange="formFormDateChange"
+      />
+    </div>
+    <div v-if="isBusiness && formType == 'create' && fromeWhere == 'countPlan'">
+      <TableFormCountPlan 
+        :tableFields="tableAllSchemas.tableFormColumns"
+        :tableData="tableData"
+        :countScopeType="countScopeType"
+        :tableFormRules="tableFormRules"
+        ref="tableFormRef"
+        @tableFormChange="tableFormChange"
+        @handleAddTable="handleAddTable"
+        @handleDeleteTable="handleDeleteTable"
+      />
+    </div>
+  </div>
+    <template #footer>
+      <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick" />
+    </template>
+  
+  </Dialog>
+  <SearchTable ref="searchTableRef" @searchTableSuccess="searchTableSuccess" />
+</template>
+<script setup lang="ts">
+import { SearchTable } from '@/components/SearchTable'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import ButtonBase from '@/components/XButton/src/ButtonBase.vue'
+import TableForm from '@/components/TableForm/src/TableForm.vue'
+import TableFormCountPlan from '@/components/TableFormCountPlan/src/TableFormCountPlan.vue'
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+
+const props = defineProps({
+  // 显示窗口宽度设置
+  basicFormWidth: {
+    type: String,
+    default: ''
+  },
+  // 是否显示TableForm 新增/删除按钮
+  isShowButton: {
+    type: Boolean,
+    default: true
+  },
+  // 是否显示tableForm 删除按钮
+  isShowReduceButton: {
+    type: Boolean,
+    default: true
+  },
+  // 校验rules
+  rules: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 表单，列表 相关信息
+  formAllSchemas: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 列表 相关信息
+  tableAllSchemas: {
+    type: Array,
+    required: true,
+    default: null
+  },
+  // 列表数据
+  tableData: {
+    type: Array,
+    required: true,
+    default: null
+  },
+  tableFormRules: {
+    type: Array,
+    required: true,
+    default: null
+  },
+  // 查询参数
+  // searchTableParams: {
+  //   type: Array,
+  //   required: false,
+  //   default: null
+  // },
+  // API——Vo
+  apiVo: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  //  API——创建
+  apiCreate: {
+    type: Function,
+    required: true,
+    default: null
+  },
+  //  API——编辑
+  apiUpdate: {
+    type: Function,
+    required: true,
+    default: null
+  },
+  // 是否是业务表单（区分是不显示tableForm）
+  isBusiness: {
+    type: Boolean,
+    required: true,
+    default: true
+  },
+  // 表单form
+  form: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 详情数据
+  detailData: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // // 主表参数
+  // masterParmas: {
+  //   type: Object,
+  //   required: false,
+  //   default: null
+  // },
+  // 来源 countPlan盘点计划进入
+  fromeWhere: {
+    type: String,
+    required: false,
+    default: ''
+  },
+  // 盘点范围类型
+  countScopeType: {
+    type: Array,
+    required: false,
+    default: null
+  },
+  // 是否从详情进入
+  isDetail: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  //盘点详情子表新增的时候判断盘点范围值显示输入框还是下拉框
+  formTypeDetail: {
+    type: String,
+    required: false,
+    default: 'InputString'
+  },
+  //盘点详情子表新增的时候判断盘点范围值的下拉列表
+  countPlanAllList: {
+    type: Array,
+    required: false,
+    default: null
+  },
+  // 窗体底部按钮 显示or隐藏：保存，关闭
+  isShowFooterButtton: {
+    type: Boolean,
+    required: false,
+    default: true
+  },
+  // 明细数据长度校验
+  tableFormDataLength: {
+    type: Boolean,
+    required: false,
+    default: true
+  },
+  // 底部按钮集合
+  footButttondata: {
+    type: Array,
+    required: false,
+    default: null
+  },
+  //是否直接展示搜索表单
+  isOpenSearchTable:{
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  myFuncTypeSign:{
+    type: String,
+    required: false,
+    default: null
+  },
+})
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+const dialogWidth = ref()
+if (props.basicFormWidth) {
+  dialogWidth.value = props.basicFormWidth + '%'
+} else {
+  dialogWidth.value = props.isBusiness ? '60%' : '40%'
+}
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+
+const formRef = ref() // 表单 Ref
+const formSchema = ref(props.formAllSchemas?.formSchema)
+const tableAllSchemas = ref(props.tableAllSchemas)
+const tableFormRules = ref(props.tableFormRules)
+
+// 列表-按钮
+// const buttondata = [
+//   defaultButtons.mainListEditBtn(null), // 编辑
+//   defaultButtons.mainListDeleteBtn(null)
+// ]
+// // 列表-操作按钮事件
+// const buttonTableClick = async (val, row) => {
+//   if (val == 'edit') {
+    
+//   } else if (val == 'delete') {
+   
+//   } else {
+//   }
+// }
+
+/** 弹层操作 */
+// formField form表单中的字段
+// searchField 查询列表中的字段
+// type 发起事件位置 type=tableForm 是明细中发起的 否则 为主表发起的
+// searchCondition 查询条件
+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 = (formField, searchField, val, type, row) => {
+  emit('searchTableSuccess', formField, searchField, val, formRef.value, type, row)
+}
+
+/** 打开弹窗 */
+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
+  resetForm()
+  // 修改时，设置数据
+  // 如果是从主表的详情页面进图添加子表，需要添加masterId，number参数
+  if (masterParmas) {
+    if (!row) {
+      if(props.myFuncTypeSign=='InspectionStage'){
+        row = {
+          masterId: masterParmas.masterId,
+          number: masterParmas.number,
+          dynamicModifyCode: masterParmas.number,
+        }
+      }else{
+        row = {
+          masterId: masterParmas.masterId,
+          number: masterParmas.number,
+        }
+      }
+    }
+  }
+  if (row?.id || row?.masterId) {
+    formLoading.value = true
+    try {
+      nextTick(() => {
+        formRef.value.setValues(row)
+      })
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open, formRef, opensearchTable, dialogVisible, formLoading }) // 提供 open 方法，用于打开弹窗
+
+/** 弹窗按钮 */
+let Butttondata:any = []
+if (props.isShowFooterButtton) {
+  Butttondata = [
+    defaultButtons.formSaveBtn(null), // 保存
+    defaultButtons.formCloseBtn(null) // 关闭
+  ]
+}
+if (props.footButttondata) {
+  Butttondata = props.footButttondata
+}
+
+/** 按钮事件 */
+const buttonBaseClick = (val) => {
+  // 扩展 按钮事件回调
+  if (props.footButttondata) {
+    emit('footButtonClick',val)
+  } 
+   // 保存
+  else if (val == 'save') {
+    submitForm()
+  }
+  // 关闭
+  else if (val == 'close') {
+    dialogVisible.value = false
+  }
+}
+
+/** 提交表单 */
+// const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+
+const tableFormRef = ref()
+const submitForm = async () => {
+  const elForm = unref(formRef)?.getElFormRef()
+  // 校验表单
+  if (!elForm) return
+  const valid = await elForm.validate()
+  if (!valid) return
+  // 针对主子表 明细校验
+  if (props.isBusiness) {
+    formLoading.value = true
+    if (formType.value == 'create') {
+      const validateForm = await tableFormRef.value.validateForm()
+      if (!validateForm && props.tableFormDataLength) {
+        if (props.tableData.length == 0) {
+          message.warning('请填写明细信息！')
+          formLoading.value = false
+          return
+        }
+        formLoading.value = false
+        return
+      }
+      // 主子表——提交请求
+      try {
+        const data = unref(formRef)?.formModel
+        emit('submitForm', formType.value, data)
+      } finally {
+      }
+    } else {
+      // 编辑
+      try {
+        const data = unref(formRef)?.formModel
+        emit('submitForm', formType.value, data)
+      } finally {
+      }
+    }
+  } else {
+    // 基础数据单表——提交请求
+    formLoading.value = true
+    try {
+      const data = unref(formRef)?.formModel
+      emit('success', formType.value, data)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  unref(formRef)?.resetFields()
+}
+
+// 传递给父类
+const emit = defineEmits([
+  'success',
+  'tableSelectionChange',
+  'tableFormSelectOnBlur',
+  'extendedButtonsClick',
+  'formSelectChange',
+  'formSelectvVisibleChange',
+  'tableSortChange',
+  'selectCallback',
+  'handleTableSelect',
+  'handleDeleteTable',
+  'handleAddTable',
+  'inpuFocus',
+  'searchTableSuccess',
+  'opensearchTable',
+  'submitForm',
+  'selectChange',
+  'selectChangeDetail',
+  'tableFormChange',
+  'buttonOperationClick',
+  'inputStringBlur',
+  'onChange',
+  'onBlur',
+  'inputNumberChange',
+  'formFormDateChange',
+  'footButtonClick'
+])
+//普通下拉改变事件
+const formSelectChange = (field, val, row) => {
+  emit('formSelectChange', field, val, row)
+}
+// 日期改变事件
+const formFormDateChange = (field, val,row, index) => {
+  emit('formFormDateChange', field, val,row, index)
+}
+const formSelectvVisibleChange = (field, val, row) => {
+  emit('formSelectvVisibleChange', field, val, row)
+}
+// 点击selection框
+const tableSelectionChange = (val) => {
+  emit('tableSelectionChange', val)
+}
+// tableform select bulr
+const tableFormSelectOnBlur = (field, val, row, index) => {
+  emit('tableFormSelectOnBlur', field, val, row, index)
+}
+// 列表排序
+const tableSortChange = (column, prop, order) => {
+  emit('tableSortChange', column, prop, order)
+}
+
+// 数字输入-改变事件
+const inputNumberChange = (field, index, row, val) => {
+  emit('inputNumberChange', field, index, row, val)
+}
+//下拉框回显方法
+// const showSelect = (val, statusID) => {
+//   return getDictForStatusID(val, statusID)
+// }
+
+// 行点击
+const handleTableSelect = (row, column, event) => {
+  emit('handleTableSelect', row, column, event)
+}
+
+// 删除数据
+const handleDeleteTable = (row, index) => {
+  emit('handleDeleteTable', row, index,formRef.value)
+}
+// 添加数据
+const handleAddTable = () => {
+  if(props.isOpenSearchTable){
+    const tableFormKeys = {}
+    tableAllSchemas.value.tableFormColumns.forEach(item => {
+      tableFormKeys[item.field] = item.default ? item.default : ''
+    })
+    inpuFocus(tableAllSchemas.value.tableFormColumns[0],tableFormKeys,0)
+  }else{
+    emit('handleAddTable')
+  }
+  
+}
+// 输入框聚焦
+const inpuFocus = (headerItem, row, index) => {
+  opensearchTable(
+    headerItem.field,
+    headerItem.tableForm.searchField,
+    headerItem.tableForm.searchTitle,
+    headerItem.tableForm.searchAllSchemas,
+    headerItem.tableForm.searchPage,
+    headerItem.tableForm.searchCondition,
+    headerItem.tableForm.multiple,
+    'tableForm',
+    row
+  )
+}
+/**
+ * 监听改变事件
+ * @param field 当前操作字段
+ * @param cur 改变后值
+ */
+const onChange = (field, cur) => {
+  emit('onChange', field, cur)
+}
+
+/**
+ * 监听失焦事件
+ * @param field 当前操作字段
+ * @param e 
+ */
+const onBlur = (field, e) => {
+  emit('onBlur', field, e)
+}
+
+// 修改盘点类型
+const selectChange = (field, val) => {
+  emit('selectChange', field, val)
+}
+// 修改盘点范围类型
+const selectChangeDetail = (field, val,formSchema) => {
+  formSchema.value = ''
+  emit('selectChangeDetail', field, val)
+}
+
+
+const tableFormChange = (field, val, row) => {
+  emit('tableFormChange', field, val, row)
+}
+
+const buttonOperationClick = (row, label, index)=> {
+  emit("buttonOperationClick", row, label, index);
+}
+
+const inputStringBlur = (headerItem, row, index)=> {
+  emit("inputStringBlur", headerItem, row, index);
+}
+
+</script>
+<style lang="scss" scoped>
+.table {
+  border: 1px solid #dedede;
+  border-radius: 8px;
+  padding: 10px;
+  width: calc(100% - 32px);
+  display: flex;
+}
+::v-deep(.el-table__body) {
+  padding: 10px 0px;
+}
+::v-deep(.el-table--default .el-table__cell) {
+  padding: 2px 0px;
+  border: none;
+}
+
+::v-deep(.el-table td.el-table__cell .el-form-item__content) {
+  display: flex !important;
+  align-items: center !important;
+  justify-content: center !important;
+}
+::v-deep(.el-table td.el-table__cell div) {
+  overflow: visible;
+}
+
+::v-deep(.el-icon) {
+  display: block;
+}button
+.button {
+  > div {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    cursor: pointer;
+
+    > div {
+      margin-left: 6px;
+      text-decoration: underline;
+      color: #409eff;
+    }
+  }
+}
+</style>

src/components/Detail/src/Detail.vue

@@ -457,6 +457,7 @@ const formRef = ref()
 const titleNameRef = ref()
 const titleValueRef = ref()
 const openDetail = async (row: any, titleName: any, titleValue: any, tableName: any) => {
+  debugger
   titleNameRef.value = titleName
   titleValueRef.value = titleValue
   remarksData.data = {

src/components/Detail/src/DetailQms.vue

@@ -0,0 +1,846 @@
+<template>
+  <div>
+    <el-drawer
+      v-model="isShowDrawer"
+      title="详情"
+      direction="rtl"
+      size="80%"
+      v-loading="detailLoading"
+    >
+      <template #header>
+        <div class="font-size-18px">
+          {{ titleValueRef }} <span class="ml-20px font-size-16px">{{ titleNameRef }}</span>
+        </div>
+      </template>
+      <ContentWrap v-if="!isBasic">
+        <Descriptions
+          :data="detailData"
+          labelClassName="label-class-name"
+          label-align="left"
+          direction="vertical"
+          :column="8"
+          :schema="allSchemas.detailSchema"
+          :columns="2"
+          width="200px"
+        />
+      </ContentWrap>
+
+      <Tabs ref="tabRef" :tabsList="tabsList" :current="current" @change="change" />
+      <div class="flex">
+        <!-- 详情 -->
+        <ContentWrap class="w-[100%]" v-show="tabsList[current].label!='附件'&&tabsList[current].label!='备注'&&tabsList[current].label!='变更记录'">          <!-- 列表头部 -->
+          <TableHead
+            v-if="!isBasic"
+            :HeadButttondata="HeadButttondata"
+            :masterId="masterParmas.masterId"
+            @button-base-click="buttonBaseClick"
+            :routeName="routeName"
+            @searchFormClick="searchFormClick"
+            :allSchemas="detailAllSchemas"
+          />
+          <!-- 默认单表展现 -->
+          <Descriptions
+            v-if="isBasic && !tabsExtend"
+            :data="detailData"
+            :schema="allSchemas.detailSchema"
+            :columns="2"
+          />
+          <!-- 单表切换tabs 展现table -->
+          <Table
+            v-if="isBasic && tabsExtend"
+            :columns="detailAllSchemasRef.tableColumns"
+            :data="tableObjectRef.tableList"
+            :loading="tableObjectRef.loading"
+            :pagination="{ total: tableObjectRef.total }"
+            v-model:pageSize="tableObjectRef.pageSize"
+            v-model:currentPage="tableObjectRef.currentPage"
+          >
+            <!-- <template #action="{ row }">
+              <ButtonBase
+                :Butttondata="buttondata"
+                @button-base-click="buttonTableClick($event, row)"
+              />
+            </template> -->
+          </Table>
+          <Table
+            v-if="!isBasic && fromeWhere != 'countPlan'"
+            :columns="detailAllSchemasRef.tableColumns"
+            :data="tableObjectRef.tableList"
+            :loading="tableObjectRef.loading"
+            :pagination="{ total: tableObjectRef.total }"
+            v-model:pageSize="tableObjectRef.pageSize"
+            v-model:currentPage="tableObjectRef.currentPage"
+          >
+          <template #photos="{ row }">
+            <div v-for="(item,index) in row.photos.split(',')" :key="index" style="color:#409eff ; cursor: pointer;" @click="openImage(item)">{{ item }}</div>            </template>
+            <template #action="{ row }">
+              <ButtonBase
+                :Butttondata="buttondata"
+                @button-base-click="buttonTableClick($event, row)"
+              />
+            </template>
+          </Table>
+          <DetailTable
+            v-if="!isBasic && fromeWhere == 'countPlan' && isShowDrawer"
+            :columns="detailAllSchemasRef.tableColumns"
+            :data="tableObjectRef.tableList"
+            :allList="allList"
+            :countScopeType="countScopeType"
+            :key="updateKey"
+          >
+            <template #action="{ row }">
+              <ButtonBase
+                :Butttondata="buttondata"
+                @button-base-click="buttonTableClick($event, row)"
+              />
+            </template>
+          </DetailTable>
+        </ContentWrap>
+        <!-- 附件/备注/变更记录 -->
+        <ContentWrap class="w-[100%]" v-show="tabsList[current].label=='附件'||tabsList[current].label=='备注'||tabsList[current].label=='变更记录'" :style="{height:remarkHeight+'px'}">
+          <!-- 附件组件 -->
+          <ElScrollbar ref="scrollbar" :style="{height:(remarkHeight-40)+'px'}">
+            <Annex  v-show="tabsList[current].label=='附件'"
+              :annexData="annexData"
+              @handleAnnexSuccess="handleAnnexSuccess"
+              @deleteAnnexSuccess="deleteAnnexSuccess"
+              :upData="remarksData.data"
+            />
+            <!-- 备注组件 -->
+            <Remarks v-show="tabsList[current].label=='备注'"
+              :remarksData="remarksData"
+              class="mt-20px"
+              @remarksSubmitScuess="remarksSubmitScuess"
+            />
+            <!-- 变更记录组件 -->
+            <ChangeRecord v-show="tabsList[current].label=='变更记录'" :changeRecordData="changeRecordData" class="mt-20px" />
+          </ElScrollbar> 
+        </ContentWrap>
+      </div>
+    </el-drawer>
+    <!-- 表格弹窗 -->
+    <SearchTable ref="searchTableRef" @search-table-success="searchTableSuccess1" />
+    <!-- 表单弹窗：添加/修改 -->
+    <BasicForm
+      ref="formRef"
+      @success="submitForm"
+      :rules="detailAllSchemasRules"
+      :formAllSchemas="detailAllSchemas"
+      :isBusiness="false"
+      :apiUpdate="apiUpdate"
+      :apiCreate="apiCreate"
+      :fromeWhere="fromeWhere"
+      :isDetail="true"
+      @searchTableSuccess="searchTableSuccess"
+      :detailData="detailData"
+      @submitForm="submitForm"
+      @selectChangeDetail="selectChangeDetail"
+      :formTypeDetail="formTypeDetail"
+      :countPlanAllList="countPlanAllList"
+      @onChange="detailBasicFormOnChange"
+      @onBlur="onBlur"
+      @formFormDateChange="formFormDateChange"
+      :myFuncTypeSign="myFuncTypeSign"
+    />
+  </div>
+</template>
+
+<script lang="ts" setup>
+
+import Annex from '@/components/Annex/src/Annex.vue'
+import Remarks from '@/components/Remarks/src/Remarks.vue'
+import ChangeRecord from '@/components/ChangeRecord/src/ChangeRecord.vue'
+import Tabs from '@/components/Tabs/src/Tabs.vue'
+import * as RemarkApi from '@/api/wms/remark'
+import * as FileApi from '@/api/wms/file'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import BasicForm from '@/components/BasicForm/src/BasicFormQms.vue'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import DetailTable from '@/components/DetailTable/src/DetailTable.vue'
+import { SearchTable } from '@/components/SearchTable'
+
+defineOptions({ name: 'DetailQms' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+routeName.value = routeName.value.substring(0, routeName.value.length - 4) + 'Detail'
+const updateKey = ref(0)
+
+const props = defineProps({
+  // 标签参数
+  tabs: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 是否是基础数据 展现详情顶部表单
+  isBasic: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  // 表单，列表 相关信息
+  allSchemas: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 明细列表相关信息
+  detailAllSchemas: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  //  明细验证
+  detailAllSchemasRules: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 子表新增API
+  apiCreate: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 子表编辑API
+  apiUpdate: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 子表分页列表API
+  apiPage: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 子表删除API
+  apiDelete: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 子表新增修改校验
+  detailValidate: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 来源 countPlan盘点计划进入
+  fromeWhere: {
+    type: String,
+    required: false,
+    default: ''
+  },
+  // 获取接口列表集合
+  allList: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 盘点范围类型
+  countScopeType: {
+    type: Array,
+    required: false,
+    default: null
+  },
+  //盘点详情子表新增的时候判断盘点范围值显示输入框还是下拉框
+  formTypeDetail: {
+    type: String,
+    required: false,
+    default: 'InputString'
+  },
+  //盘点详情子表新增的时候判断盘点范围值的下拉列表
+  countPlanAllList: {
+    type: Array,
+    required: false,
+    default: null
+  },
+  // 详情列表扩展操作按钮
+  buttondataTable: {
+    type: Array,
+    required: false,
+    default: ()=>{
+      return []
+    }
+  },
+  // 针对基础数据tabs扩展 显示table列表 默认false
+  tabsExtend: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  // tableObject 数据过滤条件 针对 详情扩展标签页 传入不同条件
+  tableObjectExtend: {
+    type: Array,
+    required: false,
+    default: null
+  },
+  // 子列表 筛选 展示与隐藏 ，默认展示
+  detailButtonIsShowFilter:{
+    type: Boolean,
+    required: false,
+    default: true
+  },
+  // 子列表 新增 展示与隐藏 ，默认展示
+  detailButtonIsShowAdd:{
+    type: Boolean,
+    required: false,
+    default: true
+  },
+  // 子列表 编辑 展示与隐藏 ，默认展示
+  detailButtonIsShowEdit:{
+    type: Boolean,
+    required: false,
+    default: true
+  },
+  // 子列表 删除 展示与隐藏 ，默认展示
+  detailButtonIsShowDelete:{
+    type: Boolean,
+    required: false,
+    default: true
+  },
+  //是否直接展示搜索表单
+  isOpenSearchTable:{
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  //个性化功能标志
+  myFuncTypeSign:{
+    type: String,
+    required: false,
+    default: null
+  },
+})
+const isShowDrawer = ref(false)
+const detailLoading = ref(false)
+const myFuncTypeSign = props.myFuncTypeSign
+const tabsList = ref(JSON.parse(JSON.stringify(props.tabs ? props.tabs : '')))
+
+if (props.isBasic == true) {
+  if (tabsList.value && tabsList.value.length > 0) {
+    tabsList.value.unshift({
+      label: '详情',
+      prop: 'Detail'
+    })
+  }
+} else {
+  if (tabsList.value && tabsList.value.length > 0) {
+  } else {
+    tabsList.value = [
+      {
+        label: '明细',
+        prop: 'Detail'
+      }
+    ]
+  }
+}
+
+const otherList = []
+
+tabsList.value = [...tabsList?.value,...otherList]
+
+if (!tabsList.value || tabsList.value && tabsList.value.length == otherList.length) {
+  tabsList.value.unshift({
+      label: '明细',
+      prop: 'Detail'
+  })
+}
+
+//  Tabs 
+const tabRef = ref()
+//滚动条
+const scrollbar = ref() 
+//附件 备注 变更记录 高度计算
+const remarkHeight = computed(() => { 
+  const tab = unref(tabRef)
+  const tabTop = tab?.$el.getBoundingClientRect().top
+  const tabHeight = tab?.$el.getBoundingClientRect().height
+  console.log('tabTop',tabTop)
+  const height = window.innerHeight - (tabTop) - (tabHeight) - 60
+  return height
+})
+
+
+// 附件默认数据
+const annexData = reactive({
+  annexList: []
+})
+
+// 备注数据
+const remarksData = reactive({
+  remarksList: [],
+  data: {}
+})
+
+// 变更记录默认数据
+const changeRecordData = reactive({
+  changeRecordList: []
+})
+const detailData = ref({}) //详情数据
+// 获取附件列表篇
+const getFileList = async () => {
+  detailLoading.value = true
+  try {
+    annexData.annexList = await FileApi.getFileList(remarksData.data)
+  } finally {
+    detailLoading.value = false
+  }
+}
+/** 添加附件 */
+const handleAnnexSuccess = () => {
+  getFileList()
+  getChangeRecordList()
+}
+// 删除附件成功之后所走的方法
+const deleteAnnexSuccess = async () => {
+  getFileList()
+  getChangeRecordList()
+}
+
+// Tabs当前选择
+const current = ref(0)
+const change = (item, index) => {
+  current.value = index
+  emit('changeTabs', item)
+  if(otherList.find(other=>other.label==item.label)){
+    // 附件/备注/变更记录 -- 点击回到顶部
+    scrollbar.value.scrollTo({ top: 0});
+  }
+      
+}
+
+//主表所需的参数
+const masterParmas = ref({
+  masterId: '', //主表id
+  number: '', //主表单据号
+  status: '', //主表状态 用于控制子表新增编辑按钮显示情况
+})
+
+// 列表头部按钮
+const HeadButttondata = ref()
+// 列表-操作按钮
+const buttondata = ref()
+
+/** 表格弹窗 */
+const initModel = (schema: FormSchema[], formModel: Recordable) => {
+  const model: Recordable = { ...formModel }
+  schema.map((v) => {
+    // 如果是hidden，就删除对应的值
+    if (v.hidden) {
+      delete model[v.field]
+    } else if (v.component && v.component !== 'Divider') {
+      const hasField = Reflect.has(model, v.field)
+      // 如果先前已经有值存在，则不进行重新赋值，而是采用现有的值
+      model[v.field] = hasField ? model[v.field] : v.value !== void 0 ? v.value : ''
+    }
+  })
+  return model
+}
+const searchTableRef = ref()
+// 如果需要直接打开表格数据表单数据
+const searchTableFormModel = ref<Recordable>({})
+if(props.isOpenSearchTable){
+  searchTableFormModel.value = initModel(props.detailAllSchemas.formSchema, unref(searchTableFormModel))
+}
+const searchTableFormType = ref('') // 表单的类型：create - 新增；update - 修改
+
+/** 打开弹窗 */
+const formRef = ref()
+const titleNameRef = ref()
+const titleValueRef = ref()
+const openDetail = async (row: any, titleName: any, titleValue: any, tableName: any) => {
+  titleNameRef.value = titleName
+  titleValueRef.value = titleValue
+  // 加载明细列表
+  if (!props.isBasic) {
+    // 设置主表id
+    masterParmas.value.masterId = row.id
+    masterParmas.value.number = row.number
+    masterParmas.value.status = row.status
+    tableObjectRef.value.params = {
+      masterId: row.id
+    }
+    await getList()
+  }
+  isShowDrawer.value = true
+  if (row) {
+    detailLoading.value = true
+    try {
+      detailData.value = row
+      // getRemarkList()
+      // getFileList()
+      // getChangeRecordList()
+      // 判断详情按钮是否显示
+      let detailButtonFilter: any = []
+      let detailButtonAdd: any = []
+      if (props.detailButtonIsShowFilter) {
+        // 筛选
+        detailButtonFilter = [
+          defaultButtons.defaultFilterBtn(null)
+        ]
+      }
+      if (props.detailButtonIsShowAdd) {
+        // 新增
+        detailButtonAdd = [
+          defaultButtons.defaultAddBtn({
+            hide: isShowMainButton(row, ['1'])
+          })
+        ]
+      }
+      HeadButttondata.value = [...detailButtonFilter,...detailButtonAdd]
+
+      // 针对特殊处理 当业务是任务的 只显示筛选 正常情况下应在业务页面设置 后期再作优化
+      if (routeName.value.indexOf('Job') > -1) {
+        HeadButttondata.value = [
+          defaultButtons.defaultFilterBtn(null) // 筛选
+        ]
+      }
+
+      let detailButtonEdit: any = []
+      let detailButtonDelete: any = []
+      if (props.detailButtonIsShowEdit) {
+        // 编辑
+        detailButtonEdit = [
+          defaultButtons.mainListEditBtn({
+            hide: isShowMainButton(row, ['1'])
+          })
+        ]
+      }
+      if (props.detailButtonIsShowDelete) {
+        // 删除
+        detailButtonDelete = [
+          defaultButtons.mainListDeleteBtn({
+            hide: isShowMainButton(row, ['1'])
+          })
+        ]
+      }
+      buttondata.value = [...detailButtonEdit,...detailButtonDelete,...props.buttondataTable]
+
+    } finally {
+      detailLoading.value = false
+    }
+  }
+}
+defineExpose({ openDetail, formRef }) // 提供 open 方法，用于打开弹窗
+
+// 获取备注列表
+const getRemarkList = async () => {
+  detailLoading.value = true
+  try {
+    remarksData.remarksList = await RemarkApi.getRemarkPage(remarksData.data)
+  } finally {
+    detailLoading.value = false
+  }
+}
+// 备注提交成功之后
+const remarksSubmitScuess = async (remark) => {
+  detailLoading.value = false
+  getRemarkList()
+  getChangeRecordList()
+}
+// 获取变更记录
+const getChangeRecordList = async () => {
+  changeRecordData.changeRecordList = await RemarkApi.getChangeRecordPage(remarksData.data)
+}
+
+const tableObjectRef = ref()
+const tableMethodsRef = ref()
+const detailAllSchemasRef = ref()
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: props.apiPage // 分页接口
+})
+
+tableObjectRef.value = tableObject
+tableMethodsRef.value = tableMethods
+detailAllSchemasRef.value = props.detailAllSchemas
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row, val) => {
+  // if (val.indexOf(row.status) > -1) {
+  //   return false
+  // } else {
+  //   return true
+  // }
+  return false
+}
+
+// 获得表格的各种操作
+const { getList } = tableMethodsRef.value
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') {
+    // 新增
+    if(props.isOpenSearchTable){
+      searchTableFormType.value = 'create'
+      // 如果需要直接打开表格数据
+      searchTableFormModel.value = Object.assign(unref(searchTableFormModel), {
+        masterId: masterParmas.value.masterId,
+        number: masterParmas.value.number
+      })
+      const item = props.detailAllSchemas.formSchema[0]
+      opensearchTable(
+          item.field, item?.componentProps?.searchField,
+          item?.componentProps?.searchTitle, 
+          item?.componentProps?.searchAllSchemas, 
+          item?.componentProps?.searchPage,
+          item?.componentProps?.searchCondition,
+          item?.componentProps?.multiple,
+          undefined,undefined
+      )
+    }else{
+      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)
+  }
+}
+
+// 直接打开表格数据 --> 对应：isOpenSearchTable === true
+const opensearchTable = (
+  formField,
+  searchField,
+  searchTitle,
+  searchAllSchemas,
+  searchPage,
+  searchCondition,
+  multiple,
+  type,
+  row
+) => {
+  const _searchCondition = {}
+  // 判断查询条件中，是否存在指向主表的数据
+  if (searchCondition && searchCondition.length > 0) {
+    // 转换筛选条件所需
+    for (var i=0; i< searchCondition.length; i++ ) {
+      // 查询条件为主表某字段，需要赋值主表数据，数据来源是详情的，赋值需要从row中获取
+      if (searchCondition[i].isMainValue) {
+        _searchCondition[searchCondition[i].key] = detailData
+          ? detailData.value[searchCondition[i].value]
+          : ''
+      }else{
+        _searchCondition[searchCondition[i].key] = searchCondition[i].value
+      }
+    }
+  }
+  console.log(searchCondition)
+  console.log(_searchCondition)
+  searchTableRef.value.open(
+    searchTitle,
+    searchAllSchemas,
+    searchPage,
+    formField,
+    searchField,
+    multiple,
+    type,
+    row,
+    _searchCondition
+  )
+}
+
+// 字段设置 更新主列表字段
+// const updataTableColumns = (val) => {
+//   detailAllSchemas.tableColumns.value = val
+// }
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') {
+    // 编辑
+    if(props.isOpenSearchTable){
+      searchTableFormType.value = 'update'
+      if (row?.id || row?.masterId) {
+        searchTableFormModel.value = Object.assign(unref(searchTableFormModel), row)
+      }
+      const item = props.detailAllSchemas.formSchema[0]
+      opensearchTable(
+          item.field, item?.componentProps?.searchField,
+          item?.componentProps?.searchTitle, 
+          item?.componentProps?.searchAllSchemas, 
+          item?.componentProps?.searchPage,
+          item?.componentProps?.searchCondition,
+          item?.componentProps?.multiple,
+          undefined,undefined
+      )
+    }else{
+      openForm('update', row)
+    }
+  } else if (val == 'delete') {
+    // 删除
+    handleDelete(row.id)
+  } else {
+    emit('tableFormButton',val, row)
+  }
+}
+/** 添加/修改操作 */
+const openForm = async (type: string, row?: number) => {
+  formRef.value.open(type, row, masterParmas.value)
+  emit('detailOpenForm', type, row, masterParmas.value)
+}
+// form 提交
+const submitForm = async (formType, data) => {
+  try {
+    // 子表新增编辑校验 如果业务需要子表提交校验 需在主页详情组件添加 detailValidate 参数及方法
+    const rs = (await props.detailValidate) ? await props.detailValidate(data) : true
+    if (!rs) return
+    if (formType === 'create') {
+      await props.apiCreate(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await props.apiUpdate(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    await getList()
+    updateKey.value += 1
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+
+const searchTableSuccess1 = (formField, searchField, val, formRef) => {
+  searchTableFormModel.value[formField] = val.map(item=>item[searchField]).join(',')
+  console.log('searchTableSuccess1',searchTableFormModel)
+  submitForm(searchTableFormType.value,searchTableFormModel.value)
+  emit('searchTableSuccessDetail', formField, searchField, val, formRef)
+}
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  emit('searchTableSuccessDetail', formField, searchField, val, formRef)
+}
+// 传递给父类
+const emit = defineEmits([
+  'searchTableSuccessDetail',
+  'changeTabs',
+  'selectChangeDetail',
+  'detailOpenForm',
+  'tableFormButton',
+  'openImage',
+  'onBlur',
+  'detailBasicFormOnChange',
+  'formFormDateChange'
+])
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await props.apiDelete(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+    updateKey.value += 1
+  } catch {}
+}
+// 筛选提交
+const searchFormClick = async (searchData) => {
+  const { tableObject, tableMethods } = useTable({
+    getListApi: props.apiPage // 分页接口
+  })
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+      ? searchData.filters
+      : [{ column: 'masterId', action: '==', value: masterParmas.value.masterId }]
+  }
+  detailAllSchemasRef.value = props.detailAllSchemas
+  tableObjectRef.value = tableObject
+  tableMethodsRef.value = tableMethods
+  tableObjectRef.value.tableList = []
+  const { getList } = tableMethods
+  await getList()
+  updateKey.value += 1
+  // tableObjectRef.value.params = {
+  //   isSearch: true,
+  //   filters: searchData.filters
+  //     ? searchData.filters
+  //     : [{ column: 'masterId', action: '==', value: masterParmas.value.masterId }]
+  // }
+  // getList() // 刷新当前列表
+}
+// 选择盘点类型的时候针对限值的操作
+const selectChangeDetail = (field, val) => {
+  emit('selectChangeDetail', field, val)
+}
+// 打开图片
+const openImage=(item)=>{
+  emit('openImage', item)
+}
+/**
+ * 监听改变事件
+ * @param field 当前操作字段
+ * @param cur 改变后值
+ */
+ const detailBasicFormOnChange = (field, cur) => {
+  emit('detailBasicFormOnChange', field, cur)
+}
+
+/**
+ * 监听失焦事件
+ * @param field 当前操作字段
+ * @param e 
+ */
+ const onBlur = (field, e) => {
+  emit('onBlur', field, e)
+}
+
+// 日期改变事件
+const formFormDateChange = (field, val,row, index) => {
+  emit('formFormDateChange', field, val,row, index)
+}
+//监视属性
+watch(
+  () => props.apiPage,
+  () => {
+    const { tableObject, tableMethods } = useTable({
+      getListApi: props.apiPage // 分页接口
+    })
+    tableObject.params.masterId = masterParmas.value.masterId
+    detailAllSchemasRef.value = props.detailAllSchemas
+    if (props.tableObjectExtend) {
+      props.tableObjectExtend.forEach(item => {
+        tableObject.params[item.key] = item.value
+      })
+    }
+    tableObjectRef.value = tableObject
+    tableMethodsRef.value = tableMethods
+    const { getList } = tableMethods
+    getList()
+  }
+)
+</script>
+<style lang="scss">
+.el-drawer__body {
+  background: #f5f5f5 !important;
+}
+
+::v-deep(.label-class-name) {
+  color: #dedede;
+}
+</style>
+<style scoped lang="scss"></style>

src/components/Dialog/src/Dialog.vue

@@ -12,7 +12,8 @@ const props = defineProps({
   width: propTypes.oneOfType([String, Number]).def('40%'),
   scroll: propTypes.bool.def(false), // 是否开启滚动条。如果是的话，按照 maxHeight 设置最大高度
   maxHeight: propTypes.oneOfType([String, Number]).def('400px'),
-  vLoading:propTypes.bool.def(false)
+  vLoading:propTypes.bool.def(false),
+  alignCenter:propTypes.bool.def(true),
 })
 
 const getBindValue = computed(() => {
@@ -87,6 +88,7 @@ const initDialog = () => {
     :close-on-click-modal="true"
     :fullscreen="isFullscreen"
     :width="width"
+    :align-center="alignCenter"
     destroy-on-close
     lock-scroll
     draggable

src/utils/dict.ts

@@ -292,6 +292,7 @@ export enum DICT_TYPE {
   EVALUATION_MODE = "evaluation_mode", // 评估模式
   INSPECTION_CHARACTERISTICS_FEATURE_TYPE  = "inspection_characteristics_feature_type", // 特征类型
   INSPECTION_CHARACTERISTICS_RESULT_ENTRY  = "inspection_characteristics_result_entry", // 结果录入方式
+  INSPECTION_SEVERITY = 'inspection_severity',//检验严重性
 
 
   // ========== 业务 - mes -gaojs ==========
@@ -302,6 +303,7 @@ export enum DICT_TYPE {
   OPERSTEP_COLLECT_TYPE='operstep_collect_type',//操作步骤采集方式
   REWORK_TYPE='rework_type',//工作类型:返工登记、返修登记
   REWORK_STATUS='rework_status',//返工返修状态:待返修，返修中，返修完成
-  REWORK_REPLACE_FLAG='rework_replace_flag',//是否有替换件
+  REWORK_REPLACE_FLAG = 'rework_replace_flag',//是否有替换件
+  
 
 }

src/views/qms/basicDataManage/dynamicRule/dynamicRule.data.ts

@@ -1,19 +1,27 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+import { string } from 'vue-types'
+
+const trueFalse = [{
+  label: '是',
+  value: true
+}, {
+  label: '否',
+  value: false
+}]
 
 // 表单校验
 export const DynamicRuleRules = reactive({
-  code: [required],
-  available: [required],
-  concurrencyStamp: [required]
+  describe: [required]
 })
 
 export const DynamicRule = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '编码',
-    field: 'code',
+    field: 'number',
     sort: 'custom',
-    isSearch: true
+    isSearch: true,
+    isForm: false,
   },
   {
     label: '描述',
@@ -22,84 +30,122 @@ export const DynamicRule = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true
   },
   {
-    label: '是否可用',
-    field: 'available',
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    isDetail: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+// 表单校验
+export const InspectionStageRules = reactive({
+  dynamicModifyCode: [required],
+  okTimes: [required],
+  okTimeStage: [required],
+  noOkTimes: [required],
+  noOkTimeStage: [required],
+  isStartStage: [required],
+  skipInspection: [required],
+  inspectionStringency: [required],
+})
+
+export const InspectionStage = useCrudSchemas(reactive<CrudSchema[]>([
+  
+  {
+    label: '描述',
+    field: 'describe',
     sort: 'custom',
     isSearch: true
   },
   {
-    label: '创建时间',
-    field: 'createTime',
+    label: 'OK次数',
+    field: 'okTimes',
     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
+    form: {
+      component: 'InputNumber',
+      value: 0
+    }
   },
   {
-    label: '删除时间',
-    field: 'deletionTime',
+    label: 'OK次数后的阶段',
+    field: 'okTimeStage',
     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'
-      }
+      component: 'InputNumber',
+      value: 0
     }
   },
   {
-    label: '删除者ID',
-    field: 'deleterId',
+    label: 'NOK次数',
+    field: 'noOkTimes',
     sort: 'custom',
-    isSearch: true
+    isSearch: true,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    }
   },
   {
-    label: '扩展属性',
-    field: 'extraProperties',
+    label: 'NOK次数后的阶段',
+    field: 'noOkTimeStage',
     sort: 'custom',
-    isSearch: true
+    isSearch: true,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    }
   },
   {
-    label: '并发乐观锁',
-    field: 'concurrencyStamp',
+    label: '是否是起始阶段',
+    field: 'isStartStage',
     sort: 'custom',
     isSearch: true,
+    formatter: (_: Recordable, __: TableColumn, cellValue: boolean) => {
+      return trueFalse.find((account) => account.value == cellValue)?.label
+    },
     form: {
-      component: 'InputNumber',
-      value: 0
+      component: 'Switch',
+      value:true
     }
   },
   {
-    label: '地点id',
-    field: 'siteId',
+    label: '是否略过检验',
+    field: 'skipInspection',
     sort: 'custom',
-    isSearch: true
+    isSearch: true,
+    formatter: (_: Recordable, __: TableColumn, cellValue: boolean) => {
+      return trueFalse.find((account) => account.value == cellValue)?.label
+    },
+    form: {
+      component: 'Switch',
+      value:true
+    }
+  },
+  {
+    label: '检验严格性',
+    field: 'inspectionStringency',
+    sort: 'custom',
+    isSearch: true,
+    dictType: DICT_TYPE.INSPECTION_SEVERITY,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    form: {
+      component: 'Select'
+    },
   },
   {
     label: '操作',
     field: 'action',
     isForm: false,
     table: {
-      width: 150,
+      width: 300,
       fixed: 'right'
-    }
+    },
+    isTableForm: false,
   }
 ]))

src/views/qms/basicDataManage/dynamicRule/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 #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.number)">
+          <span>{{ row.number }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
@@ -44,14 +44,39 @@
     @success="formsSuccess"
     :rules="DynamicRuleRules"
     :formAllSchemas="DynamicRule.allSchemas"
+    :tableAllSchemas="InspectionStage.allSchemas"
+    :tableFormRules="InspectionStageRules"
+    :tableData="tableData"
     :apiUpdate="DynamicRuleApi.updateDynamicRule"
     :apiCreate="DynamicRuleApi.createDynamicRule"
     @searchTableSuccess="searchTableSuccess"
-    :isBusiness="false"
+    :isBusiness="true"
+    @onChange="onChange"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @submitForm="submitForm"
+    :isSearchTableItem="true"
   />
 
   <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="true" :allSchemas="DynamicRule.allSchemas" />
+  <DetailQms
+    ref="detailRef" 
+    :isBasic="false" 
+    :allSchemas="DynamicRule.allSchemas"
+    :detailAllSchemas="InspectionStage.allSchemas" 
+    :detailAllSchemasRules="InspectionStageRules"
+    :apiCreate="InspectionStageApi.createInspectionStage"
+    :apiUpdate="InspectionStageApi.updateInspectionStage"
+    :apiPage="InspectionStageApi.getInspectionStagePage"
+    :apiDelete="InspectionStageApi.deleteInspectionStage" 
+    :detailValidate="detailValidate"
+    @searchTableSuccessDetail="searchTableSuccessDetail" 
+    :detailButtonIsShowEdit=true
+    :detailButtonIsShowAdd=true
+    :detailButtonIsShowDelete=true
+    @detailOpenForm="detailOpenForm"
+    myFuncTypeSign="InspectionStage"
+  />
 
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/basic/dynamic-rule/import" :importTemplateData="importTemplateData" @success="importSuccess" />
@@ -59,9 +84,11 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { DynamicRule,DynamicRuleRules } from './dynamicRule.data'
+import { DynamicRule,DynamicRuleRules,InspectionStage,InspectionStageRules } from './dynamicRule.data'
 import * as DynamicRuleApi from '@/api/qms/dynamicRule'
+import * as InspectionStageApi from '@/api/qms/inspectionStage'
 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'
@@ -73,6 +100,7 @@ const { t } = useI18n() // 国际化
 
 const route = useRoute() // 路由信息
 const routeName = ref()
+const tableData = ref([])
 routeName.value = route.name
 const tableColumns = ref(DynamicRule.allSchemas.tableColumns)
 
@@ -99,9 +127,9 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:dynamicRule:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:dynamicRule:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'wms:dynamicRule:export'}), // 导出
+  defaultButtons.defaultAddBtn({hasPermi:'qms:dynamic-rule:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'qms:dynamic-rule:import'}), // 导入
+  // defaultButtons.defaultExportBtn({hasPermi:'qms:dynamic-rule:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -133,8 +161,8 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'wms:dynamicRule:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:dynamicRule:delete'}), // 删除
+  defaultButtons.mainListEditBtn({hasPermi:'qms:dynamic-rule:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'qms:dynamic-rule:delete'}), // 删除
 ]
 
 // 列表-操作按钮事件
@@ -148,7 +176,8 @@ const buttonTableClick = async (val, row) => {
 
 /** 添加/修改操作 */
 const basicFormRef = ref()
-const openForm = (type: string, row?: any) => {
+const openForm = async (type: string, row?: any) => {
+  tableData.value = []
   basicFormRef.value.open(type, row)
 }
 
@@ -235,6 +264,52 @@ const searchFormClick = (searchData) => {
   getList() // 刷新当前列表
 }
 
+const tableFormKeys = {}
+InspectionStage.allSchemas.tableFormColumns.forEach((item) => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+
+// 添加明细
+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.inspectionStageDOList = tableData.value// 拼接子表数据参数
+  console.log(data.subList)
+  try {
+    if (formType === 'create') {
+      await DynamicRuleApi.createDynamicRule(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await DynamicRuleApi.updateDynamicRule(data)
+      message.success(t('common.updateSuccess'))
+    }
+    basicFormRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    basicFormRef.value.formLoading = false
+  }
+}
+
+const detailValidate = (data) => {
+  let tag = true;
+  return tag
+}
+
+const detailOpenForm = (type, row, masterParmas) => {
+  if(type='create'){
+   
+  }
+}
+
 /** 初始化 **/
 onMounted(async () => {
   getList()

src/views/qms/basicDataManage/inspectionPlan/addForm.vue

@@ -0,0 +1,864 @@
+<template>
+  <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">
+      <!-- <Form ref="formRefMain" :schema="formAllSchemasMain" :is-col="true" :rules="rules" /> -->
+      <el-form :model="data" label-width="auto" :rules="rules" ref="formMainRef">
+        <el-row>
+          <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="description">
+              <el-input v-model="data.description" placeholder="请填写描述" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="版本" prop="version">
+              <el-input v-model="data.version" placeholder="请填写版本" />
+            </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>
+          <!-- <Form
+            :ref="`formRefProcess`+index"
+            :schema="formAllSchemasProcess"
+            :is-col="true"
+            labelWidth="150px"
+            :rules="rules"
+          /> -->
+          <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.inspectionCode"
+                    placeholder="根据系统生成"
+                    :disabled="true"
+                  />
+                </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-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-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,
+                          '检验方法',
+                          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-input
+                      v-model="item.inspectionCharacteristicsBaseVO.dynamicUpdateCode"
+                      disabled
+                      placeholder="请选择采样过程编码"
+                    />
+                    <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-input
+                      v-model="item.inspectionCharacteristicsBaseVO.inspectionMethod"
+                      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-select
+                    v-model="item.inspectionCharacteristicsBaseVO.isCanUpdate"
+                    placeholder="请选择是否允许修改特征值"
+                  >
+                    <el-option
+                      v-for="item in isYesList"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    />
+                  </el-select>
+                </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"
+                  >
+                    <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-select
+                    v-model="item.inspectionCharacteristicsBaseVO.quantifyIsCapping"
+                    placeholder="请选择是否设定上限"
+                    @change="changeIsCapping"
+                  >
+                    <el-option
+                      v-for="item in isYesList"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    />
+                  </el-select>
+                </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" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  prop="inspectionCharacteristicsBaseVO.quantifyIsLowlimit"
+                  label="是否设定下限"
+                  v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
+                >
+                  <el-select
+                    v-model="item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit"
+                    placeholder="请选择是否设定下限"
+                    @change="changeLowlimit"
+                  >
+                    <el-option
+                      v-for="item in isYesList"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    />
+                  </el-select>
+                </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" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  prop="inspectionCharacteristicsBaseVO.quantifyIsTarget"
+                  label="是否设定目标值"
+                  v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
+                >
+                  <el-select
+                    v-model="item.inspectionCharacteristicsBaseVO.quantifyIsTarget"
+                    placeholder="请选择是否设定目标值"
+                    @change="changeIsTarget"
+                  >
+                    <el-option
+                      v-for="item in isYesList"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    />
+                  </el-select>
+                </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" />
+                </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" />
+                </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" />
+                </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,
+                          '选择集编码',
+                          SamplingProcess.allSchemas,
+                          SamplingProcessApi.getSamplingProcessPage,
+                          null,
+                          false,
+                          null,
+                          item
+                        )
+                      "
+                      ><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" />
+</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 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'
+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
+  }
+})
+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 data = ref({
+  code: '',
+  description: '',
+  version: '',
+  process: []
+})
+const isYesList = [
+  {
+    value: true,
+    label: '是'
+  },
+  {
+    value: false,
+    label: '否'
+  }
+]
+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({
+  description: [{ required: true, message: '请填写描述', trigger: 'blur' }],
+  version: [{ required: true, message: '请填写版本', trigger: 'blur' }],
+  inspectionCode: [{ required: true, message: '请选择检验方案模板编码', trigger: 'blur' }],
+  sequenceCode: [{ required: true, message: '请填写顺序号', trigger: 'blur' }],
+  inspectionCharCode: [{ required: true, message: '请选择检验特性编码', trigger: 'blur' }],
+  '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.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' }
+  ],
+  '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 = row
+    let list = await InspectionProcessPageApi.getListByTempleteCode(row.code)
+    list.forEach((item, index) => {
+      editableTabsValue.value = index + 1
+      item.name = index + 1
+    })
+    data.value.process = list
+  } else {
+    data.value = {
+      code: '',
+      description: '',
+      version: '',
+      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: '',
+          inspectionCharacteristicsBaseVO: {
+            describe: '',
+            inspectionMethodCode: '',
+            dynamicUpdateCode: '',
+            inspectionMethod: '',
+            isCanUpdate: '',
+            isDestructionInspection: '',
+            resultEntryMethod: '',
+            featureType: '',
+            quantifyIsCapping: '',
+            quantifyIsLowlimit: '',
+            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;
+    }
+    if (formType.value == 'create') {
+      // 主子表——提交请求
+      emit('submitForm', formType.value, data)
+    } else {
+      // 编辑
+      emit('submitForm', formType.value, data)
+    }
+  } 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)
+}
+const searchTableRef = ref()
+const opensearchTable = (
+  formField,
+  searchField,
+  searchTitle,
+  searchAllSchemas,
+  searchPage,
+  searchCondition,
+  multiple,
+  type,
+  row
+) => {
+  console.log(988, 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 = (formField, searchField, val, type, row) => {
+  console.log(row)
+  data.value.process.forEach((item) => {
+    if (item.description == row.description) {
+      item.inspectionCharacteristicsBaseVO[formField] = val[0].code
+    }
+  })
+
+  // row.inspectionCharacteristicsBaseVO.inspectionMethodCode = val[0].code
+  // 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>

src/views/qms/basicDataManage/inspectionPlan/index.vue

@@ -0,0 +1,197 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="InspectionTemplateMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="InspectionTemplateMain.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 #reqCode="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.reqCode)">
+          <span>{{ row.reqCode }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <AddForm
+    ref="basicFormRef"
+    basicFormWidth="80"
+    :formAllSchemasFeatures="InspectionTemplateFeatures.allSchemas"
+    :formAllSchemasProcess="InspectionTemplateProcess.allSchemas"
+    :formAllSchemasMain="InspectionTemplateMain.allSchemas"
+    :rules="InspectionTemplateRules"
+    @submitForm="submitForm"
+  />
+  <!-- 详情 -->
+  <Detail 
+    ref="detailRef" 
+    :isBasic="true" 
+    :allSchemas="InspectionTemplateMain.allSchemas" 
+    />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/agv-locationrelation/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import { InspectionTemplateMain,InspectionTemplateProcess,InspectionTemplateFeatures,InspectionTemplateRules } from './inspectionPlan.data'
+
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+import AddForm from './addForm.vue'
+import * as InspectionProcessPageApi from '@/api/qms/inspectionPlan'
+
+defineOptions({ name: 'AgvLocationrelation' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(InspectionTemplateMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: InspectionProcessPageApi.inspectionTemplatePage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:agv-locationrelation:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:agv-locationrelation:import'}), // 导入
+  // defaultButtons.defaultExportBtn({hasPermi:'wms:agv-locationrelation: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:'qms:inspectionTemplate:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'qms:inspectionTemplate: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 submitForm = async (formType,data) => {
+  console.log(data.value)
+  if (formType === 'create') {
+    await InspectionProcessPageApi.inspectionTemplateCreat(data.value)
+    message.success(t('common.createSuccess'))
+  } else {
+    await InspectionProcessPageApi.inspectionTemplateUpdate(data.value)
+    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, 'basicAgvLocationrelation')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await InspectionProcessPageApi.inspectionTemplateDelete(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+
+</script>
+./inspectionPlan.data

src/views/qms/basicDataManage/inspectionPlan/inspectionPlan.data.ts

@@ -0,0 +1,287 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+
+export const InspectionTemplateRules = reactive({
+  description: [
+    { required: true , message: '请填写描述', trigger: 'blur' }
+  ],
+  version: [
+    { required: true , message: '请填写版本', trigger: 'blur' }
+  ],
+  inspectionCode: [
+    { required: true, message: '请选择检验方案模板编码', trigger: 'blur' }
+  ],
+  sequenceCode: [
+    { required: true, message: '请填写顺序号', trigger: 'blur' }
+  ],
+  inspectionCharCode: [
+    { required: true, message: '请选择检验特性编码', trigger: 'blur' }
+  ],
+  describe: [
+    { required: true, message: '请填写描述', trigger: 'blur' }
+  ],
+  inspectionMethodCode: [
+    { required: true, message: '请选择检验方法编码', trigger: 'blur' }
+  ],
+  dynamicUpdateCode: [
+    { required: true, message: '请选择采样过程编码', trigger: 'blur' }
+  ],
+  inspectionMethod: [
+    { required: true, message: '请选择动态修改规则编码', trigger: 'blur' }
+  ],
+  isCanUpdate: [
+    { required: true, message: '请选择是否允许修改特征值', trigger: 'blur' }
+  ],
+  isDestructionInspection: [
+    { required: true, message: '请选择是否破坏性检验', trigger: 'blur' }
+  ],
+  resultEntryMethod: [
+    { required: true, message: '请选择结果录入方式', trigger: 'blur' }
+  ],
+  featureType: [
+    { required: true, message: '请选择特征类型', trigger: 'blur' }
+  ],
+  quantifyIsCapping: [
+    { required: true, message: '请选择是否设定上限', trigger: 'blur' }
+  ],
+  quantifyIsLowlimit: [
+    { required: true, message: '请选择是否设定下限', trigger: 'blur' }
+  ],
+  quantifyTarget: [
+    { required: true, message: '请输入目标值', trigger: 'blur' }
+  ],
+  quantifyCapping: [
+    { required: true, message: '请输入上限值', trigger: 'blur' }
+  ],
+  quantifyLowlimit: [
+    { required: true, message: '请输入下限值', trigger: 'blur' }
+  ],
+  quantifyquantifyUomLowlimit: [
+    { required: true, message: '请选择计量单位', trigger: 'blur' }
+  ],
+  quantifyDecimal: [
+    { required: true, message: '请输入小数位', trigger: 'blur' }
+  ],
+  quantifyQuantifyCode: [
+    { required: true, message: '请输入选择集编码', trigger: 'blur' }
+  ],
+})
+export const InspectionTemplateMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '编码',
+    field: 'code',
+    sort: 'custom',
+    form:{
+      componentProps:{
+        disabled:true,
+        placeholder:'系统自动获取'
+      }
+    }
+  },
+  {
+    label: '描述',
+    field: 'description',
+    sort: 'custom',
+  },{
+    label: '版本',
+    field: 'version',
+    sort: 'custom',
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+export const InspectionTemplateProcess = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '编码',
+    field: 'code',
+    sort: 'custom',
+    form:{
+      componentProps:{
+        disabled:true,
+        placeholder:'系统自动获取'
+      }
+    }
+  },
+  {
+    label: '描述',
+    field: 'description',
+    sort: 'custom',
+    isForm:false
+  },{
+    label: '检验方案模板编码',
+    field: 'inspectionCode',
+    sort: 'custom',
+  },{
+    label: '顺序号',
+    field: 'sequenceCode',
+  },{
+    label: '检验特性编码',
+    field: 'inspectionCharCode',
+    sort: 'custom',
+  }
+]))
+export const InspectionTemplateFeatures= useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '编码',
+    field: 'code',
+    sort: 'custom',
+    form:{
+      componentProps:{
+        disabled:true,
+        placeholder:'系统自动获取'
+      }
+    }
+  },
+  {
+    label: '描述',
+    field: 'describe',
+    sort: 'custom',
+  },{
+    label: '检验方法编码',
+    field: 'inspectionMethodCode',
+    sort: 'custom',
+  },{
+    label: '采样过程编码',
+    field: 'dynamicUpdateCode',
+    sort: 'custom',
+  },{
+    label: '动态修改规则编码',
+    field: 'inspectionMethod',
+    sort: 'custom',
+  },{
+    label: '是否允许修改特征值',
+    field: 'isCanUpdate',
+    sort: 'custom',
+    
+    form:{
+      component:'Select',
+      api: () => [{
+        value:0,
+        label:'是'
+      },{
+        value:1,
+        label:'否'
+      }],
+      componentProps:{
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'value'
+        }
+      }
+    }
+  },{
+    label: '是否破坏性检验',
+    field: 'isDestructionInspection',
+    sort: 'custom',
+    form:{
+      component:'Select',
+      api: () => [{
+        value:0,
+        label:'是'
+      },{
+        value:1,
+        label:'否'
+      }],
+      componentProps:{
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'value'
+        }
+      }
+    }
+  },{
+    label: '结果录入方式',
+    field: 'resultEntryMethod',
+    sort: 'custom',
+    dictType: DICT_TYPE.INSPECTION_CHARACTERISTICS_RESULT_ENTRY,
+    dictClass: 'string',
+    table: {
+      width: 150
+    },
+  },{
+    label: '特征类型',
+    field: 'featureType',
+    sort: 'custom',
+    dictType: DICT_TYPE.INSPECTION_CHARACTERISTICS_FEATURE_TYPE,
+    dictClass: 'string',
+    table: {
+      width: 150
+    },
+  },{
+    label: '是否设定上限',
+    field: 'quantifyIsCapping',
+    sort: 'custom',
+    form:{
+      component:'Select',
+      api: () => [{
+        value:0,
+        label:'是'
+      },{
+        value:1,
+        label:'否'
+      }],
+      componentProps:{
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'value'
+        }
+      }
+    }
+  },{
+    label: '是否设定下限',
+    field: 'quantifyIsLowlimit',
+    sort: 'custom',
+    form:{
+      component:'Select',
+      api: () => [{
+        value:0,
+        label:'是'
+      },{
+        value:1,
+        label:'否'
+      }],
+      componentProps:{
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'value'
+        }
+      }
+    }
+  },{
+    label: '目标值',
+    field: 'quantifyTarget',
+    sort: 'custom',
+  },{
+    label: '上限值',
+    field: 'quantifyCapping',
+    sort: 'custom',
+  },{
+    label: '下限值',
+    field: 'quantifyLowlimit',
+    sort: 'custom',
+  },{
+    label: '计量单位',
+    field: 'quantifyUom',
+    sort: 'custom',
+  },{
+    label: '小数位',
+    field: 'quantifyDecimal',
+    sort: 'custom',
+  },{
+    label: '选择集编码',
+    field: 'quantifyQuantifyCode',
+    sort: 'custom',
+    form:{
+      component:'Select'
+    }
+  }
+]))

src/views/qms/basicDataManage/inspectionStage/inspectionStage.data.ts

@@ -19,7 +19,7 @@ export const InspectionStageRules = reactive({
 export const InspectionStage = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '编码',
-    field: 'code',
+    field: 'number',
     sort: 'custom',
     isSearch: true
   },

src/views/qms/basicDataManage/inspectionTemplate/addForm.vue

@@ -576,10 +576,28 @@ 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)
     list.forEach((item, index) => {
       editableTabsValue.value = index + 1
       item.name = index + 1
+      // 编辑判断上限下限目标值是否必填
+      if(item.quantifyIsCapping){
+        rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = true
+      }else{
+        rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = false
+      }
+      if(item.quantifyIsLowlimit){
+        rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = true
+      }else{
+        rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = false
+      }
+      if(item.quantifyIsTarget){
+        rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = true
+      }else{
+        rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = false
+      }
+
     })
     data.value.process = list
   } else {
@@ -645,6 +663,7 @@ const buttonBaseClick1 = (val) => {
             featureType: '',
             quantifyIsCapping: '',
             quantifyIsLowlimit: '',
+            quantifyIsTarget: '',
             quantifyTarget: '',
             quantifyCapping: '',
             quantifyLowlimit: '',
@@ -691,6 +710,7 @@ const validateForm = (formRef) => {
       return false
     })
 }
+
 const submitForm = async () => {
   try {
     const validateForm1 = await validateForm(formProcessRef.value)
@@ -706,6 +726,13 @@ const submitForm = async () => {
       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)
@@ -730,6 +757,11 @@ if (props.footButttondata) {
 // 选择特征类型
 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 = (

src/views/qms/basicDataManage/inspectionTemplate/inspectionTemplate.data.ts

@@ -1,6 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
-import * as InspectionProcessPageApi from '@/api/qms/inspectionTemplate'
 
 // 表单校验
 

src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue

@@ -172,83 +172,86 @@ const butttondata = (row) => {
 const buttonTableClick = async (val, row) => {
   if (val == 'mainJobExe') { // 执行
     let aaa = {
-    "id": "1809190001478278226",
-    "requestNumber": "REC4620231212-0011",
-    "productionPlanNumber": "WP20231212-0002",
-    "workShopCode": "work2",
-    "team": "7",
-    "shift": "8",
-    "details": null,
-    "requestTime": 1702376849000,
-    "requestDueTime": null,
-    "status": "2",
-    "expiredTime": null,
-    "updateTime": 1702376904000,
-    "updater": "超级管理员",
-    "jobStageStatus": null,
-    "priority": null,
-    "priorityIncrement": null,
-    "departmentCode": "103",
-    "acceptUserId": "1",
-    "acceptTime": 1702376913000,
-    "completeUserId": "1",
-    "completeTime": 1702377036000,
-    "toWarehouseCode": null,
-    "toAreaCodes": "",
-    "fromAreaTypes": "WIP",
-    "toAreaTypes": "WIP",
-    "number": "JOB2120231212-0001",
-    "businessType": "ProductReceipt",
-    "remark": null,
-    "createTime": 1702376904000,
-    "creator": "超级管理员",
-    "autoComplete": "FALSE",
-    "allowModifyLocation": "FALSE",
-    "allowModifyQty": "TRUE",
-    "allowBiggerQty": "TRUE",
-    "allowSmallerQty": "TRUE",
-    "allowModifyInventoryStatus": "TRUE",
-    "allowContinuousScanning": "TRUE",
-    "allowPartialComplete": "TRUE",
-    "allowModifyBatch": "FALSE",
-    "allowModifyPackingNumber": "FALSE",
-    "inInventoryStatuses": "OK",
-    "outInventoryStatuses": "OK",
-    "concurrencyStamp": null,
+  "id": 8,
+  "requestNumber": "REQ1120240401-0001",
+  "productionPlanNumber": "WP20240401-0001",
+  "workShopCode": "work1",
+  "team": "T01",
+  "shift": "bc002",
+  "details": null,
+  "requestTime": 1711952813000,
+  "requestDueTime": null,
+  "status": "2",
+  "expiredTime": null,
+  "updateTime": 1711952823000,
+  "updater": "超级管理员",
+  "jobStageStatus": null,
+  "priority": null,
+  "priorityIncrement": null,
+  "departmentCode": "100",
+  "acceptUserId": "1",
+  "acceptTime": 1711952975000,
+  "completeUserId": null,
+  "completeTime": null,
+  "toWarehouseCode": null,
+  "toAreaCodes": "",
+  "fromAreaTypes": "WIP",
+  "toAreaTypes": "WIP",
+  "number": "JOB2120240401-0001",
+  "businessType": "ProductReceipt",
+  "remark": null,
+  "createTime": 1711952823000,
+  "creator": "超级管理员",
+  "autoComplete": "FALSE",
+  "allowModifyLocation": "FALSE",
+  "allowModifyQty": "TRUE",
+  "allowBiggerQty": "TRUE",
+  "allowSmallerQty": "TRUE",
+  "allowModifyInventoryStatus": "TRUE",
+  "allowContinuousScanning": "TRUE",
+  "allowPartialComplete": "TRUE",
+  "allowModifyBatch": "FALSE",
+  "allowModifyPackingNumber": "FALSE",
+  "inInventoryStatuses": "OK",
+  "outInventoryStatuses": "OK",
+  "concurrencyStamp": 2,
+  "type": "assemble",
       subList: [
-      {
-    "id": "1809190000003953999",
-    "productionLineCode": "line4",
-    "workStationCode": "station4",
+  {
+    "id": 8,
+    "productionLineCode": "work1-line1",
+    "workStationCode": "station1",
     "processCode": null,
-    "packingNumber": "PN-00113",
+    "packingNumber": "PN0401-000072",
     "containerNumber": null,
-    "batch": "20231212",
-    "produceDate": null,
-    "expireDate": null,
+    "batch": "20240401",
+    "produceDate": 1711987200000,
+    "expireDate": 1712073600000,
     "inventoryStatus": "OK",
+    "toLocationCode": "901",
     "woNumber": null,
     "woLine": null,
-    "packQty": 8,
-    "packUnit": "BOX",
-    "itemCode": "item01",
-    "itemName": "物料01",
-    "itemDesc1": "",
-    "itemDesc2": "",
-    "projectCode": "xm01",
-    "qty": 2,
+    "packQty": 5,
+    "packUnit": "Box-05",
+    "itemCode": "399.960-12",
+    "itemName": "远光内侧反射镜(镀铝)右灯",
+    "itemDesc1": null,
+    "itemDesc2": null,
+    "projectCode": null,
+    "qty": 5,
     "uom": "EA",
-    "number": "JOB2120231212-0001",
+    "number": "JOB2120240401-0001",
     "remark": null,
-    "createTime": 1702376904000,
-    "creator": "1",
+    "createTime": 1711952823000,
+    "creator": "超级管理员",
     "toOwnerCode": null,
-          handleQty: 10,
-          toPackingNumber: '12',
-          toContainerNumber: '001',
-          toBatch: '21',
-          toInventoryStatus: 'OK',
-          toLocationCode: 'H03',
+    "updateTime": 1711952823000,
+    "updater": "超级管理员",
+          handleQty: 5,
+          toPackingNumber: "PN0401-000072",
+          toContainerNumber: null,
+          toBatch: '20240401',
+          toInventoryStatus: 'OK'
         }
       ]
     }

src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue

@@ -171,83 +171,86 @@ const butttondata = (row) => {
 const buttonTableClick = async (val, row) => {
   if (val == 'mainJobExe') { // 执行
     let aaa = {
-    "id": "1809190001478278226",
-    "requestNumber": "REC4620231212-0011",
-    "productionPlanNumber": "WP20231212-0002",
-    "workShopCode": "work2",
-    "team": "7",
-    "shift": "8",
-    "details": null,
-    "requestTime": 1702376849000,
-    "requestDueTime": null,
-    "status": "2",
-    "expiredTime": null,
-    "updateTime": 1702376904000,
-    "updater": "超级管理员",
-    "jobStageStatus": null,
-    "priority": null,
-    "priorityIncrement": null,
-    "departmentCode": "103",
-    "acceptUserId": "1",
-    "acceptTime": 1702376913000,
-    "completeUserId": "1",
-    "completeTime": 1702377036000,
-    "toWarehouseCode": null,
-    "toAreaCodes": "",
-    "fromAreaTypes": "WIP",
-    "toAreaTypes": "WIP",
-    "number": "JOB2120231212-0001",
-    "businessType": "ProductReceipt",
-    "remark": null,
-    "createTime": 1702376904000,
-    "creator": "超级管理员",
-    "autoComplete": "FALSE",
-    "allowModifyLocation": "FALSE",
-    "allowModifyQty": "TRUE",
-    "allowBiggerQty": "TRUE",
-    "allowSmallerQty": "TRUE",
-    "allowModifyInventoryStatus": "TRUE",
-    "allowContinuousScanning": "TRUE",
-    "allowPartialComplete": "TRUE",
-    "allowModifyBatch": "FALSE",
-    "allowModifyPackingNumber": "FALSE",
-    "inInventoryStatuses": "OK",
-    "outInventoryStatuses": "OK",
-    "concurrencyStamp": null,
-      subList: [
-      {
-    "id": "1809190000003953999",
-    "productionLineCode": "line4",
-    "workStationCode": "station4",
-    "processCode": null,
-    "packingNumber": "PN-00113",
-    "containerNumber": null,
-    "batch": "20231212",
-    "produceDate": null,
-    "expireDate": null,
-    "inventoryStatus": "OK",
-    "woNumber": null,
-    "woLine": null,
-    "packQty": 8,
-    "packUnit": "BOX",
-    "itemCode": "item01",
-    "itemName": "物料01",
-    "itemDesc1": "",
-    "itemDesc2": "",
-    "projectCode": "xm01",
-    "qty": 2,
-    "uom": "EA",
-    "number": "JOB2120231212-0001",
-    "remark": null,
-    "createTime": 1702376904000,
-    "creator": "1",
-    "toOwnerCode": null,
-          handleQty: 10,
-          toPackingNumber: '12',
-          toContainerNumber: '001',
-          toBatch: '21',
-          toInventoryStatus: 'OK',
-          toLocationCode: 'H03',
+  "id": 8,
+  "requestNumber": "REQ1120240401-0001",
+  "productionPlanNumber": "WP20240401-0001",
+  "workShopCode": "work1",
+  "team": "T01",
+  "shift": "bc002",
+  "details": null,
+  "requestTime": 1711952813000,
+  "requestDueTime": null,
+  "status": "2",
+  "expiredTime": null,
+  "updateTime": 1711952823000,
+  "updater": "超级管理员",
+  "jobStageStatus": null,
+  "priority": null,
+  "priorityIncrement": null,
+  "departmentCode": "100",
+  "acceptUserId": "1",
+  "acceptTime": 1711952975000,
+  "completeUserId": null,
+  "completeTime": null,
+  "toWarehouseCode": null,
+  "toAreaCodes": "",
+  "fromAreaTypes": "WIP",
+  "toAreaTypes": "WIP",
+  "number": "JOB2120240401-0001",
+  "businessType": "ProductReceipt",
+  "remark": null,
+  "createTime": 1711952823000,
+  "creator": "超级管理员",
+  "autoComplete": "FALSE",
+  "allowModifyLocation": "FALSE",
+  "allowModifyQty": "TRUE",
+  "allowBiggerQty": "TRUE",
+  "allowSmallerQty": "TRUE",
+  "allowModifyInventoryStatus": "TRUE",
+  "allowContinuousScanning": "TRUE",
+  "allowPartialComplete": "TRUE",
+  "allowModifyBatch": "FALSE",
+  "allowModifyPackingNumber": "FALSE",
+  "inInventoryStatuses": "OK",
+  "outInventoryStatuses": "OK",
+  "concurrencyStamp": 2,
+  "type": "assemble",
+  "subList": [
+    {
+  "id": 8,
+  "productionLineCode": "work1-line1",
+  "workStationCode": "station1",
+  "processCode": null,
+  "packingNumber": "PN0401-000072",
+  "containerNumber": null,
+  "batch": "20240401",
+  "produceDate": 1711987200000,
+  "expireDate": 1712073600000,
+  "inventoryStatus": "OK",
+  "toLocationCode": "901",
+  "woNumber": null,
+  "woLine": null,
+  "packQty": 5,
+  "packUnit": "Box-05",
+  "itemCode": "399.960-12",
+  "itemName": "远光内侧反射镜(镀铝)右灯",
+  "itemDesc1": null,
+  "itemDesc2": null,
+  "projectCode": null,
+  "qty": 5,
+  "uom": "EA",
+  "number": "JOB2120240401-0001",
+  "remark": null,
+  "createTime": 1711952823000,
+  "creator": "超级管理员",
+  "toOwnerCode": null,
+  "updateTime": 1711952823000,
+  "updater": "超级管理员",
+          handleQty: 5,
+          toPackingNumber: "PN0401-000072",
+          toContainerNumber: null,
+          toBatch: '20240401',
+          toInventoryStatus: 'OK'
         }
       ]
     }

src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts

@@ -536,16 +536,16 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  // {
-  //   label: '操作',
-  //   field: 'action',
-  //   isDetail: false,
-  //   isForm: false,
-  //   table: {
-  //     width: 120,
-  //     fixed: 'right'
-  //   },
-  // }
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 120,
+      fixed: 'right'
+    },
+  }
 ]))
 
 //表单校验

src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue

@@ -70,7 +70,7 @@
       max-height="450px"
     >
       <Table
-        :columns="BackflushRecordDetailb.allSchemas.tableColumns"
+        :columns="ProductreceiptDetailb.allSchemas.tableColumns"
         :data="detatableDataBom.tableList"
         :loading="detatableDataBom.loading"
         :pagination="{
@@ -85,11 +85,11 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { ProductreceiptRecordMain,ProductreceiptRecordMainRules,ProductreceiptRecordDetail,ProductreceiptRecordDetailRules, BackflushRecordDetailb } from './productreceiptAssembleRecordMain.data'
+import { ProductreceiptRecordMain,ProductreceiptRecordMainRules,ProductreceiptRecordDetail,ProductreceiptRecordDetailRules, ProductreceiptDetailb } from './productreceiptAssembleRecordMain.data'
 import * as ProductreceiptRecordMainApi from '@/api/wms/productreceiptRecordMain'
 import * as ProductreceiptRecordDetailApi from '@/api/wms/productreceiptRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import * as BackflushRecordDetailbApi from '@/api/wms/backflushRecordDetailb'
+import * as ProductreceiptDetailbApi from '@/api/wms/productreceiptDetailb'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 
 // 装配收货记录主
@@ -118,7 +118,7 @@ const buttondataTable = ref([{
 const DialogTitle = ref('Bom信息')
 const bomModelVisible = ref(false)
 const { tableObject: detatableDataBom, tableMethods: detatableMethodsBom } =useTable({
-  getListApi: BackflushRecordDetailbApi.getBackflushRecordDetailbPage
+  getListApi: ProductreceiptDetailbApi.getProductreceiptDetailbPage
 })
 const { getList:getDetailListBom } = detatableMethodsBom
 

src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts

@@ -956,4 +956,117 @@ export const BackflushRecordDetailbRules = reactive({
   creator: [
     { required: true, message: '请输入创建者', trigger: 'blur' }
   ],
-})
+})
+
+// 表单校验
+export const ProductreceiptDetailbRules = reactive({
+  masterId: [required],
+})
+
+export const ProductreceiptDetailb = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '主表ID',
+    field: 'masterId',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '物品代码',
+    field: 'itemCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '物品名称',
+    field: 'itemName',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '外部零件号',
+    field: 'outsideItemCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '外部生产日期',
+    field: 'outsideProduceDate',
+    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: 'outsideSerialNumber',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    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',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))