diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index b9313b4c6..e162d86d9 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -7,131 +7,136 @@
     :vLoading="formLoading"
     @updateFullscreen="updateFullscreen"
   >
-  
-  <div 
-    style="overflow-y: auto;" :style="{'max-height':formHeight}">
-    <Form
-      ref="formRef"
-      :rules="rules"
-      :schema="formSchema"
-      :is-col="true"
-      @opensearchTable="opensearchTable"
-      @hiddenFilterButton="hiddenSearchTableFilterButton"
-      @changeDialogWidth="changeDialogWidth"
-      @clearSearchInput="clearSearchInput"
-      @onChange="onChange"
-      @onBlur="onBlur"
-      @onEnter="onEnter"
-    >
-      <template #crontab="formSchema1" v-if="fromeWhere == 'countPlan'">
-      
-        <crontab v-model="formSchema1.crontab" :disabled="formSchema?.find(item=>item.field == 'crontab')?.componentProps?.disabled "/>
-      </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="选择盘点范围值"
-          multiple
-          v-if="isDetail&& formTypeDetail =='Select'"
-        >
-          <el-option
-            v-for="dict in countPlanAllList"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
+    <div style="overflow-y: auto" :style="{ 'max-height': formHeight }">
+      <Form
+        ref="formRef"
+        :rules="rules"
+        :schema="formSchema"
+        :is-col="true"
+        @opensearchTable="opensearchTable"
+        @hiddenFilterButton="hiddenSearchTableFilterButton"
+        @changeDialogWidth="changeDialogWidth"
+        @clearSearchInput="clearSearchInput"
+        @onChange="onChange"
+        @onBlur="onBlur"
+        @onEnter="onEnter"
+      >
+        <template #crontab="formSchema1" v-if="fromeWhere == 'countPlan'">
+          <crontab
+            v-model="formSchema1.crontab"
+            :disabled="
+              formSchema?.find((item) => item.field == 'crontab')?.componentProps?.disabled
+            "
           />
-        </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%]"
-        :maxHeight = "490"
-        :tableFields="tableAllSchemas.tableFormColumns"
-        :tableData="tableData"
-        :tableFormRules="tableFormRules"
-        :isShowButton="isShowButton"
-        :isShowReduceButton="isShowReduceButton"
-        :isShowReduceButtonSelection="isShowReduceButtonSelection"
-        @handleAddTable="handleAddTable"
-        @handleDeleteTable="handleDeleteTable"
-        @tableSelectionChange="tableSelectionChange"
-        @tableSelectionDelete="tableSelectionDelete"
-        @extendedButtonsClick="extendedButtonsClick"
-        @formSelectChange="formSelectChange"
-        @formSelectvVisibleChange="formSelectvVisibleChange"
-        @tableSortChange="tableSortChange"
-        @selectCallback="selectCallback"
-        @handleTableSelect="handleTableSelect"
-        @inpuFocus="inpuFocus"
-        @buttonOperationClick="buttonOperationClick"
-        @inputStringBlur="inputStringBlur"
-        @inputNumberChange="inputNumberChange"
-        @tableFormSelectOnBlur="tableFormSelectOnBlur"
-        @formFormDateChange="formFormDateChange"
-      @clearInput='clearInput'
+        </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="选择盘点范围值"
+            multiple
+            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%]"
+          :maxHeight="490"
+          :tableFields="tableAllSchemas.tableFormColumns"
+          :tableData="tableData"
+          :tableFormRules="tableFormRules"
+          :isShowButton="isShowButton"
+          :isShowReduceButton="isShowReduceButton"
+          :isShowReduceButtonSelection="isShowReduceButtonSelection"
+          @handleAddTable="handleAddTable"
+          @handleDeleteTable="handleDeleteTable"
+          @tableSelectionChange="tableSelectionChange"
+          @tableSelectionDelete="tableSelectionDelete"
+          @extendedButtonsClick="extendedButtonsClick"
+          @formSelectChange="formSelectChange"
+          @formSelectvVisibleChange="formSelectvVisibleChange"
+          @tableSortChange="tableSortChange"
+          @selectCallback="selectCallback"
+          @handleTableSelect="handleTableSelect"
+          @inpuFocus="inpuFocus"
+          @buttonOperationClick="buttonOperationClick"
+          @inputStringBlur="inputStringBlur"
+          @inputNumberChange="inputNumberChange"
+          @tableFormSelectOnBlur="tableFormSelectOnBlur"
+          @formFormDateChange="formFormDateChange"
+          @clearInput="clearInput"
           @batchAdd="batchAdd"
           :routeName="routeName"
-          @visibleChange='visibleChange'
-      >
-      <template v-slot="{row}">
-        <slot :row="row"></slot>
-      </template>
-    </TableForm>
-    </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"
-      />
+          @visibleChange="visibleChange"
+        >
+          <template v-slot="{ row }">
+            <slot :row="row"></slot>
+          </template>
+        </TableForm>
+      </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>
-  </div>
-    <template #footer >
+    <template #footer>
       <slot name="foorter"></slot>
       <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick" />
     </template>
-  
   </Dialog>
-  <SearchTable ref="searchTableRef" :showSearchTableQueryFields="showSearchTableQueryFields" @searchTableSuccess="searchTableSuccess" >
+  <SearchTable
+    ref="searchTableRef"
+    :showSearchTableQueryFields="showSearchTableQueryFields"
+    @searchTableSuccess="searchTableSuccess"
+  >
     <template v-for="name in Object.keys($slots)" :key="name" #[name]>
-        <slot :name="name"></slot>
-      </template>
+      <slot :name="name"></slot>
+    </template>
   </SearchTable>
 </template>
 <script setup lang="ts">
@@ -140,9 +145,10 @@ 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'
-import { tableFormBlurVer,FormBlur,getListByBottonInput } from '@/api/wms/business/business'
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+import { tableFormBlurVer, FormBlur, getListByBottonInput } from '@/api/wms/business/business'
 import { isString } from 'min-dash'
