From 76c62c0b2813d894a6d6befe8d885b181c82193e Mon Sep 17 00:00:00 2001
From: mhsnet <mhsnet@163.com>
Date: Wed, 3 Apr 2024 14:38:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BA=8F=E5=88=97=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/gw/com/index.ts                       |  8 ++
 src/views/Gw/biLeiQi/BiLeiQi.vue              |  7 +-
 src/views/Gw/biLeiQi/BiLeiQiForm.vue          | 90 ++++++++++---------
 .../Gw/boxMateQuality/BoxMateQuality.vue      |  4 +-
 .../Gw/boxMateQuality/BoxMateQualityForm.vue  | 14 +--
 .../Gw/dianLiuHuGanQi/DianLiuHuGanQi.vue      |  8 +-
 .../Gw/dianLiuHuGanQi/DianLiuHuGanQiForm.vue  | 13 ++-
 src/views/Gw/dianRongQi/DianRongQi.vue        |  8 +-
 src/views/Gw/dianRongQi/DianRongQiForm.vue    | 13 ++-
 src/views/Gw/duanLuQi/DuanLuQi.vue            |  8 +-
 src/views/Gw/duanLuQi/DuanLuQiForm.vue        | 13 ++-
 .../FusedIsolationSwitch.vue                  |  8 +-
 .../FusedIsolationSwitchForm.vue              | 13 ++-
 .../Gw/langYongBaoHuQi/LangYongBaoHuQi.vue    |  8 +-
 .../langYongBaoHuQi/LangYongBaoHuQiForm.vue   | 86 ++++++++++--------
 src/views/Gw/muPai/MuPai.vue                  |  8 +-
 src/views/Gw/muPai/MuPaiForm.vue              | 13 ++-
 .../ShengYuDianLiuDongZuoBaoHu.vue            |  8 +-
 .../ShengYuDianLiuDongZuoBaoHuForm.vue        | 13 ++-
 19 files changed, 187 insertions(+), 156 deletions(-)
 create mode 100644 src/api/gw/com/index.ts

