Merge pull request '更新物料、仓库、班组' (#389) from projects/mes-zwq into projects/mes-test

Reviewed-on: #389

src/api/warehouse/warehouse-area-setup.js

@@ -0,0 +1,76 @@
+/*
+ * @Author: zwq
+ * @Date: 2023-11-02 16:20:15
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-08-09 09:55:56
+ * @Description:
+ */
+import request from '@/utils/request'
+
+// 创建库区设置
+export function createWarehouseArea(data) {
+  return request({
+    url: '/extend/warehouse-area/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新库区设置
+export function updateWarehouseArea(data) {
+  return request({
+    url: '/extend/warehouse-area/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除库区设置
+export function deleteWarehouseArea(id) {
+  return request({
+    url: '/extend/warehouse-area/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得库区设置
+export function getWarehouseArea(id) {
+  return request({
+    url: '/extend/warehouse-area/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得库区设置列表
+export function getWarehouseAreaList(id) {
+  return request({
+    url: '/extend/warehouse-area/listAll?warehouseId=' + id,
+    method: 'get'
+  })
+}
+
+// 获得库区设置分页
+export function getWarehouseAreaPage(query) {
+  return request({
+    url: '/extend/warehouse-area/page',
+    method: 'get',
+    params: query,
+  })
+}
+
+// 获得code
+export function getCode() {
+  return request({
+    url: '/extend/warehouse-area/getCode',
+    method: 'get'
+  })
+}
+// 导出库区设置 Excel
+export function exportWarehouseAreaExcel(query) {
+  return request({
+    url: '/extend/warehouse-area/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/api/warehouse/warehouse-location-setup.js

@@ -0,0 +1,84 @@
+/*
+ * @Author: zwq
+ * @Date: 2023-11-02 16:20:15
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-08-08 15:56:30
+ * @Description:
+ */
+import request from '@/utils/request'
+
+// 创建库位设置
+export function createWarehouseLocation(data) {
+  return request({
+    url: '/extend/warehouse-location/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新库位设置
+export function updateWarehouseLocation(data) {
+  return request({
+    url: '/extend/warehouse-location/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除库位设置
+export function deleteWarehouseLocation(id) {
+  return request({
+    url: '/extend/warehouse-location/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得库位设置
+export function getWarehouseLocation(id) {
+  return request({
+    url: '/extend/warehouse-location/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得库位设置列表
+export function getWarehouseLocationTree() {
+  return request({
+    url: '/extend/warehouse-location/getTree',
+    method: 'get'
+  })
+}
+
+// 获得库位设置列表
+export function getWarehouseLocationList() {
+  return request({
+    url: '/extend/warehouse-location/listAll',
+    method: 'get'
+  })
+}
+
+// 获得库位设置分页
+export function getWarehouseLocationPage(data) {
+  return request({
+    url: '/extend/warehouse-location/page',
+    method: 'POST',
+    data: data
+  })
+}
+
+// 获得code
+export function getCode() {
+  return request({
+    url: '/extend/warehouse-location/getCode',
+    method: 'get'
+  })
+}
+// 导出库位设置 Excel
+export function exportWarehouseLocationExcel(query) {
+  return request({
+    url: '/extend/warehouse-location/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/api/warehouse/warehouse-setup.js

@@ -0,0 +1,84 @@
+/*
+ * @Author: zwq
+ * @Date: 2023-11-02 16:20:15
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-07-30 14:14:48
+ * @Description:
+ */
+import request from '@/utils/request'
+
+// 创建仓库设置
+export function createWarehouse(data) {
+  return request({
+    url: '/extend/warehouse/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新仓库设置
+export function updateWarehouse(data) {
+  return request({
+    url: '/extend/warehouse/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除仓库设置
+export function deleteWarehouse(id) {
+  return request({
+    url: '/extend/warehouse/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得仓库设置
+export function getWarehouse(id) {
+  return request({
+    url: '/extend/warehouse/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得仓库设置列表
+export function getWarehouseList() {
+  return request({
+    url: '/extend/warehouse/listAll',
+    method: 'get'
+  })
+}
+
+// 获得仓库首页统计信息
+export function getWarehouseAllInfo() {
+  return request({
+    url: '/extend/warehouse/getAllInfo',
+    method: 'get'
+  })
+}
+
+// 获得仓库设置分页
+export function getWarehousePage(query) {
+  return request({
+    url: '/extend/warehouse/page',
+    method: 'get',
+    params: query,
+  })
+}
+
+// 获得code
+export function getCode() {
+  return request({
+    url: '/extend/warehouse/getCode',
+    method: 'get'
+  })
+}
+// 导出仓库设置 Excel
+export function exportWarehouseExcel(query) {
+  return request({
+    url: '/extend/warehouse/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/api/warehouse/warehouseLocation.js

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-11-02 14:31:42
  * @LastEditors: zwq
- * @LastEditTime: 2023-11-04 14:56:10
+ * @LastEditTime: 2024-08-02 15:51:37
  * @Description:
  */
 import request from '@/utils/request'
@@ -41,10 +41,11 @@ export function getWarehouseLocation(id) {
   })
 }
 // 获得库位列表(通过仓库id)
-export function listByWarehouse(id) {
+export function listByWarehouse(query) {
   return request({
-    url: '/extend/warehouse-location/listByWarehouse?warehouseId=' + id,
+    url: '/extend/warehouse-location/listByWarehouse',
-    method: 'get'
+    method: 'get',
+    params: query,
   })
 }
 // 获得库位列表(All)

src/api/warehouse/warehouseRealtimeLocation.js

@@ -25,6 +25,22 @@ export function outWarehouseRealtimeLocation(data) {
     data: data
   })
 }
+// 出入库-有库位 > 移库操作
+export function moveWarehouseRealtimeLocation(data) {
+  return request({
+    url: '/extend/warehouse-realtime-location/move',
+    method: 'post',
+    data: data
+  })
+}
+// 出入库-有库位 > 批量出库操作
+export function outWarehouseRealtimeLocationList(data) {
+  return request({
+    url: '/extend/warehouse-realtime-location/outList',
+    method: 'post',
+    data: data
+  })
+}
 
 // 出入库-有库位 > 入库操作
 export function inWarehouseRealtimeLocation(data) {
@@ -68,7 +84,16 @@ export function getWarehouseRealtimeLocationPage(data) {
 // 获得出入库历史-有库位分页
 export function getWarehouseLocationHisPage(data) {
   return request({
-    url: '/extend/warehouse-location-his/page',
+    url: '/extend/warehouse-location-his/inAndOutPage',
+    method: 'post',
+    data: data
+  })
+}
+
+// 获得移库历史-有库位分页
+export function getMoveHisPage(data) {
+  return request({
+    url: '/extend/warehouse-location-his/movePage',
     method: 'post',
     data: data
   })

src/views/core/mixins/basic-page.js

@@ -1,8 +1,8 @@
 /*
  * @Author: zwq
  * @Date: 2022-08-24 11:19:43
- * @LastEditors: DY
+ * @LastEditors: zwq
- * @LastEditTime: 2023-09-21 16:02:07
+ * @LastEditTime: 2024-07-22 11:15:10
  * @Description:
  */
 export default {
@@ -17,7 +17,7 @@ export default {
       },
       tableData: [],
       listQuery: {
-        pageSize: 10,
+        pageSize: 20,
         pageNo: 1,
         total: 1,
       },
@@ -101,11 +101,8 @@ export default {
     },
     // 删除
     deleteHandle(id, name, index) {
-      this.$confirm(`确定对${name ? '[名称=' + name + ']' : '[序号=' + index + ']'}进行删除操作?`, "提示", {
+			this.$modal
-        confirmButtonText: "确定",
+				.delConfirm(name ? '名称: ' + name : '序号： ' + index)
-        cancelButtonText: "取消",
-        type: "warning",
-      })
         .then(() => {
           this.urlOptions.deleteURL(id).then(({ data }) => {
             this.$message({

src/views/group/base/groupClasses/index.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2024-07-01 14:53:55
  * @LastEditors: zwq
- * @LastEditTime: 2024-07-12 16:19:13
+ * @LastEditTime: 2024-07-22 15:20:51
  * @Description:
 -->
 <template>
@@ -54,6 +54,8 @@ import {
 } from '@/api/base/groupClasses';
 import GroupClassAdd from './components/groupClassAdd.vue';
 import StatusBtn from './components/statusBtn';
+import tableHeightMixin from '@/mixins/tableHeightMixin';
+
 const tableProps = [
 	{
 		prop: 'name',
@@ -82,6 +84,7 @@ const tableProps = [
 export default {
 	name: 'GroupClass',
 	components: { GroupClassAdd },
+	mixins: [tableHeightMixin],
 	data() {
 		return {
 			formConfig: [
@@ -125,7 +128,6 @@ export default {
 					  }
 					: undefined,
 			].filter((v) => v),
-			tableH: this.tableHeight(260),
 			// 总条数
 			total: 0,
 			// 班次基础信息列表
@@ -143,9 +145,6 @@ export default {
 		};
 	},
 	created() {
-		window.addEventListener('resize', () => {
-			this.tableH = this.tableHeight(260);
-		});
 		this.getList();
 	},
 	methods: {
@@ -223,19 +222,18 @@ export default {
 		},
 		/** 删除按钮操作 */
 		handleDelete(row) {
-			console.log(row);
 			let _this = this;
 			if (row.enabled) {
 				// 可用
 				_this.$modal
-					.confirm(
+					.newConfirm(
 						'删除的班次"' +
 							row.name +
 							'"可能会影响交接班计划，请点取消再次确认！'
-					)
+					,'提示')
 					.then(function () {
 						return _this.$modal
-							.confirm('是否确认删除班次名称为"' + row.name + '"的数据项?')
+							.delConfirm('名称: ' + row.name)
 							.then(function () {
 								return deleteGroupClasses(row.id);
 							})
@@ -247,7 +245,7 @@ export default {
 					});
 			} else {
 				_this.$modal
-					.confirm('是否确认删除班次名称为"' + row.name + '"的数据项?')
+					.delConfirm('名称: ' + row.name)
 					.then(function () {
 						return deleteGroupClasses(row.id);
 					})

src/views/group/base/groupTeam/index.vue

@@ -1,234 +1,238 @@
 <template>
-  <div class="app-container">
+	<div class="app-container">
-
+		<!-- 搜索工作栏 -->
-    <!-- 搜索工作栏 -->
+		<search-bar
-    <search-bar
+			:formConfigs="formConfig"
-      :formConfigs="formConfig"
+			ref="searchBarForm"
-      ref="searchBarForm"
+			@headBtnClick="buttonClick" />
-      @headBtnClick="buttonClick"
+		<!-- 列表 -->
-    />
+		<base-table
-    <!-- 列表 -->
+			:page="queryParams.pageNo"
-    <base-table
+			:limit="queryParams.pageSize"
-      :page="queryParams.pageNo"
+			:table-props="tableProps"
-      :limit="queryParams.pageSize"
+			:table-data="list"
-      :table-props="tableProps"
+			:max-height="tableH"
-      :table-data="list"
+			@emitFun="handleTableEvents">
-      :max-height="tableH"
+			<method-btn
-      @emitFun="handleTableEvents"
+				v-if="tableBtn.length"
-    >
+				slot="handleBtn"
-      <method-btn
+				:width="80"
-        v-if="tableBtn.length"
+				label="操作"
-        slot="handleBtn"
+				:method-list="tableBtn"
-        :width="80"
+				@clickBtn="handleClick" />
-        label="操作"
+		</base-table>
-        :method-list="tableBtn"
+		<pagination
-        @clickBtn="handleClick"
+			:page.sync="queryParams.pageNo"
-      />
+			:limit.sync="queryParams.pageSize"
-    </base-table>
+			:total="total"
-    <pagination
+			@pagination="getList" />
-      :page.sync="queryParams.pageNo"
+		<!-- 新增 -->
-      :limit.sync="queryParams.pageSize"
+		<base-dialog
-      :total="total"
+			:dialogTitle="addOrEditTitle"
-      @pagination="getList"
+			:dialogVisible="centervisible"
-    />
+			@cancel="handleCancel"
-    <!-- 新增 -->
+			@confirm="handleConfirm"
-    <base-dialog
+			:before-close="handleCancel"
-      :dialogTitle="addOrEditTitle"
+			width="40%">
-      :dialogVisible="centervisible"
+			<group-team-add ref="groupList" @successSubmit="successSubmit" />
-      @cancel="handleCancel"
+		</base-dialog>
-      @confirm="handleConfirm"
+	</div>
-      :before-close="handleCancel"
-      width='40%'
-    >
-      <group-team-add ref="groupList" @successSubmit="successSubmit" />
-    </base-dialog>
-  </div>
 </template>
 
 <script>
-import { getGroupTeamPage, deleteGroupTeam, updateGroupTeam } from "@/api/base/groupTeam";
+import {
-import { parseTime } from '@/utils/ruoyi'
+	getGroupTeamPage,
-import GroupTeamAdd from './components/groupTeamAdd'
+	deleteGroupTeam,
-import StatusBtn from './components/statusBtn'
+	updateGroupTeam,
+} from '@/api/base/groupTeam';
+import { parseTime } from '@/utils/ruoyi';
+import GroupTeamAdd from './components/groupTeamAdd';
+import StatusBtn from './components/statusBtn';
+import tableHeightMixin from '@/mixins/tableHeightMixin';
+
 const tableProps = [
-  {
+	{
-    prop: 'createTime',
+		prop: 'createTime',
-    label: '创建时间',
+		label: '创建时间',
-    filter: parseTime,
+		filter: parseTime,
-    minWidth: 160
+		minWidth: 160,
-  },
+	},
-  {
+	{
-    prop: 'name',
+		prop: 'name',
-    label: '班组名称'
+		label: '班组名称',
-  },
+	},
-  {
+	{
-    prop: 'code',
+		prop: 'code',
-    label: '编码',
+		label: '编码',
-    minWidth: 220
+		minWidth: 220,
-  },
+	},
-  {
+	{
-    prop: 'num',
+		prop: 'num',
-    label: '班组人数'
+		label: '班组人数',
-  },
+	},
-  {
+	{
-    prop: 'leaderName',
+		prop: 'leaderName',
-    label: '组长'
+		label: '组长',
-  },
+	},
-  {
+	{
-    prop: 'enabled',
+		prop: 'enabled',
-    label: '班组状态',
+		label: '班组状态',
-    subcomponent: StatusBtn
+		subcomponent: StatusBtn,
-  },
+	},
-]
+];
 export default {
-  name: "GroupTeam",
+	name: 'GroupTeam',
-  components: { GroupTeamAdd },
+	components: { GroupTeamAdd },
-  data() {
+	mixins: [tableHeightMixin],
-    return {
+	data() {
-      formConfig: [
+		return {
-        {
+			formConfig: [
-          type: 'input',
+				{
-          label: '班组名称',
+					type: 'input',
-          placeholder: '班组名称',
+					label: '班组名称',
-          param: 'name'
+					placeholder: '班组名称',
-        },
+					param: 'name',
-        {
+				},
-          type: 'input',
+				{
-          label: '组长',
+					type: 'input',
-          placeholder: '组长',
+					label: '组长',
-          param: 'leaderName'
+					placeholder: '组长',
-        },
+					param: 'leaderName',
-        {
+				},
-          type: 'button',
+				{
-          btnName: '查询',
+					type: 'button',
-          name: 'search',
+					btnName: '查询',
-          color: 'primary'
+					name: 'search',
-        },
+					color: 'primary',
-        {
+				},
-          type: 'separate'
+				{
-        },
+					type: 'separate',
-        {
+				},
-          type: this.$auth.hasPermi('base:group-team:create') ? 'button' : '',
+				{
-          btnName: '新增',
+					type: this.$auth.hasPermi('base:group-team:create') ? 'button' : '',
-          name: 'add',
+					btnName: '新增',
-          color: 'success',
+					name: 'add',
-          plain: true
+					color: 'success',
-        }
+					plain: true,
-      ],
+				},
-      tableProps,
+			],
-      tableBtn: [
+			tableProps,
-        this.$auth.hasPermi('base:group-team:update')
+			tableBtn: [
-          ? {
+				this.$auth.hasPermi('base:group-team:update')
-              type: 'edit',
+					? {
-              btnName: '编辑'
+							type: 'edit',
-            }
+							btnName: '编辑',
-          : undefined,
+					  }
-        this.$auth.hasPermi('base:group-team:delete')
+					: undefined,
-          ? {
+				this.$auth.hasPermi('base:group-team:delete')
-              type: 'delete',
+					? {
-              btnName: '删除'
+							type: 'delete',
-            }
+							btnName: '删除',
-          : undefined
+					  }
-      ].filter((v) => v),
+					: undefined,
-      tableH: this.tableHeight(260),
+			].filter((v) => v),
-      // 总条数
+			// 总条数
-      total: 0,
+			total: 0,
-      // 班次基础信息列表
+			// 班次基础信息列表
-      list: [],
+			list: [],
-      // 弹出层标题
+			// 弹出层标题
-      addOrEditTitle: "",
+			addOrEditTitle: '',
-      // 是否显示弹出层
+			// 是否显示弹出层
-      centervisible: false,
+			centervisible: false,
-      // 查询参数
+			// 查询参数
-      queryParams: {
+			queryParams: {
-        pageNo: 1,
+				pageNo: 1,
-        pageSize: 20,
+				pageSize: 20,
-        name: null,
+				name: null,
-        code: null
+				code: null,
-      },
+			},
-    };
+		};
-  },
+	},
-  created() {
+	created() {
-    window.addEventListener('resize', () => {
+		this.getList();
-      this.tableH = this.tableHeight(260)
+	},
-    })
+	methods: {
-    this.getList();
+		buttonClick(val) {
-  },
+			switch (val.btnName) {
-  methods: {
+				case 'search':
-    buttonClick(val) {
+					this.queryParams.pageNo = 1;
-      switch (val.btnName) {
+					this.queryParams.leaderName = val.leaderName;
-        case 'search':
+					this.queryParams.name = val.name;
-          this.queryParams.pageNo = 1;
+					this.getList();
-          this.queryParams.leaderName = val.leaderName
+					break;
-          this.queryParams.name = val.name
+				default:
-          this.getList()
+					this.addOrEditTitle = '新增';
-          break
+					this.centervisible = true;
-        default:
+					this.$nextTick(() => {
-          this.addOrEditTitle = '新增'
+						this.$refs.groupList.init();
-          this.centervisible = true
+					});
-          this.$nextTick(() => {
+			}
-            this.$refs.groupList.init()
+		},
-          })
+		/** 查询列表 */
-      }
+		getList() {
-    },
+			getGroupTeamPage(this.queryParams).then((response) => {
-    /** 查询列表 */
+				this.list = response.data.list;
-    getList() {
+				this.total = response.data.total;
-      getGroupTeamPage(this.queryParams).then(response => {
+			});
-        this.list = response.data.list;
+		},
-        this.total = response.data.total;
+		handleClick(val) {
-      });
+			switch (val.type) {
-    },
+				case 'edit':
-    handleClick(val) {
+					this.addOrEditTitle = '编辑';
-      switch (val.type) {
+					this.$nextTick(() => {
-        case 'edit':
+						this.$refs.groupList.init(val.data.id);
-          this.addOrEditTitle = '编辑'
+					});
-          this.$nextTick(() => {
+					this.centervisible = true;
-            this.$refs.groupList.init(val.data.id)
+					break;
-          })
+				default:
-          this.centervisible = true
+					this.handleDelete(val.data);
-          break
+			}
-        default:
+		},
-        this.handleDelete(val.data)
+		// 班组状态
-      }
+		handleTableEvents(params) {
-    },
+			if (params.name === 'state') {
-    // 班组状态
+				// 班组状态
-    handleTableEvents(params) {
+				updateGroupTeam({ ...params.payload })
-      if (params.name === 'state') {// 班组状态
+					.then((res) => {
-        updateGroupTeam({ ...params.payload }).then((res) => {
+						if (res.code === 0) {
-          if (res.code === 0) {
+							this.$modal.msgSuccess('操作成功');
-            this.$modal.msgSuccess("操作成功");
+							this.getList();
-            this.getList()
+						}
-          }
+					})
-        }).catch((res)=>{
+					.catch((res) => {
-          this.getList()
+						this.getList();
-        })
+					});
-      }
+			}
-    },
+		},
-    handleCancel() {
+		handleCancel() {
-      this.$refs.groupList.formClear()
+			this.$refs.groupList.formClear();
-      this.centervisible = false
+			this.centervisible = false;
-      this.addOrEditTitle = ''
+			this.addOrEditTitle = '';
-    },
+		},
-    handleConfirm() {
+		handleConfirm() {
-      this.$refs.groupList.submitForm()
+			this.$refs.groupList.submitForm();
-    },
+		},
-    successSubmit() {
+		successSubmit() {
-      this.handleCancel()
+			this.handleCancel();
-      this.getList()
+			this.getList();
-    },
+		},
-    /** 删除按钮操作 */
+		/** 删除按钮操作 */
-    handleDelete(row) {
+		handleDelete(row) {
-      this.$modal.confirm('是否确认删除班组名称为"' + row.name + '"的数据项?').then(function() {
+			this.$modal
-          return deleteGroupTeam(row.id);
+				.delConfirm('名称: ' + row.name)
-        }).then(() => {
+				.then(function () {
-          this.queryParams.pageNo = 1;
+					return deleteGroupTeam(row.id);
-          this.getList();
+				})
-          this.$modal.msgSuccess("删除成功");
+				.then(() => {
-        }).catch(() => {});
+					this.queryParams.pageNo = 1;
-    },
+					this.getList();
-    closeDrawer() {
+					this.$modal.msgSuccess('删除成功');
-      this.getList()
+				})
-    }
+				.catch(() => {});
-  }
+		},
+		closeDrawer() {
+			this.getList();
+		},
+	},
 };
 </script>

src/views/group/base/schedulingPlanConfig/index.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2024-07-10 11:08:48
  * @LastEditors: zwq
- * @LastEditTime: 2024-07-12 16:19:28
+ * @LastEditTime: 2024-07-19 14:09:18
  * @Description:
 -->
 <template>
@@ -52,6 +52,7 @@ import {
 } from '@/api/base/groupSchedulingPlan';
 import { listDept } from '@/api/system/dept';
 import schedulingPlanConfigAdd from './components/schedulingPlanConfigAdd.vue';
+import tableHeightMixin from '@/mixins/tableHeightMixin';
 const tableProps = [
 	{
 		prop: 'deptName',
@@ -78,6 +79,7 @@ const tableProps = [
 export default {
 	name: 'schedulingPlanConfig',
 	components: { schedulingPlanConfigAdd },
+	mixins: [tableHeightMixin],
 	data() {
 		return {
 			formConfig: [
@@ -129,7 +131,6 @@ export default {
 					  }
 					: undefined,
 			].filter((v) => v),
-			tableH: this.tableHeight(260),
 			// 总条数
 			total: 0,
 			// 列表
@@ -147,9 +148,6 @@ export default {
 		};
 	},
 	created() {
-		window.addEventListener('resize', () => {
-			this.tableH = this.tableHeight(260);
-		});
 		listDept().then((response) => {
 			this.formConfig[0].selectOptions = response.data;
 		});

src/views/group/base/schedulingRuleConfig/index.vue

@@ -47,6 +47,7 @@ import {
 } from '@/api/base/groupSchedulingRule';
 import schedulingRuleConfigAdd from './components/schedulingRuleConfigAdd.vue';
 import { formatDate } from '@/utils';
+import tableHeightMixin from '@/mixins/tableHeightMixin';
 const tableProps = [
 	{
 		prop: 'enableTimeStr',
@@ -71,6 +72,7 @@ const tableProps = [
 export default {
 	name: 'schedulingRuleConfig',
 	components: { schedulingRuleConfigAdd },
+	mixins: [tableHeightMixin],
 	data() {
 		return {
 			formConfig: [
@@ -140,7 +142,6 @@ export default {
 					  }
 					: undefined,
 			].filter((v) => v),
-			tableH: this.tableHeight(260),
 			// 总条数
 			total: 0,
 			// 班次基础信息列表
@@ -158,9 +159,6 @@ export default {
 		};
 	},
 	created() {
-		window.addEventListener('resize', () => {
-			this.tableH = this.tableHeight(260);
-		});
 		this.getList();
 	},
 	methods: {

src/views/group/monitoring/groupTeamView/index.vue

@@ -31,6 +31,7 @@
 import { getByWorkOrder } from '@/api/monitoring/groupTeamView'
 import { workOrderList } from '@/api/base/workOrder'
 import GroupTeamViewDetail from './components/groupTeamViewDetail.vue'
+import tableHeightMixin from '@/mixins/tableHeightMixin';
 const tableProps = [
   {
     prop: 'name',
@@ -51,6 +52,7 @@ const tableProps = [
 ]
 export default {
   name: 'GroupTeamView',
+	mixins: [tableHeightMixin],
   data() {
     return {
       formConfig: [
@@ -86,16 +88,12 @@ export default {
           : undefined
       ].filter((v) => v),
       tableProps,
-      tableH: this.tableHeight(220),
       list: [],
       paramVisible: false
     }
   },
   components: { GroupTeamViewDetail },
   mounted() {
-    window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(220)
-    })
     this.getOrderList()
   },
   methods: {
@@ -140,4 +138,4 @@ export default {
     }
   }
 }
-</script>
+</script>

src/views/group/monitoring/teamProduction/index.vue

@@ -37,6 +37,7 @@
 import { groupTeamSchedulingPage, groupClassesListAll } from '@/api/monitoring/teamProduction'
 import { parseTime } from '@/utils/ruoyi'
 import TeamProductionDetail from './components/teamProductionDetail'
+import tableHeightMixin from '@/mixins/tableHeightMixin';
 const tableProps = [
   {
     prop: 'createTime',
@@ -74,6 +75,7 @@ const tableProps = [
 ]
 export default {
   name: 'GroupTeamScheduling',
+	mixins: [tableHeightMixin],
   data() {
     return {
       formConfig: [
@@ -126,16 +128,12 @@ export default {
           : undefined
       ].filter((v) => v),
       list: [],
-      tableH: this.tableHeight(260),
       total: 0,
       paramVisible: false
     }
   },
   components: { TeamProductionDetail },
   mounted() {
-    window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(260)
-    })
     this.getGroupClass()
     this.getList()
   },
@@ -169,4 +167,4 @@ export default {
     }
   }
 }
-</script>
+</script>

src/views/material/material/add-or-updata.vue

@@ -0,0 +1,223 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-08-05 16:12:18
+ * @Description:
+-->
+<template>
+	<el-form
+		:model="dataForm"
+		:rules="dataRule"
+		ref="dataForm"
+		@keyup.enter.native="dataFormSubmit()"
+		label-width="100px"
+		label-position="top">
+		<el-row :gutter="20">
+			<el-col :span="8">
+				<el-form-item label="物料产品名称" prop="name">
+					<el-input
+						v-model="dataForm.name"
+						clearable
+						placeholder="请输入物料产品名称" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="8">
+				<el-form-item label="物料产品编码" prop="code">
+					<el-input
+						v-model="dataForm.code"
+						clearable
+						placeholder="请输入物料产品编码" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="8">
+				<el-form-item label="物料产品类型" prop="typeId">
+					<treeselect
+						v-model="dataForm.typeId"
+						:options="deptOptions"
+						:normalizer="normalizer"
+						@select="setShowTime"
+						:show-count="true"
+						:appendToBody="true"
+						z-index="99999"
+						placeholder="选择物料产品类型" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="8">
+				<el-form-item label="单位" prop="unit">
+					<el-select
+						v-model="dataForm.unit"
+						filterable
+						style="width: 100%"
+						placeholder="请选择单位">
+						<el-option
+							v-for="dict in getDictDatas(DICT_TYPE.UNIT_DICT)"
+							:key="dict.value"
+							:label="dict.label"
+							:value="dict.value" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<el-col :span="8">
+				<el-form-item label="规格" prop="specifications">
+					<el-input
+						v-model="dataForm.specifications"
+						clearable
+						placeholder="请输入规格" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="8">
+				<el-form-item label="供应商" prop="supplierId">
+					<el-select
+						v-model="dataForm.supplierId"
+						filterable
+						clearable
+						:style="{ width: '100%' }"
+						placeholder="请选择供应商">
+						<el-option
+							v-for="item in supplierArr"
+							:key="item.id"
+							:label="item.name"
+							:value="item.id"></el-option>
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<el-col :span="8" v-if="showTime">
+				<el-form-item label="生产单位用时" prop="processTime">
+					<el-input
+						v-model.number="dataForm.processTime"
+						type="number"
+						clearable
+						placeholder="请输入产线生产单位用时" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="8">
+				<el-form-item label="备注" prop="remark">
+					<el-input
+						v-model="dataForm.remark"
+						clearable
+						placeholder="请输入备注" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+	</el-form>
+</template>
+
+<script>
+import basicAdd from '../mixins/basic-add';
+import { getTreeArr } from '../mixins/code-filter';
+import {
+	createProductMaterial,
+	updateProductMaterial,
+	getProductMaterial,
+	getProductMaterialCode,
+	getSupplierList,
+	getMaterialTree,
+} from '@/api/base/material';
+import Treeselect from '@riophae/vue-treeselect';
+import '@riophae/vue-treeselect/dist/vue-treeselect.css';
+
+export default {
+	mixins: [basicAdd],
+	components: {
+		Treeselect,
+	},
+	data() {
+		return {
+			urlOptions: {
+				isGetCode: true,
+				codeURL: getProductMaterialCode,
+				createURL: createProductMaterial,
+				updateURL: updateProductMaterial,
+				infoURL: getProductMaterial,
+			},
+			deptOptions: undefined,
+			showTime: false,
+			dataForm: {
+				id: undefined,
+				code: undefined,
+				name: '',
+				typeId: undefined,
+				unit: undefined,
+				specifications: undefined,
+				supplierId: undefined,
+				processTime: 0,
+				remark: undefined,
+			},
+			supplierArr: [],
+			treeArr: [],
+			dataRule: {
+				code: [{ required: true, message: '编号不能为空', trigger: 'blur' }],
+				name: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+				typeId: [
+					{
+						required: true,
+						message: '物料产品类型不能为空',
+						trigger: 'blur',
+					},
+				],
+			},
+		};
+	},
+	mounted() {},
+	methods: {
+		init(id) {
+			this.dataForm.id = id || '';
+			this.visible = true;
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields();
+				if (this.dataForm.id) {
+					this.urlOptions.infoURL(id).then((response) => {
+						this.dataForm = response.data;
+						this.setDataForm();
+					});
+				} else {
+					if (this.urlOptions.isGetCode) {
+						this.getCode();
+						this.setDataForm();
+					}
+				}
+			});
+		},
+		typeId(typeId, product) {
+			this.$nextTick(() => {
+				this.dataForm.typeId = typeId || undefined;
+				this.showTime = product || false;
+			});
+		},
+		setDataForm() {
+			getSupplierList().then((res) => {
+				this.supplierArr = res.data;
+			});
+			// 下拉树结构
+			getMaterialTree().then((response) => {
+				this.deptOptions = [];
+				this.deptOptions.push(...this.handleTree(response.data, 'id'));
+				this.$nextTick(() => {
+					if (this.dataForm.id) {
+						this.treeArr = [];
+						this.treeArr = getTreeArr(response.data);//解构，树结构变为普通数组
+						this.showTime = this.treeArr.find(
+							(item) => item.id == this.dataForm.typeId
+						).product;
+					}
+				});
+			});
+		},
+		/** 转换菜单数据结构 */
+		normalizer(node) {
+			if (node.children && !node.children.length) {
+				delete node.children;
+			}
+			return {
+				id: node.id,
+				label: node.name,
+				children: node.children,
+			};
+		},
+		setShowTime(node) {
+			this.showTime = node.product || false;
+		},
+	},
+};
+</script>

src/views/material/material/attr-add.vue

@@ -0,0 +1,141 @@
+<template>
+	<el-dialog
+		:visible.sync="visible"
+		:width="'30%'"
+		:append-to-body="true"
+		:close-on-click-modal="false"
+		class="dialog">
+		<template #title>
+			<slot name="title">
+				<div class="titleStyle">
+					{{ !dataForm.id ? '新增' : '编辑' }}
+				</div>
+			</slot>
+		</template>
+
+		<el-form
+			ref="dataForm"
+			:model="dataForm"
+			:rules="dataRule"
+			label-width="70px"
+			@keyup.enter.native="dataFormSubmit()">
+			<el-form-item label="属性名" prop="attrName">
+				<el-input
+					v-model="dataForm.attrName"
+					placeholder="请输入属性名"
+					clearable />
+			</el-form-item>
+			<el-form-item label="属性值" prop="attrValue">
+				<el-input
+					v-model="dataForm.attrValue"
+					placeholder="请输入属性值"
+					clearable />
+			</el-form-item>
+		</el-form>
+
+		<el-row style="text-align: right">
+			<el-button @click="visible = false">取消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+		</el-row>
+	</el-dialog>
+</template>
+
+<script>
+import {
+	createMaterialAttr,
+	updateMaterialAttr,
+	getMaterialAttr
+} from '@/api/base/material';
+
+export default {
+	props: {
+		materialId: {
+			type: String,
+			default: '',
+		},
+	},
+	data() {
+		return {
+			visible: false,
+			dataForm: {
+				id: undefined,
+				attrName: '',
+				attrValue: '',
+			},
+			dataRule: {
+				attrName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+			},
+		};
+	},
+	methods: {
+		init(id) {
+			this.dataForm.id = id || '';
+			this.visible = true;
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields();
+				if (this.dataForm.id) {
+					getMaterialAttr({
+						id: this.dataForm.id
+					}).then((res) => {
+						const { attrName, attrValue } = res.data;
+						this.dataForm.attrName = attrName;
+						this.dataForm.attrValue = attrValue;
+					});
+				}
+			});
+		},
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate((valid) => {
+				if (valid) {
+					// 修改的提交
+					if (this.dataForm.id) {
+						updateMaterialAttr({
+							...this.dataForm,
+							materialId: this.materialId,
+						}).then((response) => {
+							this.$modal.msgSuccess('修改成功');
+							this.visible = false;
+							this.$emit('refreshDataList');
+						});
+						return;
+					}
+					// 添加的提交
+					createMaterialAttr({
+						...this.dataForm,
+						materialId: this.materialId,
+					}).then((response) => {
+						this.$modal.msgSuccess('新增成功');
+						this.visible = false;
+						this.$emit('refreshDataList');
+					});
+				}
+			});
+		},
+	},
+};
+</script>
+
+<style scoped>
+.dialog >>> .el-dialog__body {
+	padding: 30px 24px;
+}
+.dialog >>> .el-dialog__header {
+	font-size: 16px;
+	color: rgba(0, 0, 0, 0.85);
+	font-weight: 500;
+	padding: 13px 24px;
+	border-bottom: 1px solid #e9e9e9;
+}
+.dialog >>> .el-dialog__header .titleStyle::before {
+	content: '';
+	display: inline-block;
+	width: 4px;
+	height: 16px;
+	background-color: #0b58ff;
+	border-radius: 1px;
+	margin-right: 8px;
+	position: relative;
+	top: 2px;
+}
+</style>

src/views/material/material/index.vue

@@ -0,0 +1,466 @@
+<!--
+ * @Author: zwq
+ * @Date: 2024-07-01 14:54:06
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-08-08 16:46:44
+ * @Description:
+-->
+<template>
+	<div style="display: flex; gap: 16px; flex: 1; background: #eff1f6">
+		<div
+			class="app-container"
+			style="background: white; width: 280px; border-radius: 8px">
+			<div class="head-container">
+				<el-input
+					v-model="treeName"
+					placeholder="请输入名称"
+					clearable
+					size="small"
+					prefix-icon="el-icon-search"
+					style="margin-bottom: 20px" />
+			</div>
+			<div class="head-container">
+				<el-tree
+					v-loading="treeLoading"
+					element-loading-text="拼命加载中"
+					element-loading-spinner="el-icon-loading"
+					element-loading-background="rgba(0, 0, 0, 0.8)"
+					:data="deptOptions1"
+					:props="defaultProps"
+					node-key="id"
+					:expand-on-click-node="false"
+					:filter-node-method="filterNode"
+					ref="tree"
+					default-expand-all
+					highlight-current
+					@node-click="handleNodeClick">
+					<span class="custom-tree-node" slot-scope="{ node, data }">
+						<span>{{ node.label }}</span>
+						<span style="float: right" v-if="data.parentId !== -1">
+							<el-button
+								class="btnHover"
+								type="text"
+								icon="el-icon-edit"
+								size="mini"
+								v-if="data.parentId !== 0"
+								@click="() => edit(node, data)" />
+							<el-button
+								class="btnHover"
+								type="text"
+								icon="el-icon-circle-plus-outline"
+								size="mini"
+								@click="() => append(data)" />
+							<el-button
+								class="btnHover"
+								type="text"
+								icon="el-icon-remove-outline"
+								size="mini"
+								v-if="data.parentId !== 0"
+								@click="() => remove(node, data)" />
+						</span>
+					</span>
+				</el-tree>
+			</div>
+		</div>
+
+		<div
+			class="app-container"
+			style="background: #fff; border-radius: 8px; width: 1px; flex: 1">
+			<search-bar
+				:formConfigs="formConfig"
+				ref="searchBarForm"
+				@headBtnClick="buttonClick" />
+			<base-table
+				v-loading="dataListLoading"
+				:table-props="tableProps"
+				:page="listQuery.pageNo"
+				:limit="listQuery.pageSize"
+				:max-height="tableH"
+				:table-data="tableData">
+				<method-btn
+					v-if="tableBtn.length"
+					slot="handleBtn"
+					:width="80"
+					label="操作"
+					:method-list="tableBtn"
+					@clickBtn="handleClick" />
+			</base-table>
+			<pagination
+				:limit.sync="listQuery.pageSize"
+				:page.sync="listQuery.pageNo"
+				:total="listQuery.total"
+				@pagination="getDataList" />
+			<base-dialog
+				:dialogTitle="addOrEditTitle"
+				:dialogVisible="addOrUpdateVisible"
+				@cancel="handleCancel"
+				@confirm="handleConfirm"
+				:before-close="handleCancel"
+				width="50%">
+				<add-or-update
+					ref="addOrUpdate"
+					@refreshDataList="successSubmit"></add-or-update>
+			</base-dialog>
+		</div>
+
+		<!-- 添加或修改菜单对话框 -->
+		<el-dialog :title="title" :visible.sync="open" width="700px">
+			<el-form ref="form" :model="form" :rules="rules" label-width="100px">
+				<el-row>
+					<el-col :span="12">
+						<el-form-item label="父类型">
+							<treeselect
+								v-model="form.parentId"
+								:options="deptOptions"
+								:normalizer="normalizer"
+								:show-count="true"
+								:appendToBody="true"
+								z-index="99999"
+								placeholder="选择父类型" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="名称" prop="name">
+							<el-input v-model="form.name" placeholder="请输入名称" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+			</el-form>
+			<div slot="footer" class="dialog-footer">
+				<el-button type="primary" @click="submitForm">确 定</el-button>
+				<el-button @click="cancel">取 消</el-button>
+			</div>
+		</el-dialog>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './add-or-updata';
+import basicPage from '../mixins/basic-page';
+import { parseTime } from '../mixins/code-filter';
+import { publicFormatter } from '@/utils/dict';
+import {
+	getProductMaterialPage,
+	deleteProductMaterial,
+	getMaterialTree,
+	createMaterialTree,
+	updateMaterialTree,
+	deleteMaterialTree,
+} from '@/api/base/material';
+import Treeselect from '@riophae/vue-treeselect';
+import '@riophae/vue-treeselect/dist/vue-treeselect.css';
+import tableHeightMixin from '@/mixins/tableHeightMixin';
+
+const tableProps = [
+	{
+		prop: 'createTime',
+		label: '添加时间',
+		filter: parseTime,
+		width: 150,
+	},
+	{
+		prop: 'name',
+		label: '物料产品名称',
+	},
+	{
+		prop: 'code',
+		label: '物料产品编码',
+		width: 160,
+	},
+	{
+		prop: 'typeNameChain',
+		label: '物料产品类型',
+	},
+	{
+		prop: 'unit',
+		label: '单位',
+		filter: publicFormatter('unit_dict'),
+		width: 60,
+	},
+	{
+		prop: 'specifications',
+		label: '规格',
+	},
+	{
+		prop: 'supplierName',
+		label: '供应商',
+	},
+	{
+		prop: 'remark',
+		label: '备注',
+	},
+];
+
+export default {
+	mixins: [basicPage, tableHeightMixin],
+	name: '',
+	components: {
+		AddOrUpdate,
+		Treeselect,
+	},
+	data() {
+		return {
+			// 部门树选项
+			treeName: undefined,
+			deptOptions: undefined,
+			deptOptions1: undefined,
+			treeLoading: false,
+			defaultProps: {
+				children: 'children',
+				label: 'name',
+			},
+			// 弹出层标题
+			title: '',
+			// 是否显示弹出层
+			open: false,
+			// 表单参数
+			form: {
+				id: undefined,
+				parentId: undefined,
+				name: undefined,
+				defaultType: false,
+			},
+			// 表单校验
+			rules: {
+				name: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+			},
+			urlOptions: {
+				getDataListURL: getProductMaterialPage,
+				deleteURL: deleteProductMaterial,
+			},
+			tableProps,
+			tableBtn: [
+				this.$auth.hasPermi(`base:core-product:update`)
+					? {
+							type: 'edit',
+							btnName: '编辑',
+					  }
+					: undefined,
+				this.$auth.hasPermi(`base:core-product:delete`)
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v) => v),
+			tableData: [],
+			formConfig: [
+				{
+					type: 'input',
+					label: '物料产品名称',
+					placeholder: '物料产品名称',
+					param: 'name',
+				},
+				{
+					type: 'input',
+					label: '物料产品编号',
+					placeholder: '物料产品编号',
+					param: 'code',
+				},
+				{
+					type: 'input',
+					label: '物料产品类型',
+					param: 'type',
+					disabled: true,
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					type: this.$auth.hasPermi('base:material:create') ? 'button' : '',
+					btnName: '新增',
+					name: 'add',
+					color: 'success',
+					plain: true,
+				},
+			],
+		};
+	},
+	watch: {
+		// 根据名称筛选部门树
+		treeName(val) {
+			this.$refs.tree.filter(val);
+		},
+	},
+	created() {
+		this.getDataList();
+		this.getTreeselect();
+	},
+	methods: {
+		// 删除
+		deleteHandle(id, name, index) {
+			this.$confirm(`是否确认删除物料产品名称为"${name}"的数据项`, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning',
+			})
+				.then(() => {
+					this.urlOptions.deleteURL(id).then(({ data }) => {
+						this.$message({
+							message: '操作成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getDataList();
+							},
+						});
+					});
+				})
+				.catch(() => {});
+		},
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 20;
+					this.listQuery.name = val.name ? val.name : undefined;
+					this.listQuery.code = val.code ? val.code : undefined;
+					this.getDataList();
+					break;
+				case 'add':
+					this.addOrEditTitle = '新增';
+					this.addOrUpdateVisible = true;
+					this.$nextTick(() => {
+						this.$refs.addOrUpdate.init();
+						this.$refs.addOrUpdate.typeId(
+							this.listQuery.typeId,
+							this.listQuery.product
+						);
+					});
+					break;
+				case 'export':
+					this.handleExport();
+					break;
+				default:
+					console.log(val);
+			}
+		},
+
+		/** 树操作 */
+
+		// 查询下拉树结构
+		getTreeselect() {
+			this.treeLoading = true;
+			getMaterialTree().then((response) => {
+				// treeArr[0].push(...this.handleTree(response.data, 'id'));
+				// 处理 deptOptions 参数
+				this.deptOptions = [];
+				this.treeLoading = false;
+				this.deptOptions.push(...this.handleTree(response.data, 'id'));
+				const arr = [{ name: '全部', parentId: -1 }];
+				this.deptOptions1 = arr.concat(this.deptOptions);
+			});
+		},
+		// 筛选节点
+		filterNode(value, data) {
+			if (!value) return true;
+			return data.name.indexOf(value) !== -1;
+		},
+		// 节点单击事件
+		handleNodeClick(data) {
+			this.listQuery.typeId = data.id || undefined;
+			this.listQuery.product = data.product;
+			this.$refs.searchBarForm.formInline.type = data.name || undefined;
+		},
+		// 新增节点
+		append(data) {
+			this.open = true;
+			this.title = '新增物料产品类型';
+			this.form.id = undefined;
+			this.form.parentId = data.id;
+		},
+		// 删除节点
+		remove(node, data) {
+			this.$confirm(`是否确认删除名称为"${data.name}"的数据项`, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning',
+			})
+				.then(() => {
+					deleteMaterialTree(data.id).then(({ data }) => {
+						this.$message({
+							message: '操作成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getTreeselect();
+							},
+						});
+					});
+				})
+				.catch(() => {});
+		},
+		// 编辑节点
+		edit(node, data) {
+			this.open = true;
+			this.title = '编辑物料产品类型';
+			this.form.id = data.id;
+			this.form.name = data.name;
+			this.form.parentId = data.parentId;
+		},
+
+		/** 转换菜单数据结构 */
+		normalizer(node) {
+			if (node.children && !node.children.length) {
+				delete node.children;
+			}
+			return {
+				id: node.id,
+				label: node.name,
+				children: node.children,
+			};
+		},
+		// 取消按钮
+		cancel() {
+			this.open = false;
+			this.reset();
+		},
+		// 表单重置
+		reset() {
+			this.form = {
+				id: undefined,
+				parentId: 0,
+				name: undefined,
+				defaultType: false,
+			};
+			this.resetForm('form');
+		},
+		// 表单提交
+		submitForm() {
+			this.$refs['form'].validate((valid) => {
+				if (!valid) {
+					return false;
+				}
+				// 修改的提交
+				if (this.form.id) {
+					updateMaterialTree(this.form).then((response) => {
+						this.$modal.msgSuccess('修改成功');
+						this.cancel();
+						this.getTreeselect();
+					});
+					return;
+				}
+				// 添加的提交
+				createMaterialTree(this.form).then((response) => {
+					this.$modal.msgSuccess('新增成功');
+					this.cancel();
+					this.getTreeselect();
+				});
+			});
+		},
+	},
+};
+</script>
+
+<style scoped>
+.btnHover:hover {
+	color: #67c23a;
+	transform: scale(1.5);
+}
+</style>

src/views/material/materialDate/add-or-updata.vue

@@ -0,0 +1,108 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-08-05 16:12:58
+ * @Description:
+-->
+<template>
+	<el-form
+		:model="dataForm"
+		:rules="dataRule"
+		ref="dataForm"
+		@keyup.enter.native="dataFormSubmit()"
+		label-width="80px">
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="物料名称" prop="materialId">
+					<el-select
+						v-model="dataForm.materialId"
+						placeholder="请选择物料"
+						@change="setMaterialCode"
+						style="width: 100%">
+						<el-option
+							v-for="dict in materialList"
+							:key="dict.id"
+							:label="dict.name"
+							:value="dict.id" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="物料编码" prop="materialCode">
+					<el-input
+						v-model="dataForm.materialCode"
+						disabled
+						placeholder="请输入物料编码" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="批次号" prop="code">
+					<el-input v-model="dataForm.code" clearable placeholder="请输入批次号" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="批次名称" prop="name">
+					<el-input v-model="dataForm.name" clearable placeholder="请输入批次名称" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-form-item label="备注" prop="remark">
+			<el-input v-model="dataForm.remark" clearable placeholder="请输入备注" />
+		</el-form-item>
+	</el-form>
+</template>
+
+<script>
+import basicAdd from '../mixins/basic-add';
+import { createMaterialDate, updateMaterialDate, getMaterialDate, getCode } from "@/api/base/materialDate";
+import { getMaterialList } from "@/api/base/material";
+
+export default {
+	mixins: [basicAdd],
+	data() {
+		return {
+			urlOptions: {
+			  isGetCode: false,
+        codeURL: getCode,
+				createURL: createMaterialDate,
+				updateURL: updateMaterialDate,
+				infoURL: getMaterialDate,
+			},
+			dataForm: {
+        id: undefined,
+        code: undefined,
+        name: undefined,
+        materialId: undefined,
+				materialCode: undefined,
+        remark: undefined,
+			},
+			materialList: [],
+			dataRule: {
+				materialId: [{ required: true, message: "物料不能为空", trigger: "blur" }],
+        code: [{ required: true, message: "批次号不能为空", trigger: "blur" }],
+        name: [{ required: true, message: "批次名称不能为空", trigger: "blur" }],
+      }
+		};
+	},
+	mounted() {
+		this.getDict()
+		console.log('我看看', this.dataForm)
+	},
+	methods: {
+		async getDict() {
+			// 物料列表
+			const res = await getMaterialList();
+			this.materialList = res.data;
+		},
+		setMaterialCode() {
+			const chooseM = this.materialList.filter(item => {
+				return item.id === this.dataForm.materialId
+			})
+			this.dataForm.materialCode = chooseM[0].code
+		}
+	},
+};
+</script>

src/views/material/materialDate/index.vue

@@ -0,0 +1,190 @@
+<template>
+	<div class="app-container">
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
+		<base-table
+			v-loading="dataListLoading"
+			:table-props="tableProps"
+			:page="listQuery.pageNo"
+			:limit="listQuery.pageSize"
+			:table-data="tableData">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				:width="120"
+				label="操作"
+				:method-list="tableBtn"
+				@clickBtn="handleClick" />
+		</base-table>
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getDataList" />
+		<base-dialog
+			:dialogTitle="addOrEditTitle"
+			:dialogVisible="addOrUpdateVisible"
+			@cancel="handleCancel"
+			@confirm="handleConfirm"
+			:before-close="handleCancel"
+			width="40%">
+			<add-or-update
+				ref="addOrUpdate"
+				@refreshDataList="successSubmit"></add-or-update>
+		</base-dialog>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './add-or-updata';
+import basicPage from '../mixins/basic-page';
+import { parseTime } from '../mixins/code-filter';
+import {
+	getMaterDatePage,
+	deleteMaterialDate
+} from '@/api/base/materialDate';
+
+const tableProps = [
+	{
+		prop: 'createTime',
+		label: '添加时间',
+		filter: parseTime
+	},
+	{
+		prop: 'code',
+		label: '批次号'
+	},
+	{
+		prop: 'name',
+		label: '批次名称'
+	},
+	{
+		prop: 'materialCode',
+		label: '物料编码'
+	},
+	{
+		prop: 'materialName',
+		label: '物料名称'
+	},
+];
+
+export default {
+	mixins: [basicPage],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getMaterDatePage,
+				deleteURL: deleteMaterialDate,
+				// exportURL: exportFactoryExcel,
+			},
+			tableProps,
+			tableBtn: [
+				this.$auth.hasPermi(`base:material-date:update`)
+					? {
+							type: 'edit',
+							btnName: '编辑',
+					  }
+					: undefined,
+          this.$auth.hasPermi(`base:material-date:delete`)
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v)=>v),
+			tableData: [],
+			formConfig: [
+				{
+					type: 'input',
+					label: '批次名',
+					placeholder: '批次名',
+					param: 'name',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					type: this.$auth.hasPermi('base:material-date:create') ? 'button' : '',
+					btnName: '新增',
+					name: 'add',
+					color: 'success',
+					plain: true
+				},
+			],
+		};
+	},
+	components: {
+		AddOrUpdate,
+	},
+	created() {},
+	methods: {
+		// 获取数据列表
+    getDataList() {
+      this.dataListLoading = true;
+      this.urlOptions.getDataListURL(this.listQuery).then(response => {
+        this.tableData = response.data.records;
+        this.listQuery.total = response.data.total;
+        this.dataListLoading = false;
+      });
+    },
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 10;
+					this.listQuery.name = val.name ? val.name : undefined;
+					this.getDataList();
+					break;
+				case 'reset':
+					this.$refs.searchBarForm.resetForm();
+					this.listQuery = {
+						pageSize: 10,
+						pageNo: 1,
+						total: 1,
+					};
+					this.getDataList();
+					break;
+				case 'add':
+					this.addOrEditTitle = '新增';
+					this.addOrUpdateVisible = true;
+					this.addOrUpdateHandle();
+					break;
+				case 'export':
+					this.handleExport();
+					break;
+				default:
+					console.log(val);
+			}
+		},
+		// 删除
+    deleteHandle(id, name, index) {
+      this.$confirm(`是否删除物料批次名称为"${name}"的数据项?`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.urlOptions.deleteURL(id).then(({ data }) => {
+            this.$message({
+              message: "操作成功",
+              type: "success",
+              duration: 1500,
+              onClose: () => {
+                this.getDataList();
+              },
+            });
+          });
+        })
+        .catch(() => { });
+    }
+	},
+};
+</script>

src/views/material/materialProductBom/SmallTitle.vue

@@ -0,0 +1,65 @@
+<!--
+ * @Author: zwq
+ * @Date: 2023-08-01 15:27:31
+ * @LastEditors: zwq
+ * @LastEditTime: 2023-08-01 16:25:54
+ * @Description:
+-->
+<template>
+	<div :class="[className, { 'p-0': noPadding }]">
+		<slot />
+	</div>
+</template>
+
+<script>
+export default {
+	props: {
+		size: {
+			// 取值范围:  xl lg md sm
+			type: String,
+			default: 'de',
+			validator: function (val) {
+				return ['xl', 'lg', 'de', 'md', 'sm'].indexOf(val) !== -1;
+			},
+		},
+		noPadding: {
+			type: Boolean,
+			default: false,
+		},
+	},
+	computed: {
+		className: function () {
+			return `${this.size}-title`;
+		},
+	},
+};
+</script>
+
+<style lang="scss" scoped>
+$pxls: (xl, 28px) (lg, 24px) (de, 20px) (md, 18px) (sm, 16px);
+$mgr: 8px;
+@each $size, $height in $pxls {
+	.#{$size}-title {
+		font-size: 18px;
+		line-height: $height;
+		color: #000;
+		font-weight: 500;
+		font-family: '微软雅黑', 'Microsoft YaHei', Arial, Helvetica, sans-serif;
+
+		&::before {
+			content: '';
+			display: inline-block;
+			vertical-align: top;
+			width: 4px;
+			height: $height + 2px;
+			border-radius: 1px;
+			margin-right: $mgr;
+			background-color: #0b58ff;
+		}
+	}
+}
+
+.p-0 {
+	padding: 0;
+}
+</style>

src/views/material/materialProductBom/add-or-updata.vue

@@ -0,0 +1,420 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-08-08 16:47:36
+ * @Description:
+-->
+<template>
+	<el-drawer
+		:visible.sync="visible"
+		:show-close="false"
+		:wrapper-closable="isdetail"
+		class="drawer"
+		size="70%">
+		<small-title slot="title" :no-padding="true">
+			{{ isdetail ? '详情' : !dataForm.id ? '新增' : '编辑' }}
+		</small-title>
+		<div class="content">
+			<div class="visual-part">
+				<el-form
+					:model="dataForm"
+					:rules="dataRule"
+					ref="dataForm"
+					@keyup.enter.native="dataFormSubmit()"
+					label-width="100px"
+					label-position="top">
+					<el-row :gutter="20">
+						<el-col :span="8">
+							<el-form-item label="产品名称" prop="productId">
+								<el-select
+									v-model="dataForm.productId"
+									filterable
+									clearable
+									:disabled="isdetail"
+									style="width: 100%"
+									placeholder="请选择产品">
+									<el-option
+										v-for="dict in productList"
+										:key="dict.id"
+										:label="dict.name"
+										:value="dict.id" />
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">
+							<el-form-item label="产品BOM编码" prop="code">
+								<el-input
+									v-model="dataForm.code"
+									:disabled="isdetail"
+									placeholder="请输入产品Bom编码" />
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">
+							<el-form-item label="备注" prop="remark">
+								<el-input
+									v-model="dataForm.remark"
+									:disabled="isdetail"
+									clearable
+									placeholder="请输入备注" />
+							</el-form-item>
+						</el-col>
+					</el-row>
+				</el-form>
+			</div>
+			<div class="attr-list" v-if="idAttrShow">
+				<small-title
+					style="margin: 16px 0; padding-left: 8px"
+					:no-padding="true">
+					BOM明细
+				</small-title>
+
+				<div v-if="!isdetail" class="action_btn">
+					<template>
+						<span style="display: inline-block">
+							<el-button type="text" @click="addNew()" icon="el-icon-plus">
+								添加
+							</el-button>
+						</span>
+					</template>
+				</div>
+				<base-table
+					:table-props="tableProps"
+					:page="listQuery.pageNo"
+					:limit="listQuery.pageSize"
+					:table-data="tableData">
+					<method-btn
+						v-if="!isdetail"
+						slot="handleBtn"
+						:width="80"
+						label="操作"
+						:method-list="tableBtn"
+						@clickBtn="handleClick" />
+				</base-table>
+				<pagination
+					v-show="listQuery.total > 0"
+					:total="listQuery.total"
+					:page.sync="listQuery.pageNo"
+					:limit.sync="listQuery.pageSize"
+					:page-sizes="[5, 10, 15]"
+					@pagination="getList" />
+			</div>
+
+			<div v-if="!isdetail" class="drawer-body__footer">
+				<el-button style="" @click="goback()">取消</el-button>
+				<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+			</div>
+		</div>
+
+		<attr-add
+			v-if="addOrUpdateVisible"
+			ref="addOrUpdate"
+			:bom-id="dataForm.id"
+			@refreshDataList="getList" />
+	</el-drawer>
+</template>
+
+<script>
+import basicAdd from '../mixins/basic-add';
+import {
+	createMaterialPB,
+	updateMaterialPB,
+	getMaterialPB,
+	getCode,
+	getProBomList,
+	createMaterialPBDet,
+	updateMaterialPBDet,
+	deleteMaterialPBDet,
+} from '@/api/base/materialProductBom';
+import { getMaterialTree, getMaterialList } from '@/api/base/material';
+import SmallTitle from './SmallTitle';
+import { parseTime } from '../mixins/code-filter';
+import attrAdd from './attr-add';
+import { publicFormatter } from '@/utils/dict';
+
+const tableBtn = [
+	{
+		type: 'edit',
+		btnName: '编辑',
+	},
+	{
+		type: 'delete',
+		btnName: '删除',
+	},
+];
+const tableProps = [
+	{
+		prop: 'createTime',
+		label: '添加时间',
+		filter: parseTime,
+		width: 160,
+	},
+	{
+		prop: 'materialName',
+		label: '物料名称',
+		showOverflowtooltip: true,
+	},
+	{
+		prop: 'materialCode',
+		label: '物料编码',
+		width: 160,
+	},
+	{
+		prop: 'unit',
+		label: '单位',
+		filter: publicFormatter('unit_dict'),
+		width: 60,
+	},
+	{
+		prop: 'num',
+		label: '数量',
+		width: 60,
+	},
+	{
+		prop: 'remark',
+		label: '备注',
+	},
+];
+
+export default {
+	mixins: [basicAdd],
+	components: { SmallTitle, attrAdd },
+	data() {
+		return {
+			tableBtn,
+			tableProps,
+			addOrUpdateVisible: false,
+			urlOptions: {
+				isGetCode: true,
+				codeURL: getCode,
+				createURL: createMaterialPB,
+				updateURL: updateMaterialPB,
+				infoURL: getMaterialPB,
+			},
+			listQuery: {
+				pageSize: 10,
+				pageNo: 1,
+				total: 0,
+			},
+			dataForm: {
+				id: undefined,
+				code: undefined,
+				productId: '',
+				remark: undefined,
+			},
+			productList: [],
+			materialAttrList: [],
+			tableData: [],
+			visible: false,
+			isdetail: false,
+			idAttrShow: false,
+			dataRule: {
+				productId: [
+					{ required: true, message: '产品不能为空', trigger: 'blur' },
+				],
+			},
+		};
+	},
+	mounted() {
+		this.getDict();
+	},
+	methods: {
+		handleClick(raw) {
+			if (raw.type === 'delete') {
+				this.deleteDetail(raw.data);
+			} else {
+				this.addNew(raw.data.id);
+			}
+		},
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate((valid) => {
+				if (!valid) {
+					return false;
+				}
+				// 修改的提交
+				if (this.dataForm.id) {
+					this.urlOptions.updateURL(this.dataForm).then((response) => {
+						this.$modal.msgSuccess('修改成功');
+						this.visible = false;
+						this.$emit('refreshDataList');
+					});
+					return;
+				}
+				// 添加的提交
+				this.urlOptions.createURL(this.dataForm).then((response) => {
+					this.$modal.msgSuccess('新增成功');
+					// this.visible = false;
+					this.idAttrShow = true;
+					this.dataForm.id = response.data;
+					this.$emit('refreshDataList');
+				});
+			});
+		},
+		async getDict() {
+			const materRes = await getMaterialTree();
+			let typeId = materRes.data[0].product
+				? materRes.data[0].id
+				: materRes.data[1].id;
+			const listQuery = {
+				typeId: typeId,
+			};
+			const materData = await getMaterialList(listQuery);
+			this.productList = [];
+			this.productList = materData.data;
+		},
+		initData() {
+			// this.materialAttrList.splice(0);
+			this.listQuery.total = 0;
+		},
+		deleteDetail(raw) {
+			this.$confirm(
+				`是否确认删除物料名称为"${raw.materialName}"的数据项?`,
+				'提示',
+				{
+					confirmButtonText: '确定',
+					cancelButtonText: '取消',
+					type: 'warning',
+				}
+			)
+				.then(() => {
+					deleteMaterialPBDet(raw.id).then(({ data }) => {
+						this.$message({
+							message: '操作成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getList();
+							},
+						});
+					});
+				})
+				.catch(() => {});
+		},
+		getList() {
+			// 获取产品Bom详细列表
+			getProBomList({
+				...this.listQuery,
+				bomId: this.dataForm.id,
+			}).then((response) => {
+				this.tableData = response.data.records;
+				this.listQuery.total = response.data.total;
+			});
+		},
+		// 构造一行
+		addRow() {
+			const row = {
+				bomId: this.dataForm.id,
+				materialId: '',
+				num: 0,
+				materialCode: undefined,
+				unit: undefined,
+				remark: '',
+				isEdit: true,
+			};
+			this.tableData.push(row);
+		},
+		init(id, isdetail) {
+			this.initData();
+			this.isdetail = isdetail || false;
+			this.dataForm.id = id || undefined;
+			this.visible = true;
+			if (id) {
+				this.idAttrShow = true;
+			} else {
+				this.idAttrShow = false;
+			}
+
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields();
+
+				if (this.dataForm.id) {
+					// 获取物料详情
+					this.urlOptions.infoURL(id).then((response) => {
+						this.dataForm = response.data;
+					});
+					// 获取Bom明细
+					this.getList();
+				} else {
+					if (this.urlOptions.isGetCode) {
+						this.getCode();
+					}
+				}
+			});
+		},
+		goback() {
+			this.$emit('refreshDataList');
+			this.visible = false;
+			// this.initData();
+		},
+		goEdit() {
+			this.isdetail = false;
+		},
+		// 新增 / 修改
+		addNew(id) {
+			this.addOrUpdateVisible = true;
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id);
+			});
+		},
+	},
+};
+</script>
+<style scoped>
+.drawer >>> .el-drawer {
+	border-radius: 8px 0 0 8px;
+	display: flex;
+	flex-direction: column;
+}
+
+.drawer >>> .el-form-item__label {
+	padding: 0;
+}
+
+.drawer >>> .el-drawer__header {
+	margin: 0;
+	padding: 32px 32px 24px;
+	border-bottom: 1px solid #dcdfe6;
+}
+.drawer >>> .el-drawer__body {
+	flex: 1;
+	height: 1px;
+	display: flex;
+	flex-direction: column;
+}
+
+.drawer >>> .content {
+	padding: 30px 24px;
+	flex: 1;
+	display: flex;
+	flex-direction: column;
+	/* height: 100%; */
+}
+
+.drawer >>> .visual-part {
+	flex: 1 auto;
+	max-height: 20vh;
+	overflow: hidden;
+	overflow-y: scroll;
+	padding-right: 10px; /* 调整滚动条样式 */
+}
+
+.drawer >>> .el-form,
+.drawer >>> .attr-list {
+	padding: 0 16px;
+}
+
+.drawer-body__footer {
+	display: flex;
+	justify-content: flex-end;
+	padding: 18px;
+}
+.action_btn {
+	float: right;
+	margin: -40px 15px;
+	font-size: 14px;
+}
+.add {
+	color: #0b58ff;
+}
+</style>

src/views/material/materialProductBom/attr-add.vue

@@ -0,0 +1,203 @@
+<template>
+	<el-dialog
+		:visible.sync="visible"
+		:width="'40%'"
+		:append-to-body="true"
+		:close-on-click-modal="false"
+		class="dialog">
+		<template #title>
+			<slot name="title">
+				<div class="titleStyle">
+					{{ !dataForm.id ? '新增' : '编辑' }}
+				</div>
+			</slot>
+		</template>
+
+		<el-form
+			ref="dataForm"
+			:model="dataForm"
+			:rules="dataRule"
+			label-width="80px"
+			@keyup.enter.native="dataFormSubmit()">
+			<el-row :gutter="20">
+				<el-col :span="12">
+					<el-form-item label="物料名称" prop="materialId">
+						<el-select
+							v-model="dataForm.materialId"
+							placeholder="请选择物料"
+							clearable
+							filterable
+							@change="setCode"
+							style="width: 100%"
+						>
+							<el-option
+								v-for="dict in materialList"
+								:key="dict.id"
+								:label="dict.name"
+								:value="dict.id" />
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="物料编码" prop="materialCode">
+						<el-input
+							v-model="dataForm.materialCode"
+							clearable
+							disabled
+							placeholder="请输入物料编码" />
+					</el-form-item>
+				</el-col>
+			</el-row>
+			<el-row :gutter="20">
+				<el-col :span="12">
+					<el-form-item label="单位" prop="unit">
+						<el-select
+							v-model="dataForm.unit"
+							style="width: 100%"
+							disabled
+							placeholder="请选择单位">
+							<el-option
+								v-for="dict in getDictDatas(DICT_TYPE.UNIT_DICT)"
+								:key="dict.value"
+								:label="dict.label"
+								:value="dict.value" />
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="数量" prop="num">
+					<el-input-number v-model="dataForm.num" controls-position="right" clearable placeholder="请输入数量" style="width: 100%" />
+					</el-form-item>
+				</el-col>
+			</el-row>
+			<el-form-item label="备注" prop="remark">
+				<el-input v-model="dataForm.remark" clearable placeholder="请输入备注" />
+			</el-form-item>
+		</el-form>
+
+		<el-row style="text-align: right">
+			<el-button @click="visible = false">取消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+		</el-row>
+	</el-dialog>
+</template>
+
+<script>
+import { getMaterialTree,getMaterialList } from '@/api/base/material';
+import { createMaterialPBDet, updateMaterialPBDet, getMaterialPBDet } from "@/api/base/materialProductBom";
+
+export default {
+	props: {
+		bomId: {
+			type: String,
+			default: '',
+		},
+	},
+	data() {
+		return {
+			visible: false,
+			dataForm: {
+				id: undefined,
+				materialId: '',
+				num: 0,
+				materialCode: undefined,
+				unit: undefined,
+				remark: '',
+			},
+			materialList: [],
+			dataRule: {
+				materialId: [{ required: true, message: '物料名称不能为空', trigger: 'change' }],
+				num: [{ required: true, message: '数量不能为空', trigger: 'blur' }]
+			},
+		};
+	},
+	mounted() {
+		this.getDict()
+	},
+	methods: {
+		async getDict() {
+			// 物料列表
+			const materRes = await getMaterialTree();
+      let typeId = materRes.data[0].product?materRes.data[1].id:materRes.data[0].id
+      const listQuery= {
+        typeId:typeId
+      }
+			const materData = await getMaterialList(listQuery);
+			this.materialList = [];
+			this.materialList = materData.data;
+		},
+		init(id) {
+			this.dataForm.id = id || '';
+			this.visible = true;
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields();
+				if (this.dataForm.id) {
+					getMaterialPBDet(this.dataForm.id).then((res) => {
+						this.dataForm = res.data
+						this.setCode()
+					});
+				}
+			});
+		},
+		setCode() {
+			const tempMaterial = this.materialList.filter(item =>{
+				return item.id === this.dataForm.materialId
+			})
+			this.dataForm.materialCode = tempMaterial[0]?.code
+			this.dataForm.unit = tempMaterial[0].unit === undefined ? undefined : String(tempMaterial[0]?.unit)
+		},
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate((valid) => {
+				if (valid) {
+					// 修改的提交
+					if (this.dataForm.id) {
+						updateMaterialPBDet({
+							...this.dataForm,
+							bomId: this.bomId,
+						}).then((response) => {
+							this.$modal.msgSuccess('修改成功');
+							this.visible = false;
+							this.$emit('refreshDataList');
+						});
+						return;
+					}
+					// 添加的提交
+					createMaterialPBDet({
+						...this.dataForm,
+						bomId: this.bomId,
+					}).then((response) => {
+						this.$modal.msgSuccess('新增成功');
+						this.visible = false;
+						this.$emit('refreshDataList');
+					});
+				}
+			});
+		},
+	},
+};
+</script>
+
+<style scoped>
+.dialog >>> .el-dialog__body {
+	padding: 30px 24px;
+}
+.dialog >>> .el-dialog__header {
+	font-size: 16px;
+	color: rgba(0, 0, 0, 0.85);
+	font-weight: 500;
+	padding: 13px 24px;
+	border-bottom: 1px solid #e9e9e9;
+}
+.dialog >>> .el-dialog__header .titleStyle::before {
+	content: '';
+	display: inline-block;
+	width: 4px;
+	height: 16px;
+	background-color: #0b58ff;
+	border-radius: 1px;
+	margin-right: 8px;
+	position: relative;
+	top: 2px;
+}
+</style>

src/views/material/materialProductBom/index.vue

@@ -0,0 +1,182 @@
+<template>
+	<div class="app-container">
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
+		<base-table
+			v-loading="dataListLoading"
+			:table-props="tableProps"
+			:page="listQuery.pageNo"
+			:limit="listQuery.pageSize"
+			:max-height="tableH"
+			:table-data="tableData">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				:width="120"
+				label="操作"
+				:method-list="tableBtn"
+				@clickBtn="handleClick" />
+		</base-table>
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getDataList" />
+		<add-or-update
+			v-if="addOrUpdateVisible"
+			ref="addOrUpdate"
+			@refreshDataList="getDataList" />
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './add-or-updata';
+import basicPage from '../mixins/basic-page';
+// import { parseTime } from '../mixins/code-filter';
+import {
+	getMaterialPBPage,
+	deleteMaterialPB
+} from '@/api/base/materialProductBom';
+import tableHeightMixin from '@/mixins/tableHeightMixin';
+
+const tableProps = [
+	{
+		prop: 'productName',
+		label: '产品名称'
+	},
+	{
+		prop: 'code',
+		label: '产品BOM编码'
+	},
+	{
+		prop: 'remark',
+		label: '备注'
+	}
+];
+
+export default {
+	mixins: [basicPage, tableHeightMixin],
+	components: {
+		AddOrUpdate,
+	},
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getMaterialPBPage,
+				deleteURL: deleteMaterialPB
+				// exportURL: exportFactoryExcel,
+			},
+			tableProps,
+			tableBtn: [
+				this.$auth.hasPermi(`base:material-product-bom:queryMaterial`)
+					? {
+							type: 'detail',
+							btnName: '查看物料',
+					  }
+					: undefined,
+					this.$auth.hasPermi(`base:material-product-bom:update`)
+					? {
+							type: 'edit',
+							btnName: '编辑',
+					  }
+					: undefined,
+					// this.$auth.hasPermi(`base:material-product-bom:editMaterial`)
+					// ? {
+					// 		type: 'editMaterial',
+					// 		btnName: '编辑物料',
+					//   }
+					// : undefined,
+          this.$auth.hasPermi(`base:material-product-bom:delete`)
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v)=>v),
+			tableData: [],
+			formConfig: [
+				{
+					type: 'input',
+					label: '产品名称',
+					placeholder: '产品名称',
+					param: 'name',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					type: this.$auth.hasPermi('base:material:create') ? 'button' : '',
+					btnName: '新增',
+					name: 'add',
+					color: 'success',
+					plain: true
+				},
+			],
+		};
+	},
+	created() {},
+	methods: {
+		otherMethods(val) {
+			if (val.type === 'detail') {
+				this.addOrUpdateVisible = true;
+				this.addOrEditTitle = '详情';
+				this.$nextTick(() => {
+					this.$refs.addOrUpdate.init(val.data.id, true);
+				});
+			} else {
+				this.addOrEditTitle = '编辑';
+				this.addOrUpdateVisible = true;
+				this.$nextTick(() => {
+					this.$refs.addOrUpdate.init(val.data.id);
+				});
+			}
+		},
+		// 获取数据列表
+    getDataList() {
+      this.dataListLoading = true;
+      this.urlOptions.getDataListURL(this.listQuery).then(response => {
+        this.tableData = response.data.records;
+        this.listQuery.total = response.data.total;
+        this.dataListLoading = false;
+      });
+    },
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 20;
+					this.listQuery.productName = val.name ? val.name : undefined;
+					this.getDataList();
+					break;
+				case 'reset':
+					this.$refs.searchBarForm.resetForm();
+					this.listQuery = {
+						pageSize: 20,
+						pageNo: 1,
+						total: 1,
+					};
+					this.getDataList();
+					break;
+				case 'add':
+					this.addOrEditTitle = '新增';
+					this.addOrUpdateVisible = true;
+					this.addOrUpdateHandle();
+					break;
+				case 'export':
+					this.handleExport();
+					break;
+				default:
+					console.log(val);
+			}
+		},
+	},
+};
+</script>

src/views/material/materialUseLog/add-or-updata.vue

@@ -0,0 +1,284 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-08-05 16:13:52
+ * @Description:
+-->
+<template>
+	<el-form
+		:model="dataForm"
+		:rules="dataRule"
+		ref="dataForm"
+		@keyup.enter.native="dataFormSubmit()"
+		label-width="80px"
+		label-position="top">
+		<el-row :gutter="20">
+			<el-col :span="8">
+				<el-form-item label="物料名称" prop="materialId">
+					<el-select
+						v-model="dataForm.materialId"
+						placeholder="请选择物料"
+						clearable
+						filterable
+						@change="setCode"
+						style="width: 100%">
+						<el-option
+							v-for="dict in materialList"
+							:key="dict.id"
+							:label="dict.name"
+							:value="dict.id" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<el-col :span="8">
+				<el-form-item label="物料编码" prop="materialCode">
+					<el-input
+						v-model="dataForm.materialCode"
+						clearable
+						disabled
+						placeholder="请输入物料编码" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="8">
+				<el-form-item label="物料批次" prop="materialDateId">
+					<el-select
+						v-model="dataForm.materialDateId"
+						clearable
+						filterable
+						placeholder="请选择物料批次"
+						style="width: 100%">
+						<el-option
+							v-for="dict in materialDateList"
+							:key="dict.id"
+							:label="dict.code"
+							:value="dict.id" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="8">
+				<el-form-item label="使用设备" prop="equipmentId">
+					<el-select
+						v-model="dataForm.equipmentId"
+						clearable
+						filterable
+						placeholder="请选择使用设备"
+						style="width: 100%">
+						<el-option
+							v-for="dict in eqList"
+							:key="dict.id"
+							:label="dict.name"
+							:value="dict.id" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<el-col :span="8">
+				<el-form-item label="使用时间" prop="useTime">
+					<el-date-picker
+						v-model="dataForm.useTime"
+						type="datetime"
+						format="yyyy-MM-dd HH:mm:ss"
+						value-format="timestamp"
+						placeholder="选择日期时间" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="8">
+				<el-form-item label="操作员" prop="userNames">
+					<el-select
+						v-model="dataForm.userNames"
+						clearable
+						filterable
+						multiple
+						placeholder="请选择操作员"
+						style="width: 100%">
+						<el-option
+							v-for="dict in workersList"
+							:key="dict.id"
+							:label="dict.nickname"
+							:value="dict.nickname" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="8">
+				<el-form-item label="使用数量" prop="num">
+					<el-input-number
+						v-model="dataForm.num"
+						clearable
+						controls-position="right"
+						placeholder="请输入使用数量"
+						style="width: 100%" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="8">
+				<el-form-item label="数据来源" prop="source">
+					<el-select
+						v-model="dataForm.source"
+						clearable
+						placeholder="请选择数据来源">
+						<el-option
+							v-for="dict in this.dataSourceList"
+							:key="dict.id"
+							:label="dict.name"
+							:value="dict.id" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<el-col :span="8">
+				<el-form-item label="备注" prop="remark">
+					<el-input
+						v-model="dataForm.remark"
+						clearable
+						placeholder="请输入备注" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+	</el-form>
+</template>
+
+<script>
+import basicAdd from '../mixins/basic-add';
+import {
+	createMaterialLog,
+	updateMaterialLog,
+	getMaterialLog,
+	getEqListAll,
+} from '@/api/base/materialUseLog';
+import { getMaterialTree,getMaterialList } from '@/api/base/material';
+import { getMaterDateList } from '@/api/base/materialDate';
+import { listSimpleUsers } from '@/api/system/user';
+
+export default {
+	mixins: [basicAdd],
+	data() {
+		return {
+			urlOptions: {
+				createURL: createMaterialLog,
+				updateURL: updateMaterialLog,
+				infoURL: getMaterialLog,
+			},
+			dataForm: {
+				id: undefined,
+				materialId: undefined,
+				materialCode: undefined,
+				materialDateId: undefined,
+				equipmentId: undefined,
+				userName: undefined,
+				userNames: [],
+				useTime: new Date().getTime(),
+				address: undefined,
+				num: 0,
+				source: undefined,
+				remark: undefined,
+			},
+			dataSourceList: [
+				{
+					id: 1,
+					name: '手动',
+				},
+				{
+					id: 2,
+					name: 'PDA',
+				},
+			],
+			materialList: [],
+			materialDateList: [],
+			eqList: [],
+			workersList: [],
+			dataRule: {
+				materialId: [
+					{ required: true, message: '物料不能为空', trigger: 'blur' },
+				],
+				useTime: [
+					{ required: true, message: '使用时间不能为空', trigger: 'blur' },
+				],
+				userNames: [
+					{ required: true, message: '操作员不能为空', trigger: 'blur' },
+				],
+				num: [{ required: true, message: '使用数量不能为空', trigger: 'blur' }],
+			},
+		};
+	},
+	mounted() {
+		this.getDictData();
+	},
+	methods: {
+		async getDictData() {
+			const materRes = await getMaterialTree();
+      let typeId = materRes.data[0].product?materRes.data[1].id:materRes.data[0].id
+      const listQuery= {
+        typeId:typeId
+      }
+			const materData = await getMaterialList(listQuery);
+			this.materialList = [];
+			this.materialList = materData.data;
+			const dateRes = await getMaterDateList();
+			this.materialDateList = dateRes.data;
+			const eqRes = await getEqListAll();
+			this.eqList = eqRes.data;
+			const workerRes = await listSimpleUsers();
+			this.workersList = workerRes.data;
+		},
+		// 表单提交
+		dataFormSubmit() {
+			this.dataForm.userName = this.dataForm.userNames.join(',');
+			this.$refs['dataForm'].validate((valid) => {
+				if (!valid) {
+					return false;
+				}
+				// 修改的提交
+				if (this.dataForm.id) {
+					this.urlOptions.updateURL(this.dataForm).then((response) => {
+						this.$modal.msgSuccess('修改成功');
+						this.visible = false;
+						this.$emit('refreshDataList');
+					});
+					return;
+				}
+				// 添加的提交
+				this.urlOptions.createURL(this.dataForm).then((response) => {
+					this.$modal.msgSuccess('新增成功');
+					this.visible = false;
+					this.$emit('refreshDataList');
+				});
+			});
+		},
+		init(id) {
+			this.dataForm.id = id || undefined;
+			this.visible = true;
+
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields();
+				if (this.dataForm.id) {
+					this.urlOptions.infoURL(id).then((response) => {
+						this.dataForm.id = response.data.id;
+						this.dataForm.materialCode = response.data.materialCode;
+						this.dataForm.materialId = response.data.materialId;
+						this.dataForm.materialDateId = response.data.materialDateId;
+						this.dataForm.equipmentId = response.data.equipmentId;
+						this.dataForm.useTime = response.data.useTime;
+						// this.dataForm.userName = response.data.userName
+						this.dataForm.num = response.data.num;
+						this.dataForm.source = response.data.source;
+						this.dataForm.remark = response.data.remark;
+						this.dataForm.userNames = response.data.userName.split(',');
+					});
+				} else {
+				}
+			});
+		},
+		setCode() {
+			const tempMaterial = this.materialList.filter((item) => {
+				return item.id === this.dataForm.materialId;
+			});
+			this.dataForm.materialCode = tempMaterial[0].code;
+			getMaterDateList({ materialId: this.dataForm.materialId }).then((res) => {
+				this.materialDateList = res.data;
+			});
+		},
+	},
+};
+</script>

src/views/material/materialUseLog/index.vue

@@ -0,0 +1,250 @@
+<template>
+	<div class="app-container">
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
+		<base-table
+			v-loading="dataListLoading"
+			:table-props="tableProps"
+			:page="listQuery.pageNo"
+			:limit="listQuery.pageSize"
+			:max-height="tableH"
+			:table-data="tableData">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				:width="120"
+				label="操作"
+				:method-list="tableBtn"
+				@clickBtn="handleClick" />
+		</base-table>
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getDataList" />
+		<base-dialog
+			:dialogTitle="addOrEditTitle"
+			:dialogVisible="addOrUpdateVisible"
+			@cancel="handleCancel"
+			@confirm="handleConfirm"
+			:before-close="handleCancel"
+			width="60%">
+			<add-or-update
+				ref="addOrUpdate"
+				@refreshDataList="successSubmit"></add-or-update>
+		</base-dialog>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './add-or-updata';
+import basicPage from '../mixins/basic-page';
+import { parseTime } from '../mixins/code-filter';
+import {
+	getMaterialLogPage,
+	deleteMaterialLog
+} from '@/api/base/materialUseLog';
+import tableHeightMixin from '@/mixins/tableHeightMixin';
+
+const tableProps = [
+	{
+		prop: 'materialName',
+		label: '物料名称'
+	},
+	{
+		prop: 'materialCode',
+		label: '物料编码',
+		width: 160,
+	},
+	{
+		prop: 'materialDateName',
+		label: '物料批次'
+	},
+	{
+		prop: 'equipName',
+		label: '使用设备'
+	},
+	{
+		prop: 'num',
+		label: '使用数量'
+	},
+	{
+		prop: 'useTime',
+		label: '使用时间',
+		filter: parseTime,
+		width: 160,
+	},
+	{
+		prop: 'userName',
+		label: '操作人',
+		showOverflowtooltip: true,
+	},
+	{
+		prop: 'source',
+		label: '数据来源',
+		filter: (val) => ['未知', '手动', '自动'][val],
+		width: 80,
+	},
+	{
+		prop: 'remark',
+		label: '备注'
+	}
+];
+
+export default {
+	mixins: [basicPage, tableHeightMixin],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getMaterialLogPage,
+				deleteURL: deleteMaterialLog,
+				// exportURL: exportFactoryExcel,
+			},
+			tableProps,
+			tableBtn: [
+				this.$auth.hasPermi(`base:material-use-log:update`)
+					? {
+							type: 'edit',
+							btnName: '编辑',
+					  }
+					: undefined,
+          this.$auth.hasPermi(`base:material-use-log:delete`)
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v)=>v),
+			tableData: [],
+			listQuery: {
+        pageSize: 20,
+        pageNo: 1,
+        total: 1,
+				materialName: undefined,
+				useTime: []
+      },
+			formConfig: [
+				{
+					type: 'input',
+					label: '物料名称',
+					placeholder: '物料名称',
+					param: 'name',
+				},
+				{
+          type: 'datePicker',
+          label: '使用时间段',
+          dateType: 'datetimerange',
+          format: 'yyyy-MM-dd HH:mm:ss',
+          valueFormat: 'yyyy-MM-dd HH:mm:ss',
+          rangeSeparator: '-',
+          startPlaceholder: '开始时间',
+          endPlaceholder: '结束时间',
+          width: 350,
+          param: 'time',
+        },
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary'
+				},
+				{
+					type: 'separate',
+				},
+				{
+					type: this.$auth.hasPermi('base:material-use-log:create') ? 'button' : '',
+					btnName: '新增',
+					name: 'add',
+					color: 'success',
+					plain: true
+				},
+			],
+		};
+	},
+	components: {
+		AddOrUpdate,
+	},
+	created() {},
+	methods: {
+		// 获取数据列表
+    getDataList() {
+      this.dataListLoading = true;
+      this.urlOptions.getDataListURL(this.listQuery).then(response => {
+        this.tableData = response.data.records;
+        this.listQuery.total = response.data.total;
+        this.dataListLoading = false;
+      });
+    },
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 20;
+					this.listQuery.materialName = val.name ? val.name : undefined;
+					if (val.time) {
+						this.listQuery.useTime[0] = val.time[0]
+						this.listQuery.useTime[1] = val.time[1]
+					} else {
+						this.listQuery.useTime = []
+					}
+					this.getDataList();
+					break;
+				case 'reset':
+					this.$refs.searchBarForm.resetForm();
+					this.listQuery = {
+						pageSize: 20,
+						pageNo: 1,
+						total: 1,
+					};
+					this.getDataList();
+					break;
+				case 'add':
+					this.addOrEditTitle = '新增';
+					this.addOrUpdateVisible = true;
+					this.addOrUpdateHandle();
+					break;
+				case 'export':
+					this.handleExport();
+					break;
+				default:
+					console.log(val);
+			}
+		},
+		//tableBtn点击
+    handleClick(val) {
+      if (val.type === "edit") {
+        this.addOrUpdateVisible = true;
+        this.addOrEditTitle = "编辑";
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init(val.data.id);
+        });
+      } else if (val.type === "delete") {
+        this.deleteHandle(val.data.id, val.data.materialName)
+      } else if (val.type === "change") {
+        this.changeStatus(val.data.id)
+      } else {
+        this.otherMethods(val)
+      }
+    },
+		// 删除
+    deleteHandle(id, name) {
+			this.$modal
+				.delConfirm(name ? '名称: ' + name : '序号： ' + index).then(() => {
+          this.urlOptions.deleteURL(id).then(({ data }) => {
+            this.$message({
+              message: "操作成功",
+              type: "success",
+              duration: 1500,
+              onClose: () => {
+                this.getDataList();
+              },
+            });
+          });
+        })
+        .catch(() => { });
+    }
+	},
+};
+</script>

src/views/material/mixins/basic-add.js

@@ -0,0 +1,100 @@
+/*
+ * @Author: zwq
+ * @Date: 2022-08-24 11:19:43
+ * @LastEditors: zwq
+ * @LastEditTime: 2023-08-03 14:21:04
+ * @Description:
+ */
+export default {
+  data() {
+    /* eslint-disable */
+    return {
+      urlOptions: {
+        createURL: '',
+        updateURL: '',
+        infoURL: '',
+        codeURL: '',
+        getOption: false,
+        isGetCode: false,
+        optionArrUrl: [],
+        optionArr: {}
+      },
+      visible: false,
+      setData: false
+    }
+  },
+  created() {
+  },
+  activated() {
+  },
+  methods: {
+    init(id) {
+      this.dataForm.id = id || "";
+      this.visible = true;
+      if (this.urlOptions.getOption) {
+        this.getArr()
+      }
+      this.$nextTick(() => {
+        this.$refs["dataForm"].resetFields();
+        if (this.dataForm.id) {
+          this.urlOptions.infoURL(id).then(response => {
+            this.dataForm = response.data;
+            if (this.setData) {
+              this.setDataForm()
+            }
+          });
+        } else {
+          if (this.urlOptions.isGetCode) {
+            this.getCode()
+          }
+				}
+      });
+    },
+		getCode() {
+			this.urlOptions.codeURL()
+				.then(({ data: res }) => {
+					this.dataForm.code = res;
+				})
+				.catch(() => {});
+		},
+    getArr() {
+      const params = {
+        pageSize: 100,
+        pageNo: 1,
+      }
+      this.urlOptions.optionArrUrl.forEach((item, index) => {
+        item(params).then(({ data: res }) => {
+          this.$set(this.urlOptions.optionArr, `arr${index}`, res.list)
+        })
+          .catch(() => {
+          });
+      });
+    },
+    // 表单提交
+    dataFormSubmit() {
+      this.$refs["dataForm"].validate((valid) => {
+        if (!valid) {
+          return false;
+        }
+        // 修改的提交
+        if (this.dataForm.id) {
+          this.urlOptions.updateURL(this.dataForm).then(response => {
+            this.$modal.msgSuccess("修改成功");
+            this.visible = false;
+            this.$emit("refreshDataList");
+          });
+          return;
+        }
+        // 添加的提交
+        this.urlOptions.createURL(this.dataForm).then(response => {
+          this.$modal.msgSuccess("新增成功");
+          this.visible = false;
+          this.$emit("refreshDataList");
+        });
+      });
+    },
+    formClear() {
+      this.$refs.dataForm.resetFields()
+    }
+  }
+}

src/views/material/mixins/basic-page.js

@@ -0,0 +1,165 @@
+/*
+ * @Author: zwq
+ * @Date: 2022-08-24 11:19:43
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-08-05 16:35:15
+ * @Description:
+ */
+export default {
+  data() {
+    /* eslint-disable */
+    return {
+      urlOptions: {
+        getDataListURL: '',
+        deleteURL: '',
+        statusUrl: '',
+        exportURL: ''
+      },
+      tableData: [],
+      listQuery: {
+        pageSize: 20,
+        pageNo: 1,
+        total: 1,
+      },
+      exportLoading: false,
+      dataListLoading: false,
+      addOrEditTitle: '',
+      addOrUpdateVisible: false,
+    }
+  },
+  created() {
+  },
+  mounted() {
+    this.getDataList()
+  },
+  methods: {
+    // 获取数据列表
+    getDataList() {
+      this.dataListLoading = true;
+      this.urlOptions.getDataListURL(this.listQuery).then(response => {
+        this.tableData = response.data.list;
+        this.listQuery.total = response.data.total;
+        this.dataListLoading = false;
+      });
+    },
+    // 每页数
+    sizeChangeHandle(val) {
+      this.listQuery.pageSize = val;
+      this.listQuery.pageNo = 1;
+      this.getDataList();
+    },
+    // 当前页
+    currentChangeHandle(val) {
+      this.listQuery.pageNo = val;
+      this.getDataList();
+    },
+    // 新增 / 修改
+    addOrUpdateHandle(id) {
+      this.addOrUpdateVisible = true;
+      this.$nextTick(() => {
+        this.$refs.addOrUpdate.init(id);
+      });
+    },
+    cancel(id) {
+      this.$refs["popover-" + id].showPopper = false;
+    },
+    //改变状态
+    changeStatus(id) {
+      this.$http
+        .post(this.urlOptions.statusUrl, { id })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          }
+          this.$refs["popover-" + id].showPopper = false;
+          this.$message({
+            message: this.$t("prompt.success"),
+            type: "success",
+            duration: 500,
+            onClose: () => {
+              this.getDataList();
+            },
+          });
+        })
+        .catch(() => { });
+    },
+    //tableBtn点击
+    handleClick(val) {
+      if (val.type === "edit") {
+        this.addOrUpdateVisible = true;
+        this.addOrEditTitle = "编辑";
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init(val.data.id);
+        });
+      } else if (val.type === "delete") {
+        this.deleteHandle(val.data.id, val.data.name, val.data._pageIndex)
+      } else if (val.type === "change") {
+        this.changeStatus(val.data.id)
+      } else {
+        this.otherMethods(val)
+      }
+    },
+    // 删除
+    deleteHandle(id, name, index) {
+			this.$modal
+				.delConfirm(name ? '名称: ' + name : '序号： ' + index)
+        .then(() => {
+          this.urlOptions.deleteURL(id).then(({ data }) => {
+            this.$message({
+              message: "操作成功",
+              type: "success",
+              duration: 1500,
+              onClose: () => {
+                this.getDataList();
+              },
+            });
+          });
+        })
+        .catch(() => { });
+    },
+    //search-bar点击
+    buttonClick(val) {
+      switch (val.btnName) {
+        case "search":
+          this.listQuery.xm1 = val.xm1;
+          this.listQuery.xm2 = val.xm2;
+          this.listQuery.pageNo = 1;
+          this.getDataList();
+          break;
+        case "add":
+          this.addOrEditTitle = '新增'
+          this.addOrUpdateVisible = true;
+          this.addOrUpdateHandle()
+          break;
+        default:
+          console.log(val)
+      }
+    },
+    handleCancel() {
+      this.$refs.addOrUpdate.formClear()
+      this.addOrUpdateVisible = false
+      this.addOrEditTitle = ''
+    },
+    handleConfirm() {
+      this.$refs.addOrUpdate.dataFormSubmit()
+    },
+    successSubmit() {
+      this.handleCancel()
+      this.getDataList()
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      // 处理查询参数
+      let params = { ...this.queryParams };
+      params.pageNo = undefined;
+      params.pageSize = undefined;
+      this.$modal.confirm('是否确认导出所有数据项?').then(() => {
+        this.exportLoading = true;
+        return this.urlOptions.exportURL(params);
+      }).then(response => {
+        this.$download.excel(response, '工厂.xls');
+        this.exportLoading = false;
+      }).catch(() => { });
+    }
+  }
+}

src/views/material/mixins/code-filter.js

@@ -0,0 +1,85 @@
+
+/*
+ * @Date: 2020-12-29 16:49:28
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-07-08 16:27:39
+ * @FilePath: \basic-admin\src\filters\basicData\index.js
+ * @Description:
+ */
+
+const table = {
+  lineStatus: {
+    1: '生产中',
+    2: '停止',
+    3: '未知',
+  },
+  reportType: {
+    1: '日',
+    2: '周',
+    3: '月'
+  }
+}
+
+// 日期格式化
+export function parseTime(time, pattern) {
+  if (arguments.length === 0 || !time) {
+    return null
+  }
+  const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}'
+  let date
+  if (typeof time === 'object') {
+    date = time
+  } else {
+    if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
+      time = parseInt(time)
+    } else if (typeof time === 'string') {
+      time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.\d{3}/gm), '');
+    }
+    if ((typeof time === 'number') && (time.toString().length === 10)) {
+      time = time * 1000
+    }
+    date = new Date(time)
+  }
+  const formatObj = {
+    y: date.getFullYear(),
+    m: date.getMonth() + 1,
+    d: date.getDate(),
+    h: date.getHours(),
+    i: date.getMinutes(),
+    s: date.getSeconds(),
+    a: date.getDay()
+  }
+  const time_str = format.replace(/{([ymdhisa])+}/g, (result, key) => {
+    let value = formatObj[key]
+    // Note: getDay() returns 0 on Sunday
+    if (key === 'a') {
+      return ['日', '一', '二', '三', '四', '五', '六'][value]
+    }
+    if (result.length > 0 && value < 10) {
+      value = '0' + value
+    }
+    return value || 0
+  })
+  return time_str
+}
+// 遍历树结构返回数组
+export function getTreeArr(arr) {
+  let result =[]
+  arr.forEach(item => {
+    if(item.children && item.children.length>0){
+      let {children,...obj} = item
+      result.push(obj)
+      result = result.concat(getTreeArr(children))
+    }else{
+      let {children,...obj} = item
+      result.push(obj)
+    }
+  });
+  return result
+}
+
+export default function (dictTable) {
+  return function (val) {
+    return table?.[dictTable]?.[val]
+  }
+}

src/views/warehouse/mixins/basic-page.js

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2022-08-24 11:19:43
  * @LastEditors: zwq
- * @LastEditTime: 2023-11-21 10:37:05
+ * @LastEditTime: 2024-08-09 15:51:09
  * @Description:
  */
 export default {
@@ -17,7 +17,7 @@ export default {
       },
       tableData: [],
       listQuery: {
-        pageSize: 10,
+        pageSize: 20,
         pageNo: 1,
         total: 1,
       },
@@ -41,6 +41,8 @@ export default {
         if(response.hasOwnProperty('data')){
           this.tableData = response.data.list;
           this.listQuery.total = response.data.total;
+        }else{
+          this.tableData = []
         }
         this.dataListLoading = false;
       });
@@ -104,11 +106,8 @@ export default {
     },
     // 删除
     deleteHandle(id, name, index) {
-      this.$confirm(`是否确认删除${name ? '名称为"' + name + '"' : '序号为"' + index + '"'}的数据项?`, "系统提示", {
+			this.$modal
-        confirmButtonText: "确定",
+				.delConfirm(name ? '名称: ' + name : '序号： ' + index)
-        cancelButtonText: "取消",
-        type: "warning",
-      })
         .then(() => {
           this.urlOptions.deleteURL(id).then(({ data }) => {
             this.$message({

src/views/warehouse/mixins/code-filter.js

@@ -2,7 +2,7 @@
 /*
  * @Date: 2020-12-29 16:49:28
  * @LastEditors: zwq
- * @LastEditTime: 2023-10-24 16:30:25
+ * @LastEditTime: 2024-08-07 15:57:27
  * @FilePath: \basic-admin\src\filters\basicData\index.js
  * @Description:
  */
@@ -17,11 +17,6 @@ const table = {
     1: '启用',
     0: '停用',
   },
-  wareType: {
-    1: '缓存',
-    2: '活动',
-    3: '其它',
-  },
 }
 
 // 日期格式化

src/views/warehouse/warehouse-base/index.vue

@@ -0,0 +1,73 @@
+<!--
+ * @Author: zwq
+ * @Date: 2024-07-01 14:54:06
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-07-30 14:49:14
+ * @Description:
+-->
+<template>
+	<div class="warehouse-base">
+		<div class="operationArea">
+			<el-tabs v-model="pane" @tab-click="setPane" stretch>
+				<el-tab-pane label="仓库设置" name="warehouseSetup">
+					<warehouseSetup
+						ref="warehouseSetup"
+						v-if="pane === 'warehouseSetup'"></warehouseSetup>
+				</el-tab-pane>
+				<el-tab-pane label="库区设置" name="areaSetup">
+					<areaSetup
+						ref="areaSetup"
+						v-if="pane === 'areaSetup'"></areaSetup>
+				</el-tab-pane>
+				<el-tab-pane label="库位设置" name="locationSetup">
+					<locationSetup
+						ref="locationSetup"
+						v-if="pane === 'locationSetup'"></locationSetup>
+				</el-tab-pane>
+			</el-tabs>
+		</div>
+	</div>
+</template>
+
+<script>
+import areaSetup from './warehouse-area-setup';
+import locationSetup from './warehouse-location-setup';
+import warehouseSetup from './warehouse-setup';
+export default {
+	name: 'warehouseBase',
+	components: {
+		warehouseSetup,
+		areaSetup,
+		locationSetup,
+	},
+	data() {
+		return {
+			pane: 'warehouseSetup',
+		};
+	},
+	created() {
+		this.$nextTick(() => {
+			this.$refs.warehouseSetup.getDataList();
+		});
+	},
+	methods: {
+		setPane() {
+			this.$nextTick(() => {
+				this.$refs[this.pane].getDataList();
+			});
+		},
+	},
+};
+</script>
+<style lang="scss">
+.warehouse-base {
+	background-color: #f2f4f9;
+	.operationArea {
+		background-color: #fff;
+		border-radius: 8px;
+	}
+	.el-tabs__header {
+		padding: 14px 50% 0 10px;
+	}
+}
+</style>

src/views/warehouse/warehouse-base/warehouse-area-setup/add-or-updata.vue

@@ -0,0 +1,124 @@
+<!--
+ * @Author: zwq
+ * @Date: 2023-08-01 13:52:10
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-07-30 15:06:35
+ * @Description:
+-->
+<template>
+	<el-form
+		:model="dataForm"
+		:rules="dataRule"
+		ref="dataForm"
+		v-if="visible"
+		@keyup.enter.native="dataFormSubmit()"
+		label-width="100px"
+    label-position="top">
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="仓库名称" prop="warehouseId">
+					<el-select
+						v-model="dataForm.warehouseId"
+						filterable
+						clearable
+						:style="{ width: '100%' }"
+						placeholder="请选择仓库名称">
+						<el-option
+							v-for="item in warehouseArr"
+							:key="item.id"
+							:label="item.name"
+							:value="item.id"></el-option>
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="库区名称" prop="name">
+					<el-input
+						v-model="dataForm.name"
+						clearable
+						placeholder="请输入库区名称" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="库区类型" prop="areaType">
+					<el-input
+						v-model="dataForm.areaType"
+						clearable
+						placeholder="请输入库区类型" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item prop="enabled" label="是否启用">
+					<el-select
+						v-model="dataForm.enabled"
+						filterable
+						:style="{ width: '100%' }"
+						placeholder="请选择是否启用">
+						<el-option
+							v-for="item in isorno"
+							:key="item.id"
+							:label="item.name"
+							:value="item.id"></el-option>
+					</el-select>
+				</el-form-item>
+			</el-col>
+		</el-row>
+	</el-form>
+</template>
+
+<script>
+import basicAdd from '../../mixins/basic-add';
+import {
+	createWarehouseArea,
+	updateWarehouseArea,
+	getWarehouseArea,
+} from "@/api/warehouse/warehouse-area-setup";
+import {
+  getWarehouseList
+} from "@/api/warehouse/warehouse-setup";
+
+export default {
+	mixins: [basicAdd],
+	data() {
+		return {
+			urlOptions: {
+				createURL: createWarehouseArea,
+				updateURL: updateWarehouseArea,
+				infoURL: getWarehouseArea,
+			},
+			dataForm: {
+				id: undefined,
+				name: '',
+        warehouseId: '',
+				enabled: 1,
+        areaType: ''
+			},
+			dataRule: {
+				warehouseId: [
+					{ required: true, message: '仓库名称不能为空', trigger: 'change' },
+				],
+				name: [
+					{ required: true, message: '库区名称不能为空', trigger: 'blur' },
+				],
+			},
+      warehouseArr: [],
+			isorno: [
+				{
+					id: 0,
+					name: '停用',
+				},
+				{
+					id: 1,
+					name: '启用',
+				},
+			],
+		};
+	},
+  created() {
+		getWarehouseList().then((response) => {
+			this.warehouseArr = response.data;
+		});
+  },
+	methods: {},
+};
+</script>

src/views/warehouse/warehouse-base/warehouse-area-setup/index.vue

@@ -0,0 +1,185 @@
+<template>
+	<div class="app-container">
+
+<!-- 搜索工作栏 -->
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
+
+    <!-- 列表 -->
+		<base-table
+      v-loading="dataListLoading"
+			:table-props="tableProps"
+			:page="listQuery.pageNo"
+			:limit="listQuery.pageSize"
+			:max-height="tableH"
+			:table-data="tableData">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				:width="80"
+				label="操作"
+				:method-list="tableBtn"
+				@clickBtn="handleClick" />
+		</base-table>
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getDataList" />
+
+		<!-- 对话框(添加 / 修改) -->
+		<base-dialog
+			:dialogTitle="addOrEditTitle"
+			:dialogVisible="addOrUpdateVisible"
+			@cancel="handleCancel"
+			@confirm="handleConfirm"
+			:before-close="handleCancel"
+			width="40%">
+			<add-or-update
+				ref="addOrUpdate"
+				@refreshDataList="successSubmit"></add-or-update>
+		</base-dialog>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './add-or-updata';
+import basicPage from '../../mixins/basic-page';
+import codeFilter from '../../mixins/code-filter';
+import {
+  deleteWarehouseArea,
+  getWarehouseAreaPage,
+  getWarehouseAreaList
+} from "@/api/warehouse/warehouse-area-setup";
+import {
+  getWarehouseList
+} from "@/api/warehouse/warehouse-setup";
+import tableHeightMixin from '@/mixins/tableHeightMixin';
+
+const tableProps = [
+	{
+		prop: 'warehouseName',
+		label: '仓库名称',
+	},
+	{
+		prop: 'name',
+		label: '库区名称',
+	},
+	{
+		prop: 'areaType',
+		label: '库区类型',
+	},
+	{
+		prop: 'enabled',
+		label: '是否启用',
+		filter: codeFilter('deactivate'),
+	},
+];
+
+export default {
+	mixins: [basicPage,tableHeightMixin],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getWarehouseAreaPage,
+				deleteURL: deleteWarehouseArea,
+			},
+			tableProps,
+			tableBtn: [
+				this.$auth.hasPermi(`warehouse:warehouse-area-setup:update`)
+					? {
+							type: 'edit',
+							btnName: '编辑',
+					  }
+					: undefined,
+          this.$auth.hasPermi(`warehouse:warehouse-area-setup:delete`)
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v)=>v),
+			tableData: [],
+			formConfig: [
+				{
+					type: 'select',
+					label: '仓库',
+					selectOptions: [],
+					param: 'warehouseId',
+					defaultSelect: '',
+					filterable: true,
+				},
+				{
+					type: 'select',
+					label: '库区',
+					selectOptions: [],
+					param: 'areaId',
+					defaultSelect: '',
+					filterable: true,
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					type: this.$auth.hasPermi('warehouse:warehouse-area-setup:create') ? 'button' : '',
+					btnName: '新增',
+					name: 'add',
+					color: 'success',
+					plain: true,
+				},
+			],
+		};
+	},
+	components: {
+		AddOrUpdate,
+	},
+	created() {
+		getWarehouseList().then((response) => {
+			this.formConfig[0].selectOptions = response.data;
+		});
+		getWarehouseAreaList().then((response) => {
+			this.formConfig[1].selectOptions = response.data;
+		});
+  },
+	methods: {
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 20;
+					this.listQuery.warehouseId = val.warehouseId;
+					this.listQuery.areaId = val.areaId;
+					this.getDataList();
+					break;
+				case 'reset':
+					this.$refs.searchBarForm.resetForm();
+					this.listQuery = {
+						pageSize: 20,
+						pageNo: 1,
+						total: 1,
+					};
+					this.getDataList();
+					break;
+				case 'add':
+					this.addOrEditTitle = '新增';
+					this.addOrUpdateVisible = true;
+					this.addOrUpdateHandle();
+					break;
+				case 'export':
+					this.handleExport();
+					break;
+				default:
+					console.log(val);
+			}
+		},
+	},
+};
+</script>

src/views/warehouse/warehouse-base/warehouse-location-setup/add-or-updata.vue

@@ -0,0 +1,223 @@
+<!--
+ * @Author: zwq
+ * @Date: 2023-08-01 13:52:10
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-08-07 15:53:15
+ * @Description:
+-->
+<template>
+	<el-form
+		:model="dataForm"
+		:rules="dataRule"
+		ref="dataForm"
+		v-if="visible"
+		@keyup.enter.native="dataFormSubmit()"
+		label-width="100px"
+		label-position="top">
+		<el-row :gutter="20">
+			<el-col :span="8">
+				<el-form-item label="仓库名称" prop="warehouseId">
+					<el-select
+						v-model="dataForm.warehouseId"
+						filterable
+						clearable
+						:style="{ width: '100%' }"
+						placeholder="请选择仓库名称">
+						<el-option
+							v-for="item in warehouseArr"
+							:key="item.id"
+							:label="item.name"
+							:value="item.id"></el-option>
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<el-col :span="8">
+				<el-form-item label="库区名称" prop="areaId">
+					<el-select
+						v-model="dataForm.areaId"
+						filterable
+						clearable
+						:style="{ width: '100%' }"
+						@change="setAreaType"
+						placeholder="请选择库区名称">
+						<el-option
+							v-for="item in areaArr"
+							:key="item.id"
+							:label="item.name"
+							:value="item.id"></el-option>
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<el-col :span="8">
+				<el-form-item label="库区类型" prop="areaType">
+					<el-input
+						v-model="dataForm.areaType"
+						disabled
+						placeholder="库区类型" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="8">
+				<el-form-item label="库位名称" prop="name">
+					<el-input
+						v-model="dataForm.name"
+						clearable
+						placeholder="请输入库位名称" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="8">
+				<el-form-item label="库位编码" prop="code">
+					<el-input
+						v-model="dataForm.code"
+						clearable
+						placeholder="请输入库位编码" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="8">
+				<el-form-item prop="type" label="库位类型">
+					<el-select
+						v-model="dataForm.type"
+						filterable
+						:style="{ width: '100%' }"
+						placeholder="请选择库位类型">
+						<el-option
+							v-for="item in urlOptions.dictList.dict0"
+							:key="item.id"
+							:label="item.label"
+							:value="parseInt(item.value)"></el-option>
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<el-col :span="8">
+				<el-form-item label="排" prop="arrange">
+					<el-input
+						v-model="dataForm.arrange"
+						clearable
+						placeholder="请输入排" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="8">
+				<el-form-item label="列" prop="col">
+					<el-input v-model="dataForm.col" clearable placeholder="请输入列" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="8">
+				<el-form-item label="层" prop="layer">
+					<el-input v-model="dataForm.layer" clearable placeholder="请输入层" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="8">
+				<el-form-item prop="enabled" label="是否启用">
+					<el-select
+						v-model="dataForm.enabled"
+						filterable
+						:style="{ width: '100%' }"
+						placeholder="请选择是否启用">
+						<el-option
+							v-for="item in isorno"
+							:key="item.id"
+							:label="item.name"
+							:value="item.id"></el-option>
+					</el-select>
+				</el-form-item>
+			</el-col>
+		</el-row>
+	</el-form>
+</template>
+
+<script>
+import basicAdd from '../../mixins/basic-add';
+import {
+	createWarehouseLocation,
+	updateWarehouseLocation,
+	getWarehouseLocation,
+	getCode,
+} from '@/api/warehouse/warehouse-location-setup';
+import { getWarehouseList } from '@/api/warehouse/warehouse-setup';
+import { getWarehouseAreaList } from '@/api/warehouse/warehouse-area-setup';
+
+export default {
+	mixins: [basicAdd],
+	data() {
+		return {
+			urlOptions: {
+				isGetCode: true,
+				codeURL: getCode,
+				getDictList: true,
+				createURL: createWarehouseLocation,
+				updateURL: updateWarehouseLocation,
+				infoURL: getWarehouseLocation,
+			},
+			nameList: ['location_type'],
+			dataForm: {
+				id: undefined,
+				name: '',
+				code: '',
+				warehouseId: '',
+				areaId: '',
+				areaType: '',
+				type: '',
+				enabled: 1,
+				arrange: '',
+				col: '',
+				layer: '',
+			},
+			dataRule: {
+				warehouseId: [
+					{ required: true, message: '仓库名称不能为空', trigger: 'change' },
+				],
+				areaId: [
+					{ required: true, message: '库区名称不能为空', trigger: 'change' },
+				],
+				code: [{ required: true, message: '编码不能为空', trigger: 'blur' }],
+				name: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+				arrange: [{ required: true, message: '排不能为空', trigger: 'blur' }],
+				col: [{ required: true, message: '列不能为空', trigger: 'blur' }],
+				layer: [{ required: true, message: '层不能为空', trigger: 'blur' }],
+			},
+			warehouseArr: [],
+			areaArr: [],
+			isorno: [
+				{
+					id: 0,
+					name: '停用',
+				},
+				{
+					id: 1,
+					name: '启用',
+				},
+			],
+			typeArr: [
+				{
+					id: 1,
+					name: '缓存',
+				},
+				{
+					id: 2,
+					name: '活动',
+				},
+				{
+					id: 3,
+					name: '其它',
+				},
+			],
+		};
+	},
+	created() {
+		getWarehouseList().then((response) => {
+			this.warehouseArr = response.data;
+		});
+		getWarehouseAreaList().then((response) => {
+			this.areaArr = response.data;
+		});
+	},
+	methods: {
+		setAreaType() {
+			if (this.dataForm.areaId) {
+				this.dataForm.areaType = this.areaArr.find(
+					(item) => item.id === this.dataForm.areaId
+				).areaType;
+			}
+		},
+	},
+};
+</script>

src/views/warehouse/warehouse-base/warehouse-location-setup/index.vue

@@ -0,0 +1,213 @@
+<template>
+	<div class="app-container">
+
+<!-- 搜索工作栏 -->
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
+
+    <!-- 列表 -->
+		<base-table
+      v-loading="dataListLoading"
+			:table-props="tableProps"
+			:page="listQuery.pageNo"
+			:limit="listQuery.pageSize"
+			:max-height="tableH"
+			:table-data="tableData">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				:width="80"
+				label="操作"
+				:method-list="tableBtn"
+				@clickBtn="handleClick" />
+		</base-table>
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getDataList" />
+
+		<!-- 对话框(添加 / 修改) -->
+		<base-dialog
+			:dialogTitle="addOrEditTitle"
+			:dialogVisible="addOrUpdateVisible"
+			@cancel="handleCancel"
+			@confirm="handleConfirm"
+			:before-close="handleCancel"
+			width="40%">
+			<add-or-update
+				ref="addOrUpdate"
+				@refreshDataList="successSubmit"></add-or-update>
+		</base-dialog>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './add-or-updata';
+import basicPage from '../../mixins/basic-page';
+import codeFilter from '../../mixins/code-filter';
+import {
+  deleteWarehouseLocation,
+  getWarehouseLocationPage,
+} from "@/api/warehouse/warehouse-location-setup";
+import {
+  getWarehouseAreaList
+} from "@/api/warehouse/warehouse-area-setup";
+import {
+  getWarehouseList
+} from "@/api/warehouse/warehouse-setup";
+import tableHeightMixin from '@/mixins/tableHeightMixin';
+import { publicFormatter } from '@/utils/dict';
+
+const tableProps = [
+	{
+		prop: 'warehouseName',
+		label: '仓库名称',
+	},
+	{
+		prop: 'areaName',
+		label: '库区名称',
+	},
+	{
+		prop: 'areaType',
+		label: '库区类型',
+	},
+	{
+		prop: 'name',
+		label: '库位名称',
+	},
+	{
+		prop: 'code',
+		label: '库位编码',
+	},
+	{
+		prop: 'type',
+		label: '库位类型',
+    filter: publicFormatter('location_type')
+	},
+	{
+		prop: 'arrange',
+		label: '排',
+	},
+	{
+		prop: 'col',
+		label: '列',
+	},
+	{
+		prop: 'layer',
+		label: '层',
+	},
+	{
+		prop: 'enabled',
+		label: '是否启用',
+		filter: codeFilter('deactivate'),
+	},
+];
+
+export default {
+	mixins: [basicPage,tableHeightMixin],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getWarehouseLocationPage,
+				deleteURL: deleteWarehouseLocation,
+			},
+			tableProps,
+			tableBtn: [
+				this.$auth.hasPermi(`warehouse:warehouse-location-setup:update`)
+					? {
+							type: 'edit',
+							btnName: '编辑',
+					  }
+					: undefined,
+          this.$auth.hasPermi(`warehouse:warehouse-location-setup:delete`)
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v)=>v),
+			tableData: [],
+			formConfig: [
+				{
+					type: 'select',
+					label: '仓库',
+					selectOptions: [],
+					param: 'warehouseId',
+					defaultSelect: '',
+					filterable: true,
+				},
+				{
+					type: 'select',
+					label: '库区',
+					selectOptions: [],
+					param: 'areaId',
+					defaultSelect: '',
+					filterable: true,
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					type: this.$auth.hasPermi('warehouse:warehouse-location-setup:create') ? 'button' : '',
+					btnName: '新增',
+					name: 'add',
+					color: 'success',
+					plain: true,
+				},
+			],
+		};
+	},
+	components: {
+		AddOrUpdate,
+	},
+	created() {
+		getWarehouseList().then((response) => {
+			this.formConfig[0].selectOptions = response.data;
+		});
+		getWarehouseAreaList().then((response) => {
+			this.formConfig[1].selectOptions = response.data;
+		});
+  },
+	methods: {
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 20;
+					this.listQuery.warehouseId = val.warehouseId;
+					this.listQuery.areaId = val.areaId;
+					this.getDataList();
+					break;
+				case 'reset':
+					this.$refs.searchBarForm.resetForm();
+					this.listQuery = {
+						pageSize: 10,
+						pageNo: 1,
+						total: 1,
+					};
+					this.getDataList();
+					break;
+				case 'add':
+					this.addOrEditTitle = '新增';
+					this.addOrUpdateVisible = true;
+					this.addOrUpdateHandle();
+					break;
+				case 'export':
+					this.handleExport();
+					break;
+				default:
+					console.log(val);
+			}
+		},
+	},
+};
+</script>

src/views/warehouse/warehouse-base/warehouse-setup/add-or-updata.vue

@@ -0,0 +1,126 @@
+<!--
+ * @Author: zwq
+ * @Date: 2023-08-01 13:52:10
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-08-07 16:39:08
+ * @Description:
+-->
+<template>
+	<el-form
+		:model="dataForm"
+		:rules="dataRule"
+		ref="dataForm"
+		v-if="visible"
+		@keyup.enter.native="dataFormSubmit()"
+		label-width="100px"
+    label-position="top">
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="仓库名称" prop="name">
+					<el-input
+						v-model="dataForm.name"
+						clearable
+						placeholder="请输入仓库名称" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="仓库编码" prop="code">
+					<el-input
+						v-model="dataForm.code"
+						clearable
+						placeholder="请输入仓库编码" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item prop="enabled" label="是否启用">
+					<el-select
+						v-model="dataForm.enabled"
+						filterable
+						:style="{ width: '100%' }"
+						placeholder="请选择是否启用">
+						<el-option
+							v-for="item in isorno"
+							:key="item.id"
+							:label="item.name"
+							:value="item.id"></el-option>
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item prop="type" label="仓库类型">
+					<el-select
+						v-model="dataForm.type"
+						filterable
+						:style="{ width: '100%' }"
+						placeholder="请选择仓库类型">
+						<el-option
+							v-for="item in urlOptions.dictList.dict0"
+							:key="item.id"
+							:label="item.label"
+							:value="parseInt(item.value)"></el-option>
+					</el-select>
+				</el-form-item>
+			</el-col>
+		</el-row>
+	</el-form>
+</template>
+
+<script>
+import basicAdd from '../../mixins/basic-add';
+import {
+	createWarehouse,
+	updateWarehouse,
+	getWarehouse,
+	getCode,
+} from '@/api/warehouse/warehouse-setup';
+import { getUserProfile } from "@/api/system/user";
+
+export default {
+	mixins: [basicAdd],
+	data() {
+		return {
+			urlOptions: {
+				isGetCode: true,
+				codeURL: getCode,
+				getDictList: true,
+				createURL: createWarehouse,
+				updateURL: updateWarehouse,
+				infoURL: getWarehouse,
+			},
+			nameList: ['warehouse_type'],
+			dataForm: {
+				id: undefined,
+				name: '',
+        code: '',
+				enabled: 1,
+        type: 2,
+        creator: ''
+			},
+			dataRule: {
+				code: [
+					{ required: true, message: '仓库编码不能为空', trigger: 'blur' },
+				],
+				name: [
+					{ required: true, message: '仓库名称不能为空', trigger: 'blur' },
+				],
+			},
+			isorno: [
+				{
+					id: 0,
+					name: '停用',
+				},
+				{
+					id: 1,
+					name: '启用',
+				},
+			],
+		};
+	},
+  created() {
+      getUserProfile().then(response => {
+        this.dataForm.creator = response.data.username;
+      });
+  },
+	methods: {},
+};
+</script>

src/views/warehouse/warehouse-base/warehouse-setup/index.vue

@@ -0,0 +1,172 @@
+<template>
+	<div class="app-container">
+
+<!-- 搜索工作栏 -->
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
+
+    <!-- 列表 -->
+		<base-table
+      v-loading="dataListLoading"
+			:table-props="tableProps"
+			:page="listQuery.pageNo"
+			:limit="listQuery.pageSize"
+			:max-height="tableH"
+			:table-data="tableData">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				:width="80"
+				label="操作"
+				:method-list="tableBtn"
+				@clickBtn="handleClick" />
+		</base-table>
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getDataList" />
+
+		<!-- 对话框(添加 / 修改) -->
+		<base-dialog
+			:dialogTitle="addOrEditTitle"
+			:dialogVisible="addOrUpdateVisible"
+			@cancel="handleCancel"
+			@confirm="handleConfirm"
+			:before-close="handleCancel"
+			width="40%">
+			<add-or-update
+				ref="addOrUpdate"
+				@refreshDataList="successSubmit"></add-or-update>
+		</base-dialog>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './add-or-updata';
+import basicPage from '../../mixins/basic-page';
+import { parseTime } from '../../mixins/code-filter';
+import codeFilter from '../../mixins/code-filter';
+import {
+  deleteWarehouse,
+  getWarehousePage,
+} from "@/api/warehouse/warehouse-setup";
+import tableHeightMixin from '@/mixins/tableHeightMixin';
+import { publicFormatter } from '@/utils/dict';
+
+const tableProps = [
+	{
+		prop: 'name',
+		label: '仓库名称',
+	},
+	{
+		prop: 'creator',
+		label: '创建人',
+	},
+	{
+		prop: 'createTime',
+		label: '创建时间',
+		filter: parseTime,
+		minWidth: 100,
+	},
+	{
+		prop: 'type',
+		label: '仓库类型',
+    filter: publicFormatter('warehouse_type')
+	},
+	{
+		prop: 'enabled',
+		label: '是否启用',
+		filter: codeFilter('deactivate'),
+	},
+];
+
+export default {
+	mixins: [basicPage,tableHeightMixin],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getWarehousePage,
+				deleteURL: deleteWarehouse,
+			},
+			tableProps,
+			tableBtn: [
+				this.$auth.hasPermi(`warehouse:warehouse-setup:update`)
+					? {
+							type: 'edit',
+							btnName: '编辑',
+					  }
+					: undefined,
+          this.$auth.hasPermi(`warehouse:warehouse-setup:delete`)
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v)=>v),
+			tableData: [],
+			formConfig: [
+				{
+					type: 'input',
+					label: '仓库名称',
+					placeholder: '仓库名称',
+					param: 'name',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					type: this.$auth.hasPermi('warehouse:warehouse-setup:create') ? 'button' : '',
+					btnName: '新增',
+					name: 'add',
+					color: 'success',
+					plain: true,
+				},
+			],
+		};
+	},
+	components: {
+		AddOrUpdate,
+	},
+	created() {},
+	methods: {
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 20;
+					this.listQuery.name = val.name;
+					this.getDataList();
+					break;
+				case 'reset':
+					this.$refs.searchBarForm.resetForm();
+					this.listQuery = {
+						pageSize: 20,
+						pageNo: 1,
+						total: 1,
+					};
+					this.getDataList();
+					break;
+				case 'add':
+					this.addOrEditTitle = '新增';
+					this.addOrUpdateVisible = true;
+					this.addOrUpdateHandle();
+					break;
+				case 'export':
+					this.handleExport();
+					break;
+				default:
+					console.log(val);
+			}
+		},
+	},
+};
+</script>

src/views/warehouse/warehouse-info/BarChart.vue

@@ -10,7 +10,6 @@ require('echarts/theme/macarons'); // echarts theme
 import resize from '@/utils/chartMixins/resize';
 
 const animationDuration = 1000;
-
 export default {
 	mixins: [resize],
 	props: {
@@ -38,6 +37,7 @@ export default {
 	data() {
 		return {
 			chart: null,
+			targetId: '',
 		};
 	},
 	beforeDestroy() {
@@ -50,7 +50,7 @@ export default {
 	methods: {
 		initChart() {
 			this.chart = echarts.init(this.$el, 'macarons');
-
+			const _this = this;
 			this.chart.setOption({
 				title: {
 					text: this.title
@@ -81,6 +81,18 @@ export default {
 						// 坐标轴指示器，坐标轴触发有效
 						type: 'shadow', // 默认为直线，可选为：'line' | 'shadow'
 					},
+					formatter: function (params) {
+						_this.targetId = params[0].data.id;
+						let res =
+							'<div>' +
+							params[0].name +
+							'</div><br/>' +
+							params[0].marker +
+							'<div style="float:right">库存数量：' +
+							params[0].value +
+							'</div>';
+						return res;
+					},
 				},
 				grid: {
 					containLabel: true,
@@ -119,12 +131,36 @@ export default {
 						type: 'bar',
 						barWidth: '20',
 						data: this.barData.map((item) => {
-							return item.value;
+							const obj = {
+								value: item.num,
+								id: item.id,
+							};
+							return obj;
 						}),
 						animationDuration,
 					},
 				],
 			});
+			this.chart.getZr().off('click');
+			this.chart.getZr().on('click', function () {
+				if (_this.targetId !== '') {
+					switch (_this.targetId) {
+						case 1:
+							_this.$router.push({
+								path: 'warehouse-manage1/InventoryOverview/' + _this.targetId,
+							});
+							break;
+						case '1818175999715164161':
+							_this.$router.push({
+								path: 'warehouse-manage2/InventoryOverview/' + _this.targetId,
+							});
+							break;
+						default:
+							console.log(_this.targetId);
+							break;
+					}
+				}
+			});
 		},
 	},
 };

src/views/warehouse/warehouse-info/index.vue

@@ -2,21 +2,26 @@
  * @Author: zwq
  * @Date: 2024-07-02 15:56:48
  * @LastEditors: zwq
- * @LastEditTime: 2024-07-02 16:55:43
+ * @LastEditTime: 2024-08-02 14:57:52
  * @Description:
 -->
 <template>
 	<div class="app-container">
 		<div class="flexDiv">
-			<div v-for="i in wareName" :key="i + 'a'" class="divClass up">
+			<div class="divClass up">仓库名称</div>
-				{{ i }}
+			<div
+				v-for="i in wareArr"
+				:key="i.id + 'a'"
+				class="divClass up"
+				:title="i.name">
+				{{ i.name }}
 			</div>
 		</div>
 		<div class="flexDiv">
-			<div v-for="i in stockNum" :key="i + 'b'" class="divClass down">
+			<div class="divClass down">库存数量</div>
-				<span v-if="i === '库存数量'">{{ i }}</span>
+			<div v-for="i in wareArr" :key="i.id + 'a'" class="divClass down">
-				<el-link v-else :underline="false" type="primary" @click="toPage(i)">
+				<el-link :underline="false" type="primary" @click="toPage(i)">
-					{{ i }}
+					{{ i.num }}
 				</el-link>
 			</div>
 		</div>
@@ -25,8 +30,8 @@
 			ref="barChart"
 			height="600px"
 			:title="'库存数量'"
-			v-if="barData.length"
+			v-if="wareArr.length"
-			:bar-data="barData" />
+			:bar-data="wareArr" />
 		<!-- 没有数据 -->
 		<div class="no-data-bg" v-else></div>
 	</div>
@@ -34,37 +39,41 @@
 
 <script>
 import barChart from './BarChart.vue';
+import { getWarehouseAllInfo } from '@/api/warehouse/warehouse-setup';
 export default {
 	data() {
 		return {
-			wareName: ['仓库名称'],
+			wareArr: [],
-			stockNum: ['库存数量'],
-			barData: [],
 		};
 	},
 	components: {
 		barChart,
 	},
 	created() {
-		for (let i = 0; i < 5; i++) {
+		getWarehouseAllInfo().then((response) => {
-			this.wareName.push('仓库' + i);
+			this.wareArr = response.data;
-			this.stockNum.push(i * 100 + i);
-		}
-	},
-	methods: {
-		toPage(i) {
-			console.log(i);
-			for (let i = 1; i < 6; i++) {
-				const obj = {
-					name: this.wareName[i],
-					value: this.stockNum[i],
-				};
-				this.barData.push(obj);
-			}
-			console.log(this.barData);
 			this.$nextTick(() => {
 				this.$refs.barChart.initChart();
 			});
+		});
+	},
+	methods: {
+		toPage(i) {
+			switch (i.id) {
+				case 1:
+					this.$router.push({
+						path: 'warehouse-manage1/InventoryOverview/' + i.id,
+					});
+					break;
+				case '1818175999715164161':
+					this.$router.push({
+						path: 'warehouse-manage2/InventoryOverview/' + i.id,
+					});
+					break;
+				default:
+					console.log(i.id);
+					break;
+			}
 		},
 	},
 };
@@ -82,6 +91,9 @@ export default {
 	border: 1px solid #ededed;
 	font-size: 14px;
 	color: #606266;
+	white-space: nowrap; /* 确保文本不换行 */
+	overflow: hidden; /* 超出部分隐藏 */
+	text-overflow: ellipsis; /* 使用省略号表示超出的文本 */
 }
 .up:nth-child(n) {
 	border-bottom: none;

src/views/warehouse/warehouse-manage/InventoryOverview/index.vue

@@ -0,0 +1,150 @@
+<!--
+ * @Author: zwq
+ * @Date: 2023-08-22 15:01:54
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-08-02 15:00:47
+ * @Description:
+-->
+<template>
+	<el-row :gutter="10" class="chart-container">
+		<el-col :span="wareType === 1 ? 14 : 24">
+			<div class="chart-card">
+				<div class="title">库存总览</div>
+				<div class="sub-title">
+					产品总数量
+					<div style="color: black">{{ totalNum }}</div>
+				</div>
+				<barChart
+					ref="barChart"
+					height="600px"
+					title="库存总览"
+					v-if="overviewList.length"
+					:histogram="overviewList" />
+				<!-- 没有数据 -->
+				<div class="no-data-bg" v-else></div>
+			</div>
+		</el-col>
+		<el-col :span="wareType === 1 ? 10 : 0">
+			<div class="chart-card">
+				<div class="title">库位占用率</div>
+				<pieChart
+					ref="pieChart"
+					height="600px"
+					title="库位占用率"
+					v-if="rateList.length"
+					:pie-data="rateList" />
+				<!-- 没有数据 -->
+				<div class="no-data-bg" v-else></div>
+			</div>
+		</el-col>
+	</el-row>
+</template>
+
+<script>
+import barChart from '../../chart/BarChart.vue';
+import pieChart from '../../chart/PieChart.vue';
+import { getOverview, getRate } from '@/api/warehouse/warehouseLocation';
+import { getWarehouse } from '@/api/warehouse/warehouse-setup';
+
+export default {
+	data() {
+		return {
+			urlOptions: {
+				allURL: getOverview,
+				rateURL: getRate,
+			},
+			warehouseId: '',
+			wareType: 1,
+			totalNum: 0,
+			overviewList: [],
+			rateList: [],
+		};
+	},
+	components: {
+		barChart,
+		pieChart,
+	},
+	mounted() {
+	},
+	created() {
+		let str = this.$router.currentRoute.path;
+		let lastIndex = str.lastIndexOf('/');
+		this.warehouseId = str.slice(lastIndex + 1);
+		getWarehouse(this.warehouseId).then((response) => {
+			this.wareType = response.data.type;
+      this.getDataList();
+		});
+	},
+	methods: {
+		// 获取数据列表
+		getDataList() {
+			const data = {
+				warehouseId: this.warehouseId,
+			};
+			this.urlOptions.allURL(data).then((response) => {
+				if (response.data && response.data.length) {
+					this.overviewList = response.data;
+					this.overviewList.forEach((item) => {
+						this.totalNum += item.num;
+					});
+					this.$nextTick(() => {
+						this.$refs.barChart.initChart();
+					});
+				}
+			});
+			if (this.wareType === 1) {
+				this.urlOptions.rateURL(data).then((response) => {
+					if (response.data && response.data.length) {
+						this.rateList = response.data;
+						this.$nextTick(() => {
+							this.$refs.pieChart.initChart();
+						});
+					}
+				});
+			}
+		},
+	},
+};
+</script>
+
+<style scoped>
+.chart-container {
+	min-height: calc(100vh - 120px - 8px);
+	background-color: #f0f2f7;
+}
+.chart-card {
+	min-height: calc(100vh - 120px - 8px);
+	background-color: #fff;
+	padding: 16px;
+	border-radius: 8px;
+}
+.title {
+	font-size: 18px;
+	line-height: 16px;
+	margin-bottom: 10px;
+	color: #000;
+	font-weight: 500;
+	font-family: '微软雅黑', 'Microsoft YaHei', Arial, Helvetica, sans-serif;
+}
+.title::before {
+	content: '';
+	display: inline-block;
+	vertical-align: top;
+	width: 4px;
+	height: 16px;
+	border-radius: 1px;
+	margin-right: 5px;
+	background-color: #0b58ff;
+}
+.sub-title {
+	font-size: 16px;
+	line-height: 18px;
+	color: #888686;
+	min-width: 80px;
+	text-align: center;
+	font-weight: 500;
+	margin-right: 30px;
+	font-family: '微软雅黑', 'Microsoft YaHei', Arial, Helvetica, sans-serif;
+	float: right;
+}
+</style>

src/views/warehouse/warehouse-manage/in&out-nothing/add-or-updata.vue

@@ -0,0 +1,258 @@
+<!--
+ * @Author: zwq
+ * @Date: 2023-08-01 13:52:10
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-08-09 10:30:18
+ * @Description:
+-->
+<template>
+	<el-form
+		:model="dataForm"
+		:rules="dataRule"
+		ref="dataForm"
+		v-if="visible"
+		@keyup.enter.native="dataFormSubmit()"
+		label-width="100px"
+		label-position="top">
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="仓库名称" prop="warehouseName">
+					<el-input
+						v-model="dataForm.warehouseName"
+						readonly
+						placeholder="请输入仓库名称" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="库区名称" prop="warehouseAreaId">
+					<el-select
+						v-model="dataForm.warehouseAreaId"
+						filterable
+						:style="{ width: '100%' }"
+						:disabled="dataForm.id ? true : false"
+						placeholder="请选择库区名称">
+						<el-option
+							v-for="item in warehouseAreaArr"
+							:key="item.id"
+							:label="item.name"
+							:value="item.id"></el-option>
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="物品名称" prop="goodsId">
+					<el-select
+						v-model="dataForm.goodsId"
+						filterable
+						clearable
+						:disabled="dataForm.id ? true : false"
+						:style="{ width: '100%' }"
+						@change="setGoodInfo"
+						placeholder="请选择物品名称">
+						<el-option
+							v-for="item in goodsArr"
+							:key="item.id"
+							:label="item.name"
+							:value="item.id"></el-option>
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="物品编码" prop="code">
+					<el-input
+						v-model="dataForm.code"
+						readonly
+						placeholder="请输入物品编码" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="物品规格" prop="specifications">
+					<el-input
+						v-model="dataForm.specifications"
+						readonly
+						placeholder="请输入物品规格" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="物品批次" prop="goodsBatch">
+					<el-input
+						v-if="!dataForm.id ? true : false"
+						v-model="dataForm.goodsBatch"
+						clearable
+						placeholder="请输入物品批次" />
+					<el-select
+						v-else
+						v-model="dataForm.goodsBatch"
+						filterable
+						clearable
+						style="width: 100%"
+						placeholder="请选择物品名称">
+						<el-option
+							v-for="(item, index) in Batch"
+							:key="index"
+							:label="item.goodsBatch"
+							:value="item.goodsBatch"></el-option>
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item
+					:label="dataForm.id ? '出库数量' : '入库数量'"
+					prop="numDet">
+					<el-input-number
+						v-model="dataForm.numDet"
+						clearable
+						style="width: 100%"
+						:min="0"
+						placeholder="请输入数量" />
+					<!-- :max="max?max:9999999" -->
+				</el-form-item>
+			</el-col>
+			<el-col :span="12" v-if="!dataForm.id ? true : false">
+				<el-form-item label="供应商" prop="supplierId">
+					<el-select
+						v-model="dataForm.supplierId"
+						filterable
+						disabled
+						:style="{ width: '100%' }"
+						placeholder="请选择供应商">
+						<el-option
+							v-for="item in supplierArr"
+							:key="item.id"
+							:label="item.name"
+							:value="item.id"></el-option>
+					</el-select>
+				</el-form-item>
+			</el-col>
+		</el-row>
+	</el-form>
+</template>
+
+<script>
+import basicAdd from '../../mixins/basic-add';
+import {
+	createWarehouseRealtime,
+	outWarehouseRealtime,
+	getWarehouseRealtime,
+	getWarehouseRealtimeDet,
+} from '@/api/warehouse/warehouseRealtime';
+import { getWarehouse } from '@/api/warehouse/warehouse-setup';
+import { getWarehouseAreaList } from '@/api/warehouse/warehouse-area-setup';
+import { getMaterialList, getSupplierList } from '@/api/base/material';
+import { mapGetters } from 'vuex';
+
+export default {
+	mixins: [basicAdd],
+	computed: {
+		...mapGetters(['nickname']),
+	},
+	data() {
+		return {
+			urlOptions: {
+				getOption: true,
+				createURL: createWarehouseRealtime,
+				updateURL: outWarehouseRealtime,
+				infoURL: getWarehouseRealtime,
+			},
+			dataForm: {
+				id: undefined,
+				warehouseName: '',
+				warehouseId: '',
+				warehouseAreaId: '',
+				goodsId: '',
+				code: '',
+				specifications: '',
+				goodsBatch: '',
+				numDet: '',
+				operator: '',
+				supplierId: '',
+			},
+			goodsArr: [], //产品物料数组
+			Batch: [], //物品批次数组
+			warehouseAreaArr: [], //库区数组
+			supplierArr: [], //供应商数组
+			//max: 0,
+			dataRule: {
+				goodsId: [
+					{ required: true, message: '物品名称不能为空', trigger: 'change' },
+				],
+				warehouseAreaId: [
+					{ required: true, message: '库区名称不能为空', trigger: 'change' },
+				],
+				goodsBatch: [
+					{
+						required: true,
+						message: '物品批次不能为空,若无请填写无',
+						trigger: 'blur',
+					},
+				],
+				numDet: [{ required: true, message: '数量不能为空', trigger: 'blur' }],
+			},
+		};
+	},
+	created() {},
+	methods: {
+		init(warehouseId) {
+			this.dataForm.warehouseId = warehouseId || '';
+			this.dataForm.id = undefined;
+			this.visible = true;
+			this.dataForm.operator = this.nickname;
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields();
+				this.getArr();
+			});
+		},
+		getArr() {
+			getWarehouse(this.dataForm.warehouseId).then((response) => {
+				this.dataForm.warehouseName = response.data.name;
+			});
+			getMaterialList().then((response) => {
+				this.goodsArr = response.data;
+			});
+			getSupplierList().then((res) => {
+				this.supplierArr = res.data;
+			});
+			getWarehouseAreaList(this.dataForm.warehouseId).then((response) => {
+				this.warehouseAreaArr = response.data;
+			});
+		},
+		setGoodInfo() {
+			this.goodsArr.forEach((item) => {
+				if (item.id === this.dataForm.goodsId) {
+					this.dataForm.code = item.code;
+					this.dataForm.specifications = item.specifications;
+					this.dataForm.supplierId = item.supplierId;
+				}
+			});
+		},
+		// setBatchInfo(){
+		// 	this.Batch.forEach((item) => {
+		// 		if (item.goodsBatch === this.dataForm.goodsBatch) {
+		// 			this.max = item.numDet
+		// 		}
+		// 	});
+		// },
+		outWare(data) {
+			this.dataForm.warehouseId = data.warehouseId;
+			this.getArr();
+			this.visible = true;
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields();
+				this.dataForm.realTimeId = data.id;
+				this.dataForm.warehouseAreaId = data.warehouseAreaId;
+				this.dataForm.warehouseAreaId = data.warehouseAreaId;
+				this.dataForm.id = data.id;
+				this.dataForm.goodsId = data.goodsId;
+				this.dataForm.code = data.code;
+				this.dataForm.specifications = data.spec;
+				getWarehouseRealtimeDet(data.id).then((res) => {
+					this.Batch = res.data;
+				});
+				// this.urlOptions.infoURL(data.id).then((response) => {
+				// 	this.dataForm = response.data;
+				// });
+			});
+		},
+	},
+};
+</script>

src/views/warehouse/warehouse-manage/in&out-nothing/index.vue

@@ -0,0 +1,208 @@
+<!--
+ * @Author: zwq
+ * @Date: 2023-11-03 16:37:06
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-08-09 14:13:46
+ * @Description:
+-->
+<template>
+	<div class="app-container">
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
+		<el-table
+			:data="tableData"
+			:header-cell-style="{
+				background: '#F2F4F9',
+				color: '#606266',
+			}"
+			:max-height="tableH"
+			border
+			v-loading="dataListLoading"
+			style="width: 100%"
+			ref="dataList">
+			<el-table-column type="expand">
+				<template slot-scope="scope">
+					<product :warehouse-id="scope.row.id"></product>
+				</template>
+			</el-table-column>
+			<el-table-column prop="warehouseName" label="仓库名称" min-width="150" />
+			<el-table-column prop="warehouseAreaName" label="库区名称" />
+			<el-table-column prop="name" label="物品名称" />
+			<el-table-column prop="code" label="物品编码" width="150" />
+			<el-table-column prop="spec" label="物品规格" />
+			<el-table-column prop="num" label="数量" />
+			<el-table-column prop="operator" label="操作人" />
+			<el-table-column prop="latestInTime" label="最新入库时间" width="150">
+				<template v-slot="scope">
+					<span>{{ parseTime(scope.row.latestInTime) }}</span>
+				</template>
+			</el-table-column>
+			<el-table-column prop="latestOutTime" label="最新出库时间" width="150">
+				<template v-slot="scope">
+					<span>{{ parseTime(scope.row.latestOutTime) }}</span>
+				</template>
+			</el-table-column>
+			<el-table-column label="操作" width="70">
+				<template v-slot="scope">
+					<el-button
+						size="mini"
+						type="text"
+						@click="handleClick({ data: scope.row, type: 'out' })"
+						v-hasPermi="['warehouse:warehouse-manage:in&out-nothing:out']">
+						出库
+					</el-button>
+				</template>
+			</el-table-column>
+		</el-table>
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getDataList" />
+		<!-- 对话框(添加 / 修改) -->
+		<base-dialog
+			:dialogTitle="addOrEditTitle"
+			:dialogVisible="addOrUpdateVisible"
+			@cancel="handleCancel"
+			@confirm="handleConfirm"
+			:before-close="handleCancel"
+			width="40%">
+			<add-or-update
+				ref="addOrUpdate"
+				@refreshDataList="successSubmit"></add-or-update>
+		</base-dialog>
+	</div>
+</template>
+
+<script>
+import product from './product-mini';
+import basicPage from '../../mixins/basic-page';
+import { getMaterialList } from '@/api/base/material';
+import AddOrUpdate from './add-or-updata';
+import { getWarehouseRealtimePage } from '@/api/warehouse/warehouseRealtime';
+import tableHeightMixin from '@/mixins/tableHeightMixin';
+
+export default {
+	mixins: [basicPage, tableHeightMixin],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getWarehouseRealtimePage,
+			},
+			listQuery: {
+				warehouseId: '',
+			},
+			tableData: [],
+			formConfig: [
+				{
+					type: 'select',
+					label: '物品名称',
+					selectOptions: [],
+					param: 'goodsId',
+					defaultSelect: '',
+					filterable: true,
+				},
+				{
+					type: 'input',
+					label: '操作人',
+					placeholder: '操作人',
+					param: 'operator',
+				},
+				{
+					type: 'datePicker',
+					label: '最新入库时间',
+					dateType: 'daterange',
+					format: 'yyyy-MM-dd',
+					valueFormat: 'timestamp',
+					rangeSeparator: '-',
+					startPlaceholder: '开始时间',
+					endPlaceholder: '结束时间',
+					param: 'searchTime',
+				},
+				{
+					type: 'datePicker',
+					label: '最新出库时间',
+					dateType: 'daterange',
+					format: 'yyyy-MM-dd',
+					valueFormat: 'timestamp',
+					rangeSeparator: '-',
+					startPlaceholder: '开始时间',
+					endPlaceholder: '结束时间',
+					param: 'searchTime1',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					type: this.$auth.hasPermi('warehouse:warehouse-manage:in&out-nothing:in')
+						? 'button'
+						: '',
+					btnName: '入库',
+					name: 'add',
+					color: 'primary',
+					plain: true,
+				},
+			],
+		};
+	},
+	components: {
+		product,
+		AddOrUpdate,
+	},
+	created() {
+		let str = this.$router.currentRoute.path;
+		let lastIndex = str.lastIndexOf('/');
+		this.listQuery.warehouseId = str.slice(lastIndex + 1);
+		getMaterialList().then((response) => {
+			this.formConfig[0].selectOptions = response.data;
+		});
+	},
+	methods: {
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 20;
+					this.listQuery.goodsId = val.goodsId;
+					this.listQuery.operator = val.operator;
+					this.listQuery.latestInTime = val.searchTime ? val.searchTime : null;
+					this.listQuery.latestOutTime = val.searchTime1
+						? val.searchTime1
+						: null;
+					this.getDataList();
+					break;
+				case 'add':
+					this.addOrEditTitle = '入库';
+					this.addOrUpdateVisible = true;
+					this.$nextTick(() => {
+						this.$refs.addOrUpdate.init(this.listQuery.warehouseId);
+					});
+					break;
+				default:
+					console.log(val);
+			}
+		},
+		otherMethods(val) {
+			this.addOrUpdateVisible = true;
+			this.addOrEditTitle = '出库';
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.outWare(val.data);
+			});
+		},
+	},
+};
+</script>
+<style>
+.app-container .el-table .el-table__cell {
+	padding: 0;
+	height: 35px;
+}
+</style>

src/views/warehouse/warehouse-manage/in&out-nothing/product-mini.vue

@@ -0,0 +1,71 @@
+<!--
+ * @Author: zwq
+ * @Date: 2023-08-24 14:47:58
+ * @LastEditors: zwq
+ * @LastEditTime: 2023-11-04 10:31:56
+ * @Description:
+-->
+<template>
+	<div>
+		<base-table
+			v-loading="dataListLoading"
+			:table-props="tableProps"
+      max-height="200"
+			:table-data="tableData" />
+      </div>
+</template>
+
+<script>
+import { parseTime } from '../../mixins/code-filter';
+import { getWarehouseRealtimeDet } from '@/api/warehouse/warehouseRealtime';
+
+const tableProps = [
+	{
+		prop: 'goodsBatch',
+		label: '产品批次',
+	},
+	{
+		prop: 'numDet',
+		label: '批次数量',
+	},
+	{
+		prop: 'createTime',
+		label: '入库时间',
+		filter: parseTime,
+	},
+];
+export default {
+	props: {
+    warehouseId: {
+			type: String,
+			default: '',
+		},
+	},
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getWarehouseRealtimeDet
+			},
+			tableProps,
+			tableData: [],
+      dataListLoading: false,
+		};
+	},
+	components: {
+	},
+	created() {},
+  mounted() {
+    this.getDataList()
+  },
+	methods: {
+    // 获取数据列表
+    getDataList() {
+      this.dataListLoading = true;
+      this.urlOptions.getDataListURL(this.warehouseId).then(response => {
+        this.tableData = response.data;
+        this.dataListLoading = false;
+      });
+    },
+	},
+};
+</script>

