diff --git a/src/views/Gw/appIPGrade/AppIPGradeForm.vue b/src/views/Gw/appIPGrade/AppIPGradeForm.vue
index 9a44aa9..2e40865 100644
--- a/src/views/Gw/appIPGrade/AppIPGradeForm.vue
+++ b/src/views/Gw/appIPGrade/AppIPGradeForm.vue
@@ -26,13 +26,13 @@
                         </vxe-form-item> -->
                         <vxe-form-item title="供应商工单编号" field="SupplierWorkNo" span="12">
                             <template #default="params">
-                                <vxe-select v-model="params.data.SupplierWorkNo" clearable filterable @change="fnWoNoChange(params)">
+                                <!-- <vxe-select v-model="params.data.SupplierWorkNo" clearable filterable>
                                     <template v-for="item in dictEipSupplierWoSimpList">
                                         <vxe-option :value="item.WoNo" :label="item.WoNo"></vxe-option>
                                     </template>
-                                </vxe-select>
-                                <!-- <vxe-input v-model="params.data.SupplierWorkNo" placeholder="请输入供应商工单编号" clearable
-                                    @change="fnChangeA(params)"></vxe-input> -->
+                                </vxe-select> -->
+                                <vxe-input v-model="params.data.SupplierWorkNo" placeholder="请输入供应商工单编号" clearable
+                                    @change="fnChangeA(params)" @click="fnSltWorkOrderOpen"></vxe-input>
                             </template>
                         </vxe-form-item>
                         <!-- <vxe-form-item title="国网侧供应商编码" field="SupplierCode" span="12">
@@ -154,6 +154,7 @@
             <vxe-button type="reset" content="取消" @click="fnEventCancel"></vxe-button>
         </template>
     </vxe-modal>
+    <SltWorkOrder ref="refSltWorkOrder" @success="fnSltWorkOrder" />
 </template>
 
 <script lang="ts" setup name="AppIPGradeForm">
@@ -165,6 +166,22 @@ import * as AppIPGradeApi from '@/api/gw/appIPGrade'
 import { useDictStore } from '@/stores/dict'
 import { storeToRefs } from 'pinia'
 import * as comApi from '@/api/gw/com'