+
 const props = defineProps({
   // 显示窗口宽度设置
   basicFormWidth: {
@@ -155,9 +161,9 @@ const props = defineProps({
     default: true
   },
   // 是否显示删除按钮--多选
-  isShowReduceButtonSelection:{
+  isShowReduceButtonSelection: {
     type: Boolean,
-    default: false,
+    default: false
   },
   // 是否显示tableForm 删除按钮
   isShowReduceButton: {
@@ -290,13 +296,13 @@ const props = defineProps({
     default: null
   },
   //是否直接展示搜索表单
-  isOpenSearchTable:{
+  isOpenSearchTable: {
     type: Boolean,
     required: false,
     default: false
   },
-  
-  fieldTableColumn:{
+
+  fieldTableColumn: {
     type: String,
     required: false,
     default: ''
@@ -306,36 +312,32 @@ const props = defineProps({
     formField:form中对应的field,
     tableField:searchtable中对应的field,
   }]*/
-  sumFormDataField:{
+  sumFormDataField: {
     type: Array,
     required: false,
     default: null
   },
-  sumFormDataByForm:{
-    type:Function,
+  sumFormDataByForm: {
+    type: Function,
     required: false,
     default: null
   },
-  sumFormDataByTableCustom:{
-    type:Function,
+  sumFormDataByTableCustom: {
+    type: Function,
     required: false,
     default: null
   },
-  showSearchTableQueryFields:{
+  showSearchTableQueryFields: {
     type: Array,
     required: false,
     default: []
   },
-  byCodespageApi: {
-    type: Function,
-    required: true,
-    default: null
-  }, //输入框校验是否正确的方法
-  byCodesParams: {
-    type: Object,
-    required: true,
-    default: null
-  } //输入框校验是否正确的参数
+  // 失去焦点之后是否进行校验，
+  isJiaoyan: {
+    type: Boolean,
+    required: false,
+    default: false
+  }
 })
 
 const { t } = useI18n() // 国际化
@@ -347,8 +349,8 @@ if (props.basicFormWidth) {
   dialogWidth.value = props.isBusiness ? '60%' : '40%'
 }
 const formHeight = ref('60vh')
-const updateFullscreen = (isFullscreen)=>{
-  formHeight.value = isFullscreen?'auto':'60vh'
+const updateFullscreen = (isFullscreen) => {
+  formHeight.value = isFullscreen ? 'auto' : '60vh'
 }
 
 const dialogVisible = ref(false) // 弹窗的是否展示
@@ -363,7 +365,7 @@ const tableFormRules = ref(props.tableFormRules)
 const route = useRoute() // 路由信息
 const routeName = ref('')
 routeName.value = route.name
-const isExecute = ref(true)//如果走失去焦点的方法只有为true的时候才能进行保存
+const isExecute = ref(true) //如果走失去焦点的方法只有为true的时候才能进行保存
 
 // 列表-按钮
 // const buttondata = [
@@ -373,9 +375,9 @@ const isExecute = ref(true)//如果走失去焦点的方法只有为true的时
 // // 列表-操作按钮事件
 // const buttonTableClick = async (val, row) => {
 //   if (val == 'edit') {
-    
+
 //   } else if (val == 'delete') {
-   
+
 //   } else {
 //   }
 // }
@@ -396,7 +398,7 @@ const opensearchTable = (
   multiple,
   type,
   row,
-  isConcatDetailSchemas=false,
+  isConcatDetailSchemas = false,
   searchDetailSchemas: any
 ) => {
   const _searchCondition = {}
@@ -404,8 +406,8 @@ const opensearchTable = (
   if (searchCondition && searchCondition.length > 0) {
     // 转换筛选条件所需
     let filters: any[] = []
-    for (var i=0; i< searchCondition.length; i++ ) {
-    // searchCondition.forEach((item) => {
+    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]
@@ -417,19 +419,26 @@ const opensearchTable = (
           : ''
         // 是否含有空参数情况
         let isNull = false
-        if (_searchCondition[searchCondition[i].key] == '' || _searchCondition[searchCondition[i].key] == undefined) {
+        if (
+          _searchCondition[searchCondition[i].key] == '' ||
+          _searchCondition[searchCondition[i].key] == undefined
+        ) {
           isNull = true
         }
         if (isNull) {
-          message.warning(searchCondition[i].message?searchCondition[i].message:'前置条件未选择！')
+          message.warning(
+            searchCondition[i].message ? searchCondition[i].message : '前置条件未选择！'
+          )
           return
         }
-      }else if(searchCondition[i].isTableRowValue){
-        if(searchCondition[i].required){
-          if (row[searchCondition[i].value] == '' ||row[searchCondition[i].value] == undefined) {
-                message.warning(searchCondition[i].message?searchCondition[i].message:'前置条件未选择！')
-                return
-            }
+      } else if (searchCondition[i].isTableRowValue) {
+        if (searchCondition[i].required) {
+          if (row[searchCondition[i].value] == '' || row[searchCondition[i].value] == undefined) {
+            message.warning(
+              searchCondition[i].message ? searchCondition[i].message : '前置条件未选择！'
+            )
+            return
+          }
         }
         row[searchCondition[i].value]
         //查询当前table表数据的值
@@ -439,10 +448,15 @@ const opensearchTable = (
         if (searchCondition[i].isSearch) {
           if (searchCondition[i].isFormModel) {
             //用formModel中的值
-            if(searchCondition[i].required){
-              if (formRef.value.formModel[searchCondition[i].value] == '' ||formRef.value.formModel[searchCondition[i].value] == undefined) {
-                  message.warning(searchCondition[i].message?searchCondition[i].message:'前置条件未选择！')
-                  return
+            if (searchCondition[i].required) {
+              if (
+                formRef.value.formModel[searchCondition[i].value] == '' ||
+                formRef.value.formModel[searchCondition[i].value] == undefined
+              ) {
+                message.warning(
+                  searchCondition[i].message ? searchCondition[i].message : '前置条件未选择！'
+                )
+                return
               }
             }
             filters.push({
@@ -450,14 +464,13 @@ const opensearchTable = (
               column: searchCondition[i].key,
               value: formRef.value.formModel[searchCondition[i].value]
             })
-          }else{
+          } else {
             filters.push({
               action: searchCondition[i].action,
               column: searchCondition[i].key,
               value: searchCondition[i].value
             })
           }
-          
         } else {
           _searchCondition[searchCondition[i].key] = searchCondition[i].value
         }
@@ -488,50 +501,76 @@ const opensearchTable = (
 }
 
 //修改 searchTable 弹窗宽度
-const changeDialogWidth = (width)=>{
+const changeDialogWidth = (width) => {
   searchTableRef.value.changeDialogWidth(width)
 }
-const hiddenSearchTableFilterButton = ()=>{
+const hiddenSearchTableFilterButton = () => {
   searchTableRef.value.hiddenFilterButton()
 }
-const clearSearchInput = (field)=>{
-  emit('clearSearchInput',field)
+const clearSearchInput = (field) => {
+  emit('clearSearchInput', field)
 }
 const sumFormDataByTable = () => {
-  if(props.sumFormDataField){
+  if (props.sumFormDataField) {
     const sumObject = {}
-    props.sumFormDataField.forEach(sumItem=>{
-      sumObject[sumItem?.formField]= props.tableData.reduce((prev, item) => prev + item[sumItem?.tableField],0)
+    props.sumFormDataField.forEach((sumItem) => {
+      sumObject[sumItem?.formField] = props.tableData.reduce(
+        (prev, item) => prev + item[sumItem?.tableField],
+        0
+      )
     })
-    nextTick(()=>{
+    nextTick(() => {
       formRef.value.setValues(sumObject)
     })
   }
 }
-watch(()=>props.tableData,() => {
-  sumFormDataByTable()
-  if(props?.sumFormDataByTableCustom&&unref(formRef)?.formModel&&props.tableData){
-    props?.sumFormDataByTableCustom(formRef,unref(formRef)?.formModel,props.tableData)
+watch(
+  () => props.tableData,
+  () => {
+    sumFormDataByTable()
+    if (props?.sumFormDataByTableCustom && unref(formRef)?.formModel && props.tableData) {
+      props?.sumFormDataByTableCustom(formRef, unref(formRef)?.formModel, props.tableData)
+    }
+  },
+  {
+    deep: true
   }
-  
-},{
-  deep:true
-})
+)
 let originFormModel = {}
-const updateOriginFormModel = (data)=>{
+const updateOriginFormModel = (data) => {
   originFormModel = JSON.parse(JSON.stringify(data))
 }
-const sumFormDataHandle1 = ()=>{
-  emit('sumFormDataHandle',formRef,unref(formRef)?.formModel,props.tableData,formType.value,originFormModel,updateOriginFormModel)
+const sumFormDataHandle1 = () => {
+  emit(
+    'sumFormDataHandle',
+    formRef,
+    unref(formRef)?.formModel,
+    props.tableData,
+    formType.value,
+    originFormModel,
+    updateOriginFormModel
+  )
 }
 
-watch(()=>unref(formRef)?.formModel,async () => {
-  if(props?.sumFormDataByForm&&unref(formRef)?.formModel){
-    props?.sumFormDataByForm(formRef,unref(formRef)?.formModel,props.tableData,formType.value,originFormModel,updateOriginFormModel,sumFormDataHandle1)
+watch(
+  () => unref(formRef)?.formModel,
+  async () => {
+    if (props?.sumFormDataByForm && unref(formRef)?.formModel) {
+      props?.sumFormDataByForm(
+        formRef,
+        unref(formRef)?.formModel,
+        props.tableData,
+        formType.value,
+        originFormModel,
+        updateOriginFormModel,
+        sumFormDataHandle1
+      )
+    }
+  },
+  {
+    deep: true
   }
-},{
-  deep:true
-})
+)
 
 // 弹层确定返回所选数据
 // val ： 弹层列表row 数据
@@ -540,11 +579,17 @@ const searchTableSuccess = (formField, searchField, val, type, row) => {
 }
 
 /** 打开弹窗 */
-const open = async (type: string, row?: any, masterParmas?: any, titleName?: any, alltitleName?: any) => {
+const open = async (
+  type: string,
+  row?: any,
+  masterParmas?: any,
+  titleName?: any,
+  alltitleName?: any
+) => {
   dialogVisible.value = true
-  if(alltitleName){
+  if (alltitleName) {
     dialogTitle.value = alltitleName
-  }else if (titleName) {
+  } else if (titleName) {
     dialogTitle.value = t('action.' + titleName)
   } else {
     dialogTitle.value = t('action.' + type)
@@ -574,22 +619,25 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
 }
 // 添加数据
 const handleAddTable = () => {
-  if(props.isOpenSearchTable){
+  if (props.isOpenSearchTable) {
     const tableFormKeys = {}
-    tableAllSchemas.value.tableFormColumns.forEach(item => {
+    tableAllSchemas.value.tableFormColumns.forEach((item) => {
       tableFormKeys[item.field] = item.default ? item.default : ''
     })
-    if(props.fieldTableColumn!=''){
-      inpuFocus(tableAllSchemas.value.tableFormColumns.find(item=>item.field==props.fieldTableColumn),tableFormKeys,0)
+    if (props.fieldTableColumn != '') {
+      inpuFocus(
+        tableAllSchemas.value.tableFormColumns.find((item) => item.field == props.fieldTableColumn),
+        tableFormKeys,
+        0
+      )
     }
-  }else{
+  } else {
     emit('handleAddTable')
   }
-  
 }
 
 /** 弹窗按钮 */
-let Butttondata:any = []
+let Butttondata: any = []
 if (props.isShowFooterButtton) {
   Butttondata = [
     defaultButtons.formSaveBtn(null), // 保存
@@ -604,9 +652,9 @@ if (props.footButttondata) {
 const buttonBaseClick = (val) => {
   // 扩展 按钮事件回调
   if (props.footButttondata) {
-    emit('footButtonClick',val)
-  } 
-   // 保存
+    emit('footButtonClick', val)
+  }
+  // 保存
   else if (val == 'save') {
     submitForm()
   }
@@ -708,15 +756,15 @@ const emit = defineEmits([
   'visibleChange'
 ])
 const visibleChange = (field, val, row, index) => {
-  emit('visibleChange',field, val, row, index)
+  emit('visibleChange', field, val, row, index)
 }
 //普通下拉改变事件
 const formSelectChange = (field, val, row) => {
   emit('formSelectChange', field, val, row)
 }
 // 日期改变事件
-const formFormDateChange = (field, val,row, index) => {
-  emit('formFormDateChange', field, val,row, index)
+const formFormDateChange = (field, val, row, index) => {
+  emit('formFormDateChange', field, val, row, index)
 }
 const formSelectvVisibleChange = (field, val, row) => {
   emit('formSelectvVisibleChange', field, val, row)
@@ -753,14 +801,11 @@ const handleTableSelect = (row, column, event) => {
 
 // 删除数据
 const handleDeleteTable = (row, index) => {
-  emit('handleDeleteTable', row, index,formRef.value)
+  emit('handleDeleteTable', row, index, formRef.value)
 }
 
-
-
 // 输入框聚焦
 const inpuFocus = (headerItem, row, index) => {
-  
   emit('inpuFocus', headerItem, row, index)
 
   opensearchTable(
@@ -778,7 +823,7 @@ const inpuFocus = (headerItem, row, index) => {
   )
 }
 const clearInput = (field, row, index) => {
-  emit('clearInput',field, row, index)
+  emit('clearInput', field, row, index)
 }
 /**
  * 监听改变事件
@@ -796,48 +841,31 @@ const onChange = (field, cur) => {
  */
 const onBlur = async (field, e) => {
   isExecute.value = false
-  if (
-    field == 'supplierCode' ||
-    field == 'itemCode' ||
-    field == 'productItemCode' ||
-    field == 'componentItemCode' ||
-    field == 'packUnit' ||
-    field == 'inPackUnit' ||
-    field == 'fromPackingNumber'
-  ) {
-    await FormBlur(
-      field,
-      e,
-      routeName.value,
-      formRef.value,
-      props.detailData,
-      formSchema.value,
-      (searchField, list) => {
-        emit('searchTableSuccess', field, searchField, list, formRef.value, 'form')
-      }
-    )
-  } else {
-    let formSchemaObj = formSchema.value.find((item) => item.field == field)
-    let searchCondition1 = formSchema.value.find((item) => item.field == field).componentProps
-      .searchCondition //获取data.ts参数信息
-    if (formSchemaObj?.componentProps?.enterSearch) {
+
+  let formSchemaObj = formSchema.value.find((item) => item.field == field)?.componentProps
+  if (formSchemaObj?.enterSearch) {
+    if (formSchemaObj.verificationPage) {
+      let searchCondition1 = formSchema.value.find((item) => item.field == field).componentProps
+        .searchCondition //获取data.ts参数信息
+      let verificationParams = formSchema.value.find((item) => item.field == field).componentProps
+        .verificationParams //获取失去焦点参数信息
+      console.log('走新方法啦')
       if (e && isString(e)) {
         let setV = {}
         setV[field] = ''
-        let obj = {}
-console.log(233,searchCondition1)
+        let params = {}
         // 循环参数设置参数为key：value格式
         if (searchCondition1 && searchCondition1.length > 0) {
           for (let i = 0; i < searchCondition1.length; i++) {
             if (searchCondition1[i].isMainValue) {
-              obj[searchCondition1[i].key] = formRef.value.formModel[searchCondition1[i].value]
+              params[searchCondition1[i].key] = formRef.value.formModel[searchCondition1[i].value]
                 ? formRef.value.formModel[searchCondition1[i].value]
                 : props.detailData
                 ? props.detailData[searchCondition1[i].value]
                 : ''
               // 是否含有空参数情况
               let isNull = false
-              if (obj[searchCondition1[i].key] == '' || obj[searchCondition1[i].key] == undefined) {
+              if (params[searchCondition1[i].key] == '' || params[searchCondition1[i].key] == undefined) {
                 isNull = true
               }
               if (isNull) {
@@ -865,120 +893,188 @@ console.log(233,searchCondition1)
                     }
                   }
                 }
-                  obj[searchCondition1[i].key] = searchCondition1[i].value
+                params[searchCondition1[i].key] = searchCondition1[i].value
               } else {
-                obj[searchCondition1[i].key] = searchCondition1[i].value
+                params[searchCondition1[i].key] = searchCondition1[i].value
               }
             }
           }
         }
-        if (!formSchemaObj?.componentProps.multiple && e.indexOf(',') > -1) {
+        // 循环参数设置参数为key：value格式
+        if (verificationParams && verificationParams.length > 0) {
+          for (let i = 0; i < verificationParams.length; i++) {
+              params[verificationParams[i].key] = e?.trim()
+          }
+        }
+        console.log(333,params)
+        if (!formSchemaObj?.multiple && e.indexOf(',') > -1) {
           message.alert('该输入框只能输入一条数据')
           formRef.value.setValues(setV)
           return
         }
-        if (props.byCodespageApi) {
-          let params = {}
-          if (props.byCodesParams) {
-            params = { ...props.byCodesParams, ...obj, codes: e }
-          } else {
-            params = { ...obj, codes: e }
+        await formSchemaObj.verificationPage(params).then((res) => {
+          let arr1 = e.split(',')
+          let list = ref([])
+          list.value = res
+          console.log(222, list.value)
+          if (list.value?.length == 0) {
+            message.alert('暂无数据')
+            formRef.value.setValues(setV)
+            return
           }
-          await props.byCodespageApi(params).then((res) => {
-            let arr1 = e.split(',')
-            let list = ref([])
-            list.value = res
-            if (list.value?.length == 0) {
-              message.alert('暂无数据')
-              formRef.value.setValues(setV)
-              return
-            }
-            if (arr1.length != list.value.length) {
-              let arr2 = list.value.map((item) => item.code)
-              let str = [
-                ...arr1.filter((item) => !arr2.includes(item)),
-                ...arr2.filter((item) => !arr1.includes(item))
-              ].join(',')
-              message.alert('代码' + str + '没有找到对应数据')
-              formRef.value.setValues(setV)
-              return
-            }
-            emit(
-              'searchTableSuccess',
-              field,
-              searchCondition1.searchField,
-              list,
-              formRef.value,
-              'form'
-            )
-          })
-        }
+          if (arr1.length != list.value.length) {
+            let arr2 = list.value.map((item) => item.code)
+            let str = [
+              ...arr1.filter((item) => !arr2.includes(item)),
+              ...arr2.filter((item) => !arr1.includes(item))
+            ].join(',')
+            message.alert('代码' + str + '没有找到对应数据')
+            formRef.value.setValues(setV)
+            return
+          }
+          // emit('searchTableSuccess', formField, searchField, list.value, formRef.value, 'form')
+          // callback(list.value)
+        })
+        // emit(
+        //   'onBlur',
+        //   field,
+        //   e,
+        //   formSchemaObj.componentProps.searchField,
+        //   formSchemaObj,
+        //   formRef.value,
+        //   'form',
+        //   obj
+        // )
       }
     } else {
-      emit('onBlur', field, e)
+      if (
+        field == 'supplierCode' ||
+        field == 'itemCode' ||
+        field == 'productItemCode' ||
+        field == 'componentItemCode' ||
+        field == 'packUnit' ||
+        field == 'inPackUnit' ||
+        field == 'fromPackingNumber'
+      ) {
+        await FormBlur(
+          field,
+          e,
+          routeName.value,
+          formRef.value,
+          props.detailData,
+          formSchema.value,
+          (searchField, list) => {
+            emit('searchTableSuccess', field, searchField, list, formRef.value, 'form')
+          }
+        )
+        return
+      }
     }
+  } else {
+    emit('onBlur', field, e)
   }
   isExecute.value = true
-  emit('onBlur', field, e)
 }
 
-
 // 批量增加
 const batchAdd = async (val) => {
   const row = {}
-    tableAllSchemas.value.tableFormColumns.forEach((item) => {
-      row[item.field] = item.default ? item.default : ''
-    })
-  const headerItem = tableAllSchemas.value.tableColumns.find((item) => item.field ==  props.fieldTableColumn)
-
-
-
-  await getListByBottonInput(headerItem, val,row,routeName.value,formRef.value,props.detailData,props.tableData,(list)=>{
-    emit('searchTableSuccess',headerItem.field,'itemCode',list, formRef.value,'tableForm',row)
+  tableAllSchemas.value.tableFormColumns.forEach((item) => {
+    row[item.field] = item.default ? item.default : ''
   })
+  const headerItem = tableAllSchemas.value.tableColumns.find(
+    (item) => item.field == props.fieldTableColumn
+  )
+
+  await getListByBottonInput(
+    headerItem,
+    val,
+    row,
+    routeName.value,
+    formRef.value,
+    props.detailData,
+    props.tableData,
+    (list) => {
+      emit(
+        'searchTableSuccess',
+        headerItem.field,
+        'itemCode',
+        list,
+        formRef.value,
+        'tableForm',
+        row
+      )
+    }
+  )
 }
 
 const inputStringBlur = async (headerItem, val, row, index) => {
   // isExecute.value = false
- await  tableFormBlurVer(headerItem,val,row,index,routeName.value,formRef.value,props.detailData,props.tableData,(searchField, list)=>{
-      emit('searchTableSuccess',headerItem.field,searchField,list, formRef.value,'tableForm',row,'blur',index)
-    })
-    
+  await tableFormBlurVer(
+    headerItem,
+    val,
+    row,
+    index,
+    routeName.value,
+    formRef.value,
+    props.detailData,
+    props.tableData,
+    (searchField, list) => {
+      emit(
+        'searchTableSuccess',
+        headerItem.field,
+        searchField,
+        list,
+        formRef.value,
+        'tableForm',
+        row,
+        'blur',
+        index
+      )
+    }
+  )
+
   // isExecute.value = true
 }
 
-
 /**
  * 回车事件
  * @param field 当前操作字段
- * @param e 
+ * @param e
  */
-const onEnter = (field,value, e) => {
-  emit('onEnter', field,value, e)
-} 
+const onEnter = (field, value, e) => {
+  emit('onEnter', field, value, e)
+}
 
 // 修改盘点类型
 const selectChange = (field, val) => {
   emit('selectChange', field, val)
 }
 // 修改盘点范围类型
-const selectChangeDetail = (field, val,formSchema) => {
+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 buttonOperationClick = (row, label, index) => {
+  emit('buttonOperationClick', row, label, index)
 }
 
-
-defineExpose({ open, formRef, opensearchTable, dialogVisible, formLoading ,handleAddTable,changeDialogWidth,searchTableRef,tableFormRef}) // 提供 open 方法，用于打开弹窗
-
+defineExpose({
+  open,
+  formRef,
+  opensearchTable,
+  dialogVisible,
+  formLoading,
+  handleAddTable,
+  changeDialogWidth,
+  searchTableRef,
+  tableFormRef
+}) // 提供 open 方法，用于打开弹窗
 </script>
 <style lang="scss" scoped>
 .table {
@@ -1007,8 +1103,8 @@ defineExpose({ open, formRef, opensearchTable, dialogVisible, formLoading ,handl
 
 ::v-deep(.el-icon) {
   display: block;
-}button
-.button {
+}
+button .button {
   > div {
     display: flex;
     align-items: center;
diff --git a/src/views/qms/inspectionJob/inspectionJobMain.data.ts b/src/views/qms/inspectionJob/inspectionJobMain.data.ts
index 51c9b2d86..cf3999056 100644
--- a/src/views/qms/inspectionJob/inspectionJobMain.data.ts
+++ b/src/views/qms/inspectionJob/inspectionJobMain.data.ts
@@ -444,7 +444,7 @@ export const InspectionJobMain = useCrudSchemas(
       isDetail: false,
       isForm: false,
       table: {
-        width: 250,
+        width: 300,
         fixed: 'right'
       }
     }
diff --git a/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts b/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts
index f2888fc7f..e8729c17f 100644
--- a/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts
@@ -32,6 +32,11 @@ export const Bom = useCrudSchemas(reactive<CrudSchema[]>([
         searchTitle: '物料基础信息', // 查询弹窗标题
         searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
         searchPage: ItembasicApi.selectItembasicPageToFgAndSemibasicPage, // 查询弹窗所需分页方法
+        verificationPage: ItembasicApi.getItemListByCodes, // 失去焦点校验输入框的数据内容存在
+        verificationParams: [{
+          key: 'codes',
+          value: '',
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -53,6 +58,11 @@ export const Bom = useCrudSchemas(reactive<CrudSchema[]>([
         searchTitle: '物料基础信息', // 查询弹窗标题
         searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
         searchPage: ItembasicApi.selectTypeToItembasic, // 查询弹窗所需分页方法
+        verificationPage: ItembasicApi.getItemListByCodes, // 失去焦点校验输入框的数据内容存在
+        verificationParams: [{
+          key: 'codes',
+          value: '',
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -105,7 +115,12 @@ export const Bom = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationPage: ProcessApi.getProcessByCodes, // 失去焦点校验输入框的数据内容存在
+        verificationParams: [{
+          key: 'codes',
+          value: '',
+        }], // 失去焦点校验参数
       }
     }
   },
diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
index 9111450eb..64ce34152 100644
--- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
@@ -319,8 +319,9 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     tableForm:{
+      disabled:true,
       multiple:true,
-      isInpuFocusShow: true,
+      // isInpuFocusShow: true,
       searchListPlaceholder: '请选择物料代码', // 输入框占位文本
       searchField: 'itemCode', // 查询弹窗赋值字段
       searchTitle: '库存余额信息', // 查询弹窗标题
diff --git a/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts b/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts
index 8c9d6859b..c11f0d6c3 100644
--- a/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts
@@ -4,980 +4,966 @@ import { dateFormatter } from '@/utils/formatTime'
 /**
  * @returns {Array} 发料任务主表
  */
-export const IssueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 180,
-      fixed: 'left'
-    },
-    sortSearchDefault:1,
-    isSearch: true,
-  },
-  {
-    label: '申请单号',
-    field: 'requestNumber',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false,
-  },
-  {
-    label: '供应商代码',
-    field: 'supplierCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '车间代码',
-    field: 'workShopCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '从仓库代码',
-    field: 'fromWarehouseCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '申请时间',
-    field: 'requestTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+export const IssueJobMain = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '单据号',
+      field: 'number',
+      sort: 'custom',
+      table: {
+        width: 180,
+        fixed: 'left'
+      },
+      sortSearchDefault: 1,
+      isSearch: true
+    },
+    {
+      label: '申请单号',
+      field: 'requestNumber',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false
+    },
+    {
+      label: '供应商代码',
+      field: 'supplierCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '车间代码',
+      field: 'workShopCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '从仓库代码',
+      field: 'fromWarehouseCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '申请时间',
+      field: 'requestTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
     },
-  },
-  {
-    label: '要求截止时间',
-    field: 'requestDueTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '要求截止时间',
+      field: 'requestDueTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      },
+      isTable: false
+    },
+    {
+      label: '过期时间',
+      field: 'expiredTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
     },
-    isTable: false,
-  },
-  {
-    label: '过期时间',
-    field: 'expiredTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
+    {
+      label: '状态',
+      field: 'status',
+      dictType: DICT_TYPE.JOB_STATUS,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 1
+    },
+    {
+      label: '到仓库代码',
+      field: 'toWarehouseCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '生产线代码',
+      field: 'detailProductionLineCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '工位代码',
+      field: 'detailWorkStationCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
     },
-  },
-  {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.JOB_STATUS,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:1,
-  },
-  {
-    label: '到仓库代码',
-    field: 'toWarehouseCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '生产线代码',
-    field: 'detailProductionLineCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '工位代码',
-    field: 'detailWorkStationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
 
-  {
-    label: '最后更新时间',
-    field: 'updateTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '最后更新时间',
+      field: 'updateTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
     },
-  },
-  {
-    label: '最后更新者',
-    field: 'updater',
-    sort: 'custom',
-    table: {
-      width: 150
+    {
+      label: '最后更新者',
+      field: 'updater',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
     },
-    isTable: false,
-
-  },
 
-  {
-    label: '优先级',
-    field: 'priority',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-    form: {
-      component: 'InputNumber',
-    }
-  },
-  {
-    label: '优先级增量',
-    field: 'priorityIncrement',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-    form: {
-      component: 'InputNumber',
-    }
-  },
-  {
-    label: '部门',
-    field: 'departmentCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '承接人用户名',
-    field: 'acceptUserId',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '承接时间',
-    field: 'acceptTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '优先级',
+      field: 'priority',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      form: {
+        component: 'InputNumber'
       }
     },
-  },
-  {
-    label: '完成人用户名',
-    field: 'completeUserId',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '完成时间',
-    field: 'completeTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '优先级增量',
+      field: 'priorityIncrement',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      form: {
+        component: 'InputNumber'
       }
     },
-  },
-  {
-    label: '从库区类型范围',
-    field: 'fromAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '到库区类型范围',
-    field: 'toAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '业务类型',
-    field: 'businessType',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '部门',
+      field: 'departmentCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '承接人用户名',
+      field: 'acceptUserId',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '承接时间',
+      field: 'acceptTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
     },
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '最后更新时间',
-    field: 'updateTime',
-    sort: 'custom',
-    isDetail: true,
-    isForm: false,
-    isTable: false,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '完成人用户名',
+      field: 'completeUserId',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '完成时间',
+      field: 'completeTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
-    }
-  },
-  {
-    label: '最后更新者',
-    field: 'updater',
-    isDetail: true,
-    isForm: false,
-    isTable: false,
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '从库区代码范围',
-    field: 'fromAreaCodes',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '到库区代码范围',
-    field: 'toAreaCodes',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  // {
-  //   label: '使用在途库',
-  //   field: 'useOnTheWayLocation',
-  //   dictType: DICT_TYPE.TRUE_FALSE,
-  //   dictClass: 'string',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   isTable: false,
-  //   form: {
-  //     component: 'Switch',
-  //     value: 'TRUE',
-  //     componentProps: {
-  //       inactiveValue: 'FALSE',
-  //       activeValue: 'TRUE'
-  //     }
-  //   }
-  // },
-  {
-    label: '自动完成',
-    field: 'autoComplete',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    },
+    {
+      label: '从库区类型范围',
+      field: 'fromAreaTypes',
+      dictType: DICT_TYPE.AREA_TYPE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
       }
-    }
-  },
-  {
-    label: '允许修改库位',
-    field: 'allowModifyLocation',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    },
+    {
+      label: '到库区类型范围',
+      field: 'toAreaTypes',
+      dictType: DICT_TYPE.AREA_TYPE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
       }
-    }
-  },
-  {
-    label: '允许修改数量',
-    field: 'allowModifyQty',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    },
+    {
+      label: '业务类型',
+      field: 'businessType',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '备注',
+      field: 'remark',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '创建时间',
+      field: 'createTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
-    }
-  },
-  {
-    label: '允许大于推荐数量',
-    field: 'allowBiggerQty',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    },
+    {
+      label: '创建者',
+      field: 'creator',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '最后更新时间',
+      field: 'updateTime',
+      sort: 'custom',
+      isDetail: true,
+      isForm: false,
+      isTable: false,
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
-    }
-  },
-  {
-    label: '允许小于推荐数量',
-    field: 'allowSmallerQty',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    },
+    {
+      label: '最后更新者',
+      field: 'updater',
+      isDetail: true,
+      isForm: false,
+      isTable: false,
+      table: {
+        width: 150
       }
-    }
-  },
-  {
-    label: '允许修改库存状态',
-    field: 'allowModifyInventoryStatus',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    },
+    {
+      label: '从库区代码范围',
+      field: 'fromAreaCodes',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '到库区代码范围',
+      field: 'toAreaCodes',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    // {
+    //   label: '使用在途库',
+    //   field: 'useOnTheWayLocation',
+    //   dictType: DICT_TYPE.TRUE_FALSE,
+    //   dictClass: 'string',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   isTable: false,
+    //   form: {
+    //     component: 'Switch',
+    //     value: 'TRUE',
+    //     componentProps: {
+    //       inactiveValue: 'FALSE',
+    //       activeValue: 'TRUE'
+    //     }
+    //   }
+    // },
+    {
+      label: '自动完成',
+      field: 'autoComplete',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
       }
-    }
-  },
-  {
-    label: '允许连续扫描',
-    field: 'allowContinuousScanning',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    },
+    {
+      label: '允许修改库位',
+      field: 'allowModifyLocation',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
       }
-    }
-  },
-  {
-    label: '允许部分完成',
-    field: 'allowPartialComplete',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    },
+    {
+      label: '允许修改数量',
+      field: 'allowModifyQty',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
       }
-    }
-  },
-  {
-    label: '允许修改批次',
-    field: 'allowModifyBatch',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    },
+    {
+      label: '允许大于推荐数量',
+      field: 'allowBiggerQty',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
       }
-    }
-  },
-  {
-    label: '允许修改箱码',
-    field: 'allowModifyPackingNumber',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    },
+    {
+      label: '允许小于推荐数量',
+      field: 'allowSmallerQty',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
+      }
+    },
+    {
+      label: '允许修改库存状态',
+      field: 'allowModifyInventoryStatus',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
+      }
+    },
+    {
+      label: '允许连续扫描',
+      field: 'allowContinuousScanning',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
+      }
+    },
+    {
+      label: '允许部分完成',
+      field: 'allowPartialComplete',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
+      }
+    },
+    {
+      label: '允许修改批次',
+      field: 'allowModifyBatch',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
+      }
+    },
+    {
+      label: '允许修改箱码',
+      field: 'allowModifyPackingNumber',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
+      }
+    },
+    {
+      label: '操作',
+      field: 'action',
+      isDetail: false,
+      isForm: false,
+      table: {
+        width: 120,
+        fixed: 'right'
       }
     }
-  },
-  {
-    label: '操作',
-    field: 'action',
-    isDetail: false,
-    isForm: false,
-    table: {
-      width: 120,
-      fixed: 'right'
-    },
-  }
-]))
+  ])
+)
 
 //表单校验
 export const IssueJobMainRules = reactive({
-  requestNumber: [
-    { required: true, message: '请选择申请单号', trigger: 'change' }
-  ],
-  fromWarehouseCode: [
-    { required: true, message: '请选择从仓库代码', trigger: 'change' }
-  ],
-  fromAreaTypes: [
-    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
-  ],
-  toWarehouseCode: [
-    { required: true, message: '请选择到仓库代码', trigger: 'change' }
-  ],
-  toAreaTypes: [
-    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
-  ],
-  requestTime: [
-    { required: true, message: '请输入申请时间', trigger: 'change' }
-  ],
-  requestDueTime: [
-    { required: true, message: '请输入要求截止时间', trigger: 'change' }
-  ],
-  status: [
-    { required: true, message: '请选择状态', trigger: 'change' }
-  ],
+  requestNumber: [{ required: true, message: '请选择申请单号', trigger: 'change' }],
+  fromWarehouseCode: [{ required: true, message: '请选择从仓库代码', trigger: 'change' }],
+  fromAreaTypes: [{ required: true, message: '请选择从库区类型范围', trigger: 'change' }],
+  toWarehouseCode: [{ required: true, message: '请选择到仓库代码', trigger: 'change' }],
+  toAreaTypes: [{ required: true, message: '请选择到库区类型范围', trigger: 'change' }],
+  requestTime: [{ required: true, message: '请输入申请时间', trigger: 'change' }],
+  requestDueTime: [{ required: true, message: '请输入要求截止时间', trigger: 'change' }],
+  status: [{ required: true, message: '请选择状态', trigger: 'change' }],
   // jobStageStatus: [
   //   { required: true, message: '请选择阶段状态', trigger: 'change' }
   // ],
-  priority: [
-    { required: true, message: '请输入优先级', trigger: 'blur' }
-  ],
-  priorityIncrement: [
-    { required: true, message: '请输入优先级增量', trigger: 'blur' }
-  ],
-  departmentCode: [
-    { required: true, message: '请输入部门', trigger: 'blur' }
-  ],
-  userPositionCode: [
-    { required: true, message: '请输入岗位', trigger: 'blur' }
-  ],
-  number: [
-    { required: true, message: '请输入单据号', trigger: 'blur' }
-  ],
-  businessType: [
-    { required: true, message: '请输入业务类型', trigger: 'blur' }
-  ],
-  createTime: [
-    { required: true, message: '请输入创建时间', trigger: 'blur' }
-  ],
-  creator: [
-    { required: true, message: '请输入创建者', trigger: 'blur' }
-  ],
+  priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }],
+  priorityIncrement: [{ required: true, message: '请输入优先级增量', trigger: 'blur' }],
+  departmentCode: [{ required: true, message: '请输入部门', trigger: 'blur' }],
+  userPositionCode: [{ required: true, message: '请输入岗位', trigger: 'blur' }],
+  number: [{ required: true, message: '请输入单据号', trigger: 'blur' }],
+  businessType: [{ required: true, message: '请输入业务类型', trigger: 'blur' }],
+  createTime: [{ required: true, message: '请输入创建时间', trigger: 'blur' }],
+  creator: [{ required: true, message: '请输入创建者', trigger: 'blur' }]
 })
 
 /**
  * @returns {Array} 发料任务子表
  */
-export const IssueJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '生产线代码',
-    field: 'productionLineCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    hiddenInMain:true,
-  },
-  {
-    label: '工位代码',
-    field: 'workStationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    hiddenInMain:true,
-  },
-  {
-    label: '在途库库位',
-    field: 'onTheWayLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    hiddenInMain:true,
-  },
-  {
-    label: '包装号',
-    field: 'packingNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch: true,
-    sortTableDefault:5,
-  },
-  {
-    label: '包装规格',
-    field: 'packUnit',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:5,
-  },
-  {
-    label: '包装数量',
-    field: 'packQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-    },
-    sortTableDefault:5,
-  },
-  {
-    label: '器具号',
-    field: 'containerNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain: true,
-    isTable:false,
-  },
-  {
-    label: '批次',
-    field: 'batch',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch: true,
-    sortSearchDefault:3,
-    sortTableDefault:4,
-  },
-  {
-    label: '库存状态',
-    field: 'inventoryStatus',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '采购订单号',
-    field: 'poNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    sortTableDefault:2,
-  },
-  {
-    label: '订单行',
-    field: 'poLine',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    sortTableDefault:2,
-  },
-  {
-    label: '从库位代码',
-    field: 'fromLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch: true,
-  },
-  {
-    label: '到库位代码',
-    field: 'toLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch: true,
-  },
-  {
-    label: '物料代码',
-    field: 'itemCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortSearchDefault:2,
-    isSearch: true,
-    sortTableDefault:3,
-  },
-  {
-    label: '物料名称',
-    field: 'itemName',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:3,
-  },
-  {
-    label: '物料描述1',
-    field: 'itemDesc1',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain: true,
-  },
-  {
-    label: '物料描述2',
-    field: 'itemDesc2',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain: true,
-  },
-  {
-    label: '项目代码',
-    field: 'projectCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain: true,
-  },
-  {
-    label: '数量',
-    field: 'qty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-    },
-    hiddenInMain: true,
-  },
-  {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:6,
-  },
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    hiddenInMain: true,
-  },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain: true,
-  },
-  {
-    label: '从货主代码',
-    field: 'fromOwnerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain: true,
-  },
-  {
-    label: '到货主代码',
-    field: 'toOwnerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain: true,
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    hiddenInMain: true,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+export const IssueJobDetail = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '物料代码',
+      field: 'itemCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortSearchDefault: 2,
+      isSearch: true,
+      sortTableDefault: 3
+    },
+    {
+      label: '物料名称',
+      field: 'itemName',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 3
+    },
+    {
+      label: '批次',
+      field: 'batch',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true,
+      sortSearchDefault: 3,
+      sortTableDefault: 4
+    },
+    {
+      label: '数量',
+      field: 'qty',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'InputNumber'
+      },
+      hiddenInMain: true
+    },
+    {
+      label: '计量单位',
+      field: 'uom',
+      dictType: DICT_TYPE.UOM,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 6
+    },
+    {
+      label: '包装规格',
+      field: 'packUnit',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 5
+    },
+    {
+      label: '包装数量',
+      field: 'packQty',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'InputNumber'
+      },
+      sortTableDefault: 5
+    },
+
+    {
+      label: '库存状态',
+      field: 'inventoryStatus',
+      dictType: DICT_TYPE.INVENTORY_STATUS,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      }
+    },
+    {
+      label: '从库位代码',
+      field: 'fromLocationCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true
+    },
+    {
+      label: '到库位代码',
+      field: 'toLocationCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true
+    },
+    {
+      label: '单据号',
+      field: 'number',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      hiddenInMain: true
+    },
+    {
+      label: '物料描述1',
+      field: 'itemDesc1',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true
+    },
+    {
+      label: '物料描述2',
+      field: 'itemDesc2',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true
+    },
+    {
+      label: '项目代码',
+      field: 'projectCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true
+    },
+    {
+      label: '从货主',
+      field: 'fromOwnerCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true
+    },
+    {
+      label: '到货主',
+      field: 'toOwnerCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true
+    },
+    {
+      label: '创建者',
+      field: 'creator',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true
+    },
+    {
+      label: '创建时间',
+      field: 'createTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      hiddenInMain: true,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
     },
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain: true,
-  },
-  {
-    label: '供应商计量数量',
-    field: 'supplierQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    hiddenInMain: true,
-    form: {
-      component: 'InputNumber',
-    }
-  },
-  {
-    label: '供应商计量单位',
-    field: 'supplierUom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    hiddenInMain:true,
-  },
 
+    {
+      label: '生产线代码',
+      field: 'productionLineCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      isDetail: false,
+      hiddenInMain: true
+    },
+    {
+      label: '工位代码',
+      field: 'workStationCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      isDetail: false,
+      hiddenInMain: true
+    },
+    {
+      label: '在途库库位',
+      field: 'onTheWayLocationCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      isDetail: false,
+      hiddenInMain: true
+    },
+    {
+      label: '包装号',
+      field: 'packingNumber',
+      sort: 'custom',
+      isTable: false,
+      table: {
+        width: 150
+      },
+      isSearch: false,
+      isDetail: false,
+      sortTableDefault: 5
+    },
+
+    {
+      label: '器具号',
+      field: 'containerNumber',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true,
+      isDetail: false,
+      isTable: false
+    },
 
-]))
+    // {
+    //   label: '采购订单号',
+    //   field: 'poNumber',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   hiddenInMain: true,
+    //   isDetail: false,
+    //   sortTableDefault: 2
+    // },
+    // {
+    //   label: '订单行',
+    //   field: 'poLine',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   hiddenInMain: true,
+    //   isDetail: false,
+    //   sortTableDefault: 2
+    // },
+
+    {
+      label: '备注',
+      field: 'remark',
+      sort: 'custom',
+      isDetail: false,
+      table: {
+        width: 150
+      },
+      hiddenInMain: true
+    },
+
+    {
+      label: '供应商计量数量',
+      field: 'supplierQty',
+      sort: 'custom',
+      isDetail: false,
+      table: {
+        width: 150
+      },
+      isTable: false,
+      hiddenInMain: true,
+      form: {
+        component: 'InputNumber'
+      }
+    },
+    {
+      label: '供应商计量单位',
+      field: 'supplierUom',
+      dictType: DICT_TYPE.UOM,
+      dictClass: 'string',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      isDetail: false,
+      hiddenInMain: true
+    }
+  ])
+)
 
 //表单校验
 export const IssueJobDetailRules = reactive({
diff --git a/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts b/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts
index f40cdef01..5e39ab54b 100644
--- a/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts
@@ -1,825 +1,801 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
 
 /**
  * @returns {Array} 发料记录主表
  */
-export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 180,
-      fixed: 'left'
-    },
-    sortSearchDefault:1,
-    isSearch: true
-  },
-  {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.JOB_STATUS,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:1,
-  },
-  {
-    label: '申请单号',
-    field: 'requestNumber',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false,
-  },
-  {
-    label: '任务单号',
-    field: 'jobNumber',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false,
-  },
-  {
-    label: '供应商代码',
-    field: 'supplierCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '车间代码',
-    field: 'workshopCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '出库事务类型',
-    field: 'outTransactionType',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '入库事务类型',
-    field: 'inTransactionType',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '执行时间',
-    field: 'executeTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+export const IssueRecordMain = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '单据号',
+      field: 'number',
+      sort: 'custom',
+      table: {
+        width: 180,
+        fixed: 'left'
+      },
+      sortSearchDefault: 1,
+      isSearch: true
+    },
+    {
+      label: '状态',
+      field: 'status',
+      dictType: DICT_TYPE.JOB_STATUS,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 1
+    },
+    {
+      label: '申请单号',
+      field: 'requestNumber',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false
+    },
+    {
+      label: '任务单号',
+      field: 'jobNumber',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false
+    },
+    {
+      label: '供应商代码',
+      field: 'supplierCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '车间代码',
+      field: 'workshopCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '出库事务类型',
+      field: 'outTransactionType',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '入库事务类型',
+      field: 'inTransactionType',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '执行时间',
+      field: 'executeTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
     },
-  },
-  {
-    label: '生效日期',
-    field: 'activeDate',
-    formatter: dateFormatter2,
-    detail: {
-      dateFormat: 'YYYY-MM-DD'
-    },
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width: '100%'},
-        type: 'date',
-        dateFormat: 'YYYY-MM-DD',
-        valueFormat: 'x',
+    {
+      label: '生效日期',
+      field: 'activeDate',
+      formatter: dateFormatter2,
+      detail: {
+        dateFormat: 'YYYY-MM-DD'
+      },
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'date',
+          dateFormat: 'YYYY-MM-DD',
+          valueFormat: 'x'
+        }
       }
     },
-  },
-  {
-    label: '申请时间',
-    field: 'requestTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '申请时间',
+      field: 'requestTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
     },
-  },
-  {
-    label: '截止时间',
-    field: 'dueTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '截止时间',
+      field: 'dueTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
     },
-  },
-  {
-    label: '部门',
-    field: 'departmentCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '接口类型',
-    field: 'interfaceType',
-    dictType: DICT_TYPE.INTERFACE_TYPE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '业务类型',
-    field: 'businessType',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: true,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '部门',
+      field: 'departmentCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '接口类型',
+      field: 'interfaceType',
+      dictType: DICT_TYPE.INTERFACE_TYPE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
       }
     },
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: true,
-  },
-  {
-    label: '最后更新时间',
-    field: 'updateTime',
-    sort: 'custom',
-    isDetail: true,
-    isForm: false,
-    isTable: false,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '业务类型',
+      field: 'businessType',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '备注',
+      field: 'remark',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+
+    {
+      label: '最后更新时间',
+      field: 'updateTime',
+      sort: 'custom',
+      isDetail: true,
+      isForm: false,
+      isTable: false,
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
-    }
-  },
-  {
-    label: '最后更新者',
-    field: 'updater',
-    isDetail: true,
-    isForm: false,
-    isTable: false,
-    table: {
-      width: 150
-    }
-  },
-  // {
-  //   label: '代码',
-  //   field: 'code',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
-  {
-    label: '从仓库代码',
-    field: 'fromWarehouseCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '从库区类型范围',
-    field: 'fromAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '从库区代码范围',
-    field: 'fromAreaCodes',
-    dictType: DICT_TYPE.AREA_TYPE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '到仓库代码',
-    field: 'toWarehouseCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '到库区类型范围',
-    field: 'toAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '到库区代码范围',
-    field: 'toAreaCodes',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  // {
-  //   label: '使用在途库',
-  //   field: 'useOnTheWayLocation',
-  //   dictType: DICT_TYPE.TRUE_FALSE,
-  //   dictClass: 'string',
-  //   isTable: false,
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     component: 'Switch',
-  //     value: 'TRUE',
-  //     componentProps: {
-  //       inactiveValue: 'FALSE',
-  //       activeValue: 'TRUE'
-  //     }
-  //   }
-  // },
-  {
-    label: '是否可用',
-    field: 'available',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    },
+    {
+      label: '最后更新者',
+      field: 'updater',
+      isDetail: true,
+      isForm: false,
+      isTable: false,
+      table: {
+        width: 150
+      }
+    },
+    // {
+    //   label: '代码',
+    //   field: 'code',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    // },
+    {
+      label: '从仓库代码',
+      field: 'fromWarehouseCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '从库区类型范围',
+      field: 'fromAreaTypes',
+      dictType: DICT_TYPE.AREA_TYPE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      }
+    },
+    {
+      label: '从库区代码范围',
+      field: 'fromAreaCodes',
+      dictType: DICT_TYPE.AREA_TYPE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
       }
+    },
+    {
+      label: '到仓库代码',
+      field: 'toWarehouseCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '到库区类型范围',
+      field: 'toAreaTypes',
+      dictType: DICT_TYPE.AREA_TYPE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      }
+    },
+    {
+      label: '到库区代码范围',
+      field: 'toAreaCodes',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    // {
+    //   label: '使用在途库',
+    //   field: 'useOnTheWayLocation',
+    //   dictType: DICT_TYPE.TRUE_FALSE,
+    //   dictClass: 'string',
+    //   isTable: false,
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   form: {
+    //     component: 'Switch',
+    //     value: 'TRUE',
+    //     componentProps: {
+    //       inactiveValue: 'FALSE',
+    //       activeValue: 'TRUE'
+    //     }
+    //   }
+    // },
+    {
+      label: '是否可用',
+      field: 'available',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
+      }
+    },
+    {
+      label: '包装号', //  子表数据 只是为了展示
+      field: 'fromPackingNumber',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 6
+    },
+    {
+      label: '批次', //  子表数据 只是为了展示
+      field: 'fromBatch',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 5
     }
-  },
-  {
-    label: '包装号',   //  子表数据 只是为了展示
-    field: 'fromPackingNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:6,
-  },
-  {
-    label: '批次',     //  子表数据 只是为了展示
-    field: 'fromBatch',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:5,
-  },
-]))
+  ])
+)
 
 //表单校验
 export const IssueRecordMainRules = reactive({
-  requestNumber: [
-    { required: true, message: '请选择申请单号', trigger: 'change' }
-  ],
-  fromWarehouseCode: [
-    { required: true, message: '请选择从仓库代码', trigger: 'change' }
-  ],
-  fromAreaTypes: [
-    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
-  ],
-  toWarehouseCode: [
-    { required: true, message: '请选择到仓库代码', trigger: 'change' }
-  ],
-  toAreaTypes: [
-    { required: true, message: '请选择库位类型范围', trigger: 'change' }
-  ],
-  outTransaction: [
-    { required: true, message: '请输入出库事务类型', trigger: 'blur' }
-  ],
-  inTransaction: [
-    { required: true, message: '请输入入库事务类型', trigger: 'blur' }
-  ],
-  executeTime: [
-    { required: true, message: '请输入执行时间', trigger: 'change' }
-  ],
-  activeDate: [
-    { required: true, message: '请输入生效日期', trigger: 'change' }
-  ],
-  available: [
-    { required: true, message: '请输入是否可用', trigger: 'blur' }
-  ],
-  departmentCode: [
-    { required: true, message: '请输入部门', trigger: 'blur' }
-  ],
-  interfaceType: [
-    { required: true, message: '请选择接口类型', trigger: 'change' }
-  ],
-  number: [
-    { required: true, message: '请输入单据号', trigger: 'blur' }
-  ],
-  businessType: [
-    { required: true, message: '请输入业务类型', trigger: 'blur' }
-  ],
-  createTime: [
-    { required: true, message: '请输入创建时间', trigger: 'blur' }
-  ],
-  creator: [
-    { required: true, message: '请输入创建者', trigger: 'blur' }
-  ],
+  requestNumber: [{ required: true, message: '请选择申请单号', trigger: 'change' }],
+  fromWarehouseCode: [{ required: true, message: '请选择从仓库代码', trigger: 'change' }],
+  fromAreaTypes: [{ required: true, message: '请选择从库区类型范围', trigger: 'change' }],
+  toWarehouseCode: [{ required: true, message: '请选择到仓库代码', trigger: 'change' }],
+  toAreaTypes: [{ required: true, message: '请选择库位类型范围', trigger: 'change' }],
+  outTransaction: [{ required: true, message: '请输入出库事务类型', trigger: 'blur' }],
+  inTransaction: [{ required: true, message: '请输入入库事务类型', trigger: 'blur' }],
+  executeTime: [{ required: true, message: '请输入执行时间', trigger: 'change' }],
+  activeDate: [{ required: true, message: '请输入生效日期', trigger: 'change' }],
+  available: [{ required: true, message: '请输入是否可用', trigger: 'blur' }],
+  departmentCode: [{ required: true, message: '请输入部门', trigger: 'blur' }],
+  interfaceType: [{ required: true, message: '请选择接口类型', trigger: 'change' }],
+  number: [{ required: true, message: '请输入单据号', trigger: 'blur' }],
+  businessType: [{ required: true, message: '请输入业务类型', trigger: 'blur' }],
+  createTime: [{ required: true, message: '请输入创建时间', trigger: 'blur' }],
+  creator: [{ required: true, message: '请输入创建者', trigger: 'blur' }]
 })
 
 /**
  * @returns {Array} 发料记录子表
  */
-export const IssueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '从包装号',
-    field: 'fromPackingNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch: true,
-    hiddenInMain: true
-  },
-  {
-    label: '到包装号',
-    field: 'toPackingNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch: true,
-    hiddenInMain: true
-  },
-  {
-    label: '包装规格',
-    field: 'packUnit',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:8,
-  },
-  {
-    label: '包装数量',
-    field: 'packQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:8,
-  },
-  {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:9,
-  },
-  {
-    label: '从批次',
-    field: 'fromBatch',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortSearchDefault:3,
-    isSearch: true,
-    hiddenInMain: true
-  },
-  {
-    label: '到批次',
-    field: 'toBatch',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortSearchDefault:4,
-    isSearch: true,
-    hiddenInMain: true
-  },
-  {
-    label: '库存状态',
-    field: 'inventoryStatus',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '采购订单号',
-    field: 'poNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    sortTableDefault:2,
-  },
-  {
-    label: '订单行',
-    field: 'poLine',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    sortTableDefault:3,
-  },
-  {
-    label: '生产线代码',
-    field: 'productionLineCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false
-  },
-  {
-    label: '工位代码',
-    field: 'workStationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false
-  },
-  {
-    label: '在途库库位',
-    field: 'onTheWayLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false
-  },
-
-  {
-    label: '供应商代码',
-    field: 'supplierCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-  },
-  {
-    label: '从货主代码',
-    field: 'fromOwnerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-  },
-  {
-    label: '从库位代码',
-    field: 'fromLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch: true,
-  },
-  {
-    label: '从库位组代码',
-    field: 'fromLocationGroupCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-  },
-  {
-    label: '从库区代码',
-    field: 'fromAreaCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-  },
-  {
-    label: '到货主代码',
-    field: 'toOwnerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-  },
-  {
-    label: '到库位代码',
-    field: 'toLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch: true,
-  },
-  {
-    label: '到库位组代码',
-    field: 'toLocationGroupCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-  },
-
-  {
-    label: '到库区代码',
-    field: 'toAreaCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-  },
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    hiddenInMain:true,
+export const IssueRecordDetail = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '物料代码',
+      field: 'itemCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true,
+      sortSearchDefault: 2,
+      sortTableDefault: 4
+    },
+    {
+      label: '物料名称',
+      field: 'itemName',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 4
+    },
+    {
+      label: '数量',
+      field: 'qty',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true
+    },
+    {
+      label: '计量单位',
+      field: 'uom',
+      dictType: DICT_TYPE.UOM,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 9
+    },
+    {
+      label: '物料描述1',
+      field: 'itemDesc1',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true
+    },
+    {
+      label: '物料描述2',
+      field: 'itemDesc2',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true
+    },
+    {
+      label: '从包装号',
+      field: 'fromPackingNumber',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true,
+      hiddenInMain: true
+    },
+    {
+      label: '到包装号',
+      field: 'toPackingNumber',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true,
+      hiddenInMain: true
+    },
+    {
+      label: '包装规格',
+      field: 'packUnit',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 8
+    },
+    {
+      label: '包装数量',
+      field: 'packQty',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 8
+    },
 
-  },
-  {
-    label: '物料代码',
-    field: 'itemCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch: true,
-    sortSearchDefault:2,
-    sortTableDefault:4,
-  },
-  {
-    label: '物料名称',
-    field: 'itemName',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:4,
-  },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
+    {
+      label: '从批次',
+      field: 'fromBatch',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortSearchDefault: 3,
+      isSearch: true,
+      hiddenInMain: true
+    },
+    {
+      label: '到批次',
+      field: 'toBatch',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortSearchDefault: 4,
+      isSearch: true,
+      hiddenInMain: true
+    },
+    {
+      label: '库存状态',
+      field: 'inventoryStatus',
+      dictType: DICT_TYPE.INVENTORY_STATUS,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      }
+    },
+    // {
+    //   label: '采购订单号',
+    //   field: 'poNumber',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   hiddenInMain: true,
+    //   sortTableDefault: 2
+    // },
+    // {
+    //   label: '订单行',
+    //   field: 'poLine',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   hiddenInMain: true,
+    //   sortTableDefault: 3
+    // },
+    // {
+    //   label: '生产线代码',
+    //   field: 'productionLineCode',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   isTable: false
+    // },
+    // {
+    //   label: '工位代码',
+    //   field: 'workStationCode',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   isTable: false
+    // },
+    // {
+    //   label: '在途库库位',
+    //   field: 'onTheWayLocationCode',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   isTable: false
+    // },
 
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    hiddenInMain:true,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    // {
+    //   label: '供应商代码',
+    //   field: 'supplierCode',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   isTable: false
+    // },
+    {
+      label: '从货主代码',
+      field: 'fromOwnerCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true
+    },
+    {
+      label: '从库位代码',
+      field: 'fromLocationCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true
+    },
+    {
+      label: '从库位组代码',
+      field: 'fromLocationGroupCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true
+    },
+    {
+      label: '从库区代码',
+      field: 'fromAreaCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true
+    },
+    {
+      label: '到货主代码',
+      field: 'toOwnerCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true
+    },
+    {
+      label: '到库位代码',
+      field: 'toLocationCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true
+    },
+    {
+      label: '创建者',
+      field: 'creator',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: true,
+      isDetail: false
+    },
+    {
+      label: '创建时间',
+      field: 'createTime',
+      formatter: dateFormatter,
+      isDetail: false,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: true,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
     },
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-  },
-  {
-    label: '物料描述1',
-    field: 'itemDesc1',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-  },
-  {
-    label: '物料描述2',
-    field: 'itemDesc2',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-  },
-  {
-    label: '项目代码',
-    field: 'projectCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-  },
-  {
-    label: '数量',
-    field: 'qty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
+    {
+      label: '到库位组代码',
+      field: 'toLocationGroupCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true
+    },
+
+    {
+      label: '到库区代码',
+      field: 'toAreaCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true
+    },
+    // {
+    //   label: '单据号',
+    //   field: 'number',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 180
+    //   },
+    //   hiddenInMain: true
+    // },
+
+    // {
+    //   label: '备注',
+    //   field: 'remark',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   hiddenInMain: true
+    // },
+    // {
+    //   label: '创建时间',
+    //   field: 'createTime',
+    //   formatter: dateFormatter,
+    //   detail: {
+    //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    //   },
+    //   sort: 'custom',
+    //   table: {
+    //     width: 180
+    //   },
+    //   hiddenInMain: true,
+    //   form: {
+    //     component: 'DatePicker',
+    //     componentProps: {
+    //       type: 'datetime',
+    //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+    //       valueFormat: 'x'
+    //     }
+    //   }
+    // },
+    // {
+    //   label: '创建者',
+    //   field: 'creator',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   hiddenInMain: true
+    // },
+
+    // {
+    //   label: '项目代码',
+    //   field: 'projectCode',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   hiddenInMain: true
+    // },
 
-  },
-  {
-    label: '接口类型',
-    field: 'interfaceType',
-    dictType: DICT_TYPE.INTERFACE_TYPE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-  },
-  {
-    label: '从器具号',
-    field: 'fromContainerNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-  },
-  {
-    label: '到器具号',
-    field: 'toContainerNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-  },
+    // {
+    //   label: '接口类型',
+    //   field: 'interfaceType',
+    //   dictType: DICT_TYPE.INTERFACE_TYPE,
+    //   dictClass: 'string',
+    //   isTable: true,
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   hiddenInMain: true
+    // },
+    // {
+    //   label: '从器具号',
+    //   field: 'fromContainerNumber',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   hiddenInMain: true
+    // },
+    // {
+    //   label: '到器具号',
+    //   field: 'toContainerNumber',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   hiddenInMain: true
+    // }
 
-  // {
-  //   label: '代码',
-  //   field: 'code',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
+    // {
+    //   label: '代码',
+    //   field: 'code',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    // },
 
-  // {
-  //   label: '任务明细ID',
-  //   field: 'jobDetailId',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
-]))
+    // {
+    //   label: '任务明细ID',
+    //   field: 'jobDetailId',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    // },
+  ])
+)
 
 //表单校验
 export const IssueRecordDetailRules = reactive({
diff --git a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
index 26d259db7..022e7787d 100644
--- a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
@@ -1,6 +1,6 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
-import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
 
 import * as ProductionlineApi from '@/api/wms/productionline'
 import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data'
@@ -24,1044 +24,1072 @@ const { t } = useI18n() // 国际化
 
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
 const queryParams = {
-  pageSize:10,
-  pageNo:1,
-  code:'IssueRequest'
+  pageSize: 10,
+  pageNo: 1,
+  code: 'IssueRequest'
 }
- const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
- const requestsettingData =data?.list[0]||{}
+const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+const requestsettingData = data?.list[0] || {}
 
- // 获取当前操作人的部门
- import { useUserStore } from '@/store/modules/user'
- import { TableColumn } from '@/types/table'
- const userStore = useUserStore()
- const userDept = userStore.userSelfInfo.dept
- // id 转str 否则form回显匹配不到
- userDept.id = userDept.id.toString()
- const userDeptArray:any = [userDept]
+// 获取当前操作人的部门
+import { useUserStore } from '@/store/modules/user'
+import { TableColumn } from '@/types/table'
+const userStore = useUserStore()
+const userDept = userStore.userSelfInfo.dept
+// id 转str 否则form回显匹配不到
+userDept.id = userDept.id.toString()
+const userDeptArray: any = [userDept]
 
 /**
  * @returns {Array} 发料申请主表
  */
-export const IssueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 180,
-      fixed: 'left'
-    },
-    isForm: false,
-    isSearch: true,
-    sortSearchDefault:1,
-  },
-  {
-    label: '车间代码',
-    field: 'workshopCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        enterSearch:true,
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择车间代码', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '车间信息', // 查询弹窗标题
-        searchAllSchemas: Workshop.allSchemas, // 查询弹窗所需类
-        searchPage: WorkshopApi.getWorkshopPage, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
+export const IssueRequestMain = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '单据号',
+      field: 'number',
+      sort: 'custom',
+      table: {
+        width: 180,
+        fixed: 'left'
+      },
+      isForm: false,
+      isSearch: true,
+      sortSearchDefault: 1
+    },
+    {
+      label: '车间代码',
+      field: 'workshopCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择车间代码', // 输入框占位文本
+          searchField: 'code', // 查询弹窗赋值字段
+          searchTitle: '车间信息', // 查询弹窗标题
+          searchAllSchemas: Workshop.allSchemas, // 查询弹窗所需类
+          searchPage: WorkshopApi.getWorkshopPage, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            }
+          ]
+        }
       }