src/views/warehouse/warehouse-manage/in&out/SmallTitle.vue

@@ -0,0 +1,65 @@
+<!--
+ * @Author: zwq
+ * @Date: 2023-08-01 15:27:31
+ * @LastEditors: zwq
+ * @LastEditTime: 2023-08-01 16:25:54
+ * @Description:
+-->
+<template>
+	<div :class="[className, { 'p-0': noPadding }]">
+		<slot />
+	</div>
+</template>
+
+<script>
+export default {
+	props: {
+		size: {
+			// 取值范围:  xl lg md sm
+			type: String,
+			default: 'de',
+			validator: function (val) {
+				return ['xl', 'lg', 'de', 'md', 'sm'].indexOf(val) !== -1;
+			},
+		},
+		noPadding: {
+			type: Boolean,
+			default: false,
+		},
+	},
+	computed: {
+		className: function () {
+			return `${this.size}-title`;
+		},
+	},
+};
+</script>
+
+<style lang="scss" scoped>
+$pxls: (xl, 28px) (lg, 24px) (de, 20px) (md, 18px) (sm, 16px);
+$mgr: 8px;
+@each $size, $height in $pxls {
+	.#{$size}-title {
+		font-size: 18px;
+		line-height: $height;
+		color: #000;
+		font-weight: 500;
+		font-family: '微软雅黑', 'Microsoft YaHei', Arial, Helvetica, sans-serif;
+
+		&::before {
+			content: '';
+			display: inline-block;
+			vertical-align: top;
+			width: 4px;
+			height: $height + 2px;
+			border-radius: 1px;
+			margin-right: $mgr;
+			background-color: #0b58ff;
+		}
+	}
+}
+
+.p-0 {
+	padding: 0;
+}
+</style>

