diff --git a/README.md b/README.md
index 52d41693e..871612b43 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-## dev发布2024-05-23-002
+## dev发布2024-06-01-001
 **xxxx.data.ts 文件配置说明**
 **form表单查询弹窗配置**
 form: {
diff --git a/src/api/eam/equipmentMaintenanceMain/index.ts b/src/api/eam/equipmentMaintenanceMain/index.ts
index 5bc59771d..4037defac 100644
--- a/src/api/eam/equipmentMaintenanceMain/index.ts
+++ b/src/api/eam/equipmentMaintenanceMain/index.ts
@@ -3,27 +3,32 @@ import {EquipmentMainPartVO} from "@/api/eam/equipmentMainPart";
 
 export interface EquipmentMaintenanceMainVO {
   id: number
-  number: string
   describing: string
+  number: string
+  sources: string
   equipmentCode: string
   type: string
-  classes: string
-  planNumber: string
   faultType: string
-  cycle: string
-  times: string
+  planNumber: string
+  planStartTime: Date
+  planEndTime: Date
+  startTime: Date
+  endTime: Date
+  classType: string
   verifyer: number
   verifyContent: string
   verifyTime: Date
   maintenancer: number
   maintenancePhone: string
-  completeResult: string
   completionTime: Date
   maintenanceTime: Date
   status: string
+  autoOrder: string
+  autoPerform: string
+  autoVerify: string
+  directCreateRecord: string
   factoryAreaCode: string
   workshopCode: string
-  workshopSectionCode: string
   departmentCode: string
   remark: string
   siteId: string
@@ -49,6 +54,12 @@ export const getEquipmentMaintenanceMain = async (id: number) => {
   return await request.get({ url: `/eam/equipment-maintenance-main/get?id=` + id })
 }
 
+
+
+export const getMaintenanceOrderConfig = async () => {
+  return await request.get({ url: `/eam/equipment-maintenance-main/get-order-config`})
+}
+
 // 新增设备保养工单主
 export const createEquipmentMaintenanceMain = async (data: EquipmentMaintenanceMainVO) => {
   return await request.post({ url: `/eam/equipment-maintenance-main/create`, data })
diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 2dfe94013..716e2006a 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -390,6 +390,13 @@ const opensearchTable = (
           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表数据的值
         _searchCondition[searchCondition[i].key] = row[searchCondition[i].value]
       } else {
diff --git a/src/views/eam/equipmentMaintenanceMain/equipmentMaintenanceMain.data.ts b/src/views/eam/equipmentMaintenanceMain/equipmentMaintenanceMain.data.ts
index d2f92e2ed..717f499ca 100644
--- a/src/views/eam/equipmentMaintenanceMain/equipmentMaintenanceMain.data.ts
+++ b/src/views/eam/equipmentMaintenanceMain/equipmentMaintenanceMain.data.ts
@@ -7,15 +7,16 @@ import * as WorkshopApi from "@/api/wms/workshop";
 import {RelationMaintenancePlanItem} from "@/views/eam/maintenance/maintenance.data";
 import * as ItemApi from "@/api/eam/relationMaintenancePlanItem";
 import {validateroundNumber} from "@/utils/validator";
-import {getRelationMaintenancePlanItemPage} from "@/api/eam/relationMaintenancePlanItem";
 
 // 表单校验
 export const EquipmentMaintenanceMainRules = reactive({
   number: [required],
+  sources: [required],
   equipmentCode: [required],
-  planNumber: [required],
+  type: [required],
+  planStartTime: [required],
+  planEndTime: [required],
   status: [required],
-  factoryAreaCode: [required],
 })
 
 export const EquipmentMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
@@ -29,23 +30,23 @@ export const EquipmentMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail:false,
   },
   {
-    label: '保养工单编号',
-    field: 'number',
+    label: '描述',
+    field: 'describing',
     sort: 'custom',
+    isSearch: false,
+    isTable: false,
     isForm: false,
-    isSearch: true,
+    isDetail:false,
   },
   {
-    label: '描述',
-    field: 'describing',
+    label: '保养工单编号',
+    field: 'number',
     sort: 'custom',
     isSearch: true,
   },
   {
-    label: '设备类别',
-    field: 'type',
-    dictType: DICT_TYPE.DEVICE_TYPE,
-    dictClass: 'string',
+    label: '来源字典',
+    field: 'sources',
     sort: 'custom',
     isSearch: true,
   },
@@ -75,8 +76,16 @@ export const EquipmentMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '班次枚举',
-    field: 'classes',
+    label: '设备类别',
+    field: 'type',
+    dictType: DICT_TYPE.DEVICE_TYPE,
+    dictClass: 'string',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '故障类型枚举',
+    field: 'faultType',
     sort: 'custom',
     isSearch: true,
   },
@@ -87,26 +96,98 @@ export const EquipmentMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
   },
   {
-    label: '故障类型枚举',
-    field: 'faultType',
+    label: '计划开始时间',
+    field: 'planStartTime',
     sort: 'custom',
+    formatter: dateFormatter,
     isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
   },
   {
-    label: '保养周期',
-    field: 'cycle',
+    label: '计划结束时间',
+    field: 'planEndTime',
     sort: 'custom',
+    formatter: dateFormatter,
     isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
   },
   {
-    label: '保养次数',
-    field: 'times',
+    label: '保养开始时间',
+    field: 'startTime',
     sort: 'custom',
+    formatter: dateFormatter,
     isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
     form: {
-      component: 'InputNumber',
-      value: 0
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '保养结束时间',
+    field: 'endTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
     },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '保养班组',
+    field: 'classType',
+    sort: 'custom',
+    isSearch: true,
   },
   {
     label: '验证人',
@@ -119,6 +200,13 @@ export const EquipmentMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'verifyContent',
     sort: 'custom',
     isSearch: true,
+    form: {
+      component: 'Editor',
+      componentProps: {
+        valueHtml: '',
+        height: 200
+      }
+    },
   },
   {
     label: '验证时间',
@@ -154,12 +242,6 @@ export const EquipmentMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
   },
-  {
-    label: '结果枚举临时措施、完成',
-    field: 'completeResult',
-    sort: 'custom',
-    isSearch: true,
-  },
   {
     label: '完成时间',
     field: 'completionTime',
@@ -212,14 +294,35 @@ export const EquipmentMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.EAM_ORDER_STATUS,
     dictClass: 'string',
   },
+  // {
+  //   label: '自动接单',
+  //   field: 'autoOrder',
+  //   sort: 'custom',
+  //   isSearch: true,
+  // },
+  // {
+  //   label: '自动执行',
+  //   field: 'autoPerform',
+  //   sort: 'custom',
+  //   isSearch: true,
+  // },
+  // {
+  //   label: '自动验证',
+  //   field: 'autoVerify',
+  //   sort: 'custom',
+  //   isSearch: true,
+  // },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    sort: 'custom',
+    isSearch: true,
+  },
   {
     label: '所属厂区编号',
     field: 'factoryAreaCode',
     sort: 'custom',
-    isSearch: false,
-    isTable: false,
-    isForm: false,
-    isDetail:false,
+    isSearch: true,
   },
   {
     label: '车间编号',
@@ -288,9 +391,10 @@ export const EquipmentMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '是否可用默认TRUE',
     field: 'available',
     sort: 'custom',
-    isSearch: true,
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
   },
   {
     label: '删除时间',
@@ -351,6 +455,7 @@ export const EquipmentMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
 ]))
 
 
