Browse Source

添加数据字典新增文件信息点不能上传问题

zhangyu 4 years ago
parent
commit
7e4ed0154e

+ 15 - 7
src/components/ledger/handsontables/assets.vue

@@ -848,23 +848,31 @@
             }
             return false
           //保险文件--资产文档--安装质检报告
-          case 'LedgerParam.InsuranceDoc.InsuranceFile':
-          case 'LedgerParam.PhotoDoc.Archive':
-          case 'LedgerParam.Siteinstall.CheckReport':
+          case 'LedgerParam.InsuranceDoc.InsuranceFile': //保险文件
+          case 'LedgerParam.PhotoDoc.Archive': //设备文档
+          case 'LedgerParam.Siteinstall.CheckReport': //安装质检报告
+          case 'LedgerParam.OperationMainte.MaintainManual': //维修保养手册
+          case 'LedgerParam.SupplyPurchase.ApproachingAcceptance': //进场验收单
+          case 'LedgerParam.SupplyPurchase.AcceptanceReport': //验收报告
+          case 'LedgerParam.PhotoDoc.OperationManual': //操作说明书
+          case 'LedgerParam.EquipManufactor.OriginalCertificate': //原厂证明
+          case 'LedgerParam.EquipManufactor.TestReport': //检测报告
+          case 'LedgerParam.PhotoDoc.ProductCertification': //产品合格证
+          case 'LedgerParam.Siteinstall.InstallInstruction': //安装说明书
+          case 'LedgerParam.PhotoDoc.Drawing': //设备图纸
+          case 'LedgerParam.Siteinstall.InstallDrawing': //安装图纸
             let IPSdata = tools.dataForKey(this.tableData[row.row], val);
             this.filesArr = IPSdata ? IPSdata : [];
             this.myDialog.uploadFiles = true;
             return false
-          //安装照片--安装图纸--资产铭牌照片--资产图纸
+          //安装照片--设备铭牌照片
           case 'LedgerParam.Siteinstall.InstallPic':
-          case 'LedgerParam.Siteinstall.InstallDrawing':
           case 'LedgerParam.PhotoDoc.Nameplate':
-          case 'LedgerParam.PhotoDoc.Drawing':
             let SSPPdata = tools.dataForKey(this.tableData[row.row], val);
             this.imgsArr = SSPPdata ? SSPPdata : [];
             this.myDialog.uploadImgs = true;
             return false
-          //资产照片
+          //设备照片
           case 'LedgerParam.PhotoDoc.Pic':
             let Pdata = tools.dataForKey(this.tableData[row.row], val);
             this.picsArr = Pdata ? Pdata : [];

+ 14 - 6
src/components/ledger/handsontables/device.vue

@@ -1076,20 +1076,28 @@
                   }
                   return false
               //保险文件--设备文档--安装质检报告
-              case 'LedgerParam.InsuranceDoc.InsuranceFile':
-              case 'LedgerParam.PhotoDoc.Archive':
-              case 'LedgerParam.Siteinstall.CheckReport':
+              case 'LedgerParam.InsuranceDoc.InsuranceFile': //保险文件
+              case 'LedgerParam.PhotoDoc.Archive': //设备文档
+              case 'LedgerParam.Siteinstall.CheckReport': //安装质检报告
+              case 'LedgerParam.OperationMainte.MaintainManual': //维修保养手册
+              case 'LedgerParam.SupplyPurchase.ApproachingAcceptance': //进场验收单
+              case 'LedgerParam.SupplyPurchase.AcceptanceReport': //验收报告
+              case 'LedgerParam.PhotoDoc.OperationManual': //操作说明书
+              case 'LedgerParam.EquipManufactor.OriginalCertificate': //原厂证明
+              case 'LedgerParam.EquipManufactor.TestReport': //检测报告
+              case 'LedgerParam.PhotoDoc.ProductCertification': //产品合格证
+              case 'LedgerParam.Siteinstall.InstallInstruction': //安装说明书
+              case 'LedgerParam.PhotoDoc.Drawing': //设备图纸
+              case 'LedgerParam.Siteinstall.InstallDrawing': //安装图纸
                   let IPSdata = tools.dataForKey(this.tableData[row.row], val);
                   this.filesArr = IPSdata ? IPSdata : [];
                   if (!this.onlyRead || this.filesArr.length) {
                       this.myDialog.uploadFiles = true;
                   }
                   return false