src/views/warehouse/warehouse-manage/in&out/add-or-updata.vue

@@ -0,0 +1,191 @@
+<!--
+ * @Author: zwq
+ * @Date: 2024-08-02 16:26:58
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-08-08 16:38:53
+ * @Description:,
+-->
+<template>
+	<div>
+		<el-form
+			:model="dataForm"
+			:rules="dataRule"
+			ref="dataForm"
+			v-if="visible && !moveMode"
+			@keyup.enter.native="dataFormSubmit()"
+			label-width="100px"
+			label-position="top">
+			<el-row :gutter="20">
+				<el-col :span="24">
+					<el-form-item prop="targetName" label="出库目的地">
+						<el-select
+							v-model="dataForm.targetName"
+							filterable
+							:style="{ width: '100%' }"
+							placeholder="请选择出库目的地">
+							<el-option
+								v-for="item in urlOptions.dictList.dict0"
+								:key="item.id"
+								:label="item.label"
+								:value="item.label"></el-option>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24">
+					<el-form-item label="出库用途" prop="useFor">
+						<el-input
+							v-model="dataForm.useFor"
+							clearable
+							placeholder="请输入出库用途" />
+					</el-form-item>
+				</el-col>
+			</el-row>
+		</el-form>
+		<el-form v-else ref="form" label-width="100px">
+			<el-row>
+				<el-col :span="24">
+					<el-form-item label="请选择目的地">
+						<el-cascader
+							:value="oldLocationId"
+							:style="{ width: '100%' }"
+							:options="deptOptions"
+							:props="{
+								value: 'id',
+								label: 'name',
+							}"
+							@change="handleChange"></el-cascader>
+					</el-form-item>
+				</el-col>
+			</el-row>
+		</el-form>
+	</div>
+</template>
+
+<script>
+import basicAdd from '../../mixins/basic-add';
+import {
+	outWarehouseRealtimeLocation,
+	outWarehouseRealtimeLocationList,
+	moveWarehouseRealtimeLocation,
+} from '@/api/warehouse/warehouseRealtimeLocation';
+import { getWarehouseLocationTree } from '@/api/warehouse/warehouse-location-setup';
+import { getUserProfile } from '@/api/system/user';
+
+export default {
+	mixins: [basicAdd],
+	components: {},
+	data() {
+		return {
+			urlOptions: {
+				getDictList: true,
+				updateURL: outWarehouseRealtimeLocation,
+				allupdateURL: outWarehouseRealtimeLocationList,
+			},
+			nameList: ['outbound-dest'],
+			dataForm: {
+				id: undefined,
+				targetName: '',
+				useFor: '',
+				operator: '',
+			},
+			selectData: [],
+			moveMode: false, //是否移库
+			modeName: '出库',
+			oldLocationId: '', //移库原id
+			newLocationId: '', //移库目的id
+			dataRule: {
+				targetName: [
+					{ required: true, message: '出库目的地不能为空', trigger: 'change' },
+				],
+			},
+			deptOptions: undefined,
+		};
+	},
+	created() {
+		getUserProfile().then((response) => {
+			this.dataForm.operator = response.data.username;
+		});
+	},
+	methods: {
+		init(id, selectData) {
+			this.moveMode = false;
+			this.visible = true;
+			if (id === '批量出库') {
+				this.modeName = '批量出库';
+				this.selectData = selectData;
+			} else if (id === '移库') {
+				this.modeName = '移库';
+				this.getTreeselect();
+				this.moveMode = true;
+				this.oldLocationId = selectData;
+				this.newLocationId = selectData;
+				return;
+			} else {
+				this.modeName = '出库';
+				this.selectData = [];
+				this.dataForm.id = id || '';
+			}
+			if (this.urlOptions.getDictList) {
+				this.getDict();
+			}
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields();
+			});
+		},
+		// 表单提交
+		dataFormSubmit() {
+			if (this.modeName === '移库') {
+				// 移库
+				const obj = {
+					oldLocationId: this.oldLocationId,
+					newLocationId: this.newLocationId,
+					operator: this.dataForm.operator,
+				};
+				moveWarehouseRealtimeLocation(obj).then((response) => {
+					this.$modal.msgSuccess('出库成功');
+					this.visible = false;
+					this.$emit('refreshDataList');
+				});
+				return;
+			}
+			this.$refs['dataForm'].validate((valid) => {
+				if (!valid) {
+					return false;
+				}
+				if (this.modeName === '批量出库') {
+					this.selectData.forEach((item) => {
+						item.realtimeLocationId = item.id;
+						item.targetName = this.dataForm.targetName;
+						item.useFor = this.dataForm.useFor;
+						item.operator = this.dataForm.operator;
+					});
+					// 批量出库
+					this.urlOptions.allupdateURL(this.selectData).then((response) => {
+						this.$modal.msgSuccess('批量出库成功');
+						this.visible = false;
+						this.$emit('refreshDataList');
+					});
+				} else if (this.modeName === '出库') {
+					// 出库
+					this.dataForm.realtimeLocationId = this.dataForm.id;
+					this.urlOptions.updateURL(this.dataForm).then((response) => {
+						this.$modal.msgSuccess('出库成功');
+						this.visible = false;
+						this.$emit('refreshDataList');
+					});
+				}
+			});
+		},
+		handleChange(val) {
+			this.newLocationId = val[2];
+		},
+		// 查询下拉树结构
+		getTreeselect() {
+			getWarehouseLocationTree().then((response) => {
+				this.deptOptions = [];
+				this.deptOptions.push(...this.handleTree(response.data, 'id'));
+			});
+		},
+	},
+};
+</script>

