Sfoglia il codice sorgente

台账详情页优化修改

zhangyu 4 anni fa
parent
commit
ab0020d0a7

+ 1 - 1
src/components/ledger/details/detail/exhibitionBaseInformation.vue

@@ -34,7 +34,7 @@
 <!--        <el-button slot="reference" type="text">{{value.Value ? '有' :'-'}}</el-button>-->
         <el-button slot="reference" type="text">有</el-button>
       </el-popover>
-      <span  v-else-if="Array.isArray(value.Value) && value.InputMode== 'F2' ">
+      <span  v-else-if="Array.isArray(value.Value) && (value.InputMode == 'F2' || value.InputMode == 'F1') ">
         <el-popover
           v-if="value.Value.length "
           placement="right"

+ 2 - 0
src/components/ledger/handsontables/device.vue

@@ -1222,6 +1222,8 @@ export default {
         case 'LedgerParam.SupplyPurchase.SupplierContract': //供应合同
         case 'LedgerParam.PhotoDoc.Drawing': //设备图纸
         case 'LedgerParam.Siteinstall.InstallDrawing': //安装图纸
+        case 'TechParam.CompleteMachine.DesignIDGraph': //设计工况空调机组处理过程焓湿图
+        case 'TechParam.AirSupply.FanCharacterCurve': //风机性能曲线
           let IPSdata = tools.dataForKey(this.tableData[row.row], val)
           this.filesArr = IPSdata ? IPSdata : []
           if (!this.onlyRead || this.filesArr.length) {

+ 6 - 2
src/utils/handsontable/notShow.js

@@ -1049,7 +1049,9 @@ const showTools = {
             item.InfoPointCode == "InstallInstruction" ||
             item.InfoPointCode == "SupplierContract" ||
             item.InfoPointCode == "Drawing" ||
-            item.InfoPointCode == "InstallDrawing"
+            item.InfoPointCode == "InstallDrawing" ||
+            item.InfoPointCode == "DesignIDGraph" ||
+            item.InfoPointCode == "FanCharacterCurve"
         ) {
             return {
                 data: item.Path,
@@ -1154,7 +1156,9 @@ const showTools = {
             item.InfoPointCode == "InstallInstruction" ||
             item.InfoPointCode == "SupplierContract" ||
             item.InfoPointCode == "Drawing" ||
-            item.InfoPointCode == "InstallDrawing"
+            item.InfoPointCode == "InstallDrawing" ||
+            item.InfoPointCode == "DesignIDGraph" ||
+            item.InfoPointCode == "FanCharacterCurve"
         ) {
             return {
                 data: item.Path,

+ 2 - 0
src/views/ledger/facility/addfacility.vue

@@ -695,6 +695,8 @@ export default {
         case 'LedgerParam.SupplyPurchase.SupplierContract': //供应合同
         case 'LedgerParam.PhotoDoc.Drawing': //设备图纸
         case 'LedgerParam.Siteinstall.InstallDrawing': //安装图纸
+        case 'TechParam.CompleteMachine.DesignIDGraph': //设计工况空调机组处理过程焓湿图
+        case 'TechParam.AirSupply.FanCharacterCurve': //风机性能曲线
           let IPSdata = tools.dataForKey(this.tableData[row.row], val);
           this.filesArr = IPSdata ? IPSdata : [];
           this.myDialog.uploadFiles = true;

+ 20 - 9
src/views/ledger/facility/details/index.vue

@@ -294,18 +294,17 @@ export default {
     },
     handlePicList(arr) {
       let picObject = {}
+      let video = []
       //处理数据格式
       arr.map(i => {
-        if (i.InputMode == 'F2') {
+        if (i.InputMode == 'F2' || i.InputMode == 'F1') {
           switch (i.Path) {
-            case 'LedgerParam.PhotoDoc.Drawing':
             case 'LedgerParam.Siteinstall.InstallPic':
-            case 'LedgerParam.Siteinstall.InstallDrawing':
             case 'LedgerParam.PhotoDoc.Nameplate':
             case 'LedgerParam.PhotoDoc.Pic':
-            case 'Pic' :
               if (this.instance.hasOwnProperty(i.Path)) {
-                i.PicList = this.instance[i.Path]
+                i.PicList = this.instance[i.Path].filter(i => i.Type === 'image')
+                video = video.concat(this.instance[i.Path].filter(i => i.Type === 'video'))
               }
               if (picObject[i.InfoPointName]) {
               } else {
@@ -333,7 +332,6 @@ export default {
         }
       }
       this.exhibitionImage.arr = isArray
-      let video = isArray.filter(i => i.Type != 'image' && i.type != 'image')
       this.exhibitionVideo.list = video
       //判断是否显示图片组件
       this.isShowImage = isArray.length ? true : false
@@ -347,9 +345,22 @@ export default {
       arr.map(i => {
         if (i.InputMode == 'F2') {
           switch (i.Path) {
-            case 'LedgerParam.InsuranceDoc.InsuranceFile':
-            case 'LedgerParam.PhotoDoc.Archive':
-            case 'LedgerParam.Siteinstall.CheckReport':
+            case 'LedgerParam.EquipManufactor.OriginalCertificate': //原厂证明
+            case 'LedgerParam.SupplyPurchase.AcceptanceReport': //验收报告
+            case 'LedgerParam.OperationMainte.MaintainManual': //维修保养手册
+            case 'LedgerParam.PhotoDoc.Archive': //设备文档
+            case 'LedgerParam.PhotoDoc.Drawing': //设备图纸
+            case 'LedgerParam.SupplyPurchase.ApproachingAcceptance': //进场验收单
+            case 'LedgerParam.EquipManufactor.TestReport': //检测报告
+            case 'LedgerParam.SupplyPurchase.SupplierContract': //供应合同
+            case 'LedgerParam.PhotoDoc.ProductCertification': //产品合格证
+            case 'LedgerParam.PhotoDoc.OperationManual': //操作说明书
+            case 'LedgerParam.InsuranceDoc.InsuranceFile': //保险文件
+            case 'LedgerParam.Siteinstall.CheckReport': //安装质检报告
+            case 'LedgerParam.Siteinstall.InstallDrawing': //安装图纸
+            case 'LedgerParam.Siteinstall.InstallInstruction': //安装说明书
+            case 'TechParam.CompleteMachine.DesignIDGraph': //设计工况空调机组处理过程焓湿图
+            case 'TechParam.AirSupply.FanCharacterCurve': //风机性能曲线
               if (this.instance.hasOwnProperty(i.Path)) {
                 i.fileList = this.instance[i.Path]
               }