修正

src/views/jhzxgl/components/SljhPrint.vue

@@ -20,7 +20,7 @@
           <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: 16%">材质</div>
+          <div class="headOne" style="width: 15%">材质</div>
 
           <div class="headOne" style="width: 10%">规格</div>
           <div class="headOne" style="width: 9%">炉批号</div>
@@ -32,7 +32,7 @@
           <div class="headOne" style="width: 5%">流向</div>
           <div class="headOne" style="width: 7%">跨位</div>
           <div class="headOne" style="width: 3%">物品状态</div>
-          <div class="headOne" style="width: 5%">备注</div>
+          <div class="headOne" style="width: 6%">备注</div>
 
           <div style="clear: both"></div>
         </div>
@@ -40,7 +40,7 @@
           <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: 16%">{{ item1.wpxh }}</div>
+          <div class="one" style="width: 15%">{{ item1.wpxh }}</div>
 
           <div class="one" style="width: 10%">{{ item1.wpgg }}</div>
           <div class="one" style="width: 9%">{{ item1.lph }}</div>
@@ -52,7 +52,7 @@
           <div class="one" style="width: 5%">{{ item1.zylx }}</div>
           <div class="one" style="width: 7%">{{ item1.sldw }}</div>
           <div class="one" style="width: 3%">{{ item1.wpzt }}</div>
-          <div class="one" style="width: 5%">{{ item1.bz }}</div>
+          <div class="one" style="width: 6%">{{ item1.bz }}</div>
 
 
           <div style="clear: both"></div>

src/views/jhzxgl/sljhD.vue

@@ -6,7 +6,7 @@
       <el-row>
 
         <el-col :span="16">
-          <el-form :inline="true"  label-width="50px"  label-position="left">
+          <el-form :inline="true"  label-width="45px"  label-position="left">
             <el-form-item label="状态:">
               <el-select v-model="queryParam.rqopt" placeholder="状态" clearable @change="ztChange" style="width: 80px">
                 <el-option
@@ -26,7 +26,7 @@
                     v-model="queryParam.dcch"
                     placeholder="船号"
                     style="height: 28px;
-                    line-height: 28px; width: 140px;"
+                    line-height: 28px; width: 110px;"
                     suffix-icon="vxe-icon--search"
                     @keyup="keyupEvent6"
                     @focus="focusEvent6"
@@ -77,12 +77,17 @@
 
             <el-form-item label="炉批:">
               <el-input v-model="queryParam.lph" type="search" placeholder="炉批号" style="width: 100px" ></el-input>
-            </el-form-item>
+
+<!--            </el-form-item>-->
+
+
+<!--            <el-form-item>  </el-form-item>-->
 
 
 <!--            <el-form-item>-->
-<!--              <el-checkbox v-model="queryParam.flag" >启用跨位</el-checkbox>-->
+
-<!--            </el-form-item>-->
+            </el-form-item>
+            <el-checkbox v-model="queryParam.sdsl" style="width: 50px" >手动</el-checkbox>
           </el-form>
         </el-col>
         <el-col :span="8" style="text-align: right">
@@ -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){
 
+      }else {
         for(let i = 0; i < selectRecords.length; i++) {
           if(selectRecords[i].dcth =='' ||  selectRecords[i].dcth ===null){
             this.$message({ message: '套料图为空', type: 'warning' })
-          retrun
+            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;