diff --git a/src/views/Gw/biLeiQi/BiLeiQiForm.vue b/src/views/Gw/biLeiQi/BiLeiQiForm.vue
index 7eecb2b..a513a92 100644
--- a/src/views/Gw/biLeiQi/BiLeiQiForm.vue
+++ b/src/views/Gw/biLeiQi/BiLeiQiForm.vue
@@ -1,162 +1,185 @@
 <template>
     <div class="xyp-bi-lei-qi-form" v-if="refShow">
-        <vxe-form title-colon ref="refFormA" title-align="right" title-width="150" :data="formDataA" :rules="formRulesA"
-            @submit="fnSubmitA" @reset="fnResetA" custom-layout>
-            <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 title="基本数据" :bordered="false" style="margin: 10px">
-                        <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>
-                                </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>
-                    </a-card>
-                    <a-card title="采集数据" :bordered="false" style="margin: 10px">
-                        <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-item title="额定电压(kV)" field="PressureValue" span="12">
-                            <template #default="params">
-                                <vxe-input v-model="params.data.PressureValue" placeholder="请输入额定电压" clearable
-                                    @change="fnChangeA(params)"></vxe-input>
-                            </template>
-                        </vxe-form-item>
-                    </a-card>
-                </template>
-                <template #footer>
-                    <vxe-button type="submit" status="primary" content="提交"></vxe-button>
-                    <vxe-button type="reset" content="重置"></vxe-button>
-                </template>
-            </vxe-modal>
-        </vxe-form>
+        <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>
+                                    </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-item title="额定电压(kV)" field="PressureValue" span="12">
+                                <template #default="params">
+                                    <vxe-input v-model="params.data.PressureValue" 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>
 </template>
 
@@ -393,5 +416,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/boxMateQuality/BoxMateQualityForm.vue b/src/views/Gw/boxMateQuality/BoxMateQualityForm.vue
index 6310216..affa7b0 100644
--- a/src/views/Gw/boxMateQuality/BoxMateQualityForm.vue
+++ b/src/views/Gw/boxMateQuality/BoxMateQualityForm.vue
@@ -1,16 +1,27 @@
 <template>
-    <div class="xyp-box-mate-quality-form">
-        <vxe-modal v-model="refShow" width="1200" height="770" show-zoom show-footer :mask-closable=true>
-            <template #title>
-                <span style="color:#ffffff">{{ modalTitle }}</span>
-            </template>
-            <template #default>
+    <vxe-modal className="csty-box-mate-quality-form" v-model="refShow" width="1200" height="770" show-zoom show-footer
+        :mask-closable=true>
+        <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="210" :data="formDataA"
-                    :rules="formRulesA" @submit="fnSubmitA" @reset="fnResetA" custom-layout>
-                    <a-card title="基本数据" :bordered="false" style="margin: 10px">
+                    :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">
-                                <div style="width: 196px;">{{ params.data.StandardVersion }}</div>
+                                <span>{{ params.data.StandardVersion }}</span>
                             </template>
                         </vxe-form-item>
                         <vxe-form-item title="供应商工单编号" field="SupplierWorkNo" span="12">
@@ -135,8 +146,18 @@
                                 <div style="width: 196px;">{{ params.data.DataUniqueIdentifier }}</div>
                             </template>
                         </vxe-form-item>
-                    </a-card>
-                    <a-card title="采集数据" :bordered="false" style="margin: 10px">
+                    </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="Texture" span="12">
                             <template #default="params">
                                 <vxe-input v-model="params.data.Texture" placeholder="请输入材质" clearable
@@ -155,17 +176,26 @@
                                     @change="fnChangeA(params)"></vxe-input>
                             </template>
                         </vxe-form-item>
-                    </a-card>
-                </vxe-form>
-                <a-card title="附件上传" :bordered="false" style="margin: 10px">
-                    <vxe-form ref="refFormB" :data="formDataB" @submit="fnSubmitB" style="width: 80%;">
-                        <vxe-form-item field="FileItems" span="12">
+                    </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="FileItemsList">
-                                    <vxe-column field="id" title="id" width="100"></vxe-column>
-                                    <vxe-column field="type" title="文件类型" width="100"></vxe-column>
+                                <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 }">
+
                                             <template v-if="row.typeCode == 1">
                                                 1. 来料检测报告
                                             </template>
@@ -211,15 +241,15 @@
                                 </vxe-table>
                             </template>
                         </vxe-form-item>
-                    </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-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="BoxMateQualityForm">
@@ -234,9 +264,19 @@ import { storeToRefs } from 'pinia'
 import type { UploadProps, UploadChangeParam } from 'ant-design-vue';
 import { config } from '@/config/axios/config'
 import * as FileUploadApi from '@/api/gw/fileUpload'
-import { idText } from 'typescript'
+// 字典
+const dictStore = useDictStore()
+const { dictProcessType } = storeToRefs(dictStore)
+// 定义事件[success]
+const emit = defineEmits(['success'])
 // 是否显示表单
 const refShow = ref(false)
