diff --git a/src/views/basicData/components/addRuleDialog.vue b/src/views/basicData/components/addRuleDialog.vue
index 51044b71..c928016a 100644
--- a/src/views/basicData/components/addRuleDialog.vue
+++ b/src/views/basicData/components/addRuleDialog.vue
@@ -300,8 +300,8 @@ export default {
     this.workCenterData = worlRes.data.data;
     if (JSON.stringify(this.row) != '{}') {
       this.row.craftAbilityId = this.row.craftAbilityId + '';
-      this.row.centerId = this.row.centerId == -1 ? '' : this.row.centerId + '';
-      this.row.oemId = this.row.oemId == -1 ? '' : this.row.oemId + '';
+      this.row.centerId = this.row.centerId == -1|| this.row.centerId == null ? '' : this.row.centerId + '';
+      this.row.oemId = this.row.oemId == -1|| this.row.oemId == null ? '' : this.row.oemId + '';
       // 容错处理：确保prodMarkId在各种情况下都能正确处理
       if (this.row.prodMarkId && this.row.prodMarkId !== '') {
         this.row.prodMarkIds = this.row.prodMarkId.split(',');
diff --git a/src/views/orderManagement/allocationMessQuery.vue b/src/views/orderManagement/allocationMessQuery.vue
index 95fac2ee..6d4df999 100644
--- a/src/views/orderManagement/allocationMessQuery.vue
+++ b/src/views/orderManagement/allocationMessQuery.vue
@@ -1,753 +1,42 @@
 <template>
   <basic-container>
-    <div class="search_box"></div>
-    <avue-crud
-      :option="option"
-      :table-loading="loading"
-      :data="data"
-      v-model="form"
-      v-model:page="page"
-      ref="crud"
-      @row-del="rowDel"
-      @search-change="searchChange"
-      @search-reset="searchReset"
-      @selection-change="selectionChange"
-      @current-change="currentChange"
-      @size-change="sizeChange"
-      @refresh-change="refreshChange"
-      @on-load="onLoad"
-    >
-      <template #menu-left> </template>
-      <template #menu-right> </template>
-
-      <template #poCode="{ row }">
-        <el-text type="primary">{{ row.poCode }}</el-text>
-      </template>
-      <template #prodIdent="{ row }">
-        <el-tag>{{ row.prodIdent }}</el-tag>
-      </template>
-      <template #curStatusText="{ row }">
-        <el-tag v-if="row.curStatusText == '已派工'">{{ row.curStatusText }}</el-tag>
-        <el-tag class="ml-2" type="success" v-if="row.curStatusText == '已完工'">
-          {{ row.curStatusText }}</el-tag
-        >
-        <el-tag class="ml-2" type="info" v-if="row.curStatusText == '已关闭'">{{
-          row.curStatusText
-        }}</el-tag>
-        <el-tag class="ml-2" type="warning" v-if="row.curStatusText == '加工中'">{{
-          row.curStatusText
-        }}</el-tag>
-        <el-tag class="ml-2" type="danger" v-if="row.curStatusText == '已退回'">{{
-          row.curStatusText
-        }}</el-tag>
-      </template>
-      <template #menu="{ row }"> </template>
-    </avue-crud>
-
-    <!-- 加急 -->
-    <!-- <rushDialog :showDialog="isRushOpen" v-if="isRushOpen" @closeDialog="closeDialog"></rushDialog>
-
-         <batchDialog :showDialog="isBatchOpen" v-if="isBatchOpen" @closeDialog="closeDialog"></batchDialog> -->
+    <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tab-pane label="配套统计" name="1"> </el-tab-pane>
+      <el-tab-pane label="配套明细" name="2"> </el-tab-pane>
+    </el-tabs>
+    <statistics v-show="activeName == '1'" @edit-row="handleStatisticsEdit"></statistics>
+    <allocationDetails
+      :rowData="rowData"
+      v-if="activeName == '2'"
+      ref="detailComp"
+    ></allocationDetails>
   </basic-container>
 </template>
 
 <script>
-import { getList } from '@/api/orderManagement/allocationMessQuery';
-import {
-  add,
-  getRole,
-  getRoleAlias,
-  getRoleTreeById,
-  grant,
-  grantTree,
-  remove,
-  update,
-} from '@/api/system/role';
-import { mapGetters } from 'vuex';
-import { validatenull } from '@/utils/validate';
-
-import rushDialog from './components/rushDialog.vue';
-import batchDialog from './components/batchDialog.vue';
+import allocationDetails from './components/allocation/allocationDetails.vue';
+import statistics from './components/allocation/statistics.vue';
 export default {
   components: {
-    // rushDialog,
-    // batchDialog
+    allocationDetails,
+    statistics,
   },
   data() {
     return {
-      inBatchesOpen: false,
-      platingSmallOpen: false,
-      planOrderArr: [],
-      isOpen: false,
-      rowItem: {},
-      poId: null,
-      form: {},
-      box: false,
-      props: {
-        label: 'title',
-        value: 'key',
-      },
-      menuGrantList: [],
-      dataScopeGrantList: [],
-      apiScopeGrantList: [],
-      apiGrantList: [],
-      menuTreeObj: [],
-      dataScopeTreeObj: [],
-      apiScopeTreeObj: [],
-      selectionList: [],
-      query: {
-        pkno:'',prtmdept:"",subpkdateStart:"",subpkdateEnd:""
-      },
-      loading: true,
-      page: {
-        pageSize: 10,
-        currentPage: 1,
-        total: 0,
-      },
-      option: {
-        columnSort: true,
-        tip: false,
-        height: 'auto',
-        calcHeight: 32,
-        simplePage: false,
-        searchShow: true,
-        searchMenuSpan: 6,
-        searchIcon: true,
-        searchIndex: 3,
-        tree: false,
-        border: true,
-        index: true,
-        selection: false,
-        addBtn: false,
-        editBtn: false,
-        viewBtn: false,
-        delBtn: false,
-        editBtnText: '修改',
-        labelWidth: 120,
-        // searchLabelWidth: 120,
-        menuWidth: 150,
-        dialogWidth: 900,
-        dialogClickModal: false,
-        searchEnter: true,
-        excelBtn: false,
-        filterBtn: true,
-        searchShowBtn: false,
-        excelBtn: true,
-        showOverflowTooltip: true,
-        addBtnIcon: ' ',
-        viewBtnIcon: ' ',
-        delBtnIcon: ' ',
-        editBtnIcon: ' ',
-        gridBtn: false,
-        searchLabelPosition: 'left',
-        searchLabelPosition: 'left',
-        searchGutter: 24,
-        searchSpan: 6,
-        menuAlign: 'left',
-        gridBtn: false,
-        searchMenuPosition: 'right',
-        align: 'center',
-        menu: false,
-        column: [
-          {
-            label: '配套单号',
-            prop: 'pkno',
-            search: true,
-            sortable: true,
-            width: 150,
-            span: 12,
-            headerAlign: 'center',
-            align: 'center',
-            rules: [
-              {
-                required: true,
-                message: '请输入配套单号',
-                trigger: 'blur',
-              },
-            ],
-          },
-          {
-            label: '父件号',
-            prop: 'prntno',
-            search: false,
-            sortable: true,
-            width: 180,
-            span: 12,
-            headerAlign: 'center',
-            align: 'center',
-
-            rules: [
-              {
-                required: true,
-                message: '请输入父件号',
-                trigger: 'blur',
-              },
-            ],
-          },
-          {
-            label: '型号',
-            prop: 'mtltmrk',
-            search: false,
-            sortable: true,
-            disabled: true,
-            width: 120,
-            span: 12,
-            headerAlign: 'center',
-            align: 'center',
-            rules: [
-              {
-                required: false,
-                message: '请输入型号',
-                trigger: 'blur',
-              },
-            ],
-          },
-          {
-            label: '生产标识',
-            prop: 'prtlotno',
-            search: false,
-            sortable: true,
-            disabled: true,
-            span: 12,
-            width: 150,
-            headerAlign: 'center',
-            align: 'left',
-            rules: [
-              {
-                required: false,
-                message: '请输入生产标识',
-                trigger: 'blur',
-              },
-            ],
-          },
-          {
-            label: '需求日期',
-            prop: 'pkreqdat',
-            search: false,
-            sortable: true,
-            disabled: true,
-            span: 12,
-            width: 150,
-            headerAlign: 'center',
-            align: 'center',
-            rules: [
-              {
-                required: false,
-                message: '请输入需求日期',
-                trigger: 'blur',
-              },
-            ],
-          },
-          {
-            label: '父件批次',
-            prop: 'fjSplcode',
-            search: false,
-            sortable: true,
-            width: 120,
-            display: false,
-            span: 12,
-            headerAlign: 'center',
-            align: 'center',
-            rules: [
-              {
-                required: true,
-                message: '请输入父件批次',
-                trigger: 'blur',
-              },
-            ],
-          },
-          {
-            label: '父件配套数',
-            prop: 'fjPkavqty',
-            search: false,
-            sortable: true,
-            width: 120,
-            span: 12,
-            headerAlign: 'center',
-            align: 'center',
-            rules: [
-              {
-                required: true,
-                message: '请输入父件配套数',
-                trigger: 'blur',
-              },
-            ],
-          },
-          {
-            label: '配套序号',
-            prop: 'serialno',
-            search: false,
-            sortable: true,
-            disabled: true,
-            width: 120,
-            span: 12,
-            headerAlign: 'center',
-            align: 'center',
-            rules: [
-              {
-                required: true,
-                message: '请输入配套序号',
-                trigger: 'blur',
-              },
-            ],
-          },
-          {
-            label: '主制部门',
-            prop: 'prtmdept',
-            search: true,
-            sortable: true,
-            width: 120,
-            span: 12,
-            headerAlign: 'center',
-            align: 'center',
-            rules: [
-              {
-                required: true,
-                message: '请输入主制部门',
-                trigger: 'blur',
-              },
-            ],
-          },
-          {
-            label: '计划标记',
-            prop: 'plnsign',
-            search: false,
-            sortable: true,
-            width: 120,
-            span: 12,
-            disabled: true,
-            headerAlign: 'center',
-            align: 'center',
-            rules: [
-              {
-                required: false,
-                message: '请输入计划标记',
-                trigger: 'blur',
-              },
-            ],
-          },
-
-          {
-            label: '制造订单号',
-            prop: 'mono',
-            search: false,
-            sortable: true,
-            width: 150,
-            span: 12,
-            headerAlign: 'center',
-            align: 'center',
-
-            rules: [
-              {
-                required: true,
-                message: '请输入制造订单号',
-                trigger: 'blur',
-              },
-            ],
-          },
-          {
-            label: '计划员',
-            prop: 'schemer',
-            search: false,
-            sortable: true,
-            width: 120,
-            span: 12,
-            headerAlign: 'center',
-            align: 'center',
-            rules: [
-              {
-                required: true,
-                message: '请输入计划员',
-                trigger: 'blur',
-              },
-            ],
-          },
-          {
-            label: '调度员',
-            prop: 'planner1',
-            search: false,
-            sortable: true,
-            searchLabelWidth: 100,
-            width: 170,
-            span: 12,
-            type: 'date',
-            headerAlign: 'center',
-            align: 'center',
-            rules: [
-              {
-                required: true,
-                message: '请输入调度员',
-                trigger: 'blur',
-              },
-            ],
-          },
-          {
-            label: '配套日期',
-            prop: 'subpkdate',
-            search: true,
-            sortable: true,
-            span: 24,
-            type: 'textarea',
-            width: 150,
-            headerAlign: 'center',
-            align: 'left',
-            type: 'date',
-            searchRange: true,
-            startPlaceholder: '开始时间',
-            endPlaceholder: '结束时间',
-          },
-          {
-            label: '保管员',
-            prop: 'warctlr',
-            search: false,
-            sortable: true,
-            span: 12,
-            headerAlign: 'center',
-            align: 'center',
-            width: 150,
-          },
-          {
-            label: '条码序号',
-            prop: 'barcodeno',
-            search: false,
-            sortable: true,
-            span: 12,
-            headerAlign: 'center',
-            align: 'center',
-            width: 150,
-          },
-          {
-            label: '计划部门',
-            prop: 'plandept',
-            search: false,
-            sortable: true,
-            span: 12,
-            headerAlign: 'center',
-            align: 'center',
-            width: 150,
-          },
-
-          {
-            label: '物料标识',
-            prop: 'prtclass',
-            search: false,
-            sortable: true,
-            span: 12,
-            headerAlign: 'center',
-            align: 'center',
-            width: 150,
-          },
-          {
-            label: '备注',
-            prop: 'remark',
-            search: false,
-            sortable: true,
-            span: 12,
-            headerAlign: 'center',
-            align: 'center',
-            width: 150,
-          },
-        ],
-      },
-
-      data: [],
-      isRushOpen: false, //加急弹框
-      isBatchOpen: false, //分批处理
+      activeName: '1',
+      selectedDate: '',
+      rowData:{}
     };
   },
-  computed: {
-    ...mapGetters(['userInfo', 'permission']),
-    permissionList() {
-      return {
-        addBtn: this.validData(this.permission.role_add, false),
-        viewBtn: this.validData(this.permission.role_view, false),
-        delBtn: this.validData(this.permission.role_delete, false),
-        editBtn: this.validData(this.permission.role_edit, false),
-      };
-    },
-    ids() {
-      let ids = [];
-      this.selectionList.forEach(ele => {
-        ids.push(ele.id);
-      });
-      return ids.join(',');
-    },
-    idsArray() {
-      let ids = [];
-      this.selectionList.forEach(ele => {
-        ids.push(ele.id);
-      });
-      return ids;
-    },
-  },
-  watch: {
-    'form.currentAlias'() {
-      const alias = this.form.currentAlias;
-      if (!validatenull(alias)) {
-        this.form.roleAlias = alias;
-      }
-    },
-  },
-  methods: {
-    // 批量接收
-    batchReceiving() {
-      this.$confirm('确定将选择数据批量接收?', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          // return remove(row.id);
-        })
-        .then(() => {
-          // this.onLoad(this.page);
-          // this.$message({
-          //     type: 'success',
-          //     message: '操作成功!',
-          // });
-        });
-    },
-    // 批量关闭
-    batchClose() {
-      this.$confirm('确定将选择数据批量关闭?', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          // return remove(row.id);
-        })
-        .then(() => {
-          // this.onLoad(this.page);
-          // this.$message({
-          //     type: 'success',
-          //     message: '操作成功!',
-          // });
-        });
-    },
-    // 加急
-    rushFn() {
-      this.isRushOpen = true;
-    },
-    closeDialog() {
-      this.isRushOpen = false;
-      this.isBatchOpen = false;
-    },
-    inBatchesFn(row) {
-      this.rowItem = row;
-      this.isBatchOpen = true;
-    },
-    subclass() {
-      this.platingSmallOpen = true;
-    },
-    lookProcessRoute(row) {
-      this.isOpen = true;
-      this.rowItem = row;
-    },
-    cancel(refresh) {
-      if (refresh) {
-        this.$refs.myTable.load();
-      }
-      this.inBatchesOpen = false;
-      this.isOpen = false;
-      this.planFormOpen = false;
-      this.platingSmallOpen = false;
-    },
-    initData(roleId) {
-      getRoleTreeById(roleId).then(res => {
-        const column = this.findObject(this.option.column, 'parentId');
-        column.dicData = res.data.data;
-      });
-    },
-    submit() {
-      const menuList = this.$refs.treeMenu.getCheckedKeys();
-      const dataScopeList = this.$refs.treeDataScope.getCheckedKeys();
-      const apiScopeList = this.$refs.treeApiScope.getCheckedKeys();
-      grant(this.idsArray, menuList, dataScopeList, apiScopeList).then(() => {
-        this.box = false;
-        this.$message({
-          type: 'success',
-          message: '操作成功!',
-        });
-        this.selectionList = [];
-        this.onLoad(this.page);
-      });
-    },
-    rowSave(row, done, loading) {
-      add(row).then(
-        () => {
-          this.onLoad(this.page);
-          this.$message({
-            type: 'success',
-            message: '操作成功!',
-          });
-          done();
-        },
-        error => {
-          window.console.log(error);
-          loading();
-        }
-      );
-    },
-    rowUpdate(row, index, done, loading) {
-      update(row).then(
-        () => {
-          this.onLoad(this.page);
-          this.$message({
-            type: 'success',
-            message: '操作成功!',
-          });
-          done();
-        },
-        error => {
-          window.console.log(error);
-          loading();
-        }
-      );
-    },
-    rowDel(row) {
-      this.$confirm('确定将选择数据删除?', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          return remove(row.id);
-        })
-        .then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: 'success',
-            message: '操作成功!',
-          });
-        });
-    },
 