-    }
-  },
-  {
-    label: '生产线代码',
-    field: 'productionLineCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    hiddenInMain:true,
-    tableForm:{
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
-      searchField: 'code', // 查询弹窗赋值字段
-      searchTitle: '生产线信息', // 查询弹窗标题
-      searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
-      searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
-      searchCondition: [{
-        key:'workshopCode',
-        value:'workshopCode',
-        message: '请填写车间代码！',
-        isMainValue: true
-      },{
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
-      }]
     },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
+    {
+      label: '生产线代码',
+      field: 'productionLineCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      hiddenInMain: true,
+      tableForm: {
+        isInpuFocusShow: true,
         searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '生产线信息', // 查询弹窗标题
         searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
         searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key:'workshopCode',
-          value:'workshopCode',
-          message: '请填写车间代码！',
-          isMainValue: true
-        },{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
+        searchCondition: [
+          {
+            key: 'workshopCode',
+            value: 'workshopCode',
+            message: '请填写车间代码！',
+            isMainValue: true
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+        ]
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+          searchField: 'code', // 查询弹窗赋值字段
+          searchTitle: '生产线信息', // 查询弹窗标题
+          searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
+          searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'workshopCode',
+              value: 'workshopCode',
+              message: '请填写车间代码！',
+              isMainValue: true
+            },
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            }
+          ]
+        }
       }