src/views/warehouse/warehouse-manage/in&out/attr-add.vue

@@ -0,0 +1,125 @@
+<template>
+	<el-dialog
+		:visible.sync="visible"
+		:width="'30%'"
+		:append-to-body="true"
+		:close-on-click-modal="false"
+		class="dialog">
+		<template #title>
+			<slot name="title">
+				<div class="titleStyle">
+					新增产品
+				</div>
+			</slot>
+		</template>
+
+		<el-form
+			ref="dataForm"
+			:model="dataForm"
+			:rules="dataRule"
+			label-width="100px"
+			@keyup.enter.native="dataFormSubmit()">
+			<el-form-item label="产品" prop="productInfo">
+				<el-select
+					v-model="dataForm.productInfo"
+					style="width: 60%"
+          filterable
+          value-key="id"
+					placeholder="请选择产品">
+					<el-option
+						v-for="item in productArr"
+						:key="item.id"
+            :disabled="!item.enabled"
+						:label="item.name"
+						:value="item" />
+				</el-select>
+			</el-form-item>
+		</el-form>
+
+		<el-row style="text-align: right">
+			<el-button @click="visible = false">取消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+		</el-row>
+	</el-dialog>
+</template>
+
+<script>
+
+import {
+  getMaterialList
+} from "@/api/base/material";
+
+export default {
+	data() {
+		return {
+			visible: false,
+			dataForm: {
+				index: -1,
+				productInfo: '',
+			},
+			productArr: [],
+			dataRule: {
+				productId: [{ required: true, message: '产品不能为空', trigger: 'blur' }],
+			},
+		};
+	},
+	methods: {
+		init(index) {
+			if (index >= 0) {
+				this.dataForm.index = index;
+			}
+			this.visible = true;
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields();
+				getMaterialList().then((response) => {
+					this.productArr = response.data;
+				});
+			});
+		},
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate((valid) => {
+				if (this.dataForm.productInfo) {
+          this.dataForm.productInfo.goodsId = this.dataForm.productInfo.id
+          this.dataForm.productInfo.remark = ''
+					// 修改的提交
+					if (this.dataForm.index >= 0) {
+						this.visible = false;
+						this.$emit('refreshDataList', this.dataForm);
+						return;
+					}
+					// 添加的提交
+					this.visible = false;
+					this.$emit('refreshDataList', this.dataForm);
+				} else {
+					this.$modal.msgWarning('请选择产品');
+				}
+			});
+		},
+	},
+};
+</script>
+
+<style scoped>
+.dialog >>> .el-dialog__body {
+	padding: 30px 24px;
+}
+.dialog >>> .el-dialog__header {
+	font-size: 16px;
+	color: rgba(0, 0, 0, 0.85);
+	font-weight: 500;
+	padding: 13px 24px;
+	border-bottom: 1px solid #e9e9e9;
+}
+.dialog >>> .el-dialog__header .titleStyle::before {
+	content: '';
+	display: inline-block;
+	width: 4px;
+	height: 16px;
+	background-color: #0b58ff;
+	border-radius: 1px;
+	margin-right: 8px;
+	position: relative;
+	top: 2px;
+}
+</style>

