浏览代码

锁定行+配车校验关闭

LiuCheng 1周前
父节点
当前提交
8d6ed8fd66
共有 3 个文件被更改,包括 22 次插入5 次删除
  1. 3
    1
      src/components/PopupDistribution.vue
  2. 3
    2
      src/view/record/outrecord.vue
  3. 16
    2
      src/view/ware/storechange.vue

+ 3
- 1
src/components/PopupDistribution.vue 查看文件

263
 					});
263
 					});
264
 					return;
264
 					return;
265
 				}
265
 				}
266
+				this.dialogVisible = false   //modify by liuc 2025/04/16  10:14
266
 				var url = 'WareDistribution/save.do'
267
 				var url = 'WareDistribution/save.do'
267
 				var param = {
268
 				var param = {
268
 					json: JSON.stringify(this.distribution),
269
 					json: JSON.stringify(this.distribution),
271
 				axios.post(url, param).then(response => {
272
 				axios.post(url, param).then(response => {
272
 					if (response.data.code == 0) {
273
 					if (response.data.code == 0) {
273
 
274
 
274
-						this.dialogVisible = false   //modify by liuc 2025/04/16  10:14
275
+						
275
 						this.selectRows    = [];
276
 						this.selectRows    = [];
276
 						this.$message({
277
 						this.$message({
277
 							message: '配车成功',
278
 							message: '配车成功',
355
 					});
356
 					});
356
 					return;
357
 					return;
357
 				}
358
 				}
359
+				this.dialogVisible = false   //modify by liuc 2025/04/16  10:14
358
 				var param = {
360
 				var param = {
359
 					json: JSON.stringify(this.distribution),
361
 					json: JSON.stringify(this.distribution),
360
 					jsonList: JSON.stringify(this.selection)
362
 					jsonList: JSON.stringify(this.selection)

+ 3
- 2
src/view/record/outrecord.vue 查看文件

90
 				</el-table-column>
90
 				</el-table-column>
91
 				<el-table-column prop="distributionId" label="配车号" min-width="10%" v-if="false">
91
 				<el-table-column prop="distributionId" label="配车号" min-width="10%" v-if="false">
92
 				</el-table-column>
92
 				</el-table-column>
93
+				<el-table-column prop="plateNo" label="钢板号" width="200px" fixed show-overflow-tooltip align="center">
94
+				</el-table-column>
93
 				<el-table-column prop="wareName" label="仓库名称" width="150px" show-overflow-tooltip header-align="center">
95
 				<el-table-column prop="wareName" label="仓库名称" width="150px" show-overflow-tooltip header-align="center">
94
 				</el-table-column>
96
 				</el-table-column>
95
 				<el-table-column prop="stackName" label="垛位" width="60px" show-overflow-tooltip header-align="center" align="center">
97
 				<el-table-column prop="stackName" label="垛位" width="60px" show-overflow-tooltip header-align="center" align="center">
120
 				</el-table-column>
122
 				</el-table-column>
121
 				<el-table-column prop="unitPrice" label="结算价格" width="100px" show-overflow-tooltip align="right">
123
 				<el-table-column prop="unitPrice" label="结算价格" width="100px" show-overflow-tooltip align="right">
122
 				</el-table-column>
124
 				</el-table-column>
123
-				<el-table-column prop="plateNo" label="钢板号" width="200px" show-overflow-tooltip align="center">
124
-				</el-table-column>
125
+				
125
 				<el-table-column prop="customerName" label="订单客户" width="200px" show-overflow-tooltip align="center">
126
 				<el-table-column prop="customerName" label="订单客户" width="200px" show-overflow-tooltip align="center">
126
 				</el-table-column>   <!-- 原客户名称 -->
127
 				</el-table-column>   <!-- 原客户名称 -->
127
 				<el-table-column prop="fkComponyName" label="客户名称" width="200px" show-overflow-tooltip align="center">
128
 				<el-table-column prop="fkComponyName" label="客户名称" width="200px" show-overflow-tooltip align="center">

+ 16
- 2
src/view/ware/storechange.vue 查看文件

83
 		<div class="tabledata-grid">
83
 		<div class="tabledata-grid">
84
 			<el-table :data="tableData" height="100%"   border style="width: 97%;" v-loading="loading" ref="multipleTable"	@select="handleTableSelect"	 @selection-change="handleSelectionChange" @select-all = "selectAll">
84
 			<el-table :data="tableData" height="100%"   border style="width: 97%;" v-loading="loading" ref="multipleTable"	@select="handleTableSelect"	 @selection-change="handleSelectionChange" @select-all = "selectAll">
85
 				<el-table-column type="selection" width="40" header-align="center" align="center"></el-table-column>
85
 				<el-table-column type="selection" width="40" header-align="center" align="center"></el-table-column>
86
+				<el-table-column prop="plateNo" label="钢板号" width="200" fixed show-overflow-tooltip header-align="center" align="center">
87
+				</el-table-column>
86
 				<el-table-column prop="layer" label="层数" width="60" show-overflow-tooltip header-align="center" align="center">
88
 				<el-table-column prop="layer" label="层数" width="60" show-overflow-tooltip header-align="center" align="center">
87
 				</el-table-column>
89
 				</el-table-column>
88
 				<el-table-column prop="stack.name" label="垛位" width="120" show-overflow-tooltip header-align="center" align="center">
90
 				<el-table-column prop="stack.name" label="垛位" width="120" show-overflow-tooltip header-align="center" align="center">
91
 				</el-table-column>
93
 				</el-table-column>
92
 				<el-table-column prop="material.standard" label="材质" width="100" show-overflow-tooltip header-align="center" align="center">
94
 				<el-table-column prop="material.standard" label="材质" width="100" show-overflow-tooltip header-align="center" align="center">
93
 				</el-table-column>
95
 				</el-table-column>
94
-				<el-table-column prop="plateNo" label="钢板号" width="200" show-overflow-tooltip header-align="center">
95
-				</el-table-column>
96
+				
96
 				<el-table-column prop="model" label="规格型号" width="160" show-overflow-tooltip header-align="center" align="center">
97
 				<el-table-column prop="model" label="规格型号" width="160" show-overflow-tooltip header-align="center" align="center">
97
 				</el-table-column>
98
 				</el-table-column>
98
 				<el-table-column prop="count" label="数量" width="120" show-overflow-tooltip align="right" header-align="center">
99
 				<el-table-column prop="count" label="数量" width="120" show-overflow-tooltip align="right" header-align="center">
386
 						message: '至少选择一条数据!',
387
 						message: '至少选择一条数据!',
387
 					});
388
 					});
388
 				}
389
 				}
390
+				var isLock = false;
391
+				for(var i = 0 ;i < this.selectRows.length;i++){
392
+					if(this.selectRows[i].lockFlag == "1"){
393
+						isLock = true
394
+					}
395
+				}
396
+				if(isLock){
397
+					this.$message({
398
+						type: 'error',
399
+						message: '选中记录中存在已配货产品,不能配车',
400
+					});
401
+					return
402
+				}
389
 				this.$refs.PopupDistribution.show()
403
 				this.$refs.PopupDistribution.show()
390
 
404
 
391
 			},
405
 			},

正在加载...
取消
保存