-    }
-  },
-  {
-    label: '工位代码',
-    field: 'workStationCode',
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    isTable:false,
-    hiddenInMain:true,
-    tableForm:{
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择工位代码', // 输入框占位文本
-      searchField: 'code', // 查询弹窗赋值字段
-      searchTitle: '工位信息', // 查询弹窗标题
-      searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
-      searchPage: WorkstationApi.getWorkstationPage, // 查询弹窗所需分页方法
-      searchCondition: [{
-        key:'productionLineCode',
-        value:'productionLineCode',
-        message: '请填写生产线代码！',
-        isMainValue: true
-      },{
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
-      }]
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        enterSearch:true,
-        isSearchList: true, // 开启查询弹窗
+    {
+      label: '工位代码',
+      field: 'workStationCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      hiddenInMain: true,
+      tableForm: {
+        isInpuFocusShow: true,
         searchListPlaceholder: '请选择工位代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '工位信息', // 查询弹窗标题
         searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
         searchPage: WorkstationApi.getWorkstationPage, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key:'productionLineCode',
-          value:'productionLineCode',
-          message: '请填写生产线代码！',
-          isMainValue: true
-        },{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
-      }
-    }
-  },
-  {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.REQUEST_STATUS,
-    dictClass: 'string',
-    isForm:false,
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:1,
-    form: {
-      value: '1',
-      componentProps: {
-        disabled: true
+        searchCondition: [
+          {
+            key: 'productionLineCode',
+            value: 'productionLineCode',
+            message: '请填写生产线代码！',
+            isMainValue: true
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+        ]
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择工位代码', // 输入框占位文本
+          searchField: 'code', // 查询弹窗赋值字段
+          searchTitle: '工位信息', // 查询弹窗标题
+          searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
+          searchPage: WorkstationApi.getWorkstationPage, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'productionLineCode',
+              value: 'productionLineCode',
+              message: '请填写生产线代码！',
+              isMainValue: true
+            },
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            }
+          ]
+        }
       }
