src/views/warehouse/end-material/warehouseGoods/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 13:52:10
  * @LastEditors: zwq
- * @LastEditTime: 2023-11-23 15:27:55
+ * @LastEditTime: 2023-11-20 15:54:28
  * @Description:
 -->
 <template>
@@ -12,8 +12,7 @@
 		ref="dataForm"
 		v-if="visible"
 		@keyup.enter.native="dataFormSubmit()"
-		label-width="100px"
+		label-width="100px">
-    label-position="top">
 		<el-row :gutter="20">
 			<el-col :span="12">
 				<el-form-item label="物品名称" prop="name">
@@ -61,7 +60,6 @@
             :min="0"
 						v-model="dataForm.dailyUse"
 						clearable
-            style="width: 100%;"
 						placeholder="请输入单日消耗量" />
 				</el-form-item>
 			</el-col>
@@ -71,7 +69,6 @@
             :min="0"
 						v-model="dataForm.allowTime"
 						clearable
-            style="width: 90%;"
 						placeholder="请输入允许留存时间" /> (天)
 				</el-form-item>
 			</el-col>

src/views/warehouse/end-material/warehouseGoods/index.vue

@@ -75,7 +75,6 @@ const tableProps = [
 	{
 		prop: 'allowTime',
 		label: '允许留存时长(天)',
-    width: 150
 	},
 	{
 		prop: 'dailyUse',
@@ -128,7 +127,7 @@ export default {
 				},
 				{
 					type: 'button',
-					btnName: '查询',
+					btnName: '搜索',
 					name: 'search',
 					color: 'primary',
 				},

src/views/warehouse/end-material/warehouseHis/index.vue

@@ -14,6 +14,13 @@
 			: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"
@@ -69,7 +76,7 @@ const tableProps = [
 		prop: 'operateTime',
 		label: '操作时间',
 		filter: parseTime,
-		minWidth: 100,
+		minWidth: 150,
 	},
 	{
 		prop: 'operator',
@@ -89,6 +96,14 @@ export default {
 			},
 			tableData: [],
 			tableProps,
+			tableBtn: [
+				this.$auth.hasPermi(`end-material:warehouse-realtime-location-his:query`)
+					? {
+							type: 'info',
+							btnName: '详情',
+					  }
+					: undefined,
+			].filter((v) => v),
 			drawerVisible: false,
 			formConfig: [
 				{
@@ -128,7 +143,7 @@ export default {
 				},
 				{
 					type: 'button',
-					btnName: '查询',
+					btnName: '搜索',
 					name: 'search',
 					color: 'primary',
 				},

src/views/warehouse/end-material/warehouseLocationHis/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2023-11-23 16:09:20
+ * @LastEditTime: 2023-11-03 16:20:19
  * @Description:
 -->
 <template>
@@ -11,10 +11,7 @@
 		:page="listQuery.pageNo"
 		:limit="listQuery.pageSize"
 		:height="300"
-		:table-data="tableData"
+		:table-data="tableData" />
-		v-if="tableData.length" />
-	<!-- 没有数据 -->
-	<div class="no-data-bg" v-else></div>
 </template>
 
 <script>
@@ -25,31 +22,37 @@ const tableProps = [
 	{
 		prop: 'name',
 		label: '物品名称',
+		align: 'center',
 	},
 	{
 		prop: 'code',
 		label: '物品编码',
+		align: 'center',
 	},
 	{
 		prop: 'spec',
 		label: '物品规格',
+		align: 'center',
 	},
 	{
 		prop: 'batchCode',
 		label: '物品批次',
+		align: 'center',
 	},
 	{
 		prop: 'num',
 		label: '数量',
+		align: 'center',
 	},
 	{
 		prop: 'allowTime',
 		label: '允许留存时长(天)',
-    width: 150
+		align: 'center',
 	},
 	{
 		prop: 'remark',
 		label: '备注',
+		align: 'center',
 	},
 ];
 export default {

src/views/warehouse/end-material/warehouseLocationHis/index.vue

@@ -92,7 +92,7 @@ const tableProps = [
 		prop: 'createTime',
 		label: '操作时间',
 		filter: parseTime,
-		minWidth: 100,
+		minWidth: 150,
 	},
 	{
 		prop: 'creator',
@@ -115,7 +115,7 @@ export default {
 			tableBtn: [
 				this.$auth.hasPermi(`end-material:warehouse-location-his:query`)
 					? {
-							type: 'detail',
+							type: 'info',
 							btnName: '详情',
 					  }
 					: undefined,
@@ -159,7 +159,7 @@ export default {
 				},
 				{
 					type: 'button',
-					btnName: '查询',
+					btnName: '搜索',
 					name: 'search',
 					color: 'primary',
 				},
@@ -205,7 +205,7 @@ export default {
 			}
 		},
 		otherMethods(val) {
-			if (val.type === 'detail') {
+			if (val.type === 'info') {
 				this.addOrUpdateVisible = true;
 				this.addOrEditTitle = val.data.name + ' -产品信息';
 				this.$nextTick(() => {

src/views/warehouse/end-material/warehouseRealtime/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 13:52:10
  * @LastEditors: zwq
- * @LastEditTime: 2023-11-23 15:54:25
+ * @LastEditTime: 2023-11-20 15:14:18
  * @Description:
 -->
 <template>
@@ -68,7 +68,6 @@
 						v-model="dataForm.goodsBatch"
 						filterable
 						clearable
-            style="width:100%"
 						placeholder="请选择物品名称">
 						<el-option
 							v-for="(item, index) in Batch"
@@ -84,7 +83,6 @@
 						v-model="dataForm.numDet"
 						clearable
             :min="0"
-            style="width:100%"
 						placeholder="请输入数量" />
 				</el-form-item>
 			</el-col>

src/views/warehouse/end-material/warehouseRealtime/index.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-11-03 16:37:06
  * @LastEditors: zwq
- * @LastEditTime: 2023-11-23 15:54:31
+ * @LastEditTime: 2023-11-04 16:33:02
  * @Description:
 -->
 <template>
@@ -67,7 +67,7 @@
 			@cancel="handleCancel"
 			@confirm="handleConfirm"
 			:before-close="handleCancel"
-			width="40%">
+			width="50%">
 			<add-or-update
 				ref="addOrUpdate"
 				@refreshDataList="successSubmit"></add-or-update>
@@ -131,18 +131,15 @@ export default {
 				},
 				{
 					type: 'button',
-					btnName: '查询',
+					btnName: '搜索',
 					name: 'search',
 					color: 'primary',
 				},
-				{
-					type: 'separate',
-				},
 				{
 					type: this.$auth.hasPermi('end-material:warehouse-realtime:create') ? 'button' : '',
 					btnName: '入库',
 					name: 'add',
-					color: 'primary',
+					color: 'success',
 					plain: true,
 				},
 			],

src/views/warehouse/end-material/warehouseRealtimeLocation/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2023-11-23 16:08:09
+ * @LastEditTime: 2023-11-03 14:51:33
  * @Description:
 -->
 <template>
@@ -11,10 +11,7 @@
 		:page="listQuery.pageNo"
 		:limit="listQuery.pageSize"
 		:height="300"
-		:table-data="tableData"
+		:table-data="tableData" />
-		v-if="tableData.length" />
-	<!-- 没有数据 -->
-	<div class="no-data-bg" v-else></div>
 </template>
 
 <script>
@@ -25,41 +22,48 @@ const tableProps = [
 	{
 		prop: 'name',
 		label: '物品名称',
+		align: 'center',
 	},
 	{
 		prop: 'code',
 		label: '物品编码',
+		align: 'center',
 	},
 	{
 		prop: 'spec',
 		label: '物品规格',
+		align: 'center',
 	},
 	{
 		prop: 'goodsBatch',
 		label: '物品批次',
+		align: 'center',
 	},
 	{
 		prop: 'num',
 		label: '数量',
+		align: 'center',
 	},
 	{
 		prop: 'allowTime',
 		label: '允许留存时长(天)',
-    width: 150
+		align: 'center',
 	},
 	{
 		prop: 'inTime',
 		label: '入库时间',
+		align: 'center',
 		filter: parseTime,
 	},
 	{
 		prop: 'leftTime',
 		label: '剩余留存时长(天)',
-    width: 150
+		align: 'center',
 	},
 	{
 		prop: 'remark',
 		label: '备注',
+		align: 'center',
 	},
 ];
 export default {

src/views/warehouse/end-material/warehouseRealtimeLocation/attr-add.vue

@@ -1,7 +1,7 @@
 <template>
 	<el-dialog
 		:visible.sync="visible"
-		:width="'30%'"
+		:width="'35%'"
 		:append-to-body="true"
 		:close-on-click-modal="false"
 		class="dialog">
@@ -22,7 +22,7 @@
 			<el-form-item label="产品" prop="productInfo">
 				<el-select
 					v-model="dataForm.productInfo"
-					style="width: 60%"
+					style="width: 100%"
           filterable
           value-key="id"
 					placeholder="请选择产品">
@@ -79,7 +79,7 @@ export default {
 		// 表单提交
 		dataFormSubmit() {
 			this.$refs['dataForm'].validate((valid) => {
-				if (this.dataForm.productInfo) {
+				if (valid) {
           this.dataForm.productInfo.goodsId = this.dataForm.productInfo.id
           this.dataForm.productInfo.remark = ''
 					// 修改的提交
@@ -91,8 +91,6 @@ export default {
 					// 添加的提交
 					this.visible = false;
 					this.$emit('refreshDataList', this.dataForm);
-				} else {
-					this.$modal.msgWarning('请选择产品');
 				}
 			});
 		},

src/views/warehouse/end-material/warehouseRealtimeLocation/drawer.vue

@@ -20,7 +20,9 @@
 					<el-row :gutter="20">
 						<el-col :span="12">
 							<el-form-item label="库位名称" prop="name">
-								<el-input v-model="dataForm.name" disabled />
+								<el-input
+									v-model="dataForm.name"
+									disabled />
 							</el-form-item>
 						</el-col>
 						<el-col :span="12">
@@ -45,20 +47,15 @@
 				</small-title>
 
 				<div class="attr-list">
-					<div style="position: absolute; top: -40px; right: 15px">
-						<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"
+						:add-button-show="addButtonShow"
+						@emitButtonClick="addNew"
 						@emitFun="inputChange"
 						:height="400"
-						:table-data="productAttributeList"
+						:table-data="productAttributeList">
-						v-if="productAttributeList.length">
 						<method-btn
 							slot="handleBtn"
 							:width="70"
@@ -66,8 +63,6 @@
 							:method-list="tableBtn"
 							@clickBtn="handleClick" />
 					</base-table>
-					<!-- 没有数据 -->
-					<div class="no-data-bg" v-else></div>
 				</div>
 			</div>
 		</div>
@@ -90,10 +85,8 @@
 import productAttrAdd from './attr-add';
 import inputArea from '../../mixins/inputArea';
 import SmallTitle from './SmallTitle';
-import {
+import { inWarehouseRealtimeLocation,
-	inWarehouseRealtimeLocation,
+  getWarehouseRealtimeLocation } from '@/api/warehouse/warehouseRealtimeLocation';
-	getWarehouseRealtimeLocation,
-} from '@/api/warehouse/warehouseRealtimeLocation';
 
 const tableBtn = [
 	{
@@ -106,30 +99,36 @@ const tableProps = [
 	{
 		prop: 'name',
 		label: '物品名称',
+		align: 'center',
 	},
 	{
 		prop: 'code',
 		label: '物品编码',
+		align: 'center',
 	},
 	{
 		prop: 'spec',
 		label: '物品规格',
+		align: 'center',
 	},
 	{
 		prop: 'goodsBatch',
 		label: '物品批次',
+		align: 'center',
 		subcomponent: inputArea,
 		width: 100,
 	},
 	{
 		prop: 'num',
 		label: '数量',
+		align: 'center',
 		subcomponent: inputArea,
 		width: 100,
 	},
 	{
 		prop: 'remark',
 		label: '备注',
+		align: 'center',
 		subcomponent: inputArea,
 		width: 100,
 	},
@@ -144,7 +143,8 @@ export default {
 			tableBtn,
 			tableProps,
 			productAttributeList: [],
-			operator: '',
+			addButtonShow: '新增',
+      operator: '',
 			dataForm: {
 				id: null,
 				name: '',
@@ -170,8 +170,8 @@ export default {
 		initData() {
 			this.productAttributeList.splice(0);
 		},
-		init(val, nickname) {
+		init(val,nickname) {
-			this.operator = nickname;
+      this.operator = nickname
 			this.dataForm.id = val.id;
 			this.dataForm.name = val.name;
 			this.dataForm.palletCode = val.palletCode;
@@ -213,8 +213,12 @@ export default {
 		handleClick(raw) {
 			if (raw.type === 'delete') {
 				this.$confirm(
-					`是否确认删除名称为"${raw.data.name}"的数据项?`,
+					`确定对${
-					'系统提示',
+						raw.data.name
+							? '[名称=' + raw.data.name + ']'
+							: '[序号=' + raw.data._pageIndex + ']'
+					}进行删除操作?`,
+					'提示',
 					{
 						confirmButtonText: '确定',
 						cancelButtonText: '取消',
@@ -234,12 +238,12 @@ export default {
 			this.productAttributeList.forEach((item) => {
 				item.id = '';
 			});
-			const data = {
+      const data = {
-				realtimeLocationId: this.dataForm.id,
+        realtimeLocationId : this.dataForm.id,
-				palletCode: this.dataForm.palletCode,
+        palletCode : this.dataForm.palletCode,
-				operator: this.operator,
+        operator : this.operator,
-				goodsInfos: this.productAttributeList,
+        goodsInfos: this.productAttributeList
-			};
+      }
 			this.$refs['dataForm'].validate((valid) => {
 				if (valid) {
 					// 修改的提交
@@ -309,6 +313,5 @@ export default {
 .drawer >>> .el-form,
 .drawer >>> .attr-list {
 	padding: 0 16px;
-	position: relative;
 }
 </style>

src/views/warehouse/end-material/warehouseRealtimeLocation/index.vue

@@ -100,7 +100,7 @@ const tableProps = [
 		prop: 'inTime',
 		label: '入库时间',
 		filter: parseTime,
-		minWidth: 100,
+		minWidth: 150,
 	},
 	{
 		prop: 'remark',
@@ -125,6 +125,12 @@ export default {
 			tableData: [],
 			tableProps,
 			tableBtn: [
+				this.$auth.hasPermi(`end-material:warehouse-realtime-location:query`)
+					? {
+							type: 'info',
+							btnName: '详情',
+					  }
+					: undefined,
 				this.$auth.hasPermi(`end-material:warehouse-realtime-location:query`)
 					? {
 							type: 'out',
@@ -137,12 +143,6 @@ export default {
 							btnName: '入库',
 					  }
 					: undefined,
-				this.$auth.hasPermi(`end-material:warehouse-realtime-location:query`)
-					? {
-							type: 'detail',
-							btnName: '详情',
-					  }
-					: undefined,
 			].filter((v) => v),
 			drawerVisible: false,
 			formConfig: [
@@ -183,7 +183,7 @@ export default {
 				},
 				{
 					type: 'button',
-					btnName: '查询',
+					btnName: '搜索',
 					name: 'search',
 					color: 'primary',
 				},
@@ -262,7 +262,7 @@ export default {
 				this.$nextTick(() => {
 					this.$refs.drawerRef.init(val.data, this.nickname);
 				});
-			} else if (val.type === 'detail') {
+			} else if (val.type === 'info') {
 				this.addOrUpdateVisible = true;
 				this.addOrEditTitle = val.data.name + ' -产品信息';
 				this.$nextTick(() => {

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: 2023-11-14 15:59:53
  * @Description:
  */
 export default {
@@ -104,7 +104,7 @@ export default {
     },
     // 删除
     deleteHandle(id, name, index) {
-      this.$confirm(`是否确认删除${name ? '名称为"' + name + '"' : '序号为"' + index + '"'}的数据项?`, "系统提示", {
+      this.$confirm(`确定对${name ? '[名称=' + name + ']' : '[序号=' + index + ']'}进行删除操作?`, "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",

src/views/warehouse/out-material/warehouseGoods/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 13:52:10
  * @LastEditors: zwq
- * @LastEditTime: 2023-11-23 15:27:47
+ * @LastEditTime: 2023-11-20 15:54:39
  * @Description:
 -->
 <template>
@@ -12,8 +12,7 @@
 		ref="dataForm"
 		v-if="visible"
 		@keyup.enter.native="dataFormSubmit()"
-		label-width="100px"
+		label-width="100px">
-    label-position="top">
 		<el-row :gutter="20">
 			<el-col :span="12">
 				<el-form-item label="物品名称" prop="name">
@@ -61,7 +60,6 @@
             :min="0"
 						v-model="dataForm.dailyUse"
 						clearable
-            style="width: 100%;"
 						placeholder="请输入单日消耗量" />
 				</el-form-item>
 			</el-col>
@@ -71,7 +69,6 @@
             :min="0"
 						v-model="dataForm.allowTime"
 						clearable
-            style="width: 90%;"
 						placeholder="请输入允许留存时间" /> (天)
 				</el-form-item>
 			</el-col>

src/views/warehouse/out-material/warehouseGoods/index.vue

@@ -75,7 +75,6 @@ const tableProps = [
 	{
 		prop: 'allowTime',
 		label: '允许留存时长(天)',
-    width: 150
 	},
 	{
 		prop: 'dailyUse',
@@ -128,7 +127,7 @@ export default {
 				},
 				{
 					type: 'button',
-					btnName: '查询',
+					btnName: '搜索',
 					name: 'search',
 					color: 'primary',
 				},

src/views/warehouse/out-material/warehouseHis/index.vue

@@ -14,6 +14,13 @@
 			: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"
@@ -69,7 +76,7 @@ const tableProps = [
 		prop: 'operateTime',
 		label: '操作时间',
 		filter: parseTime,
-		minWidth: 100,
+		minWidth: 150,
 	},
 	{
 		prop: 'operator',
@@ -89,6 +96,14 @@ export default {
 			},
 			tableData: [],
 			tableProps,
+			tableBtn: [
+				this.$auth.hasPermi(`out-material:warehouse-realtime-location-his:query`)
+					? {
+							type: 'info',
+							btnName: '详情',
+					  }
+					: undefined,
+			].filter((v) => v),
 			drawerVisible: false,
 			formConfig: [
 				{
@@ -128,7 +143,7 @@ export default {
 				},
 				{
 					type: 'button',
-					btnName: '查询',
+					btnName: '搜索',
 					name: 'search',
 					color: 'primary',
 				},

src/views/warehouse/out-material/warehouseLocationHis/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2023-11-23 16:09:04
+ * @LastEditTime: 2023-11-03 16:20:19
  * @Description:
 -->
 <template>
@@ -11,10 +11,7 @@
 		:page="listQuery.pageNo"
 		:limit="listQuery.pageSize"
 		:height="300"
-		:table-data="tableData"
+		:table-data="tableData" />
-		v-if="tableData.length" />
-	<!-- 没有数据 -->
-	<div class="no-data-bg" v-else></div>
 </template>
 
 <script>
@@ -25,31 +22,37 @@ const tableProps = [
 	{
 		prop: 'name',
 		label: '物品名称',
+		align: 'center',
 	},
 	{
 		prop: 'code',
 		label: '物品编码',
+		align: 'center',
 	},
 	{
 		prop: 'spec',
 		label: '物品规格',
+		align: 'center',
 	},
 	{
 		prop: 'batchCode',
 		label: '物品批次',
+		align: 'center',
 	},
 	{
 		prop: 'num',
 		label: '数量',
+		align: 'center',
 	},
 	{
 		prop: 'allowTime',
 		label: '允许留存时长(天)',
-    width: 150
+		align: 'center',
 	},
 	{
 		prop: 'remark',
 		label: '备注',
+		align: 'center',
 	},
 ];
 export default {

src/views/warehouse/out-material/warehouseLocationHis/index.vue

@@ -92,7 +92,7 @@ const tableProps = [
 		prop: 'createTime',
 		label: '操作时间',
 		filter: parseTime,
-		minWidth: 100,
+		minWidth: 150,
 	},
 	{
 		prop: 'creator',
@@ -115,7 +115,7 @@ export default {
 			tableBtn: [
 				this.$auth.hasPermi(`out-material:warehouse-location-his:query`)
 					? {
-							type: 'detail',
+							type: 'info',
 							btnName: '详情',
 					  }
 					: undefined,
@@ -159,7 +159,7 @@ export default {
 				},
 				{
 					type: 'button',
-					btnName: '查询',
+					btnName: '搜索',
 					name: 'search',
 					color: 'primary',
 				},
@@ -205,7 +205,7 @@ export default {
 			}
 		},
 		otherMethods(val) {
-			if (val.type === 'detail') {
+			if (val.type === 'info') {
 				this.addOrUpdateVisible = true;
 				this.addOrEditTitle = val.data.name + ' -产品信息';
 				this.$nextTick(() => {

src/views/warehouse/out-material/warehouseRealtime/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 13:52:10
  * @LastEditors: zwq
- * @LastEditTime: 2023-11-23 15:54:07
+ * @LastEditTime: 2023-11-20 15:14:00
  * @Description:
 -->
 <template>
@@ -68,7 +68,6 @@
 						v-model="dataForm.goodsBatch"
 						filterable
 						clearable
-            style="width:100%"
 						placeholder="请选择物品名称">
 						<el-option
 							v-for="(item, index) in Batch"
@@ -84,7 +83,6 @@
 						v-model="dataForm.numDet"
 						clearable
             :min="0"
-            style="width:100%"
 						placeholder="请输入数量" />
 				</el-form-item>
 			</el-col>

src/views/warehouse/out-material/warehouseRealtime/index.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-11-03 16:37:06
  * @LastEditors: zwq
- * @LastEditTime: 2023-11-23 15:54:14
+ * @LastEditTime: 2023-11-04 16:14:09
  * @Description:
 -->
 <template>
@@ -67,7 +67,7 @@
 			@cancel="handleCancel"
 			@confirm="handleConfirm"
 			:before-close="handleCancel"
-			width="40%">
+			width="50%">
 			<add-or-update
 				ref="addOrUpdate"
 				@refreshDataList="successSubmit"></add-or-update>
@@ -131,18 +131,15 @@ export default {
 				},
 				{
 					type: 'button',
-					btnName: '查询',
+					btnName: '搜索',
 					name: 'search',
 					color: 'primary',
 				},
-				{
-					type: 'separate',
-				},
 				{
 					type: this.$auth.hasPermi('out-material:warehouse-realtime:create') ? 'button' : '',
 					btnName: '入库',
 					name: 'add',
-					color: 'primary',
+					color: 'success',
 					plain: true,
 				},
 			],

src/views/warehouse/out-material/warehouseRealtimeLocation/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2023-11-23 16:07:43
+ * @LastEditTime: 2023-11-03 14:51:33
  * @Description:
 -->
 <template>
@@ -11,10 +11,7 @@
 		:page="listQuery.pageNo"
 		:limit="listQuery.pageSize"
 		:height="300"
-		:table-data="tableData"
+		:table-data="tableData" />
-		v-if="tableData.length" />
-	<!-- 没有数据 -->
-	<div class="no-data-bg" v-else></div>
 </template>
 
 <script>
@@ -25,41 +22,48 @@ const tableProps = [
 	{
 		prop: 'name',
 		label: '物品名称',
+		align: 'center',
 	},
 	{
 		prop: 'code',
 		label: '物品编码',
+		align: 'center',
 	},
 	{
 		prop: 'spec',
 		label: '物品规格',
+		align: 'center',
 	},
 	{
 		prop: 'goodsBatch',
 		label: '物品批次',
+		align: 'center',
 	},
 	{
 		prop: 'num',
 		label: '数量',
+		align: 'center',
 	},
 	{
 		prop: 'allowTime',
 		label: '允许留存时长(天)',
-		width: 150,
+		align: 'center',
 	},
 	{
 		prop: 'inTime',
 		label: '入库时间',
+		align: 'center',
 		filter: parseTime,
 	},
 	{
 		prop: 'leftTime',
 		label: '剩余留存时长(天)',
-		width: 150,
+		align: 'center',
 	},
 	{
 		prop: 'remark',
 		label: '备注',
+		align: 'center',
 	},
 ];
 export default {

src/views/warehouse/out-material/warehouseRealtimeLocation/attr-add.vue

@@ -1,13 +1,15 @@
 <template>
 	<el-dialog
 		:visible.sync="visible"
-		:width="'30%'"
+		:width="'35%'"
 		:append-to-body="true"
 		:close-on-click-modal="false"
 		class="dialog">
 		<template #title>
 			<slot name="title">
-				<div class="titleStyle">新增产品</div>
+				<div class="titleStyle">
+					新增产品
+				</div>
 			</slot>
 		</template>
 
@@ -20,14 +22,14 @@
 			<el-form-item label="产品" prop="productInfo">
 				<el-select
 					v-model="dataForm.productInfo"
-					style="width: 60%"
+					style="width: 100%"
-					filterable
+          filterable
-					value-key="id"
+          value-key="id"
 					placeholder="请选择产品">
 					<el-option
 						v-for="item in productArr"
 						:key="item.id"
-						:disabled="!item.enabled"
+            :disabled="!item.enabled"
 						:label="item.name"
 						:value="item" />
 				</el-select>
@@ -42,7 +44,10 @@
 </template>
 
 <script>
-import { getListByType } from '@/api/warehouse/warehouseGoods';
+
+import {
+  getListByType
+} from "@/api/warehouse/warehouseGoods";
 
 export default {
 	data() {
@@ -54,9 +59,7 @@ export default {
 			},
 			productArr: [],
 			dataRule: {
-				productId: [
+				productId: [{ required: true, message: '产品不能为空', trigger: 'blur' }],
-					{ required: true, message: '产品不能为空', trigger: 'blur' },
-				],
 			},
 		};
 	},
@@ -76,9 +79,9 @@ export default {
 		// 表单提交
 		dataFormSubmit() {
 			this.$refs['dataForm'].validate((valid) => {
-				if (this.dataForm.productInfo) {
+				if (valid) {
-					this.dataForm.productInfo.goodsId = this.dataForm.productInfo.id;
+          this.dataForm.productInfo.goodsId = this.dataForm.productInfo.id
-					this.dataForm.productInfo.remark = '';
+          this.dataForm.productInfo.remark = ''
 					// 修改的提交
 					if (this.dataForm.index >= 0) {
 						this.visible = false;
@@ -88,8 +91,6 @@ export default {
 					// 添加的提交
 					this.visible = false;
 					this.$emit('refreshDataList', this.dataForm);
-				} else {
-					this.$modal.msgWarning('请选择产品');
 				}
 			});
 		},

src/views/warehouse/out-material/warehouseRealtimeLocation/drawer.vue

@@ -20,7 +20,9 @@
 					<el-row :gutter="20">
 						<el-col :span="12">
 							<el-form-item label="库位名称" prop="name">
-								<el-input v-model="dataForm.name" disabled />
+								<el-input
+									v-model="dataForm.name"
+									disabled />
 							</el-form-item>
 						</el-col>
 						<el-col :span="12">
@@ -45,20 +47,15 @@
 				</small-title>
 
 				<div class="attr-list">
-					<div style="position: absolute; top: -40px; right: 15px">
-						<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"
+						:add-button-show="addButtonShow"
+						@emitButtonClick="addNew"
 						@emitFun="inputChange"
 						:height="400"
-						:table-data="productAttributeList"
+						:table-data="productAttributeList">
-						v-if="productAttributeList.length">
 						<method-btn
 							slot="handleBtn"
 							:width="70"
@@ -66,8 +63,6 @@
 							:method-list="tableBtn"
 							@clickBtn="handleClick" />
 					</base-table>
-					<!-- 没有数据 -->
-					<div class="no-data-bg" v-else></div>
 				</div>
 			</div>
 		</div>
@@ -90,10 +85,8 @@
 import productAttrAdd from './attr-add';
 import inputArea from '../../mixins/inputArea';
 import SmallTitle from './SmallTitle';
-import {
+import { inWarehouseRealtimeLocation,
-	inWarehouseRealtimeLocation,
+  getWarehouseRealtimeLocation } from '@/api/warehouse/warehouseRealtimeLocation';
-	getWarehouseRealtimeLocation,
-} from '@/api/warehouse/warehouseRealtimeLocation';
 
 const tableBtn = [
 	{
@@ -106,30 +99,36 @@ const tableProps = [
 	{
 		prop: 'name',
 		label: '物品名称',
+		align: 'center',
 	},
 	{
 		prop: 'code',
 		label: '物品编码',
+		align: 'center',
 	},
 	{
 		prop: 'spec',
 		label: '物品规格',
+		align: 'center',
 	},
 	{
 		prop: 'goodsBatch',
 		label: '物品批次',
+		align: 'center',
 		subcomponent: inputArea,
 		width: 100,
 	},
 	{
 		prop: 'num',
 		label: '数量',
+		align: 'center',
 		subcomponent: inputArea,
 		width: 100,
 	},
 	{
 		prop: 'remark',
 		label: '备注',
+		align: 'center',
 		subcomponent: inputArea,
 		width: 100,
 	},
@@ -144,7 +143,8 @@ export default {
 			tableBtn,
 			tableProps,
 			productAttributeList: [],
-			operator: '',
+			addButtonShow: '新增',
+      operator: '',
 			dataForm: {
 				id: null,
 				name: '',
@@ -170,8 +170,8 @@ export default {
 		initData() {
 			this.productAttributeList.splice(0);
 		},
-		init(val, nickname) {
+		init(val,nickname) {
-			this.operator = nickname;
+      this.operator = nickname
 			this.dataForm.id = val.id;
 			this.dataForm.name = val.name;
 			this.dataForm.palletCode = val.palletCode;
@@ -213,8 +213,12 @@ export default {
 		handleClick(raw) {
 			if (raw.type === 'delete') {
 				this.$confirm(
-					`是否确认删除名称为"${raw.data.name}"的数据项?`,
+					`确定对${
-					'系统提示',
+						raw.data.name
+							? '[名称=' + raw.data.name + ']'
+							: '[序号=' + raw.data._pageIndex + ']'
+					}进行删除操作?`,
+					'提示',
 					{
 						confirmButtonText: '确定',
 						cancelButtonText: '取消',
@@ -234,12 +238,12 @@ export default {
 			this.productAttributeList.forEach((item) => {
 				item.id = '';
 			});
-			const data = {
+      const data = {
-				realtimeLocationId: this.dataForm.id,
+        realtimeLocationId : this.dataForm.id,
-				palletCode: this.dataForm.palletCode,
+        palletCode : this.dataForm.palletCode,
-				operator: this.operator,
+        operator : this.operator,
-				goodsInfos: this.productAttributeList,
+        goodsInfos: this.productAttributeList
-			};
+      }
 			this.$refs['dataForm'].validate((valid) => {
 				if (valid) {
 					// 修改的提交
@@ -309,6 +313,5 @@ export default {
 .drawer >>> .el-form,
 .drawer >>> .attr-list {
 	padding: 0 16px;
-	position: relative;
 }
 </style>

src/views/warehouse/out-material/warehouseRealtimeLocation/index.vue

@@ -100,7 +100,7 @@ const tableProps = [
 		prop: 'inTime',
 		label: '入库时间',
 		filter: parseTime,
-		minWidth: 100,
+		minWidth: 150,
 	},
 	{
 		prop: 'remark',
@@ -125,6 +125,12 @@ export default {
 			tableData: [],
 			tableProps,
 			tableBtn: [
+				this.$auth.hasPermi(`out-material:warehouse-realtime-location:query`)
+					? {
+							type: 'info',
+							btnName: '详情',
+					  }
+					: undefined,
 				this.$auth.hasPermi(`out-material:warehouse-realtime-location:query`)
 					? {
 							type: 'out',
@@ -137,12 +143,6 @@ export default {
 							btnName: '入库',
 					  }
 					: undefined,
-				this.$auth.hasPermi(`out-material:warehouse-realtime-location:query`)
-					? {
-							type: 'detail',
-							btnName: '详情',
-					  }
-					: undefined,
 			].filter((v) => v),
 			drawerVisible: false,
 			formConfig: [
@@ -183,7 +183,7 @@ export default {
 				},
 				{
 					type: 'button',
-					btnName: '查询',
+					btnName: '搜索',
 					name: 'search',
 					color: 'primary',
 				},
@@ -262,7 +262,7 @@ export default {
 				this.$nextTick(() => {
 					this.$refs.drawerRef.init(val.data, this.nickname);
 				});
-			} else if (val.type === 'detail') {
+			} else if (val.type === 'info') {
 				this.addOrUpdateVisible = true;
 				this.addOrEditTitle = val.data.name + ' -产品信息';
 				this.$nextTick(() => {

src/views/warehouse/package-material/warehouseGoods/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 13:52:10
  * @LastEditors: zwq
- * @LastEditTime: 2023-11-23 15:27:37
+ * @LastEditTime: 2023-11-20 15:54:49
  * @Description:
 -->
 <template>
@@ -12,8 +12,7 @@
 		ref="dataForm"
 		v-if="visible"
 		@keyup.enter.native="dataFormSubmit()"
-		label-width="100px"
+		label-width="100px">
-    label-position="top">
 		<el-row :gutter="20">
 			<el-col :span="12">
 				<el-form-item label="物品名称" prop="name">
@@ -61,7 +60,6 @@
             :min="0"
 						v-model="dataForm.dailyUse"
 						clearable
-            style="width: 100%;"
 						placeholder="请输入单日消耗量" />
 				</el-form-item>
 			</el-col>
@@ -71,7 +69,6 @@
             :min="0"
 						v-model="dataForm.allowTime"
 						clearable
-            style="width: 90%;"
 						placeholder="请输入允许留存时间" /> (天)
 				</el-form-item>
 			</el-col>

src/views/warehouse/package-material/warehouseGoods/index.vue

@@ -75,7 +75,6 @@ const tableProps = [
 	{
 		prop: 'allowTime',
 		label: '允许留存时长(天)',
-    width: 150
 	},
 	{
 		prop: 'dailyUse',
@@ -128,7 +127,7 @@ export default {
 				},
 				{
 					type: 'button',
-					btnName: '查询',
+					btnName: '搜索',
 					name: 'search',
 					color: 'primary',
 				},

src/views/warehouse/package-material/warehouseHis/index.vue

@@ -14,6 +14,13 @@
 			: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"
@@ -69,7 +76,7 @@ const tableProps = [
 		prop: 'operateTime',
 		label: '操作时间',
 		filter: parseTime,
-		minWidth: 100,
+		minWidth: 150,
 	},
 	{
 		prop: 'operator',
@@ -89,6 +96,14 @@ export default {
 			},
 			tableData: [],
 			tableProps,
+			tableBtn: [
+				this.$auth.hasPermi(`pack-material:warehouse-realtime-location-his:query`)
+					? {
+							type: 'info',
+							btnName: '详情',
+					  }
+					: undefined,
+			].filter((v) => v),
 			drawerVisible: false,
 			formConfig: [
 				{
@@ -128,7 +143,7 @@ export default {
 				},
 				{
 					type: 'button',
-					btnName: '查询',
+					btnName: '搜索',
 					name: 'search',
 					color: 'primary',
 				},

src/views/warehouse/package-material/warehouseLocationHis/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2023-11-23 16:09:30
+ * @LastEditTime: 2023-11-03 16:20:19
  * @Description:
 -->
 <template>
@@ -11,10 +11,7 @@
 		:page="listQuery.pageNo"
 		:limit="listQuery.pageSize"
 		:height="300"
-		:table-data="tableData"
+		:table-data="tableData" />
-		v-if="tableData.length" />
-	<!-- 没有数据 -->
-	<div class="no-data-bg" v-else></div>
 </template>
 
 <script>
@@ -25,31 +22,37 @@ const tableProps = [
 	{
 		prop: 'name',
 		label: '物品名称',
+		align: 'center',
 	},
 	{
 		prop: 'code',
 		label: '物品编码',
+		align: 'center',
 	},
 	{
 		prop: 'spec',
 		label: '物品规格',
+		align: 'center',
 	},
 	{
 		prop: 'batchCode',
 		label: '物品批次',
+		align: 'center',
 	},
 	{
 		prop: 'num',
 		label: '数量',
+		align: 'center',
 	},
 	{
 		prop: 'allowTime',
 		label: '允许留存时长(天)',
-    width: 150
+		align: 'center',
 	},
 	{
 		prop: 'remark',
 		label: '备注',
+		align: 'center',
 	},
 ];
 export default {

src/views/warehouse/package-material/warehouseLocationHis/index.vue

@@ -92,7 +92,7 @@ const tableProps = [
 		prop: 'createTime',
 		label: '操作时间',
 		filter: parseTime,
-		minWidth: 100,
+		minWidth: 150,
 	},
 	{
 		prop: 'creator',
@@ -115,7 +115,7 @@ export default {
 			tableBtn: [
 				this.$auth.hasPermi(`pack-material:warehouse-location-his:query`)
 					? {
-							type: 'detail',
+							type: 'info',
 							btnName: '详情',
 					  }
 					: undefined,
@@ -159,7 +159,7 @@ export default {
 				},
 				{
 					type: 'button',
-					btnName: '查询',
+					btnName: '搜索',
 					name: 'search',
 					color: 'primary',
 				},
@@ -205,7 +205,7 @@ export default {
 			}
 		},
 		otherMethods(val) {
-			if (val.type === 'detail') {
+			if (val.type === 'info') {
 				this.addOrUpdateVisible = true;
 				this.addOrEditTitle = val.data.name + ' -产品信息';
 				this.$nextTick(() => {

src/views/warehouse/package-material/warehouseRealtime/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 13:52:10
  * @LastEditors: zwq
- * @LastEditTime: 2023-11-23 15:53:47
+ * @LastEditTime: 2023-11-20 15:13:37
  * @Description:
 -->
 <template>
@@ -68,7 +68,6 @@
 						v-model="dataForm.goodsBatch"
 						filterable
 						clearable
-            style="width:100%"
 						placeholder="请选择物品名称">
 						<el-option
 							v-for="(item, index) in Batch"
@@ -84,7 +83,6 @@
 						v-model="dataForm.numDet"
 						clearable
             :min="0"
-            style="width:100%"
 						placeholder="请输入数量" />
 				</el-form-item>
 			</el-col>

src/views/warehouse/package-material/warehouseRealtime/index.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-11-03 16:37:06
  * @LastEditors: zwq
- * @LastEditTime: 2023-11-23 15:53:54
+ * @LastEditTime: 2023-11-04 16:01:58
  * @Description:
 -->
 <template>
@@ -67,7 +67,7 @@
 			@cancel="handleCancel"
 			@confirm="handleConfirm"
 			:before-close="handleCancel"
-			width="40%">
+			width="50%">
 			<add-or-update
 				ref="addOrUpdate"
 				@refreshDataList="successSubmit"></add-or-update>
@@ -131,18 +131,15 @@ export default {
 				},
 				{
 					type: 'button',
-					btnName: '查询',
+					btnName: '搜索',
 					name: 'search',
 					color: 'primary',
 				},
-				{
-					type: 'separate',
-				},
 				{
 					type: this.$auth.hasPermi('pack-material:warehouse-realtime:create') ? 'button' : '',
 					btnName: '入库',
 					name: 'add',
-					color: 'primary',
+					color: 'success',
 					plain: true,
 				},
 			],

src/views/warehouse/package-material/warehouseRealtimeLocation/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2023-11-23 16:08:22
+ * @LastEditTime: 2023-11-03 14:51:33
  * @Description:
 -->
 <template>
@@ -11,10 +11,7 @@
 		:page="listQuery.pageNo"
 		:limit="listQuery.pageSize"
 		:height="300"
-		:table-data="tableData"
+		:table-data="tableData" />
-		v-if="tableData.length" />
-	<!-- 没有数据 -->
-	<div class="no-data-bg" v-else></div>
 </template>
 
 <script>
@@ -25,41 +22,48 @@ const tableProps = [
 	{
 		prop: 'name',
 		label: '物品名称',
+		align: 'center',
 	},
 	{
 		prop: 'code',
 		label: '物品编码',
+		align: 'center',
 	},
 	{
 		prop: 'spec',
 		label: '物品规格',
+		align: 'center',
 	},
 	{
 		prop: 'goodsBatch',
 		label: '物品批次',
+		align: 'center',
 	},
 	{
 		prop: 'num',
 		label: '数量',
+		align: 'center',
 	},
 	{
 		prop: 'allowTime',
 		label: '允许留存时长(天)',
-    width: 150
+		align: 'center',
 	},
 	{
 		prop: 'inTime',
 		label: '入库时间',
+		align: 'center',
 		filter: parseTime,
 	},
 	{
 		prop: 'leftTime',
 		label: '剩余留存时长(天)',
-    width: 150
+		align: 'center',
 	},
 	{
 		prop: 'remark',
 		label: '备注',
+		align: 'center',
 	},
 ];
 export default {

src/views/warehouse/package-material/warehouseRealtimeLocation/attr-add.vue

@@ -1,7 +1,7 @@
 <template>
 	<el-dialog
 		:visible.sync="visible"
-		:width="'30%'"
+		:width="'35%'"
 		:append-to-body="true"
 		:close-on-click-modal="false"
 		class="dialog">
@@ -22,7 +22,7 @@
 			<el-form-item label="产品" prop="productInfo">
 				<el-select
 					v-model="dataForm.productInfo"
-					style="width: 60%"
+					style="width: 100%"
           filterable
           value-key="id"
 					placeholder="请选择产品">
@@ -59,7 +59,7 @@ export default {
 			},
 			productArr: [],
 			dataRule: {
-				productId: [{ required: true, message: '产品不能为空', trigger: 'change' }],
+				productId: [{ required: true, message: '产品不能为空', trigger: 'blur' }],
 			},
 		};
 	},
@@ -79,7 +79,7 @@ export default {
 		// 表单提交
 		dataFormSubmit() {
 			this.$refs['dataForm'].validate((valid) => {
-				if (this.dataForm.productInfo) {
+				if (valid) {
           this.dataForm.productInfo.goodsId = this.dataForm.productInfo.id
           this.dataForm.productInfo.remark = ''
 					// 修改的提交
@@ -91,8 +91,6 @@ export default {
 					// 添加的提交
 					this.visible = false;
 					this.$emit('refreshDataList', this.dataForm);
-				} else {
-					this.$modal.msgWarning('请选择产品');
 				}
 			});
 		},

src/views/warehouse/package-material/warehouseRealtimeLocation/drawer.vue

@@ -20,7 +20,9 @@
 					<el-row :gutter="20">
 						<el-col :span="12">
 							<el-form-item label="库位名称" prop="name">
-								<el-input v-model="dataForm.name" disabled />
+								<el-input
+									v-model="dataForm.name"
+									disabled />
 							</el-form-item>
 						</el-col>
 						<el-col :span="12">
@@ -45,20 +47,15 @@
 				</small-title>
 
 				<div class="attr-list">
-					<div style="position: absolute; top: -40px; right: 15px">
-						<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"
+						:add-button-show="addButtonShow"
+						@emitButtonClick="addNew"
 						@emitFun="inputChange"
 						:height="400"
-						:table-data="productAttributeList"
+						:table-data="productAttributeList">
-						v-if="productAttributeList.length">
 						<method-btn
 							slot="handleBtn"
 							:width="70"
@@ -66,8 +63,6 @@
 							:method-list="tableBtn"
 							@clickBtn="handleClick" />
 					</base-table>
-					<!-- 没有数据 -->
-					<div class="no-data-bg" v-else></div>
 				</div>
 			</div>
 		</div>
@@ -90,10 +85,8 @@
 import productAttrAdd from './attr-add';
 import inputArea from '../../mixins/inputArea';
 import SmallTitle from './SmallTitle';
-import {
+import { inWarehouseRealtimeLocation,
-	inWarehouseRealtimeLocation,
+  getWarehouseRealtimeLocation } from '@/api/warehouse/warehouseRealtimeLocation';
-	getWarehouseRealtimeLocation,
-} from '@/api/warehouse/warehouseRealtimeLocation';
 
 const tableBtn = [
 	{
@@ -106,30 +99,36 @@ const tableProps = [
 	{
 		prop: 'name',
 		label: '物品名称',
+		align: 'center',
 	},
 	{
 		prop: 'code',
 		label: '物品编码',
+		align: 'center',
 	},
 	{
 		prop: 'spec',
 		label: '物品规格',
+		align: 'center',
 	},
 	{
 		prop: 'goodsBatch',
 		label: '物品批次',
+		align: 'center',
 		subcomponent: inputArea,
 		width: 100,
 	},
 	{
 		prop: 'num',
 		label: '数量',
+		align: 'center',
 		subcomponent: inputArea,
 		width: 100,
 	},
 	{
 		prop: 'remark',
 		label: '备注',
+		align: 'center',
 		subcomponent: inputArea,
 		width: 100,
 	},
@@ -144,7 +143,8 @@ export default {
 			tableBtn,
 			tableProps,
 			productAttributeList: [],
-			operator: '',
+			addButtonShow: '新增',
+      operator: '',
 			dataForm: {
 				id: null,
 				name: '',
@@ -170,8 +170,8 @@ export default {
 		initData() {
 			this.productAttributeList.splice(0);
 		},
-		init(val, nickname) {
+		init(val,nickname) {
-			this.operator = nickname;
+      this.operator = nickname
 			this.dataForm.id = val.id;
 			this.dataForm.name = val.name;
 			this.dataForm.palletCode = val.palletCode;
@@ -213,8 +213,12 @@ export default {
 		handleClick(raw) {
 			if (raw.type === 'delete') {
 				this.$confirm(
-					`是否确认删除名称为"${raw.data.name}"的数据项?`,
+					`确定对${
-					'系统提示',
+						raw.data.name
+							? '[名称=' + raw.data.name + ']'
+							: '[序号=' + raw.data._pageIndex + ']'
+					}进行删除操作?`,
+					'提示',
 					{
 						confirmButtonText: '确定',
 						cancelButtonText: '取消',
@@ -234,12 +238,12 @@ export default {
 			this.productAttributeList.forEach((item) => {
 				item.id = '';
 			});
-			const data = {
+      const data = {
-				realtimeLocationId: this.dataForm.id,
+        realtimeLocationId : this.dataForm.id,
-				palletCode: this.dataForm.palletCode,
+        palletCode : this.dataForm.palletCode,
-				operator: this.operator,
+        operator : this.operator,
-				goodsInfos: this.productAttributeList,
+        goodsInfos: this.productAttributeList
-			};
+      }
 			this.$refs['dataForm'].validate((valid) => {
 				if (valid) {
 					// 修改的提交
@@ -309,6 +313,5 @@ export default {
 .drawer >>> .el-form,
 .drawer >>> .attr-list {
 	padding: 0 16px;
-	position: relative;
 }
 </style>

src/views/warehouse/package-material/warehouseRealtimeLocation/index.vue

@@ -100,7 +100,7 @@ const tableProps = [
 		prop: 'inTime',
 		label: '入库时间',
 		filter: parseTime,
-		minWidth: 100,
+		minWidth: 150,
 	},
 	{
 		prop: 'remark',
@@ -125,6 +125,12 @@ export default {
 			tableData: [],
 			tableProps,
 			tableBtn: [
+				this.$auth.hasPermi(`pack-material:warehouse-realtime-location:query`)
+					? {
+							type: 'info',
+							btnName: '详情',
+					  }
+					: undefined,
 				this.$auth.hasPermi(`pack-material:warehouse-realtime-location:query`)
 					? {
 							type: 'out',
@@ -137,12 +143,6 @@ export default {
 							btnName: '入库',
 					  }
 					: undefined,
-				this.$auth.hasPermi(`pack-material:warehouse-realtime-location:query`)
-					? {
-							type: 'detail',
-							btnName: '详情',
-					  }
-					: undefined,
 			].filter((v) => v),
 			drawerVisible: false,
 			formConfig: [
@@ -183,7 +183,7 @@ export default {
 				},
 				{
 					type: 'button',
-					btnName: '查询',
+					btnName: '搜索',
 					name: 'search',
 					color: 'primary',
 				},
@@ -262,7 +262,7 @@ export default {
 				this.$nextTick(() => {
 					this.$refs.drawerRef.init(val.data, this.nickname);
 				});
-			} else if (val.type === 'detail') {
+			} else if (val.type === 'info') {
 				this.addOrUpdateVisible = true;
 				this.addOrEditTitle = val.data.name + ' -产品信息';
 				this.$nextTick(() => {

src/views/warehouse/part-material/warehouseGoods/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 13:52:10
  * @LastEditors: zwq
- * @LastEditTime: 2023-11-23 15:27:28
+ * @LastEditTime: 2023-11-20 15:54:59
  * @Description:
 -->
 <template>
@@ -12,8 +12,7 @@
 		ref="dataForm"
 		v-if="visible"
 		@keyup.enter.native="dataFormSubmit()"
-		label-width="100px"
+		label-width="100px">
-    label-position="top">
 		<el-row :gutter="20">
 			<el-col :span="12">
 				<el-form-item label="物品名称" prop="name">
@@ -61,7 +60,6 @@
             :min="0"
 						v-model="dataForm.dailyUse"
 						clearable
-            style="width: 100%;"
 						placeholder="请输入单日消耗量" />
 				</el-form-item>
 			</el-col>
@@ -71,7 +69,6 @@
             :min="0"
 						v-model="dataForm.allowTime"
 						clearable
-            style="width: 90%;"
 						placeholder="请输入允许留存时间" /> (天)
 				</el-form-item>
 			</el-col>

src/views/warehouse/part-material/warehouseGoods/index.vue

@@ -75,7 +75,6 @@ const tableProps = [
 	{
 		prop: 'allowTime',
 		label: '允许留存时长(天)',
-    width: 150
 	},
 	{
 		prop: 'dailyUse',
@@ -128,7 +127,7 @@ export default {
 				},
 				{
 					type: 'button',
-					btnName: '查询',
+					btnName: '搜索',
 					name: 'search',
 					color: 'primary',
 				},

src/views/warehouse/part-material/warehouseHis/index.vue

@@ -14,6 +14,13 @@
 			: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"
@@ -69,7 +76,7 @@ const tableProps = [
 		prop: 'operateTime',
 		label: '操作时间',
 		filter: parseTime,
-		minWidth: 100,
+		minWidth: 150,
 	},
 	{
 		prop: 'operator',
@@ -89,6 +96,14 @@ export default {
 			},
 			tableData: [],
 			tableProps,
+			tableBtn: [
+				this.$auth.hasPermi(`part-material:warehouse-realtime-location-his:query`)
+					? {
+							type: 'info',
+							btnName: '详情',
+					  }
+					: undefined,
+			].filter((v) => v),
 			drawerVisible: false,
 			formConfig: [
 				{
@@ -128,7 +143,7 @@ export default {
 				},
 				{
 					type: 'button',
-					btnName: '查询',
+					btnName: '搜索',
 					name: 'search',
 					color: 'primary',
 				},

src/views/warehouse/part-material/warehouseLocationHis/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2023-11-23 16:09:38
+ * @LastEditTime: 2023-11-03 16:20:19
  * @Description:
 -->
 <template>
@@ -11,10 +11,7 @@
 		:page="listQuery.pageNo"
 		:limit="listQuery.pageSize"
 		:height="300"
-		:table-data="tableData"
+		:table-data="tableData" />
-		v-if="tableData.length" />
-	<!-- 没有数据 -->
-	<div class="no-data-bg" v-else></div>
 </template>
 
 <script>
@@ -25,31 +22,37 @@ const tableProps = [
 	{
 		prop: 'name',
 		label: '物品名称',
+		align: 'center',
 	},
 	{
 		prop: 'code',
 		label: '物品编码',
+		align: 'center',
 	},
 	{
 		prop: 'spec',
 		label: '物品规格',
+		align: 'center',
 	},
 	{
 		prop: 'batchCode',
 		label: '物品批次',
+		align: 'center',
 	},
 	{
 		prop: 'num',
 		label: '数量',
+		align: 'center',
 	},
 	{
 		prop: 'allowTime',
 		label: '允许留存时长(天)',
-    width: 150
+		align: 'center',
 	},
 	{
 		prop: 'remark',
 		label: '备注',
+		align: 'center',
 	},
 ];
 export default {

src/views/warehouse/part-material/warehouseLocationHis/index.vue

@@ -92,7 +92,7 @@ const tableProps = [
 		prop: 'createTime',
 		label: '操作时间',
 		filter: parseTime,
-		minWidth: 100,
+		minWidth: 150,
 	},
 	{
 		prop: 'creator',
@@ -115,7 +115,7 @@ export default {
 			tableBtn: [
 				this.$auth.hasPermi(`part-material:warehouse-location-his:query`)
 					? {
-							type: 'detail',
+							type: 'info',
 							btnName: '详情',
 					  }
 					: undefined,
@@ -159,7 +159,7 @@ export default {
 				},
 				{
 					type: 'button',
-					btnName: '查询',
+					btnName: '搜索',
 					name: 'search',
 					color: 'primary',
 				},
@@ -205,7 +205,7 @@ export default {
 			}
 		},
 		otherMethods(val) {
-			if (val.type === 'detail') {
+			if (val.type === 'info') {
 				this.addOrUpdateVisible = true;
 				this.addOrEditTitle = val.data.name + ' -产品信息';
 				this.$nextTick(() => {

src/views/warehouse/part-material/warehouseRealtime/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 13:52:10
  * @LastEditors: zwq
- * @LastEditTime: 2023-11-23 15:53:35
+ * @LastEditTime: 2023-11-20 15:12:43
  * @Description:
 -->
 <template>
@@ -68,7 +68,6 @@
 						v-model="dataForm.goodsBatch"
 						filterable
 						clearable
-            style="width:100%"
 						placeholder="请选择物品名称">
 						<el-option
 							v-for="(item, index) in Batch"
@@ -84,7 +83,6 @@
 						v-model="dataForm.numDet"
 						clearable
             :min="0"
-            style="width:100%"
 						placeholder="请输入数量" />
 				</el-form-item>
 			</el-col>

src/views/warehouse/part-material/warehouseRealtime/index.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-11-03 16:37:06
  * @LastEditors: zwq
- * @LastEditTime: 2023-11-23 15:53:28
+ * @LastEditTime: 2023-11-04 16:24:57
  * @Description:
 -->
 <template>
@@ -67,7 +67,7 @@
 			@cancel="handleCancel"
 			@confirm="handleConfirm"
 			:before-close="handleCancel"
-			width="40%">
+			width="50%">
 			<add-or-update
 				ref="addOrUpdate"
 				@refreshDataList="successSubmit"></add-or-update>
@@ -131,18 +131,15 @@ export default {
 				},
 				{
 					type: 'button',
-					btnName: '查询',
+					btnName: '搜索',
 					name: 'search',
 					color: 'primary',
 				},
-				{
-					type: 'separate',
-				},
 				{
 					type: this.$auth.hasPermi('part-material:warehouse-realtime:create') ? 'button' : '',
 					btnName: '入库',
 					name: 'add',
-					color: 'primary',
+					color: 'success',
 					plain: true,
 				},
 			],

src/views/warehouse/part-material/warehouseRealtimeLocation/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2023-11-23 16:08:31
+ * @LastEditTime: 2023-11-03 14:51:33
  * @Description:
 -->
 <template>
@@ -11,10 +11,7 @@
 		:page="listQuery.pageNo"
 		:limit="listQuery.pageSize"
 		:height="300"
-		:table-data="tableData"
+		:table-data="tableData" />
-		v-if="tableData.length" />
-	<!-- 没有数据 -->
-	<div class="no-data-bg" v-else></div>
 </template>
 
 <script>
@@ -25,41 +22,48 @@ const tableProps = [
 	{
 		prop: 'name',
 		label: '物品名称',
+		align: 'center',
 	},
 	{
 		prop: 'code',
 		label: '物品编码',
+		align: 'center',
 	},
 	{
 		prop: 'spec',
 		label: '物品规格',
+		align: 'center',
 	},
 	{
 		prop: 'goodsBatch',
 		label: '物品批次',
+		align: 'center',
 	},
 	{
 		prop: 'num',
 		label: '数量',
+		align: 'center',
 	},
 	{
 		prop: 'allowTime',
 		label: '允许留存时长(天)',
-    width: 150
+		align: 'center',
 	},
 	{
 		prop: 'inTime',
 		label: '入库时间',
+		align: 'center',
 		filter: parseTime,
 	},
 	{
 		prop: 'leftTime',
 		label: '剩余留存时长(天)',
-    width: 150
+		align: 'center',
 	},
 	{
 		prop: 'remark',
 		label: '备注',
+		align: 'center',
 	},
 ];
 export default {

src/views/warehouse/part-material/warehouseRealtimeLocation/attr-add.vue

@@ -1,7 +1,7 @@
 <template>
 	<el-dialog
 		:visible.sync="visible"
-		:width="'30%'"
+		:width="'35%'"
 		:append-to-body="true"
 		:close-on-click-modal="false"
 		class="dialog">
@@ -22,7 +22,7 @@
 			<el-form-item label="产品" prop="productInfo">
 				<el-select
 					v-model="dataForm.productInfo"
-					style="width: 60%"
+					style="width: 100%"
           filterable
           value-key="id"
 					placeholder="请选择产品">
@@ -79,7 +79,7 @@ export default {
 		// 表单提交
 		dataFormSubmit() {
 			this.$refs['dataForm'].validate((valid) => {
-				if (this.dataForm.productInfo) {
+				if (valid) {
           this.dataForm.productInfo.goodsId = this.dataForm.productInfo.id
           this.dataForm.productInfo.remark = ''
 					// 修改的提交
@@ -91,8 +91,6 @@ export default {
 					// 添加的提交
 					this.visible = false;
 					this.$emit('refreshDataList', this.dataForm);
-				} else {
-					this.$modal.msgWarning('请选择产品');
 				}
 			});
 		},

src/views/warehouse/part-material/warehouseRealtimeLocation/drawer.vue

@@ -20,7 +20,9 @@
 					<el-row :gutter="20">
 						<el-col :span="12">
 							<el-form-item label="库位名称" prop="name">
-								<el-input v-model="dataForm.name" disabled />
+								<el-input
+									v-model="dataForm.name"
+									disabled />
 							</el-form-item>
 						</el-col>
 						<el-col :span="12">
@@ -45,20 +47,15 @@
 				</small-title>
 
 				<div class="attr-list">
-					<div style="position: absolute; top: -40px; right: 15px">
-						<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"
+						:add-button-show="addButtonShow"
+						@emitButtonClick="addNew"
 						@emitFun="inputChange"
 						:height="400"
-						:table-data="productAttributeList"
+						:table-data="productAttributeList">
-						v-if="productAttributeList.length">
 						<method-btn
 							slot="handleBtn"
 							:width="70"
@@ -66,8 +63,6 @@
 							:method-list="tableBtn"
 							@clickBtn="handleClick" />
 					</base-table>
-					<!-- 没有数据 -->
-					<div class="no-data-bg" v-else></div>
 				</div>
 			</div>
 		</div>
@@ -90,10 +85,8 @@
 import productAttrAdd from './attr-add';
 import inputArea from '../../mixins/inputArea';
 import SmallTitle from './SmallTitle';
-import {
+import { inWarehouseRealtimeLocation,
-	inWarehouseRealtimeLocation,
+  getWarehouseRealtimeLocation } from '@/api/warehouse/warehouseRealtimeLocation';
-	getWarehouseRealtimeLocation,
-} from '@/api/warehouse/warehouseRealtimeLocation';
 
 const tableBtn = [
 	{
@@ -106,30 +99,36 @@ const tableProps = [
 	{
 		prop: 'name',
 		label: '物品名称',
+		align: 'center',
 	},
 	{
 		prop: 'code',
 		label: '物品编码',
+		align: 'center',
 	},
 	{
 		prop: 'spec',
 		label: '物品规格',
+		align: 'center',
 	},
 	{
 		prop: 'goodsBatch',
 		label: '物品批次',
+		align: 'center',
 		subcomponent: inputArea,
 		width: 100,
 	},
 	{
 		prop: 'num',
 		label: '数量',
+		align: 'center',
 		subcomponent: inputArea,
 		width: 100,
 	},
 	{
 		prop: 'remark',
 		label: '备注',
+		align: 'center',
 		subcomponent: inputArea,
 		width: 100,
 	},
@@ -144,7 +143,8 @@ export default {
 			tableBtn,
 			tableProps,
 			productAttributeList: [],
-			operator: '',
+			addButtonShow: '新增',
+      operator: '',
 			dataForm: {
 				id: null,
 				name: '',
@@ -170,8 +170,8 @@ export default {
 		initData() {
 			this.productAttributeList.splice(0);
 		},
-		init(val, nickname) {
+		init(val,nickname) {
-			this.operator = nickname;
+      this.operator = nickname
 			this.dataForm.id = val.id;
 			this.dataForm.name = val.name;
 			this.dataForm.palletCode = val.palletCode;
@@ -213,8 +213,12 @@ export default {
 		handleClick(raw) {
 			if (raw.type === 'delete') {
 				this.$confirm(
-					`是否确认删除名称为"${raw.data.name}"的数据项?`,
+					`确定对${
-					'系统提示',
+						raw.data.name
+							? '[名称=' + raw.data.name + ']'
+							: '[序号=' + raw.data._pageIndex + ']'
+					}进行删除操作?`,
+					'提示',
 					{
 						confirmButtonText: '确定',
 						cancelButtonText: '取消',
@@ -234,12 +238,12 @@ export default {
 			this.productAttributeList.forEach((item) => {
 				item.id = '';
 			});
-			const data = {
+      const data = {
-				realtimeLocationId: this.dataForm.id,
+        realtimeLocationId : this.dataForm.id,
-				palletCode: this.dataForm.palletCode,
+        palletCode : this.dataForm.palletCode,
-				operator: this.operator,
+        operator : this.operator,
-				goodsInfos: this.productAttributeList,
+        goodsInfos: this.productAttributeList
-			};
+      }
 			this.$refs['dataForm'].validate((valid) => {
 				if (valid) {
 					// 修改的提交
@@ -309,6 +313,5 @@ export default {
 .drawer >>> .el-form,
 .drawer >>> .attr-list {
 	padding: 0 16px;
-	position: relative;
 }
 </style>

src/views/warehouse/part-material/warehouseRealtimeLocation/index.vue

@@ -100,7 +100,7 @@ const tableProps = [
 		prop: 'inTime',
 		label: '入库时间',
 		filter: parseTime,
-		minWidth: 100,
+		minWidth: 150,
 	},
 	{
 		prop: 'remark',
@@ -125,6 +125,12 @@ export default {
 			tableData: [],
 			tableProps,
 			tableBtn: [
+				this.$auth.hasPermi(`part-material:warehouse-realtime-location:query`)
+					? {
+							type: 'info',
+							btnName: '详情',
+					  }
+					: undefined,
 				this.$auth.hasPermi(`part-material:warehouse-realtime-location:query`)
 					? {
 							type: 'out',
@@ -137,12 +143,6 @@ export default {
 							btnName: '入库',
 					  }
 					: undefined,
-				this.$auth.hasPermi(`part-material:warehouse-realtime-location:query`)
-					? {
-							type: 'detail',
-							btnName: '详情',
-					  }
-					: undefined,
 			].filter((v) => v),
 			drawerVisible: false,
 			formConfig: [
@@ -183,7 +183,7 @@ export default {
 				},
 				{
 					type: 'button',
-					btnName: '查询',
+					btnName: '搜索',
 					name: 'search',
 					color: 'primary',
 				},
@@ -262,7 +262,7 @@ export default {
 				this.$nextTick(() => {
 					this.$refs.drawerRef.init(val.data, this.nickname);
 				});
-			} else if (val.type === 'detail') {
+			} else if (val.type === 'info') {
 				this.addOrUpdateVisible = true;
 				this.addOrEditTitle = val.data.name + ' -产品信息';
 				this.$nextTick(() => {

src/views/warehouse/raw-material/warehouseGoods/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 13:52:10
  * @LastEditors: zwq
- * @LastEditTime: 2023-11-23 15:25:57
+ * @LastEditTime: 2023-11-20 15:54:15
  * @Description:
 -->
 <template>
@@ -12,8 +12,7 @@
 		ref="dataForm"
 		v-if="visible"
 		@keyup.enter.native="dataFormSubmit()"
-		label-width="100px"
+		label-width="100px">
-    label-position="top">
 		<el-row :gutter="20">
 			<el-col :span="12">
 				<el-form-item label="物品名称" prop="name">
@@ -59,7 +58,6 @@
 				<el-form-item label="单日消耗量" prop="dailyUse">
 					<el-input-number
             :min="0"
-            style="width: 100%;"
 						v-model="dataForm.dailyUse"
 						clearable
 						placeholder="请输入单日消耗量" />
@@ -69,7 +67,6 @@
 				<el-form-item label="允许留存时间" prop="allowTime">
 					<el-input-number
             :min="0"
-            style="width: 90%;"
 						v-model="dataForm.allowTime"
 						clearable
 						placeholder="请输入允许留存时间" /> (天)

src/views/warehouse/raw-material/warehouseGoods/index.vue

@@ -35,7 +35,7 @@
 			@cancel="handleCancel"
 			@confirm="handleConfirm"
 			:before-close="handleCancel"
-			width="40%">
+			width="50%">
 			<add-or-update
 				ref="addOrUpdate"
 				@refreshDataList="successSubmit"></add-or-update>
@@ -75,7 +75,6 @@ const tableProps = [
 	{
 		prop: 'allowTime',
 		label: '允许留存时长(天)',
-    width: 150
 	},
 	{
 		prop: 'dailyUse',
@@ -128,7 +127,7 @@ export default {
 				},
 				{
 					type: 'button',
-					btnName: '查询',
+					btnName: '搜索',
 					name: 'search',
 					color: 'primary',
 				},

src/views/warehouse/raw-material/warehouseHis/index.vue

@@ -14,6 +14,13 @@
 			: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"
@@ -69,7 +76,7 @@ const tableProps = [
 		prop: 'operateTime',
 		label: '操作时间',
 		filter: parseTime,
-		minWidth: 100,
+		minWidth: 150,
 	},
 	{
 		prop: 'operator',
@@ -89,6 +96,14 @@ export default {
 			},
 			tableData: [],
 			tableProps,
+			tableBtn: [
+				this.$auth.hasPermi(`raw-material:warehouse-realtime-location-his:query`)
+					? {
+							type: 'info',
+							btnName: '详情',
+					  }
+					: undefined,
+			].filter((v) => v),
 			drawerVisible: false,
 			formConfig: [
 				{
@@ -128,7 +143,7 @@ export default {
 				},
 				{
 					type: 'button',
-					btnName: '查询',
+					btnName: '搜索',
 					name: 'search',
 					color: 'primary',
 				},

src/views/warehouse/raw-material/warehouseLocationHis/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2023-11-23 16:09:47
+ * @LastEditTime: 2023-11-03 16:20:19
  * @Description:
 -->
 <template>
@@ -11,10 +11,7 @@
 		:page="listQuery.pageNo"
 		:limit="listQuery.pageSize"
 		:height="300"
-		:table-data="tableData"
+		:table-data="tableData" />
-		v-if="tableData.length" />
-	<!-- 没有数据 -->
-	<div class="no-data-bg" v-else></div>
 </template>
 
 <script>
@@ -25,31 +22,37 @@ const tableProps = [
 	{
 		prop: 'name',
 		label: '物品名称',
+		align: 'center',
 	},
 	{
 		prop: 'code',
 		label: '物品编码',
+		align: 'center',
 	},
 	{
 		prop: 'spec',
 		label: '物品规格',
+		align: 'center',
 	},
 	{
 		prop: 'batchCode',
 		label: '物品批次',
+		align: 'center',
 	},
 	{
 		prop: 'num',
 		label: '数量',
+		align: 'center',
 	},
 	{
 		prop: 'allowTime',
 		label: '允许留存时长(天)',
-    width: 150
+		align: 'center',
 	},
 	{
 		prop: 'remark',
 		label: '备注',
+		align: 'center',
 	},
 ];
 export default {

src/views/warehouse/raw-material/warehouseLocationHis/index.vue

@@ -92,7 +92,7 @@ const tableProps = [
 		prop: 'createTime',
 		label: '操作时间',
 		filter: parseTime,
-		minWidth: 100,
+		minWidth: 150,
 	},
 	{
 		prop: 'creator',
@@ -115,7 +115,7 @@ export default {
 			tableBtn: [
 				this.$auth.hasPermi(`raw-material:warehouse-location-his:query`)
 					? {
-							type: 'detail',
+							type: 'info',
 							btnName: '详情',
 					  }
 					: undefined,
@@ -159,7 +159,7 @@ export default {
 				},
 				{
 					type: 'button',
-					btnName: '查询',
+					btnName: '搜索',
 					name: 'search',
 					color: 'primary',
 				},
@@ -205,7 +205,7 @@ export default {
 			}
 		},
 		otherMethods(val) {
-			if (val.type === 'detail') {
+			if (val.type === 'info') {
 				this.addOrUpdateVisible = true;
 				this.addOrEditTitle = val.data.name + ' -产品信息';
 				this.$nextTick(() => {

src/views/warehouse/raw-material/warehouseRealtime/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 13:52:10
  * @LastEditors: zwq
- * @LastEditTime: 2023-11-23 15:52:41
+ * @LastEditTime: 2023-11-20 15:12:13
  * @Description:
 -->
 <template>
@@ -68,7 +68,6 @@
 						v-model="dataForm.goodsBatch"
 						filterable
 						clearable
-            style="width:100%"
 						placeholder="请选择物品名称">
 						<el-option
 							v-for="(item, index) in Batch"
@@ -83,7 +82,6 @@
 					<el-input-number
 						v-model="dataForm.numDet"
 						clearable
-            style="width:100%"
             :min="0"
 						placeholder="请输入数量" />
             <!-- :max="max?max:9999999" -->

src/views/warehouse/raw-material/warehouseRealtime/index.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-11-03 16:37:06
  * @LastEditors: zwq
- * @LastEditTime: 2023-11-23 15:52:53
+ * @LastEditTime: 2023-11-04 14:13:47
  * @Description:
 -->
 <template>
@@ -67,7 +67,7 @@
 			@cancel="handleCancel"
 			@confirm="handleConfirm"
 			:before-close="handleCancel"
-			width="40%">
+			width="50%">
 			<add-or-update
 				ref="addOrUpdate"
 				@refreshDataList="successSubmit"></add-or-update>
@@ -131,18 +131,15 @@ export default {
 				},
 				{
 					type: 'button',
-					btnName: '查询',
+					btnName: '搜索',
 					name: 'search',
 					color: 'primary',
 				},
-				{
-					type: 'separate',
-				},
 				{
 					type: this.$auth.hasPermi('raw-material:warehouse-realtime:create') ? 'button' : '',
 					btnName: '入库',
 					name: 'add',
-					color: 'primary',
+					color: 'success',
 					plain: true,
 				},
 			],

src/views/warehouse/raw-material/warehouseRealtimeLocation/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2023-11-23 16:08:41
+ * @LastEditTime: 2023-11-03 14:51:33
  * @Description:
 -->
 <template>
@@ -11,10 +11,7 @@
 		:page="listQuery.pageNo"
 		:limit="listQuery.pageSize"
 		:height="300"
-		:table-data="tableData"
+		:table-data="tableData" />
-		v-if="tableData.length" />
-	<!-- 没有数据 -->
-	<div class="no-data-bg" v-else></div>
 </template>
 
 <script>
@@ -25,41 +22,48 @@ const tableProps = [
 	{
 		prop: 'name',
 		label: '物品名称',
+		align: 'center',
 	},
 	{
 		prop: 'code',
 		label: '物品编码',
+		align: 'center',
 	},
 	{
 		prop: 'spec',
 		label: '物品规格',
+		align: 'center',
 	},
 	{
 		prop: 'goodsBatch',
 		label: '物品批次',
+		align: 'center',
 	},
 	{
 		prop: 'num',
 		label: '数量',
+		align: 'center',
 	},
 	{
 		prop: 'allowTime',
 		label: '允许留存时长(天)',
-    width: 150
+		align: 'center',
 	},
 	{
 		prop: 'inTime',
 		label: '入库时间',
+		align: 'center',
 		filter: parseTime,
 	},
 	{
 		prop: 'leftTime',
 		label: '剩余留存时长(天)',
-    width: 150
+		align: 'center',
 	},
 	{
 		prop: 'remark',
 		label: '备注',
+		align: 'center',
 	},
 ];
 export default {

src/views/warehouse/raw-material/warehouseRealtimeLocation/attr-add.vue

@@ -1,7 +1,7 @@
 <template>
 	<el-dialog
 		:visible.sync="visible"
-		:width="'30%'"
+		:width="'35%'"
 		:append-to-body="true"
 		:close-on-click-modal="false"
 		class="dialog">
@@ -22,7 +22,7 @@
 			<el-form-item label="产品" prop="productInfo">
 				<el-select
 					v-model="dataForm.productInfo"
-					style="width: 60%"
+					style="width: 100%"
           filterable
           value-key="id"
 					placeholder="请选择产品">
@@ -79,7 +79,7 @@ export default {
 		// 表单提交
 		dataFormSubmit() {
 			this.$refs['dataForm'].validate((valid) => {
-				if (this.dataForm.productInfo) {
+				if (valid) {
           this.dataForm.productInfo.goodsId = this.dataForm.productInfo.id
           this.dataForm.productInfo.remark = ''
 					// 修改的提交
@@ -91,8 +91,6 @@ export default {
 					// 添加的提交
 					this.visible = false;
 					this.$emit('refreshDataList', this.dataForm);
-				} else {
-					this.$modal.msgWarning('请选择产品');
 				}
 			});
 		},

src/views/warehouse/raw-material/warehouseRealtimeLocation/drawer.vue

@@ -20,7 +20,9 @@
 					<el-row :gutter="20">
 						<el-col :span="12">
 							<el-form-item label="库位名称" prop="name">
-								<el-input v-model="dataForm.name" disabled />
+								<el-input
+									v-model="dataForm.name"
+									disabled />
 							</el-form-item>
 						</el-col>
 						<el-col :span="12">
@@ -45,20 +47,15 @@
 				</small-title>
 
 				<div class="attr-list">
-					<div style="position: absolute; top: -40px; right: 15px">
-						<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"
+						:add-button-show="addButtonShow"
+						@emitButtonClick="addNew"
 						@emitFun="inputChange"
 						:height="400"
-						:table-data="productAttributeList"
+						:table-data="productAttributeList">
-						v-if="productAttributeList.length">
 						<method-btn
 							slot="handleBtn"
 							:width="70"
@@ -66,8 +63,6 @@
 							:method-list="tableBtn"
 							@clickBtn="handleClick" />
 					</base-table>
-					<!-- 没有数据 -->
-					<div class="no-data-bg" v-else></div>
 				</div>
 			</div>
 		</div>
@@ -90,10 +85,8 @@
 import productAttrAdd from './attr-add';
 import inputArea from '../../mixins/inputArea';
 import SmallTitle from './SmallTitle';
-import {
+import { inWarehouseRealtimeLocation,
-	inWarehouseRealtimeLocation,
+  getWarehouseRealtimeLocation } from '@/api/warehouse/warehouseRealtimeLocation';
-	getWarehouseRealtimeLocation,
-} from '@/api/warehouse/warehouseRealtimeLocation';
 
 const tableBtn = [
 	{
@@ -106,30 +99,36 @@ const tableProps = [
 	{
 		prop: 'name',
 		label: '物品名称',
+		align: 'center',
 	},
 	{
 		prop: 'code',
 		label: '物品编码',
+		align: 'center',
 	},
 	{
 		prop: 'spec',
 		label: '物品规格',
+		align: 'center',
 	},
 	{
 		prop: 'goodsBatch',
 		label: '物品批次',
+		align: 'center',
 		subcomponent: inputArea,
 		width: 100,
 	},
 	{
 		prop: 'num',
 		label: '数量',
+		align: 'center',
 		subcomponent: inputArea,
 		width: 100,
 	},
 	{
 		prop: 'remark',
 		label: '备注',
+		align: 'center',
 		subcomponent: inputArea,
 		width: 100,
 	},
@@ -144,7 +143,8 @@ export default {
 			tableBtn,
 			tableProps,
 			productAttributeList: [],
-			operator: '',
+			addButtonShow: '新增',
+      operator: '',
 			dataForm: {
 				id: null,
 				name: '',
@@ -170,8 +170,8 @@ export default {
 		initData() {
 			this.productAttributeList.splice(0);
 		},
-		init(val, nickname) {
+		init(val,nickname) {
-			this.operator = nickname;
+      this.operator = nickname
 			this.dataForm.id = val.id;
 			this.dataForm.name = val.name;
 			this.dataForm.palletCode = val.palletCode;
@@ -213,8 +213,12 @@ export default {
 		handleClick(raw) {
 			if (raw.type === 'delete') {
 				this.$confirm(
-					`是否确认删除名称为"${raw.data.name}"的数据项?`,
+					`确定对${
-					'系统提示',
+						raw.data.name
+							? '[名称=' + raw.data.name + ']'
+							: '[序号=' + raw.data._pageIndex + ']'
+					}进行删除操作?`,
+					'提示',
 					{
 						confirmButtonText: '确定',
 						cancelButtonText: '取消',
@@ -234,12 +238,12 @@ export default {
 			this.productAttributeList.forEach((item) => {
 				item.id = '';
 			});
-			const data = {
+      const data = {
-				realtimeLocationId: this.dataForm.id,
+        realtimeLocationId : this.dataForm.id,
-				palletCode: this.dataForm.palletCode,
+        palletCode : this.dataForm.palletCode,
-				operator: this.operator,
+        operator : this.operator,
-				goodsInfos: this.productAttributeList,
+        goodsInfos: this.productAttributeList
-			};
+      }
 			this.$refs['dataForm'].validate((valid) => {
 				if (valid) {
 					// 修改的提交
@@ -309,6 +313,5 @@ export default {
 .drawer >>> .el-form,
 .drawer >>> .attr-list {
 	padding: 0 16px;
-	position: relative;
 }
 </style>

src/views/warehouse/raw-material/warehouseRealtimeLocation/index.vue

@@ -100,7 +100,7 @@ const tableProps = [
 		prop: 'inTime',
 		label: '入库时间',
 		filter: parseTime,
-		minWidth: 100,
+		minWidth: 150,
 	},
 	{
 		prop: 'remark',
@@ -125,6 +125,12 @@ export default {
 			tableData: [],
 			tableProps,
 			tableBtn: [
+				this.$auth.hasPermi(`raw-material:warehouse-realtime-location:query`)
+					? {
+							type: 'info',
+							btnName: '详情',
+					  }
+					: undefined,
 				this.$auth.hasPermi(`raw-material:warehouse-realtime-location:query`)
 					? {
 							type: 'out',
@@ -137,12 +143,6 @@ export default {
 							btnName: '入库',
 					  }
 					: undefined,
-				this.$auth.hasPermi(`raw-material:warehouse-realtime-location:query`)
-					? {
-							type: 'detail',
-							btnName: '详情',
-					  }
-					: undefined,
 			].filter((v) => v),
 			drawerVisible: false,
 			formConfig: [
@@ -183,7 +183,7 @@ export default {
 				},
 				{
 					type: 'button',
-					btnName: '查询',
+					btnName: '搜索',
 					name: 'search',
 					color: 'primary',
 				},
@@ -262,7 +262,7 @@ export default {
 				this.$nextTick(() => {
 					this.$refs.drawerRef.init(val.data, this.nickname);
 				});
-			} else if (val.type === 'detail') {
+			} else if (val.type === 'info') {
 				this.addOrUpdateVisible = true;
 				this.addOrEditTitle = val.data.name + ' -产品信息';
 				this.$nextTick(() => {

src/views/warehouse/warehouse-info/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 13:52:10
  * @LastEditors: zwq
- * @LastEditTime: 2023-11-23 15:14:37
+ * @LastEditTime: 2023-11-02 16:13:31
  * @Description:
 -->
 <template>
@@ -12,10 +12,9 @@
 		ref="dataForm"
 		v-if="visible"
 		@keyup.enter.native="dataFormSubmit()"
-		label-width="90px"
+		label-width="90px">
-    label-position="top">
 		<el-row :gutter="20">
-			<el-col :span="8">
+			<el-col :span="12">
 				<el-form-item label="仓库编码" prop="warehouseCode">
 					<el-input
 						v-model="dataForm.warehouseCode"
@@ -23,7 +22,7 @@
 						placeholder="请输入仓库编码" />
 				</el-form-item>
 			</el-col>
-			<el-col :span="8">
+			<el-col :span="12">
 				<el-form-item label="仓库名称" prop="warehouseName">
 					<el-input
 						v-model="dataForm.warehouseName"
@@ -31,7 +30,7 @@
 						placeholder="请输入仓库名称" />
 				</el-form-item>
 			</el-col>
-			<el-col :span="8">
+			<el-col :span="12">
 				<el-form-item label="库位编码" prop="code">
 					<el-input
 						v-model="dataForm.code"
@@ -39,7 +38,7 @@
 						placeholder="请输入库位编码" />
 				</el-form-item>
 			</el-col>
-			<el-col :span="8">
+			<el-col :span="12">
 				<el-form-item label="库位名称" prop="name">
 					<el-input
 						v-model="dataForm.name"
@@ -71,7 +70,6 @@
 						v-model="dataForm.type"
 						filterable
 						clearable
-            style="width: 100%;"
 						placeholder="请选择库位类型">
 						<el-option
 							v-for="item in urlOptions.dictList.dict0"
@@ -87,7 +85,6 @@
 						v-model="dataForm.enabled"
 						filterable
 						clearable
-            style="width: 100%;"
 						placeholder="请选择是否可用">
 						<el-option
 							v-for="item in isorno"

src/views/warehouse/warehouse-info/add-or-updata1.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 13:52:10
  * @LastEditors: zwq
- * @LastEditTime: 2023-11-23 15:20:31
+ * @LastEditTime: 2023-11-02 15:45:53
  * @Description:
 -->
 <template>
@@ -13,61 +13,47 @@
 		v-if="visible"
 		@keyup.enter.native="dataFormSubmit()"
 		label-width="90px">
-		<el-row :gutter="20">
+		<el-form-item label="仓库编码" prop="code">
-			<el-col :span="isdetail?24:12">
+			<el-input
-				<el-form-item label="仓库编码" prop="code">
+				v-model="dataForm.code"
-					<el-input
+				clearable
-						v-model="dataForm.code"
+				:disabled="isdetail"
-						clearable
+				placeholder="请输入仓库编码" />
-						:disabled="isdetail"
+		</el-form-item>
-            :style="{width: isdetail?'70%':'100%',}"
+		<el-form-item label="仓库名称" prop="name">
-						placeholder="请输入仓库编码" />
+			<el-input
-				</el-form-item>
+				v-model="dataForm.name"
-			</el-col>
+				clearable
-			<el-col :span="isdetail?24:12">
+				:disabled="isdetail"
-				<el-form-item label="仓库名称" prop="name">
+				placeholder="请输入仓库名称" />
-					<el-input
+		</el-form-item>
-						v-model="dataForm.name"
+		<el-form-item prop="type" label="仓库类型">
-						clearable
+			<el-select
-						:disabled="isdetail"
+				v-model="dataForm.type"
-            :style="{width: isdetail?'70%':'100%',}"
+				:disabled="isdetail"
-						placeholder="请输入仓库名称" />
+				filterable
-				</el-form-item>
+				clearable
-			</el-col>
+				placeholder="请选择仓库类型">
-			<el-col :span="isdetail?24:12">
+				<el-option
-				<el-form-item prop="type" label="仓库类型">
+					v-for="item in urlOptions.dictList.dict0"
-					<el-select
+					:key="item.id"
-						v-model="dataForm.type"
+					:label="item.label"
-						:disabled="isdetail"
+					:value="parseInt(item.value)"></el-option>
-						filterable
+			</el-select>
-						clearable
+		</el-form-item>
-            :style="{width: isdetail?'70%':'100%',}"
+		<el-form-item prop="storageType" v-if="!isdetail" label="物料类型">
-						placeholder="请选择仓库类型">
+			<el-select
-						<el-option
+				v-model="dataForm.storageType"
-							v-for="item in urlOptions.dictList.dict0"
+				filterable
-							:key="item.id"
+				clearable
-							:label="item.label"
+				placeholder="请选择物料类型">
-							:value="parseInt(item.value)"></el-option>
+				<el-option
-					</el-select>
+					v-for="item in urlOptions.dictList.dict1"
-				</el-form-item>
+					:key="item.id"
-			</el-col>
+					:label="item.label"
-			<el-col :span="isdetail?24:12">
+					:value="parseInt(item.value)"></el-option>
-				<el-form-item prop="storageType" v-if="!isdetail" label="物料类型">
+			</el-select>
-					<el-select
+		</el-form-item>
-						v-model="dataForm.storageType"
-						filterable
-						clearable
-            style="width: 100%;"
-						placeholder="请选择物料类型">
-						<el-option
-							v-for="item in urlOptions.dictList.dict1"
-							:key="item.id"
-							:label="item.label"
-							:value="parseInt(item.value)"></el-option>
-					</el-select>
-				</el-form-item>
-			</el-col>
-		</el-row>
 	</el-form>
 </template>
 

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

@@ -84,7 +84,7 @@
 			@confirm="handleConfirm"
 			:before-close="handleCancel"
 			:destroy-on-close="true"
-			width="40%">
+			width="50%">
 			<add-or-update
 				ref="addOrUpdate"
 				@refreshDataList="successSubmit"></add-or-update>
@@ -123,7 +123,6 @@ const tableProps = [
 	{
 		prop: 'code',
 		label: '库位编码',
-    width: 180
 	},
 	{
 		prop: 'name',
@@ -132,29 +131,24 @@ const tableProps = [
 	{
 		prop: 'arrange',
 		label: '排',
-    width: 50
 	},
 	{
 		prop: 'col',
 		label: '列',
-    width: 50
 	},
 	{
 		prop: 'layer',
 		label: '层',
-    width: 50
 	},
 	{
 		prop: 'type',
 		label: '库位类型',
 		filter: codeFilter('wareType'),
-    width: 80
 	},
 	{
 		prop: 'enabled',
 		label: '是否可用',
 		filter: codeFilter('deactivate'),
-    width: 80
 	},
 	{
 		prop: 'remark',
@@ -203,7 +197,7 @@ export default {
 				},
 				{
 					type: 'button',
-					btnName: '查询',
+					btnName: '搜索',
 					name: 'search',
 					color: 'primary',
 				},