From d546b21103fbb33db90317fca2771a09b42f4425 Mon Sep 17 00:00:00 2001
From: xhj <xhjzrq@163.com>
Date: Sun, 17 Nov 2024 10:55:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/jhzx/ydjhzxCX.vue               |   2 +-
 src/views/jhzxgl/components/SljhPrint.vue |  26 +++---
 src/views/jhzxgl/sljhD.vue                | 107 ++++++++++++----------
 3 files changed, 72 insertions(+), 63 deletions(-)

diff --git a/src/views/jhzx/ydjhzxCX.vue b/src/views/jhzx/ydjhzxCX.vue
index 93e053c..0ececf0 100644
--- a/src/views/jhzx/ydjhzxCX.vue
+++ b/src/views/jhzx/ydjhzxCX.vue
@@ -107,7 +107,7 @@ export default {
       queryParam: {
         dcch:'',
         yf:'',
-        zt: '0'
+        zt: ''
       },
       list: [],
       list1: [],
diff --git a/src/views/jhzxgl/components/SljhPrint.vue b/src/views/jhzxgl/components/SljhPrint.vue
index 99fb2e0..984b499 100644
--- a/src/views/jhzxgl/components/SljhPrint.vue
+++ b/src/views/jhzxgl/components/SljhPrint.vue
@@ -1,7 +1,7 @@
 <template>
   <!--  <el-container>-->
   <div>
-    <div class=""   v-for="(item,indexOne) in sljhPrintData"   style="width: 980px;
+    <div class=""   v-for="(item,indexOne) in sljhPrintData"   style=" width: 1050px;
   /*border: 1px #000 solid;*/
   text-align: center;
   font-size: 20px; ">
@@ -20,18 +20,18 @@
           <div class="headOne" style="width:4%">序号</div>
           <div class="headOne" style="width: 11%">合同号</div>
           <div class="headOne" style="width: 7%">船号</div>
-          <div class="headOne" style="width: 7%">材质</div>
+          <div class="headOne" style="width: 16%">材质</div>
 
           <div class="headOne" style="width: 10%">规格</div>
-          <div class="headOne" style="width: 10%">炉批号</div>
-          <div class="headOne" style="width: 4%">数量</div>
+          <div class="headOne" style="width: 9%">炉批号</div>
+          <div class="headOne" style="width: 3%">数量</div>
           <div class="headOne" style="width: 5%">库存垛位</div>
-          <div class="headOne" style="width: 5%">层数</div>
-          <div class="headOne" style="width: 7%">需求船只</div>
+          <div class="headOne" style="width: 4%">层数</div>
+          <div class="headOne" style="width: 6%">需求船只</div>
           <div class="headOne" style="width: 5%">需求批量</div>
           <div class="headOne" style="width: 5%">流向</div>
           <div class="headOne" style="width: 7%">跨位</div>
-          <div class="headOne" style="width: 5%">物品状态</div>
+          <div class="headOne" style="width: 3%">物品状态</div>
           <div class="headOne" style="width: 5%">备注</div>
 
           <div style="clear: both"></div>
@@ -40,18 +40,18 @@
           <div class="one" style="width:4%">{{ item1.xh }}</div>
           <div class="one" style="width: 11%">{{ item1.dcFd }}</div>
           <div class="one" style="width: 7%">{{ item1.dcch }}</div>
-          <div class="one" style="width: 7%">{{ item1.wpxh }}</div>
+          <div class="one" style="width: 16%">{{ item1.wpxh }}</div>
 
           <div class="one" style="width: 10%">{{ item1.wpgg }}</div>
-          <div class="one" style="width: 10%">{{ item1.lph }}</div>
-          <div class="one" style="width: 4%">{{ item1.qxkcl }}</div>
+          <div class="one" style="width: 9%">{{ item1.lph }}</div>
+          <div class="one" style="width: 3%">{{ item1.qxkcl }}</div>
           <div class="one" style="width: 5%">{{ item1.kwh }}</div>
-          <div class="one" style="width: 5%">{{ item1.cfcs1 }}</div>
-          <div class="one" style="width: 7%">{{ item1.zych }}</div>
+          <div class="one" style="width: 4%">{{ item1.cfcs1 }}</div>
+          <div class="one" style="width: 6%">{{ item1.zych }}</div>
           <div class="one" style="width: 5%">{{ item1.zypl }}</div>
           <div class="one" style="width: 5%">{{ item1.zylx }}</div>
           <div class="one" style="width: 7%">{{ item1.sldw }}</div>
-          <div class="one" style="width: 5%">{{ item1.wpzt }}</div>
+          <div class="one" style="width: 3%">{{ item1.wpzt }}</div>
           <div class="one" style="width: 5%">{{ item1.bz }}</div>
 
 
diff --git a/src/views/jhzxgl/sljhD.vue b/src/views/jhzxgl/sljhD.vue
index fb60d38..a49dc7d 100644
--- a/src/views/jhzxgl/sljhD.vue
+++ b/src/views/jhzxgl/sljhD.vue
@@ -894,52 +894,49 @@ export default {
     updates2(){
       let selectRecords = this.$refs.xGrid.getCheckboxRecords()
 
-      if(this.queryParam.rqopt!=='01'){
-        return
-      }
-
-      if(selectRecords.length>0){
-        for(let i = 0; i < selectRecords.length; i++) {
-        console.log(selectRecords[i].ydid)
+      if(this.queryParam.rqopt==='01'){
+        if(selectRecords.length>0){
+          for(let i = 0; i < selectRecords.length; i++) {
+            console.log(selectRecords[i].ydid)
 
 
-          if(this.inParam.dcch !==''){
-            // if(selectRecords[i].ydid!==null ||  selectRecords[i].ydid!==''){
-            //   this.$message({ message: '改数据已经匹配生产计划', type: 'warning' })
-            //   return
-            // }
-            selectRecords[i].zych = this.inParam.dcch
-          }
-          if(this.inParam.dcpl !==''){
-            // if(selectRecords[i].ydid!==null){
-            //   this.$message({ message: '改数据已经匹配生产计划', type: 'warning' })
-            //   return
-            // }
-            selectRecords[i].zypl = this.inParam.dcpl
-          }
-          if(this.inParam.lx !==''){
-            // if(selectRecords[i].ydid!==null){
-            //   this.$message({ message: '改数据已经匹配生产计划', type: 'warning' })
-            //   return
-            // }
-            selectRecords[i].zylx = this.inParam.lx
-          }
-          if(this.inParam.qgkw !==''){
-            // if(selectRecords[i].ydid!==null){
-            //   this.$message({ message: '改数据已经匹配生产计划', type: 'warning' })
-            //   return
-            // }
-            selectRecords[i].sldw = this.inParam.qgkw
-          }
-          if(this.inParam.pwwz!==''){
-            selectRecords[i].pwwz = this.inParam.pwwz
-          }
-          if(this.inParam.jhrq !==''){
-            selectRecords[i].dhh = this.inParam.jhrq
-          }
-          if(this.inParam.bz !==''){
-            selectRecords[i].bz = this.inParam.bz
-          }
+            if(this.inParam.dcch !==''){
+              // if(selectRecords[i].ydid!==null ||  selectRecords[i].ydid!==''){
+              //   this.$message({ message: '改数据已经匹配生产计划', type: 'warning' })
+              //   return
+              // }
+              selectRecords[i].zych = this.inParam.dcch
+            }
+            if(this.inParam.dcpl !==''){
+              // if(selectRecords[i].ydid!==null){
+              //   this.$message({ message: '改数据已经匹配生产计划', type: 'warning' })
+              //   return
+              // }
+              selectRecords[i].zypl = this.inParam.dcpl
+            }
+            if(this.inParam.lx !==''){
+              // if(selectRecords[i].ydid!==null){
+              //   this.$message({ message: '改数据已经匹配生产计划', type: 'warning' })
+              //   return
+              // }
+              selectRecords[i].zylx = this.inParam.lx
+            }
+            if(this.inParam.qgkw !==''){
+              // if(selectRecords[i].ydid!==null){
+              //   this.$message({ message: '改数据已经匹配生产计划', type: 'warning' })
+              //   return
+              // }
+              selectRecords[i].sldw = this.inParam.qgkw
+            }
+            if(this.inParam.pwwz!==''){
+              selectRecords[i].pwwz = this.inParam.pwwz
+            }
+            if(this.inParam.jhrq !==''){
+              selectRecords[i].dhh = this.inParam.jhrq
+            }
+            if(this.inParam.bz !==''){
+              selectRecords[i].bz = this.inParam.bz
+            }
 
 
 
@@ -949,9 +946,21 @@ export default {
 
 
 
+          }
+          this.$refs.xGrid.updateData(this.list)
+        }
+      }else{
+        if(selectRecords.length>0){
+          for(let i = 0; i < selectRecords.length; i++) {
+            if(this.inParam.bz !==''){
+              selectRecords[i].bz = this.inParam.bz
+            }
+          }
+          this.$refs.xGrid.updateData(this.list)
         }
-        this.$refs.xGrid.updateData(this.list)
       }
+
+
     },
     updates(type){
 
@@ -1165,10 +1174,10 @@ export default {
         return
       }
 
-      if(this.inParam.dcpl ===''){
-        this.$message({ message: '请输入需求批量', type: 'warning' })
-        return
-      }
+      // if(this.inParam.dcpl ===''){
+      //   this.$message({ message: '请输入需求批量', type: 'warning' })
+      //   return
+      // }
     let obj =this.$refs.xGrid.getTableData().visibleData;
       if(obj.length<=0){
         this.$message({ message: '页面无数据', type: 'warning' })