-    }
-  },
-  {
-    label: '申请时间',
-    field: 'requestTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
     },
-    isTable:false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '状态',
+      field: 'status',
+      dictType: DICT_TYPE.REQUEST_STATUS,
+      dictClass: 'string',
+      isForm: false,
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 1,
+      form: {
+        value: '1',
+        componentProps: {
+          disabled: true
+        }
       }
     },
-    isForm: false,
-  },
-  {
-    label: '截止时间',
-    field: 'dueTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable:false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style:{width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '申请时间',
+      field: 'requestTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      },
+      isForm: false
+    },
+    {
+      label: '截止时间',
+      field: 'dueTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
     },
-  },
-  {
-    label: '从库区类型范围',
-    field: 'fromAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
-    dictClass: 'string',
-    isTable:false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false
-  },
-  {
-    label: '到库区类型范围',
-    field: 'toAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
-    dictClass: 'string',
-    isTable:false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false
-  },
-  {
-    label: '从库区代码范围',
-    field: 'fromAreaCodes',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    isForm: false
-  },
-  {
-    label: '到库区代码范围',
-    field: 'toAreaCodes',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    isForm: false
-  },
-  // {
-  //   label: '从仓库代码',
-  //   field: 'fromWarehouseCode',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   isTable:false,
-  //   form: {
-  //     // labelMessage: '信息提示说明！！！',
-  //     componentProps: {
-  //       isSearchList: true, // 开启查询弹窗
-  //       searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
-  //       searchField: 'code', // 查询弹窗赋值字段
-  //       searchTitle: '仓库信息', // 查询弹窗标题
-  //       searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
-  //       searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
-  //       searchCondition: [{
-  //         key: 'available',
-  //         value: 'TRUE',
-  //         isMainValue: false
-  //       }]
-  //     }
-  //   }
-  // },
-  // {
-  //   label: '到仓库代码',
-  //   field: 'toWarehouseCode',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   isTable:false,
-  //   form: {
-  //     componentProps: {
-  //       disabled: true
-  //     }
-  //   }
-  // },
-  {
-    label: '业务类型',
-    field: 'businessType',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    form: {
-      value: 'Issue',
-      componentProps: {
-        disabled: true
+    {
+      label: '从库区类型范围',
+      field: 'fromAreaTypes',
+      dictType: DICT_TYPE.AREA_TYPE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isForm: false
+    },
+    {
+      label: '到库区类型范围',
+      field: 'toAreaTypes',
+      dictType: DICT_TYPE.AREA_TYPE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isForm: false
+    },
+    {
+      label: '从库区代码范围',
+      field: 'fromAreaCodes',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      isForm: false
+    },
+    {
+      label: '到库区代码范围',
+      field: 'toAreaCodes',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      isForm: false
+    },
+    // {
+    //   label: '从仓库代码',
+    //   field: 'fromWarehouseCode',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   isTable:false,
+    //   form: {
+    //     // labelMessage: '信息提示说明！！！',
+    //     componentProps: {
+    //       isSearchList: true, // 开启查询弹窗
+    //       searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+    //       searchField: 'code', // 查询弹窗赋值字段
+    //       searchTitle: '仓库信息', // 查询弹窗标题
+    //       searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+    //       searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
+    //       searchCondition: [{
+    //         key: 'available',
+    //         value: 'TRUE',
+    //         isMainValue: false
+    //       }]
+    //     }
+    //   }
+    // },
+    // {
+    //   label: '到仓库代码',
+    //   field: 'toWarehouseCode',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   isTable:false,
+    //   form: {
+    //     componentProps: {
+    //       disabled: true
+    //     }
+    //   }
+    // },
+    {
+      label: '业务类型',
+      field: 'businessType',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      form: {
+        value: 'Issue',
+        componentProps: {
+          disabled: true
+        }
+      },
+      isForm: false
+    },
+    {
+      label: '部门',
+      field: 'departmentCode',
+      sort: 'custom',
+      isForm: false,
+      table: {
+        width: 150
+      },
+      isTable: false,
+      formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+        return userDeptArray.find((account) => account.id == cellValue)?.name
+      },
+      form: {
+        value: userDept.id,
+        component: 'Select',
+        api: () => userDeptArray,
+        componentProps: {
+          disabled: true,
+          optionsAlias: {
+            labelField: 'name',
+            valueField: 'id'
+          }
+        }
       }
     },
-    isForm: false
-  },
-  {
-    label: '部门',
-    field: 'departmentCode',
-    sort: 'custom',
-    isForm:false,
-    table: {
-      width: 150
-    },
-    isTable:false,
-    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-      return userDeptArray.find((account) => account.id == cellValue)?.name
-    },
-    form: {
-      value: userDept.id,
-      component: 'Select',
-      api: () => userDeptArray,
-      componentProps: {
-        disabled: true,
-        optionsAlias: {
-          labelField: 'name',
-          valueField: 'id'
+    {
+      label: '备注',
+      field: 'remark',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    // {
+    //   label: '使用在途库',
+    //   field: 'useOnTheWayLocation',
+    //   dictType: DICT_TYPE.TRUE_FALSE,
+    //   dictClass: 'string',
+    //   isTable:false,
+    //   isForm:false,
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   form: {
+    //     component: 'Switch',
+    //     value: 'TRUE',
+    //     componentProps: {
+    //       inactiveValue: 'FALSE',
+    //       activeValue: 'TRUE'
+    //     }
+    //   }
+    // },
+    {
+      label: '自动提交',
+      field: 'autoCommit',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      isForm: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: requestsettingData.autoCommit,
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE',
+          disabled: true
         }
       }
-    }
-  },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  // {
-  //   label: '使用在途库',
-  //   field: 'useOnTheWayLocation',
-  //   dictType: DICT_TYPE.TRUE_FALSE,
-  //   dictClass: 'string',
-  //   isTable:false,
-  //   isForm:false,
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     component: 'Switch',
-  //     value: 'TRUE',
-  //     componentProps: {
-  //       inactiveValue: 'FALSE',
-  //       activeValue: 'TRUE'
-  //     }
-  //   }
-  // },
-  {
-    label: '自动提交',
-    field: 'autoCommit',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable:false,
-    isForm:false,
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.autoCommit,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
+    {
+      label: '自动通过',
+      field: 'autoAgree',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isForm: false,
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: requestsettingData.autoAgree,
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE',
+          disabled: true
+        }
       }
-    }
-  },
-  {
-    label: '自动通过',
-    field: 'autoAgree',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isForm:false,
-    isTable:false,
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.autoAgree,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
+    {
+      label: '自动执行',
+      field: 'autoExecute',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isForm: false,
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: requestsettingData.autoExecute,
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE',
+          disabled: true
+        }
       }
-    }
-  },
-  {
-    label: '自动执行',
-    field: 'autoExecute',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isForm:false,
-    isTable:false,
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.autoExecute,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
+    {
+      label: '直接生成记录',
+      field: 'directCreateRecord',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isForm: false,
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: requestsettingData.directCreateRecord,
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE',
+          disabled: true
+        }
       }