+// 弹窗标题
+const modalTitle = ref('未知表单')
+// 表单类型[add - 新增|update - 修改|copy - 复制]
+const formType: any = ref('')
+// 表单A
+const refFormA = ref()
 // 表单A - 初始数据
 const formDataAInit: any = {
     ID: 0,
@@ -267,63 +307,9 @@ const formDataAInit: any = {
     Size: "",
     Sended: 0
 }
-// 表单B - 初始数据
-const formDataBInit: any = ref({
-    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
-})
-
 // 表单A - 数据
-let formDataA: any = ref(formDataAInit)
-// 表单B - 附件表单数据
-let formDataB: any = ref(formDataBInit)
-// 表单B联动表单A
-watch(
-    formDataA,
-    async (formDataAN) => {
-        formDataB.value.StandardVersion = formDataAN.StandardVersion
-        formDataB.value.SupplierWorkNo = formDataAN.SupplierWorkNo
-        formDataB.value.SupplierCode = formDataAN.SupplierCode
-        formDataB.value.ModelCode = formDataAN.ModelCode
-        formDataB.value.CategoryType = formDataAN.CategoryType
-        formDataB.value.SerialNo = formDataAN.SerialNo
-        formDataB.value.PdCode = formDataAN.PdCode
-        formDataB.value.Ecode = formDataAN.Ecode
-        formDataB.value.SgEntityId = formDataAN.SgEntityId
-        formDataB.value.DataUniqueIdentifier = formDataAN.DataUniqueIdentifier
-        formDataB.value.CheckTime = formDataAN.CheckTime
-        formDataB.value.PutCenterTime = formDataAN.PutCenterTime
-    },
-    { deep: true, immediate: true }
-)
-
-const dictStore = useDictStore()
-const { dictProcessType } = storeToRefs(dictStore)
-console.log(dictProcessType.value)
-//console.log(dictProcessType)
-// 定义事件[success]
-const emit = defineEmits(['success'])
-
-// 表单类型[add - 新增|update - 修改|del - 删除]
-//const formTypeA: any = ref('')
-// 弹窗标题
-const modalTitle = ref('未知表单')
-
-// 表单规则
+const formDataA: any = ref(formDataAInit)
+// 表单A - 规则
 const formRulesA: any = ref({
     SupplierWorkNo: [
         { required: true, message: '请输入供应商工单编号' }
@@ -371,6 +357,34 @@ 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 - 附件表单数据
+let formDataB: any = ref(formDataBInit)
+// 表单B - 文件列表
+const fileItems = computed(() => {
+    let FileItems: any = XEUtils.clone(formDataB.value.FileItems, true)
+    console.log(FileItems)
+    FileItems = JSON.parse(FileItems)
+    return FileItems
+})
 // 附件文件
 const fileListA = ref<UploadProps['fileList']>([]);
 const fileListB = ref<UploadProps['fileList']>([]);
@@ -379,44 +393,17 @@ const fileUpUrl: any = computed(() => {
     let url = config.base_url + '/DistributionBoxTesting/UploadFile'
     return url
 })
-const fnChgFileA = async (info: UploadChangeParam) => {
-    if (info.file.response) {
-        console.log(info)
-        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)
-    }
-}
-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)
-    }
-}
-// 附件列表
-const FileItemsList: any = computed(() => {
-    let FileItems: any = XEUtils.clone(formDataB.value.FileItems, true)
-    FileItems = JSON.parse(FileItems)
-    return FileItems
-})
 // 挂载
 onMounted(() => {
 })
 // 打开弹窗
 const open = async (type: string, row?: any) => {
-    console.log('打开')
     formType.value = type
     await fnResetA()
     switch (type) {
         case 'add':
             refShow.value = true
             modalTitle.value = '新增柜体材质，厚度及尺寸'
-
             break;
         case 'edit':
             refShow.value = true
@@ -432,25 +419,19 @@ const open = async (type: string, row?: any) => {
             rowInfoA.Data.Sended = 0
             formDataA.value = rowInfoA.Data
             // 获取附件信息
-            const queryFileParamsA: any = reactive({
-                currentPage: 1,
-                pageSize: 10,
-                filter: {
-                    "logic": 0,
-                    "filters": [{
-                        "field": 'SerialNo',
-                        "operator": 0,
-                        "value": rowInfoA.Data.SerialNo
-                    }]
+            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){
+                if (dataFileRes.List.length > 0) {
                     formDataB.value = dataFileRes.List[0]
                 }
             }
-            console.log(formDataB)
             break;
         case 'copy':
             refShow.value = true
@@ -475,6 +456,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
@@ -504,12 +505,6 @@ const fnDeleteA = async (row: any) => {
             break;
     }
 }
-
-// 表单类型[add - 新增|update - 修改|copy - 复制]
-const formType: any = ref('')
-// 表单A
-const refFormA = ref()
-
 // 表单A - 提交
 const fnSubmitA = async () => {
     refFormA.value.validate().then(async (res: any) => {
@@ -520,9 +515,8 @@ const fnSubmitA = async () => {
                         data: formDataA.value
                     }
                     await BoxMateQualityApi.saveBoxMateQuality(paramsA)
+                    await fnSubmitB()
                     VXETable.modal.message({ content: '新增成功', status: 'success' })
-                    refShow.value = false
-                    emit('success')
                     break;
                 case 'edit':
                     let setVal: any = _map(formDataA.value, (o1, k1) => {
@@ -535,11 +529,9 @@ const fnSubmitA = async () => {
                         },
                         set: setVal
                     }
-                    await fnSubmitB()
                     await BoxMateQualityApi.editBoxMateQuality(paramsB)
+                    await fnSubmitB()
                     VXETable.modal.message({ content: '编辑成功', status: 'success' })
-                    refShow.value = false
-                    emit('success')
                     break;
                 case 'copy':
                     const paramsC = {
@@ -547,94 +539,65 @@ const fnSubmitA = async () => {
                     }
                     await BoxMateQualityApi.saveBoxMateQuality(paramsC)
                     VXETable.modal.message({ content: '复制成功', status: 'success' })
-                    refShow.value = false
-                    emit('success')
                     break;
             }
-
+            refShow.value = false
+            emit('success')
         }
     })
 }
-// 表单B
-const refFormB = ref()
-
 // 表单B - 提交
 const fnSubmitB = async () => {
-    await refFormB.value.validate().then(async (res: any) => {
-        if (!res) {
-            const queryParamsA: any = reactive({
-                currentPage: 1,
-                pageSize: 10,
-                filter: {
-                    "logic": 0,
-                    "filters": [{
-                        "field": 'SerialNo',
-                        "operator": 0,
-                        "value": formDataA.value.SerialNo
-                    }]
-                }
+    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 dataFileList = await FileUploadApi.getPagingFileList(queryParamsA)
-
-            if (dataFileList.length > 0) {
-                let setVal: any = _map(formDataB.value, (o1, k1) => {
-                    return { field: k1, value: o1 }
-                })
-                const paramsB = {
-                    filter: {
-                        field: 'ID',
-                        value: formDataB.value.ID
-                    },
-                    set: setVal
-                }
-                await FileUploadApi.editFile(paramsB)
-            } else {
-                const paramsA = {
-                    data: formDataB.value
-                }
-                await FileUploadApi.saveFile(paramsA)
+            const paramsB = {
+                filter: {
+                    field: 'SerialNo',
+                    value: formDataB.value.SerialNo
+                },
+                set: setVal
             }
+            await FileUploadApi.editFile(paramsB)
+        } else {
+            const paramsA = {
+                data: formDataB.value
+            }
+            await FileUploadApi.saveFile(paramsA)
         }
-        return false
-    })
-    return false
+    }
+}
+// 重置
+const fnResetA = async () => {
+    formDataA.value = formDataAInit
+    formDataB.value = formDataBInit
 }
 // 关闭窗体
 const fnEventCancel = () => {
     refShow.value = false
 }
-
-// 重置
-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": "GX000079",
-        "ProcessType": 1,
-        "IsQualify": undefined,
-        "Ecode": "NotImp",
-        "SgEntityId": "NotImp",
-        "DataUniqueIdentifier": "NotImp",
-        "Texture": undefined,
-        "Thickness": undefined,
-        "Size": undefined,
-        "Sended": 0
-    }
-}
 </script>
 <style scoped></style>
\ No newline at end of file
diff --git a/src/views/Gw/dianLiuHuGanQi/DianLiuHuGanQiForm.vue b/src/views/Gw/dianLiuHuGanQi/DianLiuHuGanQiForm.vue
index eadc20b..5ae0bb2 100644
--- a/src/views/Gw/dianLiuHuGanQi/DianLiuHuGanQiForm.vue
+++ b/src/views/Gw/dianLiuHuGanQi/DianLiuHuGanQiForm.vue
@@ -1,162 +1,179 @@
 <template>
     <div class="xyp-mu-pai-form" v-if="refShow">
-        <vxe-form title-colon ref="refFormA" title-align="right" title-width="150" :data="formDataA" :rules="formRulesA"
-            @submit="fnSubmitA" @reset="fnResetA" custom-layout>
-            <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 title="基本数据" :bordered="false" style="margin: 10px">
-                        <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>
-                                </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>
-                    </a-card>
-                    <a-card title="采集数据" :bordered="false" style="margin: 10px">
-                        <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-item title="精度" field="Precision" span="12">
-                            <template #default="params">
-                                <vxe-input v-model="params.data.Precision" placeholder="精度" clearable
-                                    @change="fnChangeA(params)"></vxe-input>
-                            </template>
-                        </vxe-form-item> -->
-                    </a-card>
-                </template>
-                <template #footer>
-                    <vxe-button type="submit" status="primary" content="提交"></vxe-button>
-                    <vxe-button type="reset" content="重置"></vxe-button>
-                </template>
-            </vxe-modal>
-        </vxe-form>
+
+        <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>
+                                    </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>
 </template>
 
@@ -393,5 +410,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/dianRongQi/DianRongQiForm.vue b/src/views/Gw/dianRongQi/DianRongQiForm.vue
index 1d445c1..0462787 100644
--- a/src/views/Gw/dianRongQi/DianRongQiForm.vue
+++ b/src/views/Gw/dianRongQi/DianRongQiForm.vue
@@ -1,192 +1,216 @@
 <template>
     <div class="xyp-dian-rong-qi-form" v-if="refShow">
-        <vxe-form title-colon ref="refFormA" title-align="right" title-width="180" :data="formDataA" :rules="formRulesA"
-            @submit="fnSubmitA" @reset="fnResetA" custom-layout>
-            <vxe-modal v-model="refShow" width="1160" height="770" show-zoom show-footer>
-                <template #title>
-                    <span style="color:#ffffff">{{ modalTitle }}</span>
-                </template>
-                <template #default>
-                    <a-card title="基本数据" :bordered="false" style="margin: 10px">
-                        <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>
-                                </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>
-                    </a-card>
-                    <a-card title="采集数据" :bordered="false" style="margin: 10px">
-                        <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-item title="额定电压(V)" field="PressureValue" span="12">
-                            <template #default="params">
-                                <vxe-input v-model="params.data.PressureValue" placeholder="请输入额定电压" clearable
-                                    @change="fnChangeA(params)"></vxe-input>
-                            </template>
-                        </vxe-form-item>
-                        <vxe-form-item title="电容器铭牌容量值(kvar)" field="CapacityUn" span="12">
-                            <template #default="params">
-                                <vxe-input v-model="params.data.CapacityUn" placeholder="请输入电容器铭牌容量值" clearable
-                                    @change="fnChangeA(params)"></vxe-input>
-                            </template>
-                        </vxe-form-item>
-                        <vxe-form-item title="电容器容量检测值(kvar)" field="Capacity" span="12">
-                            <template #default="params">
-                                <vxe-input v-model="params.data.Capacity" placeholder="请输入电容器容量检测值" clearable
-                                    @change="fnChangeA(params)"></vxe-input>
-                            </template>
-                        </vxe-form-item>
-                        <vxe-form-item title="电容器工作峰值电压(V)" field="CapacityPressure" span="12">
-                            <template #default="params">
-                                <vxe-input v-model="params.data.CapacityPressure" placeholder="请输入电容器工作峰值电压" clearable
-                                    @change="fnChangeA(params)"></vxe-input>
-                            </template>
-                        </vxe-form-item>
-                        <vxe-form-item title="放电至50V(V)" field="DischargeVoltage" span="12">
-                            <template #default="params">
-                                <vxe-input v-model="params.data.DischargeVoltage" placeholder="请输入放电至50V" clearable
-                                    @change="fnChangeA(params)"></vxe-input>
-                            </template>
-                        </vxe-form-item>
-                        <vxe-form-item title="放电时间(s；≤180s)" field="DischargeTime" span="12">
-                            <template #default="params">
-                                <vxe-input v-model="params.data.DischargeTime" placeholder="放电时间" clearable
-                                    @change="fnChangeA(params)"></vxe-input>
-                            </template>
-                        </vxe-form-item>
-                    </a-card>
-                </template>
-                <template #footer>
-                    <vxe-button type="submit" status="primary" content="提交"></vxe-button>
-                    <vxe-button type="reset" content="重置"></vxe-button>
-                </template>
-            </vxe-modal>
-        </vxe-form>
+
+        <vxe-modal v-model="refShow" width="1160" 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="180" :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>
+                                    </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-item title="额定电压(V)" field="PressureValue" span="12">
+                                <template #default="params">
+                                    <vxe-input v-model="params.data.PressureValue" placeholder="请输入额定电压" clearable
+                                        @change="fnChangeA(params)"></vxe-input>
+                                </template>
+                            </vxe-form-item>
+                            <vxe-form-item title="电容器铭牌容量值(kvar)" field="CapacityUn" span="12">
+                                <template #default="params">
+                                    <vxe-input v-model="params.data.CapacityUn" placeholder="请输入电容器铭牌容量值" clearable
+                                        @change="fnChangeA(params)"></vxe-input>
+                                </template>
+                            </vxe-form-item>
+                            <vxe-form-item title="电容器容量检测值(kvar)" field="Capacity" span="12">
+                                <template #default="params">
+                                    <vxe-input v-model="params.data.Capacity" placeholder="请输入电容器容量检测值" clearable
+                                        @change="fnChangeA(params)"></vxe-input>
+                                </template>
+                            </vxe-form-item>
+                            <vxe-form-item title="电容器工作峰值电压(V)" field="CapacityPressure" span="12">
+                                <template #default="params">
+                                    <vxe-input v-model="params.data.CapacityPressure" placeholder="请输入电容器工作峰值电压"
+                                        clearable @change="fnChangeA(params)"></vxe-input>
+                                </template>
+                            </vxe-form-item>
+                            <vxe-form-item title="放电至50V(V)" field="DischargeVoltage" span="12">
+                                <template #default="params">
+                                    <vxe-input v-model="params.data.DischargeVoltage" placeholder="请输入放电至50V" clearable
+                                        @change="fnChangeA(params)"></vxe-input>
+                                </template>
+                            </vxe-form-item>
+                            <vxe-form-item title="放电时间(s；≤180s)" field="DischargeTime" span="12">
+                                <template #default="params">
+                                    <vxe-input v-model="params.data.DischargeTime" 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>
 </template>
 
@@ -445,5 +469,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/duanLuQi/DuanLuQiForm.vue b/src/views/Gw/duanLuQi/DuanLuQiForm.vue
index 1dfc666..d6f146d 100644
--- a/src/views/Gw/duanLuQi/DuanLuQiForm.vue
+++ b/src/views/Gw/duanLuQi/DuanLuQiForm.vue
@@ -1,176 +1,200 @@
 <template>
     <div class="xyp-duan-lu-qi-form" v-if="refShow">
-        <vxe-form title-colon ref="refFormA" title-align="right" title-width="150" :data="formDataA" :rules="formRulesA"
-            @submit="fnSubmitA" @reset="fnResetA" custom-layout>
-            <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 title="基本数据" :bordered="false" style="margin: 10px">
-                        <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>
-                                </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>
-                    </a-card>
-                    <a-card title="采集数据" :bordered="false" style="margin: 10px">
-                        <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-item title="人力分合操作5次，可靠动作" field="TextDescription" span="12">
-                            <template #default="params">
-                                <vxe-select v-model="params.data.TextDescription" 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="额定绝缘电压(V)" field="InsulationVoltageUn" span="12">
-                            <template #default="params">
-                                <vxe-input v-model="params.data.InsulationVoltageUn" placeholder="请输入额定绝缘电压" clearable
-                                    @change="fnChangeA(params)"></vxe-input>
-                            </template>
-                        </vxe-form-item>
-                        <vxe-form-item title="额定电流(A)" field="PcurrentUn" span="12">
-                            <template #default="params">
-                                <vxe-input v-model="params.data.PcurrentUn" placeholder="请输入额定电流" clearable
-                                    @change="fnChangeA(params)"></vxe-input>
-                            </template>
-                        </vxe-form-item>
-                    </a-card>
-                </template>
-                <template #footer>
-                    <vxe-button type="submit" status="primary" content="提交"></vxe-button>
-                    <vxe-button type="reset" content="重置"></vxe-button>
-                </template>
-            </vxe-modal>
-        </vxe-form>
+
+        <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>
+                                    </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-item title="人力分合操作5次，可靠动作" field="TextDescription" span="12">
+                                <template #default="params">
+                                    <vxe-select v-model="params.data.TextDescription" 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="额定绝缘电压(V)" field="InsulationVoltageUn" span="12">
+                                <template #default="params">
+                                    <vxe-input v-model="params.data.InsulationVoltageUn" placeholder="请输入额定绝缘电压"
+                                        clearable @change="fnChangeA(params)"></vxe-input>
+                                </template>
+                            </vxe-form-item>
+                            <vxe-form-item title="额定电流(A)" field="PcurrentUn" span="12">
+                                <template #default="params">
+                                    <vxe-input v-model="params.data.PcurrentUn" 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>
 </template>
 
@@ -423,5 +447,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 5868ba8..4f3054c 100644
--- a/src/views/Gw/fusedIsolationSwitch/FusedIsolationSwitchForm.vue
+++ b/src/views/Gw/fusedIsolationSwitch/FusedIsolationSwitchForm.vue
@@ -1,176 +1,199 @@
 <template>
     <div class="xyp-fused-isolation-switch-form" v-if="refShow">
-        <vxe-form title-colon ref="refFormA" title-align="right" title-width="150" :data="formDataA" :rules="formRulesA"
-            @submit="fnSubmitA" @reset="fnResetA" custom-layout>
-            <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 title="基本数据" :bordered="false" style="margin: 10px">
-                        <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>
-                                </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>
-                    </a-card>
-                    <a-card title="采集数据" :bordered="false" style="margin: 10px">
-                        <vxe-form-item title="人力分合操作5次，可靠动作" field="TextDescription" span="12">
-                            <template #default="params">
-                                <vxe-select v-model="params.data.TextDescription" 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="额定绝缘电压(V)" field="InsulationVoltageUn" span="12">
-                            <template #default="params">
-                                <vxe-input v-model="params.data.InsulationVoltageUn" placeholder="请输入额定绝缘电压" clearable
-                                    @change="fnChangeA(params)"></vxe-input>
-                            </template>
-                        </vxe-form-item>
-                        <vxe-form-item title="熔断器支持件的额定电流(A)" field="PcurrentUn" span="12">
-                            <template #default="params">
-                                <vxe-input v-model="params.data.PcurrentUn" placeholder="请输入熔断器支持件的额定电流" clearable
-                                    @change="fnChangeA(params)"></vxe-input>
-                            </template>
-                        </vxe-form-item>
-                        <vxe-form-item title="熔断体的额定电流(A)" field="TcurrentUn" span="12">
-                            <template #default="params">
-                                <vxe-input v-model="params.data.TcurrentUn" placeholder="请输入熔断体的额定电流" clearable
-                                    @change="fnChangeA(params)"></vxe-input>
-                            </template>
-                        </vxe-form-item>
-                    </a-card>
-                </template>
-                <template #footer>
-                    <vxe-button type="submit" status="primary" content="提交"></vxe-button>
-                    <vxe-button type="reset" content="重置"></vxe-button>
-                </template>
-            </vxe-modal>
-        </vxe-form>
+        <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>
+                                    </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="人力分合操作5次，可靠动作" field="TextDescription" span="12">
+                                <template #default="params">
+                                    <vxe-select v-model="params.data.TextDescription" 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="额定绝缘电压(V)" field="InsulationVoltageUn" span="12">
+                                <template #default="params">
+                                    <vxe-input v-model="params.data.InsulationVoltageUn" placeholder="请输入额定绝缘电压"
+                                        clearable @change="fnChangeA(params)"></vxe-input>
+                                </template>
+                            </vxe-form-item>
+                            <vxe-form-item title="熔断器支持件的额定电流(A)" field="PcurrentUn" span="12">
+                                <template #default="params">
+                                    <vxe-input v-model="params.data.PcurrentUn" placeholder="请输入熔断器支持件的额定电流" clearable
+                                        @change="fnChangeA(params)"></vxe-input>
+                                </template>
+                            </vxe-form-item>
+                            <vxe-form-item title="熔断体的额定电流(A)" field="TcurrentUn" span="12">
+                                <template #default="params">
+                                    <vxe-input v-model="params.data.TcurrentUn" 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>
 </template>
 
@@ -423,5 +446,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/langYongBaoHuQi/LangYongBaoHuQiForm.vue b/src/views/Gw/langYongBaoHuQi/LangYongBaoHuQiForm.vue
index beadaa1..3c9d11f 100644
--- a/src/views/Gw/langYongBaoHuQi/LangYongBaoHuQiForm.vue
+++ b/src/views/Gw/langYongBaoHuQi/LangYongBaoHuQiForm.vue
@@ -1,168 +1,192 @@
 <template>
     <div class="xyp-dian-rong-qi-form" v-if="refShow">
-        <vxe-form title-colon ref="refFormA" title-align="right" title-width="160" :data="formDataA" :rules="formRulesA"
-            @submit="fnSubmitA" @reset="fnResetA" custom-layout>
-            <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 title="基本数据" :bordered="false" style="margin: 10px">
-                        <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>
-                                </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>
-                    </a-card>
-                    <a-card title="采集数据" :bordered="false" style="margin: 10px">
-                        <vxe-form-item title="电压保护水平(V)" field="PressureValue" span="12">
-                            <template #default="params">
-                                <vxe-input v-model="params.data.PressureValue" placeholder="请输入电压保护水平" clearable
-                                    @change="fnChangeA(params)"></vxe-input>
-                            </template>
-                        </vxe-form-item>
-                        <vxe-form-item title="标称最大放电电流(kA)" field="DischargeCurrent" span="12">
-                            <template #default="params">
-                                <vxe-input v-model="params.data.DischargeCurrent" placeholder="请输入标称最大放电电流" clearable
-                                    @change="fnChangeA(params)"></vxe-input>
-                            </template>
-                        </vxe-form-item>
-                        <vxe-form-item title="试验等级(如T1)" field="TestLevel" span="12">
-                            <template #default="params">
-                                <vxe-input v-model="params.data.TestLevel" placeholder="请输入试验等级" clearable
-                                    @change="fnChangeA(params)"></vxe-input>
-                            </template>
-                        </vxe-form-item>
-                    </a-card>
-                </template>
-                <template #footer>
-                    <vxe-button type="submit" status="primary" content="提交"></vxe-button>
-                    <vxe-button type="reset" content="重置"></vxe-button>
-                </template>
-            </vxe-modal>
-        </vxe-form>
+
+        <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="160" :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>
+                                    </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="电压保护水平(V)" field="PressureValue" span="12">
+                                <template #default="params">
+                                    <vxe-input v-model="params.data.PressureValue" placeholder="请输入电压保护水平" clearable
+                                        @change="fnChangeA(params)"></vxe-input>
+                                </template>
+                            </vxe-form-item>
+                            <vxe-form-item title="标称最大放电电流(kA)" field="DischargeCurrent" span="12">
+                                <template #default="params">
+                                    <vxe-input v-model="params.data.DischargeCurrent" placeholder="请输入标称最大放电电流"
+                                        clearable @change="fnChangeA(params)"></vxe-input>
+                                </template>
+                            </vxe-form-item>
+                            <vxe-form-item title="试验等级(如T1)" field="TestLevel" span="12">
+                                <template #default="params">
+                                    <vxe-input v-model="params.data.TestLevel" 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>
 </template>
 
@@ -401,5 +425,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/muPai/MuPaiForm.vue b/src/views/Gw/muPai/MuPaiForm.vue
index 4999141..a0f181e 100644
--- a/src/views/Gw/muPai/MuPaiForm.vue
+++ b/src/views/Gw/muPai/MuPaiForm.vue
@@ -1,260 +1,255 @@
 <template>
-    <div class="xyp-mu-pai-form" v-if="refShow">
+    <vxe-modal className="csty-mu-pai-form" v-model="refShow" width="1200" height="770" show-zoom show-footer
+        :mask-closable=true>
+        <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">
+                                {{ params.data.StandardVersion }}
+                            </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)"></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="Texture" span="12">
+                            <template #default="params">
+                                <vxe-input v-model="params.data.Texture" placeholder="请输入材质" clearable
+                                    @change="fnChangeA(params)"></vxe-input>
+                            </template>
+                        </vxe-form-item>
+                        <vxe-form-item title="公称厚度(mm)" field="Thickness" span="12">
+                            <template #default="params">
+                                <vxe-input v-model="params.data.Thickness" placeholder="请输入公称厚度" clearable
+                                    @change="fnChangeA(params)"></vxe-input>
+                            </template>
+                        </vxe-form-item>
+                        <vxe-form-item title="公称宽带(mm)" field="Width" span="12">
+                            <template #default="params">
+                                <vxe-input v-model="params.data.Width" 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" @reset="fnResetA">
-                        <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">
-                                    {{ params.data.StandardVersion }}
-                                </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)"></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 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">
-                                    <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="Texture" span="12">
-                                <template #default="params">
-                                    <vxe-input v-model="params.data.Texture" placeholder="请输入材质" clearable
-                                        @change="fnChangeA(params)"></vxe-input>
-                                </template>
-                            </vxe-form-item>
-                            <vxe-form-item title="公称厚度(mm)" field="Thickness" span="12">
-                                <template #default="params">
-                                    <vxe-input v-model="params.data.Thickness" placeholder="请输入公称厚度" clearable
-                                        @change="fnChangeA(params)"></vxe-input>
-                                </template>
-                            </vxe-form-item>
-                            <vxe-form-item title="公称宽带(mm)" field="Width" span="12">
-                                <template #default="params">
-                                    <vxe-input v-model="params.data.Width" 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 }">
-
-                                                <template v-if="row.typeCode == 1">
-                                                    1. 来料检测报告
-                                                </template>
-                                                <template v-else>
-                                                    2. 生产商检测报告
-                                                </template>
+                                    </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>
-                                        </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>
-                                        </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 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>
-                                        </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>
-
-    </div>
+                                        </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="MuPaiForm">
@@ -269,103 +264,52 @@ 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 fileListA = ref<UploadProps['fileList']>([]);
-const fileListB = ref<UploadProps['fileList']>([]);
-// 附件上传路径
-const fileUpUrl: any = computed(() => {
-    let url = config.base_url + '/DistributionBoxTesting/UploadFile'
-    return url
-})
+const { dictProcessType } = storeToRefs(dictStore)
 // 定义事件[success]
 const emit = defineEmits(['success'])
 // 是否显示
 const refShow = ref(false)
+// 弹窗标题
+const modalTitle = ref('未知表单')
+// 表单
+const refFormA = ref()
+// 表单类型[add - 新增|update - 修改|del - 删除]
+const formType: any = 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": "GX000078",
-    "ProcessType": 1,
-    "IsQualify": undefined,
-    "Ecode": "NotImp",
-    "SgEntityId": "NotImp",
-    "DataUniqueIdentifier": "NotImp",
-    "Texture": undefined,
-    "Thickness": undefined,
-    "Width": undefined,
-    "Sended": 0
-}
-// 表单B - 初始数据
-const formDataBInit: any = {
     ID: 0,
-    StandardVersion: "",
+    StandardVersion: 1,
     SupplierWorkNo: "",
-    SupplierCode: "",
-    ModelCode: "",
-    CategoryType: "",
+    SupplierCode: "1000032215",
+    ModelCode: "dtb00003",
+    CategoryType: "90003",
     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: "GX000080",
-    FpdCode: "",
-    Ecode: '',
-    SgEntityId: "",
-    DataUniqueIdentifier: "",
+    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: "GX000078",
+    ProcessType: 1,
+    IsQualify: undefined,
+    Ecode: "NotImp",
+    SgEntityId: "NotImp",
+    DataUniqueIdentifier: "NotImp",
+    Texture: undefined,
+    Thickness: undefined,
+    Width: undefined,
     Sended: 0
 }
