From f0cec44ed8a2ae04c4aded56287a1caf3986978f Mon Sep 17 00:00:00 2001
From: wangmeng <1620161711@qq.com>
Date: Wed, 31 Dec 2025 17:10:49 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/menu.js            |  2 +-
 src/api/system/role.js            |  9 ++++----
 src/page/index/index.vue          |  1 +
 src/page/index/top/top-menu.vue   |  2 ++
 src/store/modules/dict.js         |  2 +-
 src/store/modules/user.js         |  5 +++--
 src/views/authority/apiscope.vue  |  2 +-
 src/views/authority/datascope.vue |  2 +-
 src/views/authority/role.vue      | 34 +++++++++++++++++--------------
 src/views/firstOrder/inbound.vue  |  2 +-
 src/views/system/dict.vue         |  1 +
 11 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/src/api/system/menu.js b/src/api/system/menu.js
index 77d38b7..c4997ef 100644
--- a/src/api/system/menu.js
+++ b/src/api/system/menu.js
@@ -98,7 +98,7 @@ export const getTopMenu = () => request({
 });
 
 export const getRoutes = (topMenuId) => request({
-  url: '/api/blade-system/menu/routes',
+  url: '/smartpark/menu/routes',
   method: 'get',
   params: {
     topMenuId,
diff --git a/src/api/system/role.js b/src/api/system/role.js
index be4d4d3..781a82f 100644
--- a/src/api/system/role.js
+++ b/src/api/system/role.js
@@ -13,14 +13,15 @@ export const getList = (current, size, params) => {
 }
 export const grantTree = () => {
   return request({
-    url: '/api/blade-system/menu/grant-tree',
+    url: '/smartpark/menu/grant-tree',
     method: 'get',
+   
   })
 }
 
 export const grant = (roleIds, menuIds, dataScopeIds, apiScopeIds) => {
   return request({
-    url: '/api/blade-system/role/grant',
+    url: '/smartpark/role/grant',
     method: 'post',
     data: {
       roleIds,
@@ -60,7 +61,7 @@ export const update = (row) => {
 
 export const getRole = (roleIds) => {
   return request({
-    url: '/api/blade-system/menu/role-tree-keys',
+    url: '/smartpark/menu/role-tree-keys',
     method: 'get',
     params: {
       roleIds,
@@ -70,7 +71,7 @@ export const getRole = (roleIds) => {
 
 export const getRoleTree = (tenantId) => {
   return request({
-    url: '/api/blade-system/role/tree',
+    url: '/smartpark/role/tree',
     method: 'get',
     params: {
       tenantId,
diff --git a/src/page/index/index.vue b/src/page/index/index.vue
index 1a6da59..3a51591 100644
--- a/src/page/index/index.vue
+++ b/src/page/index/index.vue
@@ -88,6 +88,7 @@
       },
       //打开菜单
       openMenu(item = {}) {
+        console.log("itemitemitemopenMenu", item)
         this.$store.dispatch("GetMenu", item.id).then(data => {
           if (data.length !== 0) {
             this.$router.$avueRouter.formatRoutes(data, true);
diff --git a/src/page/index/top/top-menu.vue b/src/page/index/top/top-menu.vue
index 3add0bf..29fc412 100644
--- a/src/page/index/top/top-menu.vue
+++ b/src/page/index/top/top-menu.vue
@@ -45,12 +45,14 @@
     },
     methods: {
       openHome(itemHome) {
+
         this.index.openMenu(itemHome);
         this.$router.push({
           path: this.$router.$avueRouter.getPath({name: itemHome.name, src: ''}, {})
         });
       },
       openMenu(item) {
+        console.log("openMenu", item)
         this.index.openMenu(item)
       },
       getMenu() {
diff --git a/src/store/modules/dict.js b/src/store/modules/dict.js
index 837dbe6..75e0af7 100644
--- a/src/store/modules/dict.js
+++ b/src/store/modules/dict.js
@@ -10,7 +10,7 @@ const dict = {
     FlowRoutes({commit}) {
       return new Promise((resolve, reject) => {
         getDictionary({code: 'flow'}).then(res => {
-          commit('SET_FLOW_ROUTES', res.data.data);
+          commit('SET_FLOW_ROUTES', res.data.result || []);
           resolve();
         }).catch(error => {
           reject(error)
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 7121612..b40804c 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -253,10 +253,11 @@ const user = {
       })
     },
     //获取系统菜单
-    GetMenu({commit, dispatch}, topMenuId) {
+    GetMenu({ commit, dispatch }, topMenuId) {
+      console.log("")
       return new Promise(resolve => {
         getRoutes(topMenuId).then((res) => {
-          const data = res.data.data
+          const data = res.data.result
           let menu = deepClone(data);
           menu.forEach(ele => {
             addPath(ele, true);
diff --git a/src/views/authority/apiscope.vue b/src/views/authority/apiscope.vue
index 8bd6f71..1eb6c30 100644
--- a/src/views/authority/apiscope.vue
+++ b/src/views/authority/apiscope.vue
@@ -506,7 +506,7 @@
       onLoad(page, params = {}) {
         this.loading = true;
         getLazyMenuList(this.parentId, Object.assign(params, this.query)).then(res => {
-          this.data = res.data.data;
+          this.data = res.data.result;
           this.loading = false;
           this.selectionClear();
         });
diff --git a/src/views/authority/datascope.vue b/src/views/authority/datascope.vue
index 6245070..3f3ca29 100644
--- a/src/views/authority/datascope.vue
+++ b/src/views/authority/datascope.vue
@@ -552,7 +552,7 @@ export default {
     onLoad(page, params = {}) {
       this.loading = true;
       getLazyMenuList(this.parentId, Object.assign(params, this.query)).then(res => {
-        this.data = res.data.data;
+        this.data = res.data.result;
         this.loading = false;
         this.selectionClear();
       });
diff --git a/src/views/authority/role.vue b/src/views/authority/role.vue
index f2df694..1e6a9fe 100644
--- a/src/views/authority/role.vue
+++ b/src/views/authority/role.vue
@@ -312,9 +312,11 @@ export default {
       });
     },
     submit() {
-      const menuList = this.$refs.treeMenu.getCheckedKeys();
-      const dataScopeList = this.$refs.treeDataScope.getCheckedKeys();
-      const apiScopeList = this.$refs.treeApiScope.getCheckedKeys();
+
+      const menuList = this.$refs.treeMenu ? this.$refs.treeMenu.getCheckedKeys() : [];
+      const dataScopeList = this.$refs.treeDataScope ? this.$refs.treeDataScope.getCheckedKeys() : [];
+      const apiScopeList = this.$refs.treeApiScope ? this.$refs.treeApiScope.getCheckedKeys() : [];
+
       grant(this.idsArray, menuList, dataScopeList, apiScopeList).then(() => {
         this.box = false;
         this.$message({
@@ -411,13 +413,14 @@ export default {
       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;
+        const data = res.data.result
+        this.menuGrantList = data.menu;
+        this.dataScopeGrantList = data.dataScope || [];
+        this.apiScopeGrantList = 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.menuTreeObj = res.data.result.menu;
+          this.dataScopeTreeObj = res.data.result.dataScope || [];
+          this.apiScopeTreeObj = res.data.result.apiScope || [];
           this.box = true;
         });
       });
@@ -427,13 +430,14 @@ export default {
       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;
+        const data = res.data.result
+        this.menuGrantList = data.menu;
+        this.dataScopeGrantList = data.dataScope || [];
+        this.apiScopeGrantList = 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.menuTreeObj = res.data.result.menu;
+          this.dataScopeTreeObj = res.data.result.dataScope;
+          this.apiScopeTreeObj = res.data.result.apiScope;
           this.selectionList.push(row);
           this.box = true;
         });
diff --git a/src/views/firstOrder/inbound.vue b/src/views/firstOrder/inbound.vue
index 7049616..b460ef5 100644
--- a/src/views/firstOrder/inbound.vue
+++ b/src/views/firstOrder/inbound.vue
@@ -135,7 +135,7 @@ export default {
             width: 180,
             headerAlign: "center",
             align: "center",
-            slot: "purchaseEndInfo"
+            slot: "purchaseEndInfo",
             width: 150,
             align: "center",
             formatter: (row, column) => {
diff --git a/src/views/system/dict.vue b/src/views/system/dict.vue
index 1771b2f..2377cff 100644
--- a/src/views/system/dict.vue
+++ b/src/views/system/dict.vue
@@ -339,6 +339,7 @@ export default {
         })
         .then(() => {
           this.onLoadChild(this.pageChild);
+          this.$refs.crudChild.refresh();
           this.$message({
             type: "success",
             message: "操作成功!"

From 389abd636f34ef4332b8c7aa1400f646c7b2e688 Mon Sep 17 00:00:00 2001
From: wangmeng <1620161711@qq.com>
Date: Mon, 5 Jan 2026 09:26:15 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/menu.js       |   5 +-
 src/store/modules/user.js    |   4 +-
 src/views/authority/role.vue | 186 +++++++++++++++++++----------------
 3 files changed, 107 insertions(+), 88 deletions(-)

diff --git a/src/api/system/menu.js b/src/api/system/menu.js
index c4997ef..69e7792 100644
--- a/src/api/system/menu.js
+++ b/src/api/system/menu.js
@@ -97,10 +97,11 @@ export const getTopMenu = () => request({
   method: 'get'
 });
 
-export const getRoutes = (topMenuId) => request({
+export const getRoutes = (roleId) => request({
   url: '/smartpark/menu/routes',
   method: 'get',
   params: {
-    topMenuId,
+    roleId,
   }
 });
+
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index b40804c..90eb4c2 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -254,9 +254,8 @@ const user = {
     },
     //获取系统菜单
     GetMenu({ commit, dispatch }, topMenuId) {
-      console.log("")
       return new Promise(resolve => {
-        getRoutes(topMenuId).then((res) => {
+        getRoutes().then((res) => {
           const data = res.data.result
           let menu = deepClone(data);
           menu.forEach(ele => {
@@ -267,6 +266,7 @@ const user = {
           dispatch('GetButtons');
           resolve(menu)
         })
+
       })
     },
     //获取系统按钮
diff --git a/src/views/authority/role.vue b/src/views/authority/role.vue
index 1e6a9fe..9aaf272 100644
--- a/src/views/authority/role.vue
+++ b/src/views/authority/role.vue
@@ -20,7 +20,7 @@
       @on-load="onLoad"
     >
       <template slot="menuLeft">
-        <el-button
+        <!-- <el-button
           type="danger"
           size="small"
           icon="el-icon-delete"
@@ -28,7 +28,7 @@
           plain
           @click="handleDelete"
           >删 除
-        </el-button>
+        </el-button> -->
         <el-button
           size="small"
           icon="el-icon-setting"
@@ -152,36 +152,39 @@ export default {
         border: true,
         index: true,
         selection: true,
-        viewBtn: true,
+        viewBtn: false,
+        addBtn: false,
+        editBtn: false, // 隐藏编辑按钮
+        delBtn: false,  // 隐藏删除按钮
         labelWidth: 120,
         searchLabelWidth: 120,
         menuWidth: 350,
         dialogWidth: 600,
         dialogClickModal: false,
         column: [
-          {
-            label: "上级角色",
-            prop: "parentId",
-            dicData: [],
-            type: "tree",
-            hide: true,
-            span: 24,
-            headerAlign: "center",
-            align: "center",
-            props: {
-              label: "title",
-            },
-            rules: [
-              {
-                required: false,
-                message: "请选择上级角色",
-                trigger: "click",
-              },
-            ],
-          },
+          // {
+          //   label: "上级角色",
+          //   prop: "parentId",
+          //   dicData: [],
+          //   type: "tree",
+          //   hide: true,
+          //   span: 24,
+          //   headerAlign: "center",
+          //   align: "center",
+          //   props: {
+          //     label: "title",
+          //   },
+          //   rules: [
+          //     {
+          //       required: false,
+          //       message: "请选择上级角色",
+          //       trigger: "click",
+          //     },
+          //   ],
+          // },
           {
             label: "角色名称",
-            prop: "roleName",
+            prop: "name",
             search: true,
             headerAlign: "center",
             align: "center",
@@ -194,36 +197,81 @@ export default {
               },
             ],
           },
+          // {
+          //   label: "所属租户",
+          //   prop: "tenantId",
+          //   type: "tree",
+          //   dicUrl: "/api/blade-system/tenant/select",
+          //   addDisplay: false,
+          //   editDisplay: false,
+          //   headerAlign: "center",
+          //   align: "center",
+          //   viewDisplay: website.tenantMode,
+          //   span: 24,
+          //   props: {
+          //     label: "tenantName",
+          //     value: "tenantId",
+          //   },
+          //   hide: !website.tenantMode,
+          //   search: website.tenantMode,
+          //   rules: [
+          //     {
+          //       required: true,
+          //       message: "请输入所属租户",
+          //       trigger: "click",
+          //     },
+          //   ],
+          // },
+          // {
+          //   label: "角色别名",
+          //   labelTip:
+          //     "用于权限校验与标注的属性,可手动录入也可点击现有别名快速录入",
+          //   prop: "roleAlias",
+          //   search: true,
+          //   span: 24,
+          //   headerAlign: "center",
+          //   align: "center",
+          //   rules: [
+          //     {
+          //       required: true,
+          //       message: "请输入角色别名",
+          //       trigger: "blur",
+          //     },
+          //   ],
+          // },
+          // {
+          //   label: "现有别名",
+          //   labelTip: "当前系统已存在的角色别名,点击可快速录入",
+          //   prop: "currentAlias",
+          //   type: "radio",
+          //   dicData: [],
+          //   headerAlign: "center",
+          //   align: "center",
+          //   props: {
+          //     label: "roleName",
+          //     value: "roleAlias",
+          //   },
+          //   hide: true,
+          //   span: 24,
+          // },
+          // {
+          //   label: "角色排序",
+          //   prop: "sort",
+          //   type: "number",
+          //   headerAlign: "center",
+          //   align: "center",
+          //   span: 24,
+          //   rules: [
+          //     {
+          //       required: true,
+          //       message: "请输入角色排序",
+          //       trigger: "blur",
+          //     },
+          //   ],
+          // },
           {
-            label: "所属租户",
-            prop: "tenantId",
-            type: "tree",
-            dicUrl: "/api/blade-system/tenant/select",
-            addDisplay: false,
-            editDisplay: false,
-            headerAlign: "center",
-            align: "center",
-            viewDisplay: website.tenantMode,
-            span: 24,
-            props: {
-              label: "tenantName",
-              value: "tenantId",
-            },
-            hide: !website.tenantMode,
-            search: website.tenantMode,
-            rules: [
-              {
-                required: true,
-                message: "请输入所属租户",
-                trigger: "click",
-              },
-            ],
-          },
-          {
-            label: "角色别名",
-            labelTip:
-              "用于权限校验与标注的属性,可手动录入也可点击现有别名快速录入",
-            prop: "roleAlias",
+            label: "角色编码",
+            prop: "code",
             search: true,
             span: 24,
             headerAlign: "center",
@@ -231,37 +279,7 @@ export default {
             rules: [
               {
                 required: true,
-                message: "请输入角色别名",
-                trigger: "blur",
-              },
-            ],
-          },
-          {
-            label: "现有别名",
-            labelTip: "当前系统已存在的角色别名,点击可快速录入",
-            prop: "currentAlias",
-            type: "radio",
-            dicData: [],
-            headerAlign: "center",
-            align: "center",
-            props: {
-              label: "roleName",
-              value: "roleAlias",
-            },
-            hide: true,
-            span: 24,
-          },
-          {
-            label: "角色排序",
-            prop: "sort",
-            type: "number",
-            headerAlign: "center",
-            align: "center",
-            span: 24,
-            rules: [
-              {
-                required: true,
-                message: "请输入角色排序",
+                message: "请输入角色编码",
                 trigger: "blur",
               },
             ],

From ef71e3c0272b7b25807f4b0e46a929c2cc70a336 Mon Sep 17 00:00:00 2001
From: wangmeng <1620161711@qq.com>
Date: Mon, 5 Jan 2026 10:30:00 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/user.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 90eb4c2..45f5979 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -255,6 +255,7 @@ const user = {
     //获取系统菜单
     GetMenu({ commit, dispatch }, topMenuId) {
       return new Promise(resolve => {
+        //传roleId
         getRoutes().then((res) => {
           const data = res.data.result
           let menu = deepClone(data);

From 1cf46a7dbab22660dcea7f64b34dcbd2fafa146a Mon Sep 17 00:00:00 2001
From: wangmeng <1620161711@qq.com>
Date: Mon, 5 Jan 2026 15:37:55 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E6=94=B9=E6=88=90=E5=8D=95=E8=A1=8C?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/authority/role.vue | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/views/authority/role.vue b/src/views/authority/role.vue
index 9aaf272..aa309d9 100644
--- a/src/views/authority/role.vue
+++ b/src/views/authority/role.vue
@@ -29,14 +29,14 @@
           @click="handleDelete"
           >删 除
         </el-button> -->
-        <el-button
+        <!-- <el-button
           size="small"
           icon="el-icon-setting"
           @click="handleRole"
           v-if="userInfo.role_name.includes('admin')"
           plain
           >权限设置
-        </el-button>
+        </el-button> -->
       </template>
       <template slot-scope="{ row }" slot="menu">
         <el-button
@@ -126,6 +126,7 @@ export default {
         label: "title",
         value: "key",
       },
+      currentRoleId: null, //当前点击的角色ID
       menuGrantList: [],
       dataScopeGrantList: [],
       apiScopeGrantList: [],
@@ -334,8 +335,11 @@ export default {
       const menuList = this.$refs.treeMenu ? this.$refs.treeMenu.getCheckedKeys() : [];
       const dataScopeList = this.$refs.treeDataScope ? this.$refs.treeDataScope.getCheckedKeys() : [];
       const apiScopeList = this.$refs.treeApiScope ? this.$refs.treeApiScope.getCheckedKeys() : [];
+      console.log(this.idsArray, "this.idsArray")
+      console.log(this.selectionList, "this.idsArray")
 
-      grant(this.idsArray, menuList, dataScopeList, apiScopeList).then(() => {
+        // 直接用当前角色ID提交，而不是数组
+      grant([this.currentRoleId], menuList, dataScopeList, apiScopeList).then(() => {
         this.box = false;
         this.$message({
           type: "success",
@@ -444,6 +448,7 @@ export default {
       });
     },
     handleRowRole(row) {
+      this.currentRoleId = row.id; // 保存当前行角色ID
       this.menuTreeObj = [];
       this.dataScopeTreeObj = [];
       this.apiScopeTreeObj = [];

From 4df363491f659622462a4a191376948a6eac4f1e Mon Sep 17 00:00:00 2001
From: taozi <1362265981@qq.com>
Date: Tue, 6 Jan 2026 08:55:30 +0800
Subject: [PATCH 5/5] =?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/firstOrder/outbound.js                |   9 +
 .../components/batchSelectionDialog.vue       | 162 ++++++
 .../components/consumableDialog.vue           |  75 ++-
 src/views/firstOrder/components/inDialog.vue  |   2 -
 src/views/firstOrder/components/outDialog.vue | 488 ++++++++++--------
 src/views/firstOrder/list.vue                 |  19 +-
 src/views/firstOrder/outbound.vue             |  81 +--
 7 files changed, 559 insertions(+), 277 deletions(-)
 create mode 100644 src/views/firstOrder/components/batchSelectionDialog.vue

diff --git a/src/api/firstOrder/outbound.js b/src/api/firstOrder/outbound.js
index e32686d..9ada133 100644
--- a/src/api/firstOrder/outbound.js
+++ b/src/api/firstOrder/outbound.js
@@ -39,6 +39,15 @@ export const getDetailedList = (params) => {
         cryptoData: false
     })
 }
+export const batchList = (params) => {
+    return request({
+        url: '/smartpark/demandEnd/getDemandEndNyData',
+        method: 'get',
+        params: params,
+        cryptoToken: false,
+        cryptoData: false
+    })
+}
 export const getDetailedItems = () => {
     return request({
         url: '/smartpark/department/getOnePutDepartment',
diff --git a/src/views/firstOrder/components/batchSelectionDialog.vue b/src/views/firstOrder/components/batchSelectionDialog.vue
new file mode 100644
index 0000000..f0eb431
--- /dev/null
+++ b/src/views/firstOrder/components/batchSelectionDialog.vue
@@ -0,0 +1,162 @@
+<template>
+    <el-dialog 
+        :close-on-click-modal="false" 
+        :title="batchSelectionTitle" 
+        :visible.sync="batchSelectionVisible"
+        :append-to-body="true" 
+        width="70%" 
+        @close="handleCloseDetail" 
+        fullscreen
+    >
+        <el-table :data="tableData" style="width: 100%" border>
+            <!-- 展开行详情 -->
+            <el-table-column type="expand">
+                <template slot-scope="props">
+                    <!-- 关联表单列表（带复选框） -->
+                    <el-table 
+                        :data="props.row.oneFormList || []" 
+                        size="mini" 
+                        style="width: 100%"
+                        @selection-change="(val) => handleSelectionChange(val, props.row)"
+                        border
+                    >
+                        <el-table-column type="selection" width="55" />
+                        <el-table-column type="index" label="#" width="55" />
+                        <!-- <el-table-column label="表单ID" prop="id" width="80" /> -->
+                        <el-table-column label="物料名称" prop="materialName"  />
+                        <el-table-column label="物料编码" prop="materialCode" />
+                        <el-table-column label="规格型号" prop="model"  />
+                        <!-- <el-table-column label="申请数量" prop="applicationQuantity"  /> -->
+                        <el-table-column label="单价" prop="unitPrice" width="80" />
+                    </el-table>
+                </template>
+            </el-table-column>
+            
+            <!-- 常规列展示 -->
+            <!-- <el-table-column label="物料ID" prop="materialId"  /> -->
+            <el-table-column label="物料编码" prop="materialCode"  />
+            <el-table-column label="物料名称" prop="materialName"  />
+            <el-table-column label="规格型号" prop="model"  />
+            <el-table-column label="申请数量" prop="applicationQuantity"  />
+            
+            <el-table-column label="已出库数量" prop="outboundQuantity"  />
+            <el-table-column label="部门" prop="departmentName"  />
+            <el-table-column label="单位" prop="unit"  />
+        </el-table>
+         <div style="text-align: right; margin-top: 20px">
+            <el-button @click="handleConfirmSelect">确认选择</el-button>
+        </div>
+    </el-dialog>
+</template>
+
+<style>
+.demo-table-expand {
+    font-size: 0;
+}
+
+.demo-table-expand label {
+    width: 90px;
+    color: #99a9bf;
+}
+
+.demo-table-expand .el-form-item {
+    margin-right: 0;
+    margin-bottom: 15px;
+    width: 50%;
+}
+
+/* 适配嵌套表格样式 */
+.demo-table-expand .el-table {
+    --el-table-header-text-color: #666;
+    --el-table-row-hover-bg-color: #f8f9fa;
+}
+
+/* 展开行内表格样式优化 */
+.el-table__expanded-cell .el-table {
+    margin-bottom: 16px;
+}
+</style>
+
+<script>
+export default {
+    props: {
+        batchSelectionVisible: {
+            type: Boolean,
+            default: false
+        },
+        batchSelectionTitle: {
+            type: String,
+            default: '物料出库信息'
+        },
+        tableData: { 
+            type: Array,
+            default: () => []
+        },
+        inBatchForm:{
+            type:Object,
+            default:()=>{}
+        }
+    },
+    data() {
+        return {
+            // 存储所有勾选的行数据
+            selectedRows: []
+        };
+    },
+    methods: {
+        // 监听嵌套表格的勾选事件
+        handleSelectionChange(selection, parentRow) {
+            console.log('666666',selection, parentRow)
+            // 为勾选的数据补充父行关联信息（可选，根据业务需要）
+            const selectionWithParent = selection.map(item => ({
+                ...item,
+                parentMaterialId: parentRow.materialId, // 关联父行的物料ID
+                parentDepartmentName: parentRow.departmentName, // 关联父行的部门信息
+                applicationQuantity: parentRow.applicationQuantity,
+                ldDemandEndId:parentRow.ldDemandEndId,
+                // outboundQuantity:parentRow.outboundQuantity,
+            }));
+
+            // 先移除当前父行下已勾选的旧数据
+            this.selectedRows = this.selectedRows.filter(
+                item => item.parentMaterialId !== parentRow.materialId
+            );
+            // 添加当前勾选的新数据
+            this.selectedRows.push(...selectionWithParent);
+            console.log('777777',selection, parentRow,this.selectedRows)
+            // 实时传递给父组件（可选，也可以点击确认后传递）
+        },
+
+        // 确认选择按钮 - 主动传递勾选数据给父组件
+        handleConfirmSelect() {
+            console.log(1222)
+            console.log(this.selectedRows,'00000')
+
+            // this.$emit('confirm-selection', this.selectedRows);
+            this.batchSelectionVisible = false;
+
+            this.$emit('selectionChange', this.selectedRows);
+
+
+            // 可选择关闭弹窗
+            // this.handleCloseDetail();
+        },
+
+        // // 关闭弹窗的处理方法
+        handleCloseDetail() {
+            // this.$emit('update:batchSelectionVisible', false);
+            
+            // this.$emit('handleCloseDetail')
+            this.$emit('selectionChange', this.selectedRows);
+
+        },
+       
+        
+    },
+    mounted() {
+        console.log(9999999,this.inBatchForm)
+    }
+    
+}
+
+</script>
\ No newline at end of file
diff --git a/src/views/firstOrder/components/consumableDialog.vue b/src/views/firstOrder/components/consumableDialog.vue
index 686a9c5..d66afe6 100644
--- a/src/views/firstOrder/components/consumableDialog.vue
+++ b/src/views/firstOrder/components/consumableDialog.vue
@@ -1,18 +1,18 @@
 <template>
     <el-dialog :close-on-click-modal="false" :title="demandDialogTitle" :visible.sync="consumableVisible"
         :append-to-body="true" width="70%" @close="handleCloseDetail" fullscreen>
-        <basic-container>
+        <basic-container class="dialog-content">
             <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"
                 @row-change="handleRowChange">
-                <!-- <template slot-scope="scope" slot="menu">
-                    <el-button type="text" size="small" @click.stop="handleLog(scope.row)">记录
-                    </el-button>
-                </template> -->
             </avue-crud>
         </basic-container>
+        <div slot="footer" class="dialog-footer">
+            <el-button @click="handleCancel">取消</el-button>
+            <el-button type="primary" @click="handleConfirm">确定</el-button>
+        </div>
     </el-dialog>
 </template>
 <script>
@@ -32,15 +32,15 @@ export default {
         return {
             form: {},
             selectionList: [],
-            query: {},
+            query: { type: "NY" },
             loading: true,
             page: {
-                pageSize: 10,
+                pageSize: 5,
                 currentPage: 1,
                 total: 0,
             },
             option: {
-                height: "auto",
+                // height: "auto",
                 calcHeight: 30,
                 tip: false,
                 searchShow: true,
@@ -88,11 +88,13 @@ export default {
                         type: "select",
                         headerAlign: "center",
                         align: "center",
+                        value: "NY",
+                        disabled: true,
                         dicData: [
-                            {
-                                label: "易耗品",
-                                value: "YH",
-                            },
+                            // {
+                            //     label: "易耗品",
+                            //     value: "YH",
+                            // },
                             {
                                 label: "耐用品",
                                 value: "NY",
@@ -145,7 +147,8 @@ export default {
             ckTable: [],
             rkTable: [],
             currentRow: null,
-        };
+            allSelectedList: [], //存储所有勾选的数据
+        }
     },
     computed: {
         permissionList() {
@@ -226,18 +229,34 @@ export default {
             this.onLoad(this.page, params);
             done();
         },
-        //勾选当前
+        //勾选选中
         selectionChange(list) {
-            this.selectionList = list;
+            console.log("勾选选中", list)
+            const currentPageIds = this.data.map(item => item.id)
+            console.log(currentPageIds, "currentPageIds")
+            this.allSelectedList = this.allSelectedList.filter(item => !currentPageIds.includes(item.id))
+            console.log(this.allSelectedList, '1')
+            this.allSelectedList.push(...list)
+            console.log('所有勾选数据:', this.allSelectedList)
+        },
+        //点击确定 
+        handleConfirm() {
+            console.log(6)
+            console.log(this.allSelectedList, 'chuan')
+            this.$emit("confirm", this.allSelectedList)
         },
         selectionClear() {
             this.selectionList = [];
             this.$refs.crud.toggleSelection();
         },
         handleRowChange(row, index, data) {
-            console.log('Selected data:', data); 
+            console.log('Selected data:', data);
+            console.log('select row', row)
+            // 切换页面要判断当前页面数据是否在已勾选的数据中，如果在则勾选，否则不勾选
+
         },
         currentChange(currentPage) {
+            console.log(currentPage, 1)
             this.handleRowChange()
             this.page.currentPage = currentPage;
         },
@@ -249,21 +268,35 @@ export default {
         },
         onLoad(page, params = {}) {
             this.loading = true;
+            console.log(this.query, 2)
             getList(
                 page.currentPage,
                 page.pageSize,
                 Object.assign(params, this.query)
+                
             ).then((res) => {
-                // const data = res.data.data;
-                this.data = res.data.result.list;
+                this.data = res.data.result.list
                 this.loading = false;
                 this.page.total = res.data.result.total;
-                // this.selectionClear();
-            });
+            })
             this.loading = false;
         },
     },
 }
 
 
-</script>
\ No newline at end of file
+</script>
+<style lang="scss" scoped>
+::v-deep.el-dialog__footer {
+    position: fixed !important;
+    bottom: 0 !important;
+    right: 0 !important;
+}
+
+::v-deep.dialog-content {
+    max-height: calc(100vh - 200px);
+    overflow-y: auto;
+    padding-right: 10px;
+    overflow-x: hidden;
+}
+</style>
diff --git a/src/views/firstOrder/components/inDialog.vue b/src/views/firstOrder/components/inDialog.vue
index bad5279..99a3f3b 100644
--- a/src/views/firstOrder/components/inDialog.vue
+++ b/src/views/firstOrder/components/inDialog.vue
@@ -704,8 +704,6 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-
-
 ::v-deep .el-table td,
 ::v-deep .el-table th {
   text-align: center !important;
diff --git a/src/views/firstOrder/components/outDialog.vue b/src/views/firstOrder/components/outDialog.vue
index 52521d5..6452c9c 100644
--- a/src/views/firstOrder/components/outDialog.vue
+++ b/src/views/firstOrder/components/outDialog.vue
@@ -36,7 +36,7 @@
               <el-form-item label="选项">
                 <el-radio-group v-model="sizeForm.options" @change="radioChange()"
                   :disabled="outDialogType == 'details'">
-                  <el-radio :label="1" :disabled="sizeForm.type == 2"><span @click="closeHandle">批量选择</span></el-radio>
+                  <el-radio :label="1" :disabled="sizeForm.type == 2"><span >批量选择</span></el-radio>
                   <el-radio :label="2">单项选择</el-radio>
                 </el-radio-group>
               </el-form-item>
@@ -58,7 +58,7 @@
           </el-row>
           <div class="form-title">{{ outDate }} 出库信息：</div>
           <el-button type="primary" size="mini" style="margin-bottom: 18px;" @click="inTableAdd()"
-            v-if="sizeForm.options == 2">新增</el-button>
+            v-if="sizeForm.options == 2 && outDialogType != 'details'">新增</el-button>
           <el-table :data="sizeForm.inTableData" border style="width: 100%">
             <el-table-column prop="materialCode" label="物资编码">
             </el-table-column>
@@ -102,22 +102,22 @@
             </el-table-column>
             <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">
+            <!-- <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> -->
             <el-table-column prop="theOutboundQuantity" label="本次出库数量">
               <template slot-scope="scope">
                 <el-input-number size="mini" v-model="scope.row.theOutboundQuantity" :min="0" style="width: 100%;"
-                  @change="syncInboundQuantity(scope.row)" :disabled="outDialogType == 'details'"></el-input-number>
-                <!-- <span v-else>{{ scope.row.theOutboundQuantity || 0 }}</span> -->
+                  @change="syncInboundQuantity(scope.row)" :disabled="outDialogType == 'details'"
+                  v-if="sizeForm.optionType === 'YH' ||inBatchForm.optionType === 'YH'"></el-input-number>
+                <span v-else>{{ scope.row.theOutboundQuantity = 1 }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="操作" v-if="sizeForm.optionType === 'YH' || inBatchForm.optionType === 'YH'"
-              style="text-align: center;">
+            <el-table-column label="操作" style="text-align: center;" v-if="outDialogType != 'details'">
               <template slot-scope="scope">
-                <div style="text-align: center;">
+                <div style="text-align: center;" :disabled="outDialogType == 'details'">
                   <el-button type="text" size="mini" @click="handleDelete(scope.$index, scope.row)">
                     删除
                   </el-button>
@@ -165,13 +165,13 @@
           </el-table>
         </el-form>
       </div>
-      <span slot="footer" class="dialog-footer">
+      <span slot="footer" class="dialog-footer" v-if="outDialogType != 'details'">
         <el-button @click="handleCloseDetail()">取 消</el-button>
         <el-button type="primary" @click="submit(1)">暂存</el-button>
         <el-button type="primary" @click="submit(2)">提交</el-button>
       </span>
     </el-dialog>
-    <!-- 批量出库  选择弹窗 -->
+    <!-- 批量出库  选择数据源弹窗 -->
     <el-dialog :close-on-click-modal="false" title="选择数据来源" :visible.sync="inBatchDialogVisible" :append-to-body="true"
       width="40%" @close="handleBatchClose" @open="getQuarterList">
       <el-form :model="inBatchForm" ref="dynamicValidateForm" label-width="100px" class="demo-dynamic">
@@ -214,64 +214,25 @@
         <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="70%">
-      <!-- 搜索区域 -->
-      <div class="search-container" style="margin-bottom: 15px;">
-        <el-input v-model="searchKeyword" placeholder="请输入物资名称搜索" clearable style="width: 300px;"
-          @keyup.enter.native="handleSearch">
-          <el-button slot="append" icon="el-icon-search" @click="handleSearch"></el-button>
-        </el-input>
-      </div>
-      <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="物资编码">
-        </el-table-column>
-        <el-table-column prop="materialName" label="物资名称">
-        </el-table-column>
-        <el-table-column prop="model" label="规格">
-        </el-table-column>
-        <el-table-column prop="type" label="类别">
-          <template slot-scope="scope">
-            {{ scope.row.type === "NY" ? "耐用品" : (scope.row.type === "YH" ? "易耗品" : "") }}
-          </template>
-        </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>
-        <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>
-      <!-- 分页组件 -->
-      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-        :page-sizes="[5, 10, 20, 50]" :page-size="pageSize" :total="total"
-        layout="total, sizes, prev, pager, next, jumper">
-      </el-pagination>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="goodsVisible = false">取 消</el-button>
-        <el-button type="primary" @click="goodsSubmit()">确 定</el-button>
-      </span>
-    </el-dialog>
-  <consumableDialog v-if="consumableVisible" :consumableVisible='consumableVisible' :demandDialogTitle="demandDialogTitle"
-    @handleCloseDetail="handleCloseDetail">
-  </consumableDialog>
+
+    <!-- 单条新增耐用品弹窗 -->
+    <consumableDialog v-if="consumableVisible" :consumableVisible='consumableVisible'
+      :demandDialogTitle="demandDialogTitle" @handleCloseDetail="handleCloseDetail" @confirm="confirm">
+    </consumableDialog>
+    <batchSelectionDialog v-if="batchSelectionVisible" :batchSelectionVisible='batchSelectionVisible'
+      :batchSelectionTitle="batchSelectionTitle" :tableData="batchTableData"  
+      @batchclose="batchclose" :inBatchForm="inBatchForm"   @confirm-selection="handleConfirmSelection" @selectionChange="selectionChange"></batchSelectionDialog>
   </div>
-  
+
 </template>
 <script>
-import { getQuarterList, getDepartmentList, getDetailedList, getDetailedItems, submitData, getMaterialList, editList } from "@/api/firstOrder/outbound";
+import { getQuarterList, getDepartmentList, getDetailedList, getDetailedItems, submitData, getMaterialList, editList, batchList } from "@/api/firstOrder/outbound";
 import consumableDialog from './consumableDialog.vue'
+import batchSelectionDialog from './batchSelectionDialog.vue'
 export default {
   components: {
     consumableDialog,
+    batchSelectionDialog
   },
   props: {
     repairVisible: {
@@ -297,9 +258,16 @@ export default {
   },
   data() {
     return {
+      dialogVisible: false,
+      materialList: [],
       demandDialogTitle: '耐用品出库',
+      batchSelectionTitle: '耐用品出库',
       goodsVisible: false,
+      batchSelectionVisible: false,
+      batchSelection: true, // 保持组件渲染
+      batchTableData: [],
       consumableVisible: false, //单条耐耗品弹窗显示
+      batchSelection: false,
       quarterList: [],
       departmentList: [],
       outDialogVisible: false,
@@ -325,25 +293,16 @@ export default {
       },
       goodsList: [],
       goodsSelectList: [],
-      inTableData: [],
+      // inTableData: [],
       inBatchDialogVisible: false,//选择采购单的数据
       batchType: '',//需求单选择类型
-      inBatchForm: {
-        batchType: '',
-        department: '',
-        optionType: '',
+      inBatchForm: { //批量选择
+        batchType: '', //需求单类型
+        department: '', //部门
+        optionType: '', //YH/NY
       },
       quarterYearMap: {},
       quarterQuarterMap: {},
-      rules: {
-        reason: [
-          { required: true, message: '事由不能为空', trigger: 'blur' }
-        ],
-        materialType: [
-          { required: true, message: '请选择物资类型', trigger: 'change' }
-        ]
-        // 其他字段校验规则
-      }
     }
   },
   computed: {
@@ -360,7 +319,7 @@ export default {
     }
   },
   mounted() {
-
+    
     this.outDialogVisible = this.repairVisible
     if (this.outDialogType == 'add') {
       this.addInit()
@@ -371,6 +330,18 @@ export default {
     // this.getMaterialList()
   },
   methods: {
+    batchclose() {
+      this.batchSelectionVisible = false
+    },
+    selectionChange(row){
+      this.batchSelectionVisible = false
+      this.sizeForm.inTableData=row
+    },
+    confirm(allSelectedList) {
+      this.consumableVisible = false
+      this.sizeForm.inTableData = allSelectedList
+      console.log(this.sizeForm.inTableData, '111220')
+    },
     // // 获取物资列表
     // async getMaterialList() {
     //   const { data: res } = await this.$http.get('material/getMaterialList')
@@ -415,34 +386,31 @@ export default {
     //     this.$message.error("获取商品列表失败，请重试");
     //   }
     // },
-
     // 选择变化时保存到数组
     goodsListSelectionChange(val) {
       this.goodsSelectList = JSON.parse(JSON.stringify(val));
     },
-
-    // 确认选择
-    goodsSubmit() {
-      if (this.goodsSelectList.length > 0) {
-        const newItems = this.goodsSelectList.map(item => ({
-          ...item,
-          materialId: item.materialId,
-          materialCode: item.materialCode,
-          materialName: item.materialName,
-          model: item.model,
-          type: item.type,
-          unit: item.unit,
-          department: item.departmentId,
-          departmentName: item.departmentName,
-          theOutboundQuantity: 0 
-        }));
-
-        this.sizeForm.inTableData.push(...newItems);
-        this.goodsVisible = false;
-      } else {
-        this.$message.warning('请先勾选需要添加的数据');
-      }
-    },
+    // 批量选择耐用品弹窗确认选择
+    // goodsSubmit() {
+    //   if (this.goodsSelectList.length > 0) {
+    //     const newItems = this.goodsSelectList.map(item => ({
+    //       ...item,
+    //       materialId: item.materialId,
+    //       materialCode: item.materialCode,
+    //       materialName: item.materialName,
+    //       model: item.model,
+    //       type: item.type,
+    //       unit: item.unit,
+    //       department: item.departmentId,
+    //       departmentName: item.departmentName,
+    //       theOutboundQuantity: 0
+    //     }));
+    //     this.sizeForm.inTableData.push(...newItems);
+    //     this.batchSelectionVisible = true;
+    //   } else {
+    //     this.$message.warning('请先勾选需要添加的数据')
+    //   }
+    // },
     depchange(value) {
       this.departmentList = this.departmentList
     },
@@ -480,7 +448,9 @@ export default {
           row.theOutboundQuantity = maxAllowQuantity;
         }
       }
-
+      if (this.sizeForm.optionType === 'NY') {
+        row.theOutboundQuantity = 1
+      }
     },
     //关闭新增弹窗
     handleCloseDetail() {
@@ -532,70 +502,143 @@ export default {
       }
     },
     //批量选择弹窗确定
-    async batchSubmit() {
-      if (!this.inBatchForm.batchType) {
-        this.$message.error('请选择需求单');
-        return;
-      }
-      if (!this.inBatchForm.department) {
-        this.$message.error('请选择部门');
-        return;
-      }
-      if (!this.inBatchForm.optionType) {
-        this.$message.error('请选择类别');
-        return;
+    // async batchSubmit() {
+    //   if (!this.inBatchForm.batchType) {
+    //     this.$message.error('请选择需求单');
+    //     return;
+    //   }
+    //   if (!this.inBatchForm.department) {
+    //     this.$message.error('请选择部门');
+    //     return;
+    //   }
+    //   if (!this.inBatchForm.optionType) {
+    //     this.$message.error('请选择类别');
+    //     return;
+    //   }
+    //   const res = await getDetailedList({
+    //     ids: this.inBatchForm.batchType,
+    //     departmentId: this.inBatchForm.department,
+    //     optionType: this.inBatchForm.optionType,
+    //   })
+
+    //   if (res.data && res.data.result) {
+    //     this.sizeForm.inTableData = res.data.result
+    //     const selectedDept = this.departmentList.find(
+    //       dept => dept.departmentId === this.inBatchForm.department
+    //     )
+    //     const deptName = selectedDept ? selectedDept.department : '';
+    //     this.sizeForm.inTableData = res.data.result.map(item => ({
+    //       ...item,
+    //       IdDemandEndld: this.inBatchForm.batchType,
+    //       // department: this.inBatchForm.department,
+    //       department: deptName
+    //     }))
+    //     this.inBatchDialogVisible = false;
+    //     const selectedQuarter = this.quarterList.find(
+    //       item => item.ids === this.inBatchForm.batchType
+    //     )
+    //     if (selectedQuarter) {
+    //       this.sizeForm.demandEndInfo = selectedQuarter.quarterName;
+    //     }
+    //     if (this.inBatchForm.optionType === 'NY') {
+    //       this.batchSelectionVisible = true;
+    //       this.batchTableData = res.data.result;
+    //     }
+    //     this.$nextTick(() => {
+    //       this.$forceUpdate();
+    //     })
+    //   } else {
+    //     this.$message.warning('未获取到详细数据');
+    //   }
+
+    // },
+async batchSubmit() {
+  if (!this.inBatchForm.batchType) {
+    this.$message.error('请选择需求单');
+    return;
+  }
+  if (!this.inBatchForm.department) {
+    this.$message.error('请选择部门');
+    return;
+  }
+  if (!this.inBatchForm.optionType) {
+    this.$message.error('请选择类别');
+    return;
+  }
+
+  const requestParams = {
+    ids: this.inBatchForm.batchType,
+    departmentId: this.inBatchForm.department,
+    optionType: this.inBatchForm.optionType,
+  };
+
+  try {
+    let res;
+    if (this.inBatchForm.optionType === 'YH') {
+      res = await getDetailedList(requestParams);
+    } else if (this.inBatchForm.optionType === 'NY') {
+      res = await batchList(requestParams);
+    }
+
+    if (res.data && res.data.result) {
+      this.sizeForm.inTableData = res.data.result;
+      const selectedDept = this.departmentList.find(
+        dept => dept.departmentId === this.inBatchForm.department
+      );
+      const deptName = selectedDept ? selectedDept.department : '';
+      
+      this.sizeForm.inTableData = res.data.result.map(item => ({
+        ...item,
+        IdDemandEndld: this.inBatchForm.batchType,
+        department: deptName
+      }));
+      
+      // 关闭批量选择弹窗
+      this.inBatchDialogVisible = false;
+      
+      // 设置需求单名称
+      const selectedQuarter = this.quarterList.find(
+        item => item.ids === this.inBatchForm.batchType
+      );
+      if (selectedQuarter) {
+        this.sizeForm.demandEndInfo = selectedQuarter.quarterName;
       }
-      const res = await getDetailedList({
-        ids: this.inBatchForm.batchType,
-        departmentId: this.inBatchForm.department,
-        optionType: this.inBatchForm.optionType,
-      })
 
-      if (res.data && res.data.result) {
-        this.sizeForm.inTableData = res.data.result
-        const selectedDept = this.departmentList.find(
-          dept => dept.departmentId === this.inBatchForm.department
-        )
-        const deptName = selectedDept ? selectedDept.department : '';
-        this.sizeForm.inTableData = res.data.result.map(item => ({
-          ...item,
-          IdDemandEndld: this.inBatchForm.batchType,
-          // department: this.inBatchForm.department,
-          department: deptName
-        }))
-        this.inBatchDialogVisible = false;
-        const selectedQuarter = this.quarterList.find(
-          item => item.ids === this.inBatchForm.batchType
-        )
-        if (selectedQuarter) {
-          this.sizeForm.demandEndInfo = selectedQuarter.quarterName;
-        }
-        if (this.inBatchForm.optionType === 'NY') {
-          this.goodsVisible = true
-          this.data.goodsList = res.data.result
-        }
-        this.$nextTick(() => {
-          this.$forceUpdate();
-        });
-      } else {
-        this.$message.warning('未获取到详细数据');
+      // 耐用品特殊处理（打开批量选择弹窗）
+      if (this.inBatchForm.optionType === 'NY') {
+        console.log(this.inBatchForm.optionType, 'this.inBatchForm.optionType')
+        this.batchSelectionVisible = true;
+        this.dialogVisible = true;
+        console.log(1)
+        this.batchTableData = res.data.result;
       }
 
-    },
+      // 强制更新视图
+      this.$nextTick(() => {
+        this.$forceUpdate();
+      });
+    } else {
+      this.$message.warning('未获取到详细数据');
+    }
+  } catch (error) {
+    this.$message.error(`获取${this.inBatchForm.optionType === 'YH' ? '易耗品' : '耐用品'}数据失败：${error.message}`);
+    console.error('批量提交接口调用失败：', error);
+  }
+},
     //批量选择耐用品选择回调函数
     goodsListSelectionChange(val) {
       this.goodsSelectList = val
     },
     //批量选择耐用品弹窗点击确认按钮
-    goodsSubmit() {
-      if (this.goodsSelectList.length > 0) {
-        this.sizeForm.inTableData.push(...this.goodsSelectList);
-        this.$forceUpdate();
-      } else {
-        this.$message.warning('请先勾选需要添加的数据');
-      }
-      this.goodsVisible = false
-    },
+    // goodsSubmit() {
+    //   if (this.goodsSelectList.length > 0) {
+    //     this.sizeForm.inTableData.push(...this.goodsSelectList);
+    //     this.$forceUpdate();
+    //   } else {
+    //     this.$message.warning('请先勾选需要添加的数据');
+    //   }
+    //   this.batchSelectionVisible = true;
+    // },
     //获取单条选择的部门名称列表
     async getDetailedItems() {
       this.loading = true
@@ -615,8 +658,9 @@ export default {
     //获取单条选择的物资名称列表
     async getMaterialList() {
       this.loading = true
+      this.goodsVisible = false;
+      this.consumableVisible = false;
       try {
-        
         if (this.sizeForm.optionType === "NY") {
           this.consumableVisible = true
         } else {
@@ -671,13 +715,15 @@ export default {
       this.sizeForm.ldOneOutStorageDetailVOList = this.sizeForm.inTableData
       let arr = this.departmentList.find(item => item.departmentId === this.inBatchForm.department || {})
       this.sizeForm.ldOneOutStorageDetailVOList = this.sizeForm.inTableData.map(row => {
+        console.log(row, 'row')
         const deptId = row.department
         const dept = this.list.find(item => item.departmentId === deptId);
-        console.log(dept, 'dept')
+        const oneFormId = row.id
         return {
           ...row,
           department: this.sizeForm.options == '1' ? arr.departmentId : deptId,
           departmentName: this.sizeForm.options == '1' ? arr.department : dept.department,
+          oneFormId: oneFormId
         }
       })
       console.log(this.sizeForm, '111')
@@ -701,60 +747,95 @@ export default {
 
 
     },
+
     //编辑和详情
     async inInit() {
       if (this.outDialogType == 'details' || this.outDialogType == 'edit') {
-        try {
-          const res = await editList(this.id);
-          const { ldOneOutStorage, ldOneOutStorageDetails = [] } = res.data.result || {};
-          if (!ldOneOutStorage) {
-            this.$message.error("回显数据异常");
-            return;
-          }
-          const handledDetailList = ldOneOutStorageDetails.map(item => ({
-            ...item,
-            outboundQuantity: item.outboundQuantity || 0
-          }))
-          this.sizeForm = {
-            ...this.sizeForm,
-            ...ldOneOutStorage,
-            outDate: ldOneOutStorage.outDate ? new Date(ldOneOutStorage.outDate) : '',
-            options: Number(ldOneOutStorage.options) || 1,
-          }
-          this.sizeForm.inTableData = handledDetailList;
+        editList(this.id).then(res => {
+          console.log(res.data.result, '详情数据')
+          const { ldOneOutStorage, ldOneOutStorageDetails } = res.data.result || {};
+          
+          // this.sizeForm = res.data.result.ldOneOutStorage
+          this.sizeForm.inTableData = res.data.result.ldOneOutStorageDetails
+          this.sizeForm.orderNo = ldOneOutStorage.orderNo
+          this.sizeForm.reason = ldOneOutStorage.reason
+          this.sizeForm.demandEndInfo = ldOneOutStorage.demandEndInfo
+          this.sizeForm.outDate = ldOneOutStorage.outDate
+          this.sizeForm.options = Number(ldOneOutStorage.options)
 
-        } catch (error) {
-          this.$message.error("获取详情数据失败");
-        }
+        // reason: '',//事由
+        // inAccountsTableData: [],//总计
+        // inTableData: [],
+        // ldOneOutStorageDetailVOList: [],
+        // demandEndInfo: '',//需求单名称
+        // outDate: '',//出库时间
+        // options: 2,//出库类型
+        // optionType: '', // 1易耗品 2耐用品
+        // materialType: '1',//物资类型
+        // status: '',//1暂存 2提交
+        // materialld: '',//物资Id
+          this.$set(this.sizeForm,'inTableData',res.data.result.ldOneOutStorageDetails)
+          console.log(this.sizeForm, '111')
+
+
+        })
       }
     },
-
+    // this.sizeForm = {
+    //   // ...this.sizeForm,
+    //   // ...ldOneOutStorage,
+    //   // outDate: ldOneOutStorage.outDate ? new Date(ldOneOutStorage.outDate) : '',
+    //   // options: Number(ldOneOutStorage.options) || 1,
+    //   // inTableData: ldOneOutStorageDetails
+    // }
+    // })
+    // try {
+    //   const res = await editList(this.id)
+    //   console.log(res, '详情数据')
+    //   const { ldOneOutStorage, ldOneOutStorageDetails = [] } = res.data.result || {};
+    //   if (!ldOneOutStorage) {
+    //     this.$message.error("回显数据异常");
+    //     return;
+    //   }
+    //   // const handledDetailList = ldOneOutStorageDetails.map(item => ({
+    //   //   ...item,
+    //   //   outboundQuantity: item.outboundQuantity || 0
+    //   // }))
+    //   console.log(handledDetailList, 'handledDetailList')
+    // this.sizeForm = {
+    //   ...this.sizeForm,
+    //   ...ldOneOutStorage,
+    //   outDate: ldOneOutStorage.outDate ? new Date(ldOneOutStorage.outDate) : '',
+    //   options: Number(ldOneOutStorage.options) || 1,
+    //   inTableData: ldOneOutStorageDetails
+    // }
+    //   // console.log(this.sizeForm.inTableData, 'this.sizeForm')
+    // } catch (error) {
+    //   this.$message.error("获取详情数据失败");
+    // }
 
     // 选项选择
-    async radioChange() {
+    radioChange() {
       this.sizeForm.inTableData = []
       this.sizeForm.optionType = '';
       if (this.sizeForm.options === 1) {
-        await this.getQuarterList()
+        this.getQuarterList()
         this.inBatchDialogVisible = true
-        this.$nextTick(() => {
-          this.$forceUpdate();
-        });
-
-      }
-    },
-    closeHandle() {
-      this.inBatchForm.batchType = '',
+        this.inBatchForm.batchType = '',
         this.inBatchForm.department = ''
-      this.inBatchForm.optionType = ''
-      this.sizeForm.inTableData = []
-      this.getQuarterList()
-      this.inBatchDialogVisible = true
-      this.$nextTick(() => {
-        this.$forceUpdate();
-      });
-      // this.sizeForm.inTableData = []   
+        this.inBatchForm.optionType = ''
+      }
     },
+    // closeHandle() {
+    //   this.inBatchForm.batchType = '',
+    //   this.inBatchForm.department = ''
+    //   this.inBatchForm.optionType = ''
+    //   this.sizeForm.inTableData = []
+    //   this.getQuarterList()
+    //   this.inBatchDialogVisible = true
+      
+    //   // this.sizeForm.inTableData = []   
+    // },
     // 删除表格行数据
     handleDelete(index, row) {
       this.sizeForm.inTableData.splice(index, 1)
@@ -776,15 +857,6 @@ export default {
         // this.getMaterialList()
       }
     },
-    // 当弹窗显示时加载数据
-    goodsVisible(newVal) {
-      if (newVal) {
-        // 重置搜索条件和分页
-        this.searchKeyword = '';
-        this.currentPage = 1;
-        this.loadGoodsList();
-      }
-    }
   }
 }
 </script>
diff --git a/src/views/firstOrder/list.vue b/src/views/firstOrder/list.vue
index 181b304..4bffe12 100644
--- a/src/views/firstOrder/list.vue
+++ b/src/views/firstOrder/list.vue
@@ -143,13 +143,20 @@ export default {
             prop: "unitPrice",
             headerAlign: "center",
             align: "center",
+            formatter: (row, column) => {
+              const value = row.unitPrice;
+              if (value === null || value === undefined || value === "") {
+                return "-";
+              }
+              return value;
+            }
           },
-          {
-            label: "金额",
-            prop: "amount",
-            headerAlign: "center",
-            align: "center",
-          },
+          // {
+          //   label: "金额",
+          //   prop: "amount",
+          //   headerAlign: "center",
+          //   align: "center",
+          // },
           {
             label: "描述",
             prop: "remark",
diff --git a/src/views/firstOrder/outbound.vue b/src/views/firstOrder/outbound.vue
index c031e09..7439531 100644
--- a/src/views/firstOrder/outbound.vue
+++ b/src/views/firstOrder/outbound.vue
@@ -102,13 +102,13 @@ export default {
             headerAlign: "center",
             align: "center",
           },
-          {
-            label: "出库类型",
-            prop: "outType",
-            width: 140,
-            headerAlign: "center",
-            align: "center",
-          },
+          // {
+          //   label: "出库类型",
+          //   prop: "outType",
+          //   width: 140,
+          //   headerAlign: "center",
+          //   align: "center",
+          // },
           {
             label: "出库日期",
             prop: "outDate",
@@ -146,19 +146,19 @@ export default {
               value: '2'
             }]
           },
-          {
-            label: "部门",
-            prop: "department",
-            align: "center",
-            headerAlign: "center",
-            formatter: (row, column) => {
-              const value = row.department;
-              if (value === null || value === undefined || value === "") {
-                return "无";
-              }
-              return value;
-            }
-          },
+          // {
+          //   label: "部门",
+          //   prop: "department",
+          //   align: "center",
+          //   headerAlign: "center",
+          //   formatter: (row, column) => {
+          //     const value = row.department;
+          //     if (value === null || value === undefined || value === "") {
+          //       return "无";
+          //     }
+          //     return value;
+          //   }
+          // },
           {
             label: "出库人",
             prop: "shipperName",
@@ -168,25 +168,25 @@ export default {
             headerAlign: "center",
           },
 
-          // {
-          //   label: "状态",
-          //   prop: "status",
-          //   type: 'select',
-          //   dicData: [
-          //     {
-          //       label: '暂存',
-          //       value: 1
-          //     },
-          //     {
-          //       label: '待审批',
-          //       value: 2
-          //     },
-          //     {
-          //       label: '已审批',
-          //       value: 3
-          //     },
-          //   ]
-          // },
+          {
+            label: "状态",
+            prop: "status",
+            type: 'select',
+            dicData: [
+              {
+                label: '暂存',
+                value: 1
+              },
+              {
+                label: '待审批',
+                value: 2
+              },
+              {
+                label: '已审批',
+                value: 3
+              },
+            ]
+          },
 
         ]
       },
@@ -210,11 +210,12 @@ export default {
     },
     // 详情
     handleDetails(row) {
+      console.log(row, 'row详情')
       this.outDialogVisible = true
       this.outDialogType = 'details'
       this.outDialogTiltle = '详情'
       this.id = row.id
-      console.log(this.id,'id')
+      console.log(this.id,'详情的id')
     },
     // 编辑
     handleEdit(row) {