-    }
-  },
-  {
-    label: '直接生成记录',
-    field: 'directCreateRecord',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isForm: false,
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.directCreateRecord,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
+    {
+      label: '创建时间',
+      field: 'createTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: true,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      },
+      isForm: false
+    },
+    {
+      label: '创建者',
+      field: 'creator',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: true,
+      isForm: false
+    },
+    {
+      label: '最后更新时间',
+      field: 'updateTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      },
+      isForm: false
+    },
+    {
+      label: '最后更新者',
+      field: 'updater',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      isForm: false
+    },
+    {
+      label: '操作',
+      field: 'action',
+      isDetail: false,
+      isForm: false,
+      table: {
+        width: 230,
+        fixed: 'right'
       }
     }
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable:true,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-    isForm: false,
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:true,
-    isForm: false,
-  },
-  {
-    label: '最后更新时间',
-    field: 'updateTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable:false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-    isForm: false,
-  },
-  {
-    label: '最后更新者',
-    field: 'updater',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    isForm: false,
-  },
-  {
-    label: '操作',
-    field: 'action',
-    isDetail: false,
-    isForm: false,
-    table: {
-      width: 230,
-      fixed: 'right'
-    },
-  },
-]))
+  ])
+)
 
 export const IssueRequestMainRules = reactive({
-  workshopCode: [
-    { required: true, message: '请选择车间代码', trigger: 'change' }
-  ],
-  productionLineCode: [
-    { required: true, message: '请选择生产线代码', trigger: 'change' }
-  ],
+  workshopCode: [{ required: true, message: '请选择车间代码', trigger: 'change' }],
+  productionLineCode: [{ required: true, message: '请选择生产线代码', trigger: 'change' }],
   // fromWarehouseCode: [
   //   { required: true, message: '请选择从仓库代码', trigger: 'change' }
   // ],
   // dueTime: [
   //   { required: true, message: '请选择截止时间', trigger: 'change' }
   // ],
-  remark:  [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
-  ],
+  remark: [{ max: 50, message: '不得超过50个字符', trigger: 'blur' }]
 })
 
 /**
  * @returns {Array} 发料申请子表
  */
