From cf6d3f92aa9c1786112be1dba26c073693a78f68 Mon Sep 17 00:00:00 2001
From: xhj <xhjzrq@163.com>
Date: Mon, 2 Dec 2024 16:15:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/jhzxgl/sljhD.vue | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/views/jhzxgl/sljhD.vue b/src/views/jhzxgl/sljhD.vue
index e35db33..4b1da16 100644
--- a/src/views/jhzxgl/sljhD.vue
+++ b/src/views/jhzxgl/sljhD.vue
@@ -728,13 +728,14 @@ export default {
           title: '抛丸位置',
           width: "70px",
           field: 'pwwz',
-          formatter: ['dictFormat', 'PWWZ'],
-          editRender: {
-            name: '$select', options: [],
-            optionProps: {value: 'bm', label: 'bmsm'},
-            props: {clearable: true}
-            , events: {change: this.selectChange}
-          },
+          editRender: { name: 'input' },
+          // formatter: ['dictFormat', 'PWWZ'],
+          // editRender: {
+          //   name: '$select', options: [],
+          //   optionProps: {value: 'bm', label: 'bmsm'},
+          //   props: {clearable: true}
+          //   , events: {change: this.selectChange}
+          // },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination' },
         },
@@ -957,6 +958,9 @@ export default {
             if(this.inParam.bz !==''){
               selectRecords[i].bz = this.inParam.bz
             }
+            if(this.inParam.pwwz!==''){
+              selectRecords[i].pwwz = this.inParam.pwwz
+            }
           }
           this.$refs.xGrid.updateData(this.list)
         }
@@ -1040,9 +1044,11 @@ export default {
 
     printzj(){
       if(this.queryParam.rqopt!=='03'){
+
+        this.$message({ message: '请在已打印中打印', type: 'warning' })
         return
       }else {
-        this.$message({ message: '请在已打印中打印', type: 'warning' })
+
       }
         let selectRecords = this.$refs.xGrid.getCheckboxRecords()
       if(selectRecords.length>0){
@@ -1197,10 +1203,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' })