-              //安装照片--安装图纸--设备铭牌照片--设备图纸
+              //安装照片--设备铭牌照片
               case 'LedgerParam.Siteinstall.InstallPic':
-              case 'LedgerParam.Siteinstall.InstallDrawing':
               case 'LedgerParam.PhotoDoc.Nameplate':
-              case 'LedgerParam.PhotoDoc.Drawing':
                   let SSPPdata = tools.dataForKey(this.tableData[row.row], val);
                   this.imgsArr = SSPPdata ? SSPPdata : [];
                   if (!this.onlyRead || this.imgsArr.length) {

+ 66 - 22
src/utils/handsontable/notShow.js

@@ -463,14 +463,11 @@ const showTools = {
                             readOnly: true
                         }
                     }
-
                     //图片类型
                     if (
                         item.InfoPointCode == "InstallPic" ||
-                        item.InfoPointCode == "InstallDrawing" ||
                         item.InfoPointCode == "Nameplate" ||
-                        item.InfoPointCode == "Pic" ||
-                        item.InfoPointCode == "Drawing"
+                        item.InfoPointCode == "Pic"
                     ) {
                         return {
                             data: "infos." + item.InfoPointCode,
@@ -482,7 +479,19 @@ const showTools = {
                     //文件类型
                     if (item.InfoPointCode == "InsuranceFile" ||
                         item.InfoPointCode == "Archive" ||
-                        item.InfoPointCode == "CheckReport") {
+                        item.InfoPointCode == "CheckReport" ||
+                        item.InfoPointCode == "MaintainManual" ||
+                        item.InfoPointCode == "ApproachingAcceptance" ||
+                        item.InfoPointCode == "AcceptanceReport" ||
+                        item.InfoPointCode == "OperationManual" ||
+                        item.InfoPointCode == "OriginalCertificate" ||
+                        item.InfoPointCode == "TestReport" ||
+                        item.InfoPointCode == "ProductCertification" ||
+                        item.InfoPointCode == "InstallInstruction" ||
+                        item.InfoPointCode == "Drawing" ||
+                        item.InfoPointCode == "InstallDrawing"
+
+                    ) {
                         return {
                             data: "infos." + item.InfoPointCode,
                             renderer: text.fileType,
@@ -640,10 +649,8 @@ const showTools = {
                     //图片类型
                     if (
                         item.InfoPointCode == "InstallPic" ||
-                        item.InfoPointCode == "InstallDrawing" ||
                         item.InfoPointCode == "Nameplate" ||
-                        item.InfoPointCode == "Pic" ||
-                        item.InfoPointCode == "Drawing"
+                        item.InfoPointCode == "Pic"
                     ) {
                         return {
                             data: item.Path,
@@ -655,7 +662,18 @@ const showTools = {
                     //文件类型
                     if (item.InfoPointCode == "InsuranceFile" ||
                         item.InfoPointCode == "Archive" ||
-                        item.InfoPointCode == "CheckReport") {
+                        item.InfoPointCode == "CheckReport" ||
+                        item.InfoPointCode == "MaintainManual" ||
+                        item.InfoPointCode == "ApproachingAcceptance" ||
+                        item.InfoPointCode == "AcceptanceReport" ||
+                        item.InfoPointCode == "OperationManual" ||
+                        item.InfoPointCode == "OriginalCertificate" ||
+                        item.InfoPointCode == "TestReport" ||
+                        item.InfoPointCode == "ProductCertification" ||
+                        item.InfoPointCode == "InstallInstruction" ||
+                        item.InfoPointCode == "Drawing" ||
+                        item.InfoPointCode == "InstallDrawing"
+                    ) {
                         return {
                             data: item.Path,
                             renderer: text.fileType,
@@ -799,10 +817,8 @@ const showTools = {
                     //图片类型
                     if (
                         item.InfoPointCode == "InstallPic" ||
-                        item.InfoPointCode == "InstallDrawing" ||
                         item.InfoPointCode == "Nameplate" ||
-                        item.InfoPointCode == "Pic" ||
-                        item.InfoPointCode == "Drawing"
+                        item.InfoPointCode == "Pic"
                     ) {
                         return {
                             data: item.Path,
@@ -814,7 +830,18 @@ const showTools = {
                     //文件类型
                     if (item.InfoPointCode == "InsuranceFile" ||
                         item.InfoPointCode == "Archive" ||
-                        item.InfoPointCode == "CheckReport") {
+                        item.InfoPointCode == "CheckReport" ||
+                        item.InfoPointCode == "MaintainManual" ||
+                        item.InfoPointCode == "ApproachingAcceptance" ||
+                        item.InfoPointCode == "AcceptanceReport" ||
+                        item.InfoPointCode == "OperationManual" ||
+                        item.InfoPointCode == "OriginalCertificate" ||
+                        item.InfoPointCode == "TestReport" ||
+                        item.InfoPointCode == "ProductCertification" ||
+                        item.InfoPointCode == "InstallInstruction" ||
+                        item.InfoPointCode == "Drawing" ||
+                        item.InfoPointCode == "InstallDrawing"
+                    ) {
                         return {
                             data: item.Path,
                             renderer: text.fileType,
@@ -996,10 +1023,8 @@ const showTools = {
         //图片类型
         if (
             item.InfoPointCode == "InstallPic" ||
-            item.InfoPointCode == "InstallDrawing" ||
             item.InfoPointCode == "Nameplate" ||
-            item.InfoPointCode == "Pic" ||
-            item.InfoPointCode == "Drawing"
+            item.InfoPointCode == "Pic"
         ) {
             return {
                 data: item.Path,
@@ -1007,11 +1032,21 @@ const showTools = {
                 readOnly: onlyRead
             }
         }
-
         //文件类型
         if (item.InfoPointCode == "InsuranceFile" ||
             item.InfoPointCode == "Archive" ||
-            item.InfoPointCode == "CheckReport") {
+            item.InfoPointCode == "CheckReport" ||
+            item.InfoPointCode == "MaintainManual" ||
+            item.InfoPointCode == "ApproachingAcceptance" ||
+            item.InfoPointCode == "AcceptanceReport" ||
+            item.InfoPointCode == "OperationManual" ||
+            item.InfoPointCode == "OriginalCertificate" ||
+            item.InfoPointCode == "TestReport" ||
+            item.InfoPointCode == "ProductCertification" ||
+            item.InfoPointCode == "InstallInstruction" ||
+            item.InfoPointCode == "Drawing" ||
+            item.InfoPointCode == "InstallDrawing"
+        ) {
             return {
                 data: item.Path,
                 renderer: text.fileType,
@@ -1091,10 +1126,8 @@ const showTools = {
         //图片类型
         if (
             item.InfoPointCode == "InstallPic" ||
-            item.InfoPointCode == "InstallDrawing" ||
             item.InfoPointCode == "Nameplate" ||
-            item.InfoPointCode == "Pic" ||
-            item.InfoPointCode == "Drawing"
+            item.InfoPointCode == "Pic"
         ) {
             return {
                 data: item.Path,
@@ -1106,7 +1139,18 @@ const showTools = {
         //文件类型
         if (item.InfoPointCode == "InsuranceFile" ||
             item.InfoPointCode == "Archive" ||
-            item.InfoPointCode == "CheckReport") {
+            item.InfoPointCode == "CheckReport" ||
+            item.InfoPointCode == "MaintainManual" ||
+            item.InfoPointCode == "ApproachingAcceptance" ||
+            item.InfoPointCode == "AcceptanceReport" ||
+            item.InfoPointCode == "OperationManual" ||
+            item.InfoPointCode == "OriginalCertificate" ||
+            item.InfoPointCode == "TestReport" ||
+            item.InfoPointCode == "ProductCertification" ||
+            item.InfoPointCode == "InstallInstruction" ||
+            item.InfoPointCode == "Drawing" ||
+            item.InfoPointCode == "InstallDrawing"
+        ) {
             return {
                 data: item.Path,
                 renderer: text.fileType,

+ 14 - 6
src/views/ledger/facility/addfacility.vue

@@ -605,18 +605,26 @@ export default {
           }
           break;
         //保险文件--设备文档--安装质检报告
-        case 'LedgerParam.InsuranceDoc.InsuranceFile':
-        case 'LedgerParam.PhotoDoc.Archive':
-        case 'LedgerParam.Siteinstall.CheckReport':
+        case 'LedgerParam.InsuranceDoc.InsuranceFile': //保险文件
+        case 'LedgerParam.PhotoDoc.Archive': //设备文档
+        case 'LedgerParam.Siteinstall.CheckReport': //安装质检报告
+        case 'LedgerParam.OperationMainte.MaintainManual': //维修保养手册
+        case 'LedgerParam.SupplyPurchase.ApproachingAcceptance': //进场验收单
+        case 'LedgerParam.SupplyPurchase.AcceptanceReport': //验收报告
+        case 'LedgerParam.PhotoDoc.OperationManual': //操作说明书
+        case 'LedgerParam.EquipManufactor.OriginalCertificate': //原厂证明
+        case 'LedgerParam.EquipManufactor.TestReport': //检测报告
+        case 'LedgerParam.PhotoDoc.ProductCertification': //产品合格证
+        case 'LedgerParam.Siteinstall.InstallInstruction': //安装说明书
+        case 'LedgerParam.PhotoDoc.Drawing': //设备图纸
+        case 'LedgerParam.Siteinstall.InstallDrawing': //安装图纸
           let IPSdata = tools.dataForKey(this.tableData[row.row], val);
           this.filesArr = IPSdata ? IPSdata : [];
           this.myDialog.uploadFiles = true;
           break;
-        //安装照片--安装图纸--设备铭牌照片--设备图纸
+        //安装照片--设备铭牌照片
         case 'LedgerParam.Siteinstall.InstallPic':
-        case 'LedgerParam.Siteinstall.InstallDrawing':
         case 'LedgerParam.PhotoDoc.Nameplate':
-        case 'LedgerParam.PhotoDoc.Drawing':
           let SSPPdata = tools.dataForKey(this.tableData[row.row], val);
           this.imgsArr = SSPPdata ? SSPPdata : [];
           this.myDialog.uploadImgs = true;

+ 15 - 7
src/views/ledger/facility/parts/index.vue

@@ -359,20 +359,28 @@ export default {
       }
       //保险文件--设备文档--安装质检报告
       if (
-        val == "LedgerParam.InsuranceDoc.InsuranceFile" ||
-        val == "LedgerParam.PhotoDoc.Archive" ||
-        val == "LedgerParam.Siteinstall.CheckReport"
+        val == "LedgerParam.InsuranceDoc.InsuranceFile" || //保险文件
+        val == "LedgerParam.PhotoDoc.Archive" || //设备文档
+        val == "LedgerParam.Siteinstall.CheckReport" || //安装质检报告
+        val == "LedgerParam.OperationMainte.MaintainManual" || //维修保养手册
+        val == "LedgerParam.SupplyPurchase.ApproachingAcceptance" || //进场验收单
+        val == "LedgerParam.SupplyPurchase.AcceptanceReport" || //验收报告
+        val == "LedgerParam.PhotoDoc.OperationManual" || //操作说明书
+        val == "LedgerParam.EquipManufactor.OriginalCertificate" || //原厂证明
+        val == "LedgerParam.EquipManufactor.TestReport" || //检测报告
+        val == "LedgerParam.PhotoDoc.ProductCertification" || //产品合格证
+        val == "LedgerParam.Siteinstall.InstallInstruction" || //安装说明书
+        val == "LedgerParam.PhotoDoc.Drawing" || //设备图纸
+        val == "LedgerParam.Siteinstall.InstallDrawing" //安装图纸
       ) {
         let data = tools.dataForKey(this.tableData[row.row], val);
         this.filesArr = data ? data : [];
         this.myDialog.uploadFiles = true;
       }
-      //安装照片--安装图纸--设备铭牌照片--设备图纸
+      //安装照片--设备铭牌照片
       if (
         val == "LedgerParam.Siteinstall.InstallPic" ||
-        val == "LedgerParam.Siteinstall.InstallDrawing" ||
-        val == "LedgerParam.PhotoDoc.Nameplate" ||
-        val == "LedgerParam.PhotoDoc.Drawing"
+        val == "LedgerParam.PhotoDoc.Nameplate"
       ) {
         let data = tools.dataForKey(this.tableData[row.row], val);
         this.imgsArr = data ? data : [];

+ 15 - 30
src/views/ledger/facility/partsmanage/addparts/index.vue

@@ -504,52 +504,37 @@ export default {
       }
       //保险文件--设备文档--安装质检报告
       if (
-        val == "LedgerParam.InsuranceDoc.InsuranceFile" ||
-        val == "LedgerParam.PhotoDoc.Archive" ||
-        val == "LedgerParam.Siteinstall.CheckReport"
+        val == "LedgerParam.InsuranceDoc.InsuranceFile" || //保险文件
+        val == "LedgerParam.PhotoDoc.Archive" || //设备文档
+        val == "LedgerParam.Siteinstall.CheckReport" || //安装质检报告
+        val == "LedgerParam.OperationMainte.MaintainManual" || //维修保养手册
+        val == "LedgerParam.SupplyPurchase.ApproachingAcceptance" || //进场验收单
+        val == "LedgerParam.SupplyPurchase.AcceptanceReport" || //验收报告
+        val == "LedgerParam.PhotoDoc.OperationManual" || //操作说明书
+        val == "LedgerParam.EquipManufactor.OriginalCertificate" || //原厂证明
+        val == "LedgerParam.EquipManufactor.TestReport" || //检测报告
+        val == "LedgerParam.PhotoDoc.ProductCertification" || //产品合格证
+        val == "LedgerParam.Siteinstall.InstallInstruction" || //安装说明书
+        val == "LedgerParam.PhotoDoc.Drawing" || //设备图纸
+        val == "LedgerParam.Siteinstall.InstallDrawing" //安装图纸
       ) {
         let data = tools.dataForKey(this.tableData[row.row], val)
         this.filesArr = data ? data : []
-        // this.filesArr = this.tableData[row.row].infos
-        //   ? this.tableData[row.row].infos[val.split(".")[1]]
-        //     ? [this.tableData[row.row].infos[val.split(".")[1]]]
-        //     : []
-        //   : [];
         this.myDialog.uploadFiles = true;
       }
-      //安装照片--安装图纸--设备铭牌照片--设备图纸
+      //安装照片--设备铭牌照片
       if (
         val == "LedgerParam.Siteinstall.InstallPic" ||
-        val == "LedgerParam.Siteinstall.InstallDrawing" ||
-        val == "LedgerParam.PhotoDoc.Nameplate" ||
-        val == "LedgerParam.PhotoDoc.Drawing"
+        val == "LedgerParam.PhotoDoc.Nameplate"
       ) {
         let data = tools.dataForKey(this.tableData[row.row], val)
         this.imgsArr = data ? data : []
-        // if (val == "LedgerParam.PhotoDoc.Nameplate") {
-        //   this.imgsArr = this.tableData[row.row].infos
-        //     ? this.tableData[row.row].infos[val.split(".")[1]]
-        //       ? [this.tableData[row.row].infos[val.split(".")[1]].key]
-        //       : []
-        //     : [];
-        // } else {
-        //   this.imgsArr = this.tableData[row.row].infos
-        //     ? this.tableData[row.row].infos[val.split(".")[1]]
-        //       ? [this.tableData[row.row].infos[val.split(".")[1]]]
-        //       : []
-        //     : [];
-        // }
         this.myDialog.uploadImgs = true;
       }
       //设备照片
       if (val == "LedgerParam.PhotoDoc.Pic") {
         let data = tools.dataForKey(this.tableData[row.row], val)
         this.picsArr = data ? data : []
-        // this.picsArr = this.tableData[row.row].infos
-        //   ? this.tableData[row.row].infos[val.split(".")[1]]
-        //     ? this.tableData[row.row].infos[val.split(".")[1]]
-        //     : []
-        //   : [];
         this.myDialog.pic = true;
       }
       this.row = row.row;

+ 14 - 6
src/views/ledger/facility/partsmanage/index.vue

@@ -668,18 +668,26 @@ export default {
           }
           break;
         //保险文件--设备文档--安装质检报告
-        case 'LedgerParam.InsuranceDoc.InsuranceFile':
-        case 'LedgerParam.PhotoDoc.Archive':
-        case 'LedgerParam.Siteinstall.CheckReport':
+        case 'LedgerParam.InsuranceDoc.InsuranceFile': //保险文件
+        case 'LedgerParam.PhotoDoc.Archive': //设备文档
+        case 'LedgerParam.Siteinstall.CheckReport': //安装质检报告
+        case 'LedgerParam.OperationMainte.MaintainManual': //维修保养手册
+        case 'LedgerParam.SupplyPurchase.ApproachingAcceptance': //进场验收单
+        case 'LedgerParam.SupplyPurchase.AcceptanceReport': //验收报告
+        case 'LedgerParam.PhotoDoc.OperationManual': //操作说明书
+        case 'LedgerParam.EquipManufactor.OriginalCertificate': //原厂证明
+        case 'LedgerParam.EquipManufactor.TestReport': //检测报告
+        case 'LedgerParam.PhotoDoc.ProductCertification': //产品合格证
+        case 'LedgerParam.Siteinstall.InstallInstruction': //安装说明书
+        case 'LedgerParam.PhotoDoc.Drawing': //设备图纸
+        case 'LedgerParam.Siteinstall.InstallDrawing': //安装图纸
           let IPSdata = tools.dataForKey(this.tableData[row.row], val);
           this.filesArr = IPSdata ? IPSdata : [];
           this.myDialog.uploadFiles = true;
           break;
-        //安装照片--安装图纸--设备铭牌照片--设备图纸
+        //安装照片--设备铭牌照片
         case 'LedgerParam.Siteinstall.InstallPic':
-        case 'LedgerParam.Siteinstall.InstallDrawing':
         case 'LedgerParam.PhotoDoc.Nameplate':
-        case 'LedgerParam.PhotoDoc.Drawing':
           let SSPPdata = tools.dataForKey(this.tableData[row.row], val);
           this.imgsArr = SSPPdata ? SSPPdata : [];
           this.myDialog.uploadImgs = true;

+ 14 - 6
src/views/ledger/property/addproperty.vue

@@ -438,18 +438,26 @@ export default {
           }
           break;
         //保险文件--设备文档--安装质检报告
-        case 'LedgerParam.InsuranceDoc.InsuranceFile':
-        case 'LedgerParam.PhotoDoc.Archive':
-        case 'LedgerParam.Siteinstall.CheckReport':
+        case 'LedgerParam.InsuranceDoc.InsuranceFile': //保险文件
+        case 'LedgerParam.PhotoDoc.Archive': //设备文档
+        case 'LedgerParam.Siteinstall.CheckReport': //安装质检报告
+        case 'LedgerParam.OperationMainte.MaintainManual': //维修保养手册
+        case 'LedgerParam.SupplyPurchase.ApproachingAcceptance': //进场验收单
+        case 'LedgerParam.SupplyPurchase.AcceptanceReport': //验收报告
+        case 'LedgerParam.PhotoDoc.OperationManual': //操作说明书
+        case 'LedgerParam.EquipManufactor.OriginalCertificate': //原厂证明
+        case 'LedgerParam.EquipManufactor.TestReport': //检测报告
+        case 'LedgerParam.PhotoDoc.ProductCertification': //产品合格证
+        case 'LedgerParam.Siteinstall.InstallInstruction': //安装说明书
+        case 'LedgerParam.PhotoDoc.Drawing': //设备图纸
+        case 'LedgerParam.Siteinstall.InstallDrawing': //安装图纸
           let IPSdata = tools.dataForKey(this.tableData[row.row], val);
           this.filesArr = IPSdata ? IPSdata : [];
           this.myDialog.uploadFiles = true;
           break;
-        //安装照片--安装图纸--设备铭牌照片--设备图纸
+        //安装照片--设备铭牌照片
         case 'LedgerParam.Siteinstall.InstallPic':
-        case 'LedgerParam.Siteinstall.InstallDrawing':
         case 'LedgerParam.PhotoDoc.Nameplate':
-        case 'LedgerParam.PhotoDoc.Drawing':
           let SSPPdata = tools.dataForKey(this.tableData[row.row], val);
           this.imgsArr = SSPPdata ? SSPPdata : [];
           this.myDialog.uploadImgs = true;