-export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  // {
-  //   label: '生产线代码',
-  //   field: 'productionLineCode',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   isTable:false,
-  //   hiddenInMain:true,
-  //   tableForm:{
-  //     isInpuFocusShow: true,
-  //     searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
-  //     searchField: 'code', // 查询弹窗赋值字段
-  //     searchTitle: '生产线信息', // 查询弹窗标题
-  //     searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
-  //     searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
-  //     searchCondition: [{
-  //       key:'workshopCode',
-  //       value:'workshopCode',
-  //       message: '请填写车间代码！',
-  //       isMainValue: true
-  //     },{
-  //       key: 'available',
-  //       value: 'TRUE',
-  //       isMainValue: false
-  //     }]
-  //   },
-  //   form: {
-  //     // labelMessage: '信息提示说明！！！',
-  //     componentProps: {
-  //       isSearchList: true, // 开启查询弹窗
-  //       searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
-  //       searchField: 'code', // 查询弹窗赋值字段
-  //       searchTitle: '生产线信息', // 查询弹窗标题
-  //       searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
-  //       searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
-  //       searchCondition: [{
-  //         key:'workshopCode',
-  //         value:'workshopCode',
-  //         message: '请填写车间代码！',
-  //         isMainValue: true
-  //       },{
-  //         key: 'available',
-  //         value: 'TRUE',
-  //         isMainValue: false
-  //       }]
-  //     }
-  //   }
-  // },
-  // {
-  //   label: '工位代码',
-  //   field: 'workStationCode',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   isTable:false,
-  //   hiddenInMain:true,
-  //   tableForm:{
-  //     isInpuFocusShow: true,
-  //     searchListPlaceholder: '请选择工位代码', // 输入框占位文本
-  //     searchField: 'code', // 查询弹窗赋值字段
-  //     searchTitle: '工位信息', // 查询弹窗标题
-  //     searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
-  //     searchPage: WorkstationApi.getWorkstationPage, // 查询弹窗所需分页方法
-  //     searchCondition: [{
-  //       key:'productionLineCode',
-  //       value:'productionLineCode',
-  //       message: '请填写生产线代码！',
-  //       isMainValue: true
-  //     },{
-  //       key: 'available',
-  //       value: 'TRUE',
-  //       isMainValue: false
-  //     }]
-  //   },
-  //   form: {
-  //     // labelMessage: '信息提示说明！！！',
-  //     componentProps: {
-  //       isSearchList: true, // 开启查询弹窗
-  //       searchListPlaceholder: '请选择工位代码', // 输入框占位文本
-  //       searchField: 'code', // 查询弹窗赋值字段
-  //       searchTitle: '工位信息', // 查询弹窗标题
-  //       searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
-  //       searchPage: WorkstationApi.getWorkstationPage, // 查询弹窗所需分页方法
-  //       searchCondition: [{
-  //         key:'productionLineCode',
-  //         value:'productionLineCode',
-  //         message: '请填写生产线代码！',
-  //         isMainValue: true
-  //       },{
-  //         key: 'available',
-  //         value: 'TRUE',
-  //         isMainValue: false
-  //       }]
-  //     }
-  //   }
-  // },
-  {
-    label: '包装号',
-    field: 'packingNumber',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable:false,
-    isSearch: false,
-    sortSearchDefault:4,
-    sortTableDefault:6,
-    isTableForm: false,
-    isForm: false,
-  },
-  {
-    label: '器具号',
-    field: 'containerNumber',
-    sort: 'custom',
-    table: {
-      width: 150
+export const IssueRequestDetail = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    // {
+    //   label: '生产线代码',
+    //   field: 'productionLineCode',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   isTable:false,
+    //   hiddenInMain:true,
+    //   tableForm:{
+    //     isInpuFocusShow: true,
+    //     searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+    //     searchField: 'code', // 查询弹窗赋值字段
+    //     searchTitle: '生产线信息', // 查询弹窗标题
+    //     searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
+    //     searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
+    //     searchCondition: [{
+    //       key:'workshopCode',
+    //       value:'workshopCode',
+    //       message: '请填写车间代码！',
+    //       isMainValue: true
+    //     },{
+    //       key: 'available',
+    //       value: 'TRUE',
+    //       isMainValue: false
+    //     }]
+    //   },
+    //   form: {
+    //     // labelMessage: '信息提示说明！！！',
+    //     componentProps: {
+    //       isSearchList: true, // 开启查询弹窗
+    //       searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+    //       searchField: 'code', // 查询弹窗赋值字段
+    //       searchTitle: '生产线信息', // 查询弹窗标题
+    //       searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
+    //       searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
+    //       searchCondition: [{
+    //         key:'workshopCode',
+    //         value:'workshopCode',
+    //         message: '请填写车间代码！',
+    //         isMainValue: true
+    //       },{
+    //         key: 'available',
+    //         value: 'TRUE',
+    //         isMainValue: false
+    //       }]
+    //     }
+    //   }
+    // },
+    // {
+    //   label: '工位代码',
+    //   field: 'workStationCode',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   isTable:false,
+    //   hiddenInMain:true,
+    //   tableForm:{
+    //     isInpuFocusShow: true,
+    //     searchListPlaceholder: '请选择工位代码', // 输入框占位文本
+    //     searchField: 'code', // 查询弹窗赋值字段
+    //     searchTitle: '工位信息', // 查询弹窗标题
+    //     searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
+    //     searchPage: WorkstationApi.getWorkstationPage, // 查询弹窗所需分页方法
+    //     searchCondition: [{
+    //       key:'productionLineCode',
+    //       value:'productionLineCode',
+    //       message: '请填写生产线代码！',
+    //       isMainValue: true
+    //     },{
+    //       key: 'available',
+    //       value: 'TRUE',
+    //       isMainValue: false
+    //     }]
+    //   },
+    //   form: {
+    //     // labelMessage: '信息提示说明！！！',
+    //     componentProps: {
+    //       isSearchList: true, // 开启查询弹窗
+    //       searchListPlaceholder: '请选择工位代码', // 输入框占位文本
+    //       searchField: 'code', // 查询弹窗赋值字段
+    //       searchTitle: '工位信息', // 查询弹窗标题
+    //       searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
+    //       searchPage: WorkstationApi.getWorkstationPage, // 查询弹窗所需分页方法
+    //       searchCondition: [{
+    //         key:'productionLineCode',
+    //         value:'productionLineCode',
+    //         message: '请填写生产线代码！',
+    //         isMainValue: true
+    //       },{
+    //         key: 'available',
+    //         value: 'TRUE',
+    //         isMainValue: false
+    //       }]
+    //     }
+    //   }
+    // },
+    {
+      label: '包装号',
+      field: 'packingNumber',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      isSearch: false,
+      sortSearchDefault: 4,
+      sortTableDefault: 6,
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '器具号',
+      field: 'containerNumber',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true,
+      isTableForm: false,
+      isForm: false,
+      isTable: false
+    },
+    {
+      label: '批次',
+      field: 'batch',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      isSearch: false,
+      sortTableDefault: 5,
+      sortSearchDefault: 3,
+      isTableForm: false,
+      isForm: false
     },
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false,
-    isTable: false,
 
-  },
-  {
-    label: '批次',
-    field: 'batch',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    isSearch: false,
-    sortTableDefault:5,
-    sortSearchDefault:3,
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '库存状态',
-    field: 'inventoryStatus',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false
-  },
-  // {
-  //   label: '从库位代码',
-  //   field: 'fromLocationCode',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   isSearch: true,
-  //   hiddenInMain:true,
-  //   sortSearchDefault:6,
-  // },
-  {
-    label: '到库位代码',
-    field: 'toLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch: false,
-    isTable:false,
-    sortSearchDefault:6,
-    sortTableDefault:1100,
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '物料代码',
-    field: 'itemCode',
-    sort: 'custom',
-    table: {
-      width: 250
-    },
-    isSearch:true,
-    sortSearchDefault:2,
-    sortTableDefault:3,
-    tableForm:{
-      multiple: true,
-      enterSearch:true,
-      isInpuFocusShow: true,
-      isSearchList: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
-      searchField: 'code', // 查询弹窗赋值字段
-      searchTitle: '物料信息', // 查询弹窗标题
-      searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
-      searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
-      searchCondition: [{
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
+    // {
+    //   label: '从库位代码',
+    //   field: 'fromLocationCode',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   isSearch: true,
+    //   hiddenInMain:true,
+    //   sortSearchDefault:6,
+    // },
+    {
+      label: '到库位代码',
+      field: 'toLocationCode',
+      sort: 'custom',
+      table: {
+        width: 150
       },
-      // ,{
-      //   key:'productionLineCode',
-      //   value:'productionLineCode',
-      //   message: '请填写生产线代码！',
-      //   isMainValue: true
-      // },
-      {
-        key: 'businessTypeCode',
-        value: 'Issue',
-        isMainValue: false
-      }
-    ]
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
+      isSearch: false,
+      isTable: false,
+      sortSearchDefault: 6,
+      sortTableDefault: 1100,
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '物料代码',
+      field: 'itemCode',
+      sort: 'custom',
+      table: {
+        width: 250
+      },
+      isSearch: true,
+      sortSearchDefault: 2,
+      sortTableDefault: 3,
+      tableForm: {
+        multiple: true,
+        enterSearch: true,
+        isInpuFocusShow: true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择物料代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '物料信息', // 查询弹窗标题
         searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
         searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
+        searchCondition: [
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          },
+          // ,{
+          //   key:'productionLineCode',
+          //   value:'productionLineCode',
+          //   message: '请填写生产线代码！',
+          //   isMainValue: true
+          // },
+          {
+            key: 'businessTypeCode',
+            value: 'Issue',
+            isMainValue: false
+          }
+        ]
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+          searchField: 'code', // 查询弹窗赋值字段
+          searchTitle: '物料信息', // 查询弹窗标题
+          searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
+          searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            }
+          ]
+        }
       }
-    }
-  },
-  {
-    label: '数量',
-    field: 'qty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    tableForm: {
-      type: 'InputNumber',
-      min: 0,
-      precision: 6
     },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