-    searchReset() {
-      this.query = {};
-      this.onLoad(this.page);
-    },
-    searchChange(params, done) {
-      this.query = params;
-      this.page.currentPage = 1;
-      this.onLoad(this.page, params);
-      done();
-    },
-    selectionChange(list) {
-      this.selectionList = list;
-    },
-    selectionClear() {
-      this.selectionList = [];
-      this.$refs.crud.toggleSelection();
-    },
-    beforeOpen(done, type) {
-      if (['add', 'edit'].includes(type)) {
-        this.initData(this.form.id);
-      }
-      if (['edit', 'view'].includes(type)) {
-        if (this.form.parentId === '0') {
-          this.form.parentId = '';
-        }
-      }
-      getRoleAlias().then(res => {
-        const column = this.findObject(this.option.column, 'currentAlias');
-        column.dicData = res.data.data;
-      });
-      done();
-    },
-    handleRole() {
-      if (this.selectionList.length !== 1) {
-        this.$message.warning('只能选择一条数据');
-        return;
-      }
-      this.menuTreeObj = [];
-      this.dataScopeTreeObj = [];
-      this.apiScopeTreeObj = [];
-      grantTree().then(res => {
-        this.menuGrantList = res.data.data.menu;
-        this.dataScopeGrantList = res.data.data.dataScope;
-        this.apiScopeGrantList = res.data.data.apiScope;
-        getRole(this.ids).then(res => {
-          this.menuTreeObj = res.data.data.menu;
-          this.dataScopeTreeObj = res.data.data.dataScope;
-          this.apiScopeTreeObj = res.data.data.apiScope;
-          this.box = true;
-        });
-      });
-    },
-    handleRowRole(row) {
-      this.menuTreeObj = [];
-      this.dataScopeTreeObj = [];
-      this.apiScopeTreeObj = [];
-      grantTree().then(res => {
-        this.menuGrantList = res.data.data.menu;
-        this.dataScopeGrantList = res.data.data.dataScope;
-        this.apiScopeGrantList = res.data.data.apiScope;
-        getRole(row.id).then(res => {
-          this.menuTreeObj = res.data.data.menu;
-          this.dataScopeTreeObj = res.data.data.dataScope;
-          this.apiScopeTreeObj = res.data.data.apiScope;
-          this.selectionList.push(row);
-          this.box = true;
-        });
-      });
-    },
-    handleDelete() {
-      if (this.selectionList.length === 0) {
-        this.$message.warning('请选择至少一条数据');
-        return;
-      }
-      this.$confirm('确定将选择数据删除?', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          return remove(this.ids);
-        })
-        .then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: 'success',
-            message: '操作成功!',
-          });
-          this.$refs.crud.toggleSelection();
-        });
-    },
-    currentChange(currentPage) {
-      this.page.currentPage = currentPage;
-    },
-    sizeChange(pageSize) {
-      this.page.pageSize = pageSize;
-    },
-    refreshChange() {
-      this.onLoad(this.page, this.query);
-    },
-    handleChange(file, fileList) {
-      // proxy.$Export.xlsx(file.raw).then((data) => {
-      //     data.value = data.results;
-      // });
-      this.$message({
-        type: 'success',
-        message: '操作成功!',
-      });
+  methods: {
+    handleClick() {
+      // console.log(9999999, this.activeName);
+      this.rowData = {}
     },
-
-    async onLoad(page, params = {}) {
-      this.loading = true;
-      try {
-        const res = await getList({
-          current:this.page.currentPage,
-          size:this.page.pageSize,
-          ...this.query
-        });
-          this.data = res.data.data.records;
-          this.page.total = res.data.data.total;
-          this.selectionClear();
-      } catch (err) {
-        console.log(err);
-      }
-      this.loading = false;
+    handleStatisticsEdit(row) {
+      this.rowData = row;
+      this.activeName = '2';
     },
   },
   mounted() {},
diff --git a/src/views/orderManagement/components/allocation/allocationDetails.vue b/src/views/orderManagement/components/allocation/allocationDetails.vue
new file mode 100644
index 00000000..984af812
--- /dev/null
+++ b/src/views/orderManagement/components/allocation/allocationDetails.vue
@@ -0,0 +1,469 @@
+<template>
+  <div>
+    <avue-crud
+      :option="option"
+      :table-loading="loading"
+      :data="data"
+      v-model="form"
+      v-model:page="page"
+      v-model:search="query"
+      ref="crud"
+      @search-change="searchChange"
+      @search-reset="searchReset"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+      @refresh-change="refreshChange"
+    >
+      <template #menu-left> </template>
+      <template #menu-right> </template>
+
+      <template #poCode="{ row }">
+        <el-text type="primary">{{ row.poCode }}</el-text>
+      </template>
+      <template #prodIdent="{ row }">
+        <el-tag>{{ row.prodIdent }}</el-tag>
+      </template>
+      <template #curStatusText="{ row }">
+        <el-tag v-if="row.curStatusText == '已派工'">{{ row.curStatusText }}</el-tag>
+        <el-tag class="ml-2" type="success" v-if="row.curStatusText == '已完工'">
+          {{ row.curStatusText }}</el-tag
+        >
+        <el-tag class="ml-2" type="info" v-if="row.curStatusText == '已关闭'">{{
+          row.curStatusText
+        }}</el-tag>
+        <el-tag class="ml-2" type="warning" v-if="row.curStatusText == '加工中'">{{
+          row.curStatusText
+        }}</el-tag>
+        <el-tag class="ml-2" type="danger" v-if="row.curStatusText == '已退回'">{{
+          row.curStatusText
+        }}</el-tag>
+      </template>
+      <template #menu="{ row }"> </template>
+    </avue-crud>
+  </div>
+</template>
+
+<script>
+import { getList } from '@/api/orderManagement/allocationMessQuery';
+import { mapGetters } from 'vuex';
+import { validatenull } from '@/utils/validate';
+export default {
+  components: {},
+  props: {
+    rowData: {
+      type: Object,
+      default: () => {},
+    },
+  },
+
+  data() {
+    return {
+      inBatchesOpen: false,
+      platingSmallOpen: false,
+      planOrderArr: [],
+      isOpen: false,
+      rowItem: {},
+      poId: null,
+      form: {},
+      box: false,
+      props: {
+        label: 'title',
+        value: 'key',
+      },
+      menuGrantList: [],
+      dataScopeGrantList: [],
+      apiScopeGrantList: [],
+      apiGrantList: [],
+      menuTreeObj: [],
+      dataScopeTreeObj: [],
+      apiScopeTreeObj: [],
+      selectionList: [],
+      query: {
+        pkno: '',
+        prtmdept: '',
+        subpkdateStart: '',
+        subpkdateEnd: '',
+        subpkdate: [],
+        schemerName: '',
+      },
+      loading: false,
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0,
+      },
+      option: {
+        columnSort: true,
+        tip: false,
+        height: 'auto',
+        calcHeight: 32,
+        simplePage: false,
+        searchShow: true,
+        searchMenuSpan: 6,
+        searchIcon: true,
+        searchIndex: 3,
+        tree: false,
+        border: true,
+        index: true,
+        selection: false,
+        addBtn: false,
+        editBtn: false,
+        viewBtn: false,
+        delBtn: false,
+        editBtnText: '修改',
+        labelWidth: 120,
+        // searchLabelWidth: 120,
+        menuWidth: 150,
+        dialogWidth: 900,
+        dialogClickModal: false,
+        searchEnter: true,
+        excelBtn: false,
+        filterBtn: true,
+        searchShowBtn: false,
+        excelBtn: true,
+        showOverflowTooltip: true,
+        addBtnIcon: ' ',
+        viewBtnIcon: ' ',
+        delBtnIcon: ' ',
+        editBtnIcon: ' ',
+        gridBtn: false,
+        searchLabelPosition: 'left',
+        searchLabelWidth: 'auto',
+        searchGutter: 24,
+        searchSpan: 6,
+        menuAlign: 'center',
+        gridBtn: false,
+        searchMenuPosition: 'right',
+        align: 'center',
+        menu: false,
+        column: [
+          {
+            label: '配套单号',
+            prop: 'pkno',
+            search: true,
+            sortable: true,
+            width: 150,
+            span: 12,
+            headerAlign: 'center',
+            align: 'center',
+          },
+          {
+            label: '父件号',
+            prop: 'prntno',
+            search: false,
+            sortable: true,
+            width: 180,
+            span: 12,
+            headerAlign: 'center',
+            align: 'center',
+          },
+          {
+            label: '型号',
+            prop: 'mtltmrk',
+            search: false,
+            sortable: true,
+            disabled: true,
+            width: 120,
+            span: 12,
+            headerAlign: 'center',
+            align: 'center',
+          },
+          {
+            label: '生产标识',
+            prop: 'prtlotno',
+            search: false,
+            sortable: true,
+            disabled: true,
+            span: 12,
+            width: 150,
+            headerAlign: 'center',
+            align: 'left',
+          },
+          {
+            label: '需求日期',
+            prop: 'pkreqdat',
+            search: false,
+            sortable: true,
+            disabled: true,
+            span: 12,
+            width: 150,
+            headerAlign: 'center',
+            align: 'center',
+          },
+          {
+            label: '父件批次',
+            prop: 'fjSplcode',
+            search: false,
+            sortable: true,
+            width: 120,
+            display: false,
+            span: 12,
+            headerAlign: 'center',
+            align: 'center',
+          },
+          {
+            label: '父件配套数',
+            prop: 'fjPkavqty',
+            search: false,
+            sortable: true,
+            width: 120,
+            span: 12,
+            headerAlign: 'center',
+            align: 'center',
+          },
+          {
+            label: '配套序号',
+            prop: 'serialno',
+            search: false,
+            sortable: true,
+            disabled: true,
+            width: 120,
+            span: 12,
+            headerAlign: 'center',
+            align: 'center',
+          },
+          {
+            label: '主制部门',
+            prop: 'prtmdept',
+            search: true,
+            sortable: true,
+            width: 120,
+            span: 12,
+            headerAlign: 'center',
+            align: 'center',
+          },
+          {
+            label: '计划标记',
+            prop: 'plnsign',
+            search: false,
+            sortable: true,
+            width: 120,
+            span: 12,
+            disabled: true,
+            headerAlign: 'center',
+            align: 'center',
+          },
+
+          {
+            label: '制造订单号',
+            prop: 'mono',
+            search: false,
+            sortable: true,
+            width: 150,
+            span: 12,
+            headerAlign: 'center',
+            align: 'center',
+          },
+          {
+            label: '计划部门',
+            prop: 'schemerName',
+            search: true,
+            sortable: true,
+            width: 120,
+            span: 12,
+            headerAlign: 'center',
+            align: 'center',
+            searchOrder: 19,
+          },
+          {
+            label: '计划员',
+            prop: 'schemer',
+            search: false,
+            sortable: true,
+            width: 120,
+            span: 12,
+            headerAlign: 'center',
+            align: 'center',
+          },
+          {
+            label: '调度员',
+            prop: 'planner1',
+            search: false,
+            sortable: true,
+            searchLabelWidth: 100,
+            width: 170,
+            span: 12,
+            type: 'date',
+            headerAlign: 'center',
+            align: 'center',
+          },
+          {
+            label: '配套日期',
+            prop: 'subpkdate',
+            search: true,
+            sortable: true,
+            span: 24,
+            width: 150,
+            headerAlign: 'center',
+            align: 'left',
+            type: 'date',
+            searchRange: true,
+            startPlaceholder: '开始时间',
+            endPlaceholder: '结束时间',
+            searchOrder: 20,
+            searchRules: [
+              {
+                required: true,
+                message: '请选择配套日期',
+                trigger: 'blur',
+              },
+            ],
+          },
+          {
+            label: '保管员',
+            prop: 'warctlr',
+            search: false,
+            sortable: true,
+            span: 12,
+            headerAlign: 'center',
+            align: 'center',
+            width: 150,
+          },
+          {
+            label: '条码序号',
+            prop: 'barcodeno',
+            search: false,
+            sortable: true,
+            span: 12,
+            headerAlign: 'center',
+            align: 'center',
+            width: 150,
+          },
+          {
+            label: '计划部门',
+            prop: 'plandept',
+            search: false,
+            sortable: true,
+            span: 12,
+            headerAlign: 'center',
+            align: 'center',
+            width: 150,
+          },
+
+          {
+            label: '物料标识',
+            prop: 'prtclass',
+            search: false,
+            sortable: true,
+            span: 12,
+            headerAlign: 'center',
+            align: 'center',
+            width: 150,
+          },
+          {
+            label: '备注',
+            prop: 'remark',
+            search: false,
+            sortable: true,
+            span: 12,
+            headerAlign: 'center',
+            align: 'center',
+            width: 150,
+          },
+        ],
+      },
+
+      data: [],
+      isRushOpen: false, //加急弹框
+      isBatchOpen: false, //分批处理
+    };
+  },
+  computed: {
+    ...mapGetters(['userInfo', 'permission']),
+    permissionList() {
+      return {
+        addBtn: this.validData(this.permission.role_add, false),
+        viewBtn: this.validData(this.permission.role_view, false),
+        delBtn: this.validData(this.permission.role_delete, false),
+        editBtn: this.validData(this.permission.role_edit, false),
+      };
+    },
+    ids() {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(',');
+    },
+    idsArray() {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids;
+    },
+  },
+  watch: {
+    'form.currentAlias'() {
+      const alias = this.form.currentAlias;
+      if (!validatenull(alias)) {
+        this.form.roleAlias = alias;
+      }
+    },
+  },
+  mounted() {
+    if (Object.keys(this.rowData).length > 0) {
+      if (this.rowData.partName) {
+        this.query.schemerName = this.rowData.partName;
+      }
+      if (this.rowData.startDate && this.rowData.endDate) {
+        this.query.subpkdate = [this.rowData.startDate, this.rowData.endDate];
+      }
+      this.$nextTick(() => {
+        this.onLoad(this.page, this.query);
+      });
+    }
+  },
+  methods: {
+    closeDialog() {
+      this.isRushOpen = false;
+      this.isBatchOpen = false;
+    },
+
+    searchReset() {
+      this.query = {};
+      this.onLoad(this.page);
+    },
+    searchChange(params, done) {
+      if (params.partCode && Array.isArray(params.partCode)) {
+        // 根据后端接口要求，拆分开始时间和结束时间
+        // 如果后端接收 startDate 和 endDate
+        params.startDate = params.partCode[0];
+        params.endDate = params.partCode[1];
+
+        // 删除原始的 partCode 数组，避免传递多余参数或格式错误
+        delete params.partCode;
+      }
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.query);
+    },
+    async onLoad(page, params = {}) {
+      // this.loading = true;
+      try {
+        const res = await getList({
+          current: this.page.currentPage,
+          size: this.page.pageSize,
+          ...this.query,
+        });
+        this.data = res.data.data.records;
+        this.page.total = res.data.data.total;
+      } catch (err) {
+        console.log(err);
+      }
+      // this.loading = false;
+    },
+  },
+};
+</script>
diff --git a/src/views/orderManagement/components/allocation/statistics.vue b/src/views/orderManagement/components/allocation/statistics.vue
new file mode 100644
index 00000000..bbaf5c72
--- /dev/null
+++ b/src/views/orderManagement/components/allocation/statistics.vue
@@ -0,0 +1,185 @@
+<template>
+  <div>
+    <avue-crud
+      :option="option"
+      :table-loading="loading"
+      :data="data"
+      v-model="form"
+      v-model:page="page"
+      ref="crud"
+      @search-change="searchChange"
+      @search-reset="searchReset"
+      @selection-change="selectionChange"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+      @refresh-change="refreshChange"
+    >
+      <template #menu-left> </template>
+      <template #menu-right> </template>
+      <template #menu="scope">
+        <el-button type="text" @click="handleEdit(scope.row)">明细</el-button>
+      </template>
+    </avue-crud>
+  </div>
+</template>
+
+<script>
+export default {
+  components: {},
+  data() {
+    return {
+      form: {},
+      selectionList: [],
+      query: {},
+      loading: false,
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0,
+      },
+      option: {
+        columnSort: true,
+        tip: false,
+        height: 'auto',
+        calcHeight: 32,
+        simplePage: false,
+        searchShow: true,
+        searchMenuSpan: 12,
+        searchIcon: true,
+        searchIndex: 3,
+        tree: false,
+        border: true,
+        index: true,
+        selection: false,
+        addBtn: false,
+        editBtn: false,
+        viewBtn: false,
+        delBtn: false,
+        editBtnText: '修改',
+        labelWidth: 120,
+        menuWidth: 80,
+        dialogWidth: 900,
+        dialogClickModal: false,
+        searchEnter: true,
+        excelBtn: false,
+        filterBtn: true,
+        searchShowBtn: false,
+        excelBtn: true,
+        showOverflowTooltip: true,
+        addBtnIcon: ' ',
+        viewBtnIcon: ' ',
+        delBtnIcon: ' ',
+        editBtnIcon: ' ',
+        gridBtn: false,
+        searchLabelPosition: 'left',
+        searchLabelWidth: 'auto',
+        searchGutter: 24,
+        searchSpan: 6,
+        menuAlign: 'center',
+        gridBtn: false,
+        searchMenuPosition: 'right',
+        align: 'center',
+        column: [
+          {
+            label: '配套日期',
+            prop: 'subpkdate',
+            search: true,
+            sortable: true,
+            span: 12,
+            type: 'date',
+            format: 'YYYY-MM-DD', // 显示格式
+            valueFormat: 'YYYY-MM-DD', // 提交给后端的格式
+            searchRange: true,
+            startPlaceholder: '开始时间',
+            endPlaceholder: '结束时间',
+            searchRules: [
+              {
+                required: true,
+                message: '请选择配套日期',
+                trigger: 'blur',
+              },
+            ],
+          },
+          {
+            label: '计划部门',
+            prop: 'partName',
+            search: true,
+            sortable: true,
+            span: 12,
+          },
+          {
+            label: '配套数量',
+            prop: 'num',
+            search: false,
+            sortable: false,
+            span: 12,
+          },
+        ],
+      },
+
+      data: [
+        {
+          subpkdate: '2026-01-02',
+          partName: '部门1',
+          num: '33',
+        },
+      ],
+    };
+  },
+  methods: {
+    handleEdit(row) {
+      this.$emit('edit-row', {...this.query,...row});
+    },
+    searchReset() {
+      this.query = {};
+      this.onLoad(this.page);
+    },
+    searchChange(params, done) {
+      if (params.subpkdate && Array.isArray(params.subpkdate)) {
+        // 根据后端接口要求，拆分开始时间和结束时间
+        // 如果后端接收 startDate 和 endDate
+        params.startDate = params.subpkdate[0];
+        params.endDate = params.subpkdate[1];
+
+        // 删除原始的 subpkdate 数组，避免传递多余参数或格式错误
+        delete params.subpkdate;
+      }
+
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    selectionClear() {
+      this.selectionList = [];
+      this.$refs.crud.toggleSelection();
+    },
+
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.query);
+    },
+
+    onLoad(page, params = {}) {
+      // this.loading = true;
+      console.log(page, params, this.query);
+      // getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+      //   this.data = res.data.data.records;
+      //   this.loading = false;
+      //   this.page.total = res.data.data.total;
+      //   this.selectionClear();
+      // });
+    },
+  },
+  mounted() {},
+};
+</script>
+d
\ No newline at end of file
diff --git a/src/views/orderManagement/components/exception/dataMissing.vue b/src/views/orderManagement/components/exception/dataMissing.vue
index 19557454..931d22d2 100644
--- a/src/views/orderManagement/components/exception/dataMissing.vue
+++ b/src/views/orderManagement/components/exception/dataMissing.vue
@@ -1,188 +1,242 @@
 <template>
