From 9a445f976941d0830ab1019041580b9fdab5c179 Mon Sep 17 00:00:00 2001
From: siontion <siontion_2000@163.com>
Date: Sun, 19 May 2024 22:33:43 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |  1 +
 .../Gw/baseMaterial/BaseMaterialForm.vue      | 65 ++++++++++++++++++-
 src/views/Gw/biLeiQi/BiLeiQiForm.vue          |  6 +-
 .../Gw/boxMateQuality/BoxMateQualityForm.vue  |  6 +-
 src/views/Gw/com/SltBaseSupplier.vue          |  1 +
 .../Gw/dianLiuHuGanQi/DianLiuHuGanQiForm.vue  |  6 +-
 src/views/Gw/dianRongQi/DianRongQiForm.vue    |  6 +-
 src/views/Gw/duanLuQi/DuanLuQiForm.vue        |  6 +-
 .../FusedIsolationSwitchForm.vue              |  6 +-
 .../langYongBaoHuQi/LangYongBaoHuQiForm.vue   |  6 +-
 src/views/Gw/muPai/MuPaiForm.vue              |  8 ++-
 .../PowerFrequancyTesting.vue                 |  4 +-
 .../protectionCircuit/ProtectionCircuit.vue   |  4 +-
 .../ShengYuDianLiuDongZuoBaoHuForm.vue        |  6 +-
 14 files changed, 115 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index c190966..2878d30 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@ coverage
 *.sln
 *.sw?
 .env
+dist.zip
diff --git a/src/views/Gw/baseMaterial/BaseMaterialForm.vue b/src/views/Gw/baseMaterial/BaseMaterialForm.vue
index e0dce7e..7a61e80 100644
--- a/src/views/Gw/baseMaterial/BaseMaterialForm.vue
+++ b/src/views/Gw/baseMaterial/BaseMaterialForm.vue
@@ -38,6 +38,13 @@
                                     @change="fnChangeA(params)"></vxe-input>
                             </template>
                         </vxe-form-item>
+                        <!-- <vxe-form-item title="配电箱类型" field="MatTarget" span="24">
+                            <template #default="params">
+                                    <vxe-select v-model="params.data.MatTarget" multiple clearable>
+                                        <vxe-option v-for="item in matTargetOptions" :key="item.value" :value="item.value" :label="item.label" placeholder="请选择"></vxe-option>
+                                    </vxe-select>
+                            </template>
+                        </vxe-form-item> -->
                     </vxe-form>
                 </a-card>
             </template>
@@ -68,10 +75,50 @@ const formDataAInit = {
     "MatName": "",
     "MatUnit": "台",
     "MatDescption": "",
-    "Unit": "台"
+    "Unit": "台",
+    // "MatTarget":[]  
 }
 // 定义事件[success]
 const emit = defineEmits(['success'])
+
+const matTargetOptions =  ref([
+        {
+          value: 'guiti',
+          label: '柜体材质、厚度及尺寸'
+        },
+        {
+          value: 'mupai',
+          label: '母排'
+        },
+        {
+          value: 'bileiqi',
+          label: '避雷器'
+        },
+        {
+          value: 'langyong',
+          label: '浪涌保护器'
+        },
+        {
+          value: 'dianliu',
+          label: '电流互感器'
+        },
+        {
+          value: 'shengyu',
+          label: '剩余电流动作保护器'
+        },
+        {
+          value: 'duanluqi',
+          label: '断路器'
+        },
+        {
+          value: 'dianrongqi',
+          label: '电容器'
+        },
+        {
+          value: 'rongduanqi',
+          label: '熔断器式隔离开关'
+        }
+])
 // 是否显示
 const refShow = ref(false)
 // 表单
@@ -125,6 +172,9 @@ const open = async (type: string, row?: any) => {
             }
             const rowInfoA = await BaseMaterialApi.getBaseMaterial(paramsA)
             formDataA.value = rowInfoA.Data
+            if(formDataA.value.MatTarget.length>0){
+                formDataA.value.MatTarget = eval(formDataA.value.MatTarget)
+            }
             break;
         case 'copy':
             await fnResetA()
