Prechádzať zdrojové kódy

adm:feat > 修改详情页相关inputMode输入类型

shaun-sheep 4 rokov pred
rodič
commit
ace3c74246

+ 0 - 1
src/utils/handsontable/notShow.js

@@ -277,7 +277,6 @@ const showTools = {
           arr.splice(item, 0, {
             category: 'STATIC',
             dataType: "STRING",
-            dataType: "STR",
             firstName: "基本信息",
             aliasCode: "dpManufacturerId",
             aliasName: "生产厂家/品牌/型号",

+ 1 - 1
src/views/ledger/cenotelist/cenoteDetail/index.vue

@@ -218,7 +218,7 @@ export default {
                 i.value = k.name
               }
             })
-          } else if (i.inputMode == 'D2' || i.inputMode == 'C6') {
+          } else if (i.dataType == 'MENUM' || i.dataType == 'DATETIME'){
             if (this.instance.hasOwnProperty(i.path)) {
               if (!Array.isArray(this.instance[i.path])) {
                 let transArray = this.instance[i.path].split(',')

+ 1 - 1
src/views/ledger/facility/details/index.vue

@@ -459,7 +459,7 @@ export default {
                 i.value = k.name
               }
             })
-          } else if (i.inputMode == 'D2' || i.inputMode == 'C6') {
+          } else if (i.dataType == 'MENUM' || i.dataType == 'DATETIME'){
             if (this.instance.hasOwnProperty(i.path)) {
               if (!Array.isArray(this.instance[i.path])) {
                 let transArray = this.instance[i.path].split(',')

+ 1 - 50
src/views/ledger/property/details/index.vue

@@ -383,7 +383,7 @@ export default {
                 i.value = k.name
               }
             })
-          } else if (i.inputMode == 'D2' || i.inputMode == 'C6') {
+          } else if (i.dataType == 'MENUM' || i.dataType == 'DATETIME') {
             if (this.instance.hasOwnProperty(i.path)) {
               if (!Array.isArray(this.instance[i.path])) {
                 let transArray = this.instance[i.path].split(',')
@@ -441,55 +441,6 @@ export default {
           }
         }
       })
-      // switch (i.inputMode) {
-      //   case "L":
-      //   case "L1":
-      //   case "L2":
-      //   case "M":
-      //     break;
-      //   default:
-      //     if (result[`${i.firstName}${i.secondName ? '/' + i.secondName : ''}`]) {
-      //       result[`${i.firstName}${i.secondName ? '/' + i.secondName : ''}`].paths.push({
-      //         Path: i.Path,
-      //         InfoPointName: i.name,
-      //         InfoPointCode: i.code,
-      //         Value: i.value,
-      //         Visible: i.visible,
-      //         KeyWord: i.keyWord,
-      //         InputMode: i.inputMode,
-      //         data: i.data,
-      //         receivetime: i.receivetime,
-      //         error: i.error,
-      //         Unit: i.unit,
-      //         FirstName: i.firstName,
-      //         classCode: i.classCode,
-      //         id: i.id,
-      //         groupCode: i.groupCode,
-      //         type: i.type
-      //       })
-      //     } else {
-      //       result[`${i.firstName}${i.secondName ? '/' + i.secondName : ''}`] = {
-      //         paths: [{
-      //           Path: i.path,
-      //           InfoPointName: i.name,
-      //           InfoPointCode: i.code,
-      //           Value: i.value,
-      //           Visible: i.visible,
-      //           KeyWord: i.keyWord,
-      //           InputMode: i.inputMode,
-      //           data: i.data,
-      //           receivetime: i.receivetime,
-      //           error: i.error,
-      //           Unit: i.unit,
-      //           FirstName: i.firstName,
-      //           classCode: i.classCode,
-      //           id: i.id,
-      //           groupCode: i.groupCode,
-      //           type: i.type
-      //         }]
-      //       }
-      //     }
-      // }
 
       this.exhibitionBaseInformation.information = result
       this.exhibitionCrux.allMessage = result

+ 1 - 1
src/views/ledger/spacelist/spaceDetail/index.vue