src/views/warehouse/warehouse-manage/in&out/drawer.vue

@@ -0,0 +1,360 @@
+<template>
+	<el-drawer
+		:visible.sync="visible"
+		:show-close="false"
+		:destroy-on-close="true"
+		:wrapper-closable="false"
+		class="drawer"
+		size="60%">
+		<small-title slot="title" :no-padding="true">库位信息</small-title>
+
+		<div class="content">
+			<div class="visual-part">
+				<el-form
+					ref="dataForm"
+					:model="dataForm"
+					:rules="dataRule"
+					label-width="100px"
+					label-position="top"
+					@keyup.enter.native="dataFormSubmit">
+					<el-row :gutter="20">
+						<el-col :span="12">
+							<el-form-item label="库位名称" prop="name">
+								<el-input v-model="dataForm.name" readonly />
+							</el-form-item>
+						</el-col>
+						<el-col :span="12">
+							<el-form-item label="托盘编码" prop="palletCode">
+								<el-input
+									v-model="dataForm.palletCode"
+									@input="$forceUpdate()"
+									:readonly="isDetail"
+									placeholder="请输入托盘编码" />
+							</el-form-item>
+						</el-col>
+					</el-row>
+				</el-form>
+
+				<small-title
+					style="margin: 16px 0; padding-left: 8px"
+					:no-padding="true">
+					物品信息
+					<!-- <el-alert
+						title="产品信息新增和修改后，需点击最下方保存按钮确定修改"
+						type="warning"
+						show-icon></el-alert> -->
+				</small-title>
+
+				<div class="attr-list">
+					<div
+						style="position: absolute; top: -40px; right: 15px"
+						v-if="!isDetail">
+						<el-button @click="addNew" type="text">
+							<i class="el-icon-plus"></i>
+							新增
+						</el-button>
+					</div>
+					<base-table
+						:table-props="tableProps"
+						:page="listQuery.pageNo"
+						:limit="listQuery.pageSize"
+						@emitFun="inputChange"
+						:height="400"
+						:table-data="productAttributeList"
+						v-if="productAttributeList.length">
+						<method-btn
+							slot="handleBtn"
+							v-if="!isDetail"
+							:width="70"
+							label="操作"
+							:method-list="tableBtn"
+							@clickBtn="handleClick" />
+					</base-table>
+					<!-- 没有数据 -->
+					<div class="no-data-bg" v-else></div>
+				</div>
+			</div>
+		</div>
+
+		<div style="position: absolute; bottom: 24px; right: 24px">
+			<el-button style="margin-right: 10px" @click="goback()">返回</el-button>
+			<span v-if="!isDetail">
+				<el-button type="primary" @click="dataFormSubmit()">入库</el-button>
+			</span>
+		</div>
+
+		<product-attr-add
+			v-if="addOrUpdateVisible"
+			ref="addOrUpdate"
+			@refreshDataList="addList" />
+	</el-drawer>
+</template>
+
+<script>
+import productAttrAdd from './attr-add';
+import inputArea from '../../mixins/inputArea';
+import SmallTitle from './SmallTitle';
+import {
+	inWarehouseRealtimeLocation,
+	getWarehouseRealtimeLocation,
+} from '@/api/warehouse/warehouseRealtimeLocation';
+import { publicFormatter } from '@/utils/dict';
+
+const tableBtn = [
+	{
+		type: 'delete',
+		btnName: '删除',
+	},
+];
+
+const tableProps1 = [
+	{
+		prop: 'name',
+		label: '物品名称',
+	},
+	{
+		prop: 'code',
+		label: '物品编码',
+		showOverflowtooltip: true,
+	},
+	{
+		prop: 'specifications',
+		label: '物品规格',
+	},
+	{
+		prop: 'goodsBatch',
+		label: '物品批次',
+		subcomponent: inputArea,
+		width: 100,
+	},
+	{
+		prop: 'num',
+		label: '数量',
+		subcomponent: inputArea,
+		width: 100,
+	},
+	{
+		prop: 'unit',
+		label: '单位',
+		filter: publicFormatter('unit_dict'),
+		width: 60,
+	},
+];
+const tableProps2 = [
+	{
+		prop: 'name',
+		label: '物品名称',
+	},
+	{
+		prop: 'code',
+		label: '物品编码',
+		showOverflowtooltip: true,
+	},
+	{
+		prop: 'specifications',
+		label: '物品规格',
+	},
+	{
+		prop: 'goodsBatch',
+		label: '物品批次',
+		width: 100,
+	},
+	{
+		prop: 'num',
+		label: '数量',
+		width: 100,
+	},
+	{
+		prop: 'unit',
+		label: '单位',
+		filter: publicFormatter('unit_dict'),
+		width: 60,
+	},
+];
+export default {
+	components: { productAttrAdd, SmallTitle },
+	data() {
+		return {
+			visible: false,
+			addOrUpdateVisible: false,
+			tableBtn,
+			tableProps: [],
+			productAttributeList: [],
+			operator: '',
+			dataForm: {
+				id: null,
+				name: '',
+				palletCode: '',
+			},
+			listQuery: {
+				pageSize: 10,
+				pageNo: 1,
+				total: 0,
+			},
+			isDetail: false,
+			dataRule: {
+				// palletCode: [
+				// 	{
+				// 		required: true,
+				// 		message: '托盘编码不能为空',
+				// 		trigger: 'blur',
+				// 	},
+				// ],
+			},
+		};
+	},
+	methods: {
+		initData() {
+			this.productAttributeList.splice(0);
+		},
+		init(val, nickname, isDetail) {
+			this.isDetail = isDetail || false;
+			if (isDetail) {
+				this.tableProps= tableProps2;
+			}else{
+				this.tableProps= tableProps1;
+			}
+			this.operator = nickname;
+			this.dataForm.id = val.id;
+			this.dataForm.locationId = val.locationId;
+			this.dataForm.name = val.name;
+			this.dataForm.palletCode = val.palletCode;
+			this.initData();
+			this.visible = true;
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields();
+
+				if (this.dataForm.id) {
+					// 获取产品详情
+					// 获取产品的属性列表
+					this.getList();
+				}
+			});
+		},
+
+		getList() {
+			// 获取产品的属性列表
+			getWarehouseRealtimeLocation(this.dataForm.locationId).then(
+				(response) => {
+					this.productAttributeList = response.data;
+				}
+			);
+		},
+		inputChange(data) {
+			switch (data.sType) {
+				case 1:
+					this.productAttributeList[data._pageIndex - 1][data.prop] =
+						data[data.prop];
+					break;
+				case 2:
+					this.productAttributeList[data._pageIndex - 1][data.prop] =
+						data.string ? data.string.split('+')[0] : '';
+					this.productAttributeList[data._pageIndex - 1][data.prop + 'Name'] =
+						data.string ? data.string.split('+')[1] : '';
+					break;
+				default:
+					console.log(val);
+			}
+		},
+		handleClick(raw) {
+			if (raw.type === 'delete') {
+				this.$confirm(
+					`是否确认删除名称为"${raw.data.name}"的数据项?`,
+					'系统提示',
+					{
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning',
+					}
+				)
+					.then(() => {
+						this.productAttributeList.splice(raw.data._pageIndex - 1, 1);
+					})
+					.catch(() => {});
+			} else {
+				this.addNew(raw.data._pageIndex);
+			}
+		},
+		// 表单提交
+		dataFormSubmit() {
+			this.productAttributeList.forEach((item) => {
+				item.id = '';
+			});
+			const data = {
+				realtimeLocationId: this.dataForm.id,
+				palletCode: this.dataForm.palletCode,
+				operator: this.operator,
+				goodsInfos: this.productAttributeList,
+			};
+			this.$refs['dataForm'].validate((valid) => {
+				if (valid) {
+					// 修改的提交
+					if (this.dataForm.id) {
+						inWarehouseRealtimeLocation(data).then((response) => {
+							this.$modal.msgSuccess('修改成功');
+							this.visible = false;
+							this.$emit('refreshDataList');
+						});
+						return;
+					}
+				}
+			});
+		},
+		// 新增 / 修改
+		addNew(index) {
+			this.addOrUpdateVisible = true;
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(index);
+			});
+		},
+		addList(data) {
+			this.productAttributeList.push(data.productInfo);
+		},
+		goback() {
+			this.$emit('refreshDataList');
+			this.visible = false;
+			this.initData();
+		},
+	},
+};
+</script>
+
+<style scoped>
+.drawer >>> .el-drawer {
+	border-radius: 8px 0 0 8px;
+}
+
+.drawer >>> .el-form-item__label {
+	padding: 0;
+}
+.drawer >>> .el-form-item {
+	margin: 0;
+}
+.drawer >>> .el-drawer__header {
+	margin: 0;
+	padding: 32px 32px 24px;
+	border-bottom: 1px solid #dcdfe6;
+	margin-bottom: 10px;
+}
+
+.drawer >>> .content {
+	padding: 0 24px 30px;
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+}
+
+.drawer >>> .visual-part {
+	flex: 1 auto;
+	max-height: 76vh;
+	overflow: hidden;
+	overflow-y: scroll;
+	padding-right: 10px; /* 调整滚动条样式 */
+}
+
+.drawer >>> .el-form,
+.drawer >>> .attr-list {
+	padding: 0 16px;
+	position: relative;
+}
+</style>

