Merge branch 'projects/mes-test' into projects/mes-zhp

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

@@ -49,6 +49,14 @@ export function getWarehouseAreaList(id) {
   })
 }
 
+// 获得库区设置列表
+export function getWarehouseAreaListAll() {
+  return request({
+    url: '/extend/warehouse-area/listAll',
+    method: 'get'
+  })
+}
+
 // 获得库区设置分页
 export function getWarehouseAreaPage(query) {
   return request({

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

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-11-02 16:20:15
  * @LastEditors: zwq
- * @LastEditTime: 2024-08-08 15:56:30
+ * @LastEditTime: 2024-08-21 11:03:14
  * @Description:
  */
 import request from '@/utils/request'
@@ -41,6 +41,13 @@ export function getWarehouseLocation(id) {
   })
 }
 
+// 库位存储详情
+export function getStoreInfo(id) {
+  return request({
+    url: '/extend/warehouse-location/getStoreInfo?id=' + id,
+    method: 'get'
+  })
+}
 // 获得库位设置列表
 export function getWarehouseLocationTree() {
   return request({

src/api/warehouse/warehouseRealtime.js

@@ -63,6 +63,14 @@ export function getWarehouseRealtimePage(data) {
   })
 }
 
+// 获得库存列表分页
+export function inventoryPage(data) {
+  return request({
+    url: '/extend/warehouse-realtime/allPage',
+    method: 'post',
+    data: data
+  })
+}
 // 获得出入库-无库位-历史分页
 export function getWarehouseRealtimeHisPage(data) {
   return request({

src/mixins/basic-add.js

@@ -0,0 +1,121 @@
+/*
+ * @Author: zwq
+ * @Date: 2022-08-24 11:19:43
+ * @LastEditors: zwq
+ * @LastEditTime: 2023-11-02 15:33:39
+ * @Description:
+ */
+import { listData } from "@/api/system/dict/data";
+export default {
+  data() {
+    /* eslint-disable */
+    return {
+      urlOptions: {
+        createURL: '',
+        updateURL: '',
+        infoURL: '',
+        codeURL: '',
+        getOption: false, //是否加载获取下拉框方法
+        isGetCode: false, //是否加载获取code方法
+        getDictList: false, //是否加载获取数据字典方法
+        optionArrUrl: [], //需要获取下拉框的方法数组
+        optionArr: {}, //需要获取下拉框的方法数组的返回结果
+        dictList: {}, //需要获取数据字典的方法数组的返回结果
+      },
+      visible: false,
+      setData: false
+    }
+  },
+  created() {
+  },
+  activated() {
+  },
+  methods: {
+    init(id) {
+      this.dataForm.id = id || "";
+      this.visible = true;
+      if (this.urlOptions.getOption) {
+        this.getArr()
+      }
+      if (this.urlOptions.getDictList) {
+        this.getDict()
+      }
+      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(() => {
+          });
+      });
+    },
+    /** 查询字典数据列表 */
+    getDict() {
+      this.nameList.forEach((item,index)=>{
+        const queryParams = {
+          pageNo: 1,
+          pageSize: 99,
+          dictType: item,
+        }
+        listData(queryParams).then(response => {
+          this.$set(this.urlOptions.dictList, `dict${index}`, response.data.list)
+        });
+      })
+    },
+    // 表单提交
+    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() {
+      if (this.$refs.dataForm!==undefined) {
+          this.$refs.dataForm.resetFields();
+      }
+    }
+  }
+}

src/mixins/basic-page.js

@@ -0,0 +1,175 @@
+/*
+ * @Author: zwq
+ * @Date: 2022-08-24 11:19:43
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-08-14 15:17:01
+ * @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,
+      addOrUpdate: 'addOrUpdate'
+    }
+  },
+  created() {
+  },
+  mounted() {
+    this.getDataList()
+  },
+  methods: {
+    // 获取数据列表
+    getDataList() {
+      this.dataListLoading = true;
+      this.urlOptions.getDataListURL(this.listQuery).then(response => {
+        if (response.hasOwnProperty('data')) {
+          this.tableData = response.data.list;
+          this.listQuery.total = response.data.total;
+        } else {
+          this.tableData = []
+        }
+        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") {
+        if (val.data.name) {
+          this.deleteHandle(val.data.id, val.data.name)
+        } else {
+          this.setDelete(val.data)
+        }
+      } else if (val.type === "change") {
+        this.changeStatus(val.data.id)
+      } else {
+        this.otherMethods(val)
+      }
+    },
+    // 删除
+    deleteHandle(id, name) {
+      this.$modal
+        .delConfirm(name)
+        .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[this.addOrUpdate].formClear()
+      this.addOrUpdateVisible = false
+      this.addOrEditTitle = ''
+      this.addOrUpdate = 'addOrUpdate'
+    },
+    handleConfirm() {
+      this.$refs[this.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/mixins/code-filter.js

@@ -0,0 +1,73 @@
+
+/*
+ * @Date: 2020-12-29 16:49:28
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-08-21 11:14:58
+ * @FilePath: \basic-admin\src\filters\basicData\index.js
+ * @Description:
+ */
+
+const table = {
+  lineStatus: {
+    1: '生产中',
+    2: '停止',
+    3: '未知',
+  },
+  deactivate: {
+    1: '启用',
+    0: '停用',
+  },
+  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 default function (dictTable) {
+  return function (val) {
+    return table?.[dictTable]?.[val]
+  }
+}

src/views/base/coreCustomer/add-or-updata.vue

@@ -53,7 +53,7 @@
 </template>
 
 <script>
-import basicAdd from '../../core/mixins/basic-add';
+import basicAdd from '@/mixins/basic-add';
 import { createCustomer, updateCustomer, getCustomer, getCode } from "@/api/base/coreCustomer";
 
 export default {

src/views/base/coreCustomer/index.vue

@@ -9,6 +9,7 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
+				:max-height="tableH"
 			:table-data="tableData">
 			<method-btn
 				v-if="tableBtn.length"
@@ -39,18 +40,20 @@
 
 <script>
 import AddOrUpdate from './add-or-updata';
-import basicPage from '../../core/mixins/basic-page';
+import basicPage from '@/mixins/basic-page';
 import { parseTime } from '../../core/mixins/code-filter';
 import {
 	getCustomerPage,
 	deleteCustomer
 } from '@/api/base/coreCustomer';
+import tableHeightMixin from '@/mixins/tableHeightMixin';
 
 const tableProps = [
 	{
 		prop: 'createTime',
 		label: '添加时间',
-		filter: parseTime
+		filter: parseTime,
+    width: 150
 	},
 	{
 		prop: 'name',
@@ -58,7 +61,8 @@ const tableProps = [
 	},
 	{
 		prop: 'code',
-		label: '客户编码'
+		label: '客户编码',
+    width: 150
 	},
 	{
 		prop: 'contact',
@@ -79,7 +83,7 @@ const tableProps = [
 ];
 
 export default {
-	mixins: [basicPage],
+	mixins: [basicPage,tableHeightMixin],
 	data() {
 		return {
 			urlOptions: {
@@ -133,27 +137,18 @@ export default {
 	},
 	created() {},
 	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;
-    //   });
-    // },
 		buttonClick(val) {
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.name = val.name ? val.name : undefined;
 					this.getDataList();
 					break;
 				case 'reset':
 					this.$refs.searchBarForm.resetForm();
 					this.listQuery = {
-						pageSize: 10,
+						pageSize: 20,
 						pageNo: 1,
 						total: 1,
 					};

src/views/base/coreSupplier/add-or-updata.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
- * @LastEditors: DY
+ * @LastEditors: zwq
- * @LastEditTime: 2023-11-22 10:27:43
+ * @LastEditTime: 2024-08-14 15:15:45
  * @Description:
 -->
 <template>
@@ -53,7 +53,7 @@
 </template>
 
 <script>
-import basicAdd from '../../core/mixins/basic-add';
+import basicAdd from '@/mixins/basic-add';
 import { createCoreSupplier, updateCoreSupplier, getCoreSupplier, getCode } from "@/api/base/coreSupplier";
 
 export default {

src/views/base/coreSupplier/index.vue

@@ -9,6 +9,7 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
+			:max-height="tableH"
 			:table-data="tableData">
 			<method-btn
 				v-if="tableBtn.length"
@@ -39,52 +40,55 @@
 
 <script>
 import AddOrUpdate from './add-or-updata';
-import basicPage from '../../core/mixins/basic-page';
+import basicPage from '@/mixins/basic-page';
 import { parseTime } from '../../core/mixins/code-filter';
 import {
 	getCoreSupplierPage,
-	deleteCoreSupplier
+	deleteCoreSupplier,
 } from '@/api/base/coreSupplier';
+import tableHeightMixin from '@/mixins/tableHeightMixin';
 
 const tableProps = [
 	{
 		prop: 'createTime',
 		label: '添加时间',
-		filter: parseTime
+		filter: parseTime,
+		width: 150,
 	},
 	{
 		prop: 'code',
-		label: '供应商编码'
+		label: '供应商编码',
+		width: 150,
 	},
 	{
 		prop: 'name',
-		label: '供应商名称'
+		label: '供应商名称',
 	},
 	{
 		prop: 'contact',
-		label: '联系人'
+		label: '联系人',
 	},
 	{
 		prop: 'telephone',
-		label: '联系电话'
+		label: '联系电话',
 	},
 	{
 		prop: 'address',
-		label: '地址'
+		label: '地址',
 	},
 	{
 		prop: 'remark',
-		label: '备注'
+		label: '备注',
 	},
 ];
 
 export default {
-	mixins: [basicPage],
+	mixins: [basicPage, tableHeightMixin],
 	data() {
 		return {
 			urlOptions: {
 				getDataListURL: getCoreSupplierPage,
-				deleteURL: deleteCoreSupplier
+				deleteURL: deleteCoreSupplier,
 			},
 			tableProps,
 			tableBtn: [
@@ -94,13 +98,13 @@ export default {
 							btnName: '编辑',
 					  }
 					: undefined,
-          this.$auth.hasPermi(`base:core-supplier:delete`)
+				this.$auth.hasPermi(`base:core-supplier:delete`)
 					? {
 							type: 'delete',
 							btnName: '删除',
 					  }
 					: undefined,
-			].filter((v)=>v),
+			].filter((v) => v),
 			tableData: [],
 			formConfig: [
 				{
@@ -119,11 +123,13 @@ export default {
 					type: 'separate',
 				},
 				{
-					type: this.$auth.hasPermi('base:core-supplier:create') ? 'button' : '',
+					type: this.$auth.hasPermi('base:core-supplier:create')
+						? 'button'
+						: '',
 					btnName: '新增',
 					name: 'add',
 					color: 'success',
-					plain: true
+					plain: true,
 				},
 			],
 		};
@@ -134,14 +140,14 @@ export default {
 	created() {},
 	methods: {
 		// 获取数据列表
-    // getDataList() {
+		// getDataList() {
-    //   this.dataListLoading = true;
+		//   this.dataListLoading = true;
-    //   this.urlOptions.getDataListURL(this.listQuery).then(response => {
+		//   this.urlOptions.getDataListURL(this.listQuery).then(response => {
-    //     this.tableData = response.data.list;
+		//     this.tableData = response.data.list;
-    //     this.listQuery.total = response.data.total;
+		//     this.listQuery.total = response.data.total;
-    //     this.dataListLoading = false;
+		//     this.dataListLoading = false;
-    //   });
+		//   });
-    // },
+		// },
 		buttonClick(val) {
 			switch (val.btnName) {
 				case 'search':

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-22 15:20:51
+ * @LastEditTime: 2024-08-14 15:21:31
  * @Description:
 -->
 <template>
@@ -233,7 +233,7 @@ export default {
 					,'提示')
 					.then(function () {
 						return _this.$modal
-							.delConfirm('名称: ' + row.name)
+							.delConfirm(row.name)
 							.then(function () {
 								return deleteGroupClasses(row.id);
 							})
@@ -245,7 +245,7 @@ export default {
 					});
 			} else {
 				_this.$modal
-					.delConfirm('名称: ' + row.name)
+					.delConfirm(row.name)
 					.then(function () {
 						return deleteGroupClasses(row.id);
 					})

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

@@ -219,7 +219,7 @@ export default {
 		/** 删除按钮操作 */
 		handleDelete(row) {
 			this.$modal
-				.delConfirm('名称: ' + row.name)
+				.delConfirm(row.name)
 				.then(function () {
 					return deleteGroupTeam(row.id);
 				})

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-19 14:09:18
+ * @LastEditTime: 2024-08-14 15:35:06
  * @Description:
 -->
 <template>
@@ -216,7 +216,7 @@ export default {
 		handleDelete(row) {
 			let _this = this;
 			_this.$modal
-				.confirm('是否确认删除名称为"' + row.name + '"的数据项?')
+				.delConfirm(row.name)
 				.then(function () {
 					return deleteGroupPlan(row.id);
 				})

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

@@ -226,8 +226,10 @@ export default {
 		},
 		discard(row) {
       let _this = this
-			this.$modal
+      _this.$modal
-				.confirm('是否确认作废序号为"' + row._pageIndex + '"的数据项?')
+					.newConfirm(
+						'是否确认作废序号为"' + row.planName + '"的数据项?'
+					,'提示')
 				.then(() => {
 					getGroupRule(row.id).then((response) => {
 						let datas = response.data;
@@ -244,7 +246,7 @@ export default {
 		/** 删除按钮操作 */
 		handleDelete(row) {
 			this.$modal
-				.confirm('是否确认删除序号为"' + row._pageIndex + '"的数据项?')
+				.delConfirm(row.planName)
 				.then(function () {
 					return deleteGroupRule(row.id);
 				})

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

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2024-08-05 16:12:18
+ * @LastEditTime: 2024-08-14 15:24:11
  * @Description:
 -->
 <template>
@@ -104,7 +104,7 @@
 </template>
 
 <script>
-import basicAdd from '../mixins/basic-add';
+import basicAdd from '@/mixins/basic-add';
 import { getTreeArr } from '../mixins/code-filter';
 import {
 	createProductMaterial,

src/views/material/material/index.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2024-07-01 14:54:06
  * @LastEditors: zwq
- * @LastEditTime: 2024-08-08 16:46:44
+ * @LastEditTime: 2024-08-21 11:19:51
  * @Description:
 -->
 <template>
@@ -136,8 +136,8 @@
 
 <script>
 import AddOrUpdate from './add-or-updata';
-import basicPage from '../mixins/basic-page';
+import basicPage from '@/mixins/basic-page';
-import { parseTime } from '../mixins/code-filter';
+import { parseTime } from '@/mixins/code-filter';
 import { publicFormatter } from '@/utils/dict';
 import {
 	getProductMaterialPage,
@@ -293,27 +293,6 @@ export default {
 		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':
@@ -377,11 +356,8 @@ export default {
 		},
 		// 删除节点
 		remove(node, data) {
-			this.$confirm(`是否确认删除名称为"${data.name}"的数据项`, '提示', {
+      this.$modal
-				confirmButtonText: '确定',
+        .delConfirm(data.name)
-				cancelButtonText: '取消',
-				type: 'warning',
-			})
 				.then(() => {
 					deleteMaterialTree(data.id).then(({ data }) => {
 						this.$message({

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

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2024-08-05 16:12:58
+ * @LastEditTime: 2024-08-14 15:24:29
  * @Description:
 -->
 <template>
@@ -56,7 +56,7 @@
 </template>
 
 <script>
-import basicAdd from '../mixins/basic-add';
+import basicAdd from '@/mixins/basic-add';
 import { createMaterialDate, updateMaterialDate, getMaterialDate, getCode } from "@/api/base/materialDate";
 import { getMaterialList } from "@/api/base/material";
 

src/views/material/materialDate/index.vue

@@ -39,7 +39,7 @@
 
 <script>
 import AddOrUpdate from './add-or-updata';
-import basicPage from '../mixins/basic-page';
+import basicPage from '@/mixins/basic-page';
 import { parseTime } from '../mixins/code-filter';
 import {
 	getMaterDatePage,
@@ -164,27 +164,6 @@ export 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/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2024-08-08 16:47:36
+ * @LastEditTime: 2024-08-14 15:26:32
  * @Description:
 -->
 <template>
@@ -115,7 +115,7 @@
 </template>
 
 <script>
-import basicAdd from '../mixins/basic-add';
+import basicAdd from '@/mixins/basic-add';
 import {
 	createMaterialPB,
 	updateMaterialPB,

src/views/material/materialProductBom/index.vue

@@ -33,7 +33,7 @@
 
 <script>
 import AddOrUpdate from './add-or-updata';
-import basicPage from '../mixins/basic-page';
+import basicPage from '@/mixins/basic-page';
 // import { parseTime } from '../mixins/code-filter';
 import {
 	getMaterialPBPage,
@@ -177,6 +177,9 @@ export default {
 					console.log(val);
 			}
 		},
+    setDelete(data){
+      this.deleteHandle(data.id,data.productName)
+    }
 	},
 };
 </script>

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

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2024-08-05 16:13:52
+ * @LastEditTime: 2024-08-14 15:27:50
  * @Description:
 -->
 <template>
@@ -140,7 +140,7 @@
 </template>
 
 <script>
-import basicAdd from '../mixins/basic-add';
+import basicAdd from '@/mixins/basic-add';
 import {
 	createMaterialLog,
 	updateMaterialLog,

src/views/material/materialUseLog/index.vue

@@ -40,7 +40,7 @@
 
 <script>
 import AddOrUpdate from './add-or-updata';
-import basicPage from '../mixins/basic-page';
+import basicPage from '@/mixins/basic-page';
 import { parseTime } from '../mixins/code-filter';
 import {
 	getMaterialLogPage,
@@ -212,38 +212,8 @@ export default {
 					console.log(val);
 			}
 		},
-		//tableBtn点击
+    setDelete(data){
-    handleClick(val) {
+      this.deleteHandle(data.id,data.materialName)
-      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(() => { });
     }
 	},
 };

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

@@ -2,7 +2,7 @@
 /*
  * @Date: 2020-12-29 16:49:28
  * @LastEditors: zwq
- * @LastEditTime: 2024-07-08 16:27:39
+ * @LastEditTime: 2024-08-21 11:15:56
  * @FilePath: \basic-admin\src\filters\basicData\index.js
  * @Description:
  */

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

@@ -67,7 +67,7 @@
 </template>
 
 <script>
-import basicAdd from '../../mixins/basic-add';
+import basicAdd from '@/mixins/basic-add';
 import {
 	createWarehouseArea,
 	updateWarehouseArea,

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

@@ -46,12 +46,12 @@
 
 <script>
 import AddOrUpdate from './add-or-updata';
-import basicPage from '../../mixins/basic-page';
+import basicPage from '@/mixins/basic-page';
-import codeFilter from '../../mixins/code-filter';
+import codeFilter from '@/mixins/code-filter';
 import {
   deleteWarehouseArea,
   getWarehouseAreaPage,
-  getWarehouseAreaList
+  getWarehouseAreaListAll
 } from "@/api/warehouse/warehouse-area-setup";
 import {
   getWarehouseList
@@ -145,7 +145,7 @@ export default {
 		getWarehouseList().then((response) => {
 			this.formConfig[0].selectOptions = response.data;
 		});
-		getWarehouseAreaList().then((response) => {
+		getWarehouseAreaListAll().then((response) => {
 			this.formConfig[1].selectOptions = response.data;
 		});
   },

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

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 13:52:10
  * @LastEditors: zwq
- * @LastEditTime: 2024-08-07 15:53:15
+ * @LastEditTime: 2024-08-21 10:26:21
  * @Description:
 -->
 <template>
@@ -20,7 +20,7 @@
 					<el-select
 						v-model="dataForm.warehouseId"
 						filterable
-						clearable
+						@change="getAreaList"
 						:style="{ width: '100%' }"
 						placeholder="请选择仓库名称">
 						<el-option
@@ -35,8 +35,8 @@
 				<el-form-item label="库区名称" prop="areaId">
 					<el-select
 						v-model="dataForm.areaId"
+            :disabled="!areaArr.length>0"
 						filterable
-						clearable
 						:style="{ width: '100%' }"
 						@change="setAreaType"
 						placeholder="请选择库区名称">
@@ -125,7 +125,7 @@
 </template>
 
 <script>
-import basicAdd from '../../mixins/basic-add';
+import basicAdd from '@/mixins/basic-add';
 import {
 	createWarehouseLocation,
 	updateWarehouseLocation,
@@ -206,11 +206,16 @@ export default {
 		getWarehouseList().then((response) => {
 			this.warehouseArr = response.data;
 		});
-		getWarehouseAreaList().then((response) => {
-			this.areaArr = response.data;
-		});
 	},
 	methods: {
+    getAreaList(){
+		getWarehouseAreaList(this.dataForm.warehouseId).then((response) => {
+			this.areaArr = response.data;
+      if(this.areaArr.length===0){
+        this.$message('该仓库下暂无库区');
+      }
+		});
+    },
 		setAreaType() {
 			if (this.dataForm.areaId) {
 				this.dataForm.areaType = this.areaArr.find(

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

@@ -46,14 +46,14 @@
 
 <script>
 import AddOrUpdate from './add-or-updata';
-import basicPage from '../../mixins/basic-page';
+import basicPage from '@/mixins/basic-page';
-import codeFilter from '../../mixins/code-filter';
+import codeFilter from '@/mixins/code-filter';
 import {
   deleteWarehouseLocation,
   getWarehouseLocationPage,
 } from "@/api/warehouse/warehouse-location-setup";
 import {
-  getWarehouseAreaList
+  getWarehouseAreaListAll
 } from "@/api/warehouse/warehouse-area-setup";
 import {
   getWarehouseList
@@ -173,7 +173,7 @@ export default {
 		getWarehouseList().then((response) => {
 			this.formConfig[0].selectOptions = response.data;
 		});
-		getWarehouseAreaList().then((response) => {
+		getWarehouseAreaListAll().then((response) => {
 			this.formConfig[1].selectOptions = response.data;
 		});
   },

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

@@ -66,7 +66,7 @@
 </template>
 
 <script>
-import basicAdd from '../../mixins/basic-add';
+import basicAdd from '@/mixins/basic-add';
 import {
 	createWarehouse,
 	updateWarehouse,

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

@@ -46,9 +46,9 @@
 
 <script>
 import AddOrUpdate from './add-or-updata';
-import basicPage from '../../mixins/basic-page';
+import basicPage from '@/mixins/basic-page';
-import { parseTime } from '../../mixins/code-filter';
+import { parseTime } from '@/mixins/code-filter';
-import codeFilter from '../../mixins/code-filter';
+import codeFilter from '@/mixins/code-filter';
 import {
   deleteWarehouse,
   getWarehousePage,

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

@@ -129,7 +129,7 @@
 </template>
 
 <script>
-import basicAdd from '../../mixins/basic-add';
+import basicAdd from '@/mixins/basic-add';
 import {
 	createWarehouseRealtime,
 	outWarehouseRealtime,

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

@@ -78,7 +78,7 @@
 
 <script>
 import product from './product-mini';
-import basicPage from '../../mixins/basic-page';
+import basicPage from '@/mixins/basic-page';
 import { getMaterialList } from '@/api/base/material';
 import AddOrUpdate from './add-or-updata';
 import { getWarehouseRealtimePage } from '@/api/warehouse/warehouseRealtime';

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

@@ -16,7 +16,7 @@
 </template>
 
 <script>
-import { parseTime } from '../../mixins/code-filter';
+import { parseTime } from '@/mixins/code-filter';
 import { getWarehouseRealtimeDet } from '@/api/warehouse/warehouseRealtime';
 
 const tableProps = [

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

@@ -62,7 +62,7 @@
 </template>
 
 <script>
-import basicAdd from '../../mixins/basic-add';
+import basicAdd from '@/mixins/basic-add';
 import {
 	outWarehouseRealtimeLocation,
 	outWarehouseRealtimeLocationList,

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

@@ -81,6 +81,7 @@ export default {
 			this.$refs['dataForm'].validate((valid) => {
 				if (this.dataForm.productInfo) {
           this.dataForm.productInfo.goodsId = this.dataForm.productInfo.id
+          this.dataForm.productInfo.spec = this.dataForm.productInfo.specifications
           this.dataForm.productInfo.remark = ''
 					// 修改的提交
 					if (this.dataForm.index >= 0) {

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

@@ -55,13 +55,16 @@
 						</el-button>
 					</div>
 					<base-table
+						v-if="
+							productAttributeList.length > 1 ||
+							(productAttributeList.length && !isDetail)
+						"
 						:table-props="tableProps"
 						:page="listQuery.pageNo"
 						:limit="listQuery.pageSize"
 						@emitFun="inputChange"
 						:height="400"
-						:table-data="productAttributeList"
+						:table-data="productAttributeList">
-						v-if="productAttributeList.length">
 						<method-btn
 							slot="handleBtn"
 							v-if="!isDetail"
@@ -70,6 +73,31 @@
 							:method-list="tableBtn"
 							@clickBtn="handleClick" />
 					</base-table>
+					<!-- 一条数据 -->
+					<div v-else-if="productAttributeList.length === 1 && isDetail">
+						<el-descriptions title="" direction="vertical" :column="3" border>
+							<el-descriptions-item label="物品名称">
+								{{ productAttributeList[0].name }}
+							</el-descriptions-item>
+							<el-descriptions-item label="物品编码">
+								{{ productAttributeList[0].code }}
+							</el-descriptions-item>
+							<el-descriptions-item label="物品规格">
+								{{ productAttributeList[0].spec }}
+							</el-descriptions-item>
+							<el-descriptions-item label="物品批次">
+								{{ productAttributeList[0].goodsBatch }}
+							</el-descriptions-item>
+							<el-descriptions-item label="数量">
+								{{ productAttributeList[0].num }}
+							</el-descriptions-item>
+							<el-descriptions-item label="物品单位">
+								{{
+									getDictDataLabel('unit_dict', productAttributeList[0].unit)
+								}}
+							</el-descriptions-item>
+						</el-descriptions>
+					</div>
 					<!-- 没有数据 -->
 					<div class="no-data-bg" v-else></div>
 				</div>
@@ -118,7 +146,7 @@ const tableProps1 = [
 		showOverflowtooltip: true,
 	},
 	{
-		prop: 'specifications',
+		prop: 'spec',
 		label: '物品规格',
 	},
 	{
@@ -151,7 +179,7 @@ const tableProps2 = [
 		showOverflowtooltip: true,
 	},
 	{
-		prop: 'specifications',
+		prop: 'spec',
 		label: '物品规格',
 	},
 	{
@@ -210,9 +238,9 @@ export default {
 		init(val, nickname, isDetail) {
 			this.isDetail = isDetail || false;
 			if (isDetail) {
-				this.tableProps= tableProps2;
+				this.tableProps = tableProps2;
-			}else{
+			} else {
-				this.tableProps= tableProps1;
+				this.tableProps = tableProps1;
 			}
 			this.operator = nickname;
 			this.dataForm.id = val.id;

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

@@ -54,8 +54,8 @@
 <script>
 import AddOrUpdate from './add-or-updata';
 import Drawer from './drawer';
-import basicPage from '../../mixins/basic-page';
+import basicPage from '@/mixins/basic-page';
-import { parseTime } from '../../mixins/code-filter';
+import { parseTime } from '@/mixins/code-filter';
 import { getWarehouseRealtimeLocationPage } from '@/api/warehouse/warehouseRealtimeLocation';
 import { listData } from '@/api/system/dict/data';
 import { publicFormatter } from '@/utils/dict';

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

@@ -1,3 +1,10 @@
+<!--
+ * @Author: zwq
+ * @Date: 2024-08-09 14:48:46
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-08-21 10:00:21
+ * @Description:
+-->
 <template>
 	<div class="app-container">
 		<!-- 搜索工作栏 -->
@@ -25,10 +32,10 @@
 </template>
 
 <script>
-import basicPage from '../../mixins/basic-page';
+import basicPage from '@/mixins/basic-page';
-import { parseTime } from '../../mixins/code-filter';
+import { parseTime } from '@/mixins/code-filter';
 import {
-	getWarehouseRealtimeHisPage,
+	inventoryPage,
 } from '@/api/warehouse/warehouseRealtime';
 import { getMaterialList } from '@/api/base/material';
 import tableHeightMixin from '@/mixins/tableHeightMixin';
@@ -40,10 +47,6 @@ const tableProps = [
 		prop: 'warehouseName',
 		label: '仓库名称',
 	},
-	{
-		prop: 'warehouseAreaName',
-		label: '库区名称',
-	},
 	{
 		prop: 'name',
 		label: '物品名称',
@@ -51,34 +54,37 @@ const tableProps = [
 	{
 		prop: 'code',
 		label: '物品编码',
+    width: 150,
 	},
 	{
 		prop: 'spec',
 		label: '物品规格',
 	},
 	{
-		prop: 'goodsBatch',
+		prop: 'batch',
 		label: '物品批次',
 	},
+	{
+		prop: 'supplierName',
+		label: '供应商',
+	},
 	{
 		prop: 'num',
-		label: '出入库数量',
+		label: '当前库存量',
+    width: 95,
 	},
 	{
-		prop: 'operateStatus',
+		prop: 'unit',
-		label: '操作状态',
+		label: '单位',
-		filter: publicFormatter('warehouse_operate_status'),
+		filter: publicFormatter('unit_dict'),
+		width: 60,
 	},
 	{
-		prop: 'operateTime',
+		prop: 'latestInTime',
-		label: '操作时间',
+		label: '入库时间',
 		filter: parseTime,
     width: 150,
 	},
-	{
-		prop: 'operator',
-		label: '操作人',
-	},
 ];
 
 export default {
@@ -86,7 +92,7 @@ export default {
 	data() {
 		return {
 			urlOptions: {
-				getDataListURL: getWarehouseRealtimeHisPage,
+				getDataListURL: inventoryPage,
 			},
 			tableData: [],
 			tableProps,
@@ -96,37 +102,11 @@ export default {
 					type: 'select',
 					label: '物品名称',
 					selectOptions: [],
-					param: 'goodsId',
+					param: 'goodsName',
 					defaultSelect: '',
+          valueField: 'name',
 					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: '查询',
@@ -139,14 +119,6 @@ export default {
 	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;
 		});
@@ -157,10 +129,7 @@ export default {
 				case 'search':
 					this.listQuery.pageNo = 1;
 					this.listQuery.pageSize = 10;
-					this.listQuery.goodsId = val.goodsId;
+					this.listQuery.goodsName = val.goodsName;
-					this.listQuery.operator = val.operator;
-					this.listQuery.operateStatus = val.status;
-					this.listQuery.operateTime = val.searchTime?val.searchTime:null;
 					this.getDataList();
 					break;
 				default:

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

@@ -2,24 +2,63 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2023-11-23 16:09:47
+ * @LastEditTime: 2024-08-21 13:19:47
  * @Description:
 -->
 <template>
-	<base-table
+	<div v-if="tableData.length > 1">
-		:table-props="tableProps"
+		<el-descriptions title="" direction="vertical" :column="3" border style="margin-bottom: 10px;">
-		:page="listQuery.pageNo"
+			<el-descriptions-item label="库位编码">
-		:limit="listQuery.pageSize"
+				{{ fatherInfo.code }}
-		:height="300"
+			</el-descriptions-item>
-		:table-data="tableData"
+			<el-descriptions-item label="托盘编码">
-		v-if="tableData.length" />
+				{{ tableData[0].palletCode }}
+			</el-descriptions-item>
+		</el-descriptions>
+		<base-table
+			:table-props="tableProps"
+			:page="listQuery.pageNo"
+			:limit="listQuery.pageSize"
+			:height="300"
+			:table-data="tableData" />
+	</div>
+	<!-- 一条数据 -->
+	<div v-else-if="tableData.length === 1">
+		<el-descriptions title="" direction="vertical" :column="3" border style="margin-bottom: 10px;">
+			<el-descriptions-item label="库位编码" :span="2">
+				{{ fatherInfo.code }}
+			</el-descriptions-item>
+			<el-descriptions-item label="托盘编码">
+				{{ fatherInfo.palletCode }}
+			</el-descriptions-item>
+			<el-descriptions-item label="物品名称">
+				{{ tableData[0].name }}
+			</el-descriptions-item>
+			<el-descriptions-item label="物品编码">
+				{{ tableData[0].code }}
+			</el-descriptions-item>
+			<el-descriptions-item label="物品规格">
+				{{ tableData[0].spec }}
+			</el-descriptions-item>
+			<el-descriptions-item label="物品批次">
+				{{ tableData[0].goodsBatch }}
+			</el-descriptions-item>
+			<el-descriptions-item label="数量">
+				{{ tableData[0].num }}
+			</el-descriptions-item>
+			<el-descriptions-item label="物品单位">
+				{{ getDictDataLabel('unit_dict', tableData[0].unit) }}
+			</el-descriptions-item>
+		</el-descriptions>
+	</div>
 	<!-- 没有数据 -->
 	<div class="no-data-bg" v-else></div>
 </template>
 
 <script>
-import { parseTime } from '../../mixins/code-filter';
+import { publicFormatter,getDictDataLabel } from '@/utils/dict';
-import { getWarehouseLocationHisDet } from '@/api/warehouse/warehouseRealtimeLocation';
+import { getStoreInfo
+} from '@/api/warehouse/warehouse-location-setup';
 
 const tableProps = [
 	{
@@ -29,13 +68,14 @@ const tableProps = [
 	{
 		prop: 'code',
 		label: '物品编码',
+		width: 160,
 	},
 	{
 		prop: 'spec',
 		label: '物品规格',
 	},
 	{
-		prop: 'batchCode',
+		prop: 'goodsBatch',
 		label: '物品批次',
 	},
 	{
@@ -43,13 +83,10 @@ const tableProps = [
 		label: '数量',
 	},
 	{
-		prop: 'allowTime',
+		prop: 'unit',
-		label: '允许留存时长(天)',
+		label: '单位',
-    width: 150
+		filter: publicFormatter('unit_dict'),
-	},
+		width: 60,
-	{
-		prop: 'remark',
-		label: '备注',
 	},
 ];
 export default {
@@ -57,6 +94,7 @@ export default {
 		return {
 			tableData: [],
 			tableProps,
+			fatherInfo: {}, //父页面数据
 			listQuery: {
 				pageSize: 100,
 				pageNo: 1,
@@ -67,10 +105,12 @@ export default {
 	},
 	methods: {
 		// 获取数据列表
-		init(id) {
+		init(data) {
+			this.fatherInfo = data;
+      console.log(data)
 			this.dataListLoading = true;
-			getWarehouseLocationHisDet(id).then((response) => {
+			getStoreInfo(data.id).then((response) => {
-				this.tableData = response.data;
+				this.tableData = response.data || [];
 				this.dataListLoading = false;
 			});
 		},

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

@@ -12,12 +12,13 @@
 			: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"
+				:width="80"
-				label="库位详情"
+				label="操作"
 				:method-list="tableBtn"
 				@clickBtn="handleClick" />
 		</base-table>
@@ -31,32 +32,25 @@
 		<base-dialog
 			:dialogTitle="addOrEditTitle"
 			:dialogVisible="addOrUpdateVisible"
+			@cancel="handleCancel"
+			@confirm="handleConfirm"
 			:before-close="handleCancel"
-			width="50%">
+			width="40%">
 			<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 basicPage from '@/mixins/basic-page';
-import { parseTime } from '../../mixins/code-filter';
+import codeFilter from '@/mixins/code-filter';
 import {
-	getWarehouseLocationHisPage,
+	getWarehouseLocationPage,
-} from '@/api/warehouse/warehouseRealtimeLocation';
+} from '@/api/warehouse/warehouse-location-setup';
-import { listData } from '@/api/system/dict/data';
+import tableHeightMixin from '@/mixins/tableHeightMixin';
 import { publicFormatter } from '@/utils/dict';
 
 const tableProps = [
@@ -65,9 +59,17 @@ const tableProps = [
 		label: '仓库名称',
 	},
 	{
-		prop: 'name',
+		prop: 'areaName',
 		label: '库区名称',
 	},
+	{
+		prop: 'areaType',
+		label: '库区类型',
+	},
+	{
+		prop: 'name',
+		label: '库位名称',
+	},
 	{
 		prop: 'code',
 		label: '库位编码',
@@ -78,84 +80,45 @@ const tableProps = [
 		filter: publicFormatter('location_type'),
 	},
 	{
-		prop: 'palletCode',
+		prop: 'arrange',
-		label: '托盘编码',
+		label: '排',
 	},
 	{
-		prop: 'palletCode',
+		prop: 'col',
-		label: '物品名称',
+		label: '列',
 	},
 	{
-		prop: 'operateStatus',
+		prop: 'layer',
-		label: '操作状态',
+		label: '层',
-		filter: publicFormatter('warehouse_operate_status'),
 	},
 	{
-		prop: 'createTime',
+		prop: 'enabled',
-		label: '操作时间',
+		label: '库位状态',
-		filter: parseTime,
+		filter: codeFilter('deactivate'),
-		minWidth: 100,
-	},
-	{
-		prop: 'creator',
-		label: '操作人',
 	},
 ];
 
 export default {
-	mixins: [basicPage],
+	mixins: [basicPage, tableHeightMixin],
 	data() {
 		return {
 			urlOptions: {
-				getDataListURL: getWarehouseLocationHisPage,
+				getDataListURL: getWarehouseLocationPage,
 			},
-			listQuery: {
-				storageType: 1,
-			},
-			tableData: [],
 			tableProps,
 			tableBtn: [
-				this.$auth.hasPermi(`raw-material:warehouse-location-his:query`)
+				{
-					? {
+					type: 'detail',
-							type: 'detail',
+					btnName: '详情',
-							btnName: '详情',
+				},
-					  }
-					: undefined,
 			].filter((v) => v),
-			drawerVisible: false,
+			tableData: [],
 			formConfig: [
 				{
 					type: 'input',
 					label: '库位编码',
 					placeholder: '库位编码',
-					param: 'kcode',
+					param: 'code',
-				},
-				{
-					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',
@@ -170,25 +133,14 @@ export default {
 		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.pageSize = 20;
-					this.listQuery.locationCode= val.kcode;
+					this.listQuery.code = val.code;
-					this.listQuery.palletCode = val.tcode;
-					this.listQuery.operateStatus = val.status;
-					this.listQuery.createTime = val.searchTime?val.searchTime:null;
 					this.getDataList();
 					break;
 				default:
@@ -198,9 +150,9 @@ export default {
 		otherMethods(val) {
 			if (val.type === 'detail') {
 				this.addOrUpdateVisible = true;
-				this.addOrEditTitle = val.data.name + ' -产品信息';
+				this.addOrEditTitle = '详情';
 				this.$nextTick(() => {
-					this.$refs.addOrUpdate.init(val.data.id);
+					this.$refs.addOrUpdate.init(val.data);
 				});
 			}
 		},
@@ -211,9 +163,3 @@ export default {
 	},
 };
 </script>
-<style>
-.app-container .el-table .el-table__cell {
-	padding: 0;
-	height: 35px;
-}
-</style>

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

@@ -2,64 +2,67 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2024-08-09 17:00:46
+ * @LastEditTime: 2024-08-21 09:30:48
  * @Description:
 -->
 <template>
-	<base-table
+	<div v-if="tableData.length > 1">
-		:table-props="tableProps"
+		<el-descriptions title="" direction="vertical" :column="3" border style="margin-bottom: 10px;">
-		:page="listQuery.pageNo"
+			<el-descriptions-item label="源库位编码">
-		:limit="listQuery.pageSize"
+				{{ fatherInfo.oldCode }}
-		:height="300"
+			</el-descriptions-item>
-		:table-data="tableData"
+			<el-descriptions-item label="目标库位编码">
-		v-if="tableData.length > 1" />
+				{{ fatherInfo.newCode }}
-    <!-- 一条数据 -->
+			</el-descriptions-item>
+			<el-descriptions-item label="移动托盘编码">
+				{{ fatherInfo.palletCode }}
+			</el-descriptions-item>
+		</el-descriptions>
+		<base-table
+			:table-props="tableProps"
+			:page="listQuery.pageNo"
+			:limit="listQuery.pageSize"
+			:height="300"
+			:table-data="tableData" />
+	</div>
+	<!-- 一条数据 -->
 	<div v-else-if="tableData.length === 1">
-		<el-form
+		<el-descriptions title="" direction="vertical" :column="3" border style="margin-bottom: 10px;">
-			:model="tableData[0]"
+			<el-descriptions-item label="源库位编码">
-			ref="dataForm"
+				{{ fatherInfo.oldCode }}
-			label-width="100px"
+			</el-descriptions-item>
-			label-position="top">
+			<el-descriptions-item label="目标库位编码">
-			<el-row :gutter="20">
+				{{ fatherInfo.newCode }}
-				<el-col :span="12">
+			</el-descriptions-item>
-					<el-form-item label="物品名称" prop="name">
+			<el-descriptions-item label="移动托盘编码">
-						<el-input v-model="tableData[0].name" readonly />
+				{{ fatherInfo.palletCode }}
-					</el-form-item>
+			</el-descriptions-item>
-				</el-col>
+			<el-descriptions-item label="物品名称">
-				<el-col :span="12">
+				{{ tableData[0].name }}
-					<el-form-item label="物品编码" prop="code">
+			</el-descriptions-item>
-						<el-input v-model="tableData[0].code" readonly />
+			<el-descriptions-item label="物品编码">
-					</el-form-item>
+				{{ tableData[0].code }}
-				</el-col>
+			</el-descriptions-item>
-				<el-col :span="12">
+			<el-descriptions-item label="物品规格">
-					<el-form-item label="物品规格" prop="specifications">
+				{{ tableData[0].specifications }}
-						<el-input v-model="tableData[0].specifications" readonly />
+			</el-descriptions-item>
-					</el-form-item>
+			<el-descriptions-item label="物品批次">
-				</el-col>
+				{{ tableData[0].batchCode }}
-				<el-col :span="12">
+			</el-descriptions-item>
-					<el-form-item label="物品批次" prop="batchCode">
+			<el-descriptions-item label="数量">
-						<el-input v-model="tableData[0].batchCode" readonly />
+				{{ tableData[0].num }}
-					</el-form-item>
+			</el-descriptions-item>
-				</el-col>
+			<el-descriptions-item label="物品单位">
-				<el-col :span="12">
+				{{ getDictDataLabel('unit_dict', tableData[0].unit) }}
-					<el-form-item label="数量" prop="num">
+			</el-descriptions-item>
-						<el-input v-model="tableData[0].num" readonly />
+		</el-descriptions>
-					</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 { publicFormatter,getDictDataLabel } from '@/utils/dict';
 import { getWarehouseLocationHisDet } from '@/api/warehouse/warehouseRealtimeLocation';
 
 const tableProps = [
@@ -96,6 +99,7 @@ export default {
 		return {
 			tableData: [],
 			tableProps,
+			fatherInfo: {}, //父页面数据
 			listQuery: {
 				pageSize: 100,
 				pageNo: 1,
@@ -106,9 +110,10 @@ export default {
 	},
 	methods: {
 		// 获取数据列表
-		init(id) {
+		init(data) {
+			this.fatherInfo = data;
 			this.dataListLoading = true;
-			getWarehouseLocationHisDet(id).then((response) => {
+			getWarehouseLocationHisDet(data.id).then((response) => {
 				this.tableData = response.data;
 				this.dataListLoading = false;
 			});

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

@@ -17,7 +17,7 @@
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
-				:width="100"
+				:width="90"
 				label="库位详情"
 				:method-list="tableBtn"
 				@clickBtn="handleClick" />
@@ -52,11 +52,9 @@
 
 <script>
 import AddOrUpdate from './add-or-updata';
-import basicPage from '../../mixins/basic-page';
+import basicPage from '@/mixins/basic-page';
-import { parseTime } from '../../mixins/code-filter';
+import { parseTime } from '@/mixins/code-filter';
-import {
+import { getMoveHisPage } from '@/api/warehouse/warehouseRealtimeLocation';
-	getMoveHisPage,
-} from '@/api/warehouse/warehouseRealtimeLocation';
 import { publicFormatter } from '@/utils/dict';
 import tableHeightMixin from '@/mixins/tableHeightMixin';
 
@@ -93,13 +91,13 @@ const tableProps = [
 	{
 		prop: 'newCode',
 		label: '目的库位编码',
-    width: 150,
+		width: 150,
 	},
 	{
 		prop: 'createTime',
 		label: '操作时间',
 		filter: parseTime,
-    width: 150,
+		width: 150,
 	},
 	{
 		prop: 'creator',
@@ -108,7 +106,7 @@ const tableProps = [
 ];
 
 export default {
-	mixins: [basicPage,tableHeightMixin],
+	mixins: [basicPage, tableHeightMixin],
 	data() {
 		return {
 			urlOptions: {
@@ -117,14 +115,11 @@ export default {
 			tableData: [],
 			tableProps,
 			tableBtn: [
-				this.$auth.hasPermi(`raw-material:warehouse-location-his:query`)
+				{
-					? {
+					type: 'detail',
-							type: 'detail',
+					btnName: '详情',
-							btnName: '详情',
+				},
-					  }
-					: undefined,
 			].filter((v) => v),
-			drawerVisible: false,
 			formConfig: [
 				{
 					type: 'input',
@@ -143,7 +138,7 @@ export default {
 					label: '操作时间',
 					dateType: 'daterange',
 					format: 'yyyy-MM-dd',
-          valueFormat: "timestamp",
+					valueFormat: 'timestamp',
 					rangeSeparator: '-',
 					startPlaceholder: '开始时间',
 					endPlaceholder: '结束时间',
@@ -161,8 +156,7 @@ export default {
 	components: {
 		AddOrUpdate,
 	},
-	created() {
+	created() {},
-	},
 	methods: {
 		buttonClick(val) {
 			switch (val.btnName) {
@@ -172,7 +166,7 @@ export default {
 					this.listQuery.locationCode = val.kcode;
 					this.listQuery.palletCode = val.tcode;
 					this.listQuery.operateStatus = val.status;
-					this.listQuery.createTime = val.searchTime?val.searchTime:null;
+					this.listQuery.createTime = val.searchTime ? val.searchTime : null;
 					this.getDataList();
 					break;
 				default:
@@ -184,7 +178,7 @@ export default {
 				this.addOrUpdateVisible = true;
 				this.addOrEditTitle = '详情';
 				this.$nextTick(() => {
-					this.$refs.addOrUpdate.init(val.data.id);
+					this.$refs.addOrUpdate.init(val.data);
 				});
 			}
 		},

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

@@ -25,8 +25,8 @@
 </template>
 
 <script>
-import basicPage from '../../mixins/basic-page';
+import basicPage from '@/mixins/basic-page';
-import { parseTime } from '../../mixins/code-filter';
+import { parseTime } from '@/mixins/code-filter';
 import {
 	getWarehouseRealtimeHisPage,
 } from '@/api/warehouse/warehouseRealtime';
@@ -51,6 +51,7 @@ const tableProps = [
 	{
 		prop: 'code',
 		label: '物品编码',
+    width: 150,
 	},
 	{
 		prop: 'spec',
@@ -63,6 +64,7 @@ const tableProps = [
 	{
 		prop: 'num',
 		label: '出入库数量',
+    width: 95,
 	},
 	{
 		prop: 'operateStatus',

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

@@ -2,75 +2,61 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2024-08-09 16:59:34
+ * @LastEditTime: 2024-08-21 09:36:31
  * @Description:
 -->
 <template>
-	<base-table
+	<div v-if="tableData.length > 1">
-		:table-props="tableProps"
+		<el-descriptions title="" direction="vertical" :column="3" border style="margin-bottom: 10px;">
-		:page="listQuery.pageNo"
+			<el-descriptions-item label="库位编码">
-		:limit="listQuery.pageSize"
+				{{ fatherInfo.code }}
-		:height="300"
+			</el-descriptions-item>
-		:table-data="tableData"
+			<el-descriptions-item label="托盘编码">
-		v-if="tableData.length > 1" />
+				{{ fatherInfo.palletCode }}
+			</el-descriptions-item>
+		</el-descriptions>
+		<base-table
+			:table-props="tableProps"
+			:page="listQuery.pageNo"
+			:limit="listQuery.pageSize"
+			:height="300"
+			:table-data="tableData" />
+	</div>
+	<!-- 一条数据 -->
 	<div v-else-if="tableData.length === 1">
-	<el-form
+		<el-descriptions title="" direction="vertical" :column="3" border style="margin-bottom: 10px;">
-		:model="tableData[0]"
+			<el-descriptions-item label="库位编码" :span="2">
-		ref="dataForm"
+				{{ fatherInfo.code }}
-		label-width="100px"
+			</el-descriptions-item>
-    label-position="top">
+			<el-descriptions-item label="托盘编码">
-		<el-row :gutter="20">
+				{{ fatherInfo.palletCode }}
-			<el-col :span="12">
+			</el-descriptions-item>
-				<el-form-item label="物品名称" prop="name">
+			<el-descriptions-item label="物品名称">
-					<el-input
+				{{ tableData[0].name }}
-						v-model="tableData[0].name"
+			</el-descriptions-item>
-						readonly />
+			<el-descriptions-item label="物品编码">
-				</el-form-item>
+				{{ tableData[0].code }}
-			</el-col>
+			</el-descriptions-item>
-			<el-col :span="12">
+			<el-descriptions-item label="物品规格">
-				<el-form-item label="物品编码" prop="code">
+				{{ tableData[0].specifications }}
-					<el-input
+			</el-descriptions-item>
-						v-model="tableData[0].code"
+			<el-descriptions-item label="物品批次">
-						readonly />
+				{{ tableData[0].batchCode }}
-				</el-form-item>
+			</el-descriptions-item>
-			</el-col>
+			<el-descriptions-item label="数量">
-			<el-col :span="12">
+				{{ tableData[0].num }}
-				<el-form-item label="物品规格" prop="specifications">
+			</el-descriptions-item>
-					<el-input
+			<el-descriptions-item label="物品单位">
-						v-model="tableData[0].specifications"
+				{{ getDictDataLabel('unit_dict', tableData[0].unit) }}
-						readonly />
+			</el-descriptions-item>
-				</el-form-item>
+		</el-descriptions>
-			</el-col>
+	</div>
-			<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 { publicFormatter,getDictDataLabel } from '@/utils/dict';
 import { getWarehouseLocationHisDet } from '@/api/warehouse/warehouseRealtimeLocation';
 
 const tableProps = [
@@ -107,6 +93,7 @@ export default {
 		return {
 			tableData: [],
 			tableProps,
+			fatherInfo: {}, //父页面数据
 			listQuery: {
 				pageSize: 100,
 				pageNo: 1,
@@ -117,9 +104,10 @@ export default {
 	},
 	methods: {
 		// 获取数据列表
-		init(id) {
+		init(data) {
+			this.fatherInfo = data;
 			this.dataListLoading = true;
-			getWarehouseLocationHisDet(id).then((response) => {
+			getWarehouseLocationHisDet(data.id).then((response) => {
 				this.tableData = response.data;
 				this.dataListLoading = false;
 			});

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

@@ -17,7 +17,7 @@
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
-				:width="100"
+				:width="90"
 				label="库位详情"
 				:method-list="tableBtn"
 				@clickBtn="handleClick" />
@@ -52,11 +52,9 @@
 
 <script>
 import AddOrUpdate from './add-or-updata';
-import basicPage from '../../mixins/basic-page';
+import basicPage from '@/mixins/basic-page';
-import { parseTime } from '../../mixins/code-filter';
+import { parseTime } from '@/mixins/code-filter';
-import {
+import { getWarehouseLocationHisPage } from '@/api/warehouse/warehouseRealtimeLocation';
-	getWarehouseLocationHisPage,
-} from '@/api/warehouse/warehouseRealtimeLocation';
 import { listData } from '@/api/system/dict/data';
 import { publicFormatter } from '@/utils/dict';
 import tableHeightMixin from '@/mixins/tableHeightMixin';
@@ -97,7 +95,7 @@ const tableProps = [
 		prop: 'createTime',
 		label: '操作时间',
 		filter: parseTime,
-    width: 150,
+		width: 150,
 	},
 	{
 		prop: 'creator',
@@ -106,7 +104,7 @@ const tableProps = [
 ];
 
 export default {
-	mixins: [basicPage,tableHeightMixin],
+	mixins: [basicPage, tableHeightMixin],
 	data() {
 		return {
 			urlOptions: {
@@ -115,14 +113,11 @@ export default {
 			tableData: [],
 			tableProps,
 			tableBtn: [
-				this.$auth.hasPermi(`raw-material:warehouse-location-his:query`)
+				{
-					? {
+					type: 'detail',
-							type: 'detail',
+					btnName: '详情',
-							btnName: '详情',
+				},
-					  }
-					: undefined,
 			].filter((v) => v),
-			drawerVisible: false,
 			formConfig: [
 				{
 					type: 'input',
@@ -151,7 +146,7 @@ export default {
 					label: '操作时间',
 					dateType: 'daterange',
 					format: 'yyyy-MM-dd',
-          valueFormat: "timestamp",
+					valueFormat: 'timestamp',
 					rangeSeparator: '-',
 					startPlaceholder: '开始时间',
 					endPlaceholder: '结束时间',
@@ -185,10 +180,10 @@ export default {
 				case 'search':
 					this.listQuery.pageNo = 1;
 					this.listQuery.pageSize = 10;
-					this.listQuery.locationCode= val.kcode;
+					this.listQuery.locationCode = val.kcode;
 					this.listQuery.palletCode = val.tcode;
 					this.listQuery.operateStatus = val.status;
-					this.listQuery.createTime = val.searchTime?val.searchTime:null;
+					this.listQuery.createTime = val.searchTime ? val.searchTime : null;
 					this.getDataList();
 					break;
 				default:
@@ -200,7 +195,7 @@ export default {
 				this.addOrUpdateVisible = true;
 				this.addOrEditTitle = '详情';
 				this.$nextTick(() => {
-					this.$refs.addOrUpdate.init(val.data.id);
+					this.$refs.addOrUpdate.init(val.data);
 				});
 			}
 		},