diff --git a/src/views/Gw/dianLiuHuGanQi/DianLiuHuGanQiForm.vue b/src/views/Gw/dianLiuHuGanQi/DianLiuHuGanQiForm.vue
index 5ae0bb2..2bb4e6a 100644
--- a/src/views/Gw/dianLiuHuGanQi/DianLiuHuGanQiForm.vue
+++ b/src/views/Gw/dianLiuHuGanQi/DianLiuHuGanQiForm.vue
@@ -1,234 +1,302 @@
 <template>
-    <div class="xyp-mu-pai-form" v-if="refShow">
+    <vxe-modal class-name="csty-dian-liu-hu-gan-qi-form" v-model="refShow" width="1200" height="770" show-zoom
+        show-footer>
+        <template #title>
+            <span style="color:#ffffff">{{ modalTitle }}</span>
+        </template>
+        <template #default>
+            <a-card :bordered="false">
+                <vxe-form title-colon ref="refFormA" title-align="right" title-width="150" :data="formDataA"
+                    :rules="formRulesA">
+                    <vxe-form-gather span="24">
+                        <vxe-form-item span="24">
+                            <template #default="params">
+                                <div
+                                    style="font-size: larger;border-bottom: solid 1px #606266;padding: 0px 0px 5px 0px;">
+                                    基本数据
+                                </div>
+                            </template>
+                        </vxe-form-item>
+                    </vxe-form-gather>
+                    <vxe-form-gather span="24">
+                        <!-- <vxe-form-item title="采集规范版本号" field="StandardVersion" span="12">
+                            <template #default="params">
+                                <span>{{ params.data.StandardVersion }}</span>
+                            </template>
+                        </vxe-form-item> -->
+                        <vxe-form-item title="供应商工单编号" field="SupplierWorkNo" span="12">
+                            <template #default="params">
+                                <vxe-input v-model="params.data.SupplierWorkNo" placeholder="请输入供应商工单编号" clearable
+                                    @change="fnChangeA(params)"></vxe-input>
+                            </template>
+                        </vxe-form-item>
+                        <!-- <vxe-form-item title="国网侧供应商编码" field="SupplierCode" span="12">
+                            <template #default="params">
+                                <span>{{ params.data.SupplierCode }}</span>
+                            </template>
+                        </vxe-form-item>
+                        <vxe-form-item title="规格型号编码" field="ModelCode" span="12">
+                            <template #default="params">
+                                <span>{{ params.data.ModelCode }}</span>
+                            </template>
+                        </vxe-form-item>
+                        <vxe-form-item title="物资种类编码" field="CategoryType" span="12">
+                            <template #default="params">
+                                <span>{{ params.data.CategoryType }}</span>
+                            </template>
+                        </vxe-form-item> -->
+                        <vxe-form-item title="序列号" field="SerialNo" span="12">
+                            <template #default="params">
+                                <vxe-input v-model="params.data.SerialNo" placeholder="请输入序列号" clearable
+                                    @change="fnChangeA(params)"></vxe-input>
+                            </template>
+                        </vxe-form-item>
+                        <vxe-form-item title="原材料检验批次号" field="RmibNumber" span="12">
+                            <template #default="params">
+                                <vxe-input v-model="params.data.RmibNumber" placeholder="请输入原材料检验批次号" clearable
+                                    @change="fnChangeA(params)"></vxe-input>
+                            </template>
+                        </vxe-form-item>
+                        <vxe-form-item title="原材料批次号" field="RmbNumber" span="12">
+                            <template #default="params">
+                                <vxe-input v-model="params.data.RmbNumber" placeholder="请输入原材料批次号" clearable
+                                    @change="fnChangeA(params)"></vxe-input>
+                            </template>
+                        </vxe-form-item>
+                        <vxe-form-item title="原材料品牌" field="BorMaterials" span="12">
+                            <template #default="params">
+                                <vxe-input v-model="params.data.BorMaterials" placeholder="请输入原材料品牌" clearable
+                                    @change="fnChangeA(params)"></vxe-input>
+                            </template>
+                        </vxe-form-item>
+                        <vxe-form-item title="原材料制造商" field="RawmManufacturer" span="12">
+                            <template #default="params">
+                                <vxe-input v-model="params.data.RawmManufacturer" placeholder="请输入原材料制造商" clearable
+                                    @change="fnChangeA(params)"></vxe-input>
+                            </template>
+                        </vxe-form-item>
+                        <vxe-form-item title="原材料产地" field="OorMaterials" span="12">
+                            <template #default="params">
+                                <vxe-input v-model="params.data.OorMaterials" placeholder="请输入原材料产地" clearable
+                                    @change="fnChangeA(params)"></vxe-input>
+                            </template>
+                        </vxe-form-item>
+                        <vxe-form-item title="原材料规格型号" field="MrmSpecification" span="12">
+                            <template #default="params">
+                                <vxe-input v-model="params.data.MrmSpecification" placeholder="请输入原材料规格型号" clearable
+                                    @change="fnChangeA(params)"></vxe-input>
+                            </template>
+                        </vxe-form-item>
+                        <vxe-form-item title="原材料出厂日期" field="ManufactureDate" span="12">
+                            <template #default="params">
+                                <vxe-input v-model="params.data.ManufactureDate" type="date" clearable
+                                    @change="fnChangeA(params)"></vxe-input>
+                            </template>
+                        </vxe-form-item>
+                        <vxe-form-item title="来料检验日期" field="IncomDate" span="12">
+                            <template #default="params">
+                                <vxe-input v-model="params.data.IncomDate" type="date" clearable
+                                    @change="fnChangeA(params)"></vxe-input>
+                            </template>
+                        </vxe-form-item>
+                        <!-- <vxe-form-item title="采集时间" field="CheckTime" span="12">
+                            <template #default="params">
+                                <span>{{ params.data.CheckTime }}</span>
+                            </template>
+                        </vxe-form-item>
+                        <vxe-form-item title="入数采中心时间" field="PutCenterTime" span="12">
+                            <template #default="params">
+                                <span>{{ params.data.PutCenterTime }}</span>
+                            </template>
+                        </vxe-form-item>
+                        <vxe-form-item title="工序" field="PdCode" span="12">
+                            <template #default="params">
+                                <span>{{ params.data.PdCode }}</span>
+                            </template>
+                        </vxe-form-item> -->
+                        <vxe-form-item title="感知过程" field="ProcessType" span="12">
+                            <template #default="params">
+                                <vxe-select v-model="params.data.ProcessType" clearable filterable :disabled="true">
+                                    <template v-for="(item) in dictProcessType">
+                                        <vxe-option :value="item.key" :label="item.val"></vxe-option>
+                                    </template>
+                                </vxe-select>
+                            </template>
+                        </vxe-form-item>
+                        <vxe-form-item title="检验结果是否合格" field="IsQualify" span="12">
+                            <template #default="params">
+                                <vxe-select v-model="params.data.IsQualify" clearable>
+                                    <vxe-option :key="1" :value="1" :label="`合格`"></vxe-option>
+                                    <vxe-option :key="0" :value="0" :label="`不合格`"></vxe-option>
+                                </vxe-select>
+                            </template>
+                        </vxe-form-item>
+                        <!-- <vxe-form-item title="ecode码" field="Ecode" span="12">
+                            <template #default="params">
+                                <span>{{ params.data.Ecode }}</span>
+                            </template>
+                        </vxe-form-item>
+                        <vxe-form-item title="国网实物Id" field="SgEntityId" span="12">
+                            <template #default="params">
+                                <span>{{ params.data.SgEntityId }}</span>
+                            </template>
+                        </vxe-form-item>
+                        <vxe-form-item title="数据唯一标识" field="DataUniqueIdentifier" span="12">
+                            <template #default="params">
+                                <span>{{ params.data.DataUniqueIdentifier }}</span>
+                            </template>
+                        </vxe-form-item> -->
+                    </vxe-form-gather>
+                    <vxe-form-gather span="24">
+                        <vxe-form-item span="24">
+                            <template #default="params">
+                                <div
+                                    style="font-size: larger;border-bottom: solid 1px #606266;padding: 0px 0px 5px 0px;">
+                                    采集数据
+                                </div>
+                            </template>
+                        </vxe-form-item>
+                    </vxe-form-gather>
+                    <vxe-form-gather span="24">
+                        <vxe-form-item title="规格型号" field="ModelSpecification" span="12">
+                            <template #default="params">
+                                <vxe-input v-model="params.data.ModelSpecification" placeholder="请输入规格型号" clearable
+                                    @change="fnChangeA(params)"></vxe-input>
+                            </template>
+                        </vxe-form-item>
+                    </vxe-form-gather>
+                    <vxe-form-gather span="24">
+                        <vxe-form-item span="24">
+                            <template #default="params">
+                                <div
+                                    style="font-size: larger;border-bottom: solid 1px #606266;padding: 0px 0px 5px 0px;">
+                                    附件上传
+                                </div>
+                            </template>
+                        </vxe-form-item>
+                    </vxe-form-gather>
+                    <vxe-form-gather span="24">
+                        <vxe-form-item span="24">
+                            <template #default="params">
+                                <vxe-table :data="fileItems">
+                                    <vxe-column field="id" title="id"></vxe-column>
+                                    <vxe-column field="type" title="文件类型"></vxe-column>
+                                    <vxe-column field="typeCode" title="文件类别" width="160">
+                                        <template #default="{ row }">
 