src/views/warehouse/warehouse-manage/in&out/index.vue

@@ -0,0 +1,314 @@
+<template>
+	<div class="app-container">
+		<!-- 搜索工作栏 -->
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
+
+		<!-- 列表 -->
+		<base-table
+			v-loading="dataListLoading"
+			:table-props="tableProps"
+			:page="listQuery.pageNo"
+			:limit="listQuery.pageSize"
+			:selectWidth="selectHasPermi"
+			@selection-change="selectChange"
+			:max-height="tableH"
+			:table-data="tableData">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				:width="168"
+				label="操作"
+				:method-list="tableBtn"
+				@clickBtn="handleClick" />
+		</base-table>
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getDataList" />
+
+		<!-- 对话框(添加 / 修改) -->
+		<drawer
+			v-if="drawerVisible"
+			ref="drawerRef"
+			@refreshDataList="getDataList" />
+		<!-- 对话框(添加 / 修改) -->
+		<base-dialog
+			:dialogTitle="addOrEditTitle"
+			:dialogVisible="addOrUpdateVisible"
+			@cancel="handleCancel"
+			@confirm="handleConfirm"
+			:before-close="handleCancel"
+      destroy-on-close
+			width="40%">
+			<add-or-update
+				ref="addOrUpdate"
+				@refreshDataList="successSubmit"></add-or-update>
+		</base-dialog>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './add-or-updata';
+import Drawer from './drawer';
+import basicPage from '../../mixins/basic-page';
+import { parseTime } from '../../mixins/code-filter';
+import { getWarehouseRealtimeLocationPage } from '@/api/warehouse/warehouseRealtimeLocation';
+import { listData } from '@/api/system/dict/data';
+import { publicFormatter } from '@/utils/dict';
+import { mapGetters } from 'vuex';
+import tableHeightMixin from '@/mixins/tableHeightMixin';
+
+const tableProps = [
+	{
+		prop: 'warehouseName',
+		label: '仓库名称',
+	},
+	{
+		prop: 'name',
+		label: '库位名称',
+	},
+	{
+		prop: 'code',
+		label: '库位编码',
+	},
+	{
+		prop: 'type',
+		label: '库位类型',
+		filter: publicFormatter('location_type'),
+	},
+	{
+		prop: 'status',
+		label: '库位状态',
+		filter: publicFormatter('AreaDetStatus'),
+	},
+	{
+		prop: 'palletCode',
+		label: '托盘编码',
+	},
+	{
+		prop: 'inTime',
+		label: '入库时间',
+		filter: parseTime,
+		width: 150,
+	},
+	{
+		prop: 'remark',
+		label: '备注',
+	},
+];
+
+export default {
+	mixins: [basicPage, tableHeightMixin],
+	computed: {
+		...mapGetters(['nickname']),
+	},
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getWarehouseRealtimeLocationPage,
+			},
+			listQuery: {
+				warehouseId: '',
+			},
+			tableData: [],
+			tableProps,
+			tableBtn: [
+				this.$auth.hasPermi(`warehouse:warehouse-manage:in&out:detail`)
+					? {
+							type: 'detail',
+							btnName: '详情',
+					  }
+					: undefined,
+				this.$auth.hasPermi(`warehouse:warehouse-manage:in&out:out`)
+					? {
+							type: 'out',
+							btnName: '出库',
+							showParam: {
+								type: '&',
+								data: [
+									{
+										type: 'unequal',
+										name: 'status',
+										value: 0,
+									},
+								],
+							},
+					  }
+					: undefined,
+				this.$auth.hasPermi(`warehouse:warehouse-manage:in&out:in`)
+					? {
+							type: 'in',
+							btnName: '入库',
+							showParam: {
+								type: '&',
+								data: [
+									{
+										type: 'equal',
+										name: 'status',
+										value: 0,
+									},
+								],
+							},
+					  }
+					: undefined,
+				this.$auth.hasPermi(`warehouse:warehouse-manage:in&out:move`)
+					? {
+							type: 'move',
+							btnName: '移库',
+							showParam: {
+								type: '&',
+								data: [
+									{
+										type: 'unequal',
+										name: 'status',
+										value: 0,
+									},
+								],
+							},
+					  }
+					: undefined,
+			].filter((v) => v),
+			drawerVisible: false,
+			selectData: [],
+      selectHasPermi:this.$auth.hasPermi(`warehouse:warehouse-manage:in&out:out`)
+					? 55
+					: undefined,
+			formConfig: [
+				{
+					type: 'input',
+					label: '库位编码',
+					placeholder: '库位编码',
+					param: 'kcode',
+				},
+				{
+					type: 'input',
+					label: '托盘编码',
+					placeholder: '托盘编码',
+					param: 'tcode',
+				},
+				{
+					type: 'select',
+					label: '库位状态',
+					selectOptions: [],
+					param: 'status',
+					defaultSelect: '',
+					filterable: true,
+					labelField: 'label',
+					valueField: 'value',
+				},
+				{
+					type: 'datePicker',
+					label: '入库时间',
+					dateType: 'daterange',
+					format: 'yyyy-MM-dd',
+					valueFormat: 'timestamp',
+					rangeSeparator: '-',
+					startPlaceholder: '开始时间',
+					endPlaceholder: '结束时间',
+					param: 'searchTime',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: '',
+					btnName: '批量出库',
+					name: 'allOut',
+					color: 'primary',
+				},
+			],
+		};
+	},
+	components: {
+		AddOrUpdate,
+		Drawer,
+	},
+	created() {
+		let str = this.$router.currentRoute.path;
+		let lastIndex = str.lastIndexOf('/');
+		this.listQuery.warehouseId = str.slice(lastIndex + 1);
+		const queryParams = {
+			pageNo: 1,
+			pageSize: 99,
+			dictType: 'AreaDetStatus',
+		};
+		listData(queryParams).then((response) => {
+			this.formConfig[2].selectOptions = response.data.list;
+		});
+	},
+	methods: {
+		selectChange(val) {
+			this.selectData = val;
+			if (this.selectData.length > 0) {
+				this.formConfig[5].type = 'button';
+			} else {
+				this.formConfig[5].type = '';
+			}
+		},
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 20;
+					this.listQuery.locationCode = val.kcode;
+					this.listQuery.palletCode = val.tcode;
+					this.listQuery.status = val.status;
+					this.listQuery.inTime = val.searchTime ? val.searchTime : null;
+					this.getDataList();
+					break;
+				case 'allOut':
+					this.addOrUpdateVisible = true;
+					this.addOrEditTitle = '批量出库';
+					this.$nextTick(() => {
+						this.$refs.addOrUpdate.init('批量出库', this.selectData);
+					});
+					break;
+				default:
+					console.log(val);
+			}
+		},
+		otherMethods(val) {
+			if (val.type === 'out') {
+				this.addOrUpdateVisible = true;
+				this.addOrEditTitle = '出库';
+				this.$nextTick(() => {
+					this.$refs.addOrUpdate.init(val.data.id);
+				});
+			} else if (val.type === 'in') {
+				this.drawerVisible = true;
+				this.$nextTick(() => {
+					this.$refs.drawerRef.init(val.data, this.nickname);
+				});
+			} else if (val.type === 'detail') {
+				this.drawerVisible = true;
+				this.$nextTick(() => {
+					this.$refs.drawerRef.init(val.data, this.nickname,true);
+				});
+			} else if (val.type === 'move') {
+				this.addOrUpdateVisible = true;
+				this.addOrEditTitle = '移库';
+				this.$nextTick(() => {
+					this.$refs.addOrUpdate.init('移库', val.data.locationId);
+				});
+			}
+		},
+		handleCancel() {
+			this.addOrUpdateVisible = false;
+			this.addOrEditTitle = '';
+		},
+	},
+};
+</script>
+<style>
+.app-container .el-table .el-table__cell {
+	padding: 0;
+	height: 35px;
+}
+</style>