-  <avue-crud
-    :option="option"
-    :table-loading="loading"
-    :data="data"
-    v-model="form"
-    v-model:page="page"
-    ref="crud"
-    @row-del="rowDel"
-    @search-change="searchChange"
-    @search-reset="searchReset"
-    @selection-change="selectionChange"
-    @current-change="currentChange"
-    @size-change="sizeChange"
-    @refresh-change="refreshChange"
-    @on-load="onLoad"
-    @row-update="rowUpdate"
-  >
-    <template #menu-left>
-      <el-button type="primary" @click="claseOrder()" >关闭订单</el-button>
-    </template>
-    <template #menu-right> </template>
+  <div>
+    <avue-crud
+      :option="option"
+      :table-loading="loading"
+      :data="data"
+      v-model="form"
+      v-model:page="page"
+      ref="crud"
+      @row-del="rowDel"
+      @search-change="searchChange"
+      @search-reset="searchReset"
+      @selection-change="selectionChange"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+      @refresh-change="refreshChange"
+      @on-load="onLoad"
+      @row-update="rowUpdate"
+    >
+      <template #menu-left>
+        <el-button type="primary" @click="claseOrder()">关闭订单</el-button>
+      </template>
+      <template #menu-right> </template>
 
-    <template #ypCode="{ row }">
-      <el-text type="primary">{{ row.ypCode }}</el-text>
-    </template>
-    <template #productIdent="{ row }">
-      <el-tag>{{ row.productIdent }}</el-tag>
-    </template>
-    <template #curStatusText="{ row }">
-      <el-tag v-if="row.curStatusText == '已派工'">{{ row.curStatusText }}</el-tag>
-      <el-tag class="ml-2" type="success" v-if="row.curStatusText == '已完工'">
-        {{ row.curStatusText }}</el-tag
-      >
-      <el-tag class="ml-2" type="info" v-if="row.curStatusText == '已关闭'">{{
-        row.curStatusText
-      }}</el-tag>
-      <el-tag class="ml-2" type="warning" v-if="row.curStatusText == '加工中'">{{
-        row.curStatusText
-      }}</el-tag>
-      <el-tag class="ml-2" type="danger" v-if="row.curStatusText == '已退回'">{{
-        row.curStatusText
-      }}</el-tag>
-      <el-tag class="ml-2" type="danger" v-if="row.curStatusText == '无工艺'">{{
-        row.curStatusText
-      }}</el-tag>
-    </template>
-    <template #menu="{ row }">
-      <el-button type="primary" text @click="editData(row)">修改</el-button>
-      <el-button text @click="editData1(row)">修改1</el-button>
-      <!-- <el-button type="primary" text plain style="border: 0; background-color: transparent !important"
+      <template #ypCode="{ row }">
+        <el-text type="primary">{{ row.ypCode }}</el-text>
+      </template>
+      <template #productIdent="{ row }">
+        <el-tag>{{ row.productIdent }}</el-tag>
+      </template>
+      <template #curStatusText="{ row }">
+        <el-tag v-if="row.curStatusText == '已派工'">{{ row.curStatusText }}</el-tag>
+        <el-tag class="ml-2" type="success" v-if="row.curStatusText == '已完工'">
+          {{ row.curStatusText }}</el-tag
+        >
+        <el-tag class="ml-2" type="info" v-if="row.curStatusText == '已关闭'">{{
+          row.curStatusText
+        }}</el-tag>
+        <el-tag class="ml-2" type="warning" v-if="row.curStatusText == '加工中'">{{
+          row.curStatusText
+        }}</el-tag>
+        <el-tag class="ml-2" type="danger" v-if="row.curStatusText == '已退回'">{{
+          row.curStatusText
+        }}</el-tag>
+        <el-tag class="ml-2" type="danger" v-if="row.curStatusText == '无工艺'">{{
+          row.curStatusText
+        }}</el-tag>
+      </template>
+      <template #menu="{ row }">
+        <el-button type="primary" text @click="editData(row)">修改</el-button>
+        <!-- <el-button text @click="editData1(row)">修改1</el-button> -->
+        <!-- <el-button type="primary" text plain style="border: 0; background-color: transparent !important"
                 @click="lookProcessRoute(row)">查看工艺路线
             </el-button> -->