+
 export const EquipmentMaintenanceDetailRules = reactive({
   number: [required],
   masterId: [required],
diff --git a/src/views/eam/equipmentMaintenanceMain/finishForm.vue b/src/views/eam/equipmentMaintenanceMain/finishForm.vue
new file mode 100644
index 000000000..3834f8f70
--- /dev/null
+++ b/src/views/eam/equipmentMaintenanceMain/finishForm.vue
@@ -0,0 +1,232 @@
+<template>
+  <Dialog v-model="dialogVisible" :title="dialogTitle"  :close-on-click-modal="false">
+    <el-form ref="basicFormRef" v-loading="formLoading" :model="formData" :rules="formRules" label-width="100px">
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="验证人" prop="verifyer">
+            <el-input v-model="formData.verifyer" placeholder="请输入验证人" :disabled="isDisabled"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="验证内容" prop="verifyContent">
+            <el-input v-model="formData.verifyContent" placeholder="请输入验证内容" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="验证时间" prop="verifyTime">
+            <el-date-picker
+              v-model="formData.verifyTime"
+              type="datetime"
+              placeholder="选择验证时间">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="保养人ID" prop="maintenancer">
+            <el-input v-model="formData.maintenancer" placeholder="请输入保养人" :disabled="isDisabled"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="保养人电话" prop="maintenancePhone">
+            <el-input v-model="formData.maintenancePhone" placeholder="请输入保养人电话" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm('success')">确 定</el-button>
+      <el-button @click="handleClose('close')">取 消</el-button>
+    </template>
+  </Dialog>
+
+<!--添加巡检项弹窗-->
+  <SearchTable ref="searchTableRef" @searchTableSuccess="searchTableSuccess" />
+
+</template>
+<script lang="ts" setup>
+import * as EquipmentMaintenanceMainApi from '@/api/eam/equipmentMaintenanceMain'
+import request from "@/config/axios";
+import { SearchTable } from '@/components/SearchTable'
+import { InspectionItem} from "@/views/eam/inspectionItem/inspectionItem.data";
+import * as inspectionItemApi from "@/api/eam/inspectionItem";
+import {ElInput} from "element-plus";
+import {updateEquipmentMaintenanceMain} from "@/api/eam/equipmentMaintenanceMain";
+
+defineOptions({ name: 'TeamForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const tags=ref([])
+
+const inputValue = ref('')
+const inputVisible = ref(false)
+const isDisabled = ref(false)
+const InputRef = ref<InstanceType<typeof ElInput>>()
+
+
+const formData = ref({
+  id:'',
+  number:'',
+  verifyer: '',
+  verifyContent: '',
+  verifyTime: '',
+  maintenancer: '',
+  maintenancePhone: '',
+})
+const formRules = reactive({
+  verifyer: [
+    { required: true, message: '验证人不能为空', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  verifyContent: [
+    { required: true, message: '验证内容不能为空', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  verifyTime: [
+    { required: true, message: '验证时间不能为空', trigger: 'blur' },
+  ],
+  maintenancer: [
+    { required: true, message: '保养人ID不能为空', trigger: 'blur' },
+  ],
+  maintenancePhone: [
+    { required: true, message: '保养人电话不能为空', trigger: 'blur' },
+  ],
+})
+const basicFormRef = ref() // 表单 Ref
+
+// /** 弹窗相关参数 */
+// const searchTableRef = ref();
+// const _searchTableTitle = ref();
+// const _searchTableAllSchemas = ref();
+// const _searchTablePage = ref();
+// const _formField = ref();
+// const _searchField = ref();
+// const _multiple = ref();
+// const _type = ref();
+// const _row = ref();
+// const _searchCondition = ref({})
+//
+//
+// const addItem = () =>{
+//   addItemCommon(true,'xunJianItem')
+// }
+//
+// /** 选择巡检项弹窗 */
+// const addItemCommon = (multiple,field) => {
+//   _searchCondition.value = {}
+//   const filters: any[] = []
+//   filters.push({
+//     action: "==",
+//     column: 'available',
+//     value: 'TRUE'
+//   })
+//   // 参数整理
+//   _searchCondition.value.isSearch = true
+//   _searchCondition.value.filters = filters
+//   _searchTableTitle.value = '选择巡检项'
+//   _multiple.value = multiple
+//   _formField.value = field
+//   _searchField.value = field
+//   _searchTablePage.value = inspectionItemApi.getInspectionItemPage
+//   _searchTableAllSchemas.value = InspectionItem.allSchemas
+//   openCommon()
+// }
+//
+// /** 弹窗选择之后  回调函数 添加选择集 */
+// const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+//   nextTick?.(() => {
+//       if (formField === 'xunJianItem') {
+//           val.forEach(item => {
+//             const isExist = tags.value.some(tag => tag.content === item.content);
+//             if (!isExist){
+//               const newItem = {};
+//               newItem['content'] = item.content;
+//               newItem['id'] = item.id;
+//               tags.value.push(newItem);
+//             }
+//           });
+//       }
+//   })
+// }
+// /*打开弹窗*/
+// const openCommon = () => {
+//   searchTableRef.value.open(
+//     _searchTableTitle.value,
+//     _searchTableAllSchemas.value,
+//     _searchTablePage.value,
+//     _formField.value,
+//     _searchField.value,
+//     _multiple.value,
+//     _type.value,
+//     _row.value,
+//     _searchCondition.value
+//   )
+// }
+/** 初始化弹窗 */
+const open = async (type: string, row?: object) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  //初始化数据
+  formData.value.id = row.id
+  formData.value.number = row.planNumber
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const submitForm = async (val) => {
+
+   //把success函数传递到父页面
+   emit('success',formData.value.id)
+   // 校验表单
+   if (!basicFormRef) return
+   const valid = await basicFormRef.value.validate()
+   if (!valid) return
+
+   //发送数据
+   await EquipmentMaintenanceMainApi.updateEquipmentMaintenanceMain(formData.value)
+   dialogVisible.value = false
+}
+
+const handleClose=(val)=>{
+  dialogVisible.value = false
+  emit('close',val)
+}
+
+// 传递给父类
+const emit = defineEmits(['close','success'])
+
+</script>
+
+<style scoped>
+.tag-container {
+  margin-top: 10px; /* 可根据需要调整标签容器与表单项之间的间距 */
+  border: 1px solid #ccc; /* 添加边框样式 */
+  padding: 10px; /* 可根据需要调整容器内边距 */
+  width: 950px; /* 设置固定宽度为 950px */
+  overflow-y: auto; /* 当内容溢出容器高度时显示滚动条 */
+  word-wrap: break-word; /* 使用 word-wrap 属性实现超出范围换行 */
+  overflow-wrap: break-word; /* 兼容性更好的写法 */
+  flex-wrap: wrap;
+}
+.input-with-button {
+  display: flex;
+  align-items: center;
+  width: 100%;
+}
+
+.input-with-button > .el-input {
+  flex: 1;
+  /*margin-right: 10px;*/
+}
+
+</style>
diff --git a/src/views/eam/equipmentMaintenanceMain/index.vue b/src/views/eam/equipmentMaintenanceMain/index.vue
index 4e0295cb2..fb244e15a 100644
--- a/src/views/eam/equipmentMaintenanceMain/index.vue
+++ b/src/views/eam/equipmentMaintenanceMain/index.vue
@@ -51,6 +51,20 @@
     @onChange="onChange"
   />
 
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="EquipmentMaintenanceMainRules"
+    :formAllSchemas="EquipmentMaintenanceMain.allSchemas"
+    :apiUpdate="EquipmentMaintenanceMainApi.updateEquipmentMaintenanceMain"
+    :apiCreate="EquipmentMaintenanceMainApi.createEquipmentMaintenanceMain"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+    @onChange="onChange"
+  />
+
+  <FinishForm ref="finishFormRef" @success="getData" @close="getClosed"/>
+
   <!-- 详情 -->
   <Detail ref="detailRef"
           :isBasic="false"
@@ -83,12 +97,13 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/views/eam/equipmentMaintenanceMain/MaintenanceOrderDetail.vue'
+import FinishForm from '@/views/eam/equipmentMaintenanceMain/finishForm.vue'
 import {Maintenance} from "@/views/eam/maintenance/maintenance.data";
 import {EquipmentAccounts} from "@/views/eam/equipmentAccounts/equipmentAccounts.data";
 import * as EquipmentItemApi from "@/api/eam/equipmentAccounts";
 import {ToolAccounts} from "@/views/eam/toolAccounts/toolAccounts.data";
 import * as ToolItemApi from "@/api/eam/toolAccounts";
-import {updateMaintenanceOrder} from "@/api/eam/equipmentMaintenanceMain";
+import {getMaintenanceOrderConfig} from "@/api/eam/equipmentMaintenanceMain";
 
 defineOptions({ name: 'EquipmentMaintenanceMain' })
 
@@ -195,7 +210,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'execute') { // 执行
     handleExecute(row.id)
   } else if (val == 'finish') { // 完成
-    handleFinish(row.id)
+    handleFinish(row)
   } else if (val == 'validate') { // 验证
     handleValidate(row.id)
   }
@@ -330,22 +345,38 @@ const handleExecute = async (id: number) => {
 }
 
 /** 完成按钮操作 */
-const handleFinish = async (id: number) => {
-  try {
-    // 中止的二次确认
-    await message.delConfirm('是否完成所选中工单？');
-    const params = ref({
-      id: '',
-      status:'',
-    })
-    params.value.id = id
-    params.value.status = '5'
-    // 发起
-    await EquipmentMaintenanceMainApi.executeMaintenanceOrder(params.value)
-    message.success(t('工单已完成'))
-    // 刷新列表
-    await getList()
-  } catch {}
+const finishFormRef = ref()
+const handleFinish = async (row) => {
+  let  res = await EquipmentMaintenanceMainApi.getMaintenanceOrderConfig();
+  //系统配置需要验证
+  if(res.remark === 'TRUE'){
+    try {
+        // 中止的二次确认
+        await message.delConfirm('是否完成所选中工单？');
+        const params = ref({
+          id: '',
+          status:'',
+        })
+        params.value.id = row.id
+        params.value.status = '5'
+        // 发起
+        await EquipmentMaintenanceMainApi.executeMaintenanceOrder(params.value)
+        message.success(t('工单已完成'))
+        // 刷新列表
+        await getList()
+    } catch {}
+  }
+  //系统配置不需要验证
+  if(res.remark === 'FALSE'){
+    try {
+      // 中止的二次确认
+      await message.delConfirm('是否完成所选中工单？');
+
+      //打开提交表单
+      finishFormRef.value.open('update', row);
+
+    } catch {}
+  }
 }
 
 /** 验证按钮操作 */
@@ -498,6 +529,30 @@ const searchFormClick = (searchData) => {
   getList() // 刷新当前列表
 }
 
+const getClosed=(val)=> {
+  //console.log('orderday-publishClosed-200',val)
+  nextTick?.(() => {
+    console.log(val)
+    getList()
+  })
+}
+
+const getData=(val)=> {
+  nextTick?.(async () => {
+    console.log(val)
+    const params = ref({
+      id: '',
+      status: '',
+    })
+    params.value.id = val
+    params.value.status = '5'
+    // 发起
+    await EquipmentMaintenanceMainApi.executeMaintenanceOrder(params.value)
+    message.success(t('工单已完成'))
+    // 刷新列表
+    await getList()})
+}
+
 /** 初始化 **/
 onMounted(async () => {
   getList()
diff --git a/src/views/home/components/material.vue b/src/views/home/components/material.vue
index 841bab035..aa32fce7b 100644
--- a/src/views/home/components/material.vue
+++ b/src/views/home/components/material.vue
@@ -250,8 +250,8 @@ const getJobCharts = async () => {
   ])
   lineIndex.value++
 }
-onMounted(async () => {
-  await getMaterialData()
+onMounted(() => {
+  getMaterialData()
 })
 </script>
 <style scoped lang="scss">
diff --git a/src/views/home/components/produce.vue b/src/views/home/components/produce.vue
index 527bd8877..79c877979 100644
--- a/src/views/home/components/produce.vue
+++ b/src/views/home/components/produce.vue
@@ -201,8 +201,8 @@ const getJobCharts = async () => {
   ])
   lineIndex.value++
 }
-onMounted(async () => {
-  await getProduceData()
+onMounted( () => {
+  getProduceData()
 })
 </script>
 <style scoped lang="scss">
diff --git a/src/views/home/components/product.vue b/src/views/home/components/product.vue
index 5896907ca..46397e777 100644
--- a/src/views/home/components/product.vue
+++ b/src/views/home/components/product.vue
@@ -228,8 +228,8 @@ const getJobCharts = async () => {
   ])
   lineIndex.value++
 }
-onMounted(async () => {
-  await getProductData()
+onMounted( () => {
+  getProductData()
 })
 </script>
 <style scoped lang="scss">
diff --git a/src/views/home/components/supplierIndex.vue b/src/views/home/components/supplierIndex.vue
index af6faa6f0..59fd75043 100644
--- a/src/views/home/components/supplierIndex.vue
+++ b/src/views/home/components/supplierIndex.vue
@@ -354,8 +354,8 @@ const formatter = (type,dict) => {
   let str = getStrDictOptions(dict).filter((item) => type == item.value)[0]?.label
   return str
 }
-onMounted(async () => {
-  await getSupplierData()
+onMounted( () => {
+  getSupplierData()
   getList()
 })
 </script>
diff --git a/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue b/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue
index 7defa8b4c..7c32a3771 100644
--- a/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue
@@ -67,7 +67,7 @@ import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
 
-// 生产线
+// 生产线管理
 defineOptions({ name: 'Productionline' })
 
 const message = useMessage() // 消息弹窗
@@ -154,10 +154,10 @@ const openForm = (type: string, row?: any) => {
       if (item.field == 'code') {
               item.componentProps.disabled = true
             }
-            if (item.field == 'workshopCode') {
-              item.componentProps.disabled = true
-              item.componentProps.isSearchList = false
-            }
+            // if (item.field == 'workshopCode') {
+              // item.componentProps.disabled = true
+              // item.componentProps.isSearchList = false
+            // }
           })       
           
   }else {
diff --git a/src/views/wms/basicDataManage/orderManage/shift/index.vue b/src/views/wms/basicDataManage/orderManage/shift/index.vue
index 4b8788693..50aef449e 100644
--- a/src/views/wms/basicDataManage/orderManage/shift/index.vue
+++ b/src/views/wms/basicDataManage/orderManage/shift/index.vue
@@ -165,12 +165,14 @@ const openForm = (type: string, row?: any) => {
 
 // form表单提交
 const formsSuccess = async (formType,data) => {
+  console.log('endAtNextDay',data)
       var isHave =Shift.allSchemas.formSchema.some(function (item) {
         return item.field === 'beginTime' || item.field === 'entTime';
       });
-      if(isHave){
+      
+      if(data['endAtNextDay']=='FALSE'&&isHave){
         if(data.beginTime && data.entTime && data.beginTime >=data.entTime){
-          message.error('开始时间要大于结束时间')
+          message.error('开始时间大于结束时间')
           return;
         }
       }
diff --git a/src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue b/src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue
index 6a64ef200..49b902718 100644
--- a/src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue
+++ b/src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue
@@ -55,7 +55,15 @@
   <Detail ref="detailRef" :isBasic="true" :allSchemas="SupplierUser.allSchemas" />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/wms/supplier-user/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportForm 
+    ref="importFormRef" 
+    url="/wms/supplier-user/import" 
+    :importTemplateData="importTemplateData" 
+    @success="importSuccess" 
+    :updateIsDisable="true"
+    :coverIsDisable="true"
+    :mode="2"
+  />
 </template>
 
 <script setup lang="ts">
@@ -66,7 +74,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
-
+// 供应商用户关联管理
 defineOptions({ name: 'SupplierUser' })
 
 const message = useMessage() // 消息弹窗
diff --git a/src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts b/src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts
index ce0606d61..81a8bcc3c 100644
--- a/src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts
+++ b/src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts
@@ -87,6 +87,7 @@ export const SupplierUser = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        dialogWidth:'1025px',//搜索出来弹窗的宽度
         isSearchList: true,
         searchListPlaceholder: '请选用户信息',
         searchField: 'id',
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
index cfa5c326c..0163db4ff 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
@@ -868,6 +868,7 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTableForm:false,
     isForm:false,
   },
   {
@@ -878,6 +879,7 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTableForm:false,
     isForm:false,
   },
   {
@@ -887,6 +889,7 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTableForm:false,
     isForm:false,
   },
   {
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
index 751865884..d75a19e9f 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
@@ -558,10 +558,24 @@ const importSuccess = () => {
 
 // 筛选提交
 const searchFormClick = (searchData) => {
-  tableObject.params = {
-    isSearch: true,
-    filters: searchData.filters
+  tableObject.params.isSearch = true
+  let filters = [...searchData.filters]
+  if(!filters.find(item=>item.column=='business_type')){
+    if ( routeName.value == 'DeliverRequestMain') {
+      filters = [...filters,{
+        action:'==',      
+        column:'business_type',      
+        value:'Deliver',
+      }]
+    } else if ( routeName.value == 'ZZBJDeliverRequestMain') {
+      filters = [...filters,{
+        action:'==',      
+        column:'business_type',      
+        value:'ZZBJDeliver',
+      }]
+    }
   }
+  tableObject.params.filters = filters
   getList() // 刷新当前列表
 }
 
diff --git a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
index 190e928ae..38407d012 100644
--- a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
@@ -673,12 +673,14 @@ export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
         key: 'available',
         value: 'TRUE',
         isMainValue: false
-      },{
-        key:'productionLineCode',
-        value:'productionLineCode',
-        message: '请填写生产线代码！',
-        isMainValue: true
-      },{
+      },
+      // ,{
+      //   key:'productionLineCode',
+      //   value:'productionLineCode',
+      //   message: '请填写生产线代码！',
+      //   isMainValue: true
+      // },
+      {
         key: 'businessTypeCode',
         value: 'Issue',
         isMainValue: false
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
index 1c0ce5e05..94db7444d 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
@@ -590,7 +590,7 @@ const submitForm = async (formType, data) => {
 const submitFormLabel = async (formType, data) => {
   try {
     detatableData.tableList.forEach(async (item) => {
-      await PackageApi.createPackageLabel(item).then(res => {
+      await PackageApi.createPackageLabel({...item,toLocationCode:item.fromLocationCode}).then(res => {
         isCreateLabel.value = true
         message.success('创建标签成功')
       }).catch(err => {
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
index e0f65f42e..27581ecc1 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
@@ -260,14 +260,16 @@ const searchTableSuccess = async(formField, searchField, val, formRef, type, row
         // row['fromLocationCode'] = val[0]['fromLocationCode']
         row['toLocationCode'] = val[0]['toLocationCode']
       }else if(formField=='fromLocationCode'){
-          let params = {
-          itemCode: row.itemCode,
-          batch: row.batch,
-          locationCode:val[0]['code']
-        }
-        let aa  = await  BalanceApi.getSumByConditions(params);
-        console.log('23423423',aa);
-        row['inventoryBalance'] = aa//库存余额
+        //   let params = {
+        //   itemCode: row.itemCode,
+        //   batch: row.batch,
+        //   locationCode:val[0]['code']
+        // }
+        // let aa  = await  BalanceApi.getSumByConditions(params);
+        // console.log('23423423',aa);
+        // row['inventoryBalance'] = aa//库存余额
+      }else if(formField=='packingNumber'){
+        row['inventoryBalance'] = val[0]['qty']//库存余额
       }
     } else {
       const setV = {}
@@ -491,17 +493,17 @@ const butttondata = (row,$index) => {
       hide: isShowMainButton(row, ['1']),
       hasPermi: 'wms:purchasereceipt-request-main:update'
     }), // 编辑
-    {
-      label: '生成标签',
-      name: 'ssbq',
-      hide: isShowMainButton(row, ['3']),
-      type: 'primary',
-      icon: '',
-      color: '',
-      hasPermi: '',
-      link: true // 文本展现按钮
-    },
-    defaultButtons.mainListPointBtn({ hide: isShowMainButton(row, ['3','6']) }), // 标签打印
+    // {
+    //   label: '生成标签',
+    //   name: 'ssbq',
+    //   hide: isShowMainButton(row, ['3']),
+    //   type: 'primary',
+    //   icon: '',
+    //   color: '',
+    //   hasPermi: '',
+    //   link: true // 文本展现按钮
+    // },
+    // defaultButtons.mainListPointBtn({ hide: isShowMainButton(row, ['3','6']) }), // 标签打印
   ]
 }
 
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
index 2b302bfad..35528de62 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
@@ -10,6 +10,8 @@ import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackag
 import * as ItemPackageApi from '@/api/wms/itempackage/index'
 import * as LocationApi from "@/api/wms/location";
 import {Location} from "@/views/wms/basicDataManage/factoryModeling/location/location.data";
+import * as BalanceApi from '@/api/wms/balance'
+import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
 
 
 
@@ -743,7 +745,9 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     sort: 'custom',
     table: {
       width: 150
-    }, 
+    },
+    isTableForm:false,
+    isTable:false, 
     hiddenInMain: true,
     tableForm:{
       disabled:true
@@ -760,7 +764,9 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     sort: 'custom',
     table: {
       width: 150
-    }, 
+    },
+    isTableForm:false,
+    isTable:false, 
     hiddenInMain: true,
     tableForm:{
       disabled:true
@@ -771,7 +777,22 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       }
     }
   },
-  
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled:true
+    },
+    form: {
+      componentProps:{
+        disabled:true
+      }
+    }
+  },
   {
     label: '替代批次',
     field: 'altBatch',
@@ -880,6 +901,77 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
   //     disabled:false
   //   }
   // },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    }, 
+    tableForm:{
+      // labelMessage: '信息提示说明！！！',
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择从库位代码',
+      searchField: 'code',
+      searchTitle: '库位代码信息',
+      searchAllSchemas: Location.allSchemas,
+      searchPage: LocationApi.getLocationListByAreaAndBusinesstype,
+      searchCondition: [{
+        key: 'businessType',
+        value: 'PurchaseReturn',
+        message: '请填写业务类型',
+        isMainValue: false
+      }]
+    },
+    hiddenInMain: true,
+    isTable: false,
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    }, 
+    hiddenInMain: true,
+    isTable: false,
+    form: {
+      componentProps:{
+        disabled:true
+      }
+    },
+    tableForm:{
+      // labelMessage: '信息提示说明！！！',
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择物料代码、批次、从库位代码',
+      searchField: 'packingNumber',
+      searchTitle: '库存余额信息', // 查询弹窗标题
+      searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
+      searchPage: BalanceApi.getBalancePage,
+      searchCondition: [{
+        key: 'itemCode',
+        value: 'itemCode',
+        message: '请填写物料代码',
+        isTableRowValue: true, //查询当前searchTable表中行数据的值
+        required:true,
+        isMainValue:false
+      },{
+        key: 'batch',
+        value: 'batch',
+        message: '请填写批次',
+        isTableRowValue: true, //查询当前searchTable表中行数据的值
+        required:true,
+        isMainValue:false
+      },{
+        key: 'locationCode',
+        value: 'fromLocationCode',
+        message: '请选择从库位代码',
+        isTableRowValue: true, //查询当前searchTable表中行数据的值
+        required:true,
+        isMainValue:false
+      }]
+    },
+  },
   {
     label: '库存余额',
     field: 'inventoryBalance',
@@ -922,21 +1014,6 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       precision: 6
     }
   },
-  {
-    label: '包装号',
-    field: 'packingNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    }, 
-    hiddenInMain: true,
-    isTable: false,
-    form: {
-      componentProps:{
-        disabled:true
-      }
-    }
-  },
   {
     label: '库存状态',
     field: 'inventoryStatus',
@@ -960,31 +1037,6 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       }
     }
   },
-  {
-    label: '从库位代码',
-    field: 'fromLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    }, 
-    tableForm:{
-      // labelMessage: '信息提示说明！！！',
-      isInpuFocusShow: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择从库位代码',
-      searchField: 'code',
-      searchTitle: '库位代码信息',
-      searchAllSchemas: Location.allSchemas,
-      searchPage: LocationApi.getLocationListByAreaAndBusinesstype,
-      searchCondition: [{
-        key: 'businessType',
-        value: 'PurchaseReturn',
-        message: '请填写业务类型',
-        isMainValue: false
-      }]
-    },
-    hiddenInMain: true,
-    isTable: false,
-  },
   {
     label: '到库位代码',
     field: 'toLocationCode',
@@ -1292,9 +1344,9 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
 
 //表单校验
 export const PurchasereturnRequestDetailRules = reactive({
-  // packingNumber: [
-  //   { required: true, message: '请输入包装号', trigger: 'blur' }
-  // ],
+  packingNumber: [
+    { required: true, message: '请输入包装号', trigger: 'blur' }
+  ],
   // batch: [
   //   { required: true, message: '请输入批次', trigger: 'blur' }
   // ],
diff --git a/src/views/wms/reportList/index.vue b/src/views/wms/reportList/index.vue
index a9fdf79dd..a81ebae68 100644
--- a/src/views/wms/reportList/index.vue
+++ b/src/views/wms/reportList/index.vue
@@ -6,9 +6,11 @@
 </template>
 
 <script setup lang="ts">
+import { getAccessToken } from '@/utils/auth'
 // const url = ref('http://localhost:12080/jmreport/view/881686740529258496')
 const route = useRoute() // 路由对象
+debugger
 const str = route.path.split('/')[3]
-const url = ref(import.meta.env.VITE_JMREPORT_BASE_URL + '/jmreport/view/'+ str)
+const url = ref(import.meta.env.VITE_JMREPORT_BASE_URL + '/jmreport/view/'+ str+ '?token='+ getAccessToken())
 console.log(url);
 </script>
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 238be0e93..d2557e079 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -298,7 +298,7 @@
     return []
   }
     return [
-      defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['1','6']) ,hasPermi: 'wms:supplierinvoice-request-main:open'}), // 打开
+      defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['9']) ,hasPermi: 'wms:supplierinvoice-request-main:open'}), // 打开
       defaultButtons.mainListPlanSubBtn({ hide: isShowMainButton(row, ['1','6']),hasPermi: 'wms:supplierinvoice-request-main:sub' }), // 提交审批
       {
         label: t('ts.采购通过'),