更新

src/views/asrs/delivery/add-or-updatab.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2024-12-26 11:20:46
+ * @LastEditTime: 2025-01-07 15:48:54
  * @Description:
 -->
 <template>
@@ -214,7 +214,7 @@
 							<template slot-scope="scope">
 								<span>
 									{{
-										scope.row.region ? regionArr[scope.row.region - 1].name : ''
+										scope.row.region ? regionArr.filter(item=>{return item.id===scope.row.region})[0].name: ''
 									}}
 								</span>
 							</template>
@@ -624,6 +624,7 @@ export default {
 					return;
 				}
 				// 添加的提交
+        this.dataForm.warehouseId = '1698950657556340737'
 				this.urlOptions.createURL(this.dataForm).then((response) => {
 					if (response.data === -1) {
 						this.$modal.msgWarning('排、列、层不能重复');

src/views/asrs/deliveryHis/indexb.vue

@@ -47,7 +47,7 @@
 			<el-table-column prop="region" label="发货区域" width="95">
 				<template slot-scope="scope">
 					<span>
-						{{ regionArr.filter(item=>{return item.id===scope.row.region})[0].name }}
+						{{ scope.row.region?regionArr.filter(item=>{return item.id===scope.row.region})[0].name:'-' }}
 					</span>
 				</template>
 			</el-table-column>
@@ -142,6 +142,7 @@ export default {
 			deliveryType,
 			trayType,
 			region,
+      regionArr,
 			tableData: [],
 			formConfig: [
 				{

src/views/asrs/jobMainTaskHistory/indexb.vue

@@ -185,20 +185,20 @@ const mainTaskState = [
 ];
 const stackerArr = [
 	{
-		name: 'DDJ1',
-		id: 1,
+		name: 'DDJ5',
+		id: 5,
 	},
 	{
-		name: 'DDJ2',
-		id: 2,
+		name: 'DDJ6',
+		id: 6,
 	},
 	{
-		name: 'DDJ3',
-		id: 3,
+		name: 'DDJ7',
+		id: 7,
 	},
 	{
-		name: 'DDJ4',
-		id: 4,
+		name: 'DDJ8',
+		id: 8,
 	},
 ];
 export default {

src/views/asrs/rollMessage/index.vue

@@ -112,6 +112,14 @@ const tableProps = [
 		prop: 'grade',
 		label: '品质',
 	},
+	{
+		prop: 'cpGrade',
+		label: '质检初判',
+	},
+	{
+		prop: 'fpGrade',
+		label: '质检复判',
+	},
 	{
 		prop: 'bugCode',
 		label: '复判缺陷',
@@ -193,6 +201,18 @@ export default {
 					placeholder: '品质',
 					param: 'grade',
 				},
+				{
+					type: 'input',
+					label: '质检初判',
+					placeholder: '质检初判',
+					param: 'cpGrade',
+				},
+				{
+					type: 'input',
+					label: '质检复判',
+					placeholder: '质检复判',
+					param: 'fpGrade',
+				},
 				{
 					type: 'input',
 					label: '入库单号',
@@ -243,6 +263,8 @@ export default {
 					this.listQuery.rollCode = val.rollCode.trim() || null;
 					this.listQuery.productName = val.productName.trim() || null;
 					this.listQuery.grade = val.grade.trim() || null;
+					this.listQuery.cpGrade = val.cpGrade.trim() || null;
+					this.listQuery.fpGrade = val.fpGrade.trim() || null;
 					this.listQuery.workOrderCode = val.workOrderCode.trim() || null;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime ? val.searchTime[1] : null;

src/views/asrs/rollMessage/indexb.vue

@@ -112,6 +112,14 @@ const tableProps = [
 		prop: 'grade',
 		label: '品质',
 	},
+	{
+		prop: 'cpGrade',
+		label: '质检初判',
+	},
+	{
+		prop: 'fpGrade',
+		label: '质检复判',
+	},
 	{
 		prop: 'bugCode',
 		label: '复判缺陷',
@@ -193,6 +201,18 @@ export default {
 					placeholder: '品质',
 					param: 'grade',
 				},
+				{
+					type: 'input',
+					label: '质检初判',
+					placeholder: '质检初判',
+					param: 'cpGrade',
+				},
+				{
+					type: 'input',
+					label: '质检复判',
+					placeholder: '质检复判',
+					param: 'fpGrade',
+				},
 				{
 					type: 'input',
 					label: '入库单号',
@@ -244,6 +264,8 @@ export default {
 					this.listQuery.rollCode = val.rollCode.trim() || null;
 					this.listQuery.productName = val.productName.trim() || null;
 					this.listQuery.grade = val.grade.trim() || null;
+					this.listQuery.cpGrade = val.cpGrade.trim() || null;
+					this.listQuery.fpGrade = val.fpGrade.trim() || null;
 					this.listQuery.workOrderCode = val.workOrderCode.trim() || null;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime ? val.searchTime[1] : null;