-    </template>
-    <template #demandDate="{ row }">
+      </template>
+      <template #demandDate="{ row }">
         {{ row.demandDate ? row.demandDate.substring(0, 10) : '' }}
       </template>
       <template #releaseDate="{ row }">
         {{ row.releaseDate ? row.releaseDate.substring(0, 10) : '' }}
       </template>
-  </avue-crud>
-  <el-dialog v-model="isEdit" width="900" title="修改">
-    <el-form :model="editForm" ref="form" :rules="formRules" label-width="120">
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="计划单号" prop="ypCode">
-            <el-input v-model="editForm.ypCode" clearable placeholder="请输入计划单号"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="零件号" prop="partCode">
-            <el-select v-model="editForm.partCode" remote :remote-method="queryCode" filterable :loading="partLoading" placeholder="请选择零件号" @change="changePart">
-              <el-option v-for="item in partCodeList" :key="item.partCode" :label="item.partCode" :value="item.partCode"></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="产品型号" prop="productType">
-            <el-input v-model="editForm.productType" disabled placeholder="请输入产品型号"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="产品名称" prop="partName">
-            <el-input v-model="editForm.partName" disabled placeholder="请输入产品名称"></el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="镀种" prop="plate">
-            <el-input v-model="editForm.plate" clearable disabled placeholder="请输入镀种"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="面积(dm²)" prop="ypArea">
-            <el-input v-model="editForm.ypArea" clearable disabled placeholder="请输入面积(dm²)"></el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="生产标识" prop="productIdent">
-            <el-select v-model="editForm.productIdent" placeholder="请选择生产标识">
-              <el-option v-for="item in productIdentList" :key="item.id" :label="item.name" :value="item.name"></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="使用部门" prop="useDept">
-            <el-input v-model="editForm.useDept" clearable disabled placeholder="请输入使用部门"></el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="生产数量" prop="ypQty">
-            <el-input v-model="editForm.ypQty" clearable  placeholder="请输入生产数量"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="需求交期" prop="demandDate">
-            <el-date-picker 
-              style="width:100%"
-              type="datetime" placeholder="请选择需求交期" 
-              format="YYYY-MM-DD HH:mm:ss" 
-              value-format="YYYY-MM-DD HH:mm:ss" 
-              v-model="editForm.demandDate" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="计划员" prop="planUser">
-            <el-input v-model="editForm.planUser" clearable  placeholder="请输入计划员"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="计划下达时间" prop="releaseDate">
-            <el-date-picker 
-              style="width:100%"
-              type="datetime" placeholder="请选择计划下达时间" 
-              format="YYYY-MM-DD HH:mm:ss" 
-              value-format="YYYY-MM-DD HH:mm:ss" 
-              v-model="editForm.releaseDate" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="24">
-          <el-form-item label="备注" prop="memo">
-            <el-input v-model="editForm.memo" type="textarea" placeholder="请输入备注"></el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="isEdit = false">取 消</el-button>
-        <el-button type="primary" @click="submitEdit">确定</el-button>
-      </span>
-    </template>
-  </el-dialog>
+    </avue-crud>
+    <el-dialog v-model="isEdit" width="900" title="修改">
+      <el-form :model="editForm" ref="form" :rules="formRules" label-width="120">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="计划单号" prop="ypCode">
+              <el-input v-model="editForm.ypCode" clearable placeholder="请输入计划单号"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="零件号" prop="partCode">
+              
+              <!-- <el-select
+                v-model="editForm.partCode"
+                remote
+                :remote-method="queryCode"
+                filterable
+                :loading="partLoading"
+                placeholder="请选择零件号"
+                @change="changePart"
+              >
+                <el-option
+                  v-for="item in partCodeList"
+                  :key="item.partCode"
+                  :label="item.partCode"
+                  :value="item.partCode"
+                ></el-option>
+              </el-select> -->
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="产品型号" prop="productType">
+              <el-input
+                v-model="editForm.productType"
+                disabled
+                placeholder="请输入产品型号"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="产品名称" prop="partName">
+              <el-input
+                v-model="editForm.partName"
+                disabled
+                placeholder="请输入产品名称"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="镀种" prop="plate">
+              <el-input
+                v-model="editForm.plate"
+                clearable
+                disabled
+                placeholder="请输入镀种"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="面积(dm²)" prop="ypArea">
+              <el-input
+                v-model="editForm.ypArea"
+                clearable
+                disabled
+                placeholder="请输入面积(dm²)"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="生产标识" prop="productIdent">
+              <el-select v-model="editForm.productIdent" placeholder="请选择生产标识">
+                <el-option
+                  v-for="item in productIdentList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.name"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="使用部门" prop="useDept">
+              <el-input
+                v-model="editForm.useDept"
+                clearable
+                disabled
+                placeholder="请输入使用部门"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="生产数量" prop="ypQty">
+              <el-input v-model="editForm.ypQty" clearable placeholder="请输入生产数量"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="需求交期" prop="demandDate">
+              <el-date-picker
+                style="width: 100%"
+                type="datetime"
+                placeholder="请选择需求交期"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="editForm.demandDate"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="计划员" prop="planUser">
+              <el-input v-model="editForm.planUser" clearable placeholder="请输入计划员"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="计划下达时间" prop="releaseDate">
+              <el-date-picker
+                style="width: 100%"
+                type="datetime"
+                placeholder="请选择计划下达时间"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="editForm.releaseDate"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="memo">
+              <el-input v-model="editForm.memo" type="textarea" placeholder="请输入备注"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="isEdit = false">取 消</el-button>
+          <el-button type="primary" @click="submitEdit">确定</el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
 </template>
 
