From 2403cdc7bed9d5fc2b384579393fdc29bfa09951 Mon Sep 17 00:00:00 2001
From: siontion <siontion_2000@163.com>
Date: Wed, 15 May 2024 10:19:32 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=94=B5=E7=AE=B1=E4=B8=AD=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../appQualityInspection/AppQualityInspectionForm.vue |  2 +-
 src/views/Gw/biLeiQi/BiLeiQiForm.vue                  |  2 +-
 src/views/Gw/boxAppStruct/BoxAppStructForm.vue        |  2 +-
 src/views/Gw/boxMateQuality/BoxMateQualityForm.vue    |  2 +-
 src/views/Gw/com/SltWorkOrder.vue                     | 11 +++++++----
 .../Gw/componentInspect/ComponentInspectForm.vue      |  2 +-
 src/views/Gw/daoXian/DaoXianForm.vue                  |  2 +-
 src/views/Gw/dianLiuHuGanQi/DianLiuHuGanQiForm.vue    |  2 +-
 src/views/Gw/dianRongQi/DianRongQiForm.vue            |  2 +-
 src/views/Gw/duanLuQi/DuanLuQiForm.vue                |  2 +-
 src/views/Gw/elecDistance/ElecDistanceForm.vue        |  2 +-
 src/views/Gw/elecGap/ElecGapForm.vue                  |  2 +-
 .../FinishedProductWarehousingForm.vue                |  4 ++--
 .../fusedIsolationSwitch/FusedIsolationSwitchForm.vue |  2 +-
 .../insulationResistance/InsulationResistanceForm.vue |  2 +-
 src/views/Gw/langYongBaoHuQi/LangYongBaoHuQiForm.vue  |  2 +-
 .../Gw/machineOperation/MachineOperationForm.vue      |  2 +-
 src/views/Gw/muPai/MuPaiForm.vue                      |  2 +-
 .../PhaseLossProtectionTestingForm.vue                |  2 +-
 .../PowerFrequancyTestingForm.vue                     |  2 +-
 .../PowerOperationTestingForm.vue                     |  2 +-
 .../Gw/protectionCircuit/ProtectionCircuitForm.vue    |  2 +-
 .../ShengYuDianLiuDongZuoBaoHuForm.vue                |  2 +-
 .../Gw/voltageProtection/VoltageProtectionForm.vue    |  2 +-
 24 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/src/views/Gw/appQualityInspection/AppQualityInspectionForm.vue b/src/views/Gw/appQualityInspection/AppQualityInspectionForm.vue