@@ -460,7 +460,7 @@ export default {
                 i.value = k.name
               }
             })
-          } else if (i.inputMode == 'D2' || i.inputMode == 'C6') {
+          } else if (i.dataType == 'MENUM' || i.dataType == 'DATETIME') {
             if (this.instance.hasOwnProperty(i.path)) {
               if (!Array.isArray(this.instance[i.path])) {
                 let transArray = this.instance[i.path].split(',')

+ 2 - 2
src/views/ledger/system/systemDetail/index.vue

@@ -292,7 +292,7 @@ export default {
       let picObject = {}
       //处理数据格式
       arr.map(i => {
-        if (i.InputMode == 'F2') {
+        if (i.dataType == 'ATTACHMENT') {
           switch (i.Path) {
             case 'infos.drawing':
             case 'infos.installPic':
@@ -421,7 +421,7 @@ export default {
                 i.value = k.name
               }
             })
-          } else if (i.inputMode == 'D2' || i.inputMode == 'C6') {
+          } else if (i.dataType == 'MENUM' || i.dataType == 'DATETIME') {
             if (this.instance.hasOwnProperty(i.path)) {
               if (!Array.isArray(this.instance[i.path])) {
                 let transArray = this.instance[i.path].split(',')

+ 9 - 14
src/views/screen/splitscreen/spaceledger/index.vue

@@ -304,7 +304,7 @@ export default {
       let proId = localStorage.getItem('projectId');
       let secret = localStorage.getItem('secret');
       let params = {
-        filters: 'inputMode in ["L1","L2","L","M"]',
+        filters: 'category != STATIC',
         orders: "sort asc",
         pageNumber: 1,
         pageSize: 500,
@@ -358,7 +358,7 @@ export default {
         if (this.instance && this.instance.hasOwnProperty(i.Path) && this.currentRadio != 2) {
           i.value = this.instance[i.Path]
         }
-        if (i.InputMode == 'C5') {
+        if (i.dataType == 'DATETIME') {
           if (this.instance && this.instance.hasOwnProperty(i.Path)) {
             let time = this.instance[i.Path]
             i.value = this.formatDate(time)
@@ -367,14 +367,14 @@ export default {
         if (i.DataSource && i.DataSource.length) {
           let source = JSON.parse(i.DataSource)
           //判断输入类型
-          if (i.InputMode == 'D1L') {
+          if (i.dataType == 'ENUM') {
             let d1l = tools.formatDataSource(i.DataSource)
             d1l.forEach(k => {
               if (k.Code == this.instance[i.Path]) {
                 i.value = k.Name
               }
             })
-          } else if (i.InputMode == 'D2' || i.InputMode == 'C6') {
+          } else if (i.dataType == 'MENUM' || i.dataType == 'DATETIME') {
             if (this.instance && this.instance.hasOwnProperty(i.Path)) {
               if (!Array.isArray(this.instance[i.Path])) {
                 let transArray = this.instance[i.Path].split(',')
@@ -388,13 +388,8 @@ export default {
             }
           })
         }
-        switch (i.InputMode) {
-          case "L":
-          case "L1":
-          case "L2":
-          case "M":
-            break;
-          default:
+        switch (i.category) {
+          case "STATIC":
             if (result[`${i.FirstName}${i.SecondName ? '/' + i.SecondName : ''}`]) {
               result[`${i.FirstName}${i.SecondName ? '/' + i.SecondName : ''}`].paths.push({
                 Path: i.Path,
@@ -403,7 +398,7 @@ export default {
                 Value: i.value,
                 Visible: i.Visible,
                 KeyWord: i.KeyWord,
-                InputMode: i.InputMode
+                dataType: i.dataType
               })
             } else {
               result[`${i.FirstName}${i.SecondName ? '/' + i.SecondName : ''}`] = {
@@ -414,11 +409,11 @@ export default {
                   Value: i.value,
                   Visible: i.Visible,
                   KeyWord: i.KeyWord,
-                  InputMode: i.InputMode
+                  dataType: i.dataType
                 }]
               }
             }
-
+            break
         }
       })
       this.exhibitionBaseInformation.information = result