-<script> 
-import { getList, closeBatchs,updateData,getPartList,getProductionIdentificationList} from '@/api/orderManagement/exceptionOrder';
+<script>
+import {
+  getList,
+  closeBatchs,
+  updateData,
+  getPartList,
+  getProductionIdentificationList,
+} from '@/api/orderManagement/exceptionOrder';
 export default {
   data() {
     return {
-      editForm:{},
-      formRules:{
-        ypCode:[{required: true, message: '请输入计划单号', trigger: 'change'}],
-        partCode:[{required: true, message: '请选择零件号', trigger: 'change'}],
-        productIdent:[{required: true, message: '请选择生产标识', trigger: 'change'}],
-        ypQty:[{required: true, message: '请输入生产数量', trigger: 'change'}],
-        demandDate:[{required: true, message: '请选择需求交期', trigger: 'change'}],
-        planUser:[{required: true, message: '请输入计划员', trigger: 'change'}],
-        releaseDate:[{required: true, message: '请选择计划下达时间', trigger: 'change'}]
+      editForm: {},
+      formRules: {
+        ypCode: [{ required: true, message: '请输入计划单号', trigger: 'change' }],
+        partCode: [{ required: true, message: '请选择零件号', trigger: 'change' }],
+        productIdent: [{ required: true, message: '请选择生产标识', trigger: 'change' }],
+        ypQty: [{ required: true, message: '请输入生产数量', trigger: 'change' }],
+        demandDate: [{ required: true, message: '请选择需求交期', trigger: 'change' }],
+        planUser: [{ required: true, message: '请输入计划员', trigger: 'change' }],
+        releaseDate: [{ required: true, message: '请选择计划下达时间', trigger: 'change' }],
         // productType:[{required: true, message: '请输入产品型号', trigger: 'blur'}]
       },
-      partCodeList:[],
-      productIdentList:[],
-      isEdit:false,
+      partCodeList: [],
+      productIdentList: [],
+      isEdit: false,
       isOpen: false,
       rowItem: {},
       poId: null,
@@ -244,7 +298,6 @@ export default {
         menuAlign: 'left',
         gridBtn: false,
         searchLabelPosition: 'left',
-        searchLabelPosition: 'left',
         searchGutter: 24,
         searchSpan: 6,
         menuAlign: 'center',
@@ -292,11 +345,11 @@ export default {
             prop: 'partCode1',
             search: true,
             sortable: true,
-            addDisplay:false,
-            editDisplay:false,
+            addDisplay: false,
+            editDisplay: false,
             width: 150,
             span: 12,
-            hide:true,
+            hide: true,
             headerAlign: 'center',
             align: 'center',
             // rules: [
@@ -467,10 +520,10 @@ export default {
             span: 12,
             headerAlign: 'center',
             align: 'center',
-            dicUrl:'/api/blade-desk/BA/ProdMark/listForSelect',
-            props:{
-              label:'name',
-              value:'name'
+            dicUrl: '/api/blade-desk/BA/ProdMark/listForSelect',
+            props: {
+              label: 'name',
+              value: 'name',
             },
             rules: [
               {
@@ -622,6 +675,31 @@ export default {
               },
             ],
           },
+          // receiveStatus
+          {
+            label: '接收状态',
+            prop: 'receiveStatus',
+            search: false,
+            sortable: true,
+            span: 24,
+            width: 100,
+          },
+          {
+            label: '接收人',
+            prop: 'receiveUserName',
+            search: false,
+            sortable: true,
+            span: 24,
+            width: 100,
+          },
+          {
+            label: '接收时间',
+            prop: 'receiveTime',
+            search: false,
+            sortable: true,
+            span: 24,
+            width: 100,
+          },
           {
             label: '备注',
             prop: 'memo',
@@ -632,102 +710,94 @@ export default {
             width: 150,
             headerAlign: 'center',
             align: 'left',
-            // rules: [
-            //   {
-            //     required: true,
-            //     message: '请输入备注',
-            //     trigger: 'blur',
-            //   },
-            // ],
           },
         ],
       },
 
       data: [],
-      partLoading:false,
-      
+      partLoading: false,
     };
   },
 
   methods: {
-    async editData(row){
-      this.editForm = JSON.parse(JSON.stringify(row))
+    async editData(row) {
+      this.editForm = JSON.parse(JSON.stringify(row));
       const partRes = await getPartList({
-        current:1,
-        size:50
-      })
-      this.partCodeList = partRes.data.data.records
-      let tmp = this.partCodeList.find(item => item.partCode == row.partCode)
-      if(!tmp){
+        current: 1,
+        size: 50,
+      });
+      this.partCodeList = partRes.data.data.records;
+      let tmp = this.partCodeList.find(item => item.partCode == row.partCode);
+      if (!tmp) {
         const partRes = await getPartList({
-          current:1,
-          size:50,
-          partCode:row.partCode
-        })
-        this.partCodeList = [...this.partCodeList,...partRes.data.data.records]
+          current: 1,
+          size: 50,
+          partCode: row.partCode,
+        });
+        this.partCodeList = [...this.partCodeList, ...partRes.data.data.records];
       }
-      const productRes = await getProductionIdentificationList()
-      this.productIdentList = productRes.data.data
-      this.isEdit = true
+      const productRes = await getProductionIdentificationList();
+      this.productIdentList = productRes.data.data;
+      this.isEdit = true;
     },
-    queryCode(query){
-      this.partLoading = true
-      if(query){
+    queryCode(query) {
+      this.partLoading = true;
+      if (query) {
         getPartList({
-          current:1,
-          size:50,
-          partCode:val
-        }).then(res=>{
-          this.partCodeList = res.data.data.records
-          this.partLoading = false
-        })
-      }else{
+          current: 1,
+          size: 50,
+          partCode: val,
+        }).then(res => {
+          this.partCodeList = res.data.data.records;
+          this.partLoading = false;
+        });
+      } else {
         getPartList({
-          current:1,
-          size:50,
-        }).then(res =>{
-          this.partCodeList = res.data.data.records
-          let tmp = this.partCodeList.find(item => item.partCode == this.editForm.partCode)
-          if(!tmp){
+          current: 1,
+          size: 50,
+        }).then(res => {
+          this.partCodeList = res.data.data.records;
+          let tmp = this.partCodeList.find(item => item.partCode == this.editForm.partCode);
+          if (!tmp) {
             getPartList({
-              current:1,
-              size:50,
-              partCode:this.editForm.partCode
-            }).then(res =>{
-              this.partCodeList = [...this.partCodeList,...res.data.data.records]
-              this.partLoading = false
-            })
-          }else{
-            this.partLoading = false
+              current: 1,
+              size: 50,
+              partCode: this.editForm.partCode,
+            }).then(res => {
+              this.partCodeList = [...this.partCodeList, ...res.data.data.records];
+              this.partLoading = false;
+            });
+          } else {
+            this.partLoading = false;
           }
-        })
+        });
       }
     },
-    changePart(val){
-      let tmp = this.partCodeList.find(item => item.partCode == val)
-      this.editForm.partName = tmp.partName
+    changePart(val) {
+      let tmp = this.partCodeList.find(item => item.partCode == val);
+      this.editForm.partName = tmp.partName;
     },
-    submitEdit(){
-      this.$refs.form.validate(valid =>{
-        if(valid){
+    submitEdit() {
+      this.$refs.form.validate(valid => {
+        if (valid) {
           // this.editData1(this.editForm)
-          updateData(this.editForm).then(res =>{
-            if(res.data.code == 200){
-              this.$message.success('修改成功')
-              this.onLoad()
-              this.isEdit = false
+          updateData(this.editForm).then(res => {
+            if (res.data.code == 200) {
+              this.$message.success('修改成功');
+              this.onLoad();
+              this.isEdit = false;
             }
-          })
+          });
         }
-      })
+      });
     },
-    editData1(row){
-      updateData(row).then(res =>{
-        if(res.data.code == 200){
-          this.$message.success('修改成功')
-          this.onLoad()
+    editData1(row) {
+      updateData(row).then(res => {
+        if (res.data.code == 200) {
+          this.$message.success('修改成功');
+          this.onLoad();
         }
-      })
+      });
     },
     // 关闭订单
     claseOrder() {
@@ -737,23 +807,24 @@ export default {
         return;
       }
 
-      let tmp = this.selectionList.filter(item => item.status === 10015 || item.status === 10021)
-      if(tmp.length > 0){
+      let tmp = this.selectionList.filter(item => item.status === 10015 || item.status === 10021);
+      if (tmp.length > 0) {
         this.$message.error('请勿选择状态为【已完工】或【已关闭】的数据');
-        return
+        return;
       }
-      
+
       this.$confirm('确定将选择数据批量关闭?', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',
-      }) .then(() => {
+      })
+        .then(() => {
           const ids = this.selectionList.map(item => item.id).join(',');
           closeBatchs({ ...{ ids } }).then(res => {
             if (res.data.code === 200) {
               this.$message.success('关闭成功');
               this.$refs.crud.toggleSelection();
-              this.onLoad(this.page); 
+              this.onLoad(this.page);
             }
           });
         })
@@ -790,22 +861,22 @@ export default {
 
     onLoad() {
       this.loading = true;
-      this.query.partCode = this.query.partCode1
-      if(this.query.partCode1){
-        delete this.query.partCode1
+      this.query.partCode = this.query.partCode1;
+      if (this.query.partCode1) {
+        delete this.query.partCode1;
       }
       getList({
-        current:this.page.currentPage,
-        size:this.page.pageSize,
+        current: this.page.currentPage,
+        size: this.page.pageSize,
         validationResult: '16002',
         ...this.query,
-      }).then(res =>{
+      }).then(res => {
         if (res.data.code) {
           this.data = res.data.data.records;
           this.page.total = res.data.data.total;
           this.loading = false;
         }
-      })
+      });
       // try {
       //   const res = await getList({
       //     current:this.page.currentPage,
@@ -822,7 +893,6 @@ export default {
       // } catch (err) {
       //   console.log(err);
       // }
-     
     },
     // rowUpdate( row, index, done, loading) {
     //   updateData(row).then(res =>{
diff --git a/src/views/orderManagement/components/mold/moldRequire.vue b/src/views/orderManagement/components/mold/moldRequire.vue
index def5fea5..a3e8873f 100644
--- a/src/views/orderManagement/components/mold/moldRequire.vue
+++ b/src/views/orderManagement/components/mold/moldRequire.vue
@@ -154,7 +154,6 @@ export default {
         editBtnIcon: ' ',
         gridBtn: false,
         searchLabelPosition: 'left',
-        searchLabelPosition: 'left',
         searchGutter: 24,
         searchSpan: 6,
         menuAlign: 'left',
@@ -220,24 +219,24 @@ export default {
             headerAlign: 'center',
             align: 'center',
           },
-          {
-            label: '库存量',
-            prop: 'stockNum',
-            search: false,
-            sortable: true,
-            span: 12,
-            headerAlign: 'center',
-            align: 'center',
-          },
-          {
-            label: '占用量',
-            prop: 'occupyNum',
-            search: false,
-            sortable: true,
-            span: 12,
-            headerAlign: 'center',
-            align: 'center',
-          },
+          // {
+          //   label: '库存量',
+          //   prop: 'stockNum',
+          //   search: false,
+          //   sortable: true,
+          //   span: 12,
+          //   headerAlign: 'center',
+          //   align: 'center',
+          // },
+          // {
+          //   label: '占用量',
+          //   prop: 'occupyNum',
+          //   search: false,
+          //   sortable: true,
+          //   span: 12,
+          //   headerAlign: 'center',
+          //   align: 'center',
+          // },
           {
             label: '关联订单',
             prop: 'linkOrderIds',
diff --git a/src/views/productionManagement/beforeAndAfterPlating/components/handoverRec.vue b/src/views/productionManagement/beforeAndAfterPlating/components/handoverRec.vue
index 26f7ba9c..03ddb731 100644
--- a/src/views/productionManagement/beforeAndAfterPlating/components/handoverRec.vue
+++ b/src/views/productionManagement/beforeAndAfterPlating/components/handoverRec.vue
@@ -6,7 +6,7 @@
       :data="data"
       v-model="form"
       v-model:page="page"
-      v-model:query="query"
+      v-model:search="query"
       ref="crud"
       @row-del="rowDel"
       @search-change="searchChange"