-        <vxe-modal v-model="refShow" width="960" height="770" show-zoom show-footer>
-            <template #title>
-                <span style="color:#ffffff">{{ modalTitle }}</span>
-            </template>
-            <template #default>
-                <a-card :bordered="false">
-                    <vxe-form title-colon ref="refFormA" title-align="right" title-width="150" :data="formDataA"
-                        :rules="formRulesA" @submit="fnSubmitA">
-                        <vxe-form-gather span="24">
-                            <vxe-form-item span="24">
-                                <template #default="params">
-                                    <div
-                                        style="font-size: larger;border-bottom: solid 1px #606266;padding: 0px 0px 5px 0px;">
-                                        基本数据
-                                    </div>
-                                </template>
-                            </vxe-form-item>
-                        </vxe-form-gather>
-                        <vxe-form-gather span="24">
-                            <vxe-form-item title="采集规范版本号" field="StandardVersion" span="12">
-                                <template #default="params">
-                                    <div style="width: 196px;">{{ params.data.StandardVersion }}</div>
-                                </template>
-                            </vxe-form-item>
-                            <vxe-form-item title="供应商工单编号" field="SupplierWorkNo" span="12">
-                                <template #default="params">
-                                    <vxe-input v-model="params.data.SupplierWorkNo" placeholder="请输入供应商工单编号" clearable
-                                        @change="fnChangeA(params)"></vxe-input>
-                                </template>
-                            </vxe-form-item>
-                            <vxe-form-item title="国网侧供应商编码" field="SupplierCode" span="12">
-                                <template #default="params">
-                                    <div style="width: 196px;">{{ params.data.SupplierCode }}</div>
-                                </template>
-                            </vxe-form-item>
-                            <vxe-form-item title="规格型号编码" field="ModelCode" span="12">
-                                <template #default="params">
-                                    <div style="width: 196px;">{{ params.data.ModelCode }}</div>
-                                </template>
-                            </vxe-form-item>
-                            <vxe-form-item title="物资种类编码" field="CategoryType" span="12">
-                                <template #default="params">
-                                    <div style="width: 196px;">{{ params.data.CategoryType }}</div>
-                                </template>
-                            </vxe-form-item>
-                            <vxe-form-item title="序列号" field="SerialNo" span="12">
-                                <template #default="params">
-                                    <vxe-input v-model="params.data.SerialNo" placeholder="请输入序列号" clearable
-                                        @change="fnChangeA(params)"></vxe-input>
-                                </template>
-                            </vxe-form-item>
-                            <vxe-form-item title="原材料检验批次号" field="RmibNumber" span="12">
-                                <template #default="params">
-                                    <vxe-input v-model="params.data.RmibNumber" placeholder="请输入原材料检验批次号" clearable
-                                        @change="fnChangeA(params)"></vxe-input>
-                                </template>
-                            </vxe-form-item>
-                            <vxe-form-item title="原材料批次号" field="RmbNumber" span="12">
-                                <template #default="params">
-                                    <vxe-input v-model="params.data.RmbNumber" placeholder="请输入原材料批次号" clearable
-                                        @change="fnChangeA(params)"></vxe-input>
-                                </template>
-                            </vxe-form-item>
-                            <vxe-form-item title="原材料品牌" field="BorMaterials" span="12">
-                                <template #default="params">
-                                    <vxe-input v-model="params.data.BorMaterials" placeholder="请输入原材料品牌" clearable
-                                        @change="fnChangeA(params)"></vxe-input>
-                                </template>
-                            </vxe-form-item>
-                            <vxe-form-item title="原材料制造商" field="RawmManufacturer" span="12">
-                                <template #default="params">
-                                    <vxe-input v-model="params.data.RawmManufacturer" placeholder="请输入原材料制造商" clearable
-                                        @change="fnChangeA(params)"></vxe-input>
-                                </template>
-                            </vxe-form-item>
-                            <vxe-form-item title="原材料产地" field="OorMaterials" span="12">
-                                <template #default="params">
-                                    <vxe-input v-model="params.data.OorMaterials" placeholder="请输入原材料产地" clearable
-                                        @change="fnChangeA(params)"></vxe-input>
-                                </template>
-                            </vxe-form-item>
-                            <vxe-form-item title="原材料规格型号" field="MrmSpecification" span="12">
-                                <template #default="params">
-                                    <vxe-input v-model="params.data.MrmSpecification" placeholder="请输入原材料规格型号" clearable
-                                        @change="fnChangeA(params)"></vxe-input>
-                                </template>
-                            </vxe-form-item>
-                            <vxe-form-item title="原材料出厂日期" field="ManufactureDate" span="12">
-                                <template #default="params">
-                                    <vxe-input v-model="params.data.ManufactureDate" type="date" clearable
-                                        @change="fnChangeA(params)" style="width: 196px;"></vxe-input>
-                                </template>
-                            </vxe-form-item>
-                            <vxe-form-item title="来料检验日期" field="IncomDate" span="12">
-                                <template #default="params">
-                                    <vxe-input v-model="params.data.IncomDate" type="date" clearable
-                                        @change="fnChangeA(params)" style="width: 196px;"></vxe-input>
-                                </template>
-                            </vxe-form-item>
-                            <vxe-form-item title="采集时间" field="CheckTime" span="12">
-                                <template #default="params">
-                                    <div style="width: 196px;">{{ params.data.CheckTime }}</div>
-                                </template>
-                            </vxe-form-item>
-                            <vxe-form-item title="入数采中心时间" field="PutCenterTime" span="12">
-                                <template #default="params">
-                                    <div style="width: 196px;">{{ params.data.PutCenterTime }}</div>
-                                </template>
-                            </vxe-form-item>
-                            <vxe-form-item title="工序" field="PdCode" span="12">
-                                <template #default="params">
-                                    <div style="width: 196px;">{{ params.data.PdCode }}</div>
-                                </template>
-                            </vxe-form-item>
-                            <vxe-form-item title="感知过程" field="ProcessType" span="12">
-                                <template #default="params">
-                                    <vxe-select v-model="params.data.ProcessType" clearable filterable :disabled="true">
-                                        <template v-for="(item) in dictProcessType">
-                                            <vxe-option :value="item.key" :label="item.val"></vxe-option>
+                                            <template v-if="row.typeCode == 1">
+                                                1. 来料检测报告
+                                            </template>
+                                            <template v-else>
+                                                2. 生产商检测报告
+                                            </template>
                                         </template>
