2 Commits 290b0b6fe4 ... c427451f13

Autor SHA1 Mensaje Fecha
  zzw c427451f13 Merge remote-tracking branch 'new/master' hace 1 semana
  zzw df691d37c2 fix:调查表和核定表模板维护 hace 1 semana
Se han modificado 1 ficheros con 46 adiciones y 7 borrados
  1. 46 7
      src/components/task/components/costAudit.vue

+ 46 - 7
src/components/task/components/costAudit.vue

@@ -105,7 +105,7 @@
         :fixed="item.fixed"
         show-overflow-tooltip
       >
-        <!-- <template slot-scope="scope"> 
+        <!-- <template slot-scope="scope">
         <el-input
           v-model="scope.row[item.prop]"
           :placeholder="item.label"
@@ -626,7 +626,37 @@
               ...item,
               prop: item.fieldEname,
               label: item.fieldName,
+              // 自动宽度:仅"序号"使用固定宽,其余使用最小宽度并开启溢出提示
+              width: item.fieldName == '序号' ? '80px' : undefined,
+              minWidth: item.fieldName == '序号' ? undefined : '150px',
               align: 'center',
+              fieldType: item.fieldType,
+              fieldTypelen: item.fieldTypelen,
+              fieldTypenointlen: item.fieldTypenointlen,
+              isDict: item.isDict,
+              dictCode: item.dictCode,
+              showOverflowTooltip: item.fieldName == '序号' ? false : true,
+            }
+
+            // 账面值/审核调整值/核定值:允许输入小数(也兼容整数)
+            // 后端若未返回小数位长度,默认给 2 位
+            const nameForNumber = item.fieldName || item.label || ''
+            const isYearAmountCol = /^\d{4}年(账面值|审核调整值|核定值)$/.test(
+              String(nameForNumber)
+            )
+            const isAuditPeriodAmountCol =
+              String(nameForNumber).includes('年账面值') ||
+              String(nameForNumber).includes('年审核调整值') ||
+              String(nameForNumber).includes('年核定值')
+            if (isYearAmountCol || isAuditPeriodAmountCol) {
+              column.fieldType = 'double'
+              if (
+                column.fieldTypenointlen === undefined ||
+                column.fieldTypenointlen === null ||
+                String(column.fieldTypenointlen).trim() === ''
+              ) {
+                column.fieldTypenointlen = '2'
+              }
             }
             this.costAuditcolumn.push(column)
           })
@@ -650,21 +680,24 @@
             auditPeriod.forEach((item) => {
               // 账面价值字段
               let bookValueColumn = {
+                fieldEname: 'year' + item + 'BookValue',
                 prop: 'year' + item + 'BookValue',
                 label: item + '年账面值',
                 width: '120px',
+                minWidth: '150px',
                 align: 'right',
                 fieldName: item + '年账面值',
-                fieldType: 'integer',
+                fieldType: 'double',
                 format: '',
                 fieldTypelen: '255',
-                fieldTypenointlen: '',
+                fieldTypenointlen: '2',
                 isAuditPeriod: 'true',
                 isRequired: 'true',
                 showVisible: '1',
                 isDict: 'false',
                 dictid: '',
                 dictValue: '',
+                showOverflowTooltip: true,
                 tabtype: this.tableHeadersRes[0].tabtype,
                 surveyTemplateId: this.tableHeadersRes[0].surveyTemplateId,
                 versionId: this.tableHeadersRes[0].versionId,
@@ -674,21 +707,24 @@
               this.tableHeadersRes.push(bookValueColumn)
               // 审核字段
               let auditColumn = {
+                fieldEname: 'year' + item + 'Audit',
                 prop: 'year' + item + 'Audit',
                 label: item + '年审核调整值',
                 width: '150px',
+                minWidth: '150px',
                 align: 'center',
                 fieldName: item + '年审核调整值',
-                fieldType: 'integer',
+                fieldType: 'double',
                 format: '',
                 fieldTypelen: '255',
-                fieldTypenointlen: '',
+                fieldTypenointlen: '2',
                 isRequired: 'true',
                 isAuditPeriod: 'true',
                 showVisible: '1',
                 isDict: 'false',
                 dictid: '',
                 dictValue: '',
+                showOverflowTooltip: true,
                 tabtype: this.tableHeadersRes[0].tabtype,
                 surveyTemplateId: this.tableHeadersRes[0].surveyTemplateId,
                 versionId: this.tableHeadersRes[0].versionId,
@@ -698,21 +734,24 @@
               this.tableHeadersRes.push(auditColumn)
               // 核定值字段
               let approvedValueColumn = {
+                fieldEname: 'year' + item + 'ApprovedValue',
                 prop: 'year' + item + 'ApprovedValue',
                 label: item + '年核定值',
                 width: '120px',
+                minWidth: '150px',
                 align: 'right',
                 fieldName: item + '年核定值',
-                fieldType: 'integer',
+                fieldType: 'double',
                 format: '',
                 fieldTypelen: '255',
-                fieldTypenointlen: '',
+                fieldTypenointlen: '2',
                 isRequired: 'true',
                 isAuditPeriod: 'true',
                 showVisible: '1',
                 isDict: 'false',
                 dictid: '',
                 dictValue: '',
+                showOverflowTooltip: true,
                 tabtype: this.tableHeadersRes[0].tabtype,
                 surveyTemplateId: this.tableHeadersRes[0].surveyTemplateId,
                 versionId: this.tableHeadersRes[0].versionId,