diff --git a/src/views/jhzxgl/components/SljhPrint.vue b/src/views/jhzxgl/components/SljhPrint.vue index 984b499..d77c78c 100644 --- a/src/views/jhzxgl/components/SljhPrint.vue +++ b/src/views/jhzxgl/components/SljhPrint.vue @@ -20,7 +20,7 @@
序号
合同号
船号
-
材质
+
材质
规格
炉批号
@@ -32,7 +32,7 @@
流向
跨位
物品状态
-
备注
+
备注
@@ -40,7 +40,7 @@
{{ item1.xh }}
{{ item1.dcFd }}
{{ item1.dcch }}
-
{{ item1.wpxh }}
+
{{ item1.wpxh }}
{{ item1.wpgg }}
{{ item1.lph }}
@@ -52,7 +52,7 @@
{{ item1.zylx }}
{{ item1.sldw }}
{{ item1.wpzt }}
-
{{ item1.bz }}
+
{{ item1.bz }}
diff --git a/src/views/jhzxgl/sljhD.vue b/src/views/jhzxgl/sljhD.vue index ab0067f..226a050 100644 --- a/src/views/jhzxgl/sljhD.vue +++ b/src/views/jhzxgl/sljhD.vue @@ -6,7 +6,7 @@ - + - + + + + + - - + + + 手动 @@ -388,7 +393,8 @@ export default { flag:false, wpgg:'', lph:'', - kwh:'' + kwh:'', + sdsl:false }, defaultHeight: { height: '' }, wgzyprintFlag:false, @@ -1087,13 +1093,19 @@ export default { return } let selectRecords = this.$refs.xGrid.getCheckboxRecords() + console.log(this.queryParam.sdsl) + + if(this.queryParam.sdsl){ - for(let i = 0; i < selectRecords.length; i++) { - if(selectRecords[i].dcth =='' || selectRecords[i].dcth ===null){ - this.$message({ message: '套料图为空', type: 'warning' }) - retrun + }else { + for(let i = 0; i < selectRecords.length; i++) { + if(selectRecords[i].dcth =='' || selectRecords[i].dcth ===null){ + this.$message({ message: '套料图为空', type: 'warning' }) + return + } } } + if(selectRecords.length>0){ slPrint(selectRecords).then(res=>{ this.sljhPrintData=res.data @@ -1399,7 +1411,7 @@ export default { width: 140px; } .el-select{ - width: 140px; + width: 110px; } } @@ -1416,7 +1428,7 @@ export default { } .my-dropdown { - width: 400px; + width: 300px; height: 400px; background-color: #fff; border: 1px solid #dcdfe6;