-// 表单
-const refFormA = ref()
-// 表单
-const fileItems = computed(() => {
-    let FileItems: any = XEUtils.clone(formDataB.value.FileItems, true)
-    FileItems = JSON.parse(FileItems)
-    return FileItems
-})
-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)
-    }
-}
-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)
-    }
-}
-// 表单类型[add - 新增|update - 修改|del - 删除]
-const formTypeA: any = ref('')
-// 弹窗标题
-const modalTitle = ref('未知表单')
-// 表单A数据
+// 表单A - 数据
 const formDataA: any = ref(formDataAInit)
-// 表单规则
+// 表单A - 规则
 const formRulesA: any = ref({
     SupplierWorkNo: [
         { required: true, message: '请输入供应商工单编号' }
@@ -410,23 +354,56 @@ const formRulesA: any = ref({
         { required: true, message: '请输入公称宽度' }
     ]
 })
-// 表单B数据
+// 表单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':
-            modalTitle.value = '新增母排'
             refShow.value = true
+            modalTitle.value = '新增母排'
             break;
         case 'edit':
-            modalTitle.value = '编辑母排'
             refShow.value = true
+            modalTitle.value = '编辑母排'
             const paramsA = {
                 "filter": {
                     "field": "ID",
@@ -453,8 +430,8 @@ const open = async (type: string, row?: any) => {
             }
             break;
         case 'copy':
-            modalTitle.value = '复制母排'
             refShow.value = true
+            modalTitle.value = '复制母排'
             const paramsB = {
                 "filter": {
                     "field": "ID",
@@ -475,6 +452,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
@@ -508,7 +505,7 @@ const fnDeleteA = async (row: any) => {
 const fnSubmitA = async () => {
     await refFormA.value.validate().then(async (res: any) => {
         if (!res) {
-            switch (formTypeA.value) {
+            switch (formType.value) {
                 case 'add':
                     const paramsA = {
                         data: formDataA.value
@@ -553,6 +550,7 @@ const fnSubmitB = async () => {
     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
@@ -589,7 +587,7 @@ const fnSubmitB = async () => {
     }
 }
 // 重置
-const fnResetA = () => {
+const fnResetA = async () => {
     formDataA.value = formDataAInit
     formDataB.value = formDataBInit
 }
diff --git a/src/views/Gw/shengYuDianLiuDongZuoBaoHu/ShengYuDianLiuDongZuoBaoHuForm.vue b/src/views/Gw/shengYuDianLiuDongZuoBaoHu/ShengYuDianLiuDongZuoBaoHuForm.vue
index 1e37306..0bc31ad 100644
--- a/src/views/Gw/shengYuDianLiuDongZuoBaoHu/ShengYuDianLiuDongZuoBaoHuForm.vue
+++ b/src/views/Gw/shengYuDianLiuDongZuoBaoHu/ShengYuDianLiuDongZuoBaoHuForm.vue
@@ -1,182 +1,205 @@
 <template>
     <div class="xyp-sheng-yu-dian-liu-dong-zuo-bao-hu-form" v-if="refShow">
-        <vxe-form title-colon ref="refFormA" title-align="right" title-width="150" :data="formDataA" :rules="formRulesA"
-            @submit="fnSubmitA" @reset="fnResetA" custom-layout>
-            <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 title="基本数据" :bordered="false" style="margin: 10px">
-                        <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>
-                                </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>
-                    </a-card>
-                    <a-card title="采集数据" :bordered="false" style="margin: 10px">
-                        <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-item title="人力分合操作5次，可靠动作" field="TextDescription" span="12">
-                            <template #default="params">
-                                <vxe-select v-model="params.data.TextDescription" 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="额定绝缘电压(V)" field="InsulationVoltageUn" span="12">
-                            <template #default="params">
-                                <vxe-input v-model="params.data.InsulationVoltageUn" placeholder="请输入额定绝缘电压" clearable
-                                    @change="fnChangeA(params)"></vxe-input>
-                            </template>
-                        </vxe-form-item>
-                        <vxe-form-item title="额定电流(A)" field="PcurrentUn" span="12">
-                            <template #default="params">
-                                <vxe-input v-model="params.data.PcurrentUn" placeholder="请输入额定电流" clearable
-                                    @change="fnChangeA(params)"></vxe-input>
-                            </template>
-                        </vxe-form-item>
-                        <vxe-form-item title="漏电动作电流(mA)" field="CurrentLeakage" span="12">
-                            <template #default="params">
-                                <vxe-input v-model="params.data.CurrentLeakage" placeholder="请输入漏电动作电流" clearable
-                                    @change="fnChangeA(params)"></vxe-input>
-                            </template>
-                        </vxe-form-item>
-                    </a-card>
-                </template>
-                <template #footer>
-                    <vxe-button type="submit" status="primary" content="提交"></vxe-button>
-                    <vxe-button type="reset" content="重置"></vxe-button>
-                </template>
-            </vxe-modal>
-        </vxe-form>
+        <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>
+                                    </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-item title="人力分合操作5次，可靠动作" field="TextDescription" span="12">
+                                <template #default="params">
+                                    <vxe-select v-model="params.data.TextDescription" 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="额定绝缘电压(V)" field="InsulationVoltageUn" span="12">
+                                <template #default="params">
+                                    <vxe-input v-model="params.data.InsulationVoltageUn" placeholder="请输入额定绝缘电压"
+                                        clearable @change="fnChangeA(params)"></vxe-input>
+                                </template>
+                            </vxe-form-item>
+                            <vxe-form-item title="额定电流(A)" field="PcurrentUn" span="12">
+                                <template #default="params">
+                                    <vxe-input v-model="params.data.PcurrentUn" placeholder="请输入额定电流" clearable
+                                        @change="fnChangeA(params)"></vxe-input>
+                                </template>
+                            </vxe-form-item>
+                            <vxe-form-item title="漏电动作电流(mA)" field="CurrentLeakage" span="12">
+                                <template #default="params">
+                                    <vxe-input v-model="params.data.CurrentLeakage" 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>
 </template>
 
@@ -233,7 +256,7 @@ const formDataA: any = ref(
         "PcurrentUn": undefined,
         "CurrentLeakage": undefined,
         "Sended": 0
-        
+
     })
 // 表单规则
 const formRulesA: any = ref({
@@ -435,5 +458,9 @@ const fnResetA = () => {
         "Sended": 0
     }
 }
+// 关闭窗体
+const fnEventCancel = () => {
+    refShow.value = false
+}
 </script>
 <style scoped></style>
\ No newline at end of file