更新

src/api/fpw/finishProductWarehouse.js

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-09-06 14:31:37
  * @LastEditors: zwq
- * @LastEditTime: 2023-10-07 16:47:35
+ * @LastEditTime: 2023-10-10 15:09:23
  * @Description:
  */
 import request from '@/utils/request'
@@ -25,6 +25,21 @@ export function updateFinishProductWarehouse(data) {
   })
 }
 
+// 入库
+export function inFinishProductWarehouse(data) {
+  return request({
+    url: '/fpw/finish-product-warehouse/in',
+    method: 'put',
+    data: data
+  })
+}
+// 出库
+export function outFinishProductWarehouse(id) {
+  return request({
+    url: '/fpw/finish-product-warehouse/out?id=' + id,
+    method: 'get',
+  })
+}
 // 删除成品库
 export function deleteFinishProductWarehouse(id) {
   return request({

src/views/asrs/goodSpecification/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2023-10-08 10:45:09
+ * @LastEditTime: 2023-10-09 16:01:44
  * @Description:
 -->
 <template>
@@ -12,18 +12,24 @@
 		ref="dataForm"
 		@keyup.enter.native="dataFormSubmit()"
 		label-width="120px">
+		<el-row :gutter="20">
+			<el-col :span="12">
 				<el-form-item label="产品编码" prop="goodSpecificationCode">
 					<el-input
 						v-model="dataForm.goodSpecificationCode"
 						clearable
 						placeholder="请输入产品编码" />
 				</el-form-item>
+			</el-col>
+			<el-col :span="12">
 				<el-form-item label="产品名称" prop="goodSpecificationName">
 					<el-input
 						v-model="dataForm.goodSpecificationName"
 						clearable
 						placeholder="请输入产品名称" />
 				</el-form-item>
+			</el-col>
+			<el-col :span="12">
 				<el-form-item label="产品规格" prop="specification">
 					<el-select
 						v-model="dataForm.specification"
@@ -36,24 +42,32 @@
 							:value="item.value"></el-option>
 					</el-select>
 				</el-form-item>
+			</el-col>
+			<el-col :span="12">
 				<el-form-item label="需要熟化时间" prop="cureTime">
 					<el-input-number
 						v-model="dataForm.cureTime"
 						controls-position="right"
 						:min="0"></el-input-number>
 				</el-form-item>
+			</el-col>
+			<el-col :span="12">
 				<el-form-item label="是否需要熟化" prop="cure">
 					<el-switch
 						v-model="dataForm.cure"
 						:active-value="1"
 						:inactive-value="0"></el-switch>
 				</el-form-item>
+			</el-col>
+			<el-col :span="12">
 				<el-form-item label="是否启用" prop="deactivate">
 					<el-switch
 						v-model="dataForm.deactivate"
 						:active-value="1"
 						:inactive-value="0"></el-switch>
 				</el-form-item>
+			</el-col>
+		</el-row>
 	</el-form>
 </template>
 

src/views/asrs/goodSpecification/index.vue

@@ -13,7 +13,7 @@
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
-				:width="120"
+				:width="100"
 				label="操作"
 				:method-list="tableBtn"
 				@clickBtn="handleClick" />
@@ -29,7 +29,7 @@
 			@cancel="handleCancel"
 			@confirm="handleConfirm"
 			:before-close="handleCancel"
-			width="70%">
+			width="50%">
 			<add-or-update
 				ref="addOrUpdate"
 				@refreshDataList="successSubmit"></add-or-update>

src/views/asrs/goodSpecification/indexb.vue

@@ -13,7 +13,7 @@
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
-				:width="120"
+				:width="100"
 				label="操作"
 				:method-list="tableBtn"
 				@clickBtn="handleClick" />
@@ -29,7 +29,7 @@
 			@cancel="handleCancel"
 			@confirm="handleConfirm"
 			:before-close="handleCancel"
-			width="70%">
+			width="50%">
 			<add-or-update
 				ref="addOrUpdate"
 				@refreshDataList="successSubmit"></add-or-update>

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

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2022-08-24 11:19:43
  * @LastEditors: zwq
- * @LastEditTime: 2023-09-26 14:00:22
+ * @LastEditTime: 2023-10-10 15:29:31
  * @Description:
  */
 export default {
@@ -155,16 +155,16 @@ export default {
       this.getDataList()
     },
     /** 导出按钮操作 */
-    handleExport() {
+    handleExport(id) {
       // 处理查询参数
-      let params = { ...this.queryParams };
+      let params = { warehouseId:id };
       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.$download.excel(response, '导出.xls');
         this.exportLoading = false;
       }).catch(() => { });
     }

src/views/asrs/product-mini.vue

@@ -2,11 +2,12 @@
  * @Author: zwq
  * @Date: 2023-08-24 14:47:58
  * @LastEditors: zwq
- * @LastEditTime: 2023-10-07 14:33:42
+ * @LastEditTime: 2023-10-09 16:20:11
  * @Description:
 -->
 <template>
-	<div class="app-container">
+	<div>
+	<!-- <div class="app-container"> -->
 		<base-table
 			v-loading="dataListLoading"
 			:table-props="propType==='1'?

src/views/asrs/warehouse/index.vue

@@ -13,7 +13,7 @@
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
-				:width="120"
+				:width="100"
 				label="操作"
 				:method-list="tableBtn"
 				@clickBtn="handleClick" />
@@ -29,7 +29,7 @@
 			@cancel="handleCancel"
 			@confirm="handleConfirm"
 			:before-close="handleCancel"
-			width="70%">
+			width="50%">
 			<add-or-update
 				ref="addOrUpdate"
 				@refreshDataList="successSubmit"></add-or-update>

src/views/asrs/warehouseLocationMonitoring/index.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-21 14:26:23
  * @LastEditors: zwq
- * @LastEditTime: 2023-10-07 16:45:47
+ * @LastEditTime: 2023-10-10 16:05:52
  * @Description:
 -->
 <template>
@@ -12,9 +12,9 @@
 			ref="searchBarForm"
 			@headBtnClick="buttonClick" />
 		<div class="tips">
-			<el-tag effect="dark">满</el-tag>
+			<el-tag effect="dark" color="#7362F3" style="border:none">满</el-tag>
-			<el-tag type="success" effect="dark">空</el-tag>
+			<el-tag effect="dark" color="#16DC09" style="border:none">空</el-tag>
-			<el-tag type="warning" effect="dark">锁</el-tag>
+			<el-tag effect="dark" color="#FFA08F" style="border:none">锁</el-tag>
 		</div>
 		<div class="mainbody">
 			<div v-for="a in listQuery.total" :key="a">
@@ -25,11 +25,11 @@
 								class="dashboard-layout-item"
 								v-for="a in wareData.one"
 								:key="a.id+a.warehouseStorehouseCode"
-								:style="{background: bgColor[a.warehouseStorehouseState], float: 'left'}">
+							  style="background: #FFF8E8; float: left">
-								<!-- <div
+								<div
 									class="dashboard-layout-item-cricle"
-									style="background: #16dc09" /> -->
+									:style="{background: bgColor[a.warehouseStorehouseState]}" />
-								{{ a.warehouseStorehouseCode }}
+								{{ a.warehouseStorehouseName }}
 							</div>
 						</el-row>
 						<el-row>
@@ -37,11 +37,11 @@
 								class="dashboard-layout-item"
 								v-for="b in wareData.two"
 								:key="b.id+b.warehouseStorehouseCode"
-								:style="{background: bgColor[b.warehouseStorehouseState], float: 'left'}">
+							  style="background: #FFF8E8; float: left">
-								<!-- <div
+								<div
 									class="dashboard-layout-item-cricle"
-									style="background: #16dc09" /> -->
+									:style="{background: bgColor[b.warehouseStorehouseState]}" />
-								{{ b.warehouseStorehouseCode }}
+								{{ b.warehouseStorehouseName }}
 							</div>
 						</el-row>
 					</el-col>
@@ -54,11 +54,11 @@
 								class="dashboard-layout-item"
 								v-for="c in wareData.there"
 								:key="c.id+c.warehouseStorehouseCode"
-								:style="{background: bgColor[c.warehouseStorehouseState], float: 'left'}">
+							  style="background: #FFF8E8; float: left">
-								<!-- <div
+								<div
 									class="dashboard-layout-item-cricle"
-									style="background: #16dc09" /> -->
+									:style="{background: bgColor[c.warehouseStorehouseState]}" />
-								{{ c.warehouseStorehouseCode }}
+								{{ c.warehouseStorehouseName }}
 							</div>
 						</el-row>
 						<el-row>
@@ -66,11 +66,11 @@
 								class="dashboard-layout-item"
 								v-for="d in wareData.four"
 								:key="d.id+d.warehouseStorehouseCode"
-								:style="{background: bgColor[d.warehouseStorehouseState], float: 'left'}">
+							  style="background: #FFF8E8; float: left">
-								<!-- <div
+								<div
 									class="dashboard-layout-item-cricle"
-									style="background: #16dc09" /> -->
+									:style="{background: bgColor[d.warehouseStorehouseState]}" />
-								{{ d.warehouseStorehouseCode }}
+								{{ d.warehouseStorehouseName }}
 							</div>
 						</el-row>
 					</el-col>
@@ -82,7 +82,7 @@
 
 <script>
 import basicPage from '../mixins/basic-page';
-import { getWarehouseStorehouseList } from '@/api/asrs/warehouseStorehouse';
+import { getWarehouseStorehouseList,exportWarehouseStorehouseExcel } from '@/api/asrs/warehouseStorehouse';
 
 export default {
 	mixins: [basicPage],
@@ -90,6 +90,7 @@ export default {
 		return {
 			urlOptions: {
 				getDataListURL: getWarehouseStorehouseList,
+        exportURL: exportWarehouseStorehouseExcel,
 			},
 			listQuery: {
 				wareLayer: 1,
@@ -101,7 +102,7 @@ export default {
 				there: [],
 				four: [],
 			},
-      bgColor:['#37d97f','#ffbd02','#0b58ff'],
+      bgColor:['#16DC09','#FFA08F','#7362F3'],
 			formConfig: [
 				{
 					type: 'select',
@@ -123,6 +124,13 @@ export default {
 					name: 'search',
 					color: 'primary',
 				},
+				{
+					type: 'button',
+					btnName: '下载',
+					name: 'export',
+          plain: true,
+					color: 'primary',
+				},
 			],
 		};
 	},
@@ -161,6 +169,9 @@ export default {
 					this.listQuery.wareLayer = val.value;
 					this.getDataList();
 					break;
+				case 'export':
+					this.handleExport(this.aId);
+					break;
 				default:
 					console.log(val);
 			}
@@ -176,13 +187,12 @@ export default {
 	flex-direction: column;
 }
 .dashboard-layout-item {
-  color: white;
+	width: 80px;
-	width: 3.3%;
 	text-align: center;
-	height: 40px;
+	height: 32px;
 	box-shadow: 0px 3px 6px 0px rgba(166, 174, 190, 0.8);
 	border-radius: 2px 4px 4px 2px;
-	margin-bottom: 4px;
+	margin-bottom: 8px;
 	display: flex;
 	align-items: center;
 	justify-content: center;
@@ -194,10 +204,11 @@ export default {
 		margin-right: 6px;
 	}
 	&:hover {
-		background-color: rgba(85, 136, 253, 0.8) !important;
-		color: #ffffff;
 		cursor: pointer;
-		transform: scaleY(1.3) translateZ(0);
+		transform: scale(1.3) translateZ(0);
+	}
+  &:nth-child(2n) {
+    margin-right: 24px;
   }
 }
 .el-divider--horizontal {
@@ -209,6 +220,6 @@ export default {
 .tips {
 	position: absolute;
 	top: 22px;
-	left: 370px;
+	right: 120px;
 }
 </style>

src/views/asrs/warehouseLocationMonitoring/indexb.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-21 14:26:23
  * @LastEditors: zwq
- * @LastEditTime: 2023-10-07 16:45:37
+ * @LastEditTime: 2023-10-10 15:41:01
  * @Description:
 -->
 <template>
@@ -12,9 +12,9 @@
 			ref="searchBarForm"
 			@headBtnClick="buttonClick" />
 		<div class="tips">
-			<el-tag effect="dark">满</el-tag>
+			<el-tag type="info" color="#D8E5FF">满</el-tag>
-			<el-tag type="success" effect="dark">空</el-tag>
+			<el-tag type="info" color="#FFF8E8">空</el-tag>
-			<el-tag type="warning" effect="dark">锁</el-tag>
+			<el-tag type="info" color="#F6F6F6">锁</el-tag>
 		</div>
 		<div class="mainbody">
 			<div v-for="a in listQuery.total" :key="a">
@@ -29,7 +29,7 @@
 								<!-- <div
 									class="dashboard-layout-item-cricle"
 									style="background: #16dc09" /> -->
-								{{ a.warehouseStorehouseCode }}
+								{{ a.warehouseStorehouseName }}
 							</div>
 						</el-row>
 						<el-row>
@@ -41,7 +41,7 @@
 								<!-- <div
 									class="dashboard-layout-item-cricle"
 									style="background: #16dc09" /> -->
-								{{ b.warehouseStorehouseCode }}
+								{{ b.warehouseStorehouseName }}
 							</div>
 						</el-row>
 					</el-col>
@@ -58,7 +58,7 @@
 								<!-- <div
 									class="dashboard-layout-item-cricle"
 									style="background: #16dc09" /> -->
-								{{ c.warehouseStorehouseCode }}
+								{{ c.warehouseStorehouseName }}
 							</div>
 						</el-row>
 						<el-row>
@@ -70,7 +70,7 @@
 								<!-- <div
 									class="dashboard-layout-item-cricle"
 									style="background: #16dc09" /> -->
-								{{ d.warehouseStorehouseCode }}
+								{{ d.warehouseStorehouseName }}
 							</div>
 						</el-row>
 					</el-col>
@@ -82,7 +82,7 @@
 
 <script>
 import basicPage from '../mixins/basic-page';
-import { getWarehouseStorehouseList } from '@/api/asrs/warehouseStorehouse';
+import { getWarehouseStorehouseList,exportWarehouseStorehouseExcel } from '@/api/asrs/warehouseStorehouse';
 
 export default {
 	mixins: [basicPage],
@@ -90,6 +90,7 @@ export default {
 		return {
 			urlOptions: {
 				getDataListURL: getWarehouseStorehouseList,
+        exportURL: exportWarehouseStorehouseExcel,
 			},
 			listQuery: {
 				wareLayer: 1,
@@ -101,7 +102,7 @@ export default {
 				there: [],
 				four: [],
 			},
-      bgColor:['#37d97f','#ffbd02','#0b58ff'],
+      bgColor:['#FFF8E8','#F6F6F6','#D8E5FF'],
 			formConfig: [
 				{
 					type: 'select',
@@ -123,6 +124,13 @@ export default {
 					name: 'search',
 					color: 'primary',
 				},
+				{
+					type: 'button',
+					btnName: '下载',
+					name: 'export',
+          plain: true,
+					color: 'primary',
+				},
 			],
 		};
 	},
@@ -162,6 +170,9 @@ export default {
 					this.listQuery.wareLayer = val.value;
 					this.getDataList();
 					break;
+				case 'export':
+					this.handleExport(this.bId);
+					break;
 				default:
 					console.log(val);
 			}
@@ -177,7 +188,6 @@ export default {
 	flex-direction: column;
 }
 .dashboard-layout-item {
-  color: white;
 	width: 3.3%;
 	text-align: center;
 	height: 40px;
@@ -195,10 +205,8 @@ export default {
 		margin-right: 6px;
 	}
 	&:hover {
-		background-color: rgba(85, 136, 253, 0.8) !important;
-		color: #ffffff;
 		cursor: pointer;
-		transform: scaleY(1.3) translateZ(0);
+		transform: scale(1.3) translateZ(0);
 	}
 }
 .el-divider--horizontal {
@@ -210,6 +218,6 @@ export default {
 .tips {
 	position: absolute;
 	top: 22px;
-	left: 370px;
+	right: 120px;
 }
 </style>

src/views/asrs/warehouseStorehouse/index.vue

@@ -13,7 +13,7 @@
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
-				:width="120"
+				:width="100"
 				label="操作"
 				:method-list="tableBtn"
 				@clickBtn="handleClick" />
@@ -29,7 +29,7 @@
 			@cancel="handleCancel"
 			@confirm="handleConfirm"
 			:before-close="handleCancel"
-			width="70%">
+			width="50%">
 			<add-or-update
 				ref="addOrUpdate"
 				@refreshDataList="successSubmit"></add-or-update>
@@ -63,24 +63,29 @@ const tableProps = [
 	{
 		prop: 'wareRow',
 		label: '排',
+    width: 70,
 	},
 	{
 		prop: 'wareColumn',
 		label: '列',
+    width: 70,
 	},
 	{
 		prop: 'wareLayer',
 		label: '层',
+    width: 70,
 	},
 	{
 		prop: 'cacheLocation',
 		label: '缓存库位',
 		filter: codeFilter('isOrno'),
+    width: 100,
 	},
 	{
 		prop: 'deactivate',
 		label: '是否停用',
 		filter: codeFilter('deactivate'),
+    width: 100,
 	},
 	{
 		prop: 'notes',

src/views/asrs/warehouseStorehouse/indexb.vue

@@ -13,7 +13,7 @@
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
-				:width="120"
+				:width="100"
 				label="操作"
 				:method-list="tableBtn"
 				@clickBtn="handleClick" />
@@ -29,7 +29,7 @@
 			@cancel="handleCancel"
 			@confirm="handleConfirm"
 			:before-close="handleCancel"
-			width="70%">
+			width="50%">
 			<add-or-update
 				ref="addOrUpdate"
 				@refreshDataList="successSubmit"></add-or-update>
@@ -63,24 +63,29 @@ const tableProps = [
 	{
 		prop: 'wareRow',
 		label: '排',
+    width: 70,
 	},
 	{
 		prop: 'wareColumn',
 		label: '列',
+    width: 70,
 	},
 	{
 		prop: 'wareLayer',
 		label: '层',
+    width: 70,
 	},
 	{
 		prop: 'cacheLocation',
 		label: '缓存库位',
 		filter: codeFilter('isOrno'),
+    width: 100,
 	},
 	{
 		prop: 'deactivate',
 		label: '是否停用',
 		filter: codeFilter('deactivate'),
+    width: 100,
 	},
 	{
 		prop: 'notes',

src/views/asrs/warehouseStorehouseGoodsSpecification/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-22 15:01:55
  * @LastEditors: zwq
- * @LastEditTime: 2023-10-07 14:39:56
+ * @LastEditTime: 2023-10-10 10:43:39
  * @Description:
 -->
 <template>
@@ -26,28 +26,27 @@
 					@keyup.enter.native="dataFormSubmit">
 					<el-row :gutter="20">
 						<el-col :span="12">
-							<el-form-item label="仓库编码" prop="warehouseCode">
+							<el-form-item label="库位编码" prop="warehouseStorehouseCode">
 								<el-input
-									v-model="dataForm.warehouseCode"
+									v-model="dataForm.warehouseStorehouseCode"
 									readonly
-									placeholder="请输入仓库编码" />
+									placeholder="请输入库位编码" />
 							</el-form-item>
 						</el-col>
 						<el-col :span="12">
-							<el-form-item label="仓库名" prop="warehouseName">
+							<el-form-item label="库位名" prop="warehouseStorehouseName">
 								<el-input
-									v-model="dataForm.warehouseName"
+									v-model="dataForm.warehouseStorehouseName"
 									readonly
-									placeholder="请输入仓库名" />
+									placeholder="请输入库位名" />
 							</el-form-item>
 						</el-col>
-					</el-row>
-					<el-row :gutter="20">
 						<el-col :span="12">
 							<el-form-item label="工序" prop="process">
 								<el-select
 									v-model="dataForm.process"
 									style="width: 100%"
+                  @change="$forceUpdate()"
 									placeholder="请选择工序">
 									<el-option
 										v-for="item in processArr"
@@ -57,6 +56,14 @@
 								</el-select>
 							</el-form-item>
 						</el-col>
+						<el-col :span="12">
+							<el-form-item label="托盘编码" prop="trayCode">
+								<el-input
+									v-model="dataForm.trayCode"
+                  @input="$forceUpdate()"
+									placeholder="请输入托盘编码" />
+							</el-form-item>
+						</el-col>
 					</el-row>
 				</el-form>
 
@@ -79,7 +86,7 @@
 						:table-data="productAttributeList">
 						<method-btn
 							slot="handleBtn"
-							:width="120"
+							:width="70"
 							label="操作"
 							:method-list="tableBtn"
 							@clickBtn="handleClick" />
@@ -132,21 +139,25 @@ const tableProps = [
 		prop: 'specification',
 		label: '产品规格',
 		filter: codeFilter('specification'),
+    width:90
 	},
 	{
 		prop: 'number',
 		label: '数量',
 		subcomponent: inputArea,
+    width:100
 	},
 	{
 		prop: 'quality',
 		label: '品质',
 		filter: codeFilter('quality'),
 		subcomponent: selectQuality,
+    width:110
 	},
 	{
 		prop: 'cureTime',
 		label: '需要熟化时间(小时)',
+    width:150
 	},
 ];
 
@@ -185,8 +196,8 @@ export default {
 			processArr,
 			dataForm: {
 				id: null,
-				warehouseName: '',
+				warehouseStorehouseName: '',
-				warehouseCode: '',
+				warehouseStorehouseCode: '',
 				process: '',
 			},
 			listQuery: {
@@ -315,12 +326,15 @@ export default {
 .drawer >>> .el-form-item__label {
 	padding: 0;
 }
+.drawer >>> .el-form-item {
+	margin: 0;
+}
 
 .drawer >>> .el-drawer__header {
 	margin: 0;
 	padding: 32px 32px 24px;
 	border-bottom: 1px solid #dcdfe6;
-	margin-bottom: 30px;
+	margin-bottom: 10px;
 }
 
 .drawer >>> .content {

src/views/asrs/warehouseStorehouseGoodsSpecification/index.vue

@@ -29,19 +29,19 @@
 				prop="warehouseStorehouseCode"
 				label="库位编码"></el-table-column>
 			<el-table-column prop="trayCode" label="托盘编码"></el-table-column>
-			<el-table-column prop="process" label="工序">
+			<el-table-column prop="process" label="工序" width="110">
 				<template slot-scope="scope">
 					<span>
 						{{ scope.row.process>=0 ? processArr[scope.row.process].name : '' }}
 					</span>
 				</template>
 			</el-table-column>
-			<el-table-column prop="cacheLocation" label="缓存库位">
+			<el-table-column prop="cacheLocation" label="缓存库位" width="100">
 				<template slot-scope="scope">
 					<span>{{ scope.row.cacheLocation === 0 ? '否' : '是' }}</span>
 				</template>
 			</el-table-column>
-			<el-table-column prop="warehouseStorehouseState" label="仓库状态">
+			<el-table-column prop="warehouseStorehouseState" label="库位状态" width="100">
 				<template slot-scope="scope">
 					<span>
 						{{
@@ -53,7 +53,7 @@
 					</span>
 				</template>
 			</el-table-column>
-			<el-table-column label="操作">
+			<el-table-column label="操作" width="70">
 				<template v-slot="scope">
 					<el-button
 						size="mini"

src/views/asrs/warehouseStorehouseGoodsSpecification/indexb.vue

@@ -29,19 +29,19 @@
 				prop="warehouseStorehouseCode"
 				label="库位编码"></el-table-column>
 			<el-table-column prop="trayCode" label="托盘编码"></el-table-column>
-			<el-table-column prop="process" label="工序">
+			<el-table-column prop="process" label="工序" width="110">
 				<template slot-scope="scope">
 					<span>
 						{{ scope.row.process>=0 ? processArr[scope.row.process].name : '' }}
 					</span>
 				</template>
 			</el-table-column>
-			<el-table-column prop="cacheLocation" label="缓存库位">
+			<el-table-column prop="cacheLocation" label="缓存库位" width="100">
 				<template slot-scope="scope">
 					<span>{{ scope.row.cacheLocation === 0 ? '否' : '是' }}</span>
 				</template>
 			</el-table-column>
-			<el-table-column prop="warehouseStorehouseState" label="仓库状态">
+			<el-table-column prop="warehouseStorehouseState" label="库位状态" width="100">
 				<template slot-scope="scope">
 					<span>
 						{{
@@ -53,7 +53,7 @@
 					</span>
 				</template>
 			</el-table-column>
-			<el-table-column label="操作">
+			<el-table-column label="操作" width="70">
 				<template v-slot="scope">
 					<el-button
 						size="mini"

src/views/asrs/warehouseStorehouseStorage/add-or-updata.vue

@@ -18,29 +18,28 @@
 					label-position="top"
 					@keyup.enter.native="dataFormSubmit">
 					<el-row :gutter="20">
-						<el-col :span="12">
+						<el-col :span="8">
-							<el-form-item label="仓库编码" prop="code">
+							<el-form-item label="库位编码" prop="warehouseStorehouseCode">
 								<el-input
-									v-model="dataForm.code"
+									v-model="dataForm.warehouseStorehouseCode"
 									readonly
-									placeholder="请输入仓库编码" />
+									placeholder="请输入库位编码" />
 							</el-form-item>
 						</el-col>
-						<el-col :span="12">
+						<el-col :span="8">
-							<el-form-item label="仓库名" prop="name">
+							<el-form-item label="库位名" prop="warehouseStorehouseName">
 								<el-input
-									v-model="dataForm.name"
+									v-model="dataForm.warehouseStorehouseName"
 									readonly
-									placeholder="请输入仓库名" />
+									placeholder="请输入库位名" />
 							</el-form-item>
 						</el-col>
-					</el-row>
+						<el-col :span="8">
-					<el-row :gutter="20">
+							<el-form-item label="工序" prop="process">
-						<el-col :span="12">
-							<el-form-item label="工序" prop="processId">
 								<el-select
-									v-model="dataForm.processId"
+									v-model="dataForm.process"
 									style="width: 100%"
+									@change="$forceUpdate()"
 									placeholder="请选择工序">
 									<el-option
 										v-for="item in processArr"
@@ -50,6 +49,31 @@
 								</el-select>
 							</el-form-item>
 						</el-col>
+						<el-col :span="8">
+							<el-form-item label="托盘编码" prop="trayCode">
+								<el-input
+									v-model="dataForm.trayCode"
+									@input="$forceUpdate()"
+									placeholder="请输入托盘编码" />
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">
+							<el-form-item
+								label="选择入库位置"
+								prop="inWarehouseStorehouseName">
+								<el-select
+									v-model="dataForm.inWarehouseStorehouseName"
+									style="width: 100%"
+									@change="$forceUpdate()"
+									placeholder="请选择入库位置">
+									<el-option
+										v-for="item in potArr"
+										:key="item.id"
+										:label="item.warehouseStorehouseName"
+										:value="item.id" />
+								</el-select>
+							</el-form-item>
+						</el-col>
 					</el-row>
 				</el-form>
 
@@ -57,14 +81,15 @@
 					style="margin: 16px 0; padding-left: 8px"
 					:no-padding="true">
 					产品信息
-          <el-alert title="产品信息新增和修改后，需点击最下方保存按钮确定修改" type="warning" show-icon></el-alert>
+					<el-alert
+						title="产品信息新增和修改后，需点击最下方保存按钮确定修改"
+						type="warning"
+						show-icon></el-alert>
 				</small-title>
 
 				<div class="attr-list">
 					<base-table
-						:table-props="
+						:table-props="tableProps"
-							tableProps
-						"
 						:page="listQuery.pageNo"
 						:limit="listQuery.pageSize"
 						:add-button-show="addButtonShow"
@@ -74,7 +99,7 @@
 						:table-data="productAttributeList">
 						<method-btn
 							slot="handleBtn"
-							:width="120"
+							:width="70"
 							label="操作"
 							:method-list="tableBtn"
 							@clickBtn="handleClick" />
@@ -99,14 +124,13 @@
 </template>
 
 <script>
-import {
+import { updateProduct } from '@/api/core/base/product';
-	updateProduct,
-} from '@/api/core/base/product';
 
 import {
 	getWarehouseStorehouseGoodsSpecificationPage,
 	deleteWarehouseStorehouseGoodsSpecification,
 } from '@/api/asrs/warehouseStorehouseGoodsSpecification';
+import { getWarehouseStorehouseList } from '@/api/asrs/warehouseStorehouse';
 import productAttrAdd from './attr-add';
 import inputArea from '../mixins/inputArea';
 import selectQuality from '../mixins/selectQuality';
@@ -133,21 +157,25 @@ const tableProps = [
 		prop: 'specification',
 		label: '产品规格',
 		filter: codeFilter('specification'),
+		width: 90,
 	},
 	{
 		prop: 'number',
 		label: '数量',
 		subcomponent: inputArea,
+		width: 100,
 	},
 	{
 		prop: 'quality',
 		label: '品质',
 		filter: codeFilter('quality'),
 		subcomponent: selectQuality,
+		width: 110,
 	},
 	{
 		prop: 'cureTime',
 		label: '需要熟化时间(小时)',
+		width: 150,
 	},
 ];
 
@@ -184,11 +212,13 @@ export default {
 			productAttributeList: [],
 			addButtonShow: '新增',
 			processArr,
+			potArr: [],
 			dataForm: {
 				id: null,
-				name: '',
+				warehouseStorehouseName: '',
-				code: '',
+				warehouseStorehouseCode: '',
-				processId: '',
+				process: '',
+				inWarehouseStorehouseName: '',
 			},
 			listQuery: {
 				pageSize: 10,
@@ -214,7 +244,9 @@ export default {
 			this.dataForm = val;
 			this.initData();
 			this.visible = true;
-
+			getWarehouseStorehouseList().then((response) => {
+				this.potArr = response.data;
+			});
 			this.$nextTick(() => {
 				this.$refs['dataForm'].resetFields();
 
@@ -281,7 +313,7 @@ export default {
 		dataFormSubmit() {
 			this.productAttributeList.forEach((item) => {
 				item.id = '';
-        item.warehouseStorehouseId = this.dataForm.id
+				item.warehouseStorehouseId = this.dataForm.id;
 				item.warehouseId = '';
 			});
 			this.$refs['dataForm'].validate((valid) => {
@@ -326,12 +358,14 @@ export default {
 .drawer >>> .el-form-item__label {
 	padding: 0;
 }
-
+.drawer >>> .el-form-item {
+	margin: 0;
+}
 .drawer >>> .el-drawer__header {
 	margin: 0;
 	padding: 32px 32px 24px;
 	border-bottom: 1px solid #dcdfe6;
-	margin-bottom: 30px;
+	margin-bottom: 10px;
 }
 
 .drawer >>> .content {

src/views/asrs/warehouseStorehouseStorage/index.vue

@@ -29,7 +29,7 @@
 				prop="warehouseStorehouseCode"
 				label="库位编码"></el-table-column>
 			<el-table-column prop="trayCode" label="托盘编码"></el-table-column>
-			<el-table-column prop="process" label="工序">
+			<el-table-column prop="process" label="工序" width="110">
 				<template slot-scope="scope">
 					<span>
 						{{
@@ -38,12 +38,12 @@
 					</span>
 				</template>
 			</el-table-column>
-			<el-table-column prop="cacheLocation" label="缓存库位">
+			<el-table-column prop="cacheLocation" label="缓存库位" width="100">
 				<template slot-scope="scope">
 					<span>{{ scope.row.cacheLocation === 0 ? '否' : '是' }}</span>
 				</template>
 			</el-table-column>
-			<el-table-column prop="warehouseStorehouseState" label="仓库状态">
+			<el-table-column prop="warehouseStorehouseState" label="库位状态" width="100">
 				<template slot-scope="scope">
 					<span>
 						{{
@@ -55,7 +55,7 @@
 					</span>
 				</template>
 			</el-table-column>
-			<el-table-column label="操作">
+			<el-table-column label="操作" width="100">
 				<template v-slot="scope">
 					<el-button
 						size="mini"

src/views/asrs/warehouseStorehouseStorage/indexb.vue

@@ -29,7 +29,7 @@
 				prop="warehouseStorehouseCode"
 				label="库位编码"></el-table-column>
 			<el-table-column prop="trayCode" label="托盘编码"></el-table-column>
-			<el-table-column prop="process" label="工序">
+			<el-table-column prop="process" label="工序" width="110">
 				<template slot-scope="scope">
 					<span>
 						{{
@@ -38,12 +38,12 @@
 					</span>
 				</template>
 			</el-table-column>
-			<el-table-column prop="cacheLocation" label="缓存库位">
+			<el-table-column prop="cacheLocation" label="缓存库位" width="100">
 				<template slot-scope="scope">
 					<span>{{ scope.row.cacheLocation === 0 ? '否' : '是' }}</span>
 				</template>
 			</el-table-column>
-			<el-table-column prop="warehouseStorehouseState" label="仓库状态">
+			<el-table-column prop="warehouseStorehouseState" label="库位状态" width="100">
 				<template slot-scope="scope">
 					<span>
 						{{
@@ -55,7 +55,7 @@
 					</span>
 				</template>
 			</el-table-column>
-			<el-table-column label="操作">
+			<el-table-column label="操作" width="100">
 				<template v-slot="scope">
 					<el-button
 						size="mini"

src/views/asrs/warehouseStorehouseStorage/out-or-move.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2023-09-04 15:47:46
+ * @LastEditTime: 2023-10-09 15:49:08
  * @Description:
 -->
 <template>
@@ -20,7 +20,7 @@
 					<el-option
 						v-for="item in potArr"
 						:key="item.id"
-						:label="item.warehouseName"
+						:label="item.warehouseStorehouseName"
 						:value="item.id" />
 				</el-select>
 		</el-form-item>
@@ -29,7 +29,7 @@
 
 <script>
 import basicAdd from '../mixins/basic-add';
-import { getWarehouseStorehousePage,moveStorehouse } from "@/api/asrs/warehouseStorehouse";
+import { getWarehouseStorehouseList,moveStorehouse } from "@/api/asrs/warehouseStorehouse";
 
 export default {
 	mixins: [basicAdd],
@@ -55,12 +55,8 @@ export default {
       this.visible = true;
       this.$nextTick(() => {
         this.$refs["dataForm"].resetFields();
-			const params = {
+			getWarehouseStorehouseList().then((response) => {
-				pageSize: 100,
+				this.potArr = response.data;
-				pageNo: 1,
-			};
-			getWarehouseStorehousePage(params).then((response) => {
-				this.potArr = response.data.list;
 			});
       });
     },

src/views/asrs/warehouseStorehouseStorageHistory/index.vue

@@ -29,7 +29,7 @@
 				prop="warehouseStorehouseCode"
 				label="库位编码"></el-table-column>
 			<el-table-column prop="trayCode" label="托盘编码"></el-table-column>
-			<el-table-column prop="process" label="工序">
+			<el-table-column prop="process" label="工序" width="110">
 				<template slot-scope="scope">
 					<span>
 						{{
@@ -45,7 +45,7 @@
 			</el-table-column>
 			<el-table-column
 				prop="warehouseStorehouseStorageState"
-				label="出入库状态">
+				label="出入库状态" width="100">
 				<template slot-scope="scope">
 					<span>
 						{{

src/views/core/base/factory/index1.vue

@@ -13,7 +13,7 @@
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
-				:width="120"
+				:width="100"
 				label="操作"
 				:method-list="tableBtn"
 				@clickBtn="handleClick" />
@@ -29,7 +29,7 @@
 			@cancel="handleCancel"
 			@confirm="handleConfirm"
 			:before-close="handleCancel"
-			width="70%">
+			width="50%">
 			<add-or-update
 				ref="addOrUpdate"
 				@refreshDataList="successSubmit"></add-or-update>

src/views/core/base/product/add-or-updata.vue

@@ -396,12 +396,14 @@ export default {
 .drawer >>> .el-form-item__label {
 	padding: 0;
 }
-
+.drawer >>> .el-form-item {
+	margin: 0;
+}
 .drawer >>> .el-drawer__header {
 	margin: 0;
 	padding: 32px 32px 24px;
 	border-bottom: 1px solid #dcdfe6;
-	margin-bottom: 30px;
+	margin-bottom: 10px;
 }
 
 .drawer >>> .content {

src/views/core/base/product/index.vue

@@ -19,7 +19,7 @@
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
-				:width="120"
+				:width="100"
 				label="操作"
 				:method-list="tableBtn"
 				@clickBtn="handleClick" />

src/views/core/base/productionLine/index.vue

@@ -13,7 +13,7 @@
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
-				:width="120"
+				:width="100"
 				label="操作"
 				:method-list="tableBtn"
 				@clickBtn="handleClick" />
@@ -29,7 +29,7 @@
 			@cancel="handleCancel"
 			@confirm="handleConfirm"
 			:before-close="handleCancel"
-			width="70%">
+			width="50%">
 			<add-or-update
 				ref="addOrUpdate"
 				@refreshDataList="successSubmit"></add-or-update>

src/views/core/base/workshopSection/index.vue

@@ -13,7 +13,7 @@
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
-				:width="120"
+				:width="100"
 				label="操作"
 				:method-list="tableBtn"
 				@clickBtn="handleClick" />
@@ -29,7 +29,7 @@
 			@cancel="handleCancel"
 			@confirm="handleConfirm"
 			:before-close="handleCancel"
-			width="70%">
+			width="50%">
 			<add-or-update
 				ref="addOrUpdate"
 				@refreshDataList="successSubmit"></add-or-update>

src/views/core/njlm/ware.vue

@@ -13,7 +13,7 @@
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
-				:width="120"
+				:width="100"
 				label="操作"
 				:method-list="tableBtn"
 				@clickBtn="handleClick" />
@@ -29,7 +29,7 @@
 			@cancel="handleCancel"
 			@confirm="handleConfirm"
 			:before-close="handleCancel"
-			width="70%">
+			width="50%">
 			<add-or-update
 				ref="addOrUpdate"
 				@refreshDataList="successSubmit"></add-or-update>

src/views/fpw/finishGoodSpecification/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2023-08-31 16:35:40
+ * @LastEditTime: 2023-10-09 16:03:51
  * @Description:
 -->
 <template>
@@ -12,24 +12,46 @@
 		ref="dataForm"
 		@keyup.enter.native="dataFormSubmit()"
 		label-width="120px">
+		<el-row :gutter="20">
+			<el-col :span="12">
 				<el-form-item label="产品编码" prop="goodSpecificationCode">
 					<el-input
 						v-model="dataForm.goodSpecificationCode"
 						clearable
 						placeholder="请输入产品编码" />
 				</el-form-item>
+			</el-col>
+			<el-col :span="12">
 				<el-form-item label="产品名称" prop="goodSpecificationName">
 					<el-input
 						v-model="dataForm.goodSpecificationName"
 						clearable
 						placeholder="请输入产品名称" />
 				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="产品规格" prop="specification">
+					<el-select
+						v-model="dataForm.specification"
+						clearable
+						placeholder="请选择产品规格">
+						<el-option
+							v-for="item in options"
+							:key="item.value"
+							:label="item.label"
+							:value="item.value"></el-option>
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
 				<el-form-item label="是否启用" prop="deactivate">
 					<el-switch
 						v-model="dataForm.deactivate"
 						:active-value="1"
 						:inactive-value="0"></el-switch>
 				</el-form-item>
+			</el-col>
+		</el-row>
 	</el-form>
 </template>
 
@@ -39,8 +61,8 @@ import {
 	createFinishGoodSpecification,
 	updateFinishGoodSpecification,
 	getFinishGoodSpecification,
-  getCode
+	getCode,
-} from "@/api/fpw/finishGoodSpecification";
+} from '@/api/fpw/finishGoodSpecification';
 
 export default {
 	mixins: [basicAdd],
@@ -58,8 +80,19 @@ export default {
 				id: undefined,
 				goodSpecificationCode: undefined,
 				goodSpecificationName: undefined,
+				specification: undefined,
 				deactivate: undefined,
 			},
+			options: [
+				{
+					value: 2,
+					label: '卷',
+				},
+				{
+					value: 1,
+					label: '箱',
+				},
+			],
 			dataRule: {
 				goodSpecificationCode: [
 					{ required: true, message: '产品编码不能为空', trigger: 'blur' },

src/views/fpw/finishGoodSpecification/index.vue

@@ -20,7 +20,7 @@
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
-				:width="120"
+				:width="100"
 				label="操作"
 				:method-list="tableBtn"
 				@clickBtn="handleClick" />
@@ -36,7 +36,7 @@
 			@cancel="handleCancel"
 			@confirm="handleConfirm"
 			:before-close="handleCancel"
-			width="70%">
+			width="50%">
 			<add-or-update
 				ref="addOrUpdate"
 				@refreshDataList="successSubmit"></add-or-update>

src/views/fpw/finishWarehouseStorehouse/index.vue

@@ -20,7 +20,7 @@
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
-				:width="120"
+				:width="100"
 				label="操作"
 				:method-list="tableBtn"
 				@clickBtn="handleClick" />
@@ -36,7 +36,7 @@
 			@cancel="handleCancel"
 			@confirm="handleConfirm"
 			:before-close="handleCancel"
-			width="70%">
+			width="50%">
 			<add-or-update
 				ref="addOrUpdate"
 				@refreshDataList="successSubmit"></add-or-update>

src/views/fpw/finishWarehouseStorehouseStorage/add-or-updata.vue

@@ -19,19 +19,19 @@
 					@keyup.enter.native="dataFormSubmit">
 					<el-row :gutter="20">
 						<el-col :span="8">
-							<el-form-item label="仓库编码" prop="finishProductCode">
+							<el-form-item label="库位编码" prop="finishProductCode">
 								<el-input
 									v-model="dataForm.finishProductCode"
 									readonly
-									placeholder="请输入仓库编码" />
+									placeholder="请输入库位编码" />
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
-							<el-form-item label="仓库名" prop="finishProductName">
+							<el-form-item label="库位名" prop="finishProductName">
 								<el-input
 									v-model="dataForm.finishProductName"
 									readonly
-									placeholder="请输入仓库名" />
+									placeholder="请输入库位名" />
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
@@ -63,7 +63,7 @@
 						:table-data="productAttributeList">
 						<method-btn
 							slot="handleBtn"
-							:width="80"
+							:width="70"
 							label="操作"
 							:method-list="tableBtn"
 							@clickBtn="handleClick" />
@@ -74,9 +74,8 @@
 
 		<div style="position: absolute; bottom: 24px; right: 24px">
 			<el-button style="margin-right: 10px" @click="goback()">返回</el-button>
-			<span>
 				<el-button type="primary" @click="dataFormSubmit()">保存</el-button>
-			</span>
+				<el-button type="success" @click="inWare()">入库</el-button>
 		</div>
 
 		<product-attr-add
@@ -90,6 +89,7 @@
 <script>
 import {
 	updateFinishProductWarehouse,
+  inFinishProductWarehouse
 } from '@/api/fpw/finishProductWarehouse';
 
 import {
@@ -97,6 +97,7 @@ import {
 } from '@/api/fpw/finishProductWarehouseGoods';
 import productAttrAdd from './attr-add';
 import selectQuality from '../mixins/selectQuality';
+import inputArea from '../mixins/inputArea';
 import { parseTime } from '../mixins/code-filter';
 import codeFilter from '../mixins/code-filter';
 import SmallTitle from './SmallTitle';
@@ -116,20 +117,23 @@ const tableProps = [
 		prop: 'goodsCode',
 		label: '产品编码',
 	},
-	{
-		prop: 'boxCode',
-		label: '箱子编码',
-	},
 	{
 		prop: 'specification',
 		label: '产品规格',
 		filter: codeFilter('specification'),
+		width: 100,
+	},
+	{
+		prop: 'boxCode',
+		label: '箱子编码',
+		subcomponent: inputArea,
 	},
 	{
 		prop: 'quality',
 		label: '品质',
 		filter: codeFilter('quality'),
 		subcomponent: selectQuality,
+		width: 110,
 	},
 ];
 
@@ -261,6 +265,26 @@ export default {
 				}
 			});
 		},
+    inWare() {
+			this.productAttributeList.forEach((item) => {
+				item.id = '';
+        item.finishProductWarehouseId = this.dataForm.id
+			});
+			this.$refs['dataForm'].validate((valid) => {
+				if (valid) {
+					this.dataForm.list = this.productAttributeList;
+					// 修改的提交
+					if (this.dataForm.id) {
+						inFinishProductWarehouse(this.dataForm).then((response) => {
+							this.$modal.msgSuccess('修改成功');
+							this.visible = false;
+							this.$emit('refreshDataList');
+						});
+						return;
+					}
+				}
+			});
+		},
 		// 新增 / 修改
 		addNew(index) {
 			this.addOrUpdateVisible = true;
@@ -288,12 +312,14 @@ export default {
 .drawer >>> .el-form-item__label {
 	padding: 0;
 }
-
+.drawer >>> .el-form-item {
+	margin: 0;
+}
 .drawer >>> .el-drawer__header {
 	margin: 0;
 	padding: 32px 32px 24px;
 	border-bottom: 1px solid #dcdfe6;
-	margin-bottom: 30px;
+	margin-bottom: 10px;
 }
 
 .drawer >>> .content {

src/views/fpw/finishWarehouseStorehouseStorage/index.vue

@@ -39,7 +39,7 @@
 					</span>
 				</template>
 			</el-table-column>
-			<el-table-column label="操作">
+			<el-table-column label="操作" width="100">
 				<template v-slot="scope">
 					<el-button
 						size="mini"
@@ -49,14 +49,19 @@
 						v-hasPermi="['asrs:warehouse-storehouse-storage:update']">
 						入库
 					</el-button>
+					<el-popconfirm
+						@confirm="setShipment(scope.row.id)"
+            placement="top"
+						:title="'你确定要把 <'+ scope.row.finishProductName +'> 库位出货吗?'">
 						<el-button
+							slot="reference"
 							size="mini"
-						v-else-if="scope.row.finishProductWarehouseState === 1"
+							v-if="scope.row.finishProductWarehouseState === 1"
 							type="text"
-						@click="handleClick({ data: scope.row, type: 'out' })"
 							v-hasPermi="['asrs:warehouse-storehouse-storage:update']">
 							出库
 						</el-button>
+					</el-popconfirm>
 				</template>
 			</el-table-column>
 		</el-table>
@@ -70,28 +75,16 @@
 			ref="drawerRef"
 			:prop-type="2"
 			@refreshDataList="getDataList" />
-		<base-dialog
-			:dialogTitle="addOrEditTitle"
-			:dialogVisible="addOrUpdateVisible"
-			@cancel="handleCancel"
-			@confirm="handleConfirm"
-			:before-close="handleCancel"
-			width="50%">
-			<out-or-move
-				ref="addOrUpdate"
-				@refreshDataList="successSubmit"></out-or-move>
-		</base-dialog>
 	</div>
 </template>
 
 <script>
 import AddOrUpdate from './add-or-updata';
-import outOrMove from './out-or-move';
 import product from '../product-mini';
 import basicPage from '../mixins/basic-page';
 import { parseTime } from '../mixins/code-filter';
 
-import { getFinishProductWarehousePage } from '@/api/fpw/finishProductWarehouse';
+import { getFinishProductWarehousePage,outFinishProductWarehouse } from '@/api/fpw/finishProductWarehouse';
 
 const warehouseStorehouseState = [
 	{
@@ -175,7 +168,6 @@ export default {
 	components: {
 		AddOrUpdate,
 		product,
-		outOrMove,
 	},
 	created() {},
 	methods: {
@@ -192,7 +184,8 @@ export default {
 						val.warehouseStorehouseStateId;
 					Object.keys(this.listQuery).forEach(
 						(key) =>
-            this.listQuery[key] === null || (this.listQuery[key] === '' && delete this.listQuery[key])
+							this.listQuery[key] === null ||
+							(this.listQuery[key] === '' && delete this.listQuery[key])
 					);
 					this.getDataList();
 					break;
@@ -220,17 +213,6 @@ export default {
 		},
 		otherMethods(val) {
 			if (val.type === 'out') {
-				this.addOrUpdateVisible = true;
-				this.addOrEditTitle = '出库';
-				this.$nextTick(() => {
-					this.$refs.addOrUpdate.init(val.data.id, 0);
-				});
-			} else if (val.type === 'move') {
-				this.addOrUpdateVisible = true;
-				this.addOrEditTitle = '移库';
-				this.$nextTick(() => {
-					this.$refs.addOrUpdate.init(val.data.id, 1);
-				});
 			} else if (val.type === 'in') {
 				this.drawerVisible = true;
 				this.$nextTick(() => {
@@ -240,6 +222,12 @@ export default {
 				console.log(11);
 			}
 		},
+		setShipment(id) {
+			outFinishProductWarehouse(id).then((response) => {
+				this.$modal.msgSuccess('出库成功');
+				this.getDataList();
+			});
+		},
 	},
 };
 </script>

src/views/fpw/finishWarehouseStorehouseStorage/out-or-move.vue

@@ -1,82 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2021-11-18 14:16:25
- * @LastEditors: zwq
- * @LastEditTime: 2023-09-04 15:47:46
- * @Description:
--->
-<template>
-	<el-form
-		:model="dataForm"
-		:rules="dataRule"
-		ref="dataForm"
-		@keyup.enter.native="dataFormSubmit()"
-		label-width="150px">
-		<el-form-item :label="type?'选择移库位置':'选择出库到货位置'" prop="targetId">
-				<el-select
-					v-model="dataForm.targetId"
-					style="width: 100%"
-					placeholder="请选择位置">
-					<el-option
-						v-for="item in potArr"
-						:key="item.id"
-						:label="item.warehouseName"
-						:value="item.id" />
-				</el-select>
-		</el-form-item>
-	</el-form>
-</template>
-
-<script>
-import basicAdd from '../mixins/basic-add';
-import { getWarehouseStorehousePage,moveStorehouse } from "@/api/asrs/warehouseStorehouse";
-
-export default {
-	mixins: [basicAdd],
-	data() {
-		return {
-			urlOptions: {
-			},
-			dataForm: {
-        sourceId: undefined,
-        targetId: undefined,
-			},
-      potArr: [],
-      type: 0,
-			dataRule: {
-        targetId: [{ required: true, message: "位置不能为空", trigger: "blur" }],
-      }
-		};
-	},
-	methods: {
-    init(id,type) {
-      this.dataForm.sourceId = id || "";
-      this.type = type
-      this.visible = true;
-      this.$nextTick(() => {
-        this.$refs["dataForm"].resetFields();
-			const params = {
-				pageSize: 100,
-				pageNo: 1,
-			};
-			getWarehouseStorehousePage(params).then((response) => {
-				this.potArr = response.data.list;
-			});
-      });
-    },
-    // 表单提交
-    dataFormSubmit() {
-      this.$refs["dataForm"].validate((valid) => {
-        if (!valid) {
-          return false;
-        }
-        moveStorehouse(this.dataForm.sourceId,this.dataForm.targetId).then(response => {
-            this.$modal.msgSuccess("修改成功");
-            this.visible = false;
-            this.$emit("refreshDataList");
-          });
-      });
-    },
-	},
-};
-</script>

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

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2022-08-24 11:19:43
  * @LastEditors: zwq
- * @LastEditTime: 2023-09-27 09:30:22
+ * @LastEditTime: 2023-10-10 15:26:13
  * @Description:
  */
 export default {
@@ -154,14 +154,14 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       // 处理查询参数
-      let params = { ...this.queryParams };
+      let params = { };
       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.$download.excel(response, '导出.xls');
         this.exportLoading = false;
       }).catch(() => { });
     }

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

@@ -2,7 +2,7 @@
 /*
  * @Date: 2020-12-29 16:49:28
  * @LastEditors: zwq
- * @LastEditTime: 2023-10-08 15:48:34
+ * @LastEditTime: 2023-10-09 14:33:36
  * @FilePath: \basic-admin\src\filters\basicData\index.js
  * @Description:
  */
@@ -25,6 +25,10 @@ const table = {
     1: 'B',
     0: 'A',
   },
+  specification:{
+    1: '箱',
+    2: '卷',
+  },
 }
 
 // 日期格式化

src/views/fpw/mixins/inputArea.vue

@@ -0,0 +1,46 @@
+<!--
+ * @Author: zwq
+ * @Date: 2023-09-22 15:36:40
+ * @LastEditors: zwq
+ * @LastEditTime: 2023-09-26 15:59:57
+ * @Description:
+-->
+<template>
+  <div class="tableInner">
+    <el-input v-model="list[itemProp]" @blur="changeInput" />
+  </div>
+</template>
+<script>
+export default {
+  name: "InputArea",
+  props: {
+    injectData: {
+      type: Object,
+      default: () => ({}),
+    },
+    itemProp: {
+      type: String,
+    },
+  },
+  data() {
+    return {
+      list: this.injectData,
+    };
+  },
+  methods: {
+    changeInput() {
+      this.list.sType = 1
+      this.$emit("emitData", this.list,1);
+    },
+  },
+};
+</script>
+<style scoped>
+.tableInner >>> .el-input__inner {
+  color: #409EFF;
+  border: 1px rgb(232, 231, 231) solid;
+  padding: 0;
+  text-align: center;
+  height: 30px;
+}
+</style>

src/views/fpw/product-mini.vue

@@ -2,11 +2,11 @@
  * @Author: zwq
  * @Date: 2023-08-24 14:47:58
  * @LastEditors: zwq
- * @LastEditTime: 2023-10-08 15:35:04
+ * @LastEditTime: 2023-10-09 16:21:07
  * @Description:
 -->
 <template>
-	<div class="app-container">
+	<div>
 		<base-table
 			v-loading="dataListLoading"
 			:table-props="propType===2?

src/views/fpw/warehouseLocationMonitoring/index.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-21 14:26:23
  * @LastEditors: zwq
- * @LastEditTime: 2023-10-08 09:20:40
+ * @LastEditTime: 2023-10-10 10:39:41
  * @Description:
 -->
 <template>
@@ -195,10 +195,8 @@ export default {
 		margin-right: 6px;
 	}
 	&:hover {
-		background-color: rgba(85, 136, 253, 0.8) !important;
-		color: #ffffff;
 		cursor: pointer;
-		transform: scaleY(1.3) translateZ(0);
+		transform: scale(1.3) translateZ(0);
 	}
 }
 .el-divider--horizontal {

src/views/index.vue

@@ -1,98 +1,29 @@
+<!--
+ * @Author: zwq
+ * @Date: 2023-08-17 15:10:53
+ * @LastEditors: zwq
+ * @LastEditTime: 2023-10-10 11:00:56
+ * @Description:
+-->
 <template>
-  <div class="dashboard-editor-container">
+  <div class="app-container">
-
+    南京锂膜管理系统
-    <panel-group @handleSetLineChartData="handleSetLineChartData" />
-
-    <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
-      <line-chart :chart-data="lineChartData" />
-    </el-row>
-
-    <el-row :gutter="32">
-      <el-col :xs="24" :sm="24" :lg="8">
-        <div class="chart-wrapper">
-          <raddar-chart />
-        </div>
-      </el-col>
-      <el-col :xs="24" :sm="24" :lg="8">
-        <div class="chart-wrapper">
-          <pie-chart />
-        </div>
-      </el-col>
-      <el-col :xs="24" :sm="24" :lg="8">
-        <div class="chart-wrapper">
-          <bar-chart />
-        </div>
-      </el-col>
-    </el-row>
-
-    
   </div>
 </template>
 
 <script>
-import PanelGroup from './dashboard/PanelGroup'
-import LineChart from './dashboard/LineChart'
-import RaddarChart from './dashboard/RaddarChart'
-import PieChart from './dashboard/PieChart'
-import BarChart from './dashboard/BarChart'
-
-const lineChartData = {
-  newVisitis: {
-    expectedData: [100, 120, 161, 134, 105, 160, 165],
-    actualData: [120, 82, 91, 154, 162, 140, 145]
-  },
-  messages: {
-    expectedData: [200, 192, 120, 144, 160, 130, 140],
-    actualData: [180, 160, 151, 106, 145, 150, 130]
-  },
-  purchases: {
-    expectedData: [80, 100, 121, 104, 105, 90, 100],
-    actualData: [120, 90, 100, 138, 142, 130, 130]
-  },
-  shoppings: {
-    expectedData: [130, 140, 141, 142, 145, 150, 160],
-    actualData: [120, 82, 91, 154, 162, 140, 130]
-  }
-}
-
 export default {
   name: 'Index',
   components: {
-    PanelGroup,
-    LineChart,
-    RaddarChart,
-    PieChart,
-    BarChart
   },
   data() {
     return {
-      lineChartData: lineChartData.newVisitis
     }
   },
   methods: {
-    handleSetLineChartData(type) {
-      this.lineChartData = lineChartData[type]
-    }
   }
 }
 </script>
 
 <style lang="scss" scoped>
-.dashboard-editor-container {
-  padding: 32px;
-  background-color: #e9e9e9;
-  position: relative;
-
-  .chart-wrapper {
-    background: #fff;
-    padding: 16px 16px 0;
-    margin-bottom: 32px;
-  }
-}
-
-@media (max-width:1024px) {
-  .chart-wrapper {
-    padding: 8px;
-  }
-}
 </style>

src/views/system/user/profile/index.vue

@@ -55,9 +55,9 @@
             <el-tab-pane label="修改密码" name="resetPwd">
               <resetPwd :user="user" />
             </el-tab-pane>
-            <el-tab-pane label="社交信息" name="userSocial">
+            <!-- <el-tab-pane label="社交信息" name="userSocial">
               <userSocial :user="user" :getUser="getUser" :setActiveTab="setActiveTab" />
-            </el-tab-pane>
+            </el-tab-pane> -->
           </el-tabs>
         </el-card>
       </el-col>