+import SltWorkOrder from '@/views/Gw/com/SltWorkOrder.vue'
+
+const refSltWorkOrder = ref()
+// 打开供应商信息
+const fnSltWorkOrderOpen = async (info: any) => {
+    refSltWorkOrder.value.open(info)
+}
+// 选择供应商信息
+const fnSltWorkOrder = async (info: any) => {
+    formDataA.value.SupplierWorkNo = info.WoNo
+    dictEipSupplierWoSimpList.value.forEach((item: any) => {
+        if (item.WoNo == formDataA.value.SupplierWorkNo) {
+            formDataA.value.SupplierSupportId = item.FactoryNo;//出厂编号
+        }
+    })
+}
 const dictEipSupplierWoSimpList: any = ref([])
 const fnWoNoChange = (params: any) => {
     if (params.data.SupplierWorkNo) {
diff --git a/src/views/Gw/appQualityInspection/AppQualityInspectionForm.vue b/src/views/Gw/appQualityInspection/AppQualityInspectionForm.vue
index aa8ff36..2265ed1 100644
--- a/src/views/Gw/appQualityInspection/AppQualityInspectionForm.vue
+++ b/src/views/Gw/appQualityInspection/AppQualityInspectionForm.vue
@@ -26,14 +26,15 @@
                         </vxe-form-item> -->
                         <vxe-form-item title="供应商工单编号" field="SupplierWorkNo" span="12">
                             <template #default="params">
-                                <vxe-select v-model="params.data.SupplierWorkNo" clearable filterable @change="fnWoNoChange(params)">
+                                <!-- <vxe-select v-model="params.data.SupplierWorkNo" clearable filterable>
                                     <template v-for="item in dictEipSupplierWoSimpList">
                                         <vxe-option :value="item.WoNo" :label="item.WoNo"></vxe-option>
                                     </template>
-                                </vxe-select>
-                                <!-- <vxe-input v-model="params.data.SupplierWorkNo" placeholder="请输入供应商工单编号" clearable
-                                    @change="fnChangeA(params)"></vxe-input> -->
+                                </vxe-select> -->
+                                <vxe-input v-model="params.data.SupplierWorkNo" placeholder="请输入供应商工单编号" clearable
+                                    @change="fnChangeA(params)" @click="fnSltWorkOrderOpen"></vxe-input>
                             </template>
+
                         </vxe-form-item>
                         <!-- <vxe-form-item title="国网侧供应商编码" field="SupplierCode" span="12">
                             <template #default="params">
@@ -172,6 +173,8 @@
             <vxe-button type="reset" content="取消" @click="fnEventCancel"></vxe-button>
         </template>
     </vxe-modal>
+    <SltWorkOrder ref="refSltWorkOrder" @success="fnSltWorkOrder" />
+
 </template>
 
 <script lang="ts" setup name="AppQualityInspectionForm">
@@ -184,6 +187,22 @@ import { useDictStore } from '@/stores/dict'
 import { storeToRefs } from 'pinia'
 
 import * as comApi from '@/api/gw/com'
+import SltWorkOrder from '@/views/Gw/com/SltWorkOrder.vue'
+
+const refSltWorkOrder = ref()
+// 打开供应商信息
+const fnSltWorkOrderOpen = async (info: any) => {
+    refSltWorkOrder.value.open(info)
+}
+// 选择供应商信息
+const fnSltWorkOrder = async (info: any) => {
+    formDataA.value.SupplierWorkNo = info.WoNo
+    dictEipSupplierWoSimpList.value.forEach((item: any) => {
+        if (item.WoNo == formDataA.value.SupplierWorkNo) {
+            formDataA.value.SupplierSupportId = item.FactoryNo;//出厂编号
+        }
+    })
+}
 const dictEipSupplierWoSimpList: any = ref([])
 const fnWoNoChange = (params: any) => {
     if (params.data.SupplierWorkNo) {
diff --git a/src/views/Gw/baseMaterial/BaseMaterialForm.vue b/src/views/Gw/baseMaterial/BaseMaterialForm.vue
index e47ff75..e0dce7e 100644
--- a/src/views/Gw/baseMaterial/BaseMaterialForm.vue
+++ b/src/views/Gw/baseMaterial/BaseMaterialForm.vue
@@ -1,4 +1,4 @@
-<template>
+    <template>
     <div class="xyp-base-supplier-form" v-if="refShow">
         <vxe-modal v-model="refShow" width="800" height="560" show-zoom show-footer>
             <template #title>
diff --git a/src/views/Gw/biLeiQi/BiLeiQiForm.vue b/src/views/Gw/biLeiQi/BiLeiQiForm.vue
index 0c70cd2..8c0b81d 100644
--- a/src/views/Gw/biLeiQi/BiLeiQiForm.vue
+++ b/src/views/Gw/biLeiQi/BiLeiQiForm.vue
@@ -26,13 +26,13 @@
                             </vxe-form-item> -->
                         <vxe-form-item title="供应商工单编号" field="SupplierWorkNo" span="12">
                             <template #default="params">
-                                <vxe-select v-model="params.data.SupplierWorkNo" clearable filterable>
+                                <!-- <vxe-select v-model="params.data.SupplierWorkNo" clearable filterable>
                                     <template v-for="item in dictEipSupplierWoSimpList">
                                         <vxe-option :value="item.WoNo" :label="item.WoNo"></vxe-option>
                                     </template>
-                                </vxe-select>
-                                <!-- <vxe-input v-model="params.data.SupplierWorkNo" placeholder="请输入供应商工单编号" clearable
-                                    @change="fnChangeA(params)"></vxe-input> -->
+                                </vxe-select> -->
+                                <vxe-input v-model="params.data.SupplierWorkNo" placeholder="请输入供应商工单编号" clearable
+                                    @change="fnChangeA(params)" @click="fnSltWorkOrderOpen"></vxe-input>
                             </template>
                         </vxe-form-item>
                         <!-- <vxe-form-item title="国网侧供应商编码" field="SupplierCode" span="12">
@@ -250,6 +250,7 @@
         </template>
     </vxe-modal>
     <SltBaseSupplier ref="refSltBaseSupplierA" @success="fnSltBaseSupplier" />
+    <SltWorkOrder ref="refSltWorkOrder" @success="fnSltWorkOrder" />
 </template>
 
 <script lang="ts" setup name="BiLeiQiForm">
@@ -266,8 +267,18 @@ import XEUtils from 'xe-utils'
 import * as FileUploadApi from '@/api/gw/fileUpload'
 import * as comApi from '@/api/gw/com'
 import SltBaseSupplier from '@/views/Gw/com/SltBaseSupplier.vue'
+import SltWorkOrder from '@/views/Gw/com/SltWorkOrder.vue'
 // 弹窗（供应商选择）
 const refSltBaseSupplierA = ref()
+const refSltWorkOrder = ref()
+// 打开供应商信息
+const fnSltWorkOrderOpen = async (info: any) => {
+    refSltWorkOrder.value.open(info)
+}
+// 选择供应商信息
+const fnSltWorkOrder = async (info: any) => {
+    formDataA.value.SupplierWorkNo = info.WoNo
+}
 // 字典
 const dictStore = useDictStore()
 const { dictProcessType } = storeToRefs(dictStore)
@@ -517,6 +528,11 @@ const fnDeleteA = async (row: any) => {
 }
 // 提交
 const fnSubmitA = async () => {
+    let fileChecks = JSON.parse(formDataB.value.FileItems)
+    if(fileChecks[0]["fileUrl"].length == 0 || fileChecks[1]["fileUrl"].length == 0){
+        VXETable.modal.message({ content: '请上传检验报告', status: 'warning' })
+        return;
+    }
     refFormA.value.validate().then(async (res: any) => {
         if (!res) {
             formDataA.value.Sended = 0
diff --git a/src/views/Gw/boxAppStruct/BoxAppStructForm.vue b/src/views/Gw/boxAppStruct/BoxAppStructForm.vue
index 9a6a888..e152474 100644
--- a/src/views/Gw/boxAppStruct/BoxAppStructForm.vue
+++ b/src/views/Gw/boxAppStruct/BoxAppStructForm.vue
@@ -26,13 +26,13 @@
                         </vxe-form-item> -->
                         <vxe-form-item title="供应商工单编号" field="SupplierWorkNo" span="12">
                             <template #default="params">
-                                <vxe-select v-model="params.data.SupplierWorkNo" clearable filterable @change="fnWoNoChange(params)">
+                                <!-- <vxe-select v-model="params.data.SupplierWorkNo" clearable filterable>
                                     <template v-for="item in dictEipSupplierWoSimpList">
                                         <vxe-option :value="item.WoNo" :label="item.WoNo"></vxe-option>
                                     </template>
-                                </vxe-select>
-                                <!-- <vxe-input v-model="params.data.SupplierWorkNo" placeholder="请输入供应商工单编号" clearable
-                                    @change="fnChangeA(params)"></vxe-input> -->
+                                </vxe-select> -->
+                                <vxe-input v-model="params.data.SupplierWorkNo" placeholder="请输入供应商工单编号" clearable
+                                    @change="fnChangeA(params)" @click="fnSltWorkOrderOpen"></vxe-input>
                             </template>
                         </vxe-form-item>
                         <!-- <vxe-form-item title="国网侧供应商编码" field="SupplierCode" span="12">
@@ -153,7 +153,7 @@
             <vxe-button type="reset" content="取消" @click="fnEventCancel"></vxe-button>
         </template>
     </vxe-modal>
-
+    <SltWorkOrder ref="refSltWorkOrder" @success="fnSltWorkOrder" />
 </template>
 
 <script lang="ts" setup name="BoxAppStructForm">
@@ -166,6 +166,22 @@ import { useDictStore } from '@/stores/dict'
 import { storeToRefs } from 'pinia'
 
 import * as comApi from '@/api/gw/com'
+import SltWorkOrder from '@/views/Gw/com/SltWorkOrder.vue'
+
+const refSltWorkOrder = ref()
+// 打开供应商信息
+const fnSltWorkOrderOpen = async (info: any) => {
+    refSltWorkOrder.value.open(info)
+}
+// 选择供应商信息
+const fnSltWorkOrder = async (info: any) => {
+    formDataA.value.SupplierWorkNo = info.WoNo
+    dictEipSupplierWoSimpList.value.forEach((item: any) => {
+        if (item.WoNo == formDataA.value.SupplierWorkNo) {
+            formDataA.value.SupplierSupportId = item.FactoryNo;//出厂编号
+        }
+    })
+}
 const dictEipSupplierWoSimpList: any = ref([])
 const fnWoNoChange = (params: any) => {
     if (params.data.SupplierWorkNo) {
diff --git a/src/views/Gw/boxMateQuality/BoxMateQuality.vue b/src/views/Gw/boxMateQuality/BoxMateQuality.vue
index 33c98ba..27d3001 100644
--- a/src/views/Gw/boxMateQuality/BoxMateQuality.vue
+++ b/src/views/Gw/boxMateQuality/BoxMateQuality.vue
@@ -54,6 +54,7 @@ const gridOptionsA: any = reactive({
         // { type: 'checkbox', title: '', width: 30, fixed: 'left' },
         // { field: 'StandardVersion', title: '采集规范版本号', width: '120px', fixed: 'left' },
         { field: 'BuyerName', title: '采购公司名称', sortable: true, width: '200px', fixed: 'left' },
+        { field: 'PoNo', title: '采购订单编号', sortable: true, width: '200px', fixed: 'left' },
         { field: 'SupplierWorkNo', title: '供应商工单编号', sortable: true, width: '200px', fixed: 'left' },
         // { field: 'SupplierCode', title: '国网侧供应商编码', sortable: true, width: '160px' },
         // { field: 'ModelCode', title: '规格型号编码', width: '140px' },
diff --git a/src/views/Gw/boxMateQuality/BoxMateQualityForm.vue b/src/views/Gw/boxMateQuality/BoxMateQualityForm.vue
index 9e09c3f..d6d078c 100644
--- a/src/views/Gw/boxMateQuality/BoxMateQualityForm.vue
+++ b/src/views/Gw/boxMateQuality/BoxMateQualityForm.vue
@@ -26,13 +26,13 @@
                         </vxe-form-item> -->
                         <vxe-form-item title="供应商工单编号" field="SupplierWorkNo" span="12">
                             <template #default="params">
-                                <vxe-select v-model="params.data.SupplierWorkNo" clearable filterable>
+                                <!-- <vxe-select v-model="params.data.SupplierWorkNo" clearable filterable>
                                     <template v-for="item in dictEipSupplierWoSimpList">
                                         <vxe-option :value="item.WoNo" :label="item.WoNo"></vxe-option>
                                     </template>
-                                </vxe-select>
-                                <!-- <vxe-input v-model="params.data.SupplierWorkNo" placeholder="请输入供应商工单编号" clearable
-                                    @change="fnChangeA(params)"></vxe-input> -->
+                                </vxe-select> -->
+                                <vxe-input v-model="params.data.SupplierWorkNo" placeholder="请输入供应商工单编号" clearable
+                                    @change="fnChangeA(params)" @click="fnSltWorkOrderOpen"></vxe-input>
                             </template>
                         </vxe-form-item>
                         <!-- <vxe-form-item title="国网侧供应商编码" field="SupplierCode" span="12">
@@ -262,6 +262,7 @@
         </template>
     </vxe-modal>
     <SltBaseSupplier ref="refSltBaseSupplierA" @success="fnSltBaseSupplier" />
+    <SltWorkOrder ref="refSltWorkOrder" @success="fnSltWorkOrder" />
 </template>
 
 <script lang="ts" setup name="BoxMateQualityForm">
@@ -278,8 +279,18 @@ import { config } from '@/config/axios/config'
 import * as FileUploadApi from '@/api/gw/fileUpload'
 import * as comApi from '@/api/gw/com'
 import SltBaseSupplier from '@/views/Gw/com/SltBaseSupplier.vue'
+import SltWorkOrder from '@/views/Gw/com/SltWorkOrder.vue'
 // 弹窗（供应商选择）
 const refSltBaseSupplierA = ref()
+const refSltWorkOrder = ref()
+// 打开供应商信息
+const fnSltWorkOrderOpen = async (info: any) => {
+    refSltWorkOrder.value.open(info)
+}
+// 选择供应商信息
+const fnSltWorkOrder = async (info: any) => {
+    formDataA.value.SupplierWorkNo = info.WoNo
+}
 // 字典
 const dictStore = useDictStore()
 const { dictProcessType } = storeToRefs(dictStore)
@@ -556,6 +567,11 @@ const fnDeleteA = async (row: any) => {
 }
 // 表单A - 提交
 const fnSubmitA = async () => {
+    let fileChecks = JSON.parse(formDataB.value.FileItems)
+    if(fileChecks[0]["fileUrl"].length == 0 || fileChecks[1]["fileUrl"].length == 0){
+        VXETable.modal.message({ content: '请上传检验报告', status: 'warning' })
+        return;
+    }
     refFormA.value.validate().then(async (res: any) => {
         if (!res) {
             formDataA.value.Sended = 0
diff --git a/src/views/Gw/com/SltBaseSupplier.vue b/src/views/Gw/com/SltBaseSupplier.vue
index 3efd2a8..11f074a 100644
--- a/src/views/Gw/com/SltBaseSupplier.vue
+++ b/src/views/Gw/com/SltBaseSupplier.vue
@@ -17,6 +17,7 @@
 <script lang="ts" setup name="SltBaseSupplier">
 import { ref, reactive, defineProps } from 'vue'
 import * as BaseSupplierApi from '@/api/gw/baseSupplier'
+import { map as _map } from 'lodash'
 // 定义事件[success]
 const emit = defineEmits(['success'])
 // Props 声明
@@ -83,6 +84,15 @@ const gridOptionsA: any = ref({
         pageSize: 10,
         pageSizes: [10, 20, 50, 100]
     },
+    formConfig: {
+        titleWidth: 160,
+        titleAlign: 'right',
+        items: [
+            { field: 'LotNo', title: '原材料批次号', span: 8, itemRender: { name: '$input', props: { placeholder: '请输入原材料批次号' } } },
+            { field: 'Spec', title: '原材料规格型号', span: 8, itemRender: { name: '$input', props: { placeholder: '请输入原材料规格型号' } } },
+            { span: 24, align: 'center', collapseNode: true, itemRender: { name: '$buttons', children: [{ props: { type: 'submit', content: '查询', status: 'primary' } }, { props: { type: 'reset', content: '重置' } }] } }
+        ]
+    },
     proxyConfig: {
         seq: true, // 启用动态序号代理，每一页的序号会根据当前页数变化
         sort: true, // 启用排序代理，当点击排序时会自动触发 query 行为
@@ -100,6 +110,17 @@ const gridOptionsA: any = ref({
                 const queryParams: any = reactive({
                     currentPage: page.currentPage,
                     pageSize: page.pageSize,
+                    filter: {
+                        "logic": 0,
+                        "filters": _map(form, (o1: any, k1: any) => {
+                            return {
+                                "field": k1,
+                                "operator": 0,
+                                "value": o1
+                            }
+
+                        })
+                    }
                 })
                 const data = await BaseSupplierApi.getBaseSupplierPaging(queryParams)
                 return data
diff --git a/src/views/Gw/com/SltWorkOrder.vue b/src/views/Gw/com/SltWorkOrder.vue
new file mode 100644
index 0000000..d631358
--- /dev/null
+++ b/src/views/Gw/com/SltWorkOrder.vue
@@ -0,0 +1,171 @@
+<template>
+    <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">
+                <template #toolbar_buttons>
+                </template>
+            </vxe-grid>
+        </template>
+        <template #footer>
+            <vxe-button type="submit" status="primary" content="保存" @click="fnSubmit"></vxe-button>
+            <vxe-button type="reset" content="取消" @click="fnCancel"></vxe-button>
+        </template>
+    </vxe-modal>
+</template>
+
+<script lang="ts" setup name="SltBaseSupplier">
+import { ref, reactive, defineProps } from 'vue'
+import * as WorkOrderApi from '@/api/gw/productionWorkOrder'
+import { map as _map } from 'lodash'
+// 定义事件[success]
+const emit = defineEmits(['success'])
+// Props 声明
+const props = defineProps(
+    {
+        columns: {
+            type: Array,
+            required: false,
+            default(rawProps: any) {
+                return [
+                    { type: 'radio', width: 40, fixed: 'left' },
+                    { field: 'BuyerName', title: '采购方公司名称', fixed: 'left', width: '190px' },
+                    { field: 'Amount', title: '生产数量', fixed: 'left', width: '100px' },
+                    { field: 'WoNo', title: '生产工单编号', fixed: 'left', width: '190px' },
+                    { field: 'PoNo', title: '采购订单编号' ,fixed: 'left', width: '200px'},
+                    { field: 'PoItemId', title: '采购订单行项目id', width: '190px' },
+                    { field: 'IpoNo', title: '生产订单号', width: '190px' },
+                    { field: 'EntityCode', title: '实物ID ', width: '240px' },
+                ]
+            }
+
+        }
+    }
+)
+// 表格命名
+const gridSltWorkOrder = ref()
+// 选中行
+const sltRow = ref()
+// 查询参数
+// const queryParams: any = ref({
+//     currentPage: 1,
+//     pageSize: 10,
+//     total: 0,
+//     filter: {
+//         "logic": 0,
+//         "filters": []
+//     }
+// })
+// 定义表格A
+const gridOptionsA: any = ref({
+    border: true,
+    height: 650,
+    align: null,
+    columnConfig: {
+        resizable: true
+    },
+    columns: props.columns,
+    toolbarConfig: {
+        perfect: true,
+        refresh: true,
+        zoom: true,
+        custom: true,
+        slots: {
+            // 自定义插槽模板
+            buttons: 'toolbar_buttons'
+        }
+    },
+    //data: [],
+    pagerConfig: {
+        enabled: true,
+        total: 0,
+        currentPage: 1,
+        pageSize: 10,
+        pageSizes: [10, 20, 50, 100]
+    },
+    formConfig: {
+        titleWidth: 160,
+        titleAlign: 'right',
+        items: [
+            { field: 'PoNo', title: '采购订单编号', span: 8, itemRender: { name: '$input', props: { placeholder: '请输入采购订单编号' } } },
+            { field: 'WoNo', title: '生产工单编号', span: 8, itemRender: { name: '$input', props: { placeholder: '请输入生产工单编号' } } },
+            { span: 24, align: 'center', collapseNode: true, itemRender: { name: '$buttons', children: [{ props: { type: 'submit', content: '查询', status: 'primary' } }, { props: { type: 'reset', content: '重置' } }] } }
+        ]
+    },
+    proxyConfig: {
+        seq: true, // 启用动态序号代理，每一页的序号会根据当前页数变化
+        sort: true, // 启用排序代理，当点击排序时会自动触发 query 行为
+        filter: true, // 启用筛选代理，当点击筛选时会自动触发 query 行为
+        form: true, // 启用表单代理，当点击表单提交按钮时会自动触发 reload 行为
+        props: {
+            // 对应响应结果 Promise<{ result: [], page: { total: 100 } }>
+            result: 'List', // 配置响应结果列表字段
+            total: 'Total' // 配置响应结果总页数字段
+        },
+        // 只接收Promise，具体实现自由发挥
+        ajax: {
+            // 当点击工具栏查询按钮或者手动提交指令 query或reload 时会被触发
+            query: async ({ page, sorts, filters, form }: any) => {
+                const queryParams: any = reactive({
+                    currentPage: page.currentPage,
+                    pageSize: page.pageSize,
+                    filter: {
+                        "logic": 0,
+                        "filters": _map(form, (o1: any, k1: any) => {
+                            return {
+                                "field": k1,
+                                "operator": 0,
+                                "value": o1
+                            }
+
+                        })
+                    }
+                })
+                const data = await WorkOrderApi.getProductionWorkOrderPaging(queryParams)
+                return data
+            },
+            // 当点击工具栏删除按钮或者手动提交指令 delete 时会被触发
+            delete: ({ body }: any) => { },
+            // 当点击工具栏保存按钮或者手动提交指令 save 时会被触发
+            save: ({ body }: any) => { },
+            add: ({ body }: any) => {
+                console.log(body)
+            },
+        }
+    }
+})
+// 表格事件
+const gridEventsA: any = {
+    radioChange({ row }: any) {
+        sltRow.value = row
+    }
+}
+// 清除单选
+const clearRadioRow = () => {
+    const $table = gridSltWorkOrder.value
+    if ($table) {
+        sltRow.value = null
+        $table.clearRadioRow()
+    }
+}
+// 是否显示弹框
+const refShow = ref(false)
+
+// 打开弹窗
+const open = async (info: any) => {
+    refShow.value = true
+    clearRadioRow()
+}
+// 提供open方法打开弹窗
+defineExpose({ open })
+// 提交数据
+const fnSubmit = () => {
+    emit('success', sltRow.value)
+    fnCancel()
+}
+// 关闭窗体
+const fnCancel = () => {
+    refShow.value = false
+}
+</script>
+<style scoped></style>
\ No newline at end of file
diff --git a/src/views/Gw/componentInspect/ComponentInspectForm.vue b/src/views/Gw/componentInspect/ComponentInspectForm.vue
index aca8059..e5fe52a 100644
--- a/src/views/Gw/componentInspect/ComponentInspectForm.vue
+++ b/src/views/Gw/componentInspect/ComponentInspectForm.vue
@@ -26,13 +26,13 @@
                         </vxe-form-item> -->
                         <vxe-form-item title="供应商工单编号" field="SupplierWorkNo" span="12">
                             <template #default="params">
-                                <vxe-select v-model="params.data.SupplierWorkNo" clearable filterable @change="fnWoNoChange(params)">
+                                <!-- <vxe-select v-model="params.data.SupplierWorkNo" clearable filterable>
                                     <template v-for="item in dictEipSupplierWoSimpList">
                                         <vxe-option :value="item.WoNo" :label="item.WoNo"></vxe-option>
                                     </template>
-                                </vxe-select>
-                                <!-- <vxe-input v-model="params.data.SupplierWorkNo" placeholder="请输入供应商工单编号" clearable
-                                    @change="fnChangeA(params)"></vxe-input> -->
+                                </vxe-select> -->
+                                <vxe-input v-model="params.data.SupplierWorkNo" placeholder="请输入供应商工单编号" clearable
+                                    @change="fnChangeA(params)" @click="fnSltWorkOrderOpen"></vxe-input>
                             </template>
                         </vxe-form-item>
                         <!-- <vxe-form-item title="国网侧供应商编码" field="SupplierCode" span="12">
@@ -146,7 +146,7 @@
             <vxe-button type="reset" content="取消" @click="fnEventCancel"></vxe-button>
         </template>
     </vxe-modal>
-
+    <SltWorkOrder ref="refSltWorkOrder" @success="fnSltWorkOrder" />
 </template>
 
 <script lang="ts" setup name="ComponentInspectForm">
@@ -159,6 +159,21 @@ import { useDictStore } from '@/stores/dict'
 import { storeToRefs } from 'pinia'
 
 import * as comApi from '@/api/gw/com'
+import SltWorkOrder from '@/views/Gw/com/SltWorkOrder.vue'
+const refSltWorkOrder = ref()
+// 打开供应商信息
+const fnSltWorkOrderOpen = async (info: any) => {
+    refSltWorkOrder.value.open(info)
+}
+// 选择供应商信息
+const fnSltWorkOrder = async (info: any) => {
+    formDataA.value.SupplierWorkNo = info.WoNo
+    dictEipSupplierWoSimpList.value.forEach((item: any) => {
+        if (item.WoNo == formDataA.value.SupplierWorkNo) {
+            formDataA.value.SupplierSupportId = item.FactoryNo;//出厂编号
+        }
+    })
+}
 const dictEipSupplierWoSimpList: any = ref([])
 const fnWoNoChange = (params: any) => {
     if (params.data.SupplierWorkNo) {
diff --git a/src/views/Gw/daoXian/DaoXianForm.vue b/src/views/Gw/daoXian/DaoXianForm.vue
index 86e0184..55f3f03 100644
--- a/src/views/Gw/daoXian/DaoXianForm.vue
+++ b/src/views/Gw/daoXian/DaoXianForm.vue
@@ -26,13 +26,13 @@
                         </vxe-form-item> -->
                         <vxe-form-item title="供应商工单编号" field="SupplierWorkNo" span="12">
                             <template #default="params">
-                                <vxe-select v-model="params.data.SupplierWorkNo" clearable filterable @change="fnWoNoChange(params)">
+                                <!-- <vxe-select v-model="params.data.SupplierWorkNo" clearable filterable>
                                     <template v-for="item in dictEipSupplierWoSimpList">
                                         <vxe-option :value="item.WoNo" :label="item.WoNo"></vxe-option>
                                     </template>
-                                </vxe-select>
-                                <!-- <vxe-input v-model="params.data.SupplierWorkNo" placeholder="请输入供应商工单编号" clearable
-                                    @change="fnChangeA(params)"></vxe-input> -->
+                                </vxe-select> -->
+                                <vxe-input v-model="params.data.SupplierWorkNo" placeholder="请输入供应商工单编号" clearable
+                                    @change="fnChangeA(params)" @click="fnSltWorkOrderOpen"></vxe-input>
                             </template>
                         </vxe-form-item>
                         <!-- <vxe-form-item title="国网侧供应商编码" field="SupplierCode" span="12">
@@ -177,7 +177,7 @@
             <vxe-button type="reset" content="取消" @click="fnEventCancel"></vxe-button>
         </template>
     </vxe-modal>
-
+    <SltWorkOrder ref="refSltWorkOrder" @success="fnSltWorkOrder" />
 </template>
 
 <script lang="ts" setup name="DaoXianForm">
@@ -190,6 +190,22 @@ import { useDictStore } from '@/stores/dict'
 import { storeToRefs } from 'pinia'
 
 import * as comApi from '@/api/gw/com'
+import SltWorkOrder from '@/views/Gw/com/SltWorkOrder.vue'
+
+const refSltWorkOrder = ref()
+// 打开供应商信息
+const fnSltWorkOrderOpen = async (info: any) => {
+    refSltWorkOrder.value.open(info)
+}
+// 选择供应商信息
+const fnSltWorkOrder = async (info: any) => {
+    formDataA.value.SupplierWorkNo = info.WoNo
+    dictEipSupplierWoSimpList.value.forEach((item: any) => {
+        if (item.WoNo == formDataA.value.SupplierWorkNo) {
+            formDataA.value.SupplierSupportId = item.FactoryNo;//出厂编号
+        }
+    })
+}
 const dictEipSupplierWoSimpList: any = ref([])
 const fnWoNoChange = (params: any) => {
     if (params.data.SupplierWorkNo) {
diff --git a/src/views/Gw/dianLiuHuGanQi/DianLiuHuGanQiForm.vue b/src/views/Gw/dianLiuHuGanQi/DianLiuHuGanQiForm.vue
index 5ddc00c..8e416f1 100644
--- a/src/views/Gw/dianLiuHuGanQi/DianLiuHuGanQiForm.vue
+++ b/src/views/Gw/dianLiuHuGanQi/DianLiuHuGanQiForm.vue
@@ -26,13 +26,13 @@
                         </vxe-form-item> -->
                         <vxe-form-item title="供应商工单编号" field="SupplierWorkNo" span="12">
                             <template #default="params">
-                                <vxe-select v-model="params.data.SupplierWorkNo" clearable filterable>
+                                <!-- <vxe-select v-model="params.data.SupplierWorkNo" clearable filterable>
                                     <template v-for="item in dictEipSupplierWoSimpList">
                                         <vxe-option :value="item.WoNo" :label="item.WoNo"></vxe-option>
                                     </template>
-                                </vxe-select>
-                                <!-- <vxe-input v-model="params.data.SupplierWorkNo" placeholder="请输入供应商工单编号" clearable
-                                    @change="fnChangeA(params)"></vxe-input> -->
+                                </vxe-select> -->
+                                <vxe-input v-model="params.data.SupplierWorkNo" placeholder="请输入供应商工单编号" clearable
+                                    @change="fnChangeA(params)" @click="fnSltWorkOrderOpen"></vxe-input>
                             </template>
                         </vxe-form-item>
                         <!-- <vxe-form-item title="国网侧供应商编码" field="SupplierCode" span="12">
@@ -243,6 +243,7 @@
         </template>
     </vxe-modal>
     <SltBaseSupplier ref="refSltBaseSupplierA" @success="fnSltBaseSupplier" />
+    <SltWorkOrder ref="refSltWorkOrder" @success="fnSltWorkOrder" />
 </template>
 
 <script lang="ts" setup name="DianLiuHuGanQiForm">
@@ -259,8 +260,18 @@ import XEUtils from 'xe-utils'
 import * as FileUploadApi from '@/api/gw/fileUpload'
 import * as comApi from '@/api/gw/com'
 import SltBaseSupplier from '@/views/Gw/com/SltBaseSupplier.vue'
+import SltWorkOrder from '@/views/Gw/com/SltWorkOrder.vue'
 // 弹窗（供应商选择）
 const refSltBaseSupplierA = ref()
+const refSltWorkOrder = ref()
+// 打开供应商信息
+const fnSltWorkOrderOpen = async (info: any) => {
+    refSltWorkOrder.value.open(info)
+}
+// 选择供应商信息
+const fnSltWorkOrder = async (info: any) => {
+    formDataA.value.SupplierWorkNo = info.WoNo
+}
 // 字典
 const dictStore = useDictStore()
 const { dictProcessType } = storeToRefs(dictStore)
@@ -510,6 +521,11 @@ const fnDeleteA = async (row: any) => {
 }
 // 提交
 const fnSubmitA = async () => {
+    let fileChecks = JSON.parse(formDataB.value.FileItems)
+    if(fileChecks[0]["fileUrl"].length == 0 || fileChecks[1]["fileUrl"].length == 0){
+        VXETable.modal.message({ content: '请上传检验报告', status: 'warning' })
+        return;
+    }
     await refFormA.value.validate().then(async (res: any) => {
         if (!res) {
             formDataA.value.Sended = 0
diff --git a/src/views/Gw/dianRongQi/DianRongQiForm.vue b/src/views/Gw/dianRongQi/DianRongQiForm.vue
index c886cd0..dc8f5dc 100644
--- a/src/views/Gw/dianRongQi/DianRongQiForm.vue
+++ b/src/views/Gw/dianRongQi/DianRongQiForm.vue
@@ -26,13 +26,13 @@
                         </vxe-form-item> -->
                         <vxe-form-item title="供应商工单编号" field="SupplierWorkNo" span="12">
                             <template #default="params">
-                                <vxe-select v-model="params.data.SupplierWorkNo" clearable filterable>
+                                <!-- <vxe-select v-model="params.data.SupplierWorkNo" clearable filterable>
                                     <template v-for="item in dictEipSupplierWoSimpList">
                                         <vxe-option :value="item.WoNo" :label="item.WoNo"></vxe-option>
                                     </template>
-                                </vxe-select>
-                                <!-- <vxe-input v-model="params.data.SupplierWorkNo" placeholder="请输入供应商工单编号" clearable
-                                    @change="fnChangeA(params)"></vxe-input> -->
+                                </vxe-select> -->
+                                <vxe-input v-model="params.data.SupplierWorkNo" placeholder="请输入供应商工单编号" clearable
+                                    @change="fnChangeA(params)" @click="fnSltWorkOrderOpen"></vxe-input>
                             </template>
                         </vxe-form-item>
                         <!-- <vxe-form-item title="国网侧供应商编码" field="SupplierCode" span="12">
@@ -279,6 +279,7 @@
         </template>
     </vxe-modal>
     <SltBaseSupplier ref="refSltBaseSupplierA" @success="fnSltBaseSupplier" />
+    <SltWorkOrder ref="refSltWorkOrder" @success="fnSltWorkOrder" />
 </template>
 
 <script lang="ts" setup name="DianRongQiForm">
@@ -295,8 +296,18 @@ import XEUtils from 'xe-utils'
 import * as FileUploadApi from '@/api/gw/fileUpload'
 import * as comApi from '@/api/gw/com'
 import SltBaseSupplier from '@/views/Gw/com/SltBaseSupplier.vue'
+import SltWorkOrder from '@/views/Gw/com/SltWorkOrder.vue'
 // 弹窗（供应商选择）
 const refSltBaseSupplierA = ref()
+const refSltWorkOrder = ref()
+// 打开供应商信息
+const fnSltWorkOrderOpen = async (info: any) => {
+    refSltWorkOrder.value.open(info)
+}
+// 选择供应商信息
+const fnSltWorkOrder = async (info: any) => {
+    formDataA.value.SupplierWorkNo = info.WoNo
+}
 // 字典
 const dictStore = useDictStore()
 const { dictProcessType } = storeToRefs(dictStore)
@@ -563,6 +574,11 @@ const fnDeleteA = async (row: any) => {
 }
 // 提交
 const fnSubmitA = async () => {
+    let fileChecks = JSON.parse(formDataB.value.FileItems)
+    if(fileChecks[0]["fileUrl"].length == 0 || fileChecks[1]["fileUrl"].length == 0){
+        VXETable.modal.message({ content: '请上传检验报告', status: 'warning' })
+        return;
+    }
     await refFormA.value.validate().then(async (res: any) => {
         if (!res) {
             formDataA.value.Sended = 0
diff --git a/src/views/Gw/duanLuQi/DuanLuQiForm.vue b/src/views/Gw/duanLuQi/DuanLuQiForm.vue
index 1e1cb71..a98766f 100644
--- a/src/views/Gw/duanLuQi/DuanLuQiForm.vue
+++ b/src/views/Gw/duanLuQi/DuanLuQiForm.vue
@@ -26,13 +26,13 @@
                         </vxe-form-item> -->
                         <vxe-form-item title="供应商工单编号" field="SupplierWorkNo" span="12">
                             <template #default="params">
-                                <vxe-select v-model="params.data.SupplierWorkNo" clearable filterable>
+                                <!-- <vxe-select v-model="params.data.SupplierWorkNo" clearable filterable>
                                     <template v-for="item in dictEipSupplierWoSimpList">
                                         <vxe-option :value="item.WoNo" :label="item.WoNo"></vxe-option>
                                     </template>
-                                </vxe-select>
-                                <!-- <vxe-input v-model="params.data.SupplierWorkNo" placeholder="请输入供应商工单编号" clearable
-                                    @change="fnChangeA(params)"></vxe-input> -->
+                                </vxe-select> -->
+                                <vxe-input v-model="params.data.SupplierWorkNo" placeholder="请输入供应商工单编号" clearable
+                                    @change="fnChangeA(params)" @click="fnSltWorkOrderOpen"></vxe-input>
                             </template>
                         </vxe-form-item>
                         <!-- <vxe-form-item title="国网侧供应商编码" field="SupplierCode" span="12">
@@ -263,6 +263,7 @@
         </template>
     </vxe-modal>
     <SltBaseSupplier ref="refSltBaseSupplierA" @success="fnSltBaseSupplier" />
+    <SltWorkOrder ref="refSltWorkOrder" @success="fnSltWorkOrder" />
 </template>
 
 <script lang="ts" setup name="DuanLuQiForm">
@@ -279,8 +280,18 @@ import XEUtils from 'xe-utils'
 import * as FileUploadApi from '@/api/gw/fileUpload'
 import * as comApi from '@/api/gw/com'
 import SltBaseSupplier from '@/views/Gw/com/SltBaseSupplier.vue'
+import SltWorkOrder from '@/views/Gw/com/SltWorkOrder.vue'
 // 弹窗（供应商选择）
 const refSltBaseSupplierA = ref()
+const refSltWorkOrder = ref()
+// 打开供应商信息
+const fnSltWorkOrderOpen = async (info: any) => {
+    refSltWorkOrder.value.open(info)
+}
+// 选择供应商信息
+const fnSltWorkOrder = async (info: any) => {
+    formDataA.value.SupplierWorkNo = info.WoNo
+}
 // 字典
 const dictStore = useDictStore()
 const { dictProcessType } = storeToRefs(dictStore)
@@ -544,6 +555,11 @@ const fnDeleteA = async (row: any) => {
 }
 // 提交
 const fnSubmitA = async () => {
+    let fileChecks = JSON.parse(formDataB.value.FileItems)
+    if(fileChecks[0]["fileUrl"].length == 0 || fileChecks[1]["fileUrl"].length == 0){
+        VXETable.modal.message({ content: '请上传检验报告', status: 'warning' })
+        return;
+    }
     await refFormA.value.validate().then(async (res: any) => {
         if (!res) {
             formDataA.value.Sended = 0
diff --git a/src/views/Gw/elecDistance/ElecDistanceForm.vue b/src/views/Gw/elecDistance/ElecDistanceForm.vue
index 948fb48..752e4dc 100644
--- a/src/views/Gw/elecDistance/ElecDistanceForm.vue
+++ b/src/views/Gw/elecDistance/ElecDistanceForm.vue
@@ -25,13 +25,13 @@
                         </vxe-form-item> -->
                         <vxe-form-item title="供应商工单编号" field="SupplierWorkNo" span="12">
                             <template #default="params">
-                                <vxe-select v-model="params.data.SupplierWorkNo" clearable filterable @change="fnWoNoChange(params)">
+                                <!-- <vxe-select v-model="params.data.SupplierWorkNo" clearable filterable>
                                     <template v-for="item in dictEipSupplierWoSimpList">
                                         <vxe-option :value="item.WoNo" :label="item.WoNo"></vxe-option>
                                     </template>
-                                </vxe-select>
-                                <!-- <vxe-input v-model="params.data.SupplierWorkNo" placeholder="请输入供应商工单编号" clearable
-                                    @change="fnChangeA(params)"></vxe-input> -->
+                                </vxe-select> -->
+                                <vxe-input v-model="params.data.SupplierWorkNo" placeholder="请输入供应商工单编号" clearable
+                                    @change="fnChangeA(params)" @click="fnSltWorkOrderOpen"></vxe-input>
                             </template>
                         </vxe-form-item>
                         <!-- <vxe-form-item title="国网侧供应商编码" field="SupplierCode" span="12">
@@ -145,6 +145,7 @@
             <vxe-button type="reset" content="取消" @click="fnEventCancel"></vxe-button>
         </template>
     </vxe-modal>
+    <SltWorkOrder ref="refSltWorkOrder" @success="fnSltWorkOrder" />
 </template>
 
 <script lang="ts" setup name="ElecDistanceForm">
@@ -157,6 +158,22 @@ import { useDictStore } from '@/stores/dict'
 import { storeToRefs } from 'pinia'
 
 import * as comApi from '@/api/gw/com'
+import SltWorkOrder from '@/views/Gw/com/SltWorkOrder.vue'
+
+const refSltWorkOrder = ref()
+// 打开供应商信息
+const fnSltWorkOrderOpen = async (info: any) => {
+    refSltWorkOrder.value.open(info)
+}
+// 选择供应商信息
+const fnSltWorkOrder = async (info: any) => {
+    formDataA.value.SupplierWorkNo = info.WoNo
+    dictEipSupplierWoSimpList.value.forEach((item: any) => {
+        if (item.WoNo == formDataA.value.SupplierWorkNo) {
+            formDataA.value.SupplierSupportId = item.FactoryNo;//出厂编号
+        }
+    })
+}
 const dictEipSupplierWoSimpList: any = ref([])
 const fnWoNoChange = (params: any) => {
     if (params.data.SupplierWorkNo) {
diff --git a/src/views/Gw/elecGap/ElecGapForm.vue b/src/views/Gw/elecGap/ElecGapForm.vue
index b691fc1..18294ad 100644
--- a/src/views/Gw/elecGap/ElecGapForm.vue
+++ b/src/views/Gw/elecGap/ElecGapForm.vue
@@ -24,14 +24,14 @@
                         </vxe-form-item> -->
                     <vxe-form-item title="供应商工单编号" field="SupplierWorkNo" span="12">
                         <template #default="params">
-                            <vxe-select v-model="params.data.SupplierWorkNo" clearable filterable @change="fnWoNoChange(params)">
+                                <!-- <vxe-select v-model="params.data.SupplierWorkNo" clearable filterable>
                                     <template v-for="item in dictEipSupplierWoSimpList">
                                         <vxe-option :value="item.WoNo" :label="item.WoNo"></vxe-option>
                                     </template>
-                                </vxe-select>
-                            <!-- <vxe-input v-model="params.data.SupplierWorkNo" placeholder="请输入供应商工单编号" clearable
-                                @change="fnChangeA(params)"></vxe-input> -->
-                        </template>
+                                </vxe-select> -->
+                                <vxe-input v-model="params.data.SupplierWorkNo" placeholder="请输入供应商工单编号" clearable
+                                    @change="fnChangeA(params)" @click="fnSltWorkOrderOpen"></vxe-input>
+                            </template>
                     </vxe-form-item>
                     <!-- <vxe-form-item title="国网侧供应商编码" field="SupplierCode" span="12">
                             <template #default="params">
@@ -142,6 +142,7 @@
             <vxe-button type="reset" content="取消" @click="fnEventCancel"></vxe-button>
         </template>
     </vxe-modal>
+    <SltWorkOrder ref="refSltWorkOrder" @success="fnSltWorkOrder" />
 </template>
 
 <script lang="ts" setup name="ElecGapForm">
@@ -154,6 +155,22 @@ import { useDictStore } from '@/stores/dict'
 import { storeToRefs } from 'pinia'
 
 import * as comApi from '@/api/gw/com'
+import SltWorkOrder from '@/views/Gw/com/SltWorkOrder.vue'
+
+const refSltWorkOrder = ref()
+// 打开供应商信息
+const fnSltWorkOrderOpen = async (info: any) => {
+    refSltWorkOrder.value.open(info)
+}
+// 选择供应商信息
+const fnSltWorkOrder = async (info: any) => {
+    formDataA.value.SupplierWorkNo = info.WoNo
+    dictEipSupplierWoSimpList.value.forEach((item: any) => {
+        if (item.WoNo == formDataA.value.SupplierWorkNo) {
+            formDataA.value.SupplierSupportId = item.FactoryNo;//出厂编号
+        }
+    })
+}
 const dictEipSupplierWoSimpList: any = ref([])
 const fnWoNoChange = (params: any) => {
     if (params.data.SupplierWorkNo) {
diff --git a/src/views/Gw/finishedProductWarehousing/FinishedProductWarehousingForm.vue b/src/views/Gw/finishedProductWarehousing/FinishedProductWarehousingForm.vue
index f12e5c8..b50ca61 100644
--- a/src/views/Gw/finishedProductWarehousing/FinishedProductWarehousingForm.vue
+++ b/src/views/Gw/finishedProductWarehousing/FinishedProductWarehousingForm.vue
@@ -15,14 +15,15 @@
                         </vxe-form-item> -->
                         <vxe-form-item title="供应商工单编号" field="SupplierWorkNo" span="12">
                             <template #default="params">
-                                <vxe-select v-model="params.data.SupplierWorkNo" clearable filterable @change="fnWoNoChange(params)">
+                                <!-- <vxe-select v-model="params.data.SupplierWorkNo" clearable filterable>
                                     <template v-for="item in dictEipSupplierWoSimpList">
                                         <vxe-option :value="item.WoNo" :label="item.WoNo"></vxe-option>
                                     </template>
-                                </vxe-select>
-                                <!-- <vxe-input v-model="params.data.SupplierWorkNo" placeholder="请输入供应商工单编号" clearable
-                                    @change="fnChangeA(params)"></vxe-input> -->
+                                </vxe-select> -->
+                                <vxe-input v-model="params.data.SupplierWorkNo" placeholder="请输入供应商工单编号" clearable
+                                    @change="fnChangeA(params)" @click="fnSltWorkOrderOpen"></vxe-input>
                             </template>
+
                             <!-- <template #default="params">
                                 <vxe-input v-model="params.data.SupplierWorkNo" placeholder="请输入供应商工单编号" clearable
                                     @change="fnChangeA(params)"></vxe-input>
@@ -163,11 +164,12 @@
                 </template>
                 <template #footer>
                     <vxe-button type="submit" status="primary" content="提交"></vxe-button>
-                    <vxe-button type="reset" content="重置"></vxe-button>
+                    <vxe-button type="reset" content="取消" @click="fnEventCancel"></vxe-button>
                 </template>
             </vxe-modal>
         </vxe-form>
     </div>
+    <SltWorkOrder ref="refSltWorkOrder" @success="fnSltWorkOrder" />
 </template>
 
 <script lang="ts" setup name="FinishedProductWarehousingForm">
@@ -180,6 +182,25 @@ import { useDictStore } from '@/stores/dict'
 import { storeToRefs } from 'pinia'
 import * as comApi from '@/api/gw/com'
 
+import SltWorkOrder from '@/views/Gw/com/SltWorkOrder.vue'
+
+const refSltWorkOrder = ref()
+// 打开供应商信息
+const fnSltWorkOrderOpen = async (info: any) => {
+    refSltWorkOrder.value.open(info)
+}
+// 选择供应商信息
+const fnSltWorkOrder = async (info: any) => {
+    formDataA.value.SupplierWorkNo = info.WoNo
+
+    dictEipSupplierWoSimpList.value.forEach((item: any) => {
+        if (item.WoNo == formDataA.value.SupplierWorkNo) {
+            formDataA.value.ProductModel = item.ProductModel;//产品型号
+            formDataA.value.SupplierSupportId = item.FactoryNo;//出厂编号
+        }
+    })
+}
+
 const dictStore = useDictStore()
 const { dictPdCode, dictProcessType } = storeToRefs(dictStore)
 const dictEipSupplierWoSimpList: any = ref([])
@@ -409,5 +430,9 @@ const fnResetA = () => {
         "Sended": 0
     }
 }
+// 关闭窗体
+const fnEventCancel = () => {
+    refShow.value = false
+}
 </script>
 <style scoped></style>
\ No newline at end of file
diff --git a/src/views/Gw/fusedIsolationSwitch/FusedIsolationSwitchForm.vue b/src/views/Gw/fusedIsolationSwitch/FusedIsolationSwitchForm.vue
index 4ff17a8..8afb9fb 100644
--- a/src/views/Gw/fusedIsolationSwitch/FusedIsolationSwitchForm.vue
+++ b/src/views/Gw/fusedIsolationSwitch/FusedIsolationSwitchForm.vue
@@ -26,13 +26,13 @@
                         </vxe-form-item> -->
                         <vxe-form-item title="供应商工单编号" field="SupplierWorkNo" span="12">
                             <template #default="params">
-                                <vxe-select v-model="params.data.SupplierWorkNo" clearable filterable>
+                                <!-- <vxe-select v-model="params.data.SupplierWorkNo" clearable filterable>
                                     <template v-for="item in dictEipSupplierWoSimpList">
                                         <vxe-option :value="item.WoNo" :label="item.WoNo"></vxe-option>
                                     </template>
-                                </vxe-select>
-                                <!-- <vxe-input v-model="params.data.SupplierWorkNo" placeholder="请输入供应商工单编号" clearable
-                                    @change="fnChangeA(params)"></vxe-input> -->
+                                </vxe-select> -->
+                                <vxe-input v-model="params.data.SupplierWorkNo" placeholder="请输入供应商工单编号" clearable
+                                    @change="fnChangeA(params)" @click="fnSltWorkOrderOpen"></vxe-input>
                             </template>
                         </vxe-form-item>
                         <!-- <vxe-form-item title="国网侧供应商编码" field="SupplierCode" span="12">
@@ -263,6 +263,7 @@
         </template>
     </vxe-modal>
     <SltBaseSupplier ref="refSltBaseSupplierA" @success="fnSltBaseSupplier" />
+    <SltWorkOrder ref="refSltWorkOrder" @success="fnSltWorkOrder" />
 </template>
 
 <script lang="ts" setup name="FusedIsolationSwitchForm">
@@ -279,8 +280,18 @@ import XEUtils from 'xe-utils'
 import * as FileUploadApi from '@/api/gw/fileUpload'
 import * as comApi from '@/api/gw/com'
 import SltBaseSupplier from '@/views/Gw/com/SltBaseSupplier.vue'
+import SltWorkOrder from '@/views/Gw/com/SltWorkOrder.vue'
 // 弹窗（供应商选择）
 const refSltBaseSupplierA = ref()
+const refSltWorkOrder = ref()
+// 打开供应商信息
+const fnSltWorkOrderOpen = async (info: any) => {
+    refSltWorkOrder.value.open(info)
+}
+// 选择供应商信息
+const fnSltWorkOrder = async (info: any) => {
+    formDataA.value.SupplierWorkNo = info.WoNo
+}
 // 字典
 const dictStore = useDictStore()
 const { dictProcessType } = storeToRefs(dictStore)
@@ -544,6 +555,11 @@ const fnDeleteA = async (row: any) => {
 }
 // 提交
 const fnSubmitA = async () => {
+    let fileChecks = JSON.parse(formDataB.value.FileItems)
+    if(fileChecks[0]["fileUrl"].length == 0 || fileChecks[1]["fileUrl"].length == 0){
+        VXETable.modal.message({ content: '请上传检验报告', status: 'warning' })
+        return;
+    }
     await refFormA.value.validate().then(async (res: any) => {
         if (!res) {
             formDataA.value.Sended = 0
diff --git a/src/views/Gw/insulationResistance/InsulationResistanceForm.vue b/src/views/Gw/insulationResistance/InsulationResistanceForm.vue
index 0ae77ab..e31bbf4 100644
--- a/src/views/Gw/insulationResistance/InsulationResistanceForm.vue
+++ b/src/views/Gw/insulationResistance/InsulationResistanceForm.vue
@@ -26,13 +26,13 @@
                         </vxe-form-item> -->
                         <vxe-form-item title="供应商工单编号" field="SupplierWorkNo" span="12">
                             <template #default="params">
-                                <vxe-select v-model="params.data.SupplierWorkNo" clearable filterable @change="fnWoNoChange(params)">
+                                <!-- <vxe-select v-model="params.data.SupplierWorkNo" clearable filterable>
                                     <template v-for="item in dictEipSupplierWoSimpList">
                                         <vxe-option :value="item.WoNo" :label="item.WoNo"></vxe-option>
                                     </template>
-                                </vxe-select>
-                                <!-- <vxe-input v-model="params.data.SupplierWorkNo" placeholder="请输入供应商工单编号" clearable
-                                    @change="fnChangeA(params)"></vxe-input> -->
+                                </vxe-select> -->
+                                <vxe-input v-model="params.data.SupplierWorkNo" placeholder="请输入供应商工单编号" clearable
+                                    @change="fnChangeA(params)" @click="fnSltWorkOrderOpen"></vxe-input>
                             </template>
                         </vxe-form-item>
                         <!-- <vxe-form-item title="国网侧供应商编码" field="SupplierCode" span="12">
@@ -160,6 +160,7 @@
             <vxe-button type="reset" content="取消" @click="fnEventCancel"></vxe-button>
         </template>
     </vxe-modal>
+    <SltWorkOrder ref="refSltWorkOrder" @success="fnSltWorkOrder" />
 </template>
 
 <script lang="ts" setup name="InsulationResistanceForm">
@@ -171,6 +172,22 @@ import * as InsulationResistanceApi from '@/api/gw/insulationResistance'
 import { useDictStore } from '@/stores/dict'
 import { storeToRefs } from 'pinia'
 import * as comApi from '@/api/gw/com'
+import SltWorkOrder from '@/views/Gw/com/SltWorkOrder.vue'
+
+const refSltWorkOrder = ref()
+// 打开供应商信息
+const fnSltWorkOrderOpen = async (info: any) => {
+    refSltWorkOrder.value.open(info)
+}
+// 选择供应商信息
+const fnSltWorkOrder = async (info: any) => {
+    formDataA.value.SupplierWorkNo = info.WoNo
+    dictEipSupplierWoSimpList.value.forEach((item: any) => {
+        if (item.WoNo == formDataA.value.SupplierWorkNo) {
+            formDataA.value.SupplierSupportId = item.FactoryNo;//出厂编号
+        }
+    })
+}
 const dictEipSupplierWoSimpList: any = ref([])
 const fnWoNoChange = (params: any) => {
     if (params.data.SupplierWorkNo) {
diff --git a/src/views/Gw/langYongBaoHuQi/LangYongBaoHuQiForm.vue b/src/views/Gw/langYongBaoHuQi/LangYongBaoHuQiForm.vue
index 12f2826..5cf930d 100644
--- a/src/views/Gw/langYongBaoHuQi/LangYongBaoHuQiForm.vue
+++ b/src/views/Gw/langYongBaoHuQi/LangYongBaoHuQiForm.vue
@@ -26,13 +26,13 @@
                         </vxe-form-item> -->
                         <vxe-form-item title="供应商工单编号" field="SupplierWorkNo" span="12">
                             <template #default="params">
-                                <vxe-select v-model="params.data.SupplierWorkNo" clearable filterable>
+                                <!-- <vxe-select v-model="params.data.SupplierWorkNo" clearable filterable>
                                     <template v-for="item in dictEipSupplierWoSimpList">
                                         <vxe-option :value="item.WoNo" :label="item.WoNo"></vxe-option>
                                     </template>
-                                </vxe-select>
-                                <!-- <vxe-input v-model="params.data.SupplierWorkNo" placeholder="请输入供应商工单编号" clearable
-                                    @change="fnChangeA(params)"></vxe-input> -->
+                                </vxe-select> -->
+                                <vxe-input v-model="params.data.SupplierWorkNo" placeholder="请输入供应商工单编号" clearable
+                                    @change="fnChangeA(params)" @click="fnSltWorkOrderOpen"></vxe-input>
                             </template>
                         </vxe-form-item>
                         <!-- <vxe-form-item title="国网侧供应商编码" field="SupplierCode" span="12">
@@ -255,6 +255,7 @@
         </template>
     </vxe-modal>
     <SltBaseSupplier ref="refSltBaseSupplierA" @success="fnSltBaseSupplier" />
+    <SltWorkOrder ref="refSltWorkOrder" @success="fnSltWorkOrder" />
 </template>
 
 <script lang="ts" setup name="LangYongBaoHuQiForm">
@@ -271,8 +272,18 @@ import XEUtils from 'xe-utils'
 import * as FileUploadApi from '@/api/gw/fileUpload'
 import * as comApi from '@/api/gw/com'
 import SltBaseSupplier from '@/views/Gw/com/SltBaseSupplier.vue'
+import SltWorkOrder from '@/views/Gw/com/SltWorkOrder.vue'
 // 弹窗（供应商选择）
 const refSltBaseSupplierA = ref()
+const refSltWorkOrder = ref()
+// 打开供应商信息
+const fnSltWorkOrderOpen = async (info: any) => {
+    refSltWorkOrder.value.open(info)
+}
+// 选择供应商信息
+const fnSltWorkOrder = async (info: any) => {
+    formDataA.value.SupplierWorkNo = info.WoNo
+}
 // 字典
 const dictStore = useDictStore()
 const { dictProcessType } = storeToRefs(dictStore)
@@ -523,6 +534,11 @@ const fnDeleteA = async (row: any) => {
 }
 // 提交
 const fnSubmitA = async () => {
+    let fileChecks = JSON.parse(formDataB.value.FileItems)
+    if(fileChecks[0]["fileUrl"].length == 0 || fileChecks[1]["fileUrl"].length == 0){
+        VXETable.modal.message({ content: '请上传检验报告', status: 'warning' })
+        return;
+    }
     refFormA.value.validate().then(async (res: any) => {
         if (!res) {
             formDataA.value.Sended = 0
diff --git a/src/views/Gw/machineOperation/MachineOperationForm.vue b/src/views/Gw/machineOperation/MachineOperationForm.vue
index 3446029..836156a 100644
--- a/src/views/Gw/machineOperation/MachineOperationForm.vue
+++ b/src/views/Gw/machineOperation/MachineOperationForm.vue
@@ -26,13 +26,13 @@
                         </vxe-form-item> -->
                         <vxe-form-item title="供应商工单编号" field="SupplierWorkNo" span="12">
                             <template #default="params">
-                                <vxe-select v-model="params.data.SupplierWorkNo" clearable filterable @change="fnWoNoChange(params)">
+                                <!-- <vxe-select v-model="params.data.SupplierWorkNo" clearable filterable>
                                     <template v-for="item in dictEipSupplierWoSimpList">
                                         <vxe-option :value="item.WoNo" :label="item.WoNo"></vxe-option>
                                     </template>
-                                </vxe-select>
-                                <!-- <vxe-input v-model="params.data.SupplierWorkNo" placeholder="请输入供应商工单编号" clearable
-                                    @change="fnChangeA(params)"></vxe-input> -->
+                                </vxe-select> -->
+                                <vxe-input v-model="params.data.SupplierWorkNo" placeholder="请输入供应商工单编号" clearable
+                                    @change="fnChangeA(params)" @click="fnSltWorkOrderOpen"></vxe-input>
                             </template>
                         </vxe-form-item>
                         <!-- <vxe-form-item title="国网侧供应商编码" field="SupplierCode" span="12">
@@ -157,6 +157,7 @@
             <vxe-button type="reset" content="取消" @click="fnEventCancel"></vxe-button>
         </template>
     </vxe-modal>
+    <SltWorkOrder ref="refSltWorkOrder" @success="fnSltWorkOrder" />
 </template>
 
 <script lang="ts" setup name="MachineOperationForm">
@@ -168,6 +169,22 @@ import * as MachineOperationApi from '@/api/gw/machineOperation'
 import { useDictStore } from '@/stores/dict'
 import { storeToRefs } from 'pinia'
 import * as comApi from '@/api/gw/com'
+import SltWorkOrder from '@/views/Gw/com/SltWorkOrder.vue'
+
+const refSltWorkOrder = ref()
+// 打开供应商信息
+const fnSltWorkOrderOpen = async (info: any) => {
+    refSltWorkOrder.value.open(info)
+}
+// 选择供应商信息
+const fnSltWorkOrder = async (info: any) => {
+    formDataA.value.SupplierWorkNo = info.WoNo
+    dictEipSupplierWoSimpList.value.forEach((item: any) => {
+        if (item.WoNo == formDataA.value.SupplierWorkNo) {
+            formDataA.value.SupplierSupportId = item.FactoryNo;//出厂编号
+        }
+    })
+}
 const dictEipSupplierWoSimpList: any = ref([])
 const fnWoNoChange = (params: any) => {
     if (params.data.SupplierWorkNo) {
diff --git a/src/views/Gw/muPai/MuPaiForm.vue b/src/views/Gw/muPai/MuPaiForm.vue
index 5f1ebe4..3cabe49 100644
--- a/src/views/Gw/muPai/MuPaiForm.vue
+++ b/src/views/Gw/muPai/MuPaiForm.vue
@@ -26,11 +26,13 @@
                         </vxe-form-item> -->
                         <vxe-form-item title="供应商工单编号" field="SupplierWorkNo" span="12">
                             <template #default="params">
-                                <vxe-select v-model="params.data.SupplierWorkNo" clearable filterable>
+                                <!-- <vxe-select v-model="params.data.SupplierWorkNo" clearable filterable>
                                     <template v-for="item in dictEipSupplierWoSimpList">
                                         <vxe-option :value="item.WoNo" :label="item.WoNo"></vxe-option>
                                     </template>
-                                </vxe-select>
+                                </vxe-select> -->
+                                <vxe-input v-model="params.data.SupplierWorkNo" placeholder="请输入供应商工单编号" clearable
+                                    @change="fnChangeA(params)" @click="fnSltWorkOrderOpen"></vxe-input>
                             </template>
                         </vxe-form-item>
                         <!-- <vxe-form-item title="国网侧供应商编码" field="SupplierCode" span="12">
@@ -259,6 +261,7 @@
         </template>
     </vxe-modal>
     <SltBaseSupplier ref="refSltBaseSupplierA" @success="fnSltBaseSupplier" />
+    <SltWorkOrder ref="refSltWorkOrder" @success="fnSltWorkOrder" />
 </template>
 
 <script lang="ts" setup name="MuPaiForm">
@@ -275,8 +278,18 @@ import XEUtils from 'xe-utils'
 import * as FileUploadApi from '@/api/gw/fileUpload'
 import * as comApi from '@/api/gw/com'
 import SltBaseSupplier from '@/views/Gw/com/SltBaseSupplier.vue'
+import SltWorkOrder from '@/views/Gw/com/SltWorkOrder.vue'
 // 弹窗（供应商选择）
 const refSltBaseSupplierA = ref()
+const refSltWorkOrder = ref()
+// 打开供应商信息
+const fnSltWorkOrderOpen = async (info: any) => {
+    refSltWorkOrder.value.open(info)
+}
+// 选择供应商信息
+const fnSltWorkOrder = async (info: any) => {
+    formDataA.value.SupplierWorkNo = info.WoNo
+}
 // 字典
 const dictStore = useDictStore()
 const { dictProcessType } = storeToRefs(dictStore)
@@ -549,6 +562,11 @@ const fnDeleteA = async (row: any) => {
 }
 // 提交
 const fnSubmitA = async () => {
+    let fileChecks = JSON.parse(formDataB.value.FileItems)
+    if(fileChecks[0]["fileUrl"].length == 0 || fileChecks[1]["fileUrl"].length == 0){
+        VXETable.modal.message({ content: '请上传检验报告', status: 'warning' })
+        return;
+    }
     await refFormA.value.validate().then(async (res: any) => {
         if (!res) {
             formDataA.value.Sended = 0
diff --git a/src/views/Gw/phaseLossProtectionTesting/PhaseLossProtectionTestingForm.vue b/src/views/Gw/phaseLossProtectionTesting/PhaseLossProtectionTestingForm.vue
index e2f34db..aa6ad91 100644
--- a/src/views/Gw/phaseLossProtectionTesting/PhaseLossProtectionTestingForm.vue
+++ b/src/views/Gw/phaseLossProtectionTesting/PhaseLossProtectionTestingForm.vue
@@ -26,13 +26,13 @@
                         </vxe-form-item> -->
                         <vxe-form-item title="供应商工单编号" field="SupplierWorkNo" span="12">
                             <template #default="params">
-                                <vxe-select v-model="params.data.SupplierWorkNo" clearable filterable @change="fnWoNoChange(params)">
+                                <!-- <vxe-select v-model="params.data.SupplierWorkNo" clearable filterable>
                                     <template v-for="item in dictEipSupplierWoSimpList">
                                         <vxe-option :value="item.WoNo" :label="item.WoNo"></vxe-option>
                                     </template>
-                                </vxe-select>
-                                <!-- <vxe-input v-model="params.data.SupplierWorkNo" placeholder="请输入供应商工单编号" clearable
-                                    @change="fnChangeA(params)"></vxe-input> -->
+                                </vxe-select> -->
+                                <vxe-input v-model="params.data.SupplierWorkNo" placeholder="请输入供应商工单编号" clearable
+                                    @change="fnChangeA(params)" @click="fnSltWorkOrderOpen"></vxe-input>
                             </template>
                         </vxe-form-item>
                         <!-- <vxe-form-item title="国网侧供应商编码" field="SupplierCode" span="12">
@@ -157,6 +157,7 @@
             <vxe-button type="reset" content="取消" @click="fnEventCancel"></vxe-button>
         </template>
     </vxe-modal>
+    <SltWorkOrder ref="refSltWorkOrder" @success="fnSltWorkOrder" />
 </template>
 
 <script lang="ts" setup name="PhaseLossProtectionTestingForm">
@@ -169,6 +170,22 @@ import { useDictStore } from '@/stores/dict'
 import { storeToRefs } from 'pinia'
 
 import * as comApi from '@/api/gw/com'
+import SltWorkOrder from '@/views/Gw/com/SltWorkOrder.vue'
+
+const refSltWorkOrder = ref()
+// 打开供应商信息
+const fnSltWorkOrderOpen = async (info: any) => {
+    refSltWorkOrder.value.open(info)
+}
+// 选择供应商信息
+const fnSltWorkOrder = async (info: any) => {
+    formDataA.value.SupplierWorkNo = info.WoNo
+    dictEipSupplierWoSimpList.value.forEach((item: any) => {
+        if (item.WoNo == formDataA.value.SupplierWorkNo) {
+            formDataA.value.SupplierSupportId = item.FactoryNo;//出厂编号
+        }
+    })
+}
 const dictEipSupplierWoSimpList: any = ref([])
 const fnWoNoChange = (params: any) => {
     if (params.data.SupplierWorkNo) {
diff --git a/src/views/Gw/powerFrequancyTesting/PowerFrequancyTestingForm.vue b/src/views/Gw/powerFrequancyTesting/PowerFrequancyTestingForm.vue
index 1476798..733cf5c 100644
--- a/src/views/Gw/powerFrequancyTesting/PowerFrequancyTestingForm.vue
+++ b/src/views/Gw/powerFrequancyTesting/PowerFrequancyTestingForm.vue
@@ -26,13 +26,13 @@
                         </vxe-form-item> -->
                         <vxe-form-item title="供应商工单编号" field="SupplierWorkNo" span="12">
                             <template #default="params">
-                                <vxe-select v-model="params.data.SupplierWorkNo" clearable filterable @change="fnWoNoChange(params)">
+                                <!-- <vxe-select v-model="params.data.SupplierWorkNo" clearable filterable>
                                     <template v-for="item in dictEipSupplierWoSimpList">
                                         <vxe-option :value="item.WoNo" :label="item.WoNo"></vxe-option>
                                     </template>
-                                </vxe-select>
-                                <!-- <vxe-input v-model="params.data.SupplierWorkNo" placeholder="请输入供应商工单编号" clearable
-                                    @change="fnChangeA(params)"></vxe-input> -->
+                                </vxe-select> -->
+                                <vxe-input v-model="params.data.SupplierWorkNo" placeholder="请输入供应商工单编号" clearable
+                                    @change="fnChangeA(params)" @click="fnSltWorkOrderOpen"></vxe-input>
                             </template>
                         </vxe-form-item>
                         <!-- <vxe-form-item title="国网侧供应商编码" field="SupplierCode" span="12">
@@ -209,6 +209,7 @@
             <vxe-button type="reset" content="取消" @click="fnEventCancel"></vxe-button>
         </template>
     </vxe-modal>
+    <SltWorkOrder ref="refSltWorkOrder" @success="fnSltWorkOrder" />
 </template>
 
 <script lang="ts" setup name="PowerFrequancyTestingForm">
@@ -221,6 +222,22 @@ import { useDictStore } from '@/stores/dict'
 import { storeToRefs } from 'pinia'
 
 import * as comApi from '@/api/gw/com'
+import SltWorkOrder from '@/views/Gw/com/SltWorkOrder.vue'
+
+const refSltWorkOrder = ref()
+// 打开供应商信息
+const fnSltWorkOrderOpen = async (info: any) => {
+    refSltWorkOrder.value.open(info)
+}
+// 选择供应商信息
+const fnSltWorkOrder = async (info: any) => {
+    formDataA.value.SupplierWorkNo = info.WoNo
+    dictEipSupplierWoSimpList.value.forEach((item: any) => {
+        if (item.WoNo == formDataA.value.SupplierWorkNo) {
+            formDataA.value.SupplierSupportId = item.FactoryNo;//出厂编号
+        }
+    })
+}
 const dictEipSupplierWoSimpList: any = ref([])
 const fnWoNoChange = (params: any) => {
     if (params.data.SupplierWorkNo) {
@@ -253,7 +270,7 @@ const formDataAInit: any = {
     SupplierCode: "1000032215",
     ModelCode: "dtb00003",
     CategoryType: "90003",
-    EquipmentUniqueCode: '',
+    EquipmentUniqueCode: 'ID16107BC',
     FactoryCode: '01',
     SupplierSupportId: '',
     PdCode: "GX000092",
diff --git a/src/views/Gw/powerOperationTesting/PowerOperationTestingForm.vue b/src/views/Gw/powerOperationTesting/PowerOperationTestingForm.vue
index 18ec5fa..caf1db8 100644
--- a/src/views/Gw/powerOperationTesting/PowerOperationTestingForm.vue
+++ b/src/views/Gw/powerOperationTesting/PowerOperationTestingForm.vue
@@ -26,13 +26,13 @@
                         </vxe-form-item> -->
                         <vxe-form-item title="供应商工单编号" field="SupplierWorkNo" span="12">
                             <template #default="params">
-                                <vxe-select v-model="params.data.SupplierWorkNo" clearable filterable @change="fnWoNoChange(params)">
+                                <!-- <vxe-select v-model="params.data.SupplierWorkNo" clearable filterable>
                                     <template v-for="item in dictEipSupplierWoSimpList">
                                         <vxe-option :value="item.WoNo" :label="item.WoNo"></vxe-option>
                                     </template>
-                                </vxe-select>
-                                <!-- <vxe-input v-model="params.data.SupplierWorkNo" placeholder="请输入供应商工单编号" clearable
-                                    @change="fnChangeA(params)"></vxe-input> -->
+                                </vxe-select> -->
+                                <vxe-input v-model="params.data.SupplierWorkNo" placeholder="请输入供应商工单编号" clearable
+                                    @change="fnChangeA(params)" @click="fnSltWorkOrderOpen"></vxe-input>
                             </template>
                         </vxe-form-item>
                         <!-- <vxe-form-item title="国网侧供应商编码" field="SupplierCode" span="12">
@@ -157,6 +157,7 @@
             <vxe-button type="reset" content="取消" @click="fnEventCancel"></vxe-button>
         </template>
     </vxe-modal>
+    <SltWorkOrder ref="refSltWorkOrder" @success="fnSltWorkOrder" />
 </template>
 
 <script lang="ts" setup name="PowerOperationTestingForm">
@@ -169,6 +170,22 @@ import { useDictStore } from '@/stores/dict'
 import { storeToRefs } from 'pinia'
 
 import * as comApi from '@/api/gw/com'
+import SltWorkOrder from '@/views/Gw/com/SltWorkOrder.vue'
+
+const refSltWorkOrder = ref()
+// 打开供应商信息
+const fnSltWorkOrderOpen = async (info: any) => {
+    refSltWorkOrder.value.open(info)
+}
+// 选择供应商信息
+const fnSltWorkOrder = async (info: any) => {
+    formDataA.value.SupplierWorkNo = info.WoNo
+    dictEipSupplierWoSimpList.value.forEach((item: any) => {
+        if (item.WoNo == formDataA.value.SupplierWorkNo) {
+            formDataA.value.SupplierSupportId = item.FactoryNo;//出厂编号
+        }
+    })
+}
 const dictEipSupplierWoSimpList: any = ref([])
 const fnWoNoChange = (params: any) => {
     if (params.data.SupplierWorkNo) {
diff --git a/src/views/Gw/productionOrder/ProductionOrder.vue b/src/views/Gw/productionOrder/ProductionOrder.vue
index 196ffc4..a36a4e5 100644
--- a/src/views/Gw/productionOrder/ProductionOrder.vue
+++ b/src/views/Gw/productionOrder/ProductionOrder.vue
@@ -55,19 +55,21 @@ const gridOptionsA: any = reactive({
         // { field: 'IpoType', title: '订单类型', sortable: true, width: '160px', fixed: 'left' },
         // { field: 'SupplierCode', title: '供应商编码', sortable: true, width: '160px' },
         // { field: 'SupplierName', title: '供应商名称', width: '220px' },
-        { field: 'BuyerName', title: '采购方公司名称', fixed: 'left'},
-        { field: 'Amount', title: '采购数量', fixed: 'left'},
-        { field: 'PoItemId', title: '采购订单行项目id', fixed: 'left' },
-        { field: 'IpoNo', title: '生产订单号', fixed: 'left' },
-        { field: 'PlanStartDate', title: '计划开始日期',formatter:formatTime},
-        { field: 'PlanFinishDate', title: '计划完成日期' ,formatter:formatTime},
+        { field: 'BuyerName', title: '采购方公司名称', fixed: 'left',width: '200px'},
+        { field: 'Amount', title: '采购数量', fixed: 'left',width: '100px'},
+        { field: 'IpoNo', title: '生产订单号', fixed: 'left' ,width: '200px'},
+        { field: 'PoNo', title: '采购订单编号' ,fixed: 'left' ,width: '200px'},
+        { field: 'PoItemId', title: '采购订单行项目id',width: '200px'},
+        { field: 'SoNo', title: '销售订单号', width: '200px'},
+        { field: 'PlanStartDate', title: '计划开始日期',formatter:formatTime,width: '200px'},
+        { field: 'PlanFinishDate', title: '计划完成日期' ,formatter:formatTime,width: '200px'},
         // { field: 'ActualStartDate', title: '实际开始日期' ,formatter:formatTime},
         // { field: 'ActualFinishDate', title: '实际完成日期' ,formatter:formatTime},
 
-        { field: 'MaterialCode', title: '物料编码' },
-        { field: 'MaterialName', title: '物料名称' },
-        { field: 'MaterialUnit', title: '物料单位' },
-        { field: 'MaterialDesc', title: '物料描述' },
+        { field: 'MaterialCode', title: '物料编码' ,width: '200px'},
+        { field: 'MaterialName', title: '物料名称' ,width: '200px'},
+        { field: 'MaterialUnit', title: '物料单位',width: '200px' },
+        { field: 'MaterialDesc', title: '物料描述',width: '200px' },
 
         // { field: 'PlantName', title: '生产工厂名称', sortable: true, width: '160px' },
         // { field: 'WorkshopName', title: '生产车间名称 ', sortable: true, width: '160px' },
@@ -95,11 +97,14 @@ const gridOptionsA: any = reactive({
         titleAlign: 'right',
         items: [
             { field: 'BuyerName', title: '采购方公司名称', span: 8, itemRender: { name: '$input', props: { placeholder: '请输入采购方公司名称' } } },
-            { field: 'PoItemId', title: '采购订单行项目id', span: 8, itemRender: { name: '$input', props: { placeholder: '请输入采购订单行项目id' } } },
+            { field: 'PoNo', title: '采购订单编号', span: 8, itemRender: { name: '$input', props: { placeholder: '请输入采购订单编号' } } },
             { field: 'IpoNo', title: '生产订单号', span: 8, itemRender: { name: '$input', props: { placeholder: '请输入生产订单号' } } },
+            { field: 'SoNo', title: '销售订单号', span: 8, folding: true,itemRender: { name: '$input', props: { placeholder: '请输入销售订单号' } } },
+            { field: 'PoItemId', title: '采购订单行项目id', span: 8,folding: true, itemRender: { name: '$input', props: { placeholder: '请输入采购订单行项目id' } } },
+            
             { field: 'MaterialCode', title: '物料编码', span: 8, folding: true,itemRender: { name: '$input', props: { placeholder: '请输入物料编码' } } },
             { field: 'MaterialName', title: '物料名称', span: 8, folding: true,itemRender: { name: '$input', props: { placeholder: '请输入物料名称' } } },
-            { span: 24, align: 'Center', collapseNode: true, itemRender: { name: '$buttons', children: [{ props: { type: 'submit', content: '查询', status: 'primary' } }, { props: { type: 'reset', content: '重置' } }] } }
+            { span: 24, align: 'center', collapseNode: true, itemRender: { name: '$buttons', children: [{ props: { type: 'submit', content: '查询', status: 'primary' } }, { props: { type: 'reset', content: '重置' } }] } }
         ]
     },
     toolbarConfig: {
diff --git a/src/views/Gw/productionWorkOrder/ProductionWorkOrder.vue b/src/views/Gw/productionWorkOrder/ProductionWorkOrder.vue
index 1c57716..f6004fd 100644
--- a/src/views/Gw/productionWorkOrder/ProductionWorkOrder.vue
+++ b/src/views/Gw/productionWorkOrder/ProductionWorkOrder.vue
@@ -53,14 +53,13 @@ const xGrid = ref()
 const gridOptionsA: any = reactive({
     columns: [
         { field: 'BuyerName', title: '采购方公司名称', fixed: 'left', width: '190px' },
+        { field: 'Amount', title: '生产数量', fixed: 'left', width: '100px' },
         { field: 'WoNo', title: '生产工单编码', fixed: 'left', width: '190px' },
-        { field: 'Amount', title: '生产数量', fixed: 'left', width: '190px' },
+        { field: 'PoNo', title: '采购订单编号' ,fixed: 'left', width: '200px'},
         { field: 'PoItemId', title: '采购订单行项目id', width: '190px' },
         { field: 'IpoNo', title: '生产订单号', width: '190px' },
-
         { field: 'EntityCode', title: '实物ID ', width: '240px' },
         { field: 'FactoryNo', title: '出厂编号 ', width: '240px' },
-
         { field: 'MaterialsCode', title: '厂家物料编码', width: '160px' },
         { field: 'MaterialsDesc', title: '厂家物料描述', width: '160px' },
         { field: 'Unit', title: '计量单位', width: '160px' },
@@ -94,7 +93,9 @@ const gridOptionsA: any = reactive({
             // { field: 'buyerCode', title: '采购方公司编码', span: 8, itemRender: { name: '$input', props: { placeholder: '请输入采购方公司编码' } } },
             { field: 'buyerName', title: '采购方公司名称', span: 8, itemRender: { name: '$input', props: { placeholder: '请输入采购方公司名称' } } },
             { field: 'WoNo', title: '生产工单编号', span: 8, itemRender: { name: '$input', props: { placeholder: '请输入生产工单编号' } } },
-            { field: 'PoItemId', title: '采购订单行项目id', span: 8, itemRender: { name: '$input', props: { placeholder: '请输入采购订单行项目id' } } },
+            { field: 'PoNo', title: '采购订单编号', span: 8, itemRender: { name: '$input', props: { placeholder: '请输入采购订单编号' } } },
+            { field: 'IpoNo', title: '生产订单编号', span: 8, folding: true,itemRender: { name: '$input', props: { placeholder: '请输入生产订单编号' } } },
+            { field: 'PoItemId', title: '采购订单行项目id', span: 8, folding: true,itemRender: { name: '$input', props: { placeholder: '请输入采购订单行项目id' } } },
             { span: 24, align: 'center', collapseNode: true, itemRender: { name: '$buttons', children: [{ props: { type: 'submit', content: '查询', status: 'primary' } }, { props: { type: 'reset', content: '重置' } }] } }
         ]
     },
diff --git a/src/views/Gw/protectionCircuit/ProtectionCircuitForm.vue b/src/views/Gw/protectionCircuit/ProtectionCircuitForm.vue
index 451ba31..d3b3278 100644
--- a/src/views/Gw/protectionCircuit/ProtectionCircuitForm.vue
+++ b/src/views/Gw/protectionCircuit/ProtectionCircuitForm.vue
@@ -26,13 +26,13 @@
                         </vxe-form-item> -->
                         <vxe-form-item title="供应商工单编号" field="SupplierWorkNo" span="12">
                             <template #default="params">
-                                <vxe-select v-model="params.data.SupplierWorkNo" clearable filterable @change="fnWoNoChange(params)">
+                                <!-- <vxe-select v-model="params.data.SupplierWorkNo" clearable filterable>
                                     <template v-for="item in dictEipSupplierWoSimpList">
                                         <vxe-option :value="item.WoNo" :label="item.WoNo"></vxe-option>
                                     </template>
-                                </vxe-select>
-                                <!-- <vxe-input v-model="params.data.SupplierWorkNo" placeholder="请输入供应商工单编号" clearable
-                                    @change="fnChangeA(params)"></vxe-input> -->
+                                </vxe-select> -->
+                                <vxe-input v-model="params.data.SupplierWorkNo" placeholder="请输入供应商工单编号" clearable
+                                    @change="fnChangeA(params)" @click="fnSltWorkOrderOpen"></vxe-input>
                             </template>
                         </vxe-form-item>
                         <!-- <vxe-form-item title="国网侧供应商编码" field="SupplierCode" span="12">
@@ -285,7 +285,7 @@
             <vxe-button type="reset" content="取消" @click="fnEventCancel"></vxe-button>
         </template>
     </vxe-modal>
-
+    <SltWorkOrder ref="refSltWorkOrder" @success="fnSltWorkOrder" />
 </template>
 
 <script lang="ts" setup name="ProtectionCircuitForm">
@@ -297,6 +297,22 @@ import * as ProtectionCircuitApi from '@/api/gw/protectionCircuit'
 import { useDictStore } from '@/stores/dict'
 import { storeToRefs } from 'pinia'
 import * as comApi from '@/api/gw/com'
+import SltWorkOrder from '@/views/Gw/com/SltWorkOrder.vue'
+
+const refSltWorkOrder = ref()
+// 打开供应商信息
+const fnSltWorkOrderOpen = async (info: any) => {
+    refSltWorkOrder.value.open(info)
+}
+// 选择供应商信息
+const fnSltWorkOrder = async (info: any) => {
+    formDataA.value.SupplierWorkNo = info.WoNo
+    dictEipSupplierWoSimpList.value.forEach((item: any) => {
+        if (item.WoNo == formDataA.value.SupplierWorkNo) {
+            formDataA.value.SupplierSupportId = item.FactoryNo;//出厂编号
+        }
+    })
+}
 const dictEipSupplierWoSimpList: any = ref([])
 const fnWoNoChange = (params: any) => {
     if (params.data.SupplierWorkNo) {
@@ -329,7 +345,7 @@ const formDataAInit: any = {
     SupplierCode: "1000032215",
     ModelCode: "dtb00003",
     CategoryType: "90003",
-    EquipmentUniqueCode: '',
+    EquipmentUniqueCode: 'ID16113BC',
     FactoryCode: '01',
     SupplierSupportId: '',
     PdCode: "GX000087",
diff --git a/src/views/Gw/saleOrder/SaleOrder.vue b/src/views/Gw/saleOrder/SaleOrder.vue
index 4ddd3cd..cffda05 100644
--- a/src/views/Gw/saleOrder/SaleOrder.vue
+++ b/src/views/Gw/saleOrder/SaleOrder.vue
@@ -48,12 +48,14 @@ const xGrid = ref()
 
 const gridOptionsA: any = reactive({
     columns: [
-        { field: 'BuyerName', title: '采购方公司名称', fixed: 'left'},
-        { field: 'ProductAmount', title: '采购数量', fixed: 'left'},
-        { field: 'SoNo', title: '销售订单号', fixed: 'left' },
-        { field: 'ProductCode', title: '物料编码'},
-        { field: 'ProductName', title: '物料名称'},
-        { field: 'ProductUnit', title: '物料单位'},
+        { field: 'BuyerName', title: '采购方公司名称', fixed: 'left',width: '200px'},
+        { field: 'ProductAmount', title: '采购数量', fixed: 'left',width: '100px'},
+        { field: 'SoNo', title: '销售订单编号', fixed: 'left',width: '200px' },
+        { field: 'PoNo', title: '采购订单编号' ,fixed: 'left',width: '200px'},
+        { field: 'PoItemId', title: '采购订单行项目id',width: '200px'},
+        { field: 'ProductCode', title: '物料编码',width: '200px'},
+        { field: 'ProductName', title: '物料名称',width: '200px'},
+        { field: 'ProductUnit', title: '物料单位',width: '200px'},
         // { field: 'PurchaserHqCode', title: '采购方总部编码', width: '120px', fixed: 'left' },
         // { field: 'SupplierCode', title: '供应商编码', sortable: true, width: '160px' },
         // { field: 'BuyerCode', title: '采购方公司编码', width: '160px' },
@@ -82,8 +84,10 @@ const gridOptionsA: any = reactive({
         items: [
             { field: 'BuyerName', title: '采购方公司名称', span: 8, itemRender: { name: '$input', props: { placeholder: '请输入采购方公司名称' } } },
             // { field: 'PurchaserHqCode', title: '采购方总部编码', span: 8, itemRender: { name: '$input', props: { placeholder: '请输入采购方总部编码' } } },
+            { field: 'PoNo', title: '采购订单编号', span: 8, itemRender: { name: '$input', props: { placeholder: '请输入采购订单编号' } } },
             { field: 'SoNo', title: '销售订单号', span: 8, itemRender: { name: '$input', props: { placeholder: '请输入销售订单号' } } },
-            { field: 'ProductCode', title: '物料编码', span: 8, itemRender: { name: '$input', props: { placeholder: '请输入物料编码' } } },
+            { field: 'PoItemId', title: '采购订单行项目id', span: 8,folding: true, itemRender: { name: '$input', props: { placeholder: '请输入采购订单行项目id' } } },
+            { field: 'ProductCode', title: '物料编码',folding: true, span: 8, itemRender: { name: '$input', props: { placeholder: '请输入物料编码' } } },
             // { field: 'BuyerCode', title: '采购方公司编码', span: 8, itemRender: { name: '$input', props: { placeholder: '请输入采购方公司编码' } } },
             { span: 24, align: 'center', collapseNode: true, itemRender: { name: '$buttons', children: [{ props: { type: 'submit', content: '查询', status: 'primary' } }, { props: { type: 'reset', content: '重置' } }] } }
         ]
diff --git a/src/views/Gw/shengYuDianLiuDongZuoBaoHu/ShengYuDianLiuDongZuoBaoHuForm.vue b/src/views/Gw/shengYuDianLiuDongZuoBaoHu/ShengYuDianLiuDongZuoBaoHuForm.vue
index d6ceda0..5a635d4 100644
--- a/src/views/Gw/shengYuDianLiuDongZuoBaoHu/ShengYuDianLiuDongZuoBaoHuForm.vue
+++ b/src/views/Gw/shengYuDianLiuDongZuoBaoHu/ShengYuDianLiuDongZuoBaoHuForm.vue
@@ -26,13 +26,13 @@
                         </vxe-form-item> -->
                         <vxe-form-item title="供应商工单编号" field="SupplierWorkNo" span="12">
                             <template #default="params">
-                                <vxe-select v-model="params.data.SupplierWorkNo" clearable filterable>
+                                <!-- <vxe-select v-model="params.data.SupplierWorkNo" clearable filterable>
                                     <template v-for="item in dictEipSupplierWoSimpList">
                                         <vxe-option :value="item.WoNo" :label="item.WoNo"></vxe-option>
                                     </template>
-                                </vxe-select>
-                                <!-- <vxe-input v-model="params.data.SupplierWorkNo" placeholder="请输入供应商工单编号" clearable
-                                    @change="fnChangeA(params)"></vxe-input> -->
+                                </vxe-select> -->
+                                <vxe-input v-model="params.data.SupplierWorkNo" placeholder="请输入供应商工单编号" clearable
+                                    @change="fnChangeA(params)" @click="fnSltWorkOrderOpen"></vxe-input>
                             </template>
                         </vxe-form-item>
                         <!-- <vxe-form-item title="国网侧供应商编码" field="SupplierCode" span="12">
@@ -269,6 +269,7 @@
         </template>
     </vxe-modal>
     <SltBaseSupplier ref="refSltBaseSupplierA" @success="fnSltBaseSupplier" />
+    <SltWorkOrder ref="refSltWorkOrder" @success="fnSltWorkOrder" />
 </template>
 
 <script lang="ts" setup name="ShengYuDianLiuDongZuoBaoHuForm">
@@ -285,8 +286,18 @@ import XEUtils from 'xe-utils'
 import * as FileUploadApi from '@/api/gw/fileUpload'
 import * as comApi from '@/api/gw/com'
 import SltBaseSupplier from '@/views/Gw/com/SltBaseSupplier.vue'
+import SltWorkOrder from '@/views/Gw/com/SltWorkOrder.vue'
 // 弹窗（供应商选择）
 const refSltBaseSupplierA = ref()
+const refSltWorkOrder = ref()
+// 打开供应商信息
+const fnSltWorkOrderOpen = async (info: any) => {
+    refSltWorkOrder.value.open(info)
+}
+// 选择供应商信息
+const fnSltWorkOrder = async (info: any) => {
+    formDataA.value.SupplierWorkNo = info.WoNo
+}
 // 字典
 const dictStore = useDictStore()
 const { dictProcessType } = storeToRefs(dictStore)
@@ -556,6 +567,11 @@ const fnDeleteA = async (row: any) => {
 }
 // 提交
 const fnSubmitA = async () => {
+    let fileChecks = JSON.parse(formDataB.value.FileItems)
+    if(fileChecks[0]["fileUrl"].length == 0 || fileChecks[1]["fileUrl"].length == 0){
+        VXETable.modal.message({ content: '请上传检验报告', status: 'warning' })
+        return;
+    }
     await refFormA.value.validate().then(async (res: any) => {
         if (!res) {
             formDataA.value.Sended = 0
diff --git a/src/views/Gw/voltageProtection/VoltageProtectionForm.vue b/src/views/Gw/voltageProtection/VoltageProtectionForm.vue
index f27e070..c2df032 100644
--- a/src/views/Gw/voltageProtection/VoltageProtectionForm.vue
+++ b/src/views/Gw/voltageProtection/VoltageProtectionForm.vue
@@ -26,14 +26,15 @@
                         </vxe-form-item> -->
                         <vxe-form-item title="供应商工单编号" field="SupplierWorkNo" span="12">
                             <template #default="params">
-                                <vxe-select v-model="params.data.SupplierWorkNo" clearable filterable @change="fnWoNoChange(params)">
+                                <!-- <vxe-select v-model="params.data.SupplierWorkNo" clearable filterable>
                                     <template v-for="item in dictEipSupplierWoSimpList">
                                         <vxe-option :value="item.WoNo" :label="item.WoNo"></vxe-option>
                                     </template>
-                                </vxe-select>
-                                <!-- <vxe-input v-model="params.data.SupplierWorkNo" placeholder="请输入供应商工单编号" clearable
-                                    @change="fnChangeA(params)"></vxe-input> -->
+                                </vxe-select> -->
+                                <vxe-input v-model="params.data.SupplierWorkNo" placeholder="请输入供应商工单编号" clearable
+                                    @change="fnChangeA(params)" @click="fnSltWorkOrderOpen"></vxe-input>
                             </template>
+
                         </vxe-form-item>
                         <!-- <vxe-form-item title="国网侧供应商编码" field="SupplierCode" span="12">
                             <template #default="params">
@@ -157,6 +158,7 @@
             <vxe-button type="reset" content="取消" @click="fnEventCancel"></vxe-button>
         </template>
     </vxe-modal>
+    <SltWorkOrder ref="refSltWorkOrder" @success="fnSltWorkOrder" />
 </template>
 
 <script lang="ts" setup name="VoltageProtectionForm">
@@ -169,6 +171,22 @@ import { useDictStore } from '@/stores/dict'
 import { storeToRefs } from 'pinia'
 
 import * as comApi from '@/api/gw/com'
+import SltWorkOrder from '@/views/Gw/com/SltWorkOrder.vue'
+
+const refSltWorkOrder = ref()
+// 打开供应商信息
+const fnSltWorkOrderOpen = async (info: any) => {
+    refSltWorkOrder.value.open(info)
+}
+// 选择供应商信息
+const fnSltWorkOrder = async (info: any) => {
+    formDataA.value.SupplierWorkNo = info.WoNo
+    dictEipSupplierWoSimpList.value.forEach((item: any) => {
+        if (item.WoNo == formDataA.value.SupplierWorkNo) {
+            formDataA.value.SupplierSupportId = item.FactoryNo;//出厂编号
+        }
+    })
+}
 const dictEipSupplierWoSimpList: any = ref([])
 const fnWoNoChange = (params: any) => {
     if (params.data.SupplierWorkNo) {