src/views/warehouse/warehouse-manage/locationMonitoring/index.vue

@@ -0,0 +1,345 @@
+<!--
+ * @Author: zwq
+ * @Date: 2024-01-17 09:58:41
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-08-02 16:24:47
+ * @Description:
+-->
+<template>
+	<div class="app-container">
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
+		<div class="tips">
+			<el-tag effect="dark" color="#d3d3d3" style="border: none">空</el-tag>
+			<el-tag effect="dark" color="#16DC09" style="border: none">满</el-tag>
+			<el-tag effect="dark" color="#ff0000" style="border: none">不可用</el-tag>
+		</div>
+		<div class="mainbody">
+			<div v-for="i in listQuery.total" :key="i">
+				<el-row style="margin-bottom: 10px">
+					<el-col :span="24">
+						<el-row type="flex" class="flex-warp">
+							<div
+								class="dashboard-layout-item"
+								v-for="j in wareData.filter(
+									(item) => item.arrange === (i - 1) * 4 + 1
+								)"
+								:key="j.id + j.name"
+								:title="j.name">
+								<div class="x-coordinate coordinate" v-if="j.arrange === 1">
+									{{ j.col }}
+								</div>
+								<div class="y-coordinate coordinate" v-if="j.col === 1">
+									{{ j.arrange }}
+								</div>
+								<el-popover
+									placement="top-start"
+									:title="j.name"
+									width="200"
+									trigger="click"
+									@show="getLocationInfo(j.id)">
+									<div v-for="(k, index) in goodsData" :key="index">
+										物品名称:
+										<span style="margin-left: 5px;">{{ k.name }}</span>
+										<br />
+										物品数量:
+										<span style="margin-left: 5px">{{ k.num }}</span>
+										<br />
+										入库时间:
+										<span style="margin-left: 5px">{{ parseTime(k.inTime) }}</span>
+									</div>
+									<div
+										slot="reference"
+										class="hoverDiv"
+										:style="{
+											cursor: j.enabled === 0 ? 'not-allowed' : 'pointer',
+											background:
+												j.enabled === 1
+													? j.status === 0
+														? '#d3d3d3'
+														: '#16DC09'
+													: '#ff0000',
+										}" />
+								</el-popover>
+							</div>
+						</el-row>
+						<el-row type="flex" class="flex-warp">
+							<div
+								class="dashboard-layout-item"
+								v-for="j in wareData.filter(
+									(item) => item.arrange === (i - 1) * 4 + 2
+								)"
+								:key="j.id + j.name"
+								:title="j.name">
+								<div class="y-coordinate coordinate" v-if="j.col === 1">
+									{{ j.arrange }}
+								</div>
+								<el-popover
+									placement="top-start"
+									:title="j.name"
+									width="200"
+									trigger="click"
+									@show="getLocationInfo(j.id)">
+									<div v-for="(k, index) in goodsData" :key="index">
+										物品名称:
+										<span style="margin-left: 5px">{{ k.name }}</span>
+										<br />
+										物品数量:
+										<span style="margin-left: 5px">{{ k.num }}</span>
+										<br />
+										入库时间:
+										<span style="margin-left: 5px">{{ parseTime(k.inTime) }}</span>
+									</div>
+									<div
+										slot="reference"
+										class="hoverDiv"
+										:style="{
+											cursor: j.enabled === 0 ? 'not-allowed' : 'pointer',
+											background:
+												j.enabled === 1
+													? j.status === 0
+														? '#d3d3d3'
+														: '#16DC09'
+													: '#ff0000',
+										}" />
+								</el-popover>
+							</div>
+						</el-row>
+					</el-col>
+				</el-row>
+				<el-row>
+					<el-col :span="24">
+						<el-row type="flex" class="flex-warp">
+							<div
+								class="dashboard-layout-item"
+								v-for="j in wareData.filter(
+									(item) => item.arrange === (i - 1) * 4 + 3
+								)"
+								:key="j.id + j.name"
+								:title="j.name">
+								<div class="y-coordinate coordinate" v-if="j.col === 1">
+									{{ j.arrange }}
+								</div>
+								<el-popover
+									placement="top-start"
+									:title="j.name"
+									width="200"
+									trigger="click"
+									@show="getLocationInfo(j.id)">
+									<div v-for="(k, index) in goodsData" :key="index">
+										物品名称:
+										<span style="margin-left: 5px">{{ k.name }}</span>
+										<br />
+										物品数量:
+										<span style="margin-left: 5px">{{ k.num }}</span>
+										<br />
+										入库时间:
+										<span style="margin-left: 5px">{{ parseTime(k.inTime) }}</span>
+									</div>
+									<div
+										slot="reference"
+										class="hoverDiv"
+										:style="{
+											cursor: j.enabled === 0 ? 'not-allowed' : 'pointer',
+											background:
+												j.enabled === 1
+													? j.status === 0
+														? '#d3d3d3'
+														: '#16DC09'
+													: '#ff0000',
+										}" />
+								</el-popover>
+							</div>
+						</el-row>
+						<el-row type="flex" class="flex-warp">
+							<div
+								class="dashboard-layout-item"
+								v-for="j in wareData.filter((item) => item.arrange === i * 4)"
+								:key="j.id + j.name"
+								:title="j.name">
+								<div class="y-coordinate coordinate" v-if="j.col === 1">
+									{{ j.arrange }}
+								</div>
+								<el-popover
+									placement="top-start"
+									:title="j.name"
+									width="200"
+									trigger="click"
+									@show="getLocationInfo(j.id)">
+									<div v-for="(k, index) in goodsData" :key="index">
+										物品名称:
+										<span style="margin-left: 5px">{{ k.name }}</span>
+										<br />
+										物品数量:
+										<span style="margin-left: 5px">{{ k.num }}</span>
+										<br />
+										入库时间:
+										<span style="margin-left: 5px">{{ parseTime(k.inTime) }}</span>
+									</div>
+									<div
+										slot="reference"
+										class="hoverDiv"
+										:style="{
+											cursor: j.enabled === 0 ? 'not-allowed' : 'pointer',
+											background:
+												j.enabled === 1
+													? j.status === 0
+														? '#d3d3d3'
+														: '#16DC09'
+													: '#ff0000',
+										}" />
+								</el-popover>
+							</div>
+						</el-row>
+					</el-col>
+				</el-row>
+				<el-divider class="divider" v-if="i < listQuery.total"></el-divider>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script>
+import { listByWarehouse } from '@/api/warehouse/warehouseLocation';
+import { getWarehouseRealtimeLocation } from '@/api/warehouse/warehouseRealtimeLocation';
+
+export default {
+	data() {
+		return {
+			listQuery: {
+				layer: 1,
+				warehouseId: '',
+				total: 0,
+			},
+			wareData: [],
+			goodsData: [],
+			formConfig: [
+				{
+					type: 'select',
+					label: '选择层',
+					selectOptions: [
+						{ id: 1, name: '1' },
+						{ id: 2, name: '2' },
+						{ id: 3, name: '3' },
+						{ id: 4, name: '4' },
+					],
+					param: 'value',
+					filterable: true,
+					defaultSelect: 1,
+					clearable: false,
+				},
+				{
+					type: 'button',
+					btnName: '搜索',
+					name: 'search',
+					color: 'primary',
+				},
+			],
+		};
+	},
+	components: {},
+	created() {
+		let str = this.$router.currentRoute.path;
+		let lastIndex = str.lastIndexOf('/');
+		this.listQuery.warehouseId = str.slice(lastIndex + 1);
+		this.getDataList();
+	},
+	methods: {
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.layer = val.value;
+					this.getDataList();
+					break;
+				case 'export':
+					// this.handleExport(this.aId);
+					break;
+				default:
+					console.log(val);
+			}
+		},
+		// 获取数据列表
+		getDataList() {
+			listByWarehouse(this.listQuery).then((response) => {
+				this.wareData = response.data;
+				this.listQuery.total = Math.ceil(response.data.length / 120);
+			});
+		},
+		getLocationInfo(id) {
+			getWarehouseRealtimeLocation(id).then((response) => {
+				this.goodsData = response.data;
+			});
+		},
+	},
+};
+</script>
+
+<style lang="scss" scoped>
+.mainbody {
+	display: flex;
+	flex-direction: column;
+	justify-content: space-around;
+	min-width: 80vw;
+	border-radius: 5px;
+	padding-top: 25px;
+}
+.flex-warp {
+	flex-wrap: nowrap;
+}
+.dashboard-layout-item {
+	width: 30px;
+	height: 30px;
+	background-color: #d3d3d3;
+	border-radius: 2px;
+	margin: 0 6px 8px 0;
+	position: relative;
+	&:nth-child(2n) {
+		margin-right: 30px;
+	}
+	&:first-child {
+		margin-left: 40px;
+	}
+	&:last-child {
+		margin-right: 30px;
+	}
+	.coordinate {
+		font-weight: bold;
+		font-size: 18px;
+	}
+	.x-coordinate {
+		position: absolute;
+		top: -25px;
+		text-align: center;
+		width: 100%;
+	}
+	.y-coordinate {
+		position: absolute;
+		line-height: 30px;
+		text-align: center;
+		width: 20px;
+		height: 30px;
+		left: -25px;
+	}
+}
+.hoverDiv {
+	width: 100%;
+	height: 30px;
+	&:hover {
+		border: 1px #000000 dashed;
+		transform: scale(1.3);
+	}
+}
+.el-divider--horizontal {
+	margin: 0 0 8px 0;
+}
+.el-divider {
+	background-color: black;
+}
+.tips {
+	position: absolute;
+	top: 22px;
+	right: 120px;
+}
+</style>

src/views/warehouse/warehouse-report/inventoryList/index.vue

@@ -0,0 +1,178 @@
+<template>
+	<div class="app-container">
+		<!-- 搜索工作栏 -->
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
+
+		<!-- 列表 -->
+		<base-table
+			v-loading="dataListLoading"
+			:table-props="tableProps"
+			:page="listQuery.pageNo"
+			:limit="listQuery.pageSize"
+			:max-height="tableH"
+			:table-data="tableData">
+		</base-table>
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getDataList" />
+
+	</div>
+</template>
+
+<script>
+import basicPage from '../../mixins/basic-page';
+import { parseTime } from '../../mixins/code-filter';
+import {
+	getWarehouseRealtimeHisPage,
+} from '@/api/warehouse/warehouseRealtime';
+import { getMaterialList } from '@/api/base/material';
+import tableHeightMixin from '@/mixins/tableHeightMixin';
+import { listData } from '@/api/system/dict/data';
+import { publicFormatter } from '@/utils/dict';
+
+const tableProps = [
+	{
+		prop: 'warehouseName',
+		label: '仓库名称',
+	},
+	{
+		prop: 'warehouseAreaName',
+		label: '库区名称',
+	},
+	{
+		prop: 'name',
+		label: '物品名称',
+	},
+	{
+		prop: 'code',
+		label: '物品编码',
+	},
+	{
+		prop: 'spec',
+		label: '物品规格',
+	},
+	{
+		prop: 'goodsBatch',
+		label: '物品批次',
+	},
+	{
+		prop: 'num',
+		label: '出入库数量',
+	},
+	{
+		prop: 'operateStatus',
+		label: '操作状态',
+		filter: publicFormatter('warehouse_operate_status'),
+	},
+	{
+		prop: 'operateTime',
+		label: '操作时间',
+		filter: parseTime,
+    width: 150,
+	},
+	{
+		prop: 'operator',
+		label: '操作人',
+	},
+];
+
+export default {
+	mixins: [basicPage,tableHeightMixin],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getWarehouseRealtimeHisPage,
+			},
+			tableData: [],
+			tableProps,
+			drawerVisible: false,
+			formConfig: [
+				{
+					type: 'select',
+					label: '物品名称',
+					selectOptions: [],
+					param: 'goodsId',
+					defaultSelect: '',
+					filterable: true,
+				},
+				{
+					type: 'input',
+					label: '操作人',
+					placeholder: '操作人',
+					param: 'operator',
+				},
+				{
+					type: 'select',
+					label: '操作状态',
+					selectOptions: [],
+					param: 'status',
+					defaultSelect: '',
+					filterable: true,
+					labelField: 'label',
+					valueField: 'value',
+				},
+				{
+					type: 'datePicker',
+					label: '操作时间',
+					dateType: 'daterange',
+					format: 'yyyy-MM-dd',
+          valueFormat: "timestamp",
+					rangeSeparator: '-',
+					startPlaceholder: '开始时间',
+					endPlaceholder: '结束时间',
+					param: 'searchTime',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+			],
+		};
+	},
+	components: {
+	},
+	created() {
+		const queryParams = {
+			pageNo: 1,
+			pageSize: 99,
+			dictType: 'warehouse_operate_status',
+		};
+		listData(queryParams).then((response) => {
+			this.formConfig[2].selectOptions = response.data.list;
+		});
+		getMaterialList().then((response) => {
+			this.formConfig[0].selectOptions = response.data;
+		});
+	},
+	methods: {
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 10;
+					this.listQuery.goodsId = val.goodsId;
+					this.listQuery.operator = val.operator;
+					this.listQuery.operateStatus = val.status;
+					this.listQuery.operateTime = val.searchTime?val.searchTime:null;
+					this.getDataList();
+					break;
+				default:
+					console.log(val);
+			}
+		},
+	},
+};
+</script>
+<style>
+.app-container .el-table .el-table__cell {
+	padding: 0;
+	height: 35px;
+}
+</style>