+    {
+      label: '物料名称',
+      field: 'itemName',
+      sort: 'custom',
+      table: {
+        width: 300
+      },
+      sortTableDefault: 4,
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '数量',
+      field: 'qty',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true,
+      tableForm: {
+        type: 'InputNumber',
         min: 0,
         precision: 6
+      },
+      form: {
+        component: 'InputNumber',
+        componentProps: {
+          min: 0,
+          precision: 6
+        }
       }
-    }
-  },
-
-  {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:9,
-    tableForm:{
-      type: 'Select',
-      disabled: true
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
-  // {
-  //   label: '采购订单号',
-  //   field: 'poNumber',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   hiddenInMain:true,
-  //   sortTableDefault:1,
-  // },
-  // {
-  //   label: '订单行',
-  //   field: 'poLine',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   hiddenInMain:true,
-  //   sortTableDefault:2,
-  // },
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 180
     },
-    isTableForm: false,
-    hiddenInMain:true,
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
 
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '计量单位',
+      field: 'uom',
+      dictType: DICT_TYPE.UOM,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 6,
+      tableForm: {
+        type: 'Select',
+        disabled: true
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
       }
     },
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '最后更新时间',
-    field: 'updateTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '库存状态',
+      field: 'inventoryStatus',
+      dictType: DICT_TYPE.INVENTORY_STATUS,
+      dictClass: 'string',
+      sortTableDefault: 7,
+      isTable: true,
+      isDetail: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '物料描述1',
+      field: 'itemDesc1',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true,
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '物料描述2',
+      field: 'itemDesc2',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true,
+      isTableForm: false,
+      isForm: false
+    },
+    // {
+    //   label: '采购订单号',
+    //   field: 'poNumber',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   hiddenInMain:true,
+    //   sortTableDefault:1,
+    // },
+    // {
+    //   label: '订单行',
+    //   field: 'poLine',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   hiddenInMain:true,
+    //   sortTableDefault:2,
+    // },
+    {
+      label: '单据号',
+      field: 'number',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTableForm: false,
+      hiddenInMain: true,
+      form: {
+        componentProps: {
+          disabled: true
+        }
       }
     },
-    isTable:false,
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false,
-  },
-  {
-    label: '最后更新者',
-    field: 'updater',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '物料名称',
-    field: 'itemName',
-    sort: 'custom',
-    table: {
-      width: 300
-    },
-    sortTableDefault:4,
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '物料描述1',
-    field: 'itemDesc1',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '物料描述2',
-    field: 'itemDesc2',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '项目代码',
-    field: 'projectCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false
-  },
-  
-  {
-    label: '从货主代码',
-    field: 'fromOwnerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '到货主代码',
-    field: 'toOwnerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '未执行任务数量',
-    field: 'unexecutedQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
+    {
+      label: '数量',
+      field: 'qty',
+      sort: 'custom',
+      table: {
+        width: 300
+      },
+      sortTableDefault: 5,
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '未执行任务数量',
+      field: 'unexecutedQty',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'InputNumber'
+      },
+      isTableForm: false,
+      hiddenInMain: true
+    },
+    // {
+    //   label: '备注',
+    //   field: 'remark',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   hiddenInMain: true
+    // },
+    {
+      label: '创建者',
+      field: 'creator',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true,
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '创建时间',
+      field: 'createTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      },
+      hiddenInMain: true,
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '项目代码',
+      field: 'projectCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true,
+      isTableForm: false,
+      isForm: false
     },
-    isTableForm:false,
-    hiddenInMain:true,
-  },
-  {
-    label: '操作',
-    field: 'action',
-    hiddenInMain:true,
-    isDetail: false,
-    isForm: false ,
-    table: {
-      width: 200,
-      fixed: 'right'
+
+    {
+      label: '从货主',
+      field: 'fromOwnerCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true,
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '到货主',
+      field: 'toOwnerCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true,
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '最后更新时间',
+      field: 'updateTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      },
+      isTable: false,
+      hiddenInMain: true,
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '最后更新者',
+      field: 'updater',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      hiddenInMain: true,
+      isTableForm: false,
+      isForm: false
     },
-    isTableForm:false,
-  }
-]))
+
+    {
+      label: '操作',
+      field: 'action',
+      hiddenInMain: true,
+      isDetail: false,
+      isForm: false,
+      table: {
+        width: 200,
+        fixed: 'right'
+      },
+      isTableForm: false
+    }
+  ])
+)
 
 //表单校验
 export const IssueRequestDetailRules = reactive({
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index 1e234687a..bb9d87c5d 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -78,7 +78,7 @@
     fieldTableColumn="poLine"
 
   />
-
+  采购订单信息
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/wms/purchase-plan-main/import" :importTemplateData="importTemplateData"
     @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
@@ -689,6 +689,10 @@ const handleSelectionPublish = async ()=>{
     if('supplierCode'==field){
       //供应商代码
       formRef.value.opensearchTable('poNumber', 'number', '采购订单信息', PurchaseMain.allSchemas, PurchaseMainApi.getPurchaseMainPage,[{
+          key: 'type',
+          value: 'SCHEDULE',
+          isMainValue: false
+        },{
           key: 'available',
           value: 'TRUE',
           isMainValue: false
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
index b77397b3b..2f5c2006f 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
@@ -109,7 +109,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
         isSearchList: true,
         searchListPlaceholder: '请选择采购订单',
         searchField: 'number',
-        searchTitle: '采购订单信息3',
+        searchTitle: '采购订单信息',
         searchAllSchemas: PurchaseMain.allSchemas,
         searchPage: PurchaseMainApi.getPurchaseMainPage,
         searchCondition: [{
@@ -520,7 +520,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
         isSearchList: true,
         searchListPlaceholder: '请选择采购订单',
         searchField: 'number',
-        searchTitle: '采购订单信息5',
+        searchTitle: '采购订单信息',
         searchAllSchemas: PurchaseMain.allSchemas,
         searchPage: PurchaseMainApi.getPurchaseMainPage,
         searchCondition: [{
@@ -554,7 +554,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
       isInpuFocusShow: false,
       searchListPlaceholder: '请选择订单号',
       searchField: 'number',
-      searchTitle: '采购订单信息4',
+      searchTitle: '采购订单信息',
       searchAllSchemas: PurchaseMain.allSchemas,
       searchPage: PurchaseMainApi.getPurchaseMainPage,
       searchCondition: [{
@@ -580,7 +580,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
         isSearchList: false,
         searchListPlaceholder: '请选择订单号',
         searchField: 'number',
-        searchTitle: '采购订单信息6',
+        searchTitle: '采购订单信息',
         searchAllSchemas: PurchaseMain.allSchemas,
         searchPage: PurchaseMainApi.getPurchaseMainPage,
         searchCondition: [{
@@ -635,7 +635,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
         isSearchList: false,
         searchListPlaceholder: '请选择订单行',
         searchField: 'lineNumber',
-        searchTitle: '采购订单信息2',
+        searchTitle: '采购订单信息',
         searchAllSchemas: PurchaseDetail.allSchemas,
         searchPage: PurchaseDetailApi.getPurchaseDetailPagePoNumber,
         searchCondition: [{
@@ -656,7 +656,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
       isInpuFocusShow: false,
       searchListPlaceholder: '请选择订单行',
       searchField: 'lineNumber',
-      searchTitle: '采购订单信息1',
+      searchTitle: '采购订单信息',
       searchAllSchemas: PurchaseDetail.allSchemas,
       searchPage: PurchaseDetailApi.getPurchaseDetailPagePoNumber,
       searchCondition: [{
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 85b694f7a..f80b4e3e1 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -154,7 +154,6 @@
     :footButttondata="footButttondata"
     @footButtonClick="footButtonClick"
     @formSelectChange="formSelectChangeLabel"
-    @visibleChange='visibleChange'
   />
   <!-- 上传质量报告 -->
   <BasicForm
@@ -607,7 +606,7 @@ const buttonTableClick = async (val, row) => {
             }
             genLabelId.value = row.masterId
             // await getDetailList()
-            await  getGenerateLabelList(row)
+            await getGenerateLabelList(row)
             formLabelRef.value.open('create', row, null, 'createLabel') //创建标签页面 createLabel 标题
           }
         })
@@ -628,27 +627,33 @@ const footButttondata = ref([
   defaultButtons.formCloseBtn(null) // BOM关闭
 ])
 // 获取箱规格
-const getGenerateLabelList=async(row)=>{
+const getGenerateLabelList = async (row) => {
   const params1 = {
-      masterId: row.masterId,
-      pageSize: '500',
-      pageNo: '1',
-      sort: '',
-      by: 'ASC'
-    }
-    await SupplierdeliverRequestDetailApi.getGenerateLabelList(params1).then((res) => {
-      detatableData1.value = res
-      detatableData1.value.forEach((item) => {
-        item.packUnitInitOptions = item.boxPackaging
-        let obj = item?.boxPackaging[0]
-        if (obj) {
-          item.packUnit= obj.packUnit
-          item.packQty = obj.packQty
-        } 
-        item.secondPackUnit= ''
-        item.secondPackQty = ''
-      })
+    masterId: row.masterId,
+    pageSize: '500',
+    pageNo: '1',
+    sort: '',
+    by: 'ASC'
+  }
+  await SupplierdeliverRequestDetailApi.getGenerateLabelList(params1).then((res) => {
+    detatableData1.value = res
+    detatableData1.value.forEach((item) => {
+      item.packUnitInitOptions = item.boxPackaging
+      item.secondPackUnitInitOptions = item.palletPackaging || []
+      let obj = item?.boxPackaging[0]
+      if (obj) {
+        item.packUnit = obj.packUnit
+        item.packQty = obj.packQty
+      }
+      // 有托规格显示托规格，没有显示第一条规格
+      item.secondPackUnit = obj.parentPackUnit
+        ? obj.parentPackUnit
+        : item?.secondPackUnitInitOptions[0]?.packUnit
+      item.secondPackQty = obj.parentPackUnit
+        ? obj.parentPackQty
+        : item?.secondPackUnitInitOptions[0]?.packQty
     })
+  })
 }
 // 下一步
 const labelFormRef = ref()
@@ -658,12 +663,12 @@ const footButtonClick = async (val) => {
     if (!validateForm) {
       return
     }
-    let isNext = detatableData1.value.some((item)=>{
-      return !item.packUnit  || !item.packQty
+    let isNext = detatableData1.value.some((item) => {
+      return !item.packUnit || !item.packQty
     })
-    if(isNext){
+    if (isNext) {
       message.warning('有数据没有选择箱规格')
-      return;
+      return
     }
     const data = JSON.parse(JSON.stringify(detatableData1.value))
     labelFormRef.value.openLabel(data)
@@ -677,12 +682,25 @@ const formSelectChangeLabel = (field, val, row) => {
     let obj = row.boxPackaging.find((item) => item.packUnit == val)
     if (obj) {
       row.packQty = obj.packQty
+      // 获取托规格
+      const params1 = {
+        itemCode: row.itemCode,
+        packUnit: row.packUnit
+      }
+      SupplierdeliverRequestDetailApi.getGenerateLabelParentList(params1).then((res) => {
+        if (res?.length > 0) {
+          row.secondPackUnit = res[0].packUnit
+          row.secondPackQty = res[0].packQty
+        } else {
+          row.secondPackUnit = row?.secondPackUnitInitOptions[0]?.packUnit
+          row.secondPackQty = row?.secondPackUnitInitOptions[0]?.packQty
+        }
+      })
     } else {
       row.packQty = ''
+      row.secondPackUnit = ''
+      row.secondPackQty = ''
     }
-    row.secondPackUnit = ''
-    row.secondPackQty = ''
-   
   }
   // 设置托
   if (field == 'secondPackUnit') {
@@ -694,23 +712,7 @@ const formSelectChangeLabel = (field, val, row) => {
     }
   }
 }
-// tableForm下拉框弹出隐藏
-const visibleChange=(field, val, row, index)=>{
-  row.secondPackUnitInitOptions=[]
-  if(field=='secondPackUnit'){
-    if(val){
-  // 获取托规格
-    const params1 = {
-      itemCode: row.itemCode,
-      packUnit: row.packUnit
-    }
-    SupplierdeliverRequestDetailApi.getGenerateLabelParentList(params1).then((res) => {
-      row.secondPackUnitInitOptions  = res
-    })
-    }
-  }
 
-}
 
 // 获取部门 用于详情 部门回显
 const { wsCache } = useCache()
@@ -1000,10 +1002,9 @@ const { getList: getDetailList } = detatableMethods
 // 生成标签按钮操作
 const submitFormLabel = async (list) => {
   try {
-    
-   let data = {
-    subList:list
-   }
+    let data = {
+      subList: list
+    }
     await message.confirm(t('ts.是否为此数据生成标签？'))
     labelFormRef.value.isLoading = true
     await SupplierdeliverRequestMainApi.genLabel(data)
@@ -1016,7 +1017,6 @@ const submitFormLabel = async (list) => {
     labelFormRef.value.formLoading = false
     labelFormRef.value.dialogTableVisible = false
     labelFormRef.value.isLoading = false
-    
   }
 }
 const clearInput = async (field, row, index) => {
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
index a73fe67a4..99aeb5367 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
@@ -82,6 +82,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  
   // {
   //   label: '申请单号',
   //   field: 'requestNumber',
@@ -434,6 +435,21 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+  //子表数据，仅是查询条件
+  {
+    label: '货运单号',
+    field: 'asnBillNum',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isTableForm:false,
+    isTable:false,
+    isDetail:false,
+    isSearch: true,
+    isForm: false,
+  },
   {
     label: '财务凭证号',
     field: 'voucherNumber',