-                                    </vxe-select>
-                                </template>
-                            </vxe-form-item>
-                            <vxe-form-item title="检验结果是否合格" field="IsQualify" span="12">
-                                <template #default="params">
-                                    <vxe-select v-model="params.data.IsQualify" clearable>
-                                        <vxe-option :key="1" :value="1" :label="`合格`"></vxe-option>
-                                        <vxe-option :key="0" :value="0" :label="`不合格`"></vxe-option>
-                                    </vxe-select>
-                                </template>
-                            </vxe-form-item>
-                            <vxe-form-item title="ecode码" field="Ecode" span="12">
-                                <template #default="params">
-                                    <div style="width: 196px;">{{ params.data.Ecode }}</div>
-                                </template>
-                            </vxe-form-item>
-                            <vxe-form-item title="国网实物Id" field="SgEntityId" span="12">
-                                <template #default="params">
-                                    <div style="width: 196px;">{{ params.data.SgEntityId }}</div>
-                                </template>
-                            </vxe-form-item>
-                            <vxe-form-item title="数据唯一标识" field="DataUniqueIdentifier" span="12">
-                                <template #default="params">
-                                    <div style="width: 196px;">{{ params.data.DataUniqueIdentifier }}</div>
-                                </template>
-                            </vxe-form-item>
-                        </vxe-form-gather>
-                        <vxe-form-gather span="24">
-                            <vxe-form-item span="24">
-                                <template #default="params">
-                                    <div
-                                        style="font-size: larger;border-bottom: solid 1px #606266;padding: 0px 0px 5px 0px;">
-                                        采集数据
-                                    </div>
-                                </template>
-                            </vxe-form-item>
-                        </vxe-form-gather>
-                        <vxe-form-gather span="24">
-                            <vxe-form-item title="规格型号" field="ModelSpecification" span="12">
-                                <template #default="params">
-                                    <vxe-input v-model="params.data.ModelSpecification" placeholder="请输入规格型号" clearable
-                                        @change="fnChangeA(params)"></vxe-input>
-                                </template>
-                            </vxe-form-item>
-                        </vxe-form-gather>
-                    </vxe-form>
-                </a-card>
-            </template>
-            <template #footer>
-                <vxe-button type="submit" status="primary" content="保存" @click="fnSubmitA"></vxe-button>
-                <vxe-button type="reset" content="取消" @click="fnEventCancel"></vxe-button>
-            </template>
-        </vxe-modal>
-    </div>
+                                    </vxe-column>
+                                    <vxe-column field="fileName" title="文件原名称" width="100"></vxe-column>
+                                    <vxe-column field="fileUrl" title="文件Url" width="100"></vxe-column>
+                                    <vxe-column field="fileType" title="文件格式" width="100">
+                                        <template #default="{ row }">
+                                            <template v-if="row.fileType == 1">
+                                                PDF
+                                            </template>
+                                            <template v-else>
+                                            </template>
+                                        </template>
+                                    </vxe-column>
+                                    <vxe-column field="fType" title="fType"></vxe-column>
+                                    <vxe-column field="fType" title="fType" width="300">
+                                        <template #default="{ row }">
+                                            <template v-if="row.typeCode == 1">
+                                                <a-upload v-model:file-list="fileListA" name="file" :action="fileUpUrl"
+                                                    :headers="{}" @change="fnChgFileA" :maxCount="1" accept=".pdf">
+                                                    <a-button>
+                                                        <upload-outlined></upload-outlined>
+                                                        上传来料检测报告
+                                                    </a-button>
+                                                </a-upload>
+                                            </template>
+                                            <template v-else>
+                                                <a-upload v-model:file-list="fileListB" name="file" :action="fileUpUrl"
+                                                    :headers="{}" @change="fnChgFileB" :maxCount="1" accept=".pdf">
+                                                    <a-button>
+                                                        <upload-outlined></upload-outlined>
+                                                        上传生产商检测报告
+                                                    </a-button>
+                                                </a-upload>
+                                            </template>
+                                        </template>
+                                    </vxe-column>
+                                </vxe-table>
+                            </template>
+                        </vxe-form-item>
+                    </vxe-form-gather>
+                </vxe-form>
+            </a-card>
+        </template>
+        <template #footer>
+            <vxe-button type="submit" status="primary" content="保存" @click="fnSubmitA"></vxe-button>
+            <vxe-button type="reset" content="取消" @click="fnEventCancel"></vxe-button>
+        </template>
+    </vxe-modal>
 </template>
 
 <script lang="ts" setup name="DianLiuHuGanQiForm">
