锁定行+配车校验关闭

src/components/PopupDistribution.vue

@@ -263,6 +263,7 @@
 					});
 					return;
 				}
+				this.dialogVisible = false   //modify by liuc 2025/04/16  10:14
 				var url = 'WareDistribution/save.do'
 				var param = {
 					json: JSON.stringify(this.distribution),
@@ -271,7 +272,7 @@
 				axios.post(url, param).then(response => {
 					if (response.data.code == 0) {
 
-						this.dialogVisible = false   //modify by liuc 2025/04/16  10:14
+						
 						this.selectRows    = [];
 						this.$message({
 							message: '配车成功',
@@ -355,6 +356,7 @@
 					});
 					return;
 				}
+				this.dialogVisible = false   //modify by liuc 2025/04/16  10:14
 				var param = {
 					json: JSON.stringify(this.distribution),
 					jsonList: JSON.stringify(this.selection)

src/view/record/outrecord.vue

@@ -90,6 +90,8 @@
 				</el-table-column>
 				<el-table-column prop="distributionId" label="配车号" min-width="10%" v-if="false">
 				</el-table-column>
+				<el-table-column prop="plateNo" label="钢板号" width="200px" fixed show-overflow-tooltip align="center">
+				</el-table-column>
 				<el-table-column prop="wareName" label="仓库名称" width="150px" show-overflow-tooltip header-align="center">
 				</el-table-column>
 				<el-table-column prop="stackName" label="垛位" width="60px" show-overflow-tooltip header-align="center" align="center">
@@ -120,8 +122,7 @@
 				</el-table-column>
 				<el-table-column prop="unitPrice" label="结算价格" width="100px" show-overflow-tooltip align="right">
 				</el-table-column>
-				<el-table-column prop="plateNo" label="钢板号" width="200px" show-overflow-tooltip align="center">
-				</el-table-column>
+				
 				<el-table-column prop="customerName" label="订单客户" width="200px" show-overflow-tooltip align="center">
 				</el-table-column>   <!-- 原客户名称 -->
 				<el-table-column prop="fkComponyName" label="客户名称" width="200px" show-overflow-tooltip align="center">

src/view/ware/storechange.vue

@@ -83,6 +83,8 @@
 		<div class="tabledata-grid">
 			<el-table :data="tableData" height="100%"   border style="width: 97%;" v-loading="loading" ref="multipleTable"	@select="handleTableSelect"	 @selection-change="handleSelectionChange" @select-all = "selectAll">
 				<el-table-column type="selection" width="40" header-align="center" align="center"></el-table-column>
+				<el-table-column prop="plateNo" label="钢板号" width="200" fixed show-overflow-tooltip header-align="center" align="center">
+				</el-table-column>
 				<el-table-column prop="layer" label="层数" width="60" show-overflow-tooltip header-align="center" align="center">
 				</el-table-column>
 				<el-table-column prop="stack.name" label="垛位" width="120" show-overflow-tooltip header-align="center" align="center">
@@ -91,8 +93,7 @@
 				</el-table-column>
 				<el-table-column prop="material.standard" label="材质" width="100" show-overflow-tooltip header-align="center" align="center">
 				</el-table-column>
-				<el-table-column prop="plateNo" label="钢板号" width="200" show-overflow-tooltip header-align="center">
-				</el-table-column>
+				
 				<el-table-column prop="model" label="规格型号" width="160" show-overflow-tooltip header-align="center" align="center">
 				</el-table-column>
 				<el-table-column prop="count" label="数量" width="120" show-overflow-tooltip align="right" header-align="center">
@@ -386,6 +387,19 @@
 						message: '至少选择一条数据！',
 					});
 				}
+				var isLock = false;
+				for(var i = 0 ;i < this.selectRows.length;i++){
+					if(this.selectRows[i].lockFlag == "1"){
+						isLock = true
+					}
+				}
+				if(isLock){
+					this.$message({
+						type: 'error',
+						message: '选中记录中存在已配货产品,不能配车',
+					});
+					return
+				}
 				this.$refs.PopupDistribution.show()
 
 			},