@@ -140,6 +190,9 @@ const open = async (type: string, row?: any) => {
             const rowInfoB = await BaseMaterialApi.getBaseMaterial(paramsB)
             rowInfoB.Data.Id = 0
             formDataA.value = rowInfoB.Data
+            if(formDataA.value.MatTarget.length>0){
+                formDataA.value.MatTarget = eval(formDataA.value.MatTarget)
+            }
             break;
         case 'delete':
             modalTitle.value = '删除物料'
@@ -217,7 +270,15 @@ const fnEventCancel = () => {
 }
 // 重置
 const fnResetA = () => {
-    formDataA.value = formDataAInit
+    formDataA.value =  {
+    "Id": 0,
+    "MatNo": "",
+    "MatName": "",
+    "MatUnit": "台",
+    "MatDescption": "",
+    "Unit": "台",
+    "MatTarget":""
+}
 }
 </script>
 <style scoped></style>
\ No newline at end of file
diff --git a/src/views/Gw/biLeiQi/BiLeiQiForm.vue b/src/views/Gw/biLeiQi/BiLeiQiForm.vue
index b827b04..447ac39 100644
--- a/src/views/Gw/biLeiQi/BiLeiQiForm.vue
+++ b/src/views/Gw/biLeiQi/BiLeiQiForm.vue
@@ -203,7 +203,11 @@
                                             </template>
                                         </template>
                                     </vxe-column>
-                                    <vxe-column field="fileName" title="文件原名称"></vxe-column>
+                                    <vxe-column field="fileName" title="文件原名称">
+                                        <template #default="{ row }">
+                                            <a :href="row.fileUrl" target="_blank">{{ row.fileName }}</a>
+                                        </template>
+                                    </vxe-column>
                                     <!-- <vxe-column field="fileUrl" title="文件Url" width="100"></vxe-column> -->
                                     <vxe-column field="fileType" title="文件格式" width="100">
                                         <template #default="{ row }">
diff --git a/src/views/Gw/boxMateQuality/BoxMateQualityForm.vue b/src/views/Gw/boxMateQuality/BoxMateQualityForm.vue
index b24bdab..a780968 100644
--- a/src/views/Gw/boxMateQuality/BoxMateQualityForm.vue
+++ b/src/views/Gw/boxMateQuality/BoxMateQualityForm.vue
@@ -215,7 +215,11 @@
                                             </template>
                                         </template>
                                     </vxe-column>
-                                    <vxe-column field="fileName" title="文件原名称"></vxe-column>
+                                    <vxe-column field="fileName" title="文件原名称">
+                                        <template #default="{ row }">
+                                            <a :href="row.fileUrl" target="_blank">{{ row.fileName }}</a>
+                                        </template>
+                                    </vxe-column>
                                     <!-- <vxe-column field="fileUrl" title="文件Url" width="100"></vxe-column> -->
                                     <vxe-column field="fileType" title="文件格式" width="100">
                                         <template #default="{ row }">
diff --git a/src/views/Gw/com/SltBaseSupplier.vue b/src/views/Gw/com/SltBaseSupplier.vue
index 11f074a..4b323f5 100644
--- a/src/views/Gw/com/SltBaseSupplier.vue
+++ b/src/views/Gw/com/SltBaseSupplier.vue
@@ -90,6 +90,7 @@ const gridOptionsA: any = ref({
         items: [
             { field: 'LotNo', title: '原材料批次号', span: 8, itemRender: { name: '$input', props: { placeholder: '请输入原材料批次号' } } },
             { field: 'Spec', title: '原材料规格型号', span: 8, itemRender: { name: '$input', props: { placeholder: '请输入原材料规格型号' } } },
+            { field: 'Brand', title: '原材料品牌', span: 8, itemRender: { name: '$input', props: { placeholder: '请输入原材料品牌' } } },
             { span: 24, align: 'center', collapseNode: true, itemRender: { name: '$buttons', children: [{ props: { type: 'submit', content: '查询', status: 'primary' } }, { props: { type: 'reset', content: '重置' } }] } }
         ]
     },
diff --git a/src/views/Gw/dianLiuHuGanQi/DianLiuHuGanQiForm.vue b/src/views/Gw/dianLiuHuGanQi/DianLiuHuGanQiForm.vue
index 781a1cd..374eba0 100644
--- a/src/views/Gw/dianLiuHuGanQi/DianLiuHuGanQiForm.vue
+++ b/src/views/Gw/dianLiuHuGanQi/DianLiuHuGanQiForm.vue
@@ -196,7 +196,11 @@
                                             </template>
                                         </template>
                                     </vxe-column>
-                                    <vxe-column field="fileName" title="文件原名称"></vxe-column>
+                                    <vxe-column field="fileName" title="文件原名称">
+                                        <template #default="{ row }">
+                                            <a :href="row.fileUrl" target="_blank">{{ row.fileName }}</a>
+                                        </template>
+                                    </vxe-column>
                                     <!-- <vxe-column field="fileUrl" title="文件Url" width="100"></vxe-column> -->
                                     <vxe-column field="fileType" title="文件格式" width="100">
                                         <template #default="{ row }">
diff --git a/src/views/Gw/dianRongQi/DianRongQiForm.vue b/src/views/Gw/dianRongQi/DianRongQiForm.vue
index a24e0cf..8c75e6b 100644
--- a/src/views/Gw/dianRongQi/DianRongQiForm.vue
+++ b/src/views/Gw/dianRongQi/DianRongQiForm.vue
@@ -232,7 +232,11 @@
                                             </template>
                                         </template>
                                     </vxe-column>
-                                    <vxe-column field="fileName" title="文件原名称"></vxe-column>
+                                    <vxe-column field="fileName" title="文件原名称">
+                                        <template #default="{ row }">
+                                            <a :href="row.fileUrl" target="_blank">{{ row.fileName }}</a>
+                                        </template>
+                                    </vxe-column>
                                     <!-- <vxe-column field="fileUrl" title="文件Url" width="100"></vxe-column> -->
                                     <vxe-column field="fileType" title="文件格式" width="100">
                                         <template #default="{ row }">
diff --git a/src/views/Gw/duanLuQi/DuanLuQiForm.vue b/src/views/Gw/duanLuQi/DuanLuQiForm.vue
index 09427c7..eeb4fe6 100644
--- a/src/views/Gw/duanLuQi/DuanLuQiForm.vue
+++ b/src/views/Gw/duanLuQi/DuanLuQiForm.vue
@@ -216,7 +216,11 @@
                                             </template>
                                         </template>
                                     </vxe-column>
-                                    <vxe-column field="fileName" title="文件原名称"></vxe-column>
+                                    <vxe-column field="fileName" title="文件原名称">
+                                        <template #default="{ row }">
+                                            <a :href="row.fileUrl" target="_blank">{{ row.fileName }}</a>
+                                        </template>
+                                    </vxe-column>
                                     <!-- <vxe-column field="fileUrl" title="文件Url" width="100"></vxe-column> -->
                                     <vxe-column field="fileType" title="文件格式" width="100">
                                         <template #default="{ row }">
diff --git a/src/views/Gw/fusedIsolationSwitch/FusedIsolationSwitchForm.vue b/src/views/Gw/fusedIsolationSwitch/FusedIsolationSwitchForm.vue
index 164065f..3335223 100644
--- a/src/views/Gw/fusedIsolationSwitch/FusedIsolationSwitchForm.vue
+++ b/src/views/Gw/fusedIsolationSwitch/FusedIsolationSwitchForm.vue
@@ -216,7 +216,11 @@
                                             </template>
                                         </template>
                                     </vxe-column>
-                                    <vxe-column field="fileName" title="文件原名称"></vxe-column>
+                                    <vxe-column field="fileName" title="文件原名称">
+                                        <template #default="{ row }">
+                                            <a :href="row.fileUrl" target="_blank">{{ row.fileName }}</a>
+                                        </template>
+                                    </vxe-column>
                                     <!-- <vxe-column field="fileUrl" title="文件Url" width="100"></vxe-column> -->
                                     <vxe-column field="fileType" title="文件格式" width="100">
                                         <template #default="{ row }">
diff --git a/src/views/Gw/langYongBaoHuQi/LangYongBaoHuQiForm.vue b/src/views/Gw/langYongBaoHuQi/LangYongBaoHuQiForm.vue
index b1741c1..8e5f545 100644
--- a/src/views/Gw/langYongBaoHuQi/LangYongBaoHuQiForm.vue
+++ b/src/views/Gw/langYongBaoHuQi/LangYongBaoHuQiForm.vue
@@ -208,7 +208,11 @@
                                             </template>
                                         </template>
                                     </vxe-column>
-                                    <vxe-column field="fileName" title="文件原名称"></vxe-column>
+                                    <vxe-column field="fileName" title="文件原名称">
+                                        <template #default="{ row }">
+                                            <a :href="row.fileUrl" target="_blank">{{ row.fileName }}</a>
+                                        </template>
+                                    </vxe-column>
                                     <!-- <vxe-column field="fileUrl" title="文件Url" width="100"></vxe-column> -->
                                     <vxe-column field="fileType" title="文件格式" width="100">
                                         <template #default="{ row }">
diff --git a/src/views/Gw/muPai/MuPaiForm.vue b/src/views/Gw/muPai/MuPaiForm.vue
index b34e5ca..ce8c932 100644
--- a/src/views/Gw/muPai/MuPaiForm.vue
+++ b/src/views/Gw/muPai/MuPaiForm.vue
@@ -181,7 +181,7 @@
                                     @change="fnChangeA(params)"></vxe-input>
                             </template>
                         </vxe-form-item>
-                        <vxe-form-item title="公称宽带(mm)" field="Width" span="12">
+                        <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>
@@ -214,7 +214,11 @@
                                             </template>
                                         </template>
                                     </vxe-column>
-                                    <vxe-column field="fileName" title="文件原名称"></vxe-column>
+                                    <vxe-column field="fileName" title="文件原名称">
+                                        <template #default="{ row }">
+                                            <a :href="row.fileUrl" target="_blank">{{ row.fileName }}</a>
+                                        </template>
+                                    </vxe-column>
                                     <!-- <vxe-column field="fileUrl" title="文件Url" width="100"></vxe-column> -->
                                     <vxe-column field="fileType" title="文件格式" width="100">
                                         <template #default="{ row }">
diff --git a/src/views/Gw/powerFrequancyTesting/PowerFrequancyTesting.vue b/src/views/Gw/powerFrequancyTesting/PowerFrequancyTesting.vue
index ed44d12..32802f5 100644
--- a/src/views/Gw/powerFrequancyTesting/PowerFrequancyTesting.vue
+++ b/src/views/Gw/powerFrequancyTesting/PowerFrequancyTesting.vue
@@ -64,8 +64,8 @@ const gridOptionsA: any = reactive({
         { field: 'FactoryCode', title: '厂区编号', sortable: true, width: '160px' },
         { field: 'SupplierSupportId', title: '供应商产品编号', sortable: true, width: '140px' },
         // { field: 'PdCode', title: '工序', width: '110px' },
-        // { field: 'CheckTime', title: '采集时间', sortable: true, width: '160px' },
-        // { field: 'PutCenterTime', title: '入数采中心时间', sortable: true, width: '160px' },
+        { field: 'CheckTime', title: '采集时间', sortable: true, width: '160px' },
+        { field: 'PutCenterTime', title: '入数采中心时间', sortable: true, width: '160px' },
         { field: 'StartTime', title: '开始时间', sortable: true, width: '160px' },
         { field: 'StopTime', title: '结束时间', sortable: true, width: '160px' },
         { field: 'InspectionResults', title: '试验结果', sortable: true, width: '160px', slots: { default: 'slotInspectionResults' } },
diff --git a/src/views/Gw/protectionCircuit/ProtectionCircuit.vue b/src/views/Gw/protectionCircuit/ProtectionCircuit.vue
index 6e62ff0..642b401 100644
--- a/src/views/Gw/protectionCircuit/ProtectionCircuit.vue
+++ b/src/views/Gw/protectionCircuit/ProtectionCircuit.vue
@@ -63,8 +63,8 @@ const gridOptionsA: any = reactive({
         { field: 'FactoryCode', title: '厂区编号', sortable: true, width: '160px' },
         { field: 'SupplierSupportId', title: '供应商产品编号', sortable: true, width: '140px' },
         // { field: 'PdCode', title: '工序', width: '110px' },
-        // { field: 'CheckTime', title: '采集时间', sortable: true, width: '160px' },
-        // { field: 'PutCenterTime', title: '入数采中心时间', sortable: true, width: '160px' },
+        { field: 'CheckTime', title: '采集时间', sortable: true, width: '160px' },
+        { field: 'PutCenterTime', title: '入数采中心时间', sortable: true, width: '160px' },
         { field: 'StartTime', title: '开始时间', sortable: true, width: '160px' },
         { field: 'StopTime', title: '结束时间', sortable: true, width: '160px' },
         { field: 'InspectionResults', title: '试验结果', sortable: true, width: '160px', slots: { default: 'slotInspectionResults' } },
diff --git a/src/views/Gw/shengYuDianLiuDongZuoBaoHu/ShengYuDianLiuDongZuoBaoHuForm.vue b/src/views/Gw/shengYuDianLiuDongZuoBaoHu/ShengYuDianLiuDongZuoBaoHuForm.vue
index ddf441f..3e2c679 100644
--- a/src/views/Gw/shengYuDianLiuDongZuoBaoHu/ShengYuDianLiuDongZuoBaoHuForm.vue
+++ b/src/views/Gw/shengYuDianLiuDongZuoBaoHu/ShengYuDianLiuDongZuoBaoHuForm.vue
@@ -222,7 +222,11 @@
                                             </template>
                                         </template>
                                     </vxe-column>
-                                    <vxe-column field="fileName" title="文件原名称"></vxe-column>
+                                    <vxe-column field="fileName" title="文件原名称">
+                                        <template #default="{ row }">
+                                            <a :href="row.fileUrl" target="_blank">{{ row.fileName }}</a>
+                                        </template>
+                                    </vxe-column>
                                     <!-- <vxe-column field="fileUrl" title="文件Url" width="100"></vxe-column> -->
                                     <vxe-column field="fileType" title="文件格式" width="100">
                                         <template #default="{ row }">