src/views/warehouse/warehouse-report/locationList/add-or-updata.vue

@@ -0,0 +1,79 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: zwq
+ * @LastEditTime: 2023-11-23 16:09:47
+ * @Description:
+-->
+<template>
+	<base-table
+		:table-props="tableProps"
+		:page="listQuery.pageNo"
+		:limit="listQuery.pageSize"
+		:height="300"
+		:table-data="tableData"
+		v-if="tableData.length" />
+	<!-- 没有数据 -->
+	<div class="no-data-bg" v-else></div>
+</template>
+
+<script>
+import { parseTime } from '../../mixins/code-filter';
+import { getWarehouseLocationHisDet } from '@/api/warehouse/warehouseRealtimeLocation';
+
+const tableProps = [
+	{
+		prop: 'name',
+		label: '物品名称',
+	},
+	{
+		prop: 'code',
+		label: '物品编码',
+	},
+	{
+		prop: 'spec',
+		label: '物品规格',
+	},
+	{
+		prop: 'batchCode',
+		label: '物品批次',
+	},
+	{
+		prop: 'num',
+		label: '数量',
+	},
+	{
+		prop: 'allowTime',
+		label: '允许留存时长(天)',
+    width: 150
+	},
+	{
+		prop: 'remark',
+		label: '备注',
+	},
+];
+export default {
+	data() {
+		return {
+			tableData: [],
+			tableProps,
+			listQuery: {
+				pageSize: 100,
+				pageNo: 1,
+				total: 1,
+			},
+			dataListLoading: false,
+		};
+	},
+	methods: {
+		// 获取数据列表
+		init(id) {
+			this.dataListLoading = true;
+			getWarehouseLocationHisDet(id).then((response) => {
+				this.tableData = response.data;
+				this.dataListLoading = false;
+			});
+		},
+	},
+};
+</script>

src/views/warehouse/warehouse-report/locationList/index.vue

@@ -0,0 +1,219 @@
+<template>
+	<div class="app-container">
+		<!-- 搜索工作栏 -->
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
+
+		<!-- 列表 -->
+		<base-table
+			v-loading="dataListLoading"
+			:table-props="tableProps"
+			:page="listQuery.pageNo"
+			:limit="listQuery.pageSize"
+			:table-data="tableData">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				:width="100"
+				label="库位详情"
+				:method-list="tableBtn"
+				@clickBtn="handleClick" />
+		</base-table>
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getDataList" />
+
+		<!-- 对话框(添加 / 修改) -->
+		<base-dialog
+			:dialogTitle="addOrEditTitle"
+			:dialogVisible="addOrUpdateVisible"
+			:before-close="handleCancel"
+			width="50%">
+			<add-or-update
+				ref="addOrUpdate"
+				@refreshDataList="successSubmit"></add-or-update>
+			<slot name="footer">
+				<el-row slot="footer" type="flex" justify="end">
+					<el-col :span="24">
+						<el-button size="small" class="btnTextStyle" @click="handleCancel">
+							取消
+						</el-button>
+					</el-col>
+				</el-row>
+			</slot>
+		</base-dialog>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './add-or-updata';
+import basicPage from '../../mixins/basic-page';
+import { parseTime } from '../../mixins/code-filter';
+import {
+	getWarehouseLocationHisPage,
+} from '@/api/warehouse/warehouseRealtimeLocation';
+import { listData } from '@/api/system/dict/data';
+import { publicFormatter } from '@/utils/dict';
+
+const tableProps = [
+	{
+		prop: 'warehouseName',
+		label: '仓库名称',
+	},
+	{
+		prop: 'name',
+		label: '库区名称',
+	},
+	{
+		prop: 'code',
+		label: '库位编码',
+	},
+	{
+		prop: 'type',
+		label: '库位类型',
+		filter: publicFormatter('location_type'),
+	},
+	{
+		prop: 'palletCode',
+		label: '托盘编码',
+	},
+	{
+		prop: 'palletCode',
+		label: '物品名称',
+	},
+	{
+		prop: 'operateStatus',
+		label: '操作状态',
+		filter: publicFormatter('warehouse_operate_status'),
+	},
+	{
+		prop: 'createTime',
+		label: '操作时间',
+		filter: parseTime,
+		minWidth: 100,
+	},
+	{
+		prop: 'creator',
+		label: '操作人',
+	},
+];
+
+export default {
+	mixins: [basicPage],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getWarehouseLocationHisPage,
+			},
+			listQuery: {
+				storageType: 1,
+			},
+			tableData: [],
+			tableProps,
+			tableBtn: [
+				this.$auth.hasPermi(`raw-material:warehouse-location-his:query`)
+					? {
+							type: 'detail',
+							btnName: '详情',
+					  }
+					: undefined,
+			].filter((v) => v),
+			drawerVisible: false,
+			formConfig: [
+				{
+					type: 'input',
+					label: '库位编码',
+					placeholder: '库位编码',
+					param: 'kcode',
+				},
+				{
+					type: 'input',
+					label: '托盘编码',
+					placeholder: '托盘编码',
+					param: 'tcode',
+				},
+				{
+					type: 'select',
+					label: '操作状态',
+					selectOptions: [],
+					param: 'status',
+					defaultSelect: '',
+					filterable: true,
+					labelField: 'label',
+					valueField: 'value',
+				},
+				{
+					type: 'datePicker',
+					label: '操作时间',
+					dateType: 'daterange',
+					format: 'yyyy-MM-dd',
+          valueFormat: "timestamp",
+					rangeSeparator: '-',
+					startPlaceholder: '开始时间',
+					endPlaceholder: '结束时间',
+					param: 'searchTime',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+			],
+		};
+	},
+	components: {
+		AddOrUpdate,
+	},
+	created() {
+		const queryParams = {
+			pageNo: 1,
+			pageSize: 99,
+			dictType: 'warehouse_operate_status',
+		};
+		listData(queryParams).then((response) => {
+			this.formConfig[2].selectOptions = response.data.list;
+		});
+	},
+	methods: {
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 10;
+					this.listQuery.locationCode= val.kcode;
+					this.listQuery.palletCode = val.tcode;
+					this.listQuery.operateStatus = val.status;
+					this.listQuery.createTime = val.searchTime?val.searchTime:null;
+					this.getDataList();
+					break;
+				default:
+					console.log(val);
+			}
+		},
+		otherMethods(val) {
+			if (val.type === 'detail') {
+				this.addOrUpdateVisible = true;
+				this.addOrEditTitle = val.data.name + ' -产品信息';
+				this.$nextTick(() => {
+					this.$refs.addOrUpdate.init(val.data.id);
+				});
+			}
+		},
+		handleCancel() {
+			this.addOrUpdateVisible = false;
+			this.addOrEditTitle = '';
+		},
+	},
+};
+</script>
+<style>
+.app-container .el-table .el-table__cell {
+	padding: 0;
+	height: 35px;
+}
+</style>

src/views/warehouse/warehouse-report/relocationHistory/add-or-updata.vue

@@ -0,0 +1,118 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-08-09 17:00:46
+ * @Description:
+-->
+<template>
+	<base-table
+		:table-props="tableProps"
+		:page="listQuery.pageNo"
+		:limit="listQuery.pageSize"
+		:height="300"
+		:table-data="tableData"
+		v-if="tableData.length > 1" />
+    <!-- 一条数据 -->
+	<div v-else-if="tableData.length === 1">
+		<el-form
+			:model="tableData[0]"
+			ref="dataForm"
+			label-width="100px"
+			label-position="top">
+			<el-row :gutter="20">
+				<el-col :span="12">
+					<el-form-item label="物品名称" prop="name">
+						<el-input v-model="tableData[0].name" readonly />
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="物品编码" prop="code">
+						<el-input v-model="tableData[0].code" readonly />
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="物品规格" prop="specifications">
+						<el-input v-model="tableData[0].specifications" readonly />
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="物品批次" prop="batchCode">
+						<el-input v-model="tableData[0].batchCode" readonly />
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="数量" prop="num">
+						<el-input v-model="tableData[0].num" readonly />
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="物品单位" prop="name">
+						<el-input v-model="tableData[0].name" readonly />
+					</el-form-item>
+				</el-col>
+			</el-row>
+		</el-form>
+	</div>
+	<!-- 没有数据 -->
+	<div class="no-data-bg" v-else></div>
+</template>
+
+<script>
+import { publicFormatter } from '@/utils/dict';
+import { getWarehouseLocationHisDet } from '@/api/warehouse/warehouseRealtimeLocation';
+
+const tableProps = [
+	{
+		prop: 'name',
+		label: '物品名称',
+	},
+	{
+		prop: 'code',
+		label: '物品编码',
+		width: 160,
+	},
+	{
+		prop: 'specifications',
+		label: '物品规格',
+	},
+	{
+		prop: 'batchCode',
+		label: '物品批次',
+	},
+	{
+		prop: 'num',
+		label: '数量',
+	},
+	{
+		prop: 'unit',
+		label: '单位',
+		filter: publicFormatter('unit_dict'),
+		width: 60,
+	},
+];
+export default {
+	data() {
+		return {
+			tableData: [],
+			tableProps,
+			listQuery: {
+				pageSize: 100,
+				pageNo: 1,
+				total: 1,
+			},
+			dataListLoading: false,
+		};
+	},
+	methods: {
+		// 获取数据列表
+		init(id) {
+			this.dataListLoading = true;
+			getWarehouseLocationHisDet(id).then((response) => {
+				this.tableData = response.data;
+				this.dataListLoading = false;
+			});
+		},
+	},
+};
+</script>

src/views/warehouse/warehouse-report/relocationHistory/index.vue

@@ -0,0 +1,203 @@
+<template>
+	<div class="app-container">
+		<!-- 搜索工作栏 -->
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
+
+		<!-- 列表 -->
+		<base-table
+			v-loading="dataListLoading"
+			:table-props="tableProps"
+			:page="listQuery.pageNo"
+			:limit="listQuery.pageSize"
+			:max-height="tableH"
+			:table-data="tableData">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				:width="100"
+				label="库位详情"
+				:method-list="tableBtn"
+				@clickBtn="handleClick" />
+		</base-table>
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getDataList" />
+
+		<!-- 对话框(添加 / 修改) -->
+		<base-dialog
+			:dialogTitle="addOrEditTitle"
+			:dialogVisible="addOrUpdateVisible"
+			:before-close="handleCancel"
+			width="50%">
+			<add-or-update
+				ref="addOrUpdate"
+				@refreshDataList="successSubmit"></add-or-update>
+			<slot name="footer">
+				<el-row slot="footer" type="flex" justify="end">
+					<el-col :span="24">
+						<el-button size="small" class="btnTextStyle" @click="handleCancel">
+							取消
+						</el-button>
+					</el-col>
+				</el-row>
+			</slot>
+		</base-dialog>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './add-or-updata';
+import basicPage from '../../mixins/basic-page';
+import { parseTime } from '../../mixins/code-filter';
+import {
+	getMoveHisPage,
+} from '@/api/warehouse/warehouseRealtimeLocation';
+import { publicFormatter } from '@/utils/dict';
+import tableHeightMixin from '@/mixins/tableHeightMixin';
+
+const tableProps = [
+	{
+		prop: 'oldWarehouseName',
+		label: '源仓库名称',
+	},
+	{
+		prop: 'oldWarehouseAreaName',
+		label: '源库区名称',
+	},
+	{
+		prop: 'oldCode',
+		label: '源库位编码',
+	},
+	{
+		prop: 'palletCode',
+		label: '移动托盘编码',
+	},
+	{
+		prop: 'goodName',
+		label: '物品名称',
+		filter: (val) => (val ? val.join(',') : '-'),
+	},
+	{
+		prop: 'newWarehouseName',
+		label: '目的仓库',
+	},
+	{
+		prop: 'newWarehouseAreaName',
+		label: '目的库区',
+	},
+	{
+		prop: 'newCode',
+		label: '目的库位编码',
+    width: 150,
+	},
+	{
+		prop: 'createTime',
+		label: '操作时间',
+		filter: parseTime,
+    width: 150,
+	},
+	{
+		prop: 'creator',
+		label: '操作人',
+	},
+];
+
+export default {
+	mixins: [basicPage,tableHeightMixin],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getMoveHisPage,
+			},
+			tableData: [],
+			tableProps,
+			tableBtn: [
+				this.$auth.hasPermi(`raw-material:warehouse-location-his:query`)
+					? {
+							type: 'detail',
+							btnName: '详情',
+					  }
+					: undefined,
+			].filter((v) => v),
+			drawerVisible: false,
+			formConfig: [
+				{
+					type: 'input',
+					label: '库位编码',
+					placeholder: '库位编码',
+					param: 'kcode',
+				},
+				{
+					type: 'input',
+					label: '托盘编码',
+					placeholder: '托盘编码',
+					param: 'tcode',
+				},
+				{
+					type: 'datePicker',
+					label: '操作时间',
+					dateType: 'daterange',
+					format: 'yyyy-MM-dd',
+          valueFormat: "timestamp",
+					rangeSeparator: '-',
+					startPlaceholder: '开始时间',
+					endPlaceholder: '结束时间',
+					param: 'searchTime',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+			],
+		};
+	},
+	components: {
+		AddOrUpdate,
+	},
+	created() {
+	},
+	methods: {
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 10;
+					this.listQuery.locationCode = val.kcode;
+					this.listQuery.palletCode = val.tcode;
+					this.listQuery.operateStatus = val.status;
+					this.listQuery.createTime = val.searchTime?val.searchTime:null;
+					this.getDataList();
+					break;
+				default:
+					console.log(val);
+			}
+		},
+		otherMethods(val) {
+			if (val.type === 'detail') {
+				this.addOrUpdateVisible = true;
+				this.addOrEditTitle = '详情';
+				this.$nextTick(() => {
+					this.$refs.addOrUpdate.init(val.data.id);
+				});
+			}
+		},
+		handleCancel() {
+			this.addOrUpdateVisible = false;
+			this.addOrEditTitle = '';
+		},
+	},
+};
+</script>
+<style>
+.app-container .el-table .el-table__cell {
+	padding: 0;
+	height: 35px;
+}
+</style>

src/views/warehouse/warehouse-report/warehouseHis/index.vue

@@ -0,0 +1,178 @@
+<template>
+	<div class="app-container">
+		<!-- 搜索工作栏 -->
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
+
+		<!-- 列表 -->
+		<base-table
+			v-loading="dataListLoading"
+			:table-props="tableProps"
+			:page="listQuery.pageNo"
+			:limit="listQuery.pageSize"
+			:max-height="tableH"
+			:table-data="tableData">
+		</base-table>
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getDataList" />
+
+	</div>
+</template>
+
+<script>
+import basicPage from '../../mixins/basic-page';
+import { parseTime } from '../../mixins/code-filter';
+import {
+	getWarehouseRealtimeHisPage,
+} from '@/api/warehouse/warehouseRealtime';
+import { getMaterialList } from '@/api/base/material';
+import tableHeightMixin from '@/mixins/tableHeightMixin';
+import { listData } from '@/api/system/dict/data';
+import { publicFormatter } from '@/utils/dict';
+
+const tableProps = [
+	{
+		prop: 'warehouseName',
+		label: '仓库名称',
+	},
+	{
+		prop: 'warehouseAreaName',
+		label: '库区名称',
+	},
+	{
+		prop: 'name',
+		label: '物品名称',
+	},
+	{
+		prop: 'code',
+		label: '物品编码',
+	},
+	{
+		prop: 'spec',
+		label: '物品规格',
+	},
+	{
+		prop: 'goodsBatch',
+		label: '物品批次',
+	},
+	{
+		prop: 'num',
+		label: '出入库数量',
+	},
+	{
+		prop: 'operateStatus',
+		label: '操作状态',
+		filter: publicFormatter('warehouse_operate_status'),
+	},
+	{
+		prop: 'operateTime',
+		label: '操作时间',
+		filter: parseTime,
+    width: 150,
+	},
+	{
+		prop: 'operator',
+		label: '操作人',
+	},
+];
+
+export default {
+	mixins: [basicPage,tableHeightMixin],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getWarehouseRealtimeHisPage,
+			},
+			tableData: [],
+			tableProps,
+			drawerVisible: false,
+			formConfig: [
+				{
+					type: 'select',
+					label: '物品名称',
+					selectOptions: [],
+					param: 'goodsId',
+					defaultSelect: '',
+					filterable: true,
+				},
+				{
+					type: 'input',
+					label: '操作人',
+					placeholder: '操作人',
+					param: 'operator',
+				},
+				{
+					type: 'select',
+					label: '操作状态',
+					selectOptions: [],
+					param: 'status',
+					defaultSelect: '',
+					filterable: true,
+					labelField: 'label',
+					valueField: 'value',
+				},
+				{
+					type: 'datePicker',
+					label: '操作时间',
+					dateType: 'daterange',
+					format: 'yyyy-MM-dd',
+          valueFormat: "timestamp",
+					rangeSeparator: '-',
+					startPlaceholder: '开始时间',
+					endPlaceholder: '结束时间',
+					param: 'searchTime',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+			],
+		};
+	},
+	components: {
+	},
+	created() {
+		const queryParams = {
+			pageNo: 1,
+			pageSize: 99,
+			dictType: 'warehouse_operate_status',
+		};
+		listData(queryParams).then((response) => {
+			this.formConfig[2].selectOptions = response.data.list;
+		});
+		getMaterialList().then((response) => {
+			this.formConfig[0].selectOptions = response.data;
+		});
+	},
+	methods: {
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 10;
+					this.listQuery.goodsId = val.goodsId;
+					this.listQuery.operator = val.operator;
+					this.listQuery.operateStatus = val.status;
+					this.listQuery.operateTime = val.searchTime?val.searchTime:null;
+					this.getDataList();
+					break;
+				default:
+					console.log(val);
+			}
+		},
+	},
+};
+</script>
+<style>
+.app-container .el-table .el-table__cell {
+	padding: 0;
+	height: 35px;
+}
+</style>

src/views/warehouse/warehouse-report/warehouseLocationHis/add-or-updata.vue

@@ -0,0 +1,129 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-08-09 16:59:34
+ * @Description:
+-->
+<template>
+	<base-table
+		:table-props="tableProps"
+		:page="listQuery.pageNo"
+		:limit="listQuery.pageSize"
+		:height="300"
+		:table-data="tableData"
+		v-if="tableData.length > 1" />
+	<div v-else-if="tableData.length === 1">
+	<el-form
+		:model="tableData[0]"
+		ref="dataForm"
+		label-width="100px"
+    label-position="top">
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="物品名称" prop="name">
+					<el-input
+						v-model="tableData[0].name"
+						readonly />
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="物品编码" prop="code">
+					<el-input
+						v-model="tableData[0].code"
+						readonly />
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="物品规格" prop="specifications">
+					<el-input
+						v-model="tableData[0].specifications"
+						readonly />
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="物品批次" prop="batchCode">
+					<el-input
+						v-model="tableData[0].batchCode"
+						readonly />
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="数量" prop="num">
+					<el-input
+						v-model="tableData[0].num"
+						readonly />
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="物品单位" prop="name">
+					<el-input
+						v-model="tableData[0].name"
+						readonly />
+				</el-form-item>
+			</el-col>
+		</el-row>
+	</el-form>
+</div>
+	<!-- 没有数据 -->
+	<div class="no-data-bg" v-else></div>
+</template>
+
+<script>
+import { publicFormatter } from '@/utils/dict';
+import { getWarehouseLocationHisDet } from '@/api/warehouse/warehouseRealtimeLocation';
+
+const tableProps = [
+	{
+		prop: 'name',
+		label: '物品名称',
+	},
+	{
+		prop: 'code',
+		label: '物品编码',
+		width: 160,
+	},
+	{
+		prop: 'specifications',
+		label: '物品规格',
+	},
+	{
+		prop: 'batchCode',
+		label: '物品批次',
+	},
+	{
+		prop: 'num',
+		label: '数量',
+	},
+	{
+		prop: 'unit',
+		label: '单位',
+		filter: publicFormatter('unit_dict'),
+		width: 60,
+	},
+];
+export default {
+	data() {
+		return {
+			tableData: [],
+			tableProps,
+			listQuery: {
+				pageSize: 100,
+				pageNo: 1,
+				total: 1,
+			},
+			dataListLoading: false,
+		};
+	},
+	methods: {
+		// 获取数据列表
+		init(id) {
+			this.dataListLoading = true;
+			getWarehouseLocationHisDet(id).then((response) => {
+				this.tableData = response.data;
+				this.dataListLoading = false;
+			});
+		},
+	},
+};
+</script>

src/views/warehouse/warehouse-report/warehouseLocationHis/index.vue

@@ -0,0 +1,219 @@
+<template>
+	<div class="app-container">
+		<!-- 搜索工作栏 -->
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
+
+		<!-- 列表 -->
+		<base-table
+			v-loading="dataListLoading"
+			:table-props="tableProps"
+			:page="listQuery.pageNo"
+			:limit="listQuery.pageSize"
+			:max-height="tableH"
+			:table-data="tableData">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				:width="100"
+				label="库位详情"
+				:method-list="tableBtn"
+				@clickBtn="handleClick" />
+		</base-table>
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getDataList" />
+
+		<!-- 对话框(添加 / 修改) -->
+		<base-dialog
+			:dialogTitle="addOrEditTitle"
+			:dialogVisible="addOrUpdateVisible"
+			:before-close="handleCancel"
+			width="50%">
+			<add-or-update
+				ref="addOrUpdate"
+				@refreshDataList="successSubmit"></add-or-update>
+			<slot name="footer">
+				<el-row slot="footer" type="flex" justify="end">
+					<el-col :span="24">
+						<el-button size="small" class="btnTextStyle" @click="handleCancel">
+							取消
+						</el-button>
+					</el-col>
+				</el-row>
+			</slot>
+		</base-dialog>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './add-or-updata';
+import basicPage from '../../mixins/basic-page';
+import { parseTime } from '../../mixins/code-filter';
+import {
+	getWarehouseLocationHisPage,
+} from '@/api/warehouse/warehouseRealtimeLocation';
+import { listData } from '@/api/system/dict/data';
+import { publicFormatter } from '@/utils/dict';
+import tableHeightMixin from '@/mixins/tableHeightMixin';
+
+const tableProps = [
+	{
+		prop: 'warehouseName',
+		label: '仓库名称',
+	},
+	{
+		prop: 'warehouseAreaName',
+		label: '库区名称',
+	},
+	{
+		prop: 'code',
+		label: '库位编码',
+	},
+	{
+		prop: 'type',
+		label: '库位类型',
+		filter: publicFormatter('location_type'),
+	},
+	{
+		prop: 'palletCode',
+		label: '托盘编码',
+	},
+	{
+		prop: 'goodName',
+		label: '物品名称',
+		filter: (val) => (val ? val.join(',') : '-'),
+	},
+	{
+		prop: 'operateStatus',
+		label: '操作状态',
+		filter: publicFormatter('warehouse_operate_status'),
+	},
+	{
+		prop: 'createTime',
+		label: '操作时间',
+		filter: parseTime,
+    width: 150,
+	},
+	{
+		prop: 'creator',
+		label: '操作人',
+	},
+];
+
+export default {
+	mixins: [basicPage,tableHeightMixin],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getWarehouseLocationHisPage,
+			},
+			tableData: [],
+			tableProps,
+			tableBtn: [
+				this.$auth.hasPermi(`raw-material:warehouse-location-his:query`)
+					? {
+							type: 'detail',
+							btnName: '详情',
+					  }
+					: undefined,
+			].filter((v) => v),
+			drawerVisible: false,
+			formConfig: [
+				{
+					type: 'input',
+					label: '库位编码',
+					placeholder: '库位编码',
+					param: 'kcode',
+				},
+				{
+					type: 'input',
+					label: '托盘编码',
+					placeholder: '托盘编码',
+					param: 'tcode',
+				},
+				{
+					type: 'select',
+					label: '操作状态',
+					selectOptions: [],
+					param: 'status',
+					defaultSelect: '',
+					filterable: true,
+					labelField: 'label',
+					valueField: 'value',
+				},
+				{
+					type: 'datePicker',
+					label: '操作时间',
+					dateType: 'daterange',
+					format: 'yyyy-MM-dd',
+          valueFormat: "timestamp",
+					rangeSeparator: '-',
+					startPlaceholder: '开始时间',
+					endPlaceholder: '结束时间',
+					param: 'searchTime',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+			],
+		};
+	},
+	components: {
+		AddOrUpdate,
+	},
+	created() {
+		const queryParams = {
+			pageNo: 1,
+			pageSize: 99,
+			dictType: 'warehouse_operate_status',
+		};
+		listData(queryParams).then((response) => {
+			this.formConfig[2].selectOptions = response.data.list;
+		});
+	},
+	methods: {
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 10;
+					this.listQuery.locationCode= val.kcode;
+					this.listQuery.palletCode = val.tcode;
+					this.listQuery.operateStatus = val.status;
+					this.listQuery.createTime = val.searchTime?val.searchTime:null;
+					this.getDataList();
+					break;
+				default:
+					console.log(val);
+			}
+		},
+		otherMethods(val) {
+			if (val.type === 'detail') {
+				this.addOrUpdateVisible = true;
+				this.addOrEditTitle = '详情';
+				this.$nextTick(() => {
+					this.$refs.addOrUpdate.init(val.data.id);
+				});
+			}
+		},
+		handleCancel() {
+			this.addOrUpdateVisible = false;
+			this.addOrEditTitle = '';
+		},
+	},
+};
+</script>
+<style>
+.app-container .el-table .el-table__cell {
+	padding: 0;
+	height: 35px;
+}
+</style>