diff --git a/src/api/gw/com/index.ts b/src/api/gw/com/index.ts
new file mode 100644
index 0000000..8197162
--- /dev/null
+++ b/src/api/gw/com/index.ts
@@ -0,0 +1,8 @@
+import request from '@/config/axios'
+
+// 获取系统序列号
+export const getSystemSerialNo = async () => {
+  return await request.post({ url: `/DistributionBoxTesting/GetSystemSerialNo` }).then((res) => {
+    return res.SerialNo
+  })
+}
diff --git a/src/views/Gw/biLeiQi/BiLeiQi.vue b/src/views/Gw/biLeiQi/BiLeiQi.vue
index 873ccba..cc71320 100644
--- a/src/views/Gw/biLeiQi/BiLeiQi.vue
+++ b/src/views/Gw/biLeiQi/BiLeiQi.vue
@@ -50,7 +50,7 @@ const gridOptionsA: any = reactive({
         { field: 'SupplierCode', title: '国网侧供应商编码', sortable: true, width: '160px' },
         { field: 'ModelCode', title: '规格型号编码', width: '140px' },
         { field: 'CategoryType', title: '物资种类编码', width: '120px' },
-        { field: 'SerialNo', title: '序列号', sortable: true, width: '110px' },
+        { field: 'SerialNo', title: '序列号', sortable: true, width: '210px' },
         { field: 'RmibNumber', title: '原材料检验批次号', sortable: true, width: '160px' },
         { field: 'RmbNumber', title: '原材料批次号', sortable: true, width: '130px' },
         { field: 'BorMaterials', title: '原材料品牌', sortable: true, width: '180px' },
@@ -65,7 +65,7 @@ const gridOptionsA: any = reactive({
         { field: 'IsQualify', title: '检验结果是否合格', width: '140px', slots: { default: 'slotIsQualify' } },
         { field: 'Ecode', title: 'ecode码', width: '110px' },
         { field: 'SgEntityId', title: '国网实物Id', width: '110px' },
-        { field: 'DataUniqueIdentifier', title: '数据唯一标识', width: '110px' },
+        { field: 'DataUniqueIdentifier', title: '数据唯一标识', width: '250px' },
         { field: 'ModelSpecification', title: '规格型号', width: '160px' },
         { field: 'PressureValue', title: '额定电压(kV)', width: '120px' },
         { title: '操作', width: 250, fixed: 'right', slots: { default: 'operate' } }
@@ -143,7 +143,6 @@ const gridOptionsA: any = reactive({
                         if (o1.order == "asc") {
                             isAscending = true;
                         }
-                        console.log(o1)
                         return {
                             "field": o1.field,
                             "isAscending": (() => {
@@ -152,7 +151,6 @@ const gridOptionsA: any = reactive({
                         }
                     })
                 }
-                // console.log(queryParams)
                 const data = await BiLeiQiApi.getBiLeiQiPaging(queryParamsA)
                 return data
                 // // 处理排序条件
@@ -172,7 +170,6 @@ const gridOptionsA: any = reactive({
             // 当点击工具栏保存按钮或者手动提交指令 save 时会被触发
             save: ({ body }:any) => { },
             add: ({ body }: any) => {
-                console.log(body)
             },
         }
     }
diff --git a/src/views/Gw/biLeiQi/BiLeiQiForm.vue b/src/views/Gw/biLeiQi/BiLeiQiForm.vue
index 5916e27..f6d1429 100644
--- a/src/views/Gw/biLeiQi/BiLeiQiForm.vue
+++ b/src/views/Gw/biLeiQi/BiLeiQiForm.vue
@@ -1,5 +1,6 @@
 <template>
-    <vxe-modal class-name="csty-bi-lei-qi-form" v-model="refShow" width="1200" height="770" show-zoom show-footer :mask-closable=true>
+    <vxe-modal class-name="csty-bi-lei-qi-form" v-model="refShow" width="1200" height="770" show-zoom show-footer
+        :mask-closable=true>
         <template #title>
             <span style="color:#ffffff">{{ modalTitle }}</span>
         </template>
@@ -44,12 +45,12 @@
                                     <span>{{ params.data.CategoryType }}</span>
                                 </template>
                             </vxe-form-item> -->
-                        <vxe-form-item title="序列号" field="SerialNo" span="12">
+                        <!-- <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> -->
                         <vxe-form-item title="原材料检验批次号" field="RmibNumber" span="12">
                             <template #default="params">
                                 <vxe-input v-model="params.data.RmibNumber" placeholder="请输入原材料检验批次号" clearable
@@ -113,7 +114,7 @@
                                     <span>{{ params.data.PdCode }}</span>
                                 </template>
                             </vxe-form-item> -->
-                        <vxe-form-item title="感知过程" field="ProcessType" span="12">
+                        <!-- <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">
@@ -121,7 +122,7 @@
                                     </template>
                                 </vxe-select>
                             </template>
-                        </vxe-form-item>
+                        </vxe-form-item> -->
                         <vxe-form-item title="检验结果是否合格" field="IsQualify" span="12">
                             <template #default="params">
                                 <vxe-select v-model="params.data.IsQualify" clearable>
@@ -257,6 +258,7 @@ 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'
+import * as comApi from '@/api/gw/com'
 // 字典
 const dictStore = useDictStore()
 const { dictProcessType } = storeToRefs(dictStore)
@@ -383,6 +385,7 @@ const open = async (type: string, row?: any) => {
         case 'add':
             refShow.value = true
             modalTitle.value = '新增避雷器'
+            formDataA.value.SerialNo = await comApi.getSystemSerialNo()
             break;
         case 'edit':
             refShow.value = true
@@ -424,12 +427,13 @@ const open = async (type: string, row?: any) => {
             }
             const rowInfoB = await BiLeiQiApi.getBiLeiQi(paramsB)
             rowInfoB.Data.ID = 0
-            rowInfoB.Data.ManufactureDate = dayjs().format("YYYY-MM-DD"),
-            rowInfoB.Data.IncomDate = dayjs().format("YYYY-MM-DD"),
+            rowInfoB.Data.ManufactureDate = dayjs().format("YYYY-MM-DD")
+            rowInfoB.Data.IncomDate = dayjs().format("YYYY-MM-DD")
             rowInfoB.Data.CheckTime = dayjs().format("YYYY-MM-DD HH:mm:ss")
             rowInfoB.Data.PutCenterTime = dayjs().format("YYYY-MM-DD HH:mm:ss")
             rowInfoB.Data.Sended = 0
             formDataA.value = rowInfoB.Data
+            formDataA.value.SerialNo = await comApi.getSystemSerialNo()
             break;
         case 'delete':
             modalTitle.value = '删除避雷器'
@@ -488,40 +492,45 @@ const fnDeleteA = async (row: any) => {
 }
 // 提交
 const fnSubmitA = async () => {
-    switch (formTypeA.value) {
-        case 'add':
-            const paramsA = {
-                data: formDataA.value
+    refFormA.value.validate().then(async (res: any) => {
+        if (!res) {
+            formDataA.value.Sended = 0
+            switch (formTypeA.value) {
+                case 'add':
+                    const paramsA = {
+                        data: formDataA.value
+                    }
+                    await BiLeiQiApi.saveBiLeiQi(paramsA)
+                    await fnSubmitB()
+                    VXETable.modal.message({ content: '新增成功', status: 'success' })
+                    break;
+                case 'edit':
+                    let setVal: any = _map(formDataA.value, (o1, k1) => {
+                        return { field: k1, value: o1 }
+                    })
+                    const paramsB = {
+                        filter: {
+                            field: 'ID',
+                            value: formDataA.value.ID
+                        },
+                        set: setVal
+                    }
+                    await BiLeiQiApi.editBiLeiQi(paramsB)
+                    await fnSubmitB()
+                    VXETable.modal.message({ content: '编辑成功', status: 'success' })
+                    break;
+                case 'copy':
+                    const paramsC = {
+                        data: formDataA.value
+                    }
+                    await BiLeiQiApi.saveBiLeiQi(paramsC)
+                    VXETable.modal.message({ content: '复制成功', status: 'success' })
+                    break;
             }
-            await BiLeiQiApi.saveBiLeiQi(paramsA)
-            await fnSubmitB()
-            VXETable.modal.message({ content: '新增成功', status: 'success' })
-            break;
-        case 'edit':
-            let setVal: any = _map(formDataA.value, (o1, k1) => {
-                return { field: k1, value: o1 }
-            })
-            const paramsB = {
-                filter: {
-                    field: 'ID',
-                    value: formDataA.value.ID
-                },
-                set: setVal
-            }
-            await BiLeiQiApi.editBiLeiQi(paramsB)
-            await fnSubmitB()
-            VXETable.modal.message({ content: '编辑成功', status: 'success' })
-            break;
-        case 'copy':
-            const paramsC = {
-                data: formDataA.value
-            }
-            await BiLeiQiApi.saveBiLeiQi(paramsC)
-            VXETable.modal.message({ content: '复制成功', status: 'success' })
-            break;
-    }
-    refShow.value = false
-    emit('success')
+            refShow.value = false
+            emit('success')
+        }
+    })
 }
 // 表单B - 提交
 const fnSubmitB = async () => {
@@ -538,6 +547,7 @@ const fnSubmitB = async () => {
     formDataB.value.DataUniqueIdentifier = formDataA.value.DataUniqueIdentifier
     formDataB.value.CheckTime = formDataA.value.CheckTime
     formDataB.value.PutCenterTime = formDataA.value.PutCenterTime
+    formDataB.value.Sended = 0
     const queryParamsA: any = {
         "filter": {
             "field": 'SerialNo',
diff --git a/src/views/Gw/boxMateQuality/BoxMateQuality.vue b/src/views/Gw/boxMateQuality/BoxMateQuality.vue
index ed59599..61f6116 100644
--- a/src/views/Gw/boxMateQuality/BoxMateQuality.vue
+++ b/src/views/Gw/boxMateQuality/BoxMateQuality.vue
@@ -57,7 +57,7 @@ const gridOptionsA: any = reactive({
         { field: 'SupplierCode', title: '国网侧供应商编码', sortable: true, width: '160px' },
         { field: 'ModelCode', title: '规格型号编码', width: '140px' },
         { field: 'CategoryType', title: '物资种类编码', width: '120px' },
-        { field: 'SerialNo', title: '序列号', sortable: true, width: '110px' },
+        { field: 'SerialNo', title: '序列号', sortable: true, width: '210px' },
         { field: 'RmibNumber', title: '原材料检验批次号', sortable: true, width: '160px' },
         { field: 'RmbNumber', title: '原材料批次号', sortable: true, width: '130px' },
         { field: 'BorMaterials', title: '原材料品牌', sortable: true, width: '180px' },
@@ -75,7 +75,7 @@ const gridOptionsA: any = reactive({
         { field: 'IsQualify', title: '检验结果是否合格', width: '140px', slots: { default: 'slotIsQualify' } },
         { field: 'Ecode', title: 'ecode码', width: '110px' },
         { field: 'SgEntityId', title: '国网实物Id', width: '110px' },
-        { field: 'DataUniqueIdentifier', title: '数据唯一标识', width: '110px' },
+        { field: 'DataUniqueIdentifier', title: '数据唯一标识', width: '250px' },
         { field: 'Texture', title: '材质', width: '110px' },
         { field: 'Thickness', title: '公称厚度(mm)', width: '120px' },
         { field: 'Size', title: '尺寸(宽*深*高)', width: '220px' },
diff --git a/src/views/Gw/boxMateQuality/BoxMateQualityForm.vue b/src/views/Gw/boxMateQuality/BoxMateQualityForm.vue
index 68e2eb0..5175b9d 100644
--- a/src/views/Gw/boxMateQuality/BoxMateQualityForm.vue
+++ b/src/views/Gw/boxMateQuality/BoxMateQualityForm.vue
@@ -45,12 +45,12 @@
                                 <span>{{ params.data.CategoryType }}</span>
                             </template>
                         </vxe-form-item> -->
-                        <vxe-form-item title="序列号" field="SerialNo" span="12">
+                        <!-- <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> -->
                         <vxe-form-item title="原材料检验批次号" field="RmibNumber" span="12">
                             <template #default="params">
                                 <vxe-input v-model="params.data.RmibNumber" placeholder="请输入原材料检验批次号" clearable
@@ -114,7 +114,7 @@
                                 <span>{{ params.data.PdCode }}</span>
                             </template>
                         </vxe-form-item> -->
-                        <vxe-form-item title="感知过程" field="ProcessType" span="12">
+                        <!-- <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">
@@ -122,7 +122,7 @@
                                     </template>
                                 </vxe-select>
                             </template>
-                        </vxe-form-item>
+                        </vxe-form-item> -->
                         <vxe-form-item title="检验结果是否合格" field="IsQualify" span="12">
                             <template #default="params">
                                 <vxe-select v-model="params.data.IsQualify" clearable>
@@ -264,6 +264,7 @@ 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 * as comApi from '@/api/gw/com'
 // 字典
 const dictStore = useDictStore()
 const { dictProcessType } = storeToRefs(dictStore)
@@ -381,7 +382,6 @@ 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
 })
@@ -404,6 +404,7 @@ const open = async (type: string, row?: any) => {
         case 'add':
             refShow.value = true
             modalTitle.value = '新增柜体材质，厚度及尺寸'
+            formDataA.value.SerialNo = await comApi.getSystemSerialNo()
             break;
         case 'edit':
             refShow.value = true
@@ -451,6 +452,7 @@ const open = async (type: string, row?: any) => {
             rowInfoB.Data.PutCenterTime = dayjs().format("YYYY-MM-DD HH:mm:ss")
             rowInfoB.Data.Sended = 0
             formDataA.value = rowInfoB.Data
+            formDataA.value.SerialNo = await comApi.getSystemSerialNo()
             break;
         case 'delete':
             modalTitle.value = '删除柜体材质，厚度及尺寸'
@@ -511,6 +513,7 @@ const fnDeleteA = async (row: any) => {
 const fnSubmitA = async () => {
     refFormA.value.validate().then(async (res: any) => {
         if (!res) {
+            formDataA.value.Sended = 0
             switch (formType.value) {
                 case 'add':
                     const paramsA = {
@@ -563,6 +566,7 @@ const fnSubmitB = async () => {
     formDataB.value.DataUniqueIdentifier = formDataA.value.DataUniqueIdentifier
     formDataB.value.CheckTime = formDataA.value.CheckTime
     formDataB.value.PutCenterTime = formDataA.value.PutCenterTime
+    formDataB.value.Sended = 0
     const queryParamsA: any = {
         "filter": {
             "field": 'SerialNo',
diff --git a/src/views/Gw/dianLiuHuGanQi/DianLiuHuGanQi.vue b/src/views/Gw/dianLiuHuGanQi/DianLiuHuGanQi.vue
index a62e82d..7263f90 100644
--- a/src/views/Gw/dianLiuHuGanQi/DianLiuHuGanQi.vue
+++ b/src/views/Gw/dianLiuHuGanQi/DianLiuHuGanQi.vue
@@ -50,7 +50,7 @@ const gridOptionsA: any = reactive({
         { field: 'SupplierCode', title: '国网侧供应商编码', sortable: true, width: '160px' },
         { field: 'ModelCode', title: '规格型号编码', width: '140px' },
         { field: 'CategoryType', title: '物资种类编码', width: '120px' },
-        { field: 'SerialNo', title: '序列号', sortable: true, width: '110px' },
+        { field: 'SerialNo', title: '序列号', sortable: true, width: '210px' },
         { field: 'RmibNumber', title: '原材料检验批次号', sortable: true, width: '160px' },
         { field: 'RmbNumber', title: '原材料批次号', sortable: true, width: '130px' },
         { field: 'BorMaterials', title: '原材料品牌', sortable: true, width: '190px' },
@@ -65,7 +65,7 @@ const gridOptionsA: any = reactive({
         { field: 'IsQualify', title: '检验结果是否合格', width: '140px', slots: { default: 'slotIsQualify' } },
         { field: 'Ecode', title: 'ecode码', width: '110px' },
         { field: 'SgEntityId', title: '国网实物Id', width: '110px' },
-        { field: 'DataUniqueIdentifier', title: '数据唯一标识', width: '110px' },
+        { field: 'DataUniqueIdentifier', title: '数据唯一标识', width: '250px' },
         { field: 'ModelSpecification', title: '规格型号', width: '180px' },
         { field: 'Precision', title: '精度', width: '120px' },
         { title: '操作', width: 250, fixed: 'right', slots: { default: 'operate' } }
@@ -143,7 +143,6 @@ const gridOptionsA: any = reactive({
                         if (o1.order == "asc") {
                             isAscending = true;
                         }
-                        console.log(o1)
                         return {
                             "field": o1.field,
                             "isAscending": (() => {
@@ -152,9 +151,7 @@ const gridOptionsA: any = reactive({
                         }
                     })
                 }
-                // console.log(queryParams)
                 const data = await DianLiuHuGanQiApi.getDianLiuHuGanQiPaging(queryParamsA)
-                console.log(data)
                 return data
                 // // 处理排序条件
                 // const firstSort = sorts[0]
@@ -173,7 +170,6 @@ const gridOptionsA: any = reactive({
             // 当点击工具栏保存按钮或者手动提交指令 save 时会被触发
             save: ({ body }: any) => { },
             add: ({ body }: any) => {
-                console.log(body)
             },
         }
     }
diff --git a/src/views/Gw/dianLiuHuGanQi/DianLiuHuGanQiForm.vue b/src/views/Gw/dianLiuHuGanQi/DianLiuHuGanQiForm.vue
index c94e0e6..397d3bd 100644
--- a/src/views/Gw/dianLiuHuGanQi/DianLiuHuGanQiForm.vue
+++ b/src/views/Gw/dianLiuHuGanQi/DianLiuHuGanQiForm.vue
@@ -45,12 +45,12 @@
                                 <span>{{ params.data.CategoryType }}</span>
                             </template>
                         </vxe-form-item> -->
-                        <vxe-form-item title="序列号" field="SerialNo" span="12">
+                        <!-- <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> -->
                         <vxe-form-item title="原材料检验批次号" field="RmibNumber" span="12">
                             <template #default="params">
                                 <vxe-input v-model="params.data.RmibNumber" placeholder="请输入原材料检验批次号" clearable
@@ -114,7 +114,7 @@
                                 <span>{{ params.data.PdCode }}</span>
                             </template>
                         </vxe-form-item> -->
-                        <vxe-form-item title="感知过程" field="ProcessType" span="12">
+                        <!-- <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">
@@ -122,7 +122,7 @@
                                     </template>
                                 </vxe-select>
                             </template>
-                        </vxe-form-item>
+                        </vxe-form-item> -->
                         <vxe-form-item title="检验结果是否合格" field="IsQualify" span="12">
                             <template #default="params">
                                 <vxe-select v-model="params.data.IsQualify" clearable>
@@ -251,6 +251,7 @@ 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'
+import * as comApi from '@/api/gw/com'
 // 字典
 const dictStore = useDictStore()
 const { dictProcessType } = storeToRefs(dictStore)
@@ -377,6 +378,7 @@ const open = async (type: string, row?: any) => {
         case 'add':
             refShow.value = true
             modalTitle.value = '新增电流互感器'
+            formDataA.value.SerialNo = await comApi.getSystemSerialNo()
             break;
         case 'edit':
             refShow.value = true
@@ -424,6 +426,7 @@ const open = async (type: string, row?: any) => {
             rowInfoB.Data.PutCenterTime = dayjs().format("YYYY-MM-DD HH:mm:ss")
             rowInfoB.Data.Sended = 0
             formDataA.value = rowInfoB.Data
+            formDataA.value.SerialNo = await comApi.getSystemSerialNo()
             break;
         case 'delete':
             modalTitle.value = '删除电流互感器'
@@ -484,6 +487,7 @@ const fnDeleteA = async (row: any) => {
 const fnSubmitA = async () => {
     await refFormA.value.validate().then(async (res: any) => {
         if (!res) {
+            formDataA.value.Sended = 0
             switch (formType.value) {
                 case 'add':
                     const paramsA = {
@@ -536,6 +540,7 @@ const fnSubmitB = async () => {
     formDataB.value.DataUniqueIdentifier = formDataA.value.DataUniqueIdentifier
     formDataB.value.CheckTime = formDataA.value.CheckTime
     formDataB.value.PutCenterTime = formDataA.value.PutCenterTime
+    formDataB.value.Sended = 0
     const queryParamsA: any = {
         "filter": {
             "field": 'SerialNo',
diff --git a/src/views/Gw/dianRongQi/DianRongQi.vue b/src/views/Gw/dianRongQi/DianRongQi.vue
index 348ff21..50a2f15 100644
--- a/src/views/Gw/dianRongQi/DianRongQi.vue
+++ b/src/views/Gw/dianRongQi/DianRongQi.vue
@@ -57,7 +57,7 @@ const gridOptionsA: any = reactive({
         { field: 'SupplierCode', title: '国网侧供应商编码', sortable: true, width: '160px' },
         { field: 'ModelCode', title: '规格型号编码', width: '140px' },
         { field: 'CategoryType', title: '物资种类编码', width: '120px' },
-        { field: 'SerialNo', title: '序列号', sortable: true, width: '110px' },
+        { field: 'SerialNo', title: '序列号', sortable: true, width: '210px' },
         { field: 'RmibNumber', title: '原材料检验批次号', sortable: true, width: '160px' },
         { field: 'RmbNumber', title: '原材料批次号', sortable: true, width: '130px' },
         { field: 'BorMaterials', title: '原材料品牌', sortable: true, width: '180px' },
@@ -72,7 +72,7 @@ const gridOptionsA: any = reactive({
         { field: 'IsQualify', title: '检验结果是否合格', width: '140px', slots: { default: 'slotIsQualify' } },
         { field: 'Ecode', title: 'ecode码', width: '110px' },
         { field: 'SgEntityId', title: '国网实物Id', width: '110px' },
-        { field: 'DataUniqueIdentifier', title: '数据唯一标识', width: '110px' },
+        { field: 'DataUniqueIdentifier', title: '数据唯一标识', width: '250px' },
         { field: 'ModelSpecification', title: '规格型号', width: '160px' },
         { field: 'PressureValue', title: '额定电压(V)', width: '120px' },
         { field: 'CapacityUn', title: '电容器铭牌容量值(kvar)', width: '170px' },
@@ -155,7 +155,6 @@ const gridOptionsA: any = reactive({
                         if (o1.order == "asc") {
                             isAscending = true;
                         }
-                        console.log(o1)
                         return {
                             "field": o1.field,
                             "isAscending": (() => {
@@ -164,9 +163,7 @@ const gridOptionsA: any = reactive({
                         }
                     })
                 }
-                // console.log(queryParams)
                 const data = await DianRongQiApi.getDianRongQiPaging(queryParamsA)
-                console.log(data)
                 return data
                 // // 处理排序条件
                 // const firstSort = sorts[0]
@@ -185,7 +182,6 @@ const gridOptionsA: any = reactive({
             // 当点击工具栏保存按钮或者手动提交指令 save 时会被触发
             save: ({ body }: any) => { },
             add: ({ body }: any) => {
-                console.log(body)
             },
         }
     }
diff --git a/src/views/Gw/dianRongQi/DianRongQiForm.vue b/src/views/Gw/dianRongQi/DianRongQiForm.vue
index 3e33056..f362e04 100644
--- a/src/views/Gw/dianRongQi/DianRongQiForm.vue
+++ b/src/views/Gw/dianRongQi/DianRongQiForm.vue
@@ -45,12 +45,12 @@
                                 <span>{{ params.data.CategoryType }}</span>
                             </template>
                         </vxe-form-item> -->
-                        <vxe-form-item title="序列号" field="SerialNo" span="12">
+                        <!-- <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> -->
                         <vxe-form-item title="原材料检验批次号" field="RmibNumber" span="12">
                             <template #default="params">
                                 <vxe-input v-model="params.data.RmibNumber" placeholder="请输入原材料检验批次号" clearable
@@ -114,7 +114,7 @@
                                 <span>{{ params.data.PdCode }}</span>
                             </template>
                         </vxe-form-item> -->
-                        <vxe-form-item title="感知过程" field="ProcessType" span="12">
+                        <!-- <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">
@@ -122,7 +122,7 @@
                                     </template>
                                 </vxe-select>
                             </template>
-                        </vxe-form-item>
+                        </vxe-form-item> -->
                         <vxe-form-item title="检验结果是否合格" field="IsQualify" span="12">
                             <template #default="params">
                                 <vxe-select v-model="params.data.IsQualify" clearable>
@@ -287,6 +287,7 @@ 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'
+import * as comApi from '@/api/gw/com'
 // 字典
 const dictStore = useDictStore()
 const { dictProcessType } = storeToRefs(dictStore)
@@ -430,6 +431,7 @@ const open = async (type: string, row?: any) => {
         case 'add':
             refShow.value = true
             modalTitle.value = '新增电容器'
+            formDataA.value.SerialNo = await comApi.getSystemSerialNo()
             break;
         case 'edit':
             refShow.value = true
@@ -477,6 +479,7 @@ const open = async (type: string, row?: any) => {
             rowInfoB.Data.PutCenterTime = dayjs().format("YYYY-MM-DD HH:mm:ss")
             rowInfoB.Data.Sended = 0
             formDataA.value = rowInfoB.Data
+            formDataA.value.SerialNo = await comApi.getSystemSerialNo()
             break;
         case 'delete':
             modalTitle.value = '删除电容器'
@@ -537,6 +540,7 @@ const fnDeleteA = async (row: any) => {
 const fnSubmitA = async () => {
     await refFormA.value.validate().then(async (res: any) => {
         if (!res) {
+            formDataA.value.Sended = 0
             switch (formType.value) {
                 case 'add':
                     const paramsA = {
@@ -589,6 +593,7 @@ const fnSubmitB = async () => {
     formDataB.value.DataUniqueIdentifier = formDataA.value.DataUniqueIdentifier
     formDataB.value.CheckTime = formDataA.value.CheckTime
     formDataB.value.PutCenterTime = formDataA.value.PutCenterTime
+    formDataB.value.Sended = 0
     const queryParamsA: any = {
         "filter": {
             "field": 'SerialNo',
diff --git a/src/views/Gw/duanLuQi/DuanLuQi.vue b/src/views/Gw/duanLuQi/DuanLuQi.vue
index 1a4d7d8..4369574 100644
--- a/src/views/Gw/duanLuQi/DuanLuQi.vue
+++ b/src/views/Gw/duanLuQi/DuanLuQi.vue
@@ -54,7 +54,7 @@ const gridOptionsA: any = reactive({
         { field: 'SupplierCode', title: '国网侧供应商编码', sortable: true, width: '160px' },
         { field: 'ModelCode', title: '规格型号编码', width: '140px' },
         { field: 'CategoryType', title: '物资种类编码', width: '120px' },
-        { field: 'SerialNo', title: '序列号', sortable: true, width: '110px' },
+        { field: 'SerialNo', title: '序列号', sortable: true, width: '210px' },
         { field: 'RmibNumber', title: '原材料检验批次号', sortable: true, width: '160px' },
         { field: 'RmbNumber', title: '原材料批次号', sortable: true, width: '130px' },
         { field: 'BorMaterials', title: '原材料品牌', sortable: true, width: '180px' },
@@ -69,7 +69,7 @@ const gridOptionsA: any = reactive({
         { field: 'IsQualify', title: '检验结果是否合格', width: '140px', slots: { default: 'slotIsQualify' } },
         { field: 'Ecode', title: 'ecode码', width: '110px' },
         { field: 'SgEntityId', title: '国网实物Id', width: '110px' },
-        { field: 'DataUniqueIdentifier', title: '数据唯一标识', width: '110px' },
+        { field: 'DataUniqueIdentifier', title: '数据唯一标识', width: '250px' },
         { field: 'ModelSpecification', title: '规格型号', width: '160px' },
         { field: 'TextDescription', title: '人力分合操作5次，可靠动作', width: '200px', slots: { default: 'slotTextDescription' } },
         { field: 'InsulationVoltageUn', title: '额定绝缘电压(V)', width: '130px' },
@@ -149,7 +149,6 @@ const gridOptionsA: any = reactive({
                         if (o1.order == "asc") {
                             isAscending = true;
                         }
-                        console.log(o1)
                         return {
                             "field": o1.field,
                             "isAscending": (() => {
@@ -158,9 +157,7 @@ const gridOptionsA: any = reactive({
                         }
                     })
                 }
-                // console.log(queryParams)
                 const data = await DuanLuQiApi.getDuanLuQiPaging(queryParamsA)
-                console.log(data)
                 return data
                 // // 处理排序条件
                 // const firstSort = sorts[0]
@@ -179,7 +176,6 @@ const gridOptionsA: any = reactive({
             // 当点击工具栏保存按钮或者手动提交指令 save 时会被触发
             save: ({ body }: any) => { },
             add: ({ body }: any) => {
-                console.log(body)
             },
         }
     }
diff --git a/src/views/Gw/duanLuQi/DuanLuQiForm.vue b/src/views/Gw/duanLuQi/DuanLuQiForm.vue
index 9cd673d..056ee32 100644
--- a/src/views/Gw/duanLuQi/DuanLuQiForm.vue
+++ b/src/views/Gw/duanLuQi/DuanLuQiForm.vue
@@ -45,12 +45,12 @@
                                 <span>{{ params.data.CategoryType }}</span>
                             </template>
                         </vxe-form-item> -->
-                        <vxe-form-item title="序列号" field="SerialNo" span="12">
+                        <!-- <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> -->
                         <vxe-form-item title="原材料检验批次号" field="RmibNumber" span="12">
                             <template #default="params">
                                 <vxe-input v-model="params.data.RmibNumber" placeholder="请输入原材料检验批次号" clearable
@@ -114,7 +114,7 @@
                                 <span>{{ params.data.PdCode }}</span>
                             </template>
                         </vxe-form-item> -->
-                        <vxe-form-item title="感知过程" field="ProcessType" span="12">
+                        <!-- <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">
@@ -122,7 +122,7 @@
                                     </template>
                                 </vxe-select>
                             </template>
-                        </vxe-form-item>
+                        </vxe-form-item> -->
                         <vxe-form-item title="检验结果是否合格" field="IsQualify" span="12">
                             <template #default="params">
                                 <vxe-select v-model="params.data.IsQualify" clearable>
@@ -271,6 +271,7 @@ 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'
+import * as comApi from '@/api/gw/com'
 // 字典
 const dictStore = useDictStore()
 const { dictProcessType } = storeToRefs(dictStore)
@@ -411,6 +412,7 @@ const open = async (type: string, row?: any) => {
         case 'add':
             refShow.value = true
             modalTitle.value = '新增断路器'
+            formDataA.value.SerialNo = await comApi.getSystemSerialNo()
             break;
         case 'edit':
             refShow.value = true
@@ -458,6 +460,7 @@ const open = async (type: string, row?: any) => {
             rowInfoB.Data.PutCenterTime = dayjs().format("YYYY-MM-DD HH:mm:ss")
             rowInfoB.Data.Sended = 0
             formDataA.value = rowInfoB.Data
+            formDataA.value.SerialNo = await comApi.getSystemSerialNo()
             break;
         case 'delete':
             modalTitle.value = '删除断路器'
@@ -518,6 +521,7 @@ const fnDeleteA = async (row: any) => {
 const fnSubmitA = async () => {
     await refFormA.value.validate().then(async (res: any) => {
         if (!res) {
+            formDataA.value.Sended = 0
             switch (formType.value) {
                 case 'add':
                     const paramsA = {
@@ -570,6 +574,7 @@ const fnSubmitB = async () => {
     formDataB.value.DataUniqueIdentifier = formDataA.value.DataUniqueIdentifier
     formDataB.value.CheckTime = formDataA.value.CheckTime
     formDataB.value.PutCenterTime = formDataA.value.PutCenterTime
+    formDataB.value.Sended = 0
     const queryParamsA: any = {
         "filter": {
             "field": 'SerialNo',
diff --git a/src/views/Gw/fusedIsolationSwitch/FusedIsolationSwitch.vue b/src/views/Gw/fusedIsolationSwitch/FusedIsolationSwitch.vue
index 64884e0..63c80cc 100644
--- a/src/views/Gw/fusedIsolationSwitch/FusedIsolationSwitch.vue
+++ b/src/views/Gw/fusedIsolationSwitch/FusedIsolationSwitch.vue
@@ -55,7 +55,7 @@ const gridOptionsA: any = reactive({
         { field: 'SupplierCode', title: '国网侧供应商编码', sortable: true, width: '160px' },
         { field: 'ModelCode', title: '规格型号编码', width: '140px' },
         { field: 'CategoryType', title: '物资种类编码', width: '120px' },
-        { field: 'SerialNo', title: '序列号', sortable: true, width: '110px' },
+        { field: 'SerialNo', title: '序列号', sortable: true, width: '210px' },
         { field: 'RmibNumber', title: '原材料检验批次号', sortable: true, width: '160px' },
         { field: 'RmbNumber', title: '原材料批次号', sortable: true, width: '130px' },
         { field: 'BorMaterials', title: '原材料品牌', sortable: true, width: '180px' },
@@ -70,7 +70,7 @@ const gridOptionsA: any = reactive({
         { field: 'IsQualify', title: '检验结果是否合格', width: '140px', slots: { default: 'slotIsQualify' } },
         { field: 'Ecode', title: 'ecode码', width: '110px' },
         { field: 'SgEntityId', title: '国网实物Id', width: '110px' },
-        { field: 'DataUniqueIdentifier', title: '数据唯一标识', width: '110px' },
+        { field: 'DataUniqueIdentifier', title: '数据唯一标识', width: '250px' },
         { field: 'TextDescription', title: '人力分合操作5次，可靠动作', width: '210px', slots: { default: 'slotTextDescription' } },
         { field: 'InsulationVoltageUn', title: '额定绝缘电压(V)', width: '140px' },
         { field: 'PcurrentUn', title: '熔断器支持件的额定电流(A)', width: '200px' },
@@ -150,7 +150,6 @@ const gridOptionsA: any = reactive({
                         if (o1.order == "asc") {
                             isAscending = true;
                         }
-                        console.log(o1)
                         return {
                             "field": o1.field,
                             "isAscending": (() => {
@@ -159,9 +158,7 @@ const gridOptionsA: any = reactive({
                         }
                     })
                 }
-                // console.log(queryParams)
                 const data = await FusedIsolationSwitchApi.getFusedIsolationSwitchPaging(queryParamsA)
-                console.log(data)
                 return data
                 // // 处理排序条件
                 // const firstSort = sorts[0]
@@ -180,7 +177,6 @@ const gridOptionsA: any = reactive({
             // 当点击工具栏保存按钮或者手动提交指令 save 时会被触发
             save: ({ body }: any) => { },
             add: ({ body }: any) => {
-                console.log(body)
             },
         }
     }
diff --git a/src/views/Gw/fusedIsolationSwitch/FusedIsolationSwitchForm.vue b/src/views/Gw/fusedIsolationSwitch/FusedIsolationSwitchForm.vue
index 0dae04a..a88c365 100644
--- a/src/views/Gw/fusedIsolationSwitch/FusedIsolationSwitchForm.vue
+++ b/src/views/Gw/fusedIsolationSwitch/FusedIsolationSwitchForm.vue
@@ -45,12 +45,12 @@
                                 <span>{{ params.data.CategoryType }}</span>
                             </template>
                         </vxe-form-item> -->
-                        <vxe-form-item title="序列号" field="SerialNo" span="12">
+                        <!-- <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> -->
                         <vxe-form-item title="原材料检验批次号" field="RmibNumber" span="12">
                             <template #default="params">
                                 <vxe-input v-model="params.data.RmibNumber" placeholder="请输入原材料检验批次号" clearable
@@ -114,7 +114,7 @@
                                 <span>{{ params.data.PdCode }}</span>
                             </template>
                         </vxe-form-item> -->
-                        <vxe-form-item title="感知过程" field="ProcessType" span="12">
+                        <!-- <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">
@@ -122,7 +122,7 @@
                                     </template>
                                 </vxe-select>
                             </template>
-                        </vxe-form-item>
+                        </vxe-form-item> -->
                         <vxe-form-item title="检验结果是否合格" field="IsQualify" span="12">
                             <template #default="params">
                                 <vxe-select v-model="params.data.IsQualify" clearable>
@@ -271,6 +271,7 @@ 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'
+import * as comApi from '@/api/gw/com'
 // 字典
 const dictStore = useDictStore()
 const { dictProcessType } = storeToRefs(dictStore)
@@ -411,6 +412,7 @@ const open = async (type: string, row?: any) => {
         case 'add':
             refShow.value = true
             modalTitle.value = '新增熔断器式隔离开关'
+            formDataA.value.SerialNo = await comApi.getSystemSerialNo()
             break;
         case 'edit':
             refShow.value = true
@@ -458,6 +460,7 @@ const open = async (type: string, row?: any) => {
             rowInfoB.Data.PutCenterTime = dayjs().format("YYYY-MM-DD HH:mm:ss")
             rowInfoB.Data.Sended = 0
             formDataA.value = rowInfoB.Data
+            formDataA.value.SerialNo = await comApi.getSystemSerialNo()
             break;
         case 'delete':
             modalTitle.value = '删除熔断器式隔离开关'
@@ -518,6 +521,7 @@ const fnDeleteA = async (row: any) => {
 const fnSubmitA = async () => {
     await refFormA.value.validate().then(async (res: any) => {
         if (!res) {
+            formDataA.value.Sended = 0
             switch (formType.value) {
                 case 'add':
                     const paramsA = {
@@ -570,6 +574,7 @@ const fnSubmitB = async () => {
     formDataB.value.DataUniqueIdentifier = formDataA.value.DataUniqueIdentifier
     formDataB.value.CheckTime = formDataA.value.CheckTime
     formDataB.value.PutCenterTime = formDataA.value.PutCenterTime
+    formDataB.value.Sended = 0
     const queryParamsA: any = {
         "filter": {
             "field": 'SerialNo',
diff --git a/src/views/Gw/langYongBaoHuQi/LangYongBaoHuQi.vue b/src/views/Gw/langYongBaoHuQi/LangYongBaoHuQi.vue
index 25a2715..562c700 100644
--- a/src/views/Gw/langYongBaoHuQi/LangYongBaoHuQi.vue
+++ b/src/views/Gw/langYongBaoHuQi/LangYongBaoHuQi.vue
@@ -50,7 +50,7 @@ const gridOptionsA: any = reactive({
         { field: 'SupplierCode', title: '国网侧供应商编码', sortable: true, width: '160px' },
         { field: 'ModelCode', title: '规格型号编码', width: '140px' },
         { field: 'CategoryType', title: '物资种类编码', width: '120px' },
-        { field: 'SerialNo', title: '序列号', sortable: true, width: '110px' },
+        { field: 'SerialNo', title: '序列号', sortable: true, width: '210px' },
         { field: 'RmibNumber', title: '原材料检验批次号', sortable: true, width: '160px' },
         { field: 'RmbNumber', title: '原材料批次号', sortable: true, width: '130px' },
         { field: 'BorMaterials', title: '原材料品牌', sortable: true, width: '180px' },
@@ -65,7 +65,7 @@ const gridOptionsA: any = reactive({
         { field: 'IsQualify', title: '检验结果是否合格', width: '140px', slots: { default: 'slotIsQualify' } },
         { field: 'Ecode', title: 'ecode码', width: '110px' },
         { field: 'SgEntityId', title: '国网实物Id', width: '110px' },
-        { field: 'DataUniqueIdentifier', title: '数据唯一标识', width: '110px' },
+        { field: 'DataUniqueIdentifier', title: '数据唯一标识', width: '250px' },
         { field: 'PressureValue', title: '电压保护水平(V)', width: '130px' },
         { field: 'DischargeCurrent', title: '标称最大放电电流(kA)', width: '160px' },
         { field: 'TestLevel', title: '试验等级', width: '120px' },
@@ -144,7 +144,6 @@ const gridOptionsA: any = reactive({
                         if (o1.order == "asc") {
                             isAscending = true;
                         }
-                        console.log(o1)
                         return {
                             "field": o1.field,
                             "isAscending": (() => {
@@ -153,9 +152,7 @@ const gridOptionsA: any = reactive({
                         }
                     })
                 }
-                // console.log(queryParams)
                 const data = await LangYongBaoHuQiApi.getLangYongBaoHuQiPaging(queryParamsA)
-                console.log(data)
                 return data
                 // // 处理排序条件
                 // const firstSort = sorts[0]
@@ -174,7 +171,6 @@ const gridOptionsA: any = reactive({
             // 当点击工具栏保存按钮或者手动提交指令 save 时会被触发
             save: ({ body }: any) => { },
             add: ({ body }: any) => {
-                console.log(body)
             },
         }
     }
diff --git a/src/views/Gw/langYongBaoHuQi/LangYongBaoHuQiForm.vue b/src/views/Gw/langYongBaoHuQi/LangYongBaoHuQiForm.vue
index b0e9769..44e2742 100644
--- a/src/views/Gw/langYongBaoHuQi/LangYongBaoHuQiForm.vue
+++ b/src/views/Gw/langYongBaoHuQi/LangYongBaoHuQiForm.vue
@@ -1,5 +1,6 @@
 <template>
-    <vxe-modal class-name="csty-dian-rong-qi-form" v-model="refShow" width="1200" height="770" show-zoom show-footer :mask-closable=true>
+    <vxe-modal class-name="csty-dian-rong-qi-form" v-model="refShow" width="1200" height="770" show-zoom show-footer
+        :mask-closable=true>
         <template #title>
             <span style="color:#ffffff">{{ modalTitle }}</span>
         </template>
@@ -44,12 +45,12 @@
                                 <span>{{ params.data.CategoryType }}</span>
                             </template>
                         </vxe-form-item> -->
-                        <vxe-form-item title="序列号" field="SerialNo" span="12">
+                        <!-- <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> -->
                         <vxe-form-item title="原材料检验批次号" field="RmibNumber" span="12">
                             <template #default="params">
                                 <vxe-input v-model="params.data.RmibNumber" placeholder="请输入原材料检验批次号" clearable
@@ -113,7 +114,7 @@
                                 <span>{{ params.data.PdCode }}</span>
                             </template>
                         </vxe-form-item> -->
-                        <vxe-form-item title="感知过程" field="ProcessType" span="12">
+                        <!-- <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">
@@ -121,7 +122,7 @@
                                     </template>
                                 </vxe-select>
                             </template>
-                        </vxe-form-item>
+                        </vxe-form-item> -->
                         <vxe-form-item title="检验结果是否合格" field="IsQualify" span="12">
                             <template #default="params">
                                 <vxe-select v-model="params.data.IsQualify" clearable>
@@ -262,6 +263,7 @@ 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'
+import * as comApi from '@/api/gw/com'
 // 字典
 const dictStore = useDictStore()
 const { dictProcessType } = storeToRefs(dictStore)
@@ -389,6 +391,7 @@ const open = async (type: string, row?: any) => {
         case 'add':
             refShow.value = true
             modalTitle.value = '新增浪涌保护器'
+            formDataA.value.SerialNo = await comApi.getSystemSerialNo()
             break;
         case 'edit':
             refShow.value = true
@@ -436,6 +439,7 @@ const open = async (type: string, row?: any) => {
             rowInfoB.Data.PutCenterTime = dayjs().format("YYYY-MM-DD HH:mm:ss")
             rowInfoB.Data.Sended = 0
             formDataA.value = rowInfoB.Data
+            formDataA.value.SerialNo = await comApi.getSystemSerialNo()
             break;
         case 'delete':
             modalTitle.value = '删除浪涌保护器'
@@ -494,40 +498,45 @@ const fnDeleteA = async (row: any) => {
 }
 // 提交
 const fnSubmitA = async () => {
-    switch (formType.value) {
-        case 'add':
-            const paramsA = {
-                data: formDataA.value
+    refFormA.value.validate().then(async (res: any) => {
+        if (!res) {
+            formDataA.value.Sended = 0
+            switch (formType.value) {
+                case 'add':
+                    const paramsA = {
+                        data: formDataA.value
+                    }
+                    await LangYongBaoHuQiApi.saveLangYongBaoHuQi(paramsA)
+                    await fnSubmitB()
+                    VXETable.modal.message({ content: '新增成功', status: 'success' })
+                    break;
+                case 'edit':
+                    let setVal: any = _map(formDataA.value, (o1, k1) => {
+                        return { field: k1, value: o1 }
+                    })
+                    const paramsB = {
+                        filter: {
+                            field: 'ID',
+                            value: formDataA.value.ID
+                        },
+                        set: setVal
+                    }
+                    await LangYongBaoHuQiApi.editLangYongBaoHuQi(paramsB)
+                    await fnSubmitB()
+                    VXETable.modal.message({ content: '编辑成功', status: 'success' })
+                    break;
+                case 'copy':
+                    const paramsC = {
+                        data: formDataA.value
+                    }
+                    await LangYongBaoHuQiApi.saveLangYongBaoHuQi(paramsC)
+                    VXETable.modal.message({ content: '复制成功', status: 'success' })
+                    break;
             }
-            await LangYongBaoHuQiApi.saveLangYongBaoHuQi(paramsA)
-            await fnSubmitB()
-            VXETable.modal.message({ content: '新增成功', status: 'success' })
-            break;
-        case 'edit':
-            let setVal: any = _map(formDataA.value, (o1, k1) => {
-                return { field: k1, value: o1 }
-            })
-            const paramsB = {
-                filter: {
-                    field: 'ID',
-                    value: formDataA.value.ID
-                },
-                set: setVal
-            }
-            await LangYongBaoHuQiApi.editLangYongBaoHuQi(paramsB)
-            await fnSubmitB()
-            VXETable.modal.message({ content: '编辑成功', status: 'success' })
-            break;
-        case 'copy':
-            const paramsC = {
-                data: formDataA.value
-            }
-            await LangYongBaoHuQiApi.saveLangYongBaoHuQi(paramsC)
-            VXETable.modal.message({ content: '复制成功', status: 'success' })
-            break;
-    }
-    refShow.value = false
-    emit('success')
+            refShow.value = false
+            emit('success')
+        }
+    })
 }
 // 表单B - 提交
 const fnSubmitB = async () => {
@@ -544,6 +553,7 @@ const fnSubmitB = async () => {
     formDataB.value.DataUniqueIdentifier = formDataA.value.DataUniqueIdentifier
     formDataB.value.CheckTime = formDataA.value.CheckTime
     formDataB.value.PutCenterTime = formDataA.value.PutCenterTime
+    formDataB.value.Sended = 0
     const queryParamsA: any = {
         "filter": {
             "field": 'SerialNo',
diff --git a/src/views/Gw/muPai/MuPai.vue b/src/views/Gw/muPai/MuPai.vue
index 3732b43..f9e8366 100644
--- a/src/views/Gw/muPai/MuPai.vue
+++ b/src/views/Gw/muPai/MuPai.vue
@@ -50,7 +50,7 @@ const gridOptionsA: any = reactive({
         { field: 'SupplierCode', title: '国网侧供应商编码', sortable: true, width: '160px' },
         { field: 'ModelCode', title: '规格型号编码', width: '140px' },
         { field: 'CategoryType', title: '物资种类编码', width: '120px' },
-        { field: 'SerialNo', title: '序列号', sortable: true, width: '110px' },
+        { field: 'SerialNo', title: '序列号', sortable: true, width: '210px' },
         { field: 'RmibNumber', title: '原材料检验批次号', sortable: true, width: '160px' },
         { field: 'RmbNumber', title: '原材料批次号', sortable: true, width: '130px' },
         { field: 'BorMaterials', title: '原材料品牌', sortable: true, width: '180px' },
@@ -65,7 +65,7 @@ const gridOptionsA: any = reactive({
         { field: 'IsQualify', title: '检验结果是否合格', width: '140px', slots: { default: 'slotIsQualify' } },
         { field: 'Ecode', title: 'ecode码', width: '110px' },
         { field: 'SgEntityId', title: '国网实物Id', width: '110px' },
-        { field: 'DataUniqueIdentifier', title: '数据唯一标识', width: '110px' },
+        { field: 'DataUniqueIdentifier', title: '数据唯一标识', width: '250px' },
         { field: 'Texture', title: '材质', width: '110px' },
         { field: 'Thickness', title: '公称厚度(mm)', width: '120px' },
         { field: 'Width', title: '公称宽度(mm)', width: '120px' },
@@ -144,7 +144,6 @@ const gridOptionsA: any = reactive({
                         if (o1.order == "asc") {
                             isAscending = true;
                         }
-                        console.log(o1)
                         return {
                             "field": o1.field,
                             "isAscending": (() => {
@@ -153,9 +152,7 @@ const gridOptionsA: any = reactive({
                         }
                     })
                 }
-                // console.log(queryParams)
                 const data = await MuPaiApi.getMuPaiPaging(queryParamsA)
-                console.log(data)
                 return data
                 // // 处理排序条件
                 // const firstSort = sorts[0]
@@ -174,7 +171,6 @@ const gridOptionsA: any = reactive({
             // 当点击工具栏保存按钮或者手动提交指令 save 时会被触发
             save: ({ body }: any) => { },
             add: ({ body }: any) => {
-                console.log(body)
             },
         }
     }
diff --git a/src/views/Gw/muPai/MuPaiForm.vue b/src/views/Gw/muPai/MuPaiForm.vue
index 121b6b4..c950d7d 100644
--- a/src/views/Gw/muPai/MuPaiForm.vue
+++ b/src/views/Gw/muPai/MuPaiForm.vue
@@ -45,12 +45,12 @@
                                 <span>{{ params.data.CategoryType }}</span>
                             </template>
                         </vxe-form-item> -->
-                        <vxe-form-item title="序列号" field="SerialNo" span="12">
+                        <!-- <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> -->
                         <vxe-form-item title="原材料检验批次号" field="RmibNumber" span="12">
                             <template #default="params">
                                 <vxe-input v-model="params.data.RmibNumber" placeholder="请输入原材料检验批次号" clearable
@@ -114,7 +114,7 @@
                                 <span>{{ params.data.PdCode }}</span>
                             </template>
                         </vxe-form-item> -->
-                        <vxe-form-item title="感知过程" field="ProcessType" span="12">
+                        <!-- <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">
@@ -122,7 +122,7 @@
                                     </template>
                                 </vxe-select>
                             </template>
-                        </vxe-form-item>
+                        </vxe-form-item> -->
                         <vxe-form-item title="检验结果是否合格" field="IsQualify" span="12">
                             <template #default="params">
                                 <vxe-select v-model="params.data.IsQualify" clearable>
@@ -263,6 +263,7 @@ 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'
+import * as comApi from '@/api/gw/com'
 // 字典
 const dictStore = useDictStore()
 const { dictProcessType } = storeToRefs(dictStore)
@@ -399,6 +400,7 @@ const open = async (type: string, row?: any) => {
         case 'add':
             refShow.value = true
             modalTitle.value = '新增母排'
+            formDataA.value.SerialNo = await comApi.getSystemSerialNo()
             break;
         case 'edit':
             refShow.value = true
@@ -446,6 +448,7 @@ const open = async (type: string, row?: any) => {
             rowInfoB.Data.PutCenterTime = dayjs().format("YYYY-MM-DD HH:mm:ss")
             rowInfoB.Data.Sended = 0
             formDataA.value = rowInfoB.Data
+            formDataA.value.SerialNo = await comApi.getSystemSerialNo()
             break;
         case 'delete':
             modalTitle.value = '删除母排'
@@ -506,6 +509,7 @@ const fnDeleteA = async (row: any) => {
 const fnSubmitA = async () => {
     await refFormA.value.validate().then(async (res: any) => {
         if (!res) {
+            formDataA.value.Sended = 0
             switch (formType.value) {
                 case 'add':
                     const paramsA = {
@@ -558,6 +562,7 @@ const fnSubmitB = async () => {
     formDataB.value.DataUniqueIdentifier = formDataA.value.DataUniqueIdentifier
     formDataB.value.CheckTime = formDataA.value.CheckTime
     formDataB.value.PutCenterTime = formDataA.value.PutCenterTime
+    formDataB.value.Sended = 0
     const queryParamsA: any = {
         "filter": {
             "field": 'SerialNo',
diff --git a/src/views/Gw/shengYuDianLiuDongZuoBaoHu/ShengYuDianLiuDongZuoBaoHu.vue b/src/views/Gw/shengYuDianLiuDongZuoBaoHu/ShengYuDianLiuDongZuoBaoHu.vue
index c0c7873..0e25b6d 100644
--- a/src/views/Gw/shengYuDianLiuDongZuoBaoHu/ShengYuDianLiuDongZuoBaoHu.vue
+++ b/src/views/Gw/shengYuDianLiuDongZuoBaoHu/ShengYuDianLiuDongZuoBaoHu.vue
@@ -55,7 +55,7 @@ const gridOptionsA: any = reactive({
         { field: 'SupplierCode', title: '国网侧供应商编码', sortable: true, width: '160px' },
         { field: 'ModelCode', title: '规格型号编码', width: '140px' },
         { field: 'CategoryType', title: '物资种类编码', width: '120px' },
-        { field: 'SerialNo', title: '序列号', sortable: true, width: '110px' },
+        { field: 'SerialNo', title: '序列号', sortable: true, width: '210px' },
         { field: 'RmibNumber', title: '原材料检验批次号', sortable: true, width: '160px' },
         { field: 'RmbNumber', title: '原材料批次号', sortable: true, width: '130px' },
         { field: 'BorMaterials', title: '原材料品牌', sortable: true, width: '180px' },
@@ -70,7 +70,7 @@ const gridOptionsA: any = reactive({
         { field: 'IsQualify', title: '检验结果是否合格', width: '140px', slots: { default: 'slotIsQualify' } },
         { field: 'Ecode', title: 'ecode码', width: '110px' },
         { field: 'SgEntityId', title: '国网实物Id', width: '110px' },
-        { field: 'DataUniqueIdentifier', title: '数据唯一标识', width: '110px' },
+        { field: 'DataUniqueIdentifier', title: '数据唯一标识', width: '250px' },
         { field: 'ModelSpecification', title: '规格型号', width: '160px' },
         { field: 'TextDescription', title: '人力分合操作5次，可靠动作', width: '200px', slots: { default: 'slotTextDescription' } },
         { field: 'InsulationVoltageUn', title: '额定绝缘电压(V)', width: '130px' },
@@ -151,7 +151,6 @@ const gridOptionsA: any = reactive({
                         if (o1.order == "asc") {
                             isAscending = true;
                         }
-                        console.log(o1)
                         return {
                             "field": o1.field,
                             "isAscending": (() => {
@@ -160,9 +159,7 @@ const gridOptionsA: any = reactive({
                         }
                     })
                 }
-                // console.log(queryParams)
                 const data = await ShengYuDianLiuDongZuoBaoHuApi.getShengYuDianLiuDongZuoBaoHuPaging(queryParamsA)
-                console.log(data)
                 return data
                 // // 处理排序条件
                 // const firstSort = sorts[0]
@@ -181,7 +178,6 @@ const gridOptionsA: any = reactive({
             // 当点击工具栏保存按钮或者手动提交指令 save 时会被触发
             save: ({ body }: any) => { },
             add: ({ body }: any) => {
-                console.log(body)
             },
         }
     }
diff --git a/src/views/Gw/shengYuDianLiuDongZuoBaoHu/ShengYuDianLiuDongZuoBaoHuForm.vue b/src/views/Gw/shengYuDianLiuDongZuoBaoHu/ShengYuDianLiuDongZuoBaoHuForm.vue
index 92bca28..8b727a4 100644
--- a/src/views/Gw/shengYuDianLiuDongZuoBaoHu/ShengYuDianLiuDongZuoBaoHuForm.vue
+++ b/src/views/Gw/shengYuDianLiuDongZuoBaoHu/ShengYuDianLiuDongZuoBaoHuForm.vue
@@ -45,12 +45,12 @@
                                 <span>{{ params.data.CategoryType }}</span>
                             </template>
                         </vxe-form-item> -->
-                        <vxe-form-item title="序列号" field="SerialNo" span="12">
+                        <!-- <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> -->
                         <vxe-form-item title="原材料检验批次号" field="RmibNumber" span="12">
                             <template #default="params">
                                 <vxe-input v-model="params.data.RmibNumber" placeholder="请输入原材料检验批次号" clearable
@@ -114,7 +114,7 @@
                                 <span>{{ params.data.PdCode }}</span>
                             </template>
                         </vxe-form-item> -->
-                        <vxe-form-item title="感知过程" field="ProcessType" span="12">
+                        <!-- <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">
@@ -122,7 +122,7 @@
                                     </template>
                                 </vxe-select>
                             </template>
-                        </vxe-form-item>
+                        </vxe-form-item> -->
                         <vxe-form-item title="检验结果是否合格" field="IsQualify" span="12">
                             <template #default="params">
                                 <vxe-select v-model="params.data.IsQualify" clearable>
@@ -277,6 +277,7 @@ 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'
+import * as comApi from '@/api/gw/com'
 // 字典
 const dictStore = useDictStore()
 const { dictProcessType } = storeToRefs(dictStore)
@@ -423,6 +424,7 @@ const open = async (type: string, row?: any) => {
         case 'add':
             refShow.value = true
             modalTitle.value = '新增剩余电流动作保护器'
+            formDataA.value.SerialNo = await comApi.getSystemSerialNo()
             break;
         case 'edit':
             refShow.value = true
@@ -470,6 +472,7 @@ const open = async (type: string, row?: any) => {
             rowInfoB.Data.PutCenterTime = dayjs().format("YYYY-MM-DD HH:mm:ss")
             rowInfoB.Data.Sended = 0
             formDataA.value = rowInfoB.Data
+            formDataA.value.SerialNo = await comApi.getSystemSerialNo()
             break;
         case 'delete':
             modalTitle.value = '删除剩余电流动作保护器'
@@ -530,6 +533,7 @@ const fnDeleteA = async (row: any) => {
 const fnSubmitA = async () => {
     await refFormA.value.validate().then(async (res: any) => {
         if (!res) {
+            formDataA.value.Sended = 0
             switch (formType.value) {
                 case 'add':
                     const paramsA = {
@@ -582,6 +586,7 @@ const fnSubmitB = async () => {
     formDataB.value.DataUniqueIdentifier = formDataA.value.DataUniqueIdentifier
     formDataB.value.CheckTime = formDataA.value.CheckTime
     formDataB.value.PutCenterTime = formDataA.value.PutCenterTime
+    formDataB.value.Sended = 0
     const queryParamsA: any = {
         "filter": {
             "field": 'SerialNo',