index 59a3631..c06d9ab 100644
--- a/src/views/Gw/appQualityInspection/AppQualityInspectionForm.vue
+++ b/src/views/Gw/appQualityInspection/AppQualityInspectionForm.vue
@@ -192,7 +192,7 @@ import SltWorkOrder from '@/views/Gw/com/SltWorkOrder.vue'
 const refSltWorkOrder = ref()
 // 打开供应商信息
 const fnSltWorkOrderOpen = async (info: any) => {
-    refSltWorkOrder.value.open(info)
+    refSltWorkOrder.value.open(info,"waiguan")
 }
 // 选择供应商信息
 const fnSltWorkOrder = async (info: any) => {
diff --git a/src/views/Gw/biLeiQi/BiLeiQiForm.vue b/src/views/Gw/biLeiQi/BiLeiQiForm.vue
index 7422a64..b827b04 100644
--- a/src/views/Gw/biLeiQi/BiLeiQiForm.vue
+++ b/src/views/Gw/biLeiQi/BiLeiQiForm.vue
@@ -273,7 +273,7 @@ const refSltBaseSupplierA = ref()
 const refSltWorkOrder = ref()
 // 打开供应商信息
 const fnSltWorkOrderOpen = async (info: any) => {
-    refSltWorkOrder.value.open(info)
+    refSltWorkOrder.value.open(info,'bileiqi')
 }
 // 选择供应商信息
 const fnSltWorkOrder = async (info: any) => {
diff --git a/src/views/Gw/boxAppStruct/BoxAppStructForm.vue b/src/views/Gw/boxAppStruct/BoxAppStructForm.vue
index 5d51126..5097350 100644
--- a/src/views/Gw/boxAppStruct/BoxAppStructForm.vue
+++ b/src/views/Gw/boxAppStruct/BoxAppStructForm.vue
@@ -171,7 +171,7 @@ import SltWorkOrder from '@/views/Gw/com/SltWorkOrder.vue'
 const refSltWorkOrder = ref()
 // 打开供应商信息
 const fnSltWorkOrderOpen = async (info: any) => {
-    refSltWorkOrder.value.open(info)
+    refSltWorkOrder.value.open(info,'keti')
 }
 // 选择供应商信息
 const fnSltWorkOrder = async (info: any) => {
diff --git a/src/views/Gw/boxMateQuality/BoxMateQualityForm.vue b/src/views/Gw/boxMateQuality/BoxMateQualityForm.vue
index 304e05b..b24bdab 100644
--- a/src/views/Gw/boxMateQuality/BoxMateQualityForm.vue
+++ b/src/views/Gw/boxMateQuality/BoxMateQualityForm.vue
@@ -285,7 +285,7 @@ const refSltBaseSupplierA = ref()
 const refSltWorkOrder = ref()
 // 打开供应商信息
 const fnSltWorkOrderOpen = async (info: any) => {
-    refSltWorkOrder.value.open(info)
+    refSltWorkOrder.value.open(info,'guiti')
 }
 // 选择供应商信息
 const fnSltWorkOrder = async (info: any) => {
diff --git a/src/views/Gw/com/SltWorkOrder.vue b/src/views/Gw/com/SltWorkOrder.vue
index 7a36713..e4cc65e 100644
--- a/src/views/Gw/com/SltWorkOrder.vue
+++ b/src/views/Gw/com/SltWorkOrder.vue
@@ -2,7 +2,7 @@
     <vxe-modal class-name="csty-slt-base-supplier" v-model="refShow" width="1200" height="770" show-zoom show-footer
         :mask-closable=true>
         <template #default>
-            <vxe-grid ref="gridSltWorkOrder" v-bind="gridOptionsA" v-on="gridEventsA">
+            <vxe-grid ref="gridSltWorkOrder" v-bind="gridOptionsA" v-on="gridEventsA" >
                 <template #toolbar_buttons>
                 </template>
             </vxe-grid>
@@ -60,6 +60,7 @@ const sltRow = ref()
 const gridOptionsA: any = ref({
     border: true,
     height: 650,
+    catch:false,
     align: null,
     columnConfig: {
         resizable: true
@@ -154,10 +155,12 @@ const refShow = ref(false)
 const businessType = ref("")
 // 打开弹窗
 const open = async (info: any,type:any) => {
-
-    //gridSltWorkOrder.value.proxyConfig.
-    refShow.value = true
     businessType.value = type
+    if(gridSltWorkOrder.value){
+        gridSltWorkOrder.value.commitProxy("reload")
+    }
+    refShow.value = true
+   
     clearRadioRow()
 }
 // 提供open方法打开弹窗
diff --git a/src/views/Gw/componentInspect/ComponentInspectForm.vue b/src/views/Gw/componentInspect/ComponentInspectForm.vue
index cb51097..605225b 100644
--- a/src/views/Gw/componentInspect/ComponentInspectForm.vue
+++ b/src/views/Gw/componentInspect/ComponentInspectForm.vue
@@ -163,7 +163,7 @@ import SltWorkOrder from '@/views/Gw/com/SltWorkOrder.vue'
 const refSltWorkOrder = ref()
 // 打开供应商信息
 const fnSltWorkOrderOpen = async (info: any) => {
-    refSltWorkOrder.value.open(info)
+    refSltWorkOrder.value.open(info,'yuanqijian')
 }
 // 选择供应商信息
 const fnSltWorkOrder = async (info: any) => {
diff --git a/src/views/Gw/daoXian/DaoXianForm.vue b/src/views/Gw/daoXian/DaoXianForm.vue
index ed70000..48e9e51 100644
--- a/src/views/Gw/daoXian/DaoXianForm.vue
+++ b/src/views/Gw/daoXian/DaoXianForm.vue
@@ -195,7 +195,7 @@ import SltWorkOrder from '@/views/Gw/com/SltWorkOrder.vue'
 const refSltWorkOrder = ref()
 // 打开供应商信息
 const fnSltWorkOrderOpen = async (info: any) => {
-    refSltWorkOrder.value.open(info)
+    refSltWorkOrder.value.open(info,'daoti')
 }
 // 选择供应商信息
 const fnSltWorkOrder = async (info: any) => {
diff --git a/src/views/Gw/dianLiuHuGanQi/DianLiuHuGanQiForm.vue b/src/views/Gw/dianLiuHuGanQi/DianLiuHuGanQiForm.vue
index 4de6f22..781a1cd 100644
--- a/src/views/Gw/dianLiuHuGanQi/DianLiuHuGanQiForm.vue
+++ b/src/views/Gw/dianLiuHuGanQi/DianLiuHuGanQiForm.vue
@@ -266,7 +266,7 @@ const refSltBaseSupplierA = ref()
 const refSltWorkOrder = ref()
 // 打开供应商信息
 const fnSltWorkOrderOpen = async (info: any) => {
-    refSltWorkOrder.value.open(info)
+    refSltWorkOrder.value.open(info,'dianliu')
 }
 // 选择供应商信息
 const fnSltWorkOrder = async (info: any) => {
diff --git a/src/views/Gw/dianRongQi/DianRongQiForm.vue b/src/views/Gw/dianRongQi/DianRongQiForm.vue
index 0bd6402..a24e0cf 100644
--- a/src/views/Gw/dianRongQi/DianRongQiForm.vue
+++ b/src/views/Gw/dianRongQi/DianRongQiForm.vue
@@ -302,7 +302,7 @@ const refSltBaseSupplierA = ref()
 const refSltWorkOrder = ref()
 // 打开供应商信息
 const fnSltWorkOrderOpen = async (info: any) => {
-    refSltWorkOrder.value.open(info)
+    refSltWorkOrder.value.open(info,'dianrongqi')
 }
 // 选择供应商信息
 const fnSltWorkOrder = async (info: any) => {
diff --git a/src/views/Gw/duanLuQi/DuanLuQiForm.vue b/src/views/Gw/duanLuQi/DuanLuQiForm.vue
index 9a8c597..09427c7 100644
--- a/src/views/Gw/duanLuQi/DuanLuQiForm.vue
+++ b/src/views/Gw/duanLuQi/DuanLuQiForm.vue
@@ -286,7 +286,7 @@ const refSltBaseSupplierA = ref()
 const refSltWorkOrder = ref()
 // 打开供应商信息
 const fnSltWorkOrderOpen = async (info: any) => {
-    refSltWorkOrder.value.open(info)
+    refSltWorkOrder.value.open(info,'duanluqi')
 }
 // 选择供应商信息
 const fnSltWorkOrder = async (info: any) => {
diff --git a/src/views/Gw/elecDistance/ElecDistanceForm.vue b/src/views/Gw/elecDistance/ElecDistanceForm.vue
index 0b60438..b3375ac 100644
--- a/src/views/Gw/elecDistance/ElecDistanceForm.vue
+++ b/src/views/Gw/elecDistance/ElecDistanceForm.vue
@@ -163,7 +163,7 @@ import SltWorkOrder from '@/views/Gw/com/SltWorkOrder.vue'
 const refSltWorkOrder = ref()
 // 打开供应商信息
 const fnSltWorkOrderOpen = async (info: any) => {
-    refSltWorkOrder.value.open(info)
+    refSltWorkOrder.value.open(info,'padian')
 }
 // 选择供应商信息
 const fnSltWorkOrder = async (info: any) => {
diff --git a/src/views/Gw/elecGap/ElecGapForm.vue b/src/views/Gw/elecGap/ElecGapForm.vue
index e5cec46..b4db459 100644
--- a/src/views/Gw/elecGap/ElecGapForm.vue
+++ b/src/views/Gw/elecGap/ElecGapForm.vue
@@ -160,7 +160,7 @@ import SltWorkOrder from '@/views/Gw/com/SltWorkOrder.vue'
 const refSltWorkOrder = ref()
 // 打开供应商信息
 const fnSltWorkOrderOpen = async (info: any) => {
-    refSltWorkOrder.value.open(info)
+    refSltWorkOrder.value.open(info,'dianqi')
 }
 // 选择供应商信息
 const fnSltWorkOrder = async (info: any) => {
diff --git a/src/views/Gw/finishedProductWarehousing/FinishedProductWarehousingForm.vue b/src/views/Gw/finishedProductWarehousing/FinishedProductWarehousingForm.vue
index 2088b01..a88c2de 100644
--- a/src/views/Gw/finishedProductWarehousing/FinishedProductWarehousingForm.vue
+++ b/src/views/Gw/finishedProductWarehousing/FinishedProductWarehousingForm.vue
@@ -69,7 +69,7 @@
                         </vxe-form-item> -->
                         <vxe-form-item title="电压等级(kV)" field="VoltageGrade" span="12">
                             <template #default="params">
-                                <vxe-input v-model="params.data.VoltageGrade" type="integer" placeholder="请输入电压等级" clearable
+                                <vxe-input v-model="params.data.VoltageGrade" type="number" placeholder="请输入电压等级" clearable
                                     @change="fnChangeA(params)" style="width: 196px;"></vxe-input>
                             </template>
                         </vxe-form-item>
@@ -187,7 +187,7 @@ import SltWorkOrder from '@/views/Gw/com/SltWorkOrder.vue'
 const refSltWorkOrder = ref()
 // 打开供应商信息
 const fnSltWorkOrderOpen = async (info: any) => {
-    refSltWorkOrder.value.open(info)
+    refSltWorkOrder.value.open(info,'chengpin')
 }
 // 选择供应商信息
 const fnSltWorkOrder = async (info: any) => {
diff --git a/src/views/Gw/fusedIsolationSwitch/FusedIsolationSwitchForm.vue b/src/views/Gw/fusedIsolationSwitch/FusedIsolationSwitchForm.vue
index fe87153..164065f 100644
--- a/src/views/Gw/fusedIsolationSwitch/FusedIsolationSwitchForm.vue
+++ b/src/views/Gw/fusedIsolationSwitch/FusedIsolationSwitchForm.vue
@@ -286,7 +286,7 @@ const refSltBaseSupplierA = ref()
 const refSltWorkOrder = ref()
 // 打开供应商信息
 const fnSltWorkOrderOpen = async (info: any) => {
-    refSltWorkOrder.value.open(info)
+    refSltWorkOrder.value.open(info,'rongduanqi')
 }
 // 选择供应商信息
 const fnSltWorkOrder = async (info: any) => {
diff --git a/src/views/Gw/insulationResistance/InsulationResistanceForm.vue b/src/views/Gw/insulationResistance/InsulationResistanceForm.vue
index c328371..bb74c23 100644
--- a/src/views/Gw/insulationResistance/InsulationResistanceForm.vue
+++ b/src/views/Gw/insulationResistance/InsulationResistanceForm.vue
@@ -177,7 +177,7 @@ import SltWorkOrder from '@/views/Gw/com/SltWorkOrder.vue'
 const refSltWorkOrder = ref()
 // 打开供应商信息
 const fnSltWorkOrderOpen = async (info: any) => {
-    refSltWorkOrder.value.open(info)
+    refSltWorkOrder.value.open(info,'jueyuan')
 }
 // 选择供应商信息
 const fnSltWorkOrder = async (info: any) => {
diff --git a/src/views/Gw/langYongBaoHuQi/LangYongBaoHuQiForm.vue b/src/views/Gw/langYongBaoHuQi/LangYongBaoHuQiForm.vue
index e1b5531..b1741c1 100644
--- a/src/views/Gw/langYongBaoHuQi/LangYongBaoHuQiForm.vue
+++ b/src/views/Gw/langYongBaoHuQi/LangYongBaoHuQiForm.vue
@@ -278,7 +278,7 @@ const refSltBaseSupplierA = ref()
 const refSltWorkOrder = ref()
 // 打开供应商信息
 const fnSltWorkOrderOpen = async (info: any) => {
-    refSltWorkOrder.value.open(info)
+    refSltWorkOrder.value.open(info,'langyong')
 }
 // 选择供应商信息
 const fnSltWorkOrder = async (info: any) => {
diff --git a/src/views/Gw/machineOperation/MachineOperationForm.vue b/src/views/Gw/machineOperation/MachineOperationForm.vue
index 5d7e84a..6d1079b 100644
--- a/src/views/Gw/machineOperation/MachineOperationForm.vue
+++ b/src/views/Gw/machineOperation/MachineOperationForm.vue
@@ -174,7 +174,7 @@ import SltWorkOrder from '@/views/Gw/com/SltWorkOrder.vue'
 const refSltWorkOrder = ref()
 // 打开供应商信息
 const fnSltWorkOrderOpen = async (info: any) => {
-    refSltWorkOrder.value.open(info)
+    refSltWorkOrder.value.open(info,'jixie')
 }
 // 选择供应商信息
 const fnSltWorkOrder = async (info: any) => {
diff --git a/src/views/Gw/muPai/MuPaiForm.vue b/src/views/Gw/muPai/MuPaiForm.vue
index 1db09a3..b34e5ca 100644
--- a/src/views/Gw/muPai/MuPaiForm.vue
+++ b/src/views/Gw/muPai/MuPaiForm.vue
@@ -284,7 +284,7 @@ const refSltBaseSupplierA = ref()
 const refSltWorkOrder = ref()
 // 打开供应商信息
 const fnSltWorkOrderOpen = async (info: any) => {
-    refSltWorkOrder.value.open(info)
+    refSltWorkOrder.value.open(info,'mupai')
 }
 // 选择供应商信息
 const fnSltWorkOrder = async (info: any) => {
diff --git a/src/views/Gw/phaseLossProtectionTesting/PhaseLossProtectionTestingForm.vue b/src/views/Gw/phaseLossProtectionTesting/PhaseLossProtectionTestingForm.vue
index eaa1b9f..794e63d 100644
--- a/src/views/Gw/phaseLossProtectionTesting/PhaseLossProtectionTestingForm.vue
+++ b/src/views/Gw/phaseLossProtectionTesting/PhaseLossProtectionTestingForm.vue
@@ -175,7 +175,7 @@ import SltWorkOrder from '@/views/Gw/com/SltWorkOrder.vue'
 const refSltWorkOrder = ref()
 // 打开供应商信息
 const fnSltWorkOrderOpen = async (info: any) => {
-    refSltWorkOrder.value.open(info)
+    refSltWorkOrder.value.open(info,'quexiang')
 }
 // 选择供应商信息
 const fnSltWorkOrder = async (info: any) => {
diff --git a/src/views/Gw/powerFrequancyTesting/PowerFrequancyTestingForm.vue b/src/views/Gw/powerFrequancyTesting/PowerFrequancyTestingForm.vue
index aa38c16..6f5e81e 100644
--- a/src/views/Gw/powerFrequancyTesting/PowerFrequancyTestingForm.vue
+++ b/src/views/Gw/powerFrequancyTesting/PowerFrequancyTestingForm.vue
@@ -227,7 +227,7 @@ import SltWorkOrder from '@/views/Gw/com/SltWorkOrder.vue'
 const refSltWorkOrder = ref()
 // 打开供应商信息
 const fnSltWorkOrderOpen = async (info: any) => {
-    refSltWorkOrder.value.open(info)
+    refSltWorkOrder.value.open(info,'gongpinnaishou')
 }
 // 选择供应商信息
 const fnSltWorkOrder = async (info: any) => {
diff --git a/src/views/Gw/powerOperationTesting/PowerOperationTestingForm.vue b/src/views/Gw/powerOperationTesting/PowerOperationTestingForm.vue
index cd5afb9..3d23716 100644
--- a/src/views/Gw/powerOperationTesting/PowerOperationTestingForm.vue
+++ b/src/views/Gw/powerOperationTesting/PowerOperationTestingForm.vue
@@ -175,7 +175,7 @@ import SltWorkOrder from '@/views/Gw/com/SltWorkOrder.vue'
 const refSltWorkOrder = ref()
 // 打开供应商信息
 const fnSltWorkOrderOpen = async (info: any) => {
-    refSltWorkOrder.value.open(info)
+    refSltWorkOrder.value.open(info,'tongdian')
 }
 // 选择供应商信息
 const fnSltWorkOrder = async (info: any) => {
diff --git a/src/views/Gw/protectionCircuit/ProtectionCircuitForm.vue b/src/views/Gw/protectionCircuit/ProtectionCircuitForm.vue
index c62ef5b..a155aad 100644
--- a/src/views/Gw/protectionCircuit/ProtectionCircuitForm.vue
+++ b/src/views/Gw/protectionCircuit/ProtectionCircuitForm.vue
@@ -302,7 +302,7 @@ import SltWorkOrder from '@/views/Gw/com/SltWorkOrder.vue'
 const refSltWorkOrder = ref()
 // 打开供应商信息
 const fnSltWorkOrderOpen = async (info: any) => {
-    refSltWorkOrder.value.open(info)
+    refSltWorkOrder.value.open(info,'baohu')
 }
 // 选择供应商信息
 const fnSltWorkOrder = async (info: any) => {
diff --git a/src/views/Gw/shengYuDianLiuDongZuoBaoHu/ShengYuDianLiuDongZuoBaoHuForm.vue b/src/views/Gw/shengYuDianLiuDongZuoBaoHu/ShengYuDianLiuDongZuoBaoHuForm.vue
index cd23e77..ddf441f 100644
--- a/src/views/Gw/shengYuDianLiuDongZuoBaoHu/ShengYuDianLiuDongZuoBaoHuForm.vue
+++ b/src/views/Gw/shengYuDianLiuDongZuoBaoHu/ShengYuDianLiuDongZuoBaoHuForm.vue
@@ -292,7 +292,7 @@ const refSltBaseSupplierA = ref()
 const refSltWorkOrder = ref()
 // 打开供应商信息
 const fnSltWorkOrderOpen = async (info: any) => {
-    refSltWorkOrder.value.open(info)
+    refSltWorkOrder.value.open(info,'shengyu')
 }
 // 选择供应商信息
 const fnSltWorkOrder = async (info: any) => {
diff --git a/src/views/Gw/voltageProtection/VoltageProtectionForm.vue b/src/views/Gw/voltageProtection/VoltageProtectionForm.vue
index 04de5bc..cea7289 100644
--- a/src/views/Gw/voltageProtection/VoltageProtectionForm.vue
+++ b/src/views/Gw/voltageProtection/VoltageProtectionForm.vue
@@ -176,7 +176,7 @@ import SltWorkOrder from '@/views/Gw/com/SltWorkOrder.vue'
 const refSltWorkOrder = ref()
 // 打开供应商信息
 const fnSltWorkOrderOpen = async (info: any) => {
-    refSltWorkOrder.value.open(info)
+    refSltWorkOrder.value.open(info,'gongpinguodian')
 }
 // 选择供应商信息
 const fnSltWorkOrder = async (info: any) => {