-import { ref, onMounted } from 'vue'
+import { ref, onMounted, computed } from 'vue'
 import { VXETable } from 'vxe-table'
 import dayjs from 'dayjs'
 import { map as _map } from 'lodash'
 import * as DianLiuHuGanQiApi from '@/api/gw/dianLiuHuGanQi'
 import { useDictStore } from '@/stores/dict'
 import { storeToRefs } from 'pinia'
-
+import type { UploadProps, UploadChangeParam } from 'ant-design-vue'
+import { config } from '@/config/axios/config'
+import XEUtils from 'xe-utils'
+import * as FileUploadApi from '@/api/gw/fileUpload'
+// 字典
 const dictStore = useDictStore()
-const { dictPdCode, dictProcessType } = storeToRefs(dictStore)
+const { dictProcessType } = storeToRefs(dictStore)
 // 定义事件[success]
 const emit = defineEmits(['success'])
 // 是否显示
 const refShow = ref(false)
-// 表单
-const refFormA = ref()
-// 表单类型[add - 新增|update - 修改|del - 删除]
-const formTypeA: any = ref('')
 // 弹窗标题
 const modalTitle = ref('未知表单')
-// 表单数据
-const formDataA: any = ref(
-    {
-        "ID": 0,
-        "StandardVersion": 1,
-        "SupplierWorkNo": "",
-        "SupplierCode": "1000032215",
-        "ModelCode": "dtb00003",
-        "CategoryType": "90003",
-        "SerialNo": "",
-        "RmbNumber": "",
-        "RmibNumber": "",
-        "BorMaterials": "",
-        "RawmManufacturer": "",
-        "OorMaterials": "",
-        "MrmSpecification": "",
-        "ManufactureDate": dayjs().format("YYYY-MM-DD"),
-        "IncomDate": dayjs().format("YYYY-MM-DD"),
-        "CheckTime": dayjs().format("YYYY-MM-DD HH:mm:ss"),
-        "PutCenterTime": dayjs().format("YYYY-MM-DD HH:mm:ss"),
-        "PdCode": "GX000075",
-        "ProcessType": 1,
-        "IsQualify": undefined,
-        "Ecode": "NotImp",
-        "SgEntityId": "NotImp",
-        "DataUniqueIdentifier": "NotImp",
-        "ModelSpecification": undefined,
-        "Precision": undefined,
-        "Sended": 0
-    })
-// 表单规则
+// 表单类型[add - 新增|update - 修改|del - 删除]
+const formType: any = ref('')
+// 表单
+const refFormA = ref()
+// 表单A - 初始数据
+const formDataAInit: any = {
+    "ID": 0,
+    "StandardVersion": 1,
+    "SupplierWorkNo": "",
+    "SupplierCode": "1000032215",
+    "ModelCode": "dtb00003",
+    "CategoryType": "90003",
+    "SerialNo": "",
+    "RmbNumber": "",
+    "RmibNumber": "",
+    "BorMaterials": "",
+    "RawmManufacturer": "",
+    "OorMaterials": "",
+    "MrmSpecification": "",
+    "ManufactureDate": dayjs().format("YYYY-MM-DD"),
+    "IncomDate": dayjs().format("YYYY-MM-DD"),
+    "CheckTime": dayjs().format("YYYY-MM-DD HH:mm:ss"),
+    "PutCenterTime": dayjs().format("YYYY-MM-DD HH:mm:ss"),
+    "PdCode": "GX000075",
+    "ProcessType": 1,
+    "IsQualify": undefined,
+    "Ecode": "NotImp",
+    "SgEntityId": "NotImp",
+    "DataUniqueIdentifier": "NotImp",
+    "ModelSpecification": undefined,
+    "Precision": undefined,
+    "Sended": 0
+}
+// 表单A - 数据
+const formDataA: any = ref(formDataAInit)
+// 表单A - 规则
 const formRulesA: any = ref({
     SupplierWorkNo: [
         { required: true, message: '请输入供应商工单编号' }
@@ -264,22 +332,56 @@ const formRulesA: any = ref({
         { required: true, message: '请选择是否合格' }
     ]
 })
+// 表单B - 初始数据
+const formDataBInit: any = {
+    ID: 0,
+    StandardVersion: "",
+    SupplierWorkNo: "",
+    SupplierCode: "",
+    ModelCode: "",
+    CategoryType: "",
+    SerialNo: "",
+    FileItems: JSON.stringify([{ "id": 1, "type": 1, "typeCode": 1, "fileName": "", "fileUrl": "", "fileType": 1, "fType": ".pdf" }, { "id": 2, "type": 1, "typeCode": 2, "fileName": "", "fileUrl": "", "fileType": 1, "fType": ".pdf" }]),
+    CheckTime: "",
+    PutCenterTime: "",
+    PdCode: "",
+    FpdCode: "",
+    Ecode: '',
+    SgEntityId: "",
+    DataUniqueIdentifier: "",
+    Sended: 0
+}
+// 表单B - 附件表单数据
+const formDataB: any = ref(formDataBInit)
+// 表单B - 文件列表
+const fileItems = computed(() => {
+    let FileItems: any = XEUtils.clone(formDataB.value.FileItems, true)
+    FileItems = JSON.parse(FileItems)
+    return FileItems
+})
+// 附件文件
+const fileListA = ref<UploadProps['fileList']>([]);
+const fileListB = ref<UploadProps['fileList']>([]);
+// 附件上传路径
+const fileUpUrl: any = computed(() => {
+    let url = config.base_url + '/DistributionBoxTesting/UploadFile'
+    return url
+})
 // 挂载
 onMounted(() => {
 })
 // 打开弹窗
 const open = async (type: string, row?: any) => {
-    formTypeA.value = type
+    formType.value = type
+    await fnResetA()
     switch (type) {
         case 'add':
-            await fnResetA()
-            modalTitle.value = '新增电流互感器'
             refShow.value = true
+            modalTitle.value = '新增电流互感器'
             break;
         case 'edit':
-            await fnResetA()
-            modalTitle.value = '编辑电流互感器'
             refShow.value = true
+            modalTitle.value = '编辑电流互感器'
             const paramsA = {
                 "filter": {
                     "field": "ID",
@@ -290,11 +392,24 @@ const open = async (type: string, row?: any) => {
             const rowInfoA = await DianLiuHuGanQiApi.getDianLiuHuGanQi(paramsA)
             rowInfoA.Data.Sended = 0
             formDataA.value = rowInfoA.Data
+            // 获取附件信息
+            const queryFileParamsA: any = {
+                "filter": {
+                    "field": 'SerialNo',
+                    "operator": "Eq",
+                    "value": formDataA.value.SerialNo
+                }
+            }
+            const dataFileRes = await FileUploadApi.getPagingFileList(queryFileParamsA)
+            if (dataFileRes.Code == 0 && dataFileRes.List) {
+                if (dataFileRes.List.length > 0) {
+                    formDataB.value = dataFileRes.List[0]
+                }
+            }
             break;
         case 'copy':
-            await fnResetA()
-            modalTitle.value = '复制电流互感器'
             refShow.value = true
+            modalTitle.value = '复制电流互感器'
             const paramsB = {
                 "filter": {
                     "field": "ID",
@@ -315,6 +430,26 @@ const open = async (type: string, row?: any) => {
             break;
     }
 }
+// 表单B - 文件A
+const fnChgFileA = async (info: UploadChangeParam) => {
+    if (info.file.response) {
+        let FileItems: any = XEUtils.clone(formDataB.value.FileItems, true)
+        FileItems = JSON.parse(FileItems)
+        FileItems[0]['fileName'] = info.file.name
+        FileItems[0]['fileUrl'] = info.file.response
+        formDataB.value.FileItems = JSON.stringify(FileItems)
+    }
+}
+// 表单B - 文件B
+const fnChgFileB = async (info: UploadChangeParam) => {
+    if (info.file.response) {
+        let FileItems: any = XEUtils.clone(formDataB.value.FileItems, true)
+        FileItems = JSON.parse(FileItems)
+        FileItems[1]['fileName'] = info.file.name
+        FileItems[1]['fileUrl'] = info.file.response
+        formDataB.value.FileItems = JSON.stringify(FileItems)
+    }
+}
 // 提供open方法打开弹窗
 defineExpose({ open })
 // 改变数据A
@@ -346,69 +481,93 @@ const fnDeleteA = async (row: any) => {
 }
 // 提交
 const fnSubmitA = async () => {
-    switch (formTypeA.value) {
-        case 'add':
-            const paramsA = {
-                data: formDataA.value
+    await refFormA.value.validate().then(async (res: any) => {
+        if (!res) {
+            switch (formType.value) {
+                case 'add':
+                    const paramsA = {
+                        data: formDataA.value
+                    }
+                    await DianLiuHuGanQiApi.saveDianLiuHuGanQi(paramsA)
+                    await fnSubmitB()
+                    VXETable.modal.message({ content: '新增成功', status: 'success' })
+                    break;
+                case 'edit':
+                    let setVal: any = _map(formDataA.value, (o1, k1) => {
+                        return { field: k1, value: o1 }
+                    })
+                    const paramsB = {
+                        filter: {
+                            field: 'ID',
+                            value: formDataA.value.ID
+                        },
+                        set: setVal
+                    }
+                    await DianLiuHuGanQiApi.editDianLiuHuGanQi(paramsB)
+                    await fnSubmitB()
+                    VXETable.modal.message({ content: '编辑成功', status: 'success' })
+                    break;
+                case 'copy':
+                    const paramsC = {
+                        data: formDataA.value
+                    }
+                    await DianLiuHuGanQiApi.saveDianLiuHuGanQi(paramsC)
+                    VXETable.modal.message({ content: '复制成功', status: 'success' })
+                    break;
             }
-            await DianLiuHuGanQiApi.saveDianLiuHuGanQi(paramsA)
-            VXETable.modal.message({ content: '新增成功', status: 'success' })
-            break;
-        case 'edit':
-            let setVal: any = _map(formDataA.value, (o1, k1) => {
+            refShow.value = false
+            emit('success')
+        }
+    })
+}
+// 表单B - 提交
+const fnSubmitB = async () => {
+    formDataB.value.StandardVersion = formDataA.value.StandardVersion
+    formDataB.value.SupplierWorkNo = formDataA.value.SupplierWorkNo
+    formDataB.value.SupplierCode = formDataA.value.SupplierCode
+    formDataB.value.ModelCode = formDataA.value.ModelCode
+    formDataB.value.CategoryType = formDataA.value.CategoryType
+    formDataB.value.SerialNo = formDataA.value.SerialNo
+    formDataB.value.pdCode = "GX000080"
+    formDataB.value.FpdCode = formDataA.value.PdCode
+    formDataB.value.Ecode = formDataA.value.Ecode
+    formDataB.value.SgEntityId = formDataA.value.SgEntityId
+    formDataB.value.DataUniqueIdentifier = formDataA.value.DataUniqueIdentifier
+    formDataB.value.CheckTime = formDataA.value.CheckTime
+    formDataB.value.PutCenterTime = formDataA.value.PutCenterTime
+    const queryParamsA: any = {
+        "filter": {
+            "field": 'SerialNo',
+            "operator": "Eq",
+            "value": formDataA.value.SerialNo
+        }
+    }
+    const dataFileRes = await FileUploadApi.getPagingFileList(queryParamsA)
+    if (dataFileRes.Code == 0 && dataFileRes.List) {
+        if (dataFileRes.List.length > 0) {
+            let setVal: any = _map(formDataB.value, (o1, k1) => {
                 return { field: k1, value: o1 }
             })
             const paramsB = {
                 filter: {
-                    field: 'ID',
-                    value: formDataA.value.ID
+                    field: 'SerialNo',
+                    value: formDataB.value.SerialNo
                 },
                 set: setVal
             }
-            await DianLiuHuGanQiApi.editDianLiuHuGanQi(paramsB)
-            VXETable.modal.message({ content: '编辑成功', status: 'success' })
-            break;
-        case 'copy':
-            const paramsC = {
-                data: formDataA.value
+            await FileUploadApi.editFile(paramsB)
+        } else {
+            const paramsA = {
+                data: formDataB.value
             }
-            await DianLiuHuGanQiApi.saveDianLiuHuGanQi(paramsC)
-            VXETable.modal.message({ content: '复制成功', status: 'success' })
-            break;
+            await FileUploadApi.saveFile(paramsA)
+        }
     }
-    refShow.value = false
-    emit('success')
 }
 // 重置
-const fnResetA = () => {
-    formDataA.value = {
-        "ID": 0,
-        "StandardVersion": 1,
-        "SupplierWorkNo": "",
-        "SupplierCode": "1000032215",
-        "ModelCode": "dtb00003",
-        "CategoryType": "90003",
-        "SerialNo": "",
-        "RmbNumber": "",
-        "RmibNumber": "",
-        "BorMaterials": "",
-        "RawmManufacturer": "",
-        "OorMaterials": "",
-        "MrmSpecification": "",
-        "ManufactureDate": dayjs().format("YYYY-MM-DD"),
-        "IncomDate": dayjs().format("YYYY-MM-DD"),
-        "CheckTime": dayjs().format("YYYY-MM-DD HH:mm:ss"),
-        "PutCenterTime": dayjs().format("YYYY-MM-DD HH:mm:ss"),
-        "PdCode": "GX000075",
-        "ProcessType": 1,
-        "IsQualify": undefined,
-        "Ecode": "NotImp",
-        "SgEntityId": "NotImp",
-        "DataUniqueIdentifier": "NotImp",
-        "ModelSpecification": undefined,
-        "Precision": undefined,
-        "Sended": 0
-    }
+const fnResetA = async () => {
+    formDataA.value = formDataAInit
+    formDataB.value = formDataBInit
 }
 // 关闭窗体
 const fnEventCancel = () => {
diff --git a/src/views/Gw/muPai/MuPaiForm.vue b/src/views/Gw/muPai/MuPaiForm.vue
index a1f47fd..9469d5a 100644
--- a/src/views/Gw/muPai/MuPaiForm.vue
+++ b/src/views/Gw/muPai/MuPaiForm.vue
@@ -273,10 +273,10 @@ const emit = defineEmits(['success'])
 const refShow = ref(false)
 // 弹窗标题
 const modalTitle = ref('未知表单')
-// 表单
-const refFormA = ref()
 // 表单类型[add - 新增|update - 修改|del - 删除]
 const formType: any = ref('')
+// 表单
+const refFormA = ref()
 // 表单A - 初始数据
 const formDataAInit: any = {
     ID: 0,