From e286bf5e09025ffe70fd491bf93b5800ce9bf6bf Mon Sep 17 00:00:00 2001
From: taozi <1362265981@qq.com>
Date: Mon, 29 Dec 2025 17:54:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/materials/list.js                     |    1 +
 src/views/authority/datascope.vue             | 1281 ++++++++---------
 src/views/demandOrder/index.vue               |   27 +-
 .../components/approvalProcessDialog.vue      |  113 +-
 src/views/firstOrder/components/inDialog.vue  |   99 +-
 src/views/firstOrder/components/outDialog.vue |  184 +--
 src/views/firstOrder/inbound.vue              |  112 +-
 src/views/firstOrder/list.vue                 |  106 +-
 src/views/firstOrder/outbound.vue             |   32 +-
 src/views/materials/expend.vue                |    2 +-
 src/views/materials/index.vue                 |   96 +-
 src/views/purchaseOrders/index.vue            |   46 +-
 src/views/secondOrder/list.vue                |    2 +-
 src/views/secondOrder/outbound.vue            |    2 +-
 14 files changed, 946 insertions(+), 1157 deletions(-)

diff --git a/src/api/materials/list.js b/src/api/materials/list.js
index a9a1746..cbbe856 100644
--- a/src/api/materials/list.js
+++ b/src/api/materials/list.js
@@ -1,6 +1,7 @@
 import request from '@/router/axios';
 
 export const getList = (current, size, params) => {
+    console.log(params,'params')
     return request({
         url: '/smartpark/material/list',
         method: 'get',
diff --git a/src/views/authority/datascope.vue b/src/views/authority/datascope.vue
index d0e0160..6245070 100644
--- a/src/views/authority/datascope.vue
+++ b/src/views/authority/datascope.vue
@@ -1,71 +1,35 @@
 <template>
   <basic-container>
-    <avue-crud :option="option"
-               :table-loading="loading"
-               :data="data"
-               ref="crud"
-               v-model="form"
-               :permission="permissionList"
-               :before-open="beforeOpen"
-               :before-close="beforeClose"
-               @row-del="rowDel"
-               @row-update="rowUpdate"
-               @row-save="rowSave"
-               @search-change="searchChange"
-               @search-reset="searchReset"
-               @selection-change="selectionChange"
-               @current-change="currentChange"
-               @size-change="sizeChange"
-               @refresh-change="refreshChange"
-               @on-load="onLoad"
-               @tree-load="treeLoad">
+    <avue-crud :option="option" :table-loading="loading" :data="data" ref="crud" v-model="form"
+      :permission="permissionList" :before-open="beforeOpen" :before-close="beforeClose" @row-del="rowDel"
+      @row-update="rowUpdate" @row-save="rowSave" @search-change="searchChange" @search-reset="searchReset"
+      @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
+      @refresh-change="refreshChange" @on-load="onLoad" @tree-load="treeLoad">
       <template slot-scope="{row}" slot="menu">
-        <el-button type="text"
-                   icon="el-icon-setting"
-                   size="small"
-                   v-if="permission.data_scope_setting"
-                   plain
-                   style="border: 0;background-color: transparent !important;"
-                   @click.stop="handleDataScope(row)">权限配置
+        <el-button type="text" icon="el-icon-setting" size="small" v-if="permission.data_scope_setting" plain
+          style="border: 0;background-color: transparent !important;" @click.stop="handleDataScope(row)">权限配置
         </el-button>
       </template>
       <template slot-scope="{row}" slot="source">
         <div style="text-align:center">
-          <i :class="row.source"/>
+          <i :class="row.source" />
         </div>
       </template>
     </avue-crud>
-    <el-drawer :title="`[${scopeMenuName}] 数据权限配置`" :visible.sync="drawerVisible" :direction="direction"
-               append-to-body
-               :before-close="handleDrawerClose" size="1000px">
+    <el-drawer :title="`[${scopeMenuName}] 数据权限配置`" :visible.sync="drawerVisible" :direction="direction" append-to-body
+      :before-close="handleDrawerClose" size="1000px">
       <basic-container>
-        <avue-crud :option="optionScope"
-                   :data="dataScope"
-                   :page="pageScope"
-                   v-model="formScope"
-                   :table-loading="scopeLoading"
-                   ref="crudScope"
-                   @row-del="rowDelScope"
-                   @row-update="rowUpdateScope"
-                   @row-save="rowSaveScope"
-                   :before-open="beforeOpenScope"
-                   @search-change="searchChangeScope"
-                   @search-reset="searchResetScope"
-                   @selection-change="selectionChangeScope"
-                   @current-change="currentChangeScope"
-                   @size-change="sizeChangeScope"
-                   @on-load="onLoadScope">
+        <avue-crud :option="optionScope" :data="dataScope" :page="pageScope" v-model="formScope"
+          :table-loading="scopeLoading" ref="crudScope" @row-del="rowDelScope" @row-update="rowUpdateScope"
+          @row-save="rowSaveScope" :before-open="beforeOpenScope" @search-change="searchChangeScope"
+          @search-reset="searchResetScope" @selection-change="selectionChangeScope" @current-change="currentChangeScope"
+          @size-change="sizeChangeScope" @on-load="onLoadScope">
           <template slot="menuLeft">
-            <el-button type="danger"
-                       size="small"
-                       icon="el-icon-delete"
-                       plain
-                       @click="handleDeleteScope">删 除
+            <el-button type="danger" size="small" icon="el-icon-delete" plain @click="handleDeleteScope">删 除
             </el-button>
           </template>
-          <template slot-scope="{row}"
-                    slot="scopeType">
-            <el-tag>{{row.scopeTypeName}}</el-tag>
+          <template slot-scope="{row}" slot="scopeType">
+            <el-tag>{{ row.scopeTypeName }}</el-tag>
           </template>
         </avue-crud>
       </basic-container>
@@ -74,659 +38,658 @@
 </template>
 
 <script>
-  import {
-    add,
-    remove,
-    update,
-    getLazyMenuList,
-    getMenu
-  } from "@/api/system/menu";
-  import {
-    addDataScope,
-    removeDataScope,
-    updateDataScope,
-    getListDataScope,
-    getMenuDataScope
-  } from "@/api/system/scope";
-  import {mapGetters} from "vuex";
-  import iconList from "@/config/iconList";
-  import func from "@/util/func";
+import {
+  add,
+  remove,
+  update,
+  getLazyMenuList,
+  getMenu
+} from "@/api/system/menu";
+import {
+  addDataScope,
+  removeDataScope,
+  updateDataScope,
+  getListDataScope,
+  getMenuDataScope
+} from "@/api/system/scope";
+import { mapGetters } from "vuex";
+import iconList from "@/config/iconList";
+import func from "@/util/func";
 
-  export default {
-    data() {
-      return {
-        form: {},
-        selectionList: [],
-        query: {},
-        loading: true,
-        parentId: 0,
-        page: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0
-        },
-        drawerVisible: false,
-        direction: 'rtl',
-        scopeMenuId: 0,
-        scopeMenuCode: '',
-        scopeMenuName: "菜单",
-        scopeLoading: false,
-        menu: true,
-        watchMode: true,
-        option: {
-          lazy: true,
-          tip: false,
-          simplePage: true,
-          searchShow: true,
-          searchMenuSpan: 6,
-          dialogWidth: "60%",
-          tree: true,
-          border: true,
-          index: true,
-          selection: true,
-          viewBtn: false,
-          editBtn: false,
-          addBtn: false,
-          delBtn: false,
-          menuWidth: 150,
-          dialogClickModal: false,
-          column: [
-            {
-              label: "菜单名称",
-              prop: "name",
-              search: true,
-              rules: [
-                {
-                  required: true,
-                  message: "请输入菜单名称",
-                  trigger: "blur"
-                }
-              ]
-            },
-            {
-              label: "路由地址",
-              prop: "path",
-              rules: [
-                {
-                  required: true,
-                  message: "请输入路由地址",
-                  trigger: "blur"
-                }
-              ]
-            },
-            {
-              label: "上级菜单",
-              prop: "parentId",
-              type: "tree",
-              dicUrl: "/api/blade-system/menu/tree",
-              hide: true,
-              props: {
-                label: "title"
-              },
-              rules: [
-                {
-                  required: false,
-                  message: "请选择上级菜单",
-                  trigger: "click"
-                }
-              ]
-            },
-            {
-              label: "菜单图标",
-              prop: "source",
-              type: "icon",
-              slot: true,
-              width: 80,
-              iconList: iconList,
-              rules: [
-                {
-                  required: true,
-                  message: "请输入菜单图标",
-                  trigger: "click"
-                }
-              ]
-            },
-            {
-              label: "菜单编号",
-              prop: "code",
-              search: true,
-              rules: [
-                {
-                  required: true,
-                  message: "请输入菜单编号",
-                  trigger: "blur"
-                }
-              ]
-            },
-            {
-              label: "菜单类型",
-              prop: "category",
-              type: "radio",
-              dicData: [
-                {
-                  label: "菜单",
-                  value: 1
-                },
-                {
-                  label: "按钮",
-                  value: 2
-                }
-              ],
-              hide: true,
-              rules: [
-                {
-                  required: true,
-                  message: "请选择菜单类型",
-                  trigger: "blur"
-                }
-              ]
-            },
-            {
-              label: "菜单别名",
-              prop: "alias",
-              rules: [
-                {
-                  required: true,
-                  message: "请输入菜单别名",
-                  trigger: "blur"
-                }
-              ]
-            },
-            {
-              label: "按钮功能",
-              prop: "action",
-              type: "radio",
-              dicData: [
-                {
-                  label: "工具栏",
-                  value: 0
-                },
-                {
-                  label: "操作栏",
-                  value: 1
-                },
-                {
-                  label: "工具操作栏",
-                  value: 2
-                }
-              ],
-              hide: true,
-              rules: [
-                {
-                  required: true,
-                  message: "请选择按钮功能",
-                  trigger: "blur"
-                }
-              ]
-            },
-            {
-              label: "菜单排序",
-              prop: "sort",
-              type: "number",
-              width: 80,
-              rules: [
-                {
-                  required: true,
-                  message: "请输入菜单排序",
-                  trigger: "blur"
-                }
-              ]
-            },
-            {
-              label: "新窗口",
-              prop: "isOpen",
-              type: "radio",
-              dicData: [
-                {
-                  label: "否",
-                  value: 0
-                },
-                {
-                  label: "是",
-                  value: 1
-                },
-              ],
-              hide: true
-            },
-            {
-              label: "菜单备注",
-              prop: "remark",
-              type: "textarea",
-              span: 24,
-              minRows: 6,
-              hide: true
-            }
-          ]
-        },
-        data: [],
-        formScope: {},
-        selectionListScope: [],
-        pageScope: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0
-        },
-        optionScope: {
-          tip: false,
-          searchShow: true,
-          searchMenuSpan: 6,
-          border: true,
-          index: true,
-          viewBtn: true,
-          selection: true,
-          menuWidth: 200,
-          dialogWidth: 900,
-          dialogClickModal: false,
-          column: [
-            {
-              label: "权限名称",
-              prop: "scopeName",
-              search: true,
-              value: "",
-              rules: [{
+export default {
+  data() {
+    return {
+      form: {},
+      selectionList: [],
+      query: {},
+      loading: true,
+      parentId: 0,
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0
+      },
+      drawerVisible: false,
+      direction: 'rtl',
+      scopeMenuId: 0,
+      scopeMenuCode: '',
+      scopeMenuName: "菜单",
+      scopeLoading: false,
+      menu: true,
+      watchMode: true,
+      option: {
+        lazy: true,
+        tip: false,
+        simplePage: true,
+        searchShow: true,
+        searchMenuSpan: 6,
+        dialogWidth: "60%",
+        tree: true,
+        border: true,
+        index: true,
+        selection: true,
+        viewBtn: false,
+        editBtn: false,
+        addBtn: false,
+        delBtn: false,
+        menuWidth: 150,
+        dialogClickModal: false,
+        column: [
+          {
+            label: "菜单名称",
+            prop: "name",
+            search: true,
+            rules: [
+              {
                 required: true,
-                message: "请输入数据权限名称",
+                message: "请输入菜单名称",
                 trigger: "blur"
-              }]
-            },
-            {
-              label: "权限编号",
-              prop: "resourceCode",
-              search: true,
-              width: 100,
-              rules: [{
+              }
+            ]
+          },
+          {
+            label: "路由地址",
+            prop: "path",
+            rules: [
+              {
                 required: true,
-                message: "请输入数据权限编号",
+                message: "请输入路由地址",
                 trigger: "blur"
-              }]
+              }
+            ]
+          },
+          {
+            label: "上级菜单",
+            prop: "parentId",
+            type: "tree",
+            dicUrl: "/api/blade-system/menu/tree",
+            hide: true,
+            props: {
+              label: "title"
             },
-            {
-              label: "权限字段",
-              prop: "scopeColumn",
-              width: 130,
-              rules: [{
+            rules: [
+              {
+                required: false,
+                message: "请选择上级菜单",
+                trigger: "click"
+              }
+            ]
+          },
+          {
+            label: "菜单图标",
+            prop: "source",
+            type: "icon",
+            slot: true,
+            width: 80,
+            iconList: iconList,
+            rules: [
+              {
+                required: true,
+                message: "请输入菜单图标",
+                trigger: "click"
+              }
+            ]
+          },
+          {
+            label: "菜单编号",
+            prop: "code",
+            search: true,
+            rules: [
+              {
                 required: true,
-                message: "请输入数据权限编号",
+                message: "请输入菜单编号",
                 trigger: "blur"
-              }]
-            },
-            {
-              label: "规则类型",
-              type: "select",
-              dicUrl: "/api/blade-system/dict/dictionary?code=data_scope_type",
-              props: {
-                label: "dictValue",
-                value: "dictKey"
+              }
+            ]
+          },
+          {
+            label: "菜单类型",
+            prop: "category",
+            type: "radio",
+            dicData: [
+              {
+                label: "菜单",
+                value: 1
               },
-              dataType: "number",
-              slot: true,
-              width: 140,
-              prop: "scopeType",
-              rules: [{
+              {
+                label: "按钮",
+                value: 2
+              }
+            ],
+            hide: true,
+            rules: [
+              {
                 required: true,
-                message: "请输入通知类型",
+                message: "请选择菜单类型",
                 trigger: "blur"
-              }]
-            },
-            {
-              label: "可见字段",
-              prop: "scopeField",
-              span: 24,
-              hide: true,
-              value: "*",
-              rules: [{
+              }
+            ]
+          },
+          {
+            label: "菜单别名",
+            prop: "alias",
+            rules: [
+              {
                 required: true,
-                message: "请输入数据权限可见的字段",
+                message: "请输入菜单别名",
                 trigger: "blur"
-              }],
-            },
-            {
-              label: "权限类名",
-              prop: "scopeClass",
-              span: 24,
-              hide: true,
-              rules: [{
+              }
+            ]
+          },
+          {
+            label: "按钮功能",
+            prop: "action",
+            type: "radio",
+            dicData: [
+              {
+                label: "工具栏",
+                value: 0
+              },
+              {
+                label: "操作栏",
+                value: 1
+              },
+              {
+                label: "工具操作栏",
+                value: 2
+              }
+            ],
+            hide: true,
+            rules: [
+              {
                 required: true,
-                message: "请输入MybatisMapper对应方法的完整类名路径",
+                message: "请选择按钮功能",
                 trigger: "blur"
-              }],
-            },
-            {
-              label: "规则值",
-              prop: "scopeValue",
-              span: 24,
-              minRows: 5,
-              type: "textarea",
-              display: true,
-              hide: true,
-            },
-            {
-              label: "备注",
-              prop: "remark",
-              span: 24,
-              hide: true,
+              }
+            ]
+          },
+          {
+            label: "菜单排序",
+            prop: "sort",
+            type: "number",
+            width: 80,
+            rules: [
+              {
+                required: true,
+                message: "请输入菜单排序",
+                trigger: "blur"
+              }
+            ]
+          },
+          {
+            label: "新窗口",
+            prop: "isOpen",
+            type: "radio",
+            dicData: [
+              {
+                label: "否",
+                value: 0
+              },
+              {
+                label: "是",
+                value: 1
+              },
+            ],
+            hide: true
+          },
+          {
+            label: "菜单备注",
+            prop: "remark",
+            type: "textarea",
+            span: 24,
+            minRows: 6,
+            hide: true
+          }
+        ]
+      },
+      data: [],
+      formScope: {},
+      selectionListScope: [],
+      pageScope: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0
+      },
+      optionScope: {
+        tip: false,
+        searchShow: true,
+        searchMenuSpan: 6,
+        border: true,
+        index: true,
+        viewBtn: true,
+        selection: true,
+        menuWidth: 200,
+        dialogWidth: 900,
+        dialogClickModal: false,
+        column: [
+          {
+            label: "权限名称",
+            prop: "scopeName",
+            search: true,
+            value: "",
+            rules: [{
+              required: true,
+              message: "请输入数据权限名称",
+              trigger: "blur"
+            }]
+          },
+          {
+            label: "权限编号",
+            prop: "resourceCode",
+            search: true,
+            width: 100,
+            rules: [{
+              required: true,
+              message: "请输入数据权限编号",
+              trigger: "blur"
+            }]
+          },
+          {
+            label: "权限字段",
+            prop: "scopeColumn",
+            width: 130,
+            rules: [{
+              required: true,
+              message: "请输入数据权限编号",
+              trigger: "blur"
+            }]
+          },
+          {
+            label: "规则类型",
+            type: "select",
+            dicUrl: "/api/blade-system/dict/dictionary?code=data_scope_type",
+            props: {
+              label: "dictValue",
+              value: "dictKey"
             },
-          ]
-        },
-        dataScope: []
+            dataType: "number",
+            slot: true,
+            width: 140,
+            prop: "scopeType",
+            rules: [{
+              required: true,
+              message: "请输入通知类型",
+              trigger: "blur"
+            }]
+          },
+          {
+            label: "可见字段",
+            prop: "scopeField",
+            span: 24,
+            hide: true,
+            value: "*",
+            rules: [{
+              required: true,
+              message: "请输入数据权限可见的字段",
+              trigger: "blur"
+            }],
+          },
+          {
+            label: "权限类名",
+            prop: "scopeClass",
+            span: 24,
+            hide: true,
+            rules: [{
+              required: true,
+              message: "请输入MybatisMapper对应方法的完整类名路径",
+              trigger: "blur"
+            }],
+          },
+          {
+            label: "规则值",
+            prop: "scopeValue",
+            span: 24,
+            minRows: 5,
+            type: "textarea",
+            display: true,
+            hide: true,
+          },
+          {
+            label: "备注",
+            prop: "remark",
+            span: 24,
+            hide: true,
+          },
+        ]
+      },
+      dataScope: []
+    };
+  },
+  watch: {
+    'formScope.scopeType'() {
+      this.initScope();
+    }
+  },
+  computed: {
+    ...mapGetters(["permission"]),
+    permissionList() {
+      return {
+        addBtn: this.vaildData(this.permission.menu_add, false),
+        viewBtn: this.vaildData(this.permission.menu_view, false),
+        delBtn: this.vaildData(this.permission.menu_delete, false),
+        editBtn: this.vaildData(this.permission.menu_edit, false)
       };
     },
-    watch: {
-      'formScope.scopeType'() {
-        this.initScope();
-      }
+    ids() {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(",");
     },
-    computed: {
-      ...mapGetters(["permission"]),
-      permissionList() {
-        return {
-          addBtn: this.vaildData(this.permission.menu_add, false),
-          viewBtn: this.vaildData(this.permission.menu_view, false),
-          delBtn: this.vaildData(this.permission.menu_delete, false),
-          editBtn: this.vaildData(this.permission.menu_edit, false)
-        };
-      },
-      ids() {
-        let ids = [];
-        this.selectionList.forEach(ele => {
-          ids.push(ele.id);
-        });
-        return ids.join(",");
-      },
-      scopeIds() {
-        let ids = [];
-        this.selectionListScope.forEach(ele => {
-          ids.push(ele.id);
-        });
-        return ids.join(",");
+    scopeIds() {
+      let ids = [];
+      this.selectionListScope.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(",");
+    }
+  },
+  methods: {
+    initScope() {
+      const scopeType = func.toInt(this.formScope.scopeType);
+      const watchMode = this.watchMode;
+      let column = "-", name = "暂无";
+      if (scopeType === 1) {
+        column = "-";
+        name = "全部可见";
+      } else if (scopeType === 2) {
+        column = "create_user";
+        name = "本人可见";
+      } else if (scopeType === 3) {
+        column = "create_dept";
+        name = "所在机构可见";
+      } else if (scopeType === 4) {
+        column = "create_dept";
+        name = "所在机构可见及子级可见";
+      } else if (scopeType === 5) {
+        column = "";
+        name = "自定义";
       }
-    },
-    methods: {
-      initScope() {
-        const scopeType = func.toInt(this.formScope.scopeType);
-        const watchMode = this.watchMode;
-        let column = "-", name = "暂无";
-        if (scopeType === 1) {
-          column = "-";
-          name = "全部可见";
-        } else if (scopeType === 2) {
-          column = "create_user";
-          name = "本人可见";
-        } else if (scopeType === 3) {
-          column = "create_dept";
-          name = "所在机构可见";
-        } else if (scopeType === 4) {
-          column = "create_dept";
-          name = "所在机构可见及子级可见";
-        } else if (scopeType === 5) {
-          column = "";
-          name = "自定义";
-        }
-        this.$refs.crudScope.option.column.filter(item => {
-          if (watchMode) {
-            if (item.prop === "scopeName") {
-              this.formScope.scopeName = `${this.scopeMenuName} [${name}]`;
-            }
-            if (item.prop === "resourceCode") {
-              this.formScope.resourceCode = this.scopeMenuCode;
-            }
-            if (item.prop === "scopeColumn") {
-              this.formScope.scopeColumn = column;
-            }
+      this.$refs.crudScope.option.column.filter(item => {
+        if (watchMode) {
+          if (item.prop === "scopeName") {
+            this.formScope.scopeName = `${this.scopeMenuName} [${name}]`;
           }
-          if (item.prop === "scopeValue") {
-            item.display = scopeType === 5;
+          if (item.prop === "resourceCode") {
+            this.formScope.resourceCode = this.scopeMenuCode;
           }
+          if (item.prop === "scopeColumn") {
+            this.formScope.scopeColumn = column;
+          }
+        }
+        if (item.prop === "scopeValue") {
+          item.display = scopeType === 5;
+        }
+      });
+    },
+    // 菜单管理模块
+    rowSave(row, done, loading) {
+      add(row).then(() => {
+        this.onLoad(this.page);
+        this.$message({
+          type: "success",
+          message: "操作成功!"
         });
-      },
-      // 菜单管理模块
-      rowSave(row, done, loading) {
-        add(row).then(() => {
+        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: "操作成功!"
           });
-          done();
-        }, error => {
-          window.console.log(error);
-          loading();
         });
-      },
-      rowUpdate(row, index, done, loading) {
-        update(row).then(() => {
+    },
+    searchReset() {
+      this.query = {};
+      this.parentId = 0;
+      this.onLoad(this.page);
+    },
+    searchChange(params, done) {
+      this.query = params;
+      this.parentId = '';
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    selectionClear() {
+      this.selectionList = [];
+      this.$refs.crud.toggleSelection();
+    },
+    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: "操作成功!"
           });
-          done();
-        }, error => {
-          window.console.log(error);
-          loading();
+          this.$refs.crud.toggleSelection();
         });
-      },
-      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.parentId = 0;
-        this.onLoad(this.page);
-      },
-      searchChange(params, done) {
-        this.query = params;
-        this.parentId = '';
-        this.page.currentPage = 1;
-        this.onLoad(this.page, params);
-        done();
-      },
-      selectionChange(list) {
-        this.selectionList = list;
-      },
-      selectionClear() {
-        this.selectionList = [];
-        this.$refs.crud.toggleSelection();
-      },
-      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();
-          });
-      },
-      beforeOpen(done, type) {
-        if (["edit", "view"].includes(type)) {
-          getMenu(this.form.id).then(res => {
-            this.form = res.data.data;
-          });
-        }
-        done();
-      },
-      beforeClose(done) {
-        this.formScope = {};
-        done();
-      },
-      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;
-        getLazyMenuList(this.parentId, Object.assign(params, this.query)).then(res => {
-          this.data = res.data.data;
-          this.loading = false;
-          this.selectionClear();
+    },
+    beforeOpen(done, type) {
+      if (["edit", "view"].includes(type)) {
+        getMenu(this.form.id).then(res => {
+          this.form = res.data.data;
         });
-      },
-      treeLoad(tree, treeNode, resolve) {
-        const parentId = tree.id;
-        getLazyMenuList(parentId).then(res => {
-          resolve(res.data.data);
+      }
+      done();
+    },
+    beforeClose(done) {
+      this.formScope = {};
+      done();
+    },
+    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;
+      getLazyMenuList(this.parentId, Object.assign(params, this.query)).then(res => {
+        this.data = res.data.data;
+        this.loading = false;
+        this.selectionClear();
+      });
+    },
+    treeLoad(tree, treeNode, resolve) {
+      const parentId = tree.id;
+      getLazyMenuList(parentId).then(res => {
+        resolve(res.data.data);
+      });
+    },
+    // 数据权限模块
+    handleDataScope(row) {
+      this.drawerVisible = true;
+      this.scopeMenuId = row.id;
+      this.scopeMenuCode = row.code;
+      this.scopeMenuName = row.name;
+      this.onLoadScope(this.pageScope)
+    },
+    handleDrawerClose(hide) {
+      hide();
+    },
+    rowSaveScope(row, done, loading) {
+      row = {
+        ...row,
+        menuId: this.scopeMenuId,
+      };
+      addDataScope(row).then(() => {
+        this.onLoadScope(this.pageScope);
+        this.$message({
+          type: "success",
+          message: "操作成功!"
         });
-      },
-      // 数据权限模块
-      handleDataScope(row) {
-        this.drawerVisible = true;
-        this.scopeMenuId = row.id;
-        this.scopeMenuCode = row.code;
-        this.scopeMenuName = row.name;
-        this.onLoadScope(this.pageScope)
-      },
-      handleDrawerClose(hide) {
-        hide();
-      },
-      rowSaveScope(row, done, loading) {
-        row = {
-          ...row,
-          menuId: this.scopeMenuId,
-        };
-        addDataScope(row).then(() => {
+        done();
+      }, error => {
+        window.console.log(error);
+        loading();
+      });
+    },
+    rowUpdateScope(row, index, done, loading) {
+      row = {
+        ...row,
+        menuId: this.scopeMenuId,
+      };
+      updateDataScope(row).then(() => {
+        this.onLoadScope(this.pageScope);
+        this.$message({
+          type: "success",
+          message: "操作成功!"
+        });
+        done();
+      }, error => {
+        window.console.log(error);
+        loading();
+      });
+    },
+    rowDelScope(row) {
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return removeDataScope(row.id);
+        })
+        .then(() => {
           this.onLoadScope(this.pageScope);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-          done();
-        }, error => {
-          window.console.log(error);
-          loading();
         });
-      },
-      rowUpdateScope(row, index, done, loading) {
-        row = {
-          ...row,
-          menuId: this.scopeMenuId,
-        };
-        updateDataScope(row).then(() => {
+    },
+    handleDeleteScope() {
+      if (this.selectionListScope.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return removeDataScope(this.scopeIds);
+        })
+        .then(() => {
           this.onLoadScope(this.pageScope);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-          done();
-        }, error => {
-          window.console.log(error);
-          loading();
+          this.$refs.crudScope.toggleSelection();
         });
-      },
-      rowDelScope(row) {
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return removeDataScope(row.id);
-          })
-          .then(() => {
-            this.onLoadScope(this.pageScope);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-          });
-      },
-      handleDeleteScope() {
-        if (this.selectionListScope.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return removeDataScope(this.scopeIds);
-          })
-          .then(() => {
-            this.onLoadScope(this.pageScope);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-            this.$refs.crudScope.toggleSelection();
-          });
-      },
-      beforeOpenScope(done, type) {
-        if (["add"].includes(type)) {
-          this.watchMode = true;
-          this.initScope();
-        }
-        if (["edit", "view"].includes(type)) {
-          this.watchMode = false;
-          getMenuDataScope(this.formScope.id).then(res => {
-            this.formScope = res.data.data;
-          });
-        }
-        done();
-      },
-      searchResetScope() {
-        this.onLoadScope(this.pageScope);
-      },
-      searchChangeScope(params, done) {
-        this.onLoadScope(this.pageScope, params);
-        done();
-      },
-      selectionChangeScope(list) {
-        this.selectionListScope = list;
-      },
-      currentChangeScope(currentPage) {
-        this.pageScope.currentPage = currentPage;
-      },
-      sizeChangeScope(pageSize) {
-        this.pageScope.pageSize = pageSize;
-      },
-      onLoadScope(page, params = {}) {
-        this.scopeLoading = true;
-        const values = {
-          ...params,
-          menuId: this.scopeMenuId,
-        }
-        getListDataScope(page.currentPage, page.pageSize, Object.assign(values, this.query)).then(res => {
-          const data = res.data.data;
-          this.pageScope.total = data.total;
-          this.dataScope = data.records;
-          this.selectionListScope = [];
-          this.scopeLoading = false;
+    },
+    beforeOpenScope(done, type) {
+      if (["add"].includes(type)) {
+        this.watchMode = true;
+        this.initScope();
+      }
+      if (["edit", "view"].includes(type)) {
+        this.watchMode = false;
+        getMenuDataScope(this.formScope.id).then(res => {
+          this.formScope = res.data.data;
         });
-      },
-    }
-  };
+      }
+      done();
+    },
+    searchResetScope() {
+      this.onLoadScope(this.pageScope);
+    },
+    searchChangeScope(params, done) {
+      this.onLoadScope(this.pageScope, params);
+      done();
+    },
+    selectionChangeScope(list) {
+      this.selectionListScope = list;
+    },
+    currentChangeScope(currentPage) {
+      this.pageScope.currentPage = currentPage;
+    },
+    sizeChangeScope(pageSize) {
+      this.pageScope.pageSize = pageSize;
+    },
+    onLoadScope(page, params = {}) {
+      this.scopeLoading = true;
+      const values = {
+        ...params,
+        menuId: this.scopeMenuId,
+      }
+      getListDataScope(page.currentPage, page.pageSize, Object.assign(values, this.query)).then(res => {
+        const data = res.data.data;
+        this.pageScope.total = data.total;
+        this.dataScope = data.records;
+        this.selectionListScope = [];
+        this.scopeLoading = false;
+      });
+    },
+  }
+};
 </script>
-
diff --git a/src/views/demandOrder/index.vue b/src/views/demandOrder/index.vue
index a440194..a44b160 100644
--- a/src/views/demandOrder/index.vue
+++ b/src/views/demandOrder/index.vue
@@ -29,11 +29,11 @@ export default {
         total: 0
       },
       option: {
-         height: 'auto',
+        height: 'auto',
         calcHeight: 30,
         tip: false,
         searchShow: true,
-        searchMenuSpan: 6,
+        searchMenuSpan: 18,
         border: true,
         index: true,
         selection: true,
@@ -48,6 +48,7 @@ export default {
         gridSpan: false,
         filterBtn: false,
         columnBtn: false,
+        searchMenuPosition: "right",
         column: [
           {
             label: "需求单号",
@@ -109,16 +110,16 @@ export default {
       tableData: [],
 
       ckTable: [
-        {str1: '3', str2: '2025-04-09', str3: '部门一'},
-        {str1: '37', str2: '2025-04-03', str3: '部门一'}
+        { str1: '3', str2: '2025-04-09', str3: '部门一' },
+        { str1: '37', str2: '2025-04-03', str3: '部门一' }
       ],
       rkTable: [
-        {str1: '5',str2: '2025-03-19',str3: '部门二'},
-        {str1: '12',str2: '2025-03-19',str3: '部门二'},
+        { str1: '5', str2: '2025-03-19', str3: '部门二' },
+        { str1: '12', str2: '2025-03-19', str3: '部门二' },
       ],
       bfTable: [
-        {str1: '9',str2: '2025-03-19',str3: '部门三'},
-        {str1: '19',str2: '2025-03-19',str3: '部门三'},
+        { str1: '9', str2: '2025-03-19', str3: '部门三' },
+        { str1: '19', str2: '2025-03-19', str3: '部门三' },
       ],
     };
   },
@@ -149,13 +150,13 @@ export default {
     },
     handleTabClick(tab, event) {
       console.log(tab, event);
-      if(this.activeName=='first'){
+      if (this.activeName == 'first') {
         this.tableData = this.ckTable
       }
-      if(this.activeName=='second'){
+      if (this.activeName == 'second') {
         this.tableData = this.rkTable
       }
-      if(this.activeName=='third'){
+      if (this.activeName == 'third') {
         this.tableData = this.bfTable
       }
     },
@@ -216,8 +217,8 @@ export default {
       //   this.loading = false;
       //   this.selectionClear();
       // });
-        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-        console.log(123,res.data.result)
+      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+        console.log(123, res.data.result)
         // const data = res.data.data;
         this.data = res.data.result.list;
         this.loading = false;
diff --git a/src/views/firstOrder/components/approvalProcessDialog.vue b/src/views/firstOrder/components/approvalProcessDialog.vue
index e63d21d..ccddb62 100644
--- a/src/views/firstOrder/components/approvalProcessDialog.vue
+++ b/src/views/firstOrder/components/approvalProcessDialog.vue
@@ -1,84 +1,97 @@
 <template>
   <div>
-    <el-dialog
-      :close-on-click-modal="false"
-      :title="inDialogTiltle"
-      :visible.sync="inDialogVisible"
-      :append-to-body="true"
-      width="20%"
-      @close="handleCloseDetail"
-    >
+    <el-dialog :close-on-click-modal="false" :title="inDialogTiltle" :visible.sync="inDialogVisible"
+      :append-to-body="true" width="20%" @close="handleCloseDetail">
       <el-steps class="teps-con" direction="vertical" :active="1">
-        <el-step
-          v-for="(item, index) in approvalList"
-          :title="item.name"
-          :description="item.time || ''"
-        ></el-step>
+        <el-step v-for="(item, index) in processedApproveList" 
+          :key="item.id"
+          :title="item.userName"
+          :description="`状态:${item.statusText}\n${item.formattedTime}`"
+          ></el-step>
       </el-steps>
-      <!-- <span slot="footer" class="dialog-footer">
-        <el-button @click="handleCloseDetail()">取 消</el-button>
-      </span> -->
     </el-dialog>
   </div>
 </template>
+
 <script>
-import {
-  getAllQuarter,
-  getPurchasesByIds,
-  getMaterialList,
-  getDetailList,
-} from "@/api/firstOrder/inbound";
 export default {
   props: {
     showDialog: {
       type: Boolean,
       default: false,
     },
+    approveList: {
+      type: Array,
+      default: () => [],
+    },
   },
-  data() {
-    return {
-      inDialogVisible: false,
-      inDialogTiltle: "审批流程",
-      approvalList: [
-        {
-          name: "张三",
-          time: "2021-01-01 10:10:10",
-          status: "通过",
-        },
-        {
-          name: "张三1",
-          time: "",
-          status: "待审核",
-        },
-        {
-          name: "张三3",
-          time: "",
-          status: "待审核",
-        },
-      ],
-    };
+  watch: {
+    showDialog(val) {
+      this.inDialogVisible = val;
+    },
   },
-
-  mounted() {
-    this.inDialogVisible = this.showDialog;
+  computed: {
+    // 处理审批列表数据
+    processedApproveList() {
+      return this.approveList.map(item => {
+        // 1. 处理时间格式化
+        let formattedTime = ''
+        if (item.optTime) {
+          const date = new Date(item.optTime);
+          const pad = (num) => num.toString().padStart(2, '0');
+          formattedTime = `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())} ${pad(date.getHours())}:${pad(date.getMinutes())}:${pad(date.getSeconds())}`;
+        }
+        let statusText = '待审核'
+        if (item.status !== '' && item.status !== undefined) {
+          const statusMap = {
+            0: '审批中',
+            1: '已完成',
+            2: '已驳回',
+          };
+          statusText = statusMap[item.status] || '';
+        }
+        return {
+          ...item,
+          formattedTime,
+          statusText,
+        };
+      });
+    },
+    activeStep() {
+      return this.processedApproveList.findIndex((item, index, array) => {
+        return index === array.length - 1 && item.statusText !== '审批中';
+      }) || 0;
+    }
   },
   methods: {
     handleCloseDetail() {
       this.inDialogVisible = false;
       this.$emit("closeDialog");
-    },
+    }
+  },
+  data() {
+    return {
+      inDialogVisible: false,
+      inDialogTiltle: "审批流程"
+    };
   },
+  mounted() {
+    this.inDialogVisible = this.showDialog;
+  }
 };
 </script>
+
 <style lang="scss" scoped>
 .form-title {
   font-size: 16px;
   font-weight: 600;
   padding: 18px 0;
 }
-.teps-con{
-  margin:0 auto 0
+
+.teps-con {
+  margin: 0 auto 0
 }
+
 :deep(.el-dialog__body) {
   height: 300px;
 }
diff --git a/src/views/firstOrder/components/inDialog.vue b/src/views/firstOrder/components/inDialog.vue
index b75e271..f4b79c0 100644
--- a/src/views/firstOrder/components/inDialog.vue
+++ b/src/views/firstOrder/components/inDialog.vue
@@ -6,9 +6,9 @@
       <el-form :model="sizeForm" ref="dynamicValidateForm" label-width="100px" class="demo-dynamic">
         <div class="form-title"> 基本信息</div>
         <el-row>
-          <el-col :span="12" v-show="sizeForm.options == 1 && inDialogType != 'add'"> 
+          <el-col :span="12" v-show="sizeForm.options == 1 && inDialogType != 'add'">
             <el-form-item label="入库单号">
-              <el-input v-model="sizeForm.orderNo" disabled ></el-input>
+              <el-input v-model="sizeForm.orderNo" disabled></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -84,7 +84,7 @@
               {{ scope.row.requiredQuantity || 0 }}
             </template>
           </el-table-column>
-          <el-table-column prop="inboundQuantity" label="已入库数量" v-if="sizeForm.option == 1" >
+          <el-table-column prop="inboundQuantity" label="已入库数量" v-if="sizeForm.option == 1">
             <template slot-scope="scope">
               {{ scope.row.inboundQuantity || 0 }}
             </template>
@@ -93,7 +93,7 @@
             <template slot-scope="scope">
               <el-input-number size="mini" v-model="scope.row.theInboundQuantity" :min="1" style="width: 100%;"
                 @change="syncInboundQuantity(scope.row)" v-if='inDialogType != "details"'></el-input-number>
-                <span v-else>{{ scope.row.theInboundQuantity || 0}}</span>
+              <span v-else>{{ scope.row.theInboundQuantity || 0 }}</span>
             </template>
           </el-table-column>
           <el-table-column prop="unitPrice" label="单价">
@@ -117,8 +117,7 @@
           <el-table-column prop="type" label="类别 ">
             <template slot-scope="scope">
               <el-select v-model="scope.row.type" placeholder="请选择" style="width: 100%;"
-                @change="handleTypeChange(scope.row)"
-                v-if='inDialogType !== "details"'>
+                @change="handleTypeChange(scope.row)" v-if='inDialogType !== "details"'>
                 <el-option label="耐用品" value="NY"></el-option>
                 <el-option label="易耗品" value="YH"></el-option>
               </el-select>
@@ -399,38 +398,38 @@ export default {
       }
     },
     async inInit() {
-  if (this.inDialogType == 'details' || this.inDialogType == 'edit') {
-    try {
-      const res = await editList(this.id);
-      const { ldOnePutStorage, ldOnePutStorageDetailList = [] } = res.data.result || {};
+      if (this.inDialogType == 'details' || this.inDialogType == 'edit') {
+        try {
+          const res = await editList(this.id);
+          const { ldOnePutStorage, ldOnePutStorageDetailList = [] } = res.data.result || {};
 
-      if (!ldOnePutStorage) {
-        this.$message.error("回显数据异常");
-        return;
-      }
-      const handledDetailList = ldOnePutStorageDetailList.map(item => ({
-        ...item,
-        theInboundQuantity: item.inboundQuantity || 0 
-      }))
-      this.sizeForm = {
-        ...this.sizeForm,
-        ...ldOnePutStorage,
-        inDate: ldOnePutStorage.inDate ? new Date(ldOnePutStorage.inDate) : '',
-        option: Number(ldOnePutStorage.options) || 1,
-        quarterName: ldOnePutStorage.purchaseEndInfo,
-      }
-      if (this.sizeForm.option === 1) {
-        this.sizeForm.inTableData = handledDetailList;
-      } else {
-        this.sizeForm.singleData = handledDetailList;
-      }
+          if (!ldOnePutStorage) {
+            this.$message.error("回显数据异常");
+            return;
+          }
+          const handledDetailList = ldOnePutStorageDetailList.map(item => ({
+            ...item,
+            theInboundQuantity: item.inboundQuantity || 0
+          }))
+          this.sizeForm = {
+            ...this.sizeForm,
+            ...ldOnePutStorage,
+            inDate: ldOnePutStorage.inDate ? new Date(ldOnePutStorage.inDate) : '',
+            option: Number(ldOnePutStorage.options) || 1,
+            quarterName: ldOnePutStorage.purchaseEndInfo,
+          }
+          if (this.sizeForm.option === 1) {
+            this.sizeForm.inTableData = handledDetailList;
+          } else {
+            this.sizeForm.singleData = handledDetailList;
+          }
 
-    } catch (error) {
-      console.error("回显失败：", error);
-      this.$message.error("获取详情数据失败");
-    }
-  }
-},
+        } catch (error) {
+          console.error("回显失败：", error);
+          this.$message.error("获取详情数据失败");
+        }
+      }
+    },
     addInit() {
       // 生成入库单号
       // const randomNum = Math.floor(Math.random() * 100000000) + 1;
@@ -485,6 +484,7 @@ export default {
         return
       }
       this.sizeForm.quarterName = selectedOption.quarterName
+
       this.sizeForm.purchaseEndInfo = selectedOption
       this.loading = true
       const res = await getPurchasesByIds(this.batchType);
@@ -623,18 +623,23 @@ export default {
         this.sizeForm.options = this.sizeForm.option
         this.sizeForm.option = ''
       }
-      const res = await submitData(this.sizeForm)
-      if (res.data.success) {
-        this.$message({
-          type: "success",
-          message: "提交成功"
-        });
-        // 提交成功后通知父组件更新页面
-        this.$emit('submitSuccess');
-        this.handleCloseDetail();
-      } else {
-        this.$message.error(res.data.message || "提交失败");
+      try {
+        const res = await submitData(this.sizeForm)
+        if (res.data.success) {
+          this.$message({
+            type: "success",
+            message: "提交成功"
+          });
+          // 提交成功后通知父组件更新页面
+          this.$emit('submitSuccess');
+          this.handleCloseDetail();
+        } else {
+          this.$message.error(res.data.message || "提交失败");
+        }
+      } catch (error) { 
+        this.$message.error(error.message || "服务器错误");
       }
+
     },
 
     // 选项选择，批量选择1 单条选择2
diff --git a/src/views/firstOrder/components/outDialog.vue b/src/views/firstOrder/components/outDialog.vue
index bc480b4..20a873f 100644
--- a/src/views/firstOrder/components/outDialog.vue
+++ b/src/views/firstOrder/components/outDialog.vue
@@ -7,7 +7,7 @@
         <div class="form-title"> 基本信息</div>
         <el-row>
           <el-col :span="12" v-show="sizeForm.options == 1 && outDialogType != 'add'">
-            <el-form-item label="入库单号">
+            <el-form-item label="出库单号">
               <el-input v-model="sizeForm.orderNo" disabled></el-input>
             </el-form-item>
           </el-col>
@@ -71,7 +71,7 @@
           </el-table-column>
           <el-table-column prop="unit" label="单位">
           </el-table-column>
-          <el-table-column prop="departmentName" label="部门" v-if="sizeForm.options == 2">
+          <el-table-column prop="departmentName" label="部门" v-if="sizeForm.options === 2">
             <template slot-scope="scope">
               <el-select v-model="scope.row.department" placeholder="请选择部门名称" style="width: 100%;"
                 v-if='inDialogType != "details"'>
@@ -85,12 +85,15 @@
           <el-table-column prop="applicationQuantity" label="申请数量" v-if="sizeForm.options == 1">
           </el-table-column>
           <el-table-column prop="outboundQuantity" label="已出库数量" v-if="sizeForm.options == 1">
+            <template slot-scope="scope">
+              {{ scope.row.outboundQuantity || 0 }}
+            </template>
           </el-table-column>
-          <el-table-column prop="theInboundQuantity" label="本次入库数量">
+          <el-table-column prop="theOutboundQuantity" label="本次出库数量">
             <template slot-scope="scope">
-              <el-input-number size="mini" v-model="scope.row.theInboundQuantity" :min="1" style="width: 100%;"
+              <el-input-number size="mini" v-model="scope.row.theOutboundQuantity" :min="1" style="width: 100%;"
                 @change="syncInboundQuantity(scope.row)" :disabled="outDialogType == 'details'"></el-input-number>
-              <!-- <span v-else>{{ scope.row.theInboundQuantity || 0 }}</span> -->
+              <!-- <span v-else>{{ scope.row.theOutboundQuantity || 0 }}</span> -->
             </template>
           </el-table-column>
           <!-- <el-table-column prop="status" label="出库情况">
@@ -121,19 +124,20 @@
                 </span>
               </template>
             </el-table-column>
-            <!-- <el-table-column prop="str6" label="数量" v-if="sizeForm.options == 1">
-            </el-table-column> -->
-            <el-table-column prop="theInboundQuantity" label="本次出库数量">
+            <el-table-column prop="theOutboundQuantity" label="本次出库数量">
             </el-table-column>
           </el-table-column>
           <el-table-column prop="date" label="出库信息" v-if="sizeForm.options == 1">
             <el-table-column prop="outboundQuantity" label="数量">
+              <template slot-scope="scope">
+      {{ scope.row.outboundQuantity || 0 }}
+    </template>
             </el-table-column>
           </el-table-column>
-          <el-table-column prop="date" label="出库后库存" v-if="sizeForm.options == 1">
+          <!-- <el-table-column prop="date" label="出库后库存" v-if="sizeForm.options == 1">
             <el-table-column prop="str10" label="数量">
             </el-table-column>
-          </el-table-column>
+          </el-table-column> -->
         </el-table>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -174,10 +178,10 @@
         <el-button type="primary" @click="batchSubmit()">确 定</el-button>
       </span>
     </el-dialog>
-    <!-- 耐用品选择弹窗 -->
+    <!-- 选择弹窗 -->
     <el-dialog :close-on-click-modal="false" title="选择耐用品" :visible.sync="goodsVisible" :append-to-body="true"
-      width="40%" @selection-change="goodsListSelectionChange">
-      <el-table :data="goodsList" border style="width: 100%">
+      width="70%">
+      <el-table :data="goodsList" border style="width: 100%" @selection-change="goodsListSelectionChange">
         <el-table-column type="selection" width="55">
         </el-table-column>
         <el-table-column prop="materialCode" label="物资编码">
@@ -198,10 +202,13 @@
         <el-table-column prop="applicationQuantity" label="申请数量">
         </el-table-column>
         <el-table-column prop="outboundQuantity" label="已出库数量">
+          <template slot-scope="scope">
+            {{ scope.row.outboundQuantity || 0 }}
+          </template>
         </el-table-column>
-        <el-table-column prop="theInboundQuantity" label="本次入库数量">
+        <el-table-column prop="theOutboundQuantity" label="本次出库数量">
           <template slot-scope="scope">
-            <el-input-number size="mini" v-model="scope.row.theInboundQuantity" :min="1" style="width: 100%;"
+            <el-input-number size="mini" v-model="scope.row.theOutboundQuantity" :min="1" style="width: 100%;"
               @change="syncInboundQuantity(scope.row)" :disabled="outDialogType == 'details'"></el-input-number>
           </template>
         </el-table-column>
@@ -246,14 +253,14 @@ export default {
       departmentList: [],
       outDialogVisible: false,
       sizeForm: {
-        orderNo: '',//入库单号
+        orderNo: '',//出库单号
         reason: '',//事由
         // inAccountsTableData: [],//总计
         inTableData: [],
         ldOneOutStorageDetailVOList: [],
         demandEndInfo: '',//需求单名称
         outDate: '',//出库日期
-        options: '',//出库类型
+        options: 2,//出库类型
         materialType: '1',//物资类型
         status: '',//1暂存 2提交
         // materialld: '',//物资Id
@@ -297,9 +304,9 @@ export default {
     this.getMaterialList()
   },
   methods: {
-    //本次入库数量
+    //本次出库数量
     syncInboundQuantity(row) {
-      row.theInboundQuantity = Number(row.theInboundQuantity);
+      row.theOutboundQuantity = Number(row.theOutboundQuantity);
     },
     //关闭新增弹窗
     handleCloseDetail() {
@@ -388,24 +395,28 @@ export default {
         if (selectedQuarter) {
           this.sizeForm.demandEndInfo = selectedQuarter.quarterName;
         }
-
-        if(res.data.result.abc != null && res.data.result.abc.length > 0){
-          this.data.goodsVisible = true
-          this.data.goodsList = res.data.result.abc
+        if (res.data.result.uniqueList != null && res.data.result.uniqueList.length > 0) {
+          this.goodsVisible = true
+          this.goodsList = res.data.result.uniqueList
         }
       } else {
         this.$message.warning('未获取到详细数据');
       }
 
     },
-    //易用品选择回调函数
-    goodsListSelectionChange(val){
+    //选择回调函数
+    goodsListSelectionChange(val) {
       this.goodsSelectList = val
     },
-    //易用品弹窗点击确认按钮
-    goodsSubmit(){
-      this.data.goodsVisible = false
-      this.sizeForm.inTableData.push(this.goodsSelectList)
+    //批量选择弹窗点击确认按钮
+    goodsSubmit() {
+      if (this.goodsSelectList.length > 0) {
+        this.sizeForm.inTableData.push(...this.goodsSelectList);
+        this.$forceUpdate();
+      } else {
+        this.$message.warning('请先勾选需要添加的数据');
+      }
+      this.goodsVisible = false
     },
     //获取单条选择的部门名称列表
     async getDetailedItems() {
@@ -481,19 +492,23 @@ export default {
       this.sizeForm.ldOneOutStorageDetailVOList.departmentName = this.sizeForm.inTableData.department
 
       this.sizeForm.inTableData = []
-      const res = await submitData(this.sizeForm)
-      console.log(res, '暂存提交数据')
-      if (res.data.success) {
-        this.$message({
-          type: "success",
-          message: "提交成功"
-        });
-        // 提交成功后通知父组件更新页面
-        this.$emit('submitSuccess');
-        this.handleCloseDetail();
-      } else {
-        this.$message.error(res.data.message || "提交失败");
+      try {
+        const res = await submitData(this.sizeForm)
+        if (res.data.success) {
+          this.$message({
+            type: "success",
+            message: "提交成功"
+          });
+          this.$emit('submitSuccess');
+          this.handleCloseDetail();
+        } else {
+          this.$message.error(res.data.message || "提交失败");
+        }
+      } catch (error) {
+        this.$message.error(error.message || "服务器错误");
       }
+
+
     },
     //编辑和详情
     async inInit() {
@@ -508,7 +523,7 @@ export default {
           }
           const handledDetailList = ldOneOutStorageDetails.map(item => ({
             ...item,
-            // theInboundQuantity: item.theInboundQuantity || 0
+            outboundQuantity: item.outboundQuantity || 0
           }))
           this.sizeForm = {
             ...this.sizeForm,
@@ -525,97 +540,22 @@ export default {
       }
     },
     addInit() {
-      //   // 生成入库单号
-      //   const randomNum = Math.floor(Math.random() * 100000000) + 1;
-      //   this.sizeForm.code = String(randomNum).padStart(8, '0');//入库单号
-      this.sizeForm.outDate = new Date()//入库时间
+      this.sizeForm.outDate = new Date()//出库时间
     },
-    // 添加入库数据
+    // 添加出库数据
     inTableAdd() {
       this.sizeForm.inTableData.push({})
     },
-    // // 点击入库
-    // // putIn(row) {
-    // //   row.status = 0
-    // //   // 更改总表的数据
-    // //   this.sizeForm.inAccountsTableData.push({
-    // //     str1: "000001",
-    // //     str2: "物品1",
-    // //     str3: "规格1",
-    // //     str4: "类别1",
-    // //     str5: "单位1",
-    // //     str6: "12",
-    // //     str7: "3",
-    // //     str8: row.str7,
-    // //     str9: "3",
-    // //     str10: row.str7 + 12,
-    // //     str11: "3",
-    // //     str12: "审批人1",
-    // //     str13: "2025-04-05",
-
-    // //   })
-    // // },
-    // 采购单选择确定
-
-    // // 采购单选择弹框关闭
-    // handleBatchClose() {
-    //   this.inBatchDialogVisible = false
-    // },
-    // // 采购单选择确定
-    // batchSumbit() {
-    //   this.sizeForm.bumen = '部门一'
-    //   this.sizeForm.xuqiudanmingcheng = '2025年一季度需求单'
-    //   this.sizeForm.inTableData.push({
-    //     // str1: '000001',
-    //     // str2: '物品1',
-    //     // str3: '规格1',
-    //     // str4: '类别1',
-    //     // str5: '单位1',
-    //     // str6: '11',
-    //     // str7: '22',
-    //     // str8: '3',
-    //     // str9: '部门一',
-    //     // name: '审批人',
-    //     // status: '1',//
-    //     // yichuku: 98,
-    //   })
-
-    //   this.inBatchDialogVisible = false
-    // },
     // 选项选择
     async radioChange() {
       this.sizeForm.inTableData = []
-      if (this.sizeForm.options == 1) {
-        await this.getQuarterList() // 等待数据加载完成
+      if (this.sizeForm.options === 1) {
+        await this.getQuarterList()
         this.inBatchDialogVisible = true
+        this.$forceUpdate()
 
       }
     },
-    //
-    // changeName(index) {
-    //   console.log(9999, index)
-    //   this.sizeForm.inTableData.forEach((item, i) => {
-    //     if (i == index) {
-    //       item.str1 = '000001'
-    //       item.str2 = '物品1'
-    //       item.str3 = '规格1'
-    //       item.str4 = '类别1'
-    //       item.str5 = '单位1'
-    //       item.str6 = '11'
-    //       item.str7 = 22
-    //       item.str8 = '3'
-    //       item.str9 = '部门一'
-    //       item.name = '审批人'
-    //       item.status = '1'
-    //       this.$set(item, 'str7', 22)
-    //     }
-    //   })
-    //   console.log(888888, this.sizeForm.inTableData)
-    // },
-    numberChange() {
-      this.$forceUpdate();//解决点击计数器失效问题
-      console.log(77777, this.sizeForm.inTableData)
-    }
   },
   watch: {
     // 监听需求单选择变化
diff --git a/src/views/firstOrder/inbound.vue b/src/views/firstOrder/inbound.vue
index b689b73..33db46f 100644
--- a/src/views/firstOrder/inbound.vue
+++ b/src/views/firstOrder/inbound.vue
@@ -16,20 +16,16 @@
       @refresh-change="refreshChange"
       @on-load="onLoad"
     >
-      <!-- @row-click="rowSelect" -->
       <template slot-scope="scope" slot="menuLeft">
         <el-button size="small"   type="primary"  @click="handleDesign()"
           >新增入库单
         </el-button>
-        <!-- <el-button size="small"  type="primary" @click="handleExport()"
-          >入库单导出
-        </el-button> -->
       </template>
       <template slot-scope="scope" slot="purchaseEndInfo">
         <el-button
           type="text"
           @click.stop="purchaseFn(scope.row)"
-          v-if="scope.row.purchaseEndInfo != ''"
+          v-if="scope.row.purchaseEndInfo && scope.row.purchaseEndInfo !== ''"
           >{{ scope.row.purchaseEndInfo }}</el-button
         >
         <span v-else>无</span>
@@ -76,13 +72,13 @@
       :showDialog="approvalProcessShow"
       v-if="approvalProcessShow"
       @closeDialog="closeDialog"
+      :approveList="approveList"
     ></approvalProcessDialog>
   </basic-container>
 </template>
 
 <script>
-import { getList } from "@/api/firstOrder/inbound";
-// import { mapGetters } from "vuex";
+import { getList, editList } from "@/api/firstOrder/inbound";
 import inDialog from "./components/inDialog.vue";
 import purchaseDialog from "./components/purchaseDialog.vue";
 import approvalProcessDialog from "./components/approvalProcessDialog.vue";
@@ -94,7 +90,7 @@ export default {
   },
   data() {
     return {
-      // form: {},
+      approveList:[],
       form: { inDate: [], inOperatorName: "", inOperator: "" },
       selectionList: [],
       query: {},
@@ -109,7 +105,7 @@ export default {
         calcHeight: 30,
         tip: false,
         searchShow: true,
-        searchMenuSpan: 6,
+        searchMenuSpan: 12,
         border: true,
         index: true,
         viewBtn: false,
@@ -128,39 +124,24 @@ export default {
         menuWidth: 190,
         menu: true,
         menuAlign: "left",
+        searchMenuAlign: "right", 
         searchMenuPosition: "right",
         excelBtn: true,
         column: [
           {
             label: "采购单名称",
             prop: "purchaseEndInfo",
-<<<<<<< HEAD
-            width: 150,
-            align: "center",
-            formatter: (row, column) => {
-              const value = row.purchaseEndInfo;
-              if (value === null || value === undefined || value === "") {
-                return "无"; // 空值时显示“无”
-              }
-              return value; // 有值时显示原内容
-            }
-=======
             width: 180,
             headerAlign: "center",
             align: "center",
->>>>>>> 8b1ca70a0fedc4bfbcc6caa65f87be7eec4bd817
+            slot: "purchaseEndInfo"
           },
           {
             label: "入库单号",
             prop: "orderNo",
-<<<<<<< HEAD
-            width: 160,
-            align: "center"
-=======
             width: 110,
             headerAlign: "center",
             align: "center",
->>>>>>> 8b1ca70a0fedc4bfbcc6caa65f87be7eec4bd817
           },
           {
             label: "入库日期",
@@ -170,72 +151,49 @@ export default {
             searchRange: true,
             startPlaceholder: "开始时间",
             endPlaceholder: "结束时间",
-<<<<<<< HEAD
-            format: 'yyyy-MM-dd HH:mm:ss',
-            valueFormat: 'yyyy-MM-dd HH:mm:ss',
-            width: 160,
-            align: "center"
-=======
             format: "yyyy-MM-dd HH:mm:ss",
             valueFormat: "yyyy-MM-dd HH:mm:ss",
             width: 140,
             headerAlign: "center",
             align: "center",
->>>>>>> 8b1ca70a0fedc4bfbcc6caa65f87be7eec4bd817
-            // searchParam: 'startTime',
-            // searchEndParam: 'endTime'
           },
           {
             label: "入库人",
             prop: "inOperatorName",
             search: true,
-<<<<<<< HEAD
-            searchParam: 'inOperator',
-            align: "center"
-=======
             searchParam: "inOperator",
             headerAlign: "center",
             align: "center",
->>>>>>> 8b1ca70a0fedc4bfbcc6caa65f87be7eec4bd817
           },
           {
             label: "来源",
             prop: "source",
             search: false,
-<<<<<<< HEAD
-            align: "center"
-=======
             headerAlign: "center",
             align: "center",
->>>>>>> 8b1ca70a0fedc4bfbcc6caa65f87be7eec4bd817
+            type: "select",
+            dicData: [
+              {
+                label: "采购申请",
+                value: 'cg',
+              },
+              {
+                label: "其他来源",
+                value: 'qt',
+              },
+            ],
           },
           {
             label: "事由",
             prop: "reason",
             search: false,
-<<<<<<< HEAD
-            align: "center"
-=======
             headerAlign: "center",
             align: "center",
->>>>>>> 8b1ca70a0fedc4bfbcc6caa65f87be7eec4bd817
           },
           {
             label: "物资类型",
             prop: "materialType",
             search: false,
-<<<<<<< HEAD
-            type: 'select',
-            align: "center",
-            dicData: [{
-              label: '办公物资',
-              value: '1'
-            },
-            {
-              label: '其他物资',
-              value: '2'
-            }]
-=======
             type: "select",
             headerAlign: "center",
             align: "center",
@@ -249,27 +207,12 @@ export default {
                 value: "2",
               },
             ],
->>>>>>> 8b1ca70a0fedc4bfbcc6caa65f87be7eec4bd817
-          },
-          {
-            label: "审批人员",
-            prop: "approvers",
-<<<<<<< HEAD
-            align: "center"
-=======
-            headerAlign: "center",
-            align: "center",
->>>>>>> 8b1ca70a0fedc4bfbcc6caa65f87be7eec4bd817
           },
           {
             label: "状态",
             prop: "status",
-<<<<<<< HEAD
-            type: 'select',
-=======
             type: "select",
             headerAlign: "center",
->>>>>>> 8b1ca70a0fedc4bfbcc6caa65f87be7eec4bd817
             align: "center",
             dicData: [
               {
@@ -300,8 +243,11 @@ export default {
   },
   computed: {},
   methods: {
-    approvalProcessFn(row) {
+    async approvalProcessFn(row) {
       this.approvalProcessShow = true;
+      const res = await editList(row.id);
+      this.approveList = res.data.result.approveList
+      console.log(this.approveList,'1111122')
     },
     handleDesign() {
       this.inDialogType = "add";
@@ -310,19 +256,10 @@ export default {
     },
     // 详情
     handleDetails(row) {
-<<<<<<< HEAD
-      this.inDialogVisible = true
-      this.inDialogType = 'details'
-      this.inDialogTiltle = '详情'
-      this.id = row.id
-      console.log(this.id, 'id')
-=======
       this.inDialogVisible = true;
       this.inDialogType = "details";
       this.inDialogTiltle = "详情";
       this.id = row.id;
-      console.log(this.id, "id");
->>>>>>> 8b1ca70a0fedc4bfbcc6caa65f87be7eec4bd817
     },
     // 编辑
     handleEdit(row) {
@@ -410,7 +347,6 @@ export default {
         delete queryParams.inDate;
       }
       getList(page.currentPage, page.pageSize, queryParams).then((res) => {
-        console.log("列表", res.data.result);
         this.data = res.data.result.list;
         this.loading = false;
         this.page.total = res.data.result.total;
@@ -420,4 +356,6 @@ export default {
 };
 </script>
 
-<style></style>
+<style>
+
+</style>
diff --git a/src/views/firstOrder/list.vue b/src/views/firstOrder/list.vue
index 9ac21fd..abb4129 100644
--- a/src/views/firstOrder/list.vue
+++ b/src/views/firstOrder/list.vue
@@ -1,48 +1,31 @@
 <template>
   <div>
     <basic-container>
-      <avue-crud
-        :option="option"
-        :table-loading="loading"
-        :data="data"
-        ref="crud"
-        v-model="form"
-        :page.sync="page"
-        :permission="permissionList"
-        @row-del="rowDel"
-        @search-change="searchChange"
-        @search-reset="searchReset"
-        @selection-change="selectionChange"
-        @current-change="currentChange"
-        @size-change="sizeChange"
-        @refresh-change="refreshChange"
-        @on-load="onLoad"
-      >
+      <avue-crud :option="option" :table-loading="loading" :data="data" ref="crud" v-model="form" :page.sync="page"
+        :permission="permissionList" @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 slot-scope="scope" slot="menu">
-          <el-button type="text" size="small" @click.stop="handleLog(scope.row)"
-            >记录
+          <el-button type="text" size="small" @click.stop="handleLog(scope.row)">记录
           </el-button>
         </template>
       </avue-crud>
     </basic-container>
-    <el-dialog
-      title="记录"
-      :visible.sync="dialogLogVisible"
-      width="50%"
-      :close-on-click-modal="false"
-      :append-to-body="true"
-    >
+    <el-dialog title="记录" :visible.sync="dialogLogVisible" width="50%" :close-on-click-modal="false"
+      :append-to-body="true">
       <el-tabs v-model="transactionType" @tab-click="handleTabClick">
-         <el-tab-pane label="出库" name="1"></el-tab-pane>
+        <el-tab-pane label="出库" name="1"></el-tab-pane>
         <el-tab-pane label="入库" name="2"></el-tab-pane>
       </el-tabs>
       <el-table :data="tableData" style="width: 100%">
         <el-table-column type="index" width="50"> </el-table-column>
-        <el-table-column prop="quantity" label="数量" >
+        <el-table-column prop="quantity" label="数量">
+        </el-table-column>
+        <el-table-column prop="money" label="单价" v-if="transactionType == '2'">
         </el-table-column>
         <el-table-column prop="operatorName" label="操作人" >
         </el-table-column>
-        <el-table-column prop="operationTime" label="时间" >
+        <el-table-column prop="operationTime" label="时间" :formatter="formatTime">
         </el-table-column>
         <el-table-column prop="departmentName" label="部门"> </el-table-column>
       </el-table>
@@ -73,7 +56,7 @@ export default {
         calcHeight: 30,
         tip: false,
         searchShow: true,
-        searchMenuSpan: 6,
+        searchMenuSpan: 12,
         border: true,
         index: true,
         selection: true,
@@ -158,6 +141,13 @@ export default {
             prop: "remark",
             headerAlign: "center",
             align: "center",
+            formatter: (row, column) => {
+              const value = row.remark;
+              if (value === null || value === undefined || value === "") {
+                return "无";
+              }
+              return value;
+            }
           },
         ],
       },
@@ -189,38 +179,54 @@ export default {
     },
   },
   mounted() {
-    this.tableData = this.ckTable;
-    this.tableData = this.rkTable;
+    this.ckTable = [];
+    this.rkTable = [];
+    this.tableData = [];
   },
   methods: {
+    formatTime(row, column, cellValue) {
+    if (!cellValue) return '';
+    return cellValue.replace('T', ' ');
+  },
     async handleLog(row) {
       this.dialogLogVisible = true;
       this.currentRow = row;
+      this.loadTransactionData();
+    },
+
+    handleTabClick() {
+      this.loadTransactionData();
+    },
+    async loadTransactionData() {
+      if (!this.currentRow) return;
+
       const params = {
-        oneFromId: row.id,
-        transactionType: this.transactionType,
+        oneFromId: this.currentRow.id,
+        transactionType: this.transactionType 
       };
+
       const pageNum = this.page.currentPage;
       const pageSize = this.page.pageSize;
-      const res = await recordList(
-        pageNum,
-        pageSize,
-        Object.assign({}, this.query, params)
-      );
-      this.tableData = res.data.result.list;
-    },
 
-    handleTabClick() {
-      //出库
-      if (this.transactionType == "1") {
-        this.tableData = this.ckTable;
-      }
-      // 入库
-      if (this.transactionType == "2") {
-        this.tableData = this.rkTable;
+      this.loading = true;
+      try {
+        const res = await recordList(
+          pageNum,
+          pageSize,
+          Object.assign({}, this.query, params)
+        );
+        if (this.transactionType === "1") {
+          this.ckTable = res.data.result.list;
+        } else {
+          this.rkTable = res.data.result.list;
+        }
+        this.tableData = res.data.result.list;
+      } catch (error) {
+        console.error("获取记录数据失败:", error);
+      } finally {
+        this.loading = false;
       }
     },
-
     searchReset() {
       this.query = {};
       this.onLoad(this.page);
diff --git a/src/views/firstOrder/outbound.vue b/src/views/firstOrder/outbound.vue
index 112bde4..a3dfd22 100644
--- a/src/views/firstOrder/outbound.vue
+++ b/src/views/firstOrder/outbound.vue
@@ -12,9 +12,9 @@
         </el-button> -->
       </template>
       <template slot-scope="scope" slot="purchaseEndInfo">
-        <el-button type="text" @click.stop="purchaseFn(scope.row)" v-if="scope.row.purchaseEndInfo != ''">{{
+        <el-button type="text" @click.stop="purchaseFn(scope.row)" v-if="scope.row.purchaseEndInfo != '无'">{{
           scope.row.purchaseEndInfo }}</el-button>
-        <span v-else>无</span>
+        <span>{{ scope.row.purchaseEndInfo || '无' }}</span>
       </template>
       <template #menu="scope">
         <el-button type="text" @click.stop="handleDetails(scope.row)">详情</el-button>
@@ -35,7 +35,6 @@
 
 <script>
 import { getList } from "@/api/firstOrder/outbound";
-// import { mapGetters } from "vuex";
 import outDialog from './components/outDialog.vue';
 import needDialog from './components/needDialog.vue';
 export default {
@@ -45,7 +44,6 @@ export default {
   },
   data() {
     return {
-      // form: {},
       form: { outDate: [] },
       selectionList: [],
       query: {},
@@ -60,7 +58,7 @@ export default {
         calcHeight: 30,
         tip: false,
         searchShow: true,
-        searchMenuSpan: 6,
+        searchMenuSpan: 12,
         border: true,
         index: true,
         selection: true,
@@ -89,11 +87,18 @@ export default {
             width: 180,
             headerAlign: "center",
             align: "center",
+            formatter: (row, column) => {
+              const value = row.demandEndInfo;
+              if (value === null || value === undefined || value === "") {
+                return "无"; 
+              }
+              return value; 
+            }
           },
           {
             label: "出库单号",
             prop: "orderNo",
-            width: 110,
+            width: 140,
             headerAlign: "center",
             align: "center",
           },
@@ -110,8 +115,6 @@ export default {
             width: 140,
             headerAlign: "center",
             align: "center",
-            // searchParam: 'startTime',
-            // searchEndParam: 'endTime'
           },
           {
             label: "事由",
@@ -141,7 +144,13 @@ export default {
             prop: "department",
             align: "center",
             headerAlign: "center",
-            align: "center",
+            formatter: (row, column) => {
+              const value = row.department;
+              if (value === null || value === undefined || value === "") {
+                return "无"; 
+              }
+              return value;
+            }
           },
           {
             label: "出库人",
@@ -150,8 +159,6 @@ export default {
             searchParam: 'inOperator',
             align: "center",
             headerAlign: "center",
-            align: "center",
-            searchParam: 'inOperator'
           },
 
           // {
@@ -271,10 +278,7 @@ export default {
     },
     //新增提交或暂存后更新页面
     handleSubmitSuccess() {
-      console.log(2)
-      console.log('父组件更新')
       this.onLoad(this.page)
-      console.log('父组件更新完成')
     },
     //请求列表数据
     onLoad(page, params = {}) {
diff --git a/src/views/materials/expend.vue b/src/views/materials/expend.vue
index 85a591c..eb6952e 100644
--- a/src/views/materials/expend.vue
+++ b/src/views/materials/expend.vue
@@ -85,7 +85,7 @@ export default {
         calcHeight: 30,
         tip: false,
         searchShow: true,
-        searchMenuSpan: 6,
+        searchMenuSpan: 12,
         border: true,
         index: true,
         selection: true,
diff --git a/src/views/materials/index.vue b/src/views/materials/index.vue
index d6e4bfd..afc15a3 100644
--- a/src/views/materials/index.vue
+++ b/src/views/materials/index.vue
@@ -1,30 +1,9 @@
 <template>
   <div>
     <basic-container>
-      <!-- <avue-crud :option="option" :table-loading="loading" :data="data" ref="crud" v-model="form" :page.sync="page"
-        :permission="permissionList" @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 slot-scope="scope" slot="menu">
-          <el-button  type="text" size="small" @click.stop="handleReturn(scope.row)">查看
-          </el-button>
-          <el-button  type="text" size="small" @click.stop="handleReturn(scope.row)">编辑
-          </el-button>
-        </template>
-</avue-crud> -->
-      <avue-crud
-        :option="option"
-        v-model="form"
-        :data="data"
-        @row-del="rowDel"
-        @on-load="onLoad"
-        :table-loading="loading"
-        @row-update="rowUpdate"
-        @row-save="rowSave"
-        @search-change="searchChange"
-        @search-reset="searchReset"
-        :page.sync="page"
-      ></avue-crud>
+      <avue-crud :option="option" v-model="form" :data="data" @row-del="rowDel" @on-load="onLoad"
+        :table-loading="loading" @row-update="rowUpdate" @row-save="rowSave" @search-change="searchChange"
+        @search-reset="searchReset" :page.sync="page"></avue-crud>
     </basic-container>
   </div>
 </template>
@@ -38,6 +17,7 @@ export default {
       selectionList: [],
       query: {},
       loading: true,
+      codeList: [],
       page: {
         pageSize: 10,
         currentPage: 1,
@@ -48,7 +28,7 @@ export default {
         calcHeight: 30,
         tip: false,
         searchShow: true,
-        searchMenuSpan: 6,
+        searchMenuSpan: 18,
         border: true,
         index: true,
         selection: true,
@@ -63,7 +43,7 @@ export default {
         gridSpan: false,
         filterBtn: false,
         columnBtn: false,
-        menuAlign: "left",
+        menuAlign: "center",
         searchMenuPosition: "right",
         addBtnIcon: " ",
         viewBtnIcon: " ",
@@ -94,14 +74,6 @@ export default {
               label: "label",
               value: "value",
             },
-            // formatter: (row, value, label, column) => {
-            //   // 根据value值返回对应的label
-            //   const typeMap = {
-            //     1: '易耗品',
-            //     2: '耐用品'
-            //   };
-            //   return typeMap[value] || value;
-            // },
             dataType: "string",
           },
           {
@@ -110,25 +82,25 @@ export default {
             headerAlign: "center",
             align: "center",
           },
+          {
+            label: "描述",
+            prop: "remark",
+            headerAlign: "center",
+            align: "center",
+            formatter: (row, column) => {
+              const value = row.remark;
+              if (value === null || value === undefined || value === "") {
+                return "无";
+              }
+              return value;
+            }
+          },
         ],
       },
       data: [],
       dialogLogVisible: false,
       activeName: "first",
       tableData: [],
-
-      ckTable: [
-        { str1: "3", str2: "2025-04-09", str3: "部门一" },
-        { str1: "37", str2: "2025-04-03", str3: "部门一" },
-      ],
-      rkTable: [
-        { str1: "5", str2: "2025-03-19", str3: "部门二" },
-        { str1: "12", str2: "2025-03-19", str3: "部门二" },
-      ],
-      bfTable: [
-        { str1: "9", str2: "2025-03-19", str3: "部门三" },
-        { str1: "19", str2: "2025-03-19", str3: "部门三" },
-      ],
     };
   },
   computed: {
@@ -161,7 +133,6 @@ export default {
             label: item.name,
             value: item.code,
           }));
-          console.log("materialCode字典数据：", dicData);
           const targetColumn = this.option.column.find(
             (col) => col.prop === "materialCode"
           );
@@ -170,7 +141,6 @@ export default {
           }
         })
         .catch((error) => {
-          console.error("获取materialCode字典数据失败：", error);
           this.$message.error("加载类别数据失败，请刷新重试");
         });
     },
@@ -218,7 +188,14 @@ export default {
     },
     //新增
     rowSave(row, done, loading) {
+      // const submitData = {
+      //     ...row,
+      //     code: row.materialCode,  
+      //     materialCode: undefined  
+      //   };
+      //   console.log(submitData,'submitData')
       add(row).then(
+        
         () => {
           this.onLoad(this.page);
           this.$message({
@@ -281,32 +258,11 @@ export default {
     },
     onLoad(page, params = {}) {
       this.loading = true;
-      // this.data.push({
-      //   no: '00100001',
-      //   name: '物资1',
-      //   xh: '1',
-      //   lb: '易耗品',
-      //   unit: '11',
-      //   number: '1',
-      //   dj: '11',
-      //   pice: '11'
-      // }, {
-      //   no: '00100002',
-      //   name: '物资2',
-      //   xh: '2',
-      //   lb: '耐用品',
-      //   unit: '22',
-      //   number: '2',
-      //   dj: '11',
-      //   pice: '22'
-      // })
-      this.loading = false;
       getList(
         page.currentPage,
         page.pageSize,
         Object.assign(params, this.query)
       ).then((res) => {
-        // const data = res.data.data;
         this.data = res.data.result.list;
         this.loading = false;
         this.page.total = res.data.result.total;
diff --git a/src/views/purchaseOrders/index.vue b/src/views/purchaseOrders/index.vue
index e3e7689..8728fc3 100644
--- a/src/views/purchaseOrders/index.vue
+++ b/src/views/purchaseOrders/index.vue
@@ -33,7 +33,7 @@ export default {
         calcHeight: 30,
         tip: false,
         searchShow: true,
-        searchMenuSpan: 6,
+        searchMenuSpan: 18,
         border: true,
         index: true,
         selection: true,
@@ -48,6 +48,7 @@ export default {
         gridSpan: false,
         filterBtn: false,
         columnBtn: false,
+        searchMenuPosition: "right",
         column: [
           {
             label: "采购单号",
@@ -68,12 +69,6 @@ export default {
             headerAlign: "center",
             align: "center",
           },
-          {
-            label: "类别",
-            prop: "type",
-            headerAlign: "center",
-            align: "center",
-          },
           {
             label: "单位",
             prop: "unit",
@@ -98,20 +93,7 @@ export default {
       dialogLogVisible: false,
       activeName: 'first',
       tableData: [],
-
-      // ckTable: [
-      //   {str1: '3', str2: '2025-04-09', str3: '部门一'},
-      //   {str1: '37', str2: '2025-04-03', str3: '部门一'}
-      // ],
-      // rkTable: [
-      //   {str1: '5',str2: '2025-03-19',str3: '部门二'},
-      //   {str1: '12',str2: '2025-03-19',str3: '部门二'},
-      // ],
-      // bfTable: [
-      //   {str1: '9',str2: '2025-03-19',str3: '部门三'},
-      //   {str1: '19',str2: '2025-03-19',str3: '部门三'},
-      // ],
-    };
+    }
   },
   computed: {
     ...mapGetters(["userInfo", "permission"]),
@@ -179,27 +161,7 @@ export default {
       this.onLoad(this.page, this.query);
     },
     onLoad(page, params = {}) {
-      this.loading = true;
-      // this.data.push({
-      //   no: '00100001',
-      //   name: '物品1',
-      //   xh: '1',
-      //   lb: '易耗品',
-      //   unit: '11',
-      //   number: '1',
-      //   dj: '11',
-      //   pice: '11'
-      // }, {
-      //   no: '00100002',
-      //   name: '物品2',
-      //   xh: '2',
-      //   lb: '耐用品',
-      //   unit: '22',
-      //   number: '2',
-      //   dj: '11',
-      //   pice: '22'
-      // })
-      this.loading = false
+      this.loading = true
       getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
         console.log(898989,res.data.result)
         this.data = res.data.result.list;
diff --git a/src/views/secondOrder/list.vue b/src/views/secondOrder/list.vue
index fa09bae..9fdbcf5 100644
--- a/src/views/secondOrder/list.vue
+++ b/src/views/secondOrder/list.vue
@@ -58,7 +58,7 @@ export default {
         calcHeight: 30,
         tip: false,
         searchShow: true,
-        searchMenuSpan: 6,
+        searchMenuSpan: 12,
         border: true,
         index: true,
         selection: true,
diff --git a/src/views/secondOrder/outbound.vue b/src/views/secondOrder/outbound.vue
index 87d1e3d..a5a0f15 100644
--- a/src/views/secondOrder/outbound.vue
+++ b/src/views/secondOrder/outbound.vue
@@ -87,7 +87,7 @@ export default {
         calcHeight: 30,
         tip: false,
         searchShow: true,
-        searchMenuSpan: 6,
+        searchMenuSpan: 12,
         border: true,
         index: true,
         selection: true,