Commit 3ec10d9e8303dbdd40b812b1592d5da599482ffc
1 parent
93a3fd11
Exists in
develop
and in
1 other branch
update:同步pc端表单
Showing
14 changed files
with
3341 additions
and
961 deletions
Show diff stats
api/auth.js
| @@ -7,8 +7,9 @@ const { | @@ -7,8 +7,9 @@ const { | ||
| 7 | 7 | ||
| 8 | //使用手机 + 密码登录 | 8 | //使用手机 + 密码登录 |
| 9 | export const passwordLogin = data => { | 9 | export const passwordLogin = data => { |
| 10 | - data.password = encrypt(data.password); | ||
| 11 | - return http.post('/auth/login', data) | 10 | + let formData = {...data}; |
| 11 | + formData.password = encrypt(formData.password); | ||
| 12 | + return http.post('/auth/login', formData) | ||
| 12 | } | 13 | } |
| 13 | 14 | ||
| 14 | // export function passwordLogin(username, password, code, uuid) { | 15 | // export function passwordLogin(username, password, code, uuid) { |
main.js
| @@ -14,6 +14,8 @@ import { dDingJudgeEnvPlatform } from 'utils/isDing.js' | @@ -14,6 +14,8 @@ import { dDingJudgeEnvPlatform } from 'utils/isDing.js' | ||
| 14 | 14 | ||
| 15 | import {DICT_TYPE, getDictDataLabel, getDictDatas, getDictDatas2} from "./utils/dict"; | 15 | import {DICT_TYPE, getDictDataLabel, getDictDatas, getDictDatas2} from "./utils/dict"; |
| 16 | 16 | ||
| 17 | +window.wx = {} | ||
| 18 | + | ||
| 17 | // 将 dict 方法挂载到全局对象上 | 19 | // 将 dict 方法挂载到全局对象上 |
| 18 | 20 | ||
| 19 | Vue.config.productionTip = false | 21 | Vue.config.productionTip = false |
manifest.json
| @@ -2,8 +2,8 @@ | @@ -2,8 +2,8 @@ | ||
| 2 | "name" : "市场资讯", | 2 | "name" : "市场资讯", |
| 3 | "appid" : "__UNI__A1179CD", | 3 | "appid" : "__UNI__A1179CD", |
| 4 | "description" : "市场资讯", | 4 | "description" : "市场资讯", |
| 5 | - "versionName" : "0.1.1", | ||
| 6 | - "versionCode" : 101, | 5 | + "versionName" : "0.3.0", |
| 6 | + "versionCode" : 103, | ||
| 7 | "transformPx" : false, | 7 | "transformPx" : false, |
| 8 | /* 5+App特有相关 */ | 8 | /* 5+App特有相关 */ |
| 9 | "app-plus" : { | 9 | "app-plus" : { |
| @@ -75,7 +75,7 @@ | @@ -75,7 +75,7 @@ | ||
| 75 | "base" : "./" | 75 | "base" : "./" |
| 76 | }, | 76 | }, |
| 77 | "devServer" : { | 77 | "devServer" : { |
| 78 | - "https" : true | 78 | + "https" : false |
| 79 | } | 79 | } |
| 80 | } | 80 | } |
| 81 | } | 81 | } |
pages.json
| @@ -2,24 +2,24 @@ | @@ -2,24 +2,24 @@ | ||
| 2 | "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages | 2 | "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages |
| 3 | { | 3 | { |
| 4 | "path": "pages/login/mobile" | 4 | "path": "pages/login/mobile" |
| 5 | - }, | ||
| 6 | - { | 5 | + },{ |
| 7 | "path": "pages/market/index", | 6 | "path": "pages/market/index", |
| 8 | "style": { | 7 | "style": { |
| 9 | "navigationBarTitleText": "市场资讯", | 8 | "navigationBarTitleText": "市场资讯", |
| 10 | "navigationStyle": "custom", | 9 | "navigationStyle": "custom", |
| 11 | "enablePullDownRefresh": true | 10 | "enablePullDownRefresh": true |
| 12 | } | 11 | } |
| 13 | - }, { | ||
| 14 | - "path": "pages/market/newsDetails", | ||
| 15 | - "style": { | ||
| 16 | - "navigationBarTitleText": "资讯详情", | ||
| 17 | - "navigationStyle": "custom" | ||
| 18 | - } | ||
| 19 | - }, { | 12 | + },{ |
| 20 | "path": "pages/market/total", | 13 | "path": "pages/market/total", |
| 21 | "style": { | 14 | "style": { |
| 22 | "navigationBarTitleText": "数据统计", | 15 | "navigationBarTitleText": "数据统计", |
| 16 | + "navigationStyle": "custom", | ||
| 17 | + "enablePullDownRefresh": true | ||
| 18 | + } | ||
| 19 | + },{ | ||
| 20 | + "path": "pages/market/newsDetails", | ||
| 21 | + "style": { | ||
| 22 | + "navigationBarTitleText": "资讯详情", | ||
| 23 | "navigationStyle": "custom" | 23 | "navigationStyle": "custom" |
| 24 | } | 24 | } |
| 25 | }, { | 25 | }, { |
| @@ -72,20 +72,17 @@ | @@ -72,20 +72,17 @@ | ||
| 72 | "text": "数据统计", | 72 | "text": "数据统计", |
| 73 | "iconPath": "/static/images/tabbar/total.png", | 73 | "iconPath": "/static/images/tabbar/total.png", |
| 74 | "selectedIconPath": "/static/images/tabbar/total-active.png" | 74 | "selectedIconPath": "/static/images/tabbar/total-active.png" |
| 75 | - }, | ||
| 76 | - { | 75 | + },{ |
| 77 | "pagePath": "pages/market/insight", | 76 | "pagePath": "pages/market/insight", |
| 78 | "text": "市场洞察", | 77 | "text": "市场洞察", |
| 79 | "iconPath": "/static/images/tabbar/insight.png", | 78 | "iconPath": "/static/images/tabbar/insight.png", |
| 80 | "selectedIconPath": "/static/images/tabbar/insight-active.png" | 79 | "selectedIconPath": "/static/images/tabbar/insight-active.png" |
| 81 | - }, | ||
| 82 | - { | 80 | + },{ |
| 83 | "pagePath": "pages/market/researchReport", | 81 | "pagePath": "pages/market/researchReport", |
| 84 | "text": "研究报告", | 82 | "text": "研究报告", |
| 85 | "iconPath": "/static/images/tabbar/report.png", | 83 | "iconPath": "/static/images/tabbar/report.png", |
| 86 | "selectedIconPath": "/static/images/tabbar/report-active.png" | 84 | "selectedIconPath": "/static/images/tabbar/report-active.png" |
| 87 | - }, | ||
| 88 | - { | 85 | + },{ |
| 89 | "pagePath": "pages/market/knowledgeBase", | 86 | "pagePath": "pages/market/knowledgeBase", |
| 90 | "text": "知识库", | 87 | "text": "知识库", |
| 91 | "iconPath": "/static/images/tabbar/knowledgeBase.png", | 88 | "iconPath": "/static/images/tabbar/knowledgeBase.png", |
pages/login/mobile.vue
| @@ -53,7 +53,7 @@ | @@ -53,7 +53,7 @@ | ||
| 53 | <view class="text" :class="rememberMe ? 'remember-text' : ''">记住密码</view> | 53 | <view class="text" :class="rememberMe ? 'remember-text' : ''">记住密码</view> |
| 54 | </view> | 54 | </view> |
| 55 | <view class="btn-group"> | 55 | <view class="btn-group"> |
| 56 | - <u-button class="auth-btn" customStyle="margin-top: 50px" @click="handleSubmit">登录</u-button> | 56 | + <u-button class="auth-btn" customStyle="margin-top: 50px" @click="handleSubmit" @>登录</u-button> |
| 57 | </view> | 57 | </view> |
| 58 | </u--form> | 58 | </u--form> |
| 59 | </view> | 59 | </view> |
| @@ -139,6 +139,9 @@ | @@ -139,6 +139,9 @@ | ||
| 139 | uni.switchTab({ | 139 | uni.switchTab({ |
| 140 | url: '/pages/market/index' | 140 | url: '/pages/market/index' |
| 141 | }) | 141 | }) |
| 142 | + // uni.navigateTo({ | ||
| 143 | + // url: '/pages/market/total' | ||
| 144 | + // }) | ||
| 142 | }, 300) | 145 | }, 300) |
| 143 | }).catch(err => { | 146 | }).catch(err => { |
| 144 | // alert(JSON.stringify(err)) | 147 | // alert(JSON.stringify(err)) |
| @@ -226,8 +229,11 @@ | @@ -226,8 +229,11 @@ | ||
| 226 | this.rememberPassword() | 229 | this.rememberPassword() |
| 227 | this.$store.dispatch('loadDictDatas') | 230 | this.$store.dispatch('loadDictDatas') |
| 228 | setTimeout(() => { | 231 | setTimeout(() => { |
| 232 | + // uni.navigateTo({ | ||
| 233 | + // url: '/pages/market/total' | ||
| 234 | + // }) | ||
| 229 | uni.switchTab({ | 235 | uni.switchTab({ |
| 230 | - url: '/pages/market/index' | 236 | + url: '/pages/market/total' |
| 231 | }) | 237 | }) |
| 232 | }, 300) | 238 | }, 300) |
| 233 | }).catch(error =>{ | 239 | }).catch(error =>{ |
pages/market/components/cardMoudule.vue
| @@ -17,14 +17,21 @@ | @@ -17,14 +17,21 @@ | ||
| 17 | </view> | 17 | </view> |
| 18 | 18 | ||
| 19 | <view class="largeAmountOfTextCss" v-if="item.cardType == 2"> | 19 | <view class="largeAmountOfTextCss" v-if="item.cardType == 2"> |
| 20 | - {{ item.value }} | 20 | + <view class="" v-if="item.value"> |
| 21 | + {{ item.value }} | ||
| 22 | + </view> | ||
| 23 | + <view class="" v-else> | ||
| 24 | + 无 | ||
| 25 | + </view> | ||
| 21 | </view> | 26 | </view> |
| 22 | 27 | ||
| 23 | <view class="u-demo-block" v-if="item.cardType == 3"> | 28 | <view class="u-demo-block" v-if="item.cardType == 3"> |
| 24 | - <view class="u-demo-block__title"> | ||
| 25 | - <span> | ||
| 26 | - <text class="requiredCss" v-if="item.required">*</text> | ||
| 27 | - {{item.title}}</span> | 29 | + <view class="u-demo-block__title secondTextCss"> |
| 30 | + <span style="margin-bottom: 10rpx;"> | ||
| 31 | + <!-- <text class="requiredCss" v-if="item.required">*</text> --> | ||
| 32 | + {{item.title}} | ||
| 33 | + </span> | ||
| 34 | + <u-line></u-line> | ||
| 28 | </view> | 35 | </view> |
| 29 | </view> | 36 | </view> |
| 30 | 37 | ||
| @@ -32,8 +39,23 @@ | @@ -32,8 +39,23 @@ | ||
| 32 | {{ item.title }} | 39 | {{ item.title }} |
| 33 | </view> | 40 | </view> |
| 34 | 41 | ||
| 35 | - </view> | 42 | + <view class="u-demo-block" v-if="item.cardType == 5"> |
| 43 | + <view class="u-demo-block__title"> | ||
| 44 | + <span> | ||
| 45 | + <text class="requiredCss" v-if="item.required">*</text> | ||
| 46 | + {{item.title}}</span> | ||
| 47 | + </view> | ||
| 48 | + <view class="largeAmountOfTextCss"> | ||
| 49 | + <view class="" v-if="item.value"> | ||
| 50 | + {{ item.value }} | ||
| 51 | + </view> | ||
| 52 | + <view class="" v-else> | ||
| 53 | + 无 | ||
| 54 | + </view> | ||
| 55 | + </view> | ||
| 56 | + </view> | ||
| 36 | 57 | ||
| 58 | + </view> | ||
| 37 | </view> | 59 | </view> |
| 38 | </template> | 60 | </template> |
| 39 | 61 | ||
| @@ -87,7 +109,17 @@ | @@ -87,7 +109,17 @@ | ||
| 87 | color: #333333; | 109 | color: #333333; |
| 88 | } | 110 | } |
| 89 | 111 | ||
| 112 | + .secondTextCss { | ||
| 113 | + display: flex; | ||
| 114 | + justify-content: center; | ||
| 115 | + align-items: center; | ||
| 116 | + font-weight: bold; | ||
| 117 | + color: #333333 !important; | ||
| 118 | + } | ||
| 119 | + | ||
| 90 | .u-demo-block__title { | 120 | .u-demo-block__title { |
| 121 | + display: flex; | ||
| 122 | + flex-direction: column; | ||
| 91 | background-color: rgba(255, 255, 255, 0); | 123 | background-color: rgba(255, 255, 255, 0); |
| 92 | box-sizing: border-box; | 124 | box-sizing: border-box; |
| 93 | font-family: '苹方 中等', '苹方', sans-serif; | 125 | font-family: '苹方 中等', '苹方', sans-serif; |
pages/market/components/reportModule1.vue
| @@ -39,32 +39,34 @@ | @@ -39,32 +39,34 @@ | ||
| 39 | </view> | 39 | </view> |
| 40 | <view class="cardCss"> | 40 | <view class="cardCss"> |
| 41 | <!-- <u-collapse :border="false" :value="['2']"> --> | 41 | <!-- <u-collapse :border="false" :value="['2']"> --> |
| 42 | - <!-- <u-collapse-item name="2"> --> | ||
| 43 | - <text class="slot-title">实施情况</text> | ||
| 44 | - <!-- <text slot="title" class="slot-title">实施情况</text> --> | ||
| 45 | - <view class="largeAmountOfTextCss"> | ||
| 46 | - {{reportData.implementationSituation || ""}} | ||
| 47 | - </view> | ||
| 48 | - <!-- </u-collapse-item> --> | 42 | + <!-- <u-collapse-item name="2"> --> |
| 43 | + <text class="slot-title">实施情况</text> | ||
| 44 | + <!-- <text slot="title" class="slot-title">实施情况</text> --> | ||
| 45 | + <view class="largeAmountOfTextCss"> | ||
| 46 | + {{reportData.implementationSituation || ""}} | ||
| 47 | + </view> | ||
| 48 | + <!-- </u-collapse-item> --> | ||
| 49 | <!-- </u-collapse> --> | 49 | <!-- </u-collapse> --> |
| 50 | </view> | 50 | </view> |
| 51 | 51 | ||
| 52 | + <cardMoudule :cardData="fiveLooksData" :required="false" title="'五看'市场调研"></cardMoudule> | ||
| 53 | + | ||
| 52 | <view class="cardCss"> | 54 | <view class="cardCss"> |
| 53 | <!-- <u-collapse :border="false" :value="['3']"> --> | 55 | <!-- <u-collapse :border="false" :value="['3']"> --> |
| 54 | - <!-- <u-collapse-item name="3"> --> | ||
| 55 | - <text class="slot-title">预算主体附件</text> | ||
| 56 | - <view class="attachmentCss" v-if="this.isShowUrl"> | ||
| 57 | - <view class="flexCss" v-for="(item,index) in fileList" :key="index"> | ||
| 58 | - <view class="leftCss overflow-one-lines"> | ||
| 59 | - <u-icon size="18" :name="calcIcon(item.extension)"></u-icon> | ||
| 60 | - <view class="textCss overflow-one-lines">{{item.fileName}}</view> | ||
| 61 | - </view> | ||
| 62 | - <view class="rightCss"> | ||
| 63 | - <view @click="viewAttachments(item.url)">查看</view> | ||
| 64 | - </view> | ||
| 65 | - </view> | 56 | + <!-- <u-collapse-item name="3"> --> |
| 57 | + <text class="slot-title">预算主体附件</text> | ||
| 58 | + <view class="attachmentCss" v-if="this.isShowUrl"> | ||
| 59 | + <view class="flexCss" v-for="(item,index) in fileList" :key="index"> | ||
| 60 | + <view class="leftCss overflow-one-lines"> | ||
| 61 | + <u-icon size="18" :name="calcIcon(item.extension)"></u-icon> | ||
| 62 | + <view class="textCss overflow-one-lines">{{item.fileName}}</view> | ||
| 66 | </view> | 63 | </view> |
| 67 | - <!-- </u-collapse-item> --> | 64 | + <view class="rightCss"> |
| 65 | + <view @click="viewAttachments(item.url)">查看</view> | ||
| 66 | + </view> | ||
| 67 | + </view> | ||
| 68 | + </view> | ||
| 69 | + <!-- </u-collapse-item> --> | ||
| 68 | <!-- </u-collapse> --> | 70 | <!-- </u-collapse> --> |
| 69 | </view> | 71 | </view> |
| 70 | </view> | 72 | </view> |
| @@ -74,8 +76,11 @@ | @@ -74,8 +76,11 @@ | ||
| 74 | import { | 76 | import { |
| 75 | getInsightFileList | 77 | getInsightFileList |
| 76 | } from '@/api/organize.js' | 78 | } from '@/api/organize.js' |
| 79 | + import cardMoudule from "./cardMoudule.vue" | ||
| 77 | export default { | 80 | export default { |
| 78 | - components: {}, | 81 | + components: { |
| 82 | + cardMoudule | ||
| 83 | + }, | ||
| 79 | props: { | 84 | props: { |
| 80 | reportData: { | 85 | reportData: { |
| 81 | type: Object | 86 | type: Object |
| @@ -84,7 +89,44 @@ | @@ -84,7 +89,44 @@ | ||
| 84 | data() { | 89 | data() { |
| 85 | return { | 90 | return { |
| 86 | isShowUrl: false, | 91 | isShowUrl: false, |
| 87 | - fileList:[], | 92 | + fileList: [], |
| 93 | + fiveLooksData: [ | ||
| 94 | + { | ||
| 95 | + cardType: 5, | ||
| 96 | + required: true, | ||
| 97 | + title: '看行业/趋势', | ||
| 98 | + value: "", | ||
| 99 | + key: "seeProfession" | ||
| 100 | + }, | ||
| 101 | + { | ||
| 102 | + cardType: 5, | ||
| 103 | + required: true, | ||
| 104 | + title: '看市场/客户', | ||
| 105 | + value: "", | ||
| 106 | + key: "seeMarket" | ||
| 107 | + }, | ||
| 108 | + { | ||
| 109 | + cardType: 5, | ||
| 110 | + required: true, | ||
| 111 | + title: '看竞争', | ||
| 112 | + value: "", | ||
| 113 | + key: "seeCompete" | ||
| 114 | + }, | ||
| 115 | + { | ||
| 116 | + cardType: 5, | ||
| 117 | + required: true, | ||
| 118 | + title: '看自身', | ||
| 119 | + value: "", | ||
| 120 | + key: "seeSelf" | ||
| 121 | + }, | ||
| 122 | + { | ||
| 123 | + cardType: 5, | ||
| 124 | + required: true, | ||
| 125 | + title: '看机会', | ||
| 126 | + value: "", | ||
| 127 | + key: "seeChance" | ||
| 128 | + }, | ||
| 129 | + ] | ||
| 88 | } | 130 | } |
| 89 | }, | 131 | }, |
| 90 | computed: { | 132 | computed: { |
| @@ -108,16 +150,23 @@ | @@ -108,16 +150,23 @@ | ||
| 108 | init() { | 150 | init() { |
| 109 | if (this.reportData.attachmentsUrl == "") { | 151 | if (this.reportData.attachmentsUrl == "") { |
| 110 | this.isShowUrl = false | 152 | this.isShowUrl = false |
| 111 | - }else{ | 153 | + } else { |
| 112 | this.isShowUrl = true | 154 | this.isShowUrl = true |
| 113 | } | 155 | } |
| 114 | let uuid = this.reportData.attachmentsUrl; | 156 | let uuid = this.reportData.attachmentsUrl; |
| 115 | - getInsightFileList(uuid).then(res=>{ | ||
| 116 | - if(res.code === 200){ | 157 | + getInsightFileList(uuid).then(res => { |
| 158 | + if (res.code === 200) { | ||
| 117 | this.fileList = res.rows | 159 | this.fileList = res.rows |
| 118 | } | 160 | } |
| 119 | }) | 161 | }) |
| 120 | - console.log('附件', JSON.parse(JSON.stringify(this.reportData.attachmentsUrl))); | 162 | + // 获取五看 |
| 163 | + this.fiveLooksData.forEach(data => { | ||
| 164 | + if (data.key in this.reportData) { | ||
| 165 | + data.value = this.reportData[data.key]; | ||
| 166 | + } | ||
| 167 | + }); | ||
| 168 | + console.log(this.fiveLooksData); | ||
| 169 | + // console.log('附件', JSON.parse(JSON.stringify(this.reportData.attachmentsUrl))); | ||
| 121 | }, | 170 | }, |
| 122 | 171 | ||
| 123 | viewAttachments(urls) { | 172 | viewAttachments(urls) { |
pages/market/components/reportModule2.vue
| @@ -4,8 +4,8 @@ | @@ -4,8 +4,8 @@ | ||
| 4 | <cardMoudule :cardData="urbanDevelopment" :required="true" title="城市总体发展规划"></cardMoudule> | 4 | <cardMoudule :cardData="urbanDevelopment" :required="true" title="城市总体发展规划"></cardMoudule> |
| 5 | <cardMoudule :cardData="natureOfBusiness" :required="false" title="经营区域及人口_经营区域(四至边界)"></cardMoudule> | 5 | <cardMoudule :cardData="natureOfBusiness" :required="false" title="经营区域及人口_经营区域(四至边界)"></cardMoudule> |
| 6 | <cardMoudule :cardData="regionalPopulation" :required="false" title="经营区域及人口_经营区域人口"></cardMoudule> | 6 | <cardMoudule :cardData="regionalPopulation" :required="false" title="经营区域及人口_经营区域人口"></cardMoudule> |
| 7 | - <cardMoudule :cardData="gasCompetition1" :required="true" title="管道燃气竞争对手及发展现状"></cardMoudule> | ||
| 8 | - <cardMoudule :cardData="gasCompetition2" :required="false" title="管道燃气竞争对手及发展现状"></cardMoudule> | 7 | + <!-- <cardMoudule :cardData="gasCompetition1" :required="true" title="管道燃气竞争对手及发展现状"></cardMoudule> |
| 8 | + <cardMoudule :cardData="gasCompetition2" :required="false" title="管道燃气竞争对手及发展现状"></cardMoudule> --> | ||
| 9 | <cardMoudule :cardData="guarantee" :required="true" title="气源保障与管网规划"></cardMoudule> | 9 | <cardMoudule :cardData="guarantee" :required="true" title="气源保障与管网规划"></cardMoudule> |
| 10 | <cardMoudule :cardData="builtUpArea" :required="false" title="建成区: 经营区域城市建成区"></cardMoudule> | 10 | <cardMoudule :cardData="builtUpArea" :required="false" title="建成区: 经营区域城市建成区"></cardMoudule> |
| 11 | <cardMoudule :cardData="ruralAreas" :required="false" title="乡镇及农村:乡镇及农村区域"></cardMoudule> | 11 | <cardMoudule :cardData="ruralAreas" :required="false" title="乡镇及农村:乡镇及农村区域"></cardMoudule> |
| @@ -29,8 +29,8 @@ | @@ -29,8 +29,8 @@ | ||
| 29 | attachment: { | 29 | attachment: { |
| 30 | type: Object | 30 | type: Object |
| 31 | }, | 31 | }, |
| 32 | - fiscalYear:{ | ||
| 33 | - type:String | 32 | + fiscalYear: { |
| 33 | + type: String | ||
| 34 | } | 34 | } |
| 35 | }, | 35 | }, |
| 36 | data() { | 36 | data() { |
| @@ -76,7 +76,7 @@ | @@ -76,7 +76,7 @@ | ||
| 76 | key: "conduitTime" | 76 | key: "conduitTime" |
| 77 | }, | 77 | }, |
| 78 | { | 78 | { |
| 79 | - cardType: 1, | 79 | + cardType: 5, |
| 80 | required: true, | 80 | required: true, |
| 81 | title: '特许经营区域范围的行政区划(或与政府约定的经营区域范围)', | 81 | title: '特许经营区域范围的行政区划(或与政府约定的经营区域范围)', |
| 82 | value: "", | 82 | value: "", |
| @@ -90,7 +90,7 @@ | @@ -90,7 +90,7 @@ | ||
| 90 | key: "manageArea" | 90 | key: "manageArea" |
| 91 | }, | 91 | }, |
| 92 | { | 92 | { |
| 93 | - cardType: 1, | 93 | + cardType: 5, |
| 94 | required: true, | 94 | required: true, |
| 95 | title: '经营区域城市建成区行政区划', | 95 | title: '经营区域城市建成区行政区划', |
| 96 | value: "", | 96 | value: "", |
| @@ -1771,7 +1771,7 @@ | @@ -1771,7 +1771,7 @@ | ||
| 1771 | cardType: 2, | 1771 | cardType: 2, |
| 1772 | required: true, | 1772 | required: true, |
| 1773 | title: '预算主体名称', | 1773 | title: '预算主体名称', |
| 1774 | - key:"selectAnalyze", | 1774 | + key: "selectAnalyze", |
| 1775 | value: "", | 1775 | value: "", |
| 1776 | }], | 1776 | }], |
| 1777 | teamStatus: [{ | 1777 | teamStatus: [{ |
| @@ -1779,49 +1779,49 @@ | @@ -1779,49 +1779,49 @@ | ||
| 1779 | required: true, | 1779 | required: true, |
| 1780 | title: '现有部门经理(人)', | 1780 | title: '现有部门经理(人)', |
| 1781 | value: "", | 1781 | value: "", |
| 1782 | - key:"departmentManagerNumber" | 1782 | + key: "departmentManagerNumber" |
| 1783 | }, | 1783 | }, |
| 1784 | { | 1784 | { |
| 1785 | cardType: 1, | 1785 | cardType: 1, |
| 1786 | required: true, | 1786 | required: true, |
| 1787 | title: '现有副经理(人)', | 1787 | title: '现有副经理(人)', |
| 1788 | value: "", | 1788 | value: "", |
| 1789 | - key:"assistantManagerNumber" | 1789 | + key: "assistantManagerNumber" |
| 1790 | }, | 1790 | }, |
| 1791 | { | 1791 | { |
| 1792 | cardType: 1, | 1792 | cardType: 1, |
| 1793 | required: true, | 1793 | required: true, |
| 1794 | title: '现有主管(人)', | 1794 | title: '现有主管(人)', |
| 1795 | value: "", | 1795 | value: "", |
| 1796 | - key:"directorNumber" | 1796 | + key: "directorNumber" |
| 1797 | }, | 1797 | }, |
| 1798 | { | 1798 | { |
| 1799 | cardType: 1, | 1799 | cardType: 1, |
| 1800 | required: true, | 1800 | required: true, |
| 1801 | title: '现有业务员(人)', | 1801 | title: '现有业务员(人)', |
| 1802 | value: "", | 1802 | value: "", |
| 1803 | - key:"salesmanNumber" | 1803 | + key: "salesmanNumber" |
| 1804 | }, | 1804 | }, |
| 1805 | { | 1805 | { |
| 1806 | cardType: 1, | 1806 | cardType: 1, |
| 1807 | required: true, | 1807 | required: true, |
| 1808 | title: '现有内勤(人)', | 1808 | title: '现有内勤(人)', |
| 1809 | value: "", | 1809 | value: "", |
| 1810 | - key:"officeStaffNumber" | 1810 | + key: "officeStaffNumber" |
| 1811 | }, | 1811 | }, |
| 1812 | { | 1812 | { |
| 1813 | cardType: 1, | 1813 | cardType: 1, |
| 1814 | required: true, | 1814 | required: true, |
| 1815 | title: '现有其他人员(人)', | 1815 | title: '现有其他人员(人)', |
| 1816 | value: "", | 1816 | value: "", |
| 1817 | - key:"otherNumber" | 1817 | + key: "otherNumber" |
| 1818 | }, | 1818 | }, |
| 1819 | { | 1819 | { |
| 1820 | cardType: 1, | 1820 | cardType: 1, |
| 1821 | required: true, | 1821 | required: true, |
| 1822 | title: '现有合计(人)', | 1822 | title: '现有合计(人)', |
| 1823 | value: "", | 1823 | value: "", |
| 1824 | - key:"totalNumber" | 1824 | + key: "totalNumber" |
| 1825 | }, | 1825 | }, |
| 1826 | ], | 1826 | ], |
| 1827 | } | 1827 | } |
| @@ -1835,76 +1835,111 @@ | @@ -1835,76 +1835,111 @@ | ||
| 1835 | }, | 1835 | }, |
| 1836 | methods: { | 1836 | methods: { |
| 1837 | initData() { | 1837 | initData() { |
| 1838 | - this.population.forEach(data => { | ||
| 1839 | - if (data.key in this.reportData) { | ||
| 1840 | - data.value = this.reportData[data.key]; | ||
| 1841 | - } | ||
| 1842 | - }); | ||
| 1843 | - this.urbanDevelopment.forEach(data => { | ||
| 1844 | - if (data.key in this.reportData) { | ||
| 1845 | - data.value = this.reportData[data.key]; | ||
| 1846 | - } | ||
| 1847 | - }); | ||
| 1848 | - this.natureOfBusiness.forEach(data => { | ||
| 1849 | - if (data.key in this.reportData) { | ||
| 1850 | - data.value = this.reportData[data.key]; | ||
| 1851 | - } | ||
| 1852 | - }); | ||
| 1853 | - this.regionalPopulation.forEach(data => { | ||
| 1854 | - if (data.key in this.reportData) { | ||
| 1855 | - data.value = this.reportData[data.key]; | ||
| 1856 | - } | ||
| 1857 | - }); | ||
| 1858 | - this.gasCompetition1.forEach(data => { | ||
| 1859 | - if (data.key in this.reportData) { | ||
| 1860 | - data.value = this.reportData[data.key]; | ||
| 1861 | - } | ||
| 1862 | - }); | ||
| 1863 | - this.gasCompetition2.forEach(data => { | ||
| 1864 | - if (data.key in this.reportData) { | ||
| 1865 | - data.value = this.reportData[data.key]; | ||
| 1866 | - } | ||
| 1867 | - }); | ||
| 1868 | - this.guarantee.forEach(data => { | ||
| 1869 | - if (data.key in this.reportData) { | ||
| 1870 | - data.value = this.reportData[data.key]; | ||
| 1871 | - } | ||
| 1872 | - }); | ||
| 1873 | - //城市新用户发展规模 | ||
| 1874 | - this.builtUpArea.forEach(data => { | ||
| 1875 | - if (data.key in this.attachment) { | ||
| 1876 | - let Arr = this.attachment[data.key].split(","); | ||
| 1877 | - data.value = Arr[data.id]; | ||
| 1878 | - } | ||
| 1879 | - }); | ||
| 1880 | - this.ruralAreas.forEach(data => { | ||
| 1881 | - if (data.key in this.attachment) { | ||
| 1882 | - let Arr = this.attachment[data.key].split(","); | ||
| 1883 | - data.value = Arr[data.id]; | ||
| 1884 | - } | ||
| 1885 | - }); | ||
| 1886 | - this.completionStatus.forEach(data => { | ||
| 1887 | - if (data.key in this.attachment) { | ||
| 1888 | - let Arr = this.attachment[data.key].split(","); | ||
| 1889 | - data.value = Arr[data.id]; | ||
| 1890 | - } | ||
| 1891 | - }); | ||
| 1892 | - this.naturalGas.forEach(data => { | ||
| 1893 | - if (data.key in this.attachment) { | ||
| 1894 | - let Arr = this.attachment[data.key].split(","); | ||
| 1895 | - data.value = Arr[data.id]; | ||
| 1896 | - } | ||
| 1897 | - }); | ||
| 1898 | - this.energyAnalysis.forEach(data => { | ||
| 1899 | - if (data.key in this.attachment) { | ||
| 1900 | - data.value = this.attachment[data.key]; | ||
| 1901 | - } | ||
| 1902 | - }); | ||
| 1903 | - this.teamStatus.forEach(data => { | ||
| 1904 | - if (data.key in this.attachment) { | ||
| 1905 | - data.value = this.attachment[data.key]; | ||
| 1906 | - } | ||
| 1907 | - }); | 1838 | + |
| 1839 | + // 逗号分隔分配 | ||
| 1840 | + const updateData = (dataArray, reportData) => { | ||
| 1841 | + dataArray.forEach(data => { | ||
| 1842 | + if (data.key in reportData) { | ||
| 1843 | + let Arr = reportData[data.key].split(","); | ||
| 1844 | + data.value = Arr[data.id]; | ||
| 1845 | + } | ||
| 1846 | + }); | ||
| 1847 | + }; | ||
| 1848 | + | ||
| 1849 | + // key直接分配 | ||
| 1850 | + const updateDataByKey = (dataArray, reportData) => { | ||
| 1851 | + dataArray.forEach(data => { | ||
| 1852 | + if (data.key in reportData) { | ||
| 1853 | + data.value = reportData[data.key]; | ||
| 1854 | + } | ||
| 1855 | + }); | ||
| 1856 | + }; | ||
| 1857 | + | ||
| 1858 | + updateData(this.builtUpArea, this.attachment); | ||
| 1859 | + updateData(this.ruralAreas, this.attachment); | ||
| 1860 | + updateData(this.completionStatus, this.attachment); | ||
| 1861 | + updateData(this.naturalGas, this.attachment); | ||
| 1862 | + | ||
| 1863 | + updateDataByKey(this.population, this.reportData); | ||
| 1864 | + updateDataByKey(this.urbanDevelopment, this.reportData); | ||
| 1865 | + updateDataByKey(this.natureOfBusiness, this.reportData); | ||
| 1866 | + updateDataByKey(this.regionalPopulation, this.reportData); | ||
| 1867 | + updateDataByKey(this.guarantee, this.reportData); | ||
| 1868 | + updateDataByKey(this.energyAnalysis, this.attachment); | ||
| 1869 | + updateDataByKey(this.teamStatus, this.attachment); | ||
| 1870 | + | ||
| 1871 | + // this.population.forEach(data => { | ||
| 1872 | + // if (data.key in this.reportData) { | ||
| 1873 | + // data.value = this.reportData[data.key]; | ||
| 1874 | + // } | ||
| 1875 | + // }); | ||
| 1876 | + // this.urbanDevelopment.forEach(data => { | ||
| 1877 | + // if (data.key in this.reportData) { | ||
| 1878 | + // data.value = this.reportData[data.key]; | ||
| 1879 | + // } | ||
| 1880 | + // }); | ||
| 1881 | + // this.natureOfBusiness.forEach(data => { | ||
| 1882 | + // if (data.key in this.reportData) { | ||
| 1883 | + // data.value = this.reportData[data.key]; | ||
| 1884 | + // } | ||
| 1885 | + // }); | ||
| 1886 | + // this.regionalPopulation.forEach(data => { | ||
| 1887 | + // if (data.key in this.reportData) { | ||
| 1888 | + // data.value = this.reportData[data.key]; | ||
| 1889 | + // } | ||
| 1890 | + // }); | ||
| 1891 | + //移除 | ||
| 1892 | + // this.gasCompetition1.forEach(data => { | ||
| 1893 | + // if (data.key in this.reportData) { | ||
| 1894 | + // data.value = this.reportData[data.key]; | ||
| 1895 | + // } | ||
| 1896 | + // }); | ||
| 1897 | + //移除 | ||
| 1898 | + // this.gasCompetition2.forEach(data => { | ||
| 1899 | + // if (data.key in this.reportData) { | ||
| 1900 | + // data.value = this.reportData[data.key]; | ||
| 1901 | + // } | ||
| 1902 | + // }); | ||
| 1903 | + // this.guarantee.forEach(data => { | ||
| 1904 | + // if (data.key in this.reportData) { | ||
| 1905 | + // data.value = this.reportData[data.key]; | ||
| 1906 | + // } | ||
| 1907 | + // }); | ||
| 1908 | + // //城市新用户发展规模 | ||
| 1909 | + // this.builtUpArea.forEach(data => { | ||
| 1910 | + // if (data.key in this.attachment) { | ||
| 1911 | + // let Arr = this.attachment[data.key].split(","); | ||
| 1912 | + // data.value = Arr[data.id]; | ||
| 1913 | + // } | ||
| 1914 | + // }); | ||
| 1915 | + // this.ruralAreas.forEach(data => { | ||
| 1916 | + // if (data.key in this.attachment) { | ||
| 1917 | + // let Arr = this.attachment[data.key].split(","); | ||
| 1918 | + // data.value = Arr[data.id]; | ||
| 1919 | + // } | ||
| 1920 | + // }); | ||
| 1921 | + // this.completionStatus.forEach(data => { | ||
| 1922 | + // if (data.key in this.attachment) { | ||
| 1923 | + // let Arr = this.attachment[data.key].split(","); | ||
| 1924 | + // data.value = Arr[data.id]; | ||
| 1925 | + // } | ||
| 1926 | + // }); | ||
| 1927 | + // this.naturalGas.forEach(data => { | ||
| 1928 | + // if (data.key in this.attachment) { | ||
| 1929 | + // let Arr = this.attachment[data.key].split(","); | ||
| 1930 | + // data.value = Arr[data.id]; | ||
| 1931 | + // } | ||
| 1932 | + // }); | ||
| 1933 | + // this.energyAnalysis.forEach(data => { | ||
| 1934 | + // if (data.key in this.attachment) { | ||
| 1935 | + // data.value = this.attachment[data.key]; | ||
| 1936 | + // } | ||
| 1937 | + // }); | ||
| 1938 | + // this.teamStatus.forEach(data => { | ||
| 1939 | + // if (data.key in this.attachment) { | ||
| 1940 | + // data.value = this.attachment[data.key]; | ||
| 1941 | + // } | ||
| 1942 | + // }); | ||
| 1908 | } | 1943 | } |
| 1909 | } | 1944 | } |
| 1910 | } | 1945 | } |
pages/market/components/reportModule3.vue
| @@ -5,6 +5,7 @@ | @@ -5,6 +5,7 @@ | ||
| 5 | <cardMoudule :cardData="data3" :required="false" title="城市居民用户_新建居民用户"></cardMoudule> | 5 | <cardMoudule :cardData="data3" :required="false" title="城市居民用户_新建居民用户"></cardMoudule> |
| 6 | <cardMoudule :cardData="data4" :required="false" title="城市居民用户_老居民用户"></cardMoudule> | 6 | <cardMoudule :cardData="data4" :required="false" title="城市居民用户_老居民用户"></cardMoudule> |
| 7 | <cardMoudule :cardData="data5" :required="false" title="城市居民用户_老居民用户"></cardMoudule> | 7 | <cardMoudule :cardData="data5" :required="false" title="城市居民用户_老居民用户"></cardMoudule> |
| 8 | + <cardMoudule :cardData="data5add" :required="false" title="城市居民用户_老居民用户"></cardMoudule> | ||
| 8 | <cardMoudule :cardData="data6" :required="false" title="城市居民用户_老居民用户"></cardMoudule> | 9 | <cardMoudule :cardData="data6" :required="false" title="城市居民用户_老居民用户"></cardMoudule> |
| 9 | <cardMoudule :cardData="data7" :required="false" title="城市居民用户_老居民用户"></cardMoudule> | 10 | <cardMoudule :cardData="data7" :required="false" title="城市居民用户_老居民用户"></cardMoudule> |
| 10 | <cardMoudule :cardData="data8" :required="false" title="城市居民用户_老居民用户"></cardMoudule> | 11 | <cardMoudule :cardData="data8" :required="false" title="城市居民用户_老居民用户"></cardMoudule> |
| @@ -57,34 +58,34 @@ | @@ -57,34 +58,34 @@ | ||
| 57 | { | 58 | { |
| 58 | cardType: 1, | 59 | cardType: 1, |
| 59 | required: true, | 60 | required: true, |
| 60 | - title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 4}年`, | 61 | + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 3}年`, |
| 61 | value: "", | 62 | value: "", |
| 62 | key: "cityNewInstalled", | 63 | key: "cityNewInstalled", |
| 63 | - id: "0" | 64 | + id: "3" |
| 64 | }, | 65 | }, |
| 65 | { | 66 | { |
| 66 | cardType: 1, | 67 | cardType: 1, |
| 67 | required: true, | 68 | required: true, |
| 68 | - title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 3}年`, | 69 | + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 2}年`, |
| 69 | value: "", | 70 | value: "", |
| 70 | key: "cityNewInstalled", | 71 | key: "cityNewInstalled", |
| 71 | - id: "1" | 72 | + id: "2" |
| 72 | }, | 73 | }, |
| 73 | { | 74 | { |
| 74 | cardType: 1, | 75 | cardType: 1, |
| 75 | required: true, | 76 | required: true, |
| 76 | - title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 2}年`, | 77 | + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 1}年`, |
| 77 | value: "", | 78 | value: "", |
| 78 | key: "cityNewInstalled", | 79 | key: "cityNewInstalled", |
| 79 | - id: "2" | 80 | + id: "1" |
| 80 | }, | 81 | }, |
| 81 | { | 82 | { |
| 82 | cardType: 1, | 83 | cardType: 1, |
| 83 | required: true, | 84 | required: true, |
| 84 | - title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 1}年(预计)`, | 85 | + title: `${this.fiscalYear == "" ? "" : this.fiscalYear}年(预计)`, |
| 85 | value: "", | 86 | value: "", |
| 86 | key: "cityNewInstalled", | 87 | key: "cityNewInstalled", |
| 87 | - id: "3" | 88 | + id: "0" |
| 88 | }, | 89 | }, |
| 89 | //政府拍卖/转让/拆迁土地面积合计 | 90 | //政府拍卖/转让/拆迁土地面积合计 |
| 90 | { | 91 | { |
| @@ -95,34 +96,34 @@ | @@ -95,34 +96,34 @@ | ||
| 95 | { | 96 | { |
| 96 | cardType: 1, | 97 | cardType: 1, |
| 97 | required: true, | 98 | required: true, |
| 98 | - title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 4}年`, | 99 | + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 3}年`, |
| 99 | value: "", | 100 | value: "", |
| 100 | key: "auctionArea", | 101 | key: "auctionArea", |
| 101 | - id: "0" | 102 | + id: "3" |
| 102 | }, | 103 | }, |
| 103 | { | 104 | { |
| 104 | cardType: 1, | 105 | cardType: 1, |
| 105 | required: true, | 106 | required: true, |
| 106 | - title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 3}年`, | 107 | + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 2}年`, |
| 107 | value: "", | 108 | value: "", |
| 108 | key: "auctionArea", | 109 | key: "auctionArea", |
| 109 | - id: "1" | 110 | + id: "2" |
| 110 | }, | 111 | }, |
| 111 | { | 112 | { |
| 112 | cardType: 1, | 113 | cardType: 1, |
| 113 | required: true, | 114 | required: true, |
| 114 | - title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 2}年`, | 115 | + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 1}年`, |
| 115 | value: "", | 116 | value: "", |
| 116 | key: "auctionArea", | 117 | key: "auctionArea", |
| 117 | - id: "2" | 118 | + id: "1" |
| 118 | }, | 119 | }, |
| 119 | { | 120 | { |
| 120 | cardType: 1, | 121 | cardType: 1, |
| 121 | required: true, | 122 | required: true, |
| 122 | - title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 1}年(预计)`, | 123 | + title: `${this.fiscalYear == "" ? "" : this.fiscalYear}年(预计)`, |
| 123 | value: "", | 124 | value: "", |
| 124 | key: "auctionArea", | 125 | key: "auctionArea", |
| 125 | - id: "3" | 126 | + id: "0" |
| 126 | }, | 127 | }, |
| 127 | //新开工住宅房地面积 | 128 | //新开工住宅房地面积 |
| 128 | { | 129 | { |
| @@ -133,34 +134,34 @@ | @@ -133,34 +134,34 @@ | ||
| 133 | { | 134 | { |
| 134 | cardType: 1, | 135 | cardType: 1, |
| 135 | required: true, | 136 | required: true, |
| 136 | - title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 4}年`, | 137 | + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 3}年`, |
| 137 | value: "", | 138 | value: "", |
| 138 | key: "newStartArea", | 139 | key: "newStartArea", |
| 139 | - id: "0" | 140 | + id: "3" |
| 140 | }, | 141 | }, |
| 141 | { | 142 | { |
| 142 | cardType: 1, | 143 | cardType: 1, |
| 143 | required: true, | 144 | required: true, |
| 144 | - title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 3}年`, | 145 | + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 2}年`, |
| 145 | value: "", | 146 | value: "", |
| 146 | key: "newStartArea", | 147 | key: "newStartArea", |
| 147 | - id: "1" | 148 | + id: "2" |
| 148 | }, | 149 | }, |
| 149 | { | 150 | { |
| 150 | cardType: 1, | 151 | cardType: 1, |
| 151 | required: true, | 152 | required: true, |
| 152 | - title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 2}年`, | 153 | + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 1}年`, |
| 153 | value: "", | 154 | value: "", |
| 154 | key: "newStartArea", | 155 | key: "newStartArea", |
| 155 | - id: "2" | 156 | + id: "1" |
| 156 | }, | 157 | }, |
| 157 | { | 158 | { |
| 158 | cardType: 1, | 159 | cardType: 1, |
| 159 | required: true, | 160 | required: true, |
| 160 | - title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 1}年(预计)`, | 161 | + title: `${this.fiscalYear == "" ? "" : this.fiscalYear}年(预计)`, |
| 161 | value: "", | 162 | value: "", |
| 162 | key: "newStartArea", | 163 | key: "newStartArea", |
| 163 | - id: "3" | 164 | + id: "0" |
| 164 | }, | 165 | }, |
| 165 | //新竣工住宅房地产面积 | 166 | //新竣工住宅房地产面积 |
| 166 | { | 167 | { |
| @@ -171,274 +172,38 @@ | @@ -171,274 +172,38 @@ | ||
| 171 | { | 172 | { |
| 172 | cardType: 1, | 173 | cardType: 1, |
| 173 | required: true, | 174 | required: true, |
| 174 | - title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 4}年`, | 175 | + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 3}年`, |
| 175 | value: "", | 176 | value: "", |
| 176 | key: "newCompletedArea", | 177 | key: "newCompletedArea", |
| 177 | - id: "0" | 178 | + id: "3" |
| 178 | }, | 179 | }, |
| 179 | { | 180 | { |
| 180 | cardType: 1, | 181 | cardType: 1, |
| 181 | required: true, | 182 | required: true, |
| 182 | - title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 3}年`, | 183 | + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 2}年`, |
| 183 | value: "", | 184 | value: "", |
| 184 | key: "newCompletedArea", | 185 | key: "newCompletedArea", |
| 185 | - id: "1" | 186 | + id: "2" |
| 186 | }, | 187 | }, |
| 187 | { | 188 | { |
| 188 | cardType: 1, | 189 | cardType: 1, |
| 189 | required: true, | 190 | required: true, |
| 190 | - title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 2}年`, | 191 | + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 1}年`, |
| 191 | value: "", | 192 | value: "", |
| 192 | key: "newCompletedArea", | 193 | key: "newCompletedArea", |
| 193 | - id: "2" | 194 | + id: "1" |
| 194 | }, | 195 | }, |
| 195 | { | 196 | { |
| 196 | cardType: 1, | 197 | cardType: 1, |
| 197 | required: true, | 198 | required: true, |
| 198 | - title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 1}年(预计)`, | 199 | + title: `${this.fiscalYear == "" ? "" : this.fiscalYear}年(预计)`, |
| 199 | value: "", | 200 | value: "", |
| 200 | key: "newCompletedArea", | 201 | key: "newCompletedArea", |
| 201 | - id: "3" | 202 | + id: "0" |
| 202 | }, | 203 | }, |
| 203 | ], | 204 | ], |
| 204 | - data2: [ | ||
| 205 | - // { | ||
| 206 | - // cardType: 4, | ||
| 207 | - // required: true, | ||
| 208 | - // title: `${this.fiscalYear}年楼盘户数预计在未来三年安装确认的新建楼盘信息:预计${this.fiscalYear - 2}财年-${this.fiscalYear - 1}财年已签约且在${this.fiscalYear}财年安装确认项目`, | ||
| 209 | - // }, | ||
| 210 | - // { | ||
| 211 | - // cardType: 3, | ||
| 212 | - // required: true, | ||
| 213 | - // title: `${this.fiscalYear - 2}财年及之前签约且在${this.fiscalYear}财年安装`, | ||
| 214 | - // }, | ||
| 215 | - // { | ||
| 216 | - // cardType: 1, | ||
| 217 | - // required: true, | ||
| 218 | - // title: '小区名称', | ||
| 219 | - // value: "", | ||
| 220 | - // key: "communityName", | ||
| 221 | - // }, | ||
| 222 | - // { | ||
| 223 | - // cardType: 1, | ||
| 224 | - // required: true, | ||
| 225 | - // title: '总规模户数', | ||
| 226 | - // value: "", | ||
| 227 | - // key: "householdNumber", | ||
| 228 | - // }, | ||
| 229 | - // { | ||
| 230 | - // cardType: 1, | ||
| 231 | - // required: true, | ||
| 232 | - // title: '预计安装户数', | ||
| 233 | - // value: "", | ||
| 234 | - // key: "predictInstallNumber", | ||
| 235 | - // }, | ||
| 236 | - | ||
| 237 | - ], | ||
| 238 | - data3:[], | ||
| 239 | - // data3: [{ | ||
| 240 | - // cardType: 4, | ||
| 241 | - // required: true, | ||
| 242 | - // title: `预计${this.fiscalYear}-${parseInt(this.fiscalYear)+2}财年安装确认项目 | ||
| 243 | - // (预计${parseInt(this.fiscalYear)}财年签约， | ||
| 244 | - // ${this.fiscalYear}财年、${parseInt(this.fiscalYear)+1}财年、${parseInt(this.fiscalYear)+2}财年安装)`, | ||
| 245 | - // }, | ||
| 246 | - // // 23财年 | ||
| 247 | - // { | ||
| 248 | - // cardType: 3, | ||
| 249 | - // required: true, | ||
| 250 | - // title: `${parseInt(this.fiscalYear)}财年`, | ||
| 251 | - // }, | ||
| 252 | - // { | ||
| 253 | - // cardType: 1, | ||
| 254 | - // required: true, | ||
| 255 | - // title: '楼盘名称', | ||
| 256 | - // value: "", | ||
| 257 | - // key: "buildingItemDetail1", | ||
| 258 | - // id: "name" | ||
| 259 | - // }, | ||
| 260 | - // { | ||
| 261 | - // cardType: 1, | ||
| 262 | - // required: true, | ||
| 263 | - // title: '楼盘类型', | ||
| 264 | - // value: "", | ||
| 265 | - // key: "buildingItemDetail1", | ||
| 266 | - // id: "type" | ||
| 267 | - // }, | ||
| 268 | - // { | ||
| 269 | - // cardType: 1, | ||
| 270 | - // required: true, | ||
| 271 | - // title: '开发商名称', | ||
| 272 | - // value: "", | ||
| 273 | - // key: "buildingItemDetail1", | ||
| 274 | - // id: "devName" | ||
| 275 | - // }, | ||
| 276 | - // { | ||
| 277 | - // cardType: 1, | ||
| 278 | - // required: true, | ||
| 279 | - // title: '预计管道天燃气安装户数', | ||
| 280 | - // value: "", | ||
| 281 | - // key: "buildingItemDetail1", | ||
| 282 | - // id: "number" | ||
| 283 | - // }, | ||
| 284 | - // { | ||
| 285 | - // cardType: 1, | ||
| 286 | - // required: true, | ||
| 287 | - // title: '签约时间(含计划签约)', | ||
| 288 | - // value: "", | ||
| 289 | - // key: "buildingItemDetail1", | ||
| 290 | - // id: "time" | ||
| 291 | - // }, | ||
| 292 | - // { | ||
| 293 | - // cardType: 1, | ||
| 294 | - // required: true, | ||
| 295 | - // title: '预计燃气安装', | ||
| 296 | - // value: "", | ||
| 297 | - // key: "buildingItemDetail1", | ||
| 298 | - // id: "installTime" | ||
| 299 | - // }, | ||
| 300 | - // { | ||
| 301 | - // cardType: 1, | ||
| 302 | - // required: true, | ||
| 303 | - // title: `${parseInt(this.fiscalYear)}财年小计`, | ||
| 304 | - // value: "", | ||
| 305 | - // key: "currentInstallSubtotal" | ||
| 306 | - // }, | ||
| 307 | - | ||
| 308 | - // // 24财年 | ||
| 309 | - // { | ||
| 310 | - // cardType: 3, | ||
| 311 | - // required: true, | ||
| 312 | - // title: `${parseInt(this.fiscalYear)+1}财年`, | ||
| 313 | - // }, | ||
| 314 | - // { | ||
| 315 | - // cardType: 1, | ||
| 316 | - // required: true, | ||
| 317 | - // title: '楼盘名称', | ||
| 318 | - // value: "", | ||
| 319 | - // key: "buildingItemDetail2", | ||
| 320 | - // id: "name" | ||
| 321 | - // }, | ||
| 322 | - // { | ||
| 323 | - // cardType: 1, | ||
| 324 | - // required: true, | ||
| 325 | - // title: '楼盘类型', | ||
| 326 | - // value: "", | ||
| 327 | - // key: "buildingItemDetail2", | ||
| 328 | - // id: "type" | ||
| 329 | - // }, | ||
| 330 | - // { | ||
| 331 | - // cardType: 1, | ||
| 332 | - // required: true, | ||
| 333 | - // title: '开发商名称', | ||
| 334 | - // value: "", | ||
| 335 | - // key: "buildingItemDetail2", | ||
| 336 | - // id: "devName" | ||
| 337 | - // }, | ||
| 338 | - // { | ||
| 339 | - // cardType: 1, | ||
| 340 | - // required: true, | ||
| 341 | - // title: '预计管道天燃气安装户数', | ||
| 342 | - // value: "", | ||
| 343 | - // key: "buildingItemDetail2", | ||
| 344 | - // id: "number" | ||
| 345 | - // }, | ||
| 346 | - // { | ||
| 347 | - // cardType: 1, | ||
| 348 | - // required: true, | ||
| 349 | - // title: '签约时间(含计划签约)', | ||
| 350 | - // value: "", | ||
| 351 | - // key: "buildingItemDetail2", | ||
| 352 | - // id: "time" | ||
| 353 | - // }, | ||
| 354 | - // { | ||
| 355 | - // cardType: 1, | ||
| 356 | - // required: true, | ||
| 357 | - // title: '预计燃气安装', | ||
| 358 | - // value: "", | ||
| 359 | - // key: "buildingItemDetail2", | ||
| 360 | - // id: "installTime" | ||
| 361 | - // }, | ||
| 362 | - // { | ||
| 363 | - // cardType: 1, | ||
| 364 | - // required: true, | ||
| 365 | - // title: `${parseInt(this.fiscalYear)+1}财年小计`, | ||
| 366 | - // value: "", | ||
| 367 | - // key: "afterInstallSubtotal" | ||
| 368 | - // }, | ||
| 369 | - // // 25财年 | ||
| 370 | - // { | ||
| 371 | - // cardType: 3, | ||
| 372 | - // required: true, | ||
| 373 | - // title: `${parseInt(this.fiscalYear)+2}财年`, | ||
| 374 | - // }, | ||
| 375 | - // { | ||
| 376 | - // cardType: 1, | ||
| 377 | - // required: true, | ||
| 378 | - // title: '楼盘名称', | ||
| 379 | - // value: "", | ||
| 380 | - // key: "buildingItemDetail3", | ||
| 381 | - // id: "name" | ||
| 382 | - // }, | ||
| 383 | - // { | ||
| 384 | - // cardType: 1, | ||
| 385 | - // required: true, | ||
| 386 | - // title: '楼盘类型', | ||
| 387 | - // value: "", | ||
| 388 | - // key: "buildingItemDetail3", | ||
| 389 | - // id: "type" | ||
| 390 | - // }, | ||
| 391 | - // { | ||
| 392 | - // cardType: 1, | ||
| 393 | - // required: true, | ||
| 394 | - // title: '开发商名称', | ||
| 395 | - // value: "", | ||
| 396 | - // key: "buildingItemDetail3", | ||
| 397 | - // id: "devName" | ||
| 398 | - // }, | ||
| 399 | - // { | ||
| 400 | - // cardType: 1, | ||
| 401 | - // required: true, | ||
| 402 | - // title: '预计管道天燃气安装户数', | ||
| 403 | - // value: "", | ||
| 404 | - // key: "buildingItemDetail3", | ||
| 405 | - // id: "number" | ||
| 406 | - // }, | ||
| 407 | - // { | ||
| 408 | - // cardType: 1, | ||
| 409 | - // required: true, | ||
| 410 | - // title: '签约时间(含计划签约)', | ||
| 411 | - // value: "", | ||
| 412 | - // key: "buildingItemDetail3", | ||
| 413 | - // id: "time" | ||
| 414 | - // }, | ||
| 415 | - // { | ||
| 416 | - // cardType: 1, | ||
| 417 | - // required: true, | ||
| 418 | - // title: '预计燃气安装', | ||
| 419 | - // value: "", | ||
| 420 | - // key: "buildingItemDetail3", | ||
| 421 | - // id: "installTime" | ||
| 422 | - // }, | ||
| 423 | - // { | ||
| 424 | - // cardType: 1, | ||
| 425 | - // required: true, | ||
| 426 | - // title: `${parseInt(this.fiscalYear)+2}财年小计`, | ||
| 427 | - // value: "", | ||
| 428 | - // key: "lastInstallSubtotal" | ||
| 429 | - // }, | ||
| 430 | - // { | ||
| 431 | - // cardType: 3, | ||
| 432 | - // required: true, | ||
| 433 | - // title: `合计`, | ||
| 434 | - // }, | ||
| 435 | - // { | ||
| 436 | - // cardType: 1, | ||
| 437 | - // required: true, | ||
| 438 | - // title: `预计管道天燃气安装户数`, | ||
| 439 | - // key: "installTotal" | ||
| 440 | - // }, | ||
| 441 | - // ], | 205 | + data2: [], |
| 206 | + data3: [], | ||
| 442 | data4: [{ | 207 | data4: [{ |
| 443 | cardType: 4, | 208 | cardType: 4, |
| 444 | required: true, | 209 | required: true, |
| @@ -521,16 +286,16 @@ | @@ -521,16 +286,16 @@ | ||
| 521 | required: true, | 286 | required: true, |
| 522 | title: '数量', | 287 | title: '数量', |
| 523 | value: "", | 288 | value: "", |
| 524 | - key:"cityResidentNumber", | ||
| 525 | - id:'0' | 289 | + key: "cityResidentNumber", |
| 290 | + id: '0' | ||
| 526 | }, | 291 | }, |
| 527 | { | 292 | { |
| 528 | cardType: 1, | 293 | cardType: 1, |
| 529 | required: true, | 294 | required: true, |
| 530 | title: '异常情况说明', | 295 | title: '异常情况说明', |
| 531 | value: "", | 296 | value: "", |
| 532 | - key:"cityResidentNumber", | ||
| 533 | - id:'1' | 297 | + key: "cityResidentNumber", |
| 298 | + id: '1' | ||
| 534 | }, | 299 | }, |
| 535 | { | 300 | { |
| 536 | cardType: 3, | 301 | cardType: 3, |
| @@ -542,16 +307,16 @@ | @@ -542,16 +307,16 @@ | ||
| 542 | required: true, | 307 | required: true, |
| 543 | title: '数量', | 308 | title: '数量', |
| 544 | value: "", | 309 | value: "", |
| 545 | - key:"cityResidentHousehold", | ||
| 546 | - id:'0' | 310 | + key: "cityResidentHousehold", |
| 311 | + id: '0' | ||
| 547 | }, | 312 | }, |
| 548 | { | 313 | { |
| 549 | cardType: 1, | 314 | cardType: 1, |
| 550 | required: true, | 315 | required: true, |
| 551 | title: '异常情况说明', | 316 | title: '异常情况说明', |
| 552 | value: "", | 317 | value: "", |
| 553 | - key:"cityResidentHousehold", | ||
| 554 | - id:'1' | 318 | + key: "cityResidentHousehold", |
| 319 | + id: '1' | ||
| 555 | }, | 320 | }, |
| 556 | { | 321 | { |
| 557 | cardType: 3, | 322 | cardType: 3, |
| @@ -563,16 +328,16 @@ | @@ -563,16 +328,16 @@ | ||
| 563 | required: true, | 328 | required: true, |
| 564 | title: '数量', | 329 | title: '数量', |
| 565 | value: "", | 330 | value: "", |
| 566 | - key:"cityUseHousehold", | ||
| 567 | - id:'0' | 331 | + key: "cityUseHousehold", |
| 332 | + id: '0' | ||
| 568 | }, | 333 | }, |
| 569 | { | 334 | { |
| 570 | cardType: 1, | 335 | cardType: 1, |
| 571 | required: true, | 336 | required: true, |
| 572 | title: '异常情况说明', | 337 | title: '异常情况说明', |
| 573 | value: "", | 338 | value: "", |
| 574 | - key:"cityUseHousehold", | ||
| 575 | - id:'1' | 339 | + key: "cityUseHousehold", |
| 340 | + id: '1' | ||
| 576 | }, | 341 | }, |
| 577 | { | 342 | { |
| 578 | cardType: 3, | 343 | cardType: 3, |
| @@ -584,16 +349,16 @@ | @@ -584,16 +349,16 @@ | ||
| 584 | required: true, | 349 | required: true, |
| 585 | title: '数量', | 350 | title: '数量', |
| 586 | value: "", | 351 | value: "", |
| 587 | - key:"continuousUseHousehold", | ||
| 588 | - id:'0' | 352 | + key: "continuousUseHousehold", |
| 353 | + id: '0' | ||
| 589 | }, | 354 | }, |
| 590 | { | 355 | { |
| 591 | cardType: 1, | 356 | cardType: 1, |
| 592 | required: true, | 357 | required: true, |
| 593 | title: '异常情况说明', | 358 | title: '异常情况说明', |
| 594 | value: "", | 359 | value: "", |
| 595 | - key:"continuousUseHousehold", | ||
| 596 | - id:'1' | 360 | + key: "continuousUseHousehold", |
| 361 | + id: '1' | ||
| 597 | }, | 362 | }, |
| 598 | { | 363 | { |
| 599 | cardType: 3, | 364 | cardType: 3, |
| @@ -605,16 +370,16 @@ | @@ -605,16 +370,16 @@ | ||
| 605 | required: true, | 370 | required: true, |
| 606 | title: '数量', | 371 | title: '数量', |
| 607 | value: "", | 372 | value: "", |
| 608 | - key:"uninstallHousehold", | ||
| 609 | - id:'0' | 373 | + key: "uninstallHousehold", |
| 374 | + id: '0' | ||
| 610 | }, | 375 | }, |
| 611 | { | 376 | { |
| 612 | cardType: 1, | 377 | cardType: 1, |
| 613 | required: true, | 378 | required: true, |
| 614 | title: '异常情况说明', | 379 | title: '异常情况说明', |
| 615 | value: "", | 380 | value: "", |
| 616 | - key:"uninstallHousehold", | ||
| 617 | - id:'1' | 381 | + key: "uninstallHousehold", |
| 382 | + id: '1' | ||
| 618 | }, | 383 | }, |
| 619 | { | 384 | { |
| 620 | cardType: 3, | 385 | cardType: 3, |
| @@ -626,16 +391,16 @@ | @@ -626,16 +391,16 @@ | ||
| 626 | required: true, | 391 | required: true, |
| 627 | title: '数量', | 392 | title: '数量', |
| 628 | value: "", | 393 | value: "", |
| 629 | - key:"receivableHousehold", | ||
| 630 | - id:'0' | 394 | + key: "receivableHousehold", |
| 395 | + id: '0' | ||
| 631 | }, | 396 | }, |
| 632 | { | 397 | { |
| 633 | cardType: 1, | 398 | cardType: 1, |
| 634 | required: true, | 399 | required: true, |
| 635 | title: '异常情况说明', | 400 | title: '异常情况说明', |
| 636 | value: "", | 401 | value: "", |
| 637 | - key:"receivableHousehold", | ||
| 638 | - id:'1' | 402 | + key: "receivableHousehold", |
| 403 | + id: '1' | ||
| 639 | }, | 404 | }, |
| 640 | { | 405 | { |
| 641 | cardType: 3, | 406 | cardType: 3, |
| @@ -647,207 +412,266 @@ | @@ -647,207 +412,266 @@ | ||
| 647 | required: true, | 412 | required: true, |
| 648 | title: '数量', | 413 | title: '数量', |
| 649 | value: "", | 414 | value: "", |
| 650 | - key:"remainHousehold", | ||
| 651 | - id:'0' | 415 | + key: "remainHousehold", |
| 416 | + id: '0' | ||
| 652 | }, | 417 | }, |
| 653 | { | 418 | { |
| 654 | cardType: 1, | 419 | cardType: 1, |
| 655 | required: true, | 420 | required: true, |
| 656 | title: '异常情况说明', | 421 | title: '异常情况说明', |
| 657 | value: "", | 422 | value: "", |
| 658 | - key:"remainHousehold", | ||
| 659 | - id:'1' | 423 | + key: "remainHousehold", |
| 424 | + id: '1' | ||
| 660 | } | 425 | } |
| 661 | ], | 426 | ], |
| 662 | - data6: [{ | 427 | + data5add: [{ |
| 663 | cardType: 4, | 428 | cardType: 4, |
| 664 | required: true, | 429 | required: true, |
| 665 | - title: '过去及未来三年城区老居民用户财务确认安装户数及回款户数、金额情况', | 430 | + title: '当地瓶装液化气居民用户现状', |
| 666 | }, | 431 | }, |
| 667 | { | 432 | { |
| 668 | cardType: 3, | 433 | cardType: 3, |
| 669 | required: true, | 434 | required: true, |
| 670 | - title: '年度财务确认安装数', | 435 | + title: '居民市场', |
| 671 | }, | 436 | }, |
| 672 | { | 437 | { |
| 673 | cardType: 1, | 438 | cardType: 1, |
| 674 | required: true, | 439 | required: true, |
| 675 | - title: `${parseInt(this.fiscalYear) - 4}财年`, | 440 | + title: '经营区域城区瓶装液化气居民用户总数量（户）', |
| 676 | value: "", | 441 | value: "", |
| 677 | - key:"confirmInstallNumber", | ||
| 678 | - id:"0" | 442 | + key: "newMarketResident", |
| 443 | + id: "0" | ||
| 444 | + }, | ||
| 445 | + { | ||
| 446 | + cardType: 1, | ||
| 447 | + required: true, | ||
| 448 | + title: '已财务安装确定的瓶装液化气居民用户数量（户）', | ||
| 449 | + value: "", | ||
| 450 | + key: "newMarketResident", | ||
| 451 | + id: "1" | ||
| 452 | + }, | ||
| 453 | + { | ||
| 454 | + cardType: 5, | ||
| 455 | + required: true, | ||
| 456 | + title: '目前当地针对居民用户已落实“瓶改管”主要有利政策"', | ||
| 457 | + value: "", | ||
| 458 | + key: "newMarketResident", | ||
| 459 | + id: "2" | ||
| 460 | + }, | ||
| 461 | + { | ||
| 462 | + cardType: 5, | ||
| 463 | + required: true, | ||
| 464 | + title: '2024年计划落实“瓶改管”主要有利政策', | ||
| 465 | + value: "", | ||
| 466 | + key: "newMarketResident", | ||
| 467 | + id: "3" | ||
| 468 | + }, | ||
| 469 | + { | ||
| 470 | + cardType: 1, | ||
| 471 | + required: true, | ||
| 472 | + title: '预计未来2-3年可通过“瓶改管”开发的居民户数', | ||
| 473 | + value: "", | ||
| 474 | + key: "newMarketResident", | ||
| 475 | + id: "4" | ||
| 476 | + }, | ||
| 477 | + { | ||
| 478 | + cardType: 1, | ||
| 479 | + required: true, | ||
| 480 | + title: '预计2024年可通过“瓶改管”开发的老居民户数（户）', | ||
| 481 | + value: "", | ||
| 482 | + key: "newMarketResident", | ||
| 483 | + id: "5" | ||
| 484 | + }, | ||
| 485 | + ], | ||
| 486 | + data6: [{ | ||
| 487 | + cardType: 4, | ||
| 488 | + required: true, | ||
| 489 | + title: '过去及未来三年城区老居民用户财务确认安装户数及回款户数、金额情况', | ||
| 490 | + }, | ||
| 491 | + { | ||
| 492 | + cardType: 3, | ||
| 493 | + required: true, | ||
| 494 | + title: '年度财务确认安装数', | ||
| 679 | }, | 495 | }, |
| 680 | { | 496 | { |
| 681 | cardType: 1, | 497 | cardType: 1, |
| 682 | required: true, | 498 | required: true, |
| 683 | title: `${parseInt(this.fiscalYear) - 3}财年`, | 499 | title: `${parseInt(this.fiscalYear) - 3}财年`, |
| 684 | value: "", | 500 | value: "", |
| 685 | - key:"confirmInstallNumber", | ||
| 686 | - id:"1" | 501 | + key: "confirmInstallNumber", |
| 502 | + id: "0" | ||
| 687 | }, | 503 | }, |
| 688 | { | 504 | { |
| 689 | cardType: 1, | 505 | cardType: 1, |
| 690 | required: true, | 506 | required: true, |
| 691 | title: `${parseInt(this.fiscalYear) - 2}财年`, | 507 | title: `${parseInt(this.fiscalYear) - 2}财年`, |
| 692 | value: "", | 508 | value: "", |
| 693 | - key:"confirmInstallNumber", | ||
| 694 | - id:"2" | 509 | + key: "confirmInstallNumber", |
| 510 | + id: "1" | ||
| 695 | }, | 511 | }, |
| 696 | { | 512 | { |
| 697 | cardType: 1, | 513 | cardType: 1, |
| 698 | required: true, | 514 | required: true, |
| 699 | title: `${parseInt(this.fiscalYear) - 1}财年`, | 515 | title: `${parseInt(this.fiscalYear) - 1}财年`, |
| 700 | value: "", | 516 | value: "", |
| 701 | - key:"confirmInstallNumber", | ||
| 702 | - id:"3" | 517 | + key: "confirmInstallNumber", |
| 518 | + id: "2" | ||
| 703 | }, | 519 | }, |
| 704 | { | 520 | { |
| 705 | cardType: 1, | 521 | cardType: 1, |
| 706 | required: true, | 522 | required: true, |
| 707 | - title: `${parseInt(this.fiscalYear)}财年(预计)`, | 523 | + title: `${parseInt(this.fiscalYear)}财年(本年预计)`, |
| 708 | value: "", | 524 | value: "", |
| 709 | - key:"confirmInstallNumber", | ||
| 710 | - id:"4" | 525 | + key: "confirmInstallNumber", |
| 526 | + id: "3" | ||
| 711 | }, | 527 | }, |
| 712 | { | 528 | { |
| 713 | cardType: 1, | 529 | cardType: 1, |
| 714 | required: true, | 530 | required: true, |
| 715 | title: `${parseInt(this.fiscalYear)+1}财年(预计)`, | 531 | title: `${parseInt(this.fiscalYear)+1}财年(预计)`, |
| 716 | value: "", | 532 | value: "", |
| 717 | - key:"confirmInstallNumber", | ||
| 718 | - id:"5" | 533 | + key: "confirmInstallNumber", |
| 534 | + id: "4" | ||
| 719 | }, | 535 | }, |
| 720 | { | 536 | { |
| 721 | cardType: 1, | 537 | cardType: 1, |
| 722 | required: true, | 538 | required: true, |
| 723 | title: `${parseInt(this.fiscalYear)+2}财年(预计)`, | 539 | title: `${parseInt(this.fiscalYear)+2}财年(预计)`, |
| 724 | value: "", | 540 | value: "", |
| 725 | - key:"confirmInstallNumber", | ||
| 726 | - id:"6" | 541 | + key: "confirmInstallNumber", |
| 542 | + id: "5" | ||
| 727 | }, | 543 | }, |
| 728 | - | ||
| 729 | { | 544 | { |
| 730 | - cardType: 3, | 545 | + cardType: 1, |
| 731 | required: true, | 546 | required: true, |
| 732 | - title: '实际新增报装回款户数(含应收款户)', | 547 | + title: `${parseInt(this.fiscalYear)+3}财年(预计)`, |
| 548 | + value: "", | ||
| 549 | + key: "confirmInstallNumber", | ||
| 550 | + id: "6" | ||
| 733 | }, | 551 | }, |
| 552 | + | ||
| 734 | { | 553 | { |
| 735 | - cardType: 1, | 554 | + cardType: 3, |
| 736 | required: true, | 555 | required: true, |
| 737 | - title: `${parseInt(this.fiscalYear) - 4}财年`, | ||
| 738 | - value: "", | ||
| 739 | - key:"newRefundHousehold", | ||
| 740 | - id:"0" | 556 | + title: '实际新增报装回款户数(含应收款户)', |
| 741 | }, | 557 | }, |
| 742 | { | 558 | { |
| 743 | cardType: 1, | 559 | cardType: 1, |
| 744 | required: true, | 560 | required: true, |
| 745 | title: `${parseInt(this.fiscalYear) - 3}财年`, | 561 | title: `${parseInt(this.fiscalYear) - 3}财年`, |
| 746 | value: "", | 562 | value: "", |
| 747 | - key:"newRefundHousehold", | ||
| 748 | - id:"1" | 563 | + key: "newRefundHousehold", |
| 564 | + id: "0" | ||
| 749 | }, | 565 | }, |
| 750 | { | 566 | { |
| 751 | cardType: 1, | 567 | cardType: 1, |
| 752 | required: true, | 568 | required: true, |
| 753 | title: `${parseInt(this.fiscalYear) - 2}财年`, | 569 | title: `${parseInt(this.fiscalYear) - 2}财年`, |
| 754 | value: "", | 570 | value: "", |
| 755 | - key:"newRefundHousehold", | ||
| 756 | - id:"2" | 571 | + key: "newRefundHousehold", |
| 572 | + id: "1" | ||
| 757 | }, | 573 | }, |
| 758 | { | 574 | { |
| 759 | cardType: 1, | 575 | cardType: 1, |
| 760 | required: true, | 576 | required: true, |
| 761 | title: `${parseInt(this.fiscalYear) - 1}财年`, | 577 | title: `${parseInt(this.fiscalYear) - 1}财年`, |
| 762 | value: "", | 578 | value: "", |
| 763 | - key:"newRefundHousehold", | ||
| 764 | - id:"3" | 579 | + key: "newRefundHousehold", |
| 580 | + id: "2" | ||
| 765 | }, | 581 | }, |
| 766 | { | 582 | { |
| 767 | cardType: 1, | 583 | cardType: 1, |
| 768 | required: true, | 584 | required: true, |
| 769 | - title: `${parseInt(this.fiscalYear)}财年(预计)`, | 585 | + title: `${parseInt(this.fiscalYear)}财年(本年预计)`, |
| 770 | value: "", | 586 | value: "", |
| 771 | - key:"newRefundHousehold", | ||
| 772 | - id:"4" | 587 | + key: "newRefundHousehold", |
| 588 | + id: "3" | ||
| 773 | }, | 589 | }, |
| 774 | { | 590 | { |
| 775 | cardType: 1, | 591 | cardType: 1, |
| 776 | required: true, | 592 | required: true, |
| 777 | title: `${parseInt(this.fiscalYear)+1}财年(预计)`, | 593 | title: `${parseInt(this.fiscalYear)+1}财年(预计)`, |
| 778 | value: "", | 594 | value: "", |
| 779 | - key:"newRefundHousehold", | ||
| 780 | - id:"5" | 595 | + key: "newRefundHousehold", |
| 596 | + id: "4" | ||
| 781 | }, | 597 | }, |
| 782 | { | 598 | { |
| 783 | cardType: 1, | 599 | cardType: 1, |
| 784 | required: true, | 600 | required: true, |
| 785 | title: `${parseInt(this.fiscalYear)+2}财年(预计)`, | 601 | title: `${parseInt(this.fiscalYear)+2}财年(预计)`, |
| 786 | value: "", | 602 | value: "", |
| 787 | - key:"newRefundHousehold", | ||
| 788 | - id:"6" | 603 | + key: "newRefundHousehold", |
| 604 | + id: "5" | ||
| 789 | }, | 605 | }, |
| 790 | - | ||
| 791 | { | 606 | { |
| 792 | - cardType: 3, | 607 | + cardType: 1, |
| 793 | required: true, | 608 | required: true, |
| 794 | - title: '年老户安装费回款金额(万元)', | 609 | + title: `${parseInt(this.fiscalYear)+3}财年(预计)`, |
| 610 | + value: "", | ||
| 611 | + key: "newRefundHousehold", | ||
| 612 | + id: "6" | ||
| 795 | }, | 613 | }, |
| 614 | + | ||
| 796 | { | 615 | { |
| 797 | - cardType: 1, | 616 | + cardType: 3, |
| 798 | required: true, | 617 | required: true, |
| 799 | - title: `${parseInt(this.fiscalYear) - 4}财年`, | ||
| 800 | - value: "", | ||
| 801 | - key:"oldRefundAmount", | ||
| 802 | - id:"0" | 618 | + title: '老户安装费回款金额(万元)', |
| 803 | }, | 619 | }, |
| 804 | { | 620 | { |
| 805 | cardType: 1, | 621 | cardType: 1, |
| 806 | required: true, | 622 | required: true, |
| 807 | title: `${parseInt(this.fiscalYear) - 3}财年`, | 623 | title: `${parseInt(this.fiscalYear) - 3}财年`, |
| 808 | value: "", | 624 | value: "", |
| 809 | - key:"oldRefundAmount", | ||
| 810 | - id:"1" | 625 | + key: "oldRefundAmount", |
| 626 | + id: "0" | ||
| 811 | }, | 627 | }, |
| 812 | { | 628 | { |
| 813 | cardType: 1, | 629 | cardType: 1, |
| 814 | required: true, | 630 | required: true, |
| 815 | title: `${parseInt(this.fiscalYear) - 2}财年`, | 631 | title: `${parseInt(this.fiscalYear) - 2}财年`, |
| 816 | value: "", | 632 | value: "", |
| 817 | - key:"oldRefundAmount", | ||
| 818 | - id:"2" | 633 | + key: "oldRefundAmount", |
| 634 | + id: "1" | ||
| 819 | }, | 635 | }, |
| 820 | { | 636 | { |
| 821 | cardType: 1, | 637 | cardType: 1, |
| 822 | required: true, | 638 | required: true, |
| 823 | title: `${parseInt(this.fiscalYear) - 1}财年`, | 639 | title: `${parseInt(this.fiscalYear) - 1}财年`, |
| 824 | value: "", | 640 | value: "", |
| 825 | - key:"oldRefundAmount", | ||
| 826 | - id:"3" | 641 | + key: "oldRefundAmount", |
| 642 | + id: "2" | ||
| 827 | }, | 643 | }, |
| 828 | { | 644 | { |
| 829 | cardType: 1, | 645 | cardType: 1, |
| 830 | required: true, | 646 | required: true, |
| 831 | - title: `${parseInt(this.fiscalYear)}财年(预计)`, | 647 | + title: `${parseInt(this.fiscalYear)}财年(本年预计)`, |
| 832 | value: "", | 648 | value: "", |
| 833 | - key:"oldRefundAmount", | ||
| 834 | - id:"4" | 649 | + key: "oldRefundAmount", |
| 650 | + id: "3" | ||
| 835 | }, | 651 | }, |
| 836 | { | 652 | { |
| 837 | cardType: 1, | 653 | cardType: 1, |
| 838 | required: true, | 654 | required: true, |
| 839 | title: `${parseInt(this.fiscalYear)+1}财年(预计)`, | 655 | title: `${parseInt(this.fiscalYear)+1}财年(预计)`, |
| 840 | value: "", | 656 | value: "", |
| 841 | - key:"oldRefundAmount", | ||
| 842 | - id:"5" | 657 | + key: "oldRefundAmount", |
| 658 | + id: "4" | ||
| 843 | }, | 659 | }, |
| 844 | { | 660 | { |
| 845 | cardType: 1, | 661 | cardType: 1, |
| 846 | required: true, | 662 | required: true, |
| 847 | title: `${parseInt(this.fiscalYear)+2}财年(预计)`, | 663 | title: `${parseInt(this.fiscalYear)+2}财年(预计)`, |
| 848 | value: "", | 664 | value: "", |
| 849 | - key:"oldRefundAmount", | ||
| 850 | - id:"6" | 665 | + key: "oldRefundAmount", |
| 666 | + id: "5" | ||
| 667 | + }, | ||
| 668 | + { | ||
| 669 | + cardType: 1, | ||
| 670 | + required: true, | ||
| 671 | + title: `${parseInt(this.fiscalYear)+3}财年(预计)`, | ||
| 672 | + value: "", | ||
| 673 | + key: "oldRefundAmount", | ||
| 674 | + id: "6" | ||
| 851 | }, | 675 | }, |
| 852 | ], | 676 | ], |
| 853 | data7: [{ | 677 | data7: [{ |
| @@ -943,6 +767,10 @@ | @@ -943,6 +767,10 @@ | ||
| 943 | title: '管网已覆盖_镇区', | 767 | title: '管网已覆盖_镇区', |
| 944 | }, | 768 | }, |
| 945 | { | 769 | { |
| 770 | + cardType: 4, | ||
| 771 | + title: '镇区', | ||
| 772 | + }, | ||
| 773 | + { | ||
| 946 | cardType: 1, | 774 | cardType: 1, |
| 947 | required: true, | 775 | required: true, |
| 948 | title: '个数', | 776 | title: '个数', |
| @@ -1013,6 +841,10 @@ | @@ -1013,6 +841,10 @@ | ||
| 1013 | title: '管网已覆盖_自然村', | 841 | title: '管网已覆盖_自然村', |
| 1014 | }, | 842 | }, |
| 1015 | { | 843 | { |
| 844 | + cardType: 4, | ||
| 845 | + title: '自然村', | ||
| 846 | + }, | ||
| 847 | + { | ||
| 1016 | cardType: 1, | 848 | cardType: 1, |
| 1017 | required: true, | 849 | required: true, |
| 1018 | title: '个数', | 850 | title: '个数', |
| @@ -1083,6 +915,10 @@ | @@ -1083,6 +915,10 @@ | ||
| 1083 | title: '管网未覆盖、但符合农村燃气投资标准_镇区', | 915 | title: '管网未覆盖、但符合农村燃气投资标准_镇区', |
| 1084 | }, | 916 | }, |
| 1085 | { | 917 | { |
| 918 | + cardType: 4, | ||
| 919 | + title: '镇区', | ||
| 920 | + }, | ||
| 921 | + { | ||
| 1086 | cardType: 1, | 922 | cardType: 1, |
| 1087 | required: true, | 923 | required: true, |
| 1088 | title: '个数', | 924 | title: '个数', |
| @@ -1153,6 +989,10 @@ | @@ -1153,6 +989,10 @@ | ||
| 1153 | title: '管网未覆盖、但符合农村燃气投资标准_自然村', | 989 | title: '管网未覆盖、但符合农村燃气投资标准_自然村', |
| 1154 | }, | 990 | }, |
| 1155 | { | 991 | { |
| 992 | + cardType: 4, | ||
| 993 | + title: '自然村', | ||
| 994 | + }, | ||
| 995 | + { | ||
| 1156 | cardType: 1, | 996 | cardType: 1, |
| 1157 | required: true, | 997 | required: true, |
| 1158 | title: '个数', | 998 | title: '个数', |
| @@ -1733,217 +1573,397 @@ | @@ -1733,217 +1573,397 @@ | ||
| 1733 | console.log("newBuildingItem", JSON.parse(JSON.stringify(this.newBuildingItem))); | 1573 | console.log("newBuildingItem", JSON.parse(JSON.stringify(this.newBuildingItem))); |
| 1734 | console.log("newBuildingInfo", JSON.parse(JSON.stringify(this.newBuildingInfo))); | 1574 | console.log("newBuildingInfo", JSON.parse(JSON.stringify(this.newBuildingInfo))); |
| 1735 | console.log("reportData", JSON.parse(JSON.stringify(this.reportData))); | 1575 | console.log("reportData", JSON.parse(JSON.stringify(this.reportData))); |
| 1736 | - this.data1.forEach(data => { | ||
| 1737 | - if (data.key in this.reportData) { | ||
| 1738 | - let Arr = this.reportData[data.key].split(","); | ||
| 1739 | - data.value = Arr[data.id]; | ||
| 1740 | - } | ||
| 1741 | - }); | 1576 | + // 逗号分隔分配 |
| 1577 | + const updateData = (dataArray, reportData) => { | ||
| 1578 | + dataArray.forEach(data => { | ||
| 1579 | + if (data.key in reportData) { | ||
| 1580 | + let Arr = reportData[data.key].split(","); | ||
| 1581 | + data.value = Arr[data.id]; | ||
| 1582 | + } | ||
| 1583 | + }); | ||
| 1584 | + }; | ||
| 1585 | + | ||
| 1586 | + // key直接分配 | ||
| 1587 | + const updateDataByKey = (dataArray, reportData) => { | ||
| 1588 | + dataArray.forEach(data => { | ||
| 1589 | + if (data.key in reportData) { | ||
| 1590 | + data.value = reportData[data.key]; | ||
| 1591 | + } | ||
| 1592 | + }); | ||
| 1593 | + }; | ||
| 1594 | + | ||
| 1595 | + | ||
| 1596 | + updateData(this.data1, this.reportData); | ||
| 1597 | + updateData(this.data4, this.reportData); | ||
| 1598 | + updateData(this.data5, this.reportData); | ||
| 1599 | + updateData(this.data5add, this.reportData); | ||
| 1600 | + updateData(this.data6, this.reportData); | ||
| 1601 | + updateData(this.data10, this.reportData); | ||
| 1602 | + updateData(this.data14, this.reportData); | ||
| 1603 | + | ||
| 1604 | + updateDataByKey(this.data7, this.reportData); | ||
| 1605 | + updateDataByKey(this.data8, this.reportData); | ||
| 1606 | + updateDataByKey(this.data9, this.reportData); | ||
| 1607 | + updateDataByKey(this.data11, this.reportData); | ||
| 1608 | + updateDataByKey(this.data12, this.reportData); | ||
| 1609 | + updateDataByKey(this.data13, this.reportData); | ||
| 1610 | + updateDataByKey(this.data15, this.reportData); | ||
| 1611 | + updateDataByKey(this.data16, this.reportData); | ||
| 1612 | + updateDataByKey(this.data17, this.reportData); | ||
| 1613 | + updateDataByKey(this.data18, this.reportData); | ||
| 1742 | 1614 | ||
| 1743 | /* 动态添加data2 标题1=>列表1=>小计1=>标题2=>列表2=>小计2=>合计 */ | 1615 | /* 动态添加data2 标题1=>列表1=>小计1=>标题2=>列表2=>小计2=>合计 */ |
| 1744 | //标题1 | 1616 | //标题1 |
| 1745 | - this.data2.push( | ||
| 1746 | - {cardType: 4,required: true,title: `${this.fiscalYear}年楼盘户数预计在未来三年安装确认的新建楼盘信息:预计${this.fiscalYear - 2}财年-${this.fiscalYear - 1}财年已签约且在${this.fiscalYear}财年安装确认项目`,}, | ||
| 1747 | - {cardType: 3,required: true,title: `${this.fiscalYear - 2}财年及之前签约且在${this.fiscalYear}财年安装`}, | ||
| 1748 | - ) | ||
| 1749 | - //列表1 | ||
| 1750 | - this.newBuildingInfo.newBuildingInfoDetails1.map(info1 => { | ||
| 1751 | - console.log(info1); | ||
| 1752 | - if (info1.name && info1.number && info1.predict) { | ||
| 1753 | - this.data2.push( | ||
| 1754 | - {cardType: 1,required: true,title: '小区名称',value: info1.name,key: "communityName"}, | ||
| 1755 | - {cardType: 1,required: true,title: '总规模户数',value: info1.number,key: "householdNumber"}, | ||
| 1756 | - {cardType: 1,required: true,title: '预计安装户数',value: info1.predict,key: "predictInstallNumber"}, | ||
| 1757 | - ) | ||
| 1758 | - } | ||
| 1759 | - }) | 1617 | + this.data2.push({ |
| 1618 | + cardType: 4, | ||
| 1619 | + required: true, | ||
| 1620 | + title: `${this.fiscalYear}年楼盘户数预计在未来三年安装确认的新建楼盘信息:预计${this.fiscalYear - 2}财年-${this.fiscalYear - 1}财年已签约且在${this.fiscalYear}财年安装确认项目`, | ||
| 1621 | + }, { | ||
| 1622 | + cardType: 3, | ||
| 1623 | + required: true, | ||
| 1624 | + title: `${this.fiscalYear - 2}财年及之前签约且在${this.fiscalYear}财年安装` | ||
| 1625 | + }, ) | ||
| 1626 | + // 类型1动态列表1 | ||
| 1627 | + if (this.newBuildingInfo.newBuildingInfoDetails1 && this.newBuildingInfo.newBuildingInfoDetails1.length) { | ||
| 1628 | + this.newBuildingInfo.newBuildingInfoDetails1.map(info1 => { | ||
| 1629 | + console.log(info1); | ||
| 1630 | + if (info1.name && info1.number && info1.predict) { | ||
| 1631 | + this.data2.push({ | ||
| 1632 | + cardType: 1, | ||
| 1633 | + required: true, | ||
| 1634 | + title: '小区名称', | ||
| 1635 | + value: info1.name, | ||
| 1636 | + key: "communityName" | ||
| 1637 | + }, { | ||
| 1638 | + cardType: 1, | ||
| 1639 | + required: true, | ||
| 1640 | + title: '总规模户数', | ||
| 1641 | + value: info1.number, | ||
| 1642 | + key: "householdNumber" | ||
| 1643 | + }, { | ||
| 1644 | + cardType: 1, | ||
| 1645 | + required: true, | ||
| 1646 | + title: '预计安装户数', | ||
| 1647 | + value: info1.predict, | ||
| 1648 | + key: "predictInstallNumber" | ||
| 1649 | + }, ) | ||
| 1650 | + } | ||
| 1651 | + }) | ||
| 1652 | + } | ||
| 1760 | //小计1 | 1653 | //小计1 |
| 1761 | - this.data2.push( | ||
| 1762 | - {cardType: 3,required: true,title: '小计'}, | ||
| 1763 | - {cardType: 1,required: true,title: '总规模户数',value: this.newBuildingInfo.householdNumberSubtotalBefore,key: "xjhouseholdNumber"}, | ||
| 1764 | - {cardType: 1,required: true,title: '预计安装户数',value: this.newBuildingInfo.predictInstallSubtotalBefore,key: "xjpredictInstallNumber"}, | ||
| 1765 | - ) | 1654 | + this.data2.push({ |
| 1655 | + cardType: 3, | ||
| 1656 | + required: true, | ||
| 1657 | + title: '小计' | ||
| 1658 | + }, { | ||
| 1659 | + cardType: 1, | ||
| 1660 | + required: true, | ||
| 1661 | + title: '总规模户数', | ||
| 1662 | + value: this.reportData.householdNumberSubtotalBefore || 0, | ||
| 1663 | + key: "xjhouseholdNumber" | ||
| 1664 | + }, { | ||
| 1665 | + cardType: 1, | ||
| 1666 | + required: true, | ||
| 1667 | + title: '预计安装户数', | ||
| 1668 | + value: this.reportData.predictInstallSubtotalBefore || 0, | ||
| 1669 | + key: "xjpredictInstallNumber" | ||
| 1670 | + }, ) | ||
| 1766 | //标题2 | 1671 | //标题2 |
| 1767 | - this.data2.push( | ||
| 1768 | - {cardType: 3,required: true,title: `${this.fiscalYear - 1}财年签约且在${this.fiscalYear}财年安装`}, | ||
| 1769 | - ) | ||
| 1770 | - //列表2 | ||
| 1771 | - this.newBuildingInfo.newBuildingInfoDetails2.map(info2 => { | ||
| 1772 | - if (info2.name && info2.number && info2.predict) { | ||
| 1773 | - this.data2.push( | ||
| 1774 | - {cardType: 1,required: true,title: '小区名称',value: info2.name,key: "communityName"}, | ||
| 1775 | - {cardType: 1,required: true,title: '总规模户数',value: info2.number,key: "householdNumber"}, | ||
| 1776 | - {cardType: 1,required: true,title: '预计安装户数',value: info2.predict,key: "predictInstallNumber"}, | ||
| 1777 | - ) | ||
| 1778 | - } | ||
| 1779 | - }) | 1672 | + this.data2.push({ |
| 1673 | + cardType: 3, | ||
| 1674 | + required: true, | ||
| 1675 | + title: `${this.fiscalYear - 1}财年签约且在${this.fiscalYear}财年安装` | ||
| 1676 | + }, ) | ||
| 1677 | + // 类型1动态列表2 | ||
| 1678 | + if (this.newBuildingInfo.newBuildingInfoDetails2 && this.newBuildingInfo.newBuildingInfoDetails2.length) { | ||
| 1679 | + this.newBuildingInfo.newBuildingInfoDetails2.map(info2 => { | ||
| 1680 | + // if (info2.name && info2.number && info2.predict) { | ||
| 1681 | + this.data2.push({ | ||
| 1682 | + cardType: 1, | ||
| 1683 | + required: true, | ||
| 1684 | + title: '小区名称', | ||
| 1685 | + value: info2.name || "", | ||
| 1686 | + key: "communityName" | ||
| 1687 | + }, { | ||
| 1688 | + cardType: 1, | ||
| 1689 | + required: true, | ||
| 1690 | + title: '总规模户数', | ||
| 1691 | + value: info2.number || "", | ||
| 1692 | + key: "householdNumber" | ||
| 1693 | + }, { | ||
| 1694 | + cardType: 1, | ||
| 1695 | + required: true, | ||
| 1696 | + title: '预计安装户数', | ||
| 1697 | + value: info2.predict || "", | ||
| 1698 | + key: "predictInstallNumber" | ||
| 1699 | + }, ) | ||
| 1700 | + // } | ||
| 1701 | + }) | ||
| 1702 | + } | ||
| 1703 | + | ||
| 1780 | //小计2 | 1704 | //小计2 |
| 1781 | - this.data2.push( | ||
| 1782 | - {cardType: 3,required: true,title: '小计'}, | ||
| 1783 | - {cardType: 1,required: true,title: '总规模户数',value: this.newBuildingInfo.householdNumberSubtotal,key: "xjhouseholdNumber"}, | ||
| 1784 | - {cardType: 1,required: true,title: '预计安装户数',value: this.newBuildingInfo.predictInstallSubtotal,key: "xjpredictInstallNumber"}, | ||
| 1785 | - ) | 1705 | + this.data2.push({ |
| 1706 | + cardType: 3, | ||
| 1707 | + required: true, | ||
| 1708 | + title: '小计' | ||
| 1709 | + }, { | ||
| 1710 | + cardType: 1, | ||
| 1711 | + required: true, | ||
| 1712 | + title: '总规模户数', | ||
| 1713 | + value: this.reportData.householdNumberSubtotal || 0, | ||
| 1714 | + key: "xjhouseholdNumber" | ||
| 1715 | + }, { | ||
| 1716 | + cardType: 1, | ||
| 1717 | + required: true, | ||
| 1718 | + title: '预计安装户数', | ||
| 1719 | + value: this.reportData.predictInstallSubtotal || 0, | ||
| 1720 | + key: "xjpredictInstallNumber" | ||
| 1721 | + }, ) | ||
| 1786 | //合计标题 | 1722 | //合计标题 |
| 1787 | - this.data2.push( | ||
| 1788 | - {cardType: 3,required: true,title: '合计'}, | ||
| 1789 | - {cardType: 1,required: true,title: '总规模户数',value: this.newBuildingInfo.householdNumberTotal,key: "hjhouseholdNumber"}, | ||
| 1790 | - {cardType: 1,required: true,title: '预计安装户数',value: this.newBuildingInfo.predictInstallTotal,key: "hjpredictInstallNumber"}, | ||
| 1791 | - ) | 1723 | + this.data2.push({ |
| 1724 | + cardType: 3, | ||
| 1725 | + required: true, | ||
| 1726 | + title: '合计' | ||
| 1727 | + }, { | ||
| 1728 | + cardType: 1, | ||
| 1729 | + required: true, | ||
| 1730 | + title: '总规模户数', | ||
| 1731 | + value: this.reportData.householdNumberTotal || 0, | ||
| 1732 | + key: "hjhouseholdNumber" | ||
| 1733 | + }, { | ||
| 1734 | + cardType: 1, | ||
| 1735 | + required: true, | ||
| 1736 | + title: '预计安装户数', | ||
| 1737 | + value: this.reportData.predictInstallTotal || 0, | ||
| 1738 | + key: "hjpredictInstallNumber" | ||
| 1739 | + }, ) | ||
| 1740 | + console.log('动态列表1', JSON.parse(JSON.stringify(this.data2))); | ||
| 1741 | + // 当前财年 | ||
| 1742 | + this.data3.push({ | ||
| 1743 | + cardType: 4, | ||
| 1744 | + required: true, | ||
| 1745 | + title: `预计${this.fiscalYear}-${parseInt(this.fiscalYear)+2}财年安装确认项目(预计${parseInt(this.fiscalYear)}财年签约，${this.fiscalYear}财年、${parseInt(this.fiscalYear)+1}财年、${parseInt(this.fiscalYear)+2}财年安装)`, | ||
| 1746 | + }, { | ||
| 1747 | + cardType: 3, | ||
| 1748 | + required: true, | ||
| 1749 | + title: `${parseInt(this.fiscalYear)}财年`, | ||
| 1750 | + }, ) | ||
| 1792 | 1751 | ||
| 1793 | - // console.log(this.data2); | ||
| 1794 | - // 当前财年 | ||
| 1795 | - this.data3.push( | ||
| 1796 | - {cardType: 4,required: true,title: `预计${this.fiscalYear}-${parseInt(this.fiscalYear)+2}财年安装确认项目(预计${parseInt(this.fiscalYear)}财年签约，${this.fiscalYear}财年、${parseInt(this.fiscalYear)+1}财年、${parseInt(this.fiscalYear)+2}财年安装)`,}, | ||
| 1797 | - {cardType: 3,required: true,title: `${parseInt(this.fiscalYear)}财年`,}, | ||
| 1798 | - ) | 1752 | + // 类型2动态列表1 |
| 1753 | + if (this.newBuildingItem.buildingItemDetail1 && this.newBuildingItem.buildingItemDetail1.length) { | ||
| 1799 | this.newBuildingItem.buildingItemDetail1.map(build1 => { | 1754 | this.newBuildingItem.buildingItemDetail1.map(build1 => { |
| 1800 | - if (build1.devName && build1.installTime && build1.name && build1.number && build1.time && build1.type) { | ||
| 1801 | - console.log(build1); | ||
| 1802 | - this.data3.push( | ||
| 1803 | - {cardType: 1,required: true,title: '楼盘名称',value:build1.name,key: "buildingItemDetail1",id: "name"}, | ||
| 1804 | - {cardType: 1,required: true,title: '楼盘类型',value: build1.type,key: "buildingItemDetail1",id: "type"}, | ||
| 1805 | - {cardType: 1,required: true,title: '开发商名称',value: build1.devName,key: "buildingItemDetail1",id: "devName"}, | ||
| 1806 | - {cardType: 1,required: true,title: '预计管道天燃气安装户数',value: build1.number,key: "buildingItemDetail1",id: "number"}, | ||
| 1807 | - {cardType: 1,required: true,title: '签约时间(含计划签约)',value: build1.time,key: "buildingItemDetail1",id: "time"}, | ||
| 1808 | - {cardType: 1,required: true,title: '预计燃气安装',value: build1.installTime,key: "buildingItemDetail1",id: "installTime"}, | ||
| 1809 | - {cardType: 1,required: true,title: `${parseInt(this.fiscalYear)}财年小计`,value: this.newBuildingItem.currentInstallSubtotal,key: "currentInstallSubtotal"}, | ||
| 1810 | - ) | ||
| 1811 | - } | 1755 | + // if (build1.devName && build1.installTime && build1.name && build1.number && build1.time && build1.type) { |
| 1756 | + console.log(build1); | ||
| 1757 | + this.data3.push({ | ||
| 1758 | + cardType: 1, | ||
| 1759 | + required: true, | ||
| 1760 | + title: '楼盘名称', | ||
| 1761 | + value: build1.name || "", | ||
| 1762 | + key: "buildingItemDetail1", | ||
| 1763 | + id: "name" | ||
| 1764 | + }, { | ||
| 1765 | + cardType: 1, | ||
| 1766 | + required: true, | ||
| 1767 | + title: '楼盘类型', | ||
| 1768 | + value: build1.type || "", | ||
| 1769 | + key: "buildingItemDetail1", | ||
| 1770 | + id: "type" | ||
| 1771 | + }, { | ||
| 1772 | + cardType: 1, | ||
| 1773 | + required: true, | ||
| 1774 | + title: '开发商名称', | ||
| 1775 | + value: build1.devName || "", | ||
| 1776 | + key: "buildingItemDetail1", | ||
| 1777 | + id: "devName" | ||
| 1778 | + }, { | ||
| 1779 | + cardType: 1, | ||
| 1780 | + required: true, | ||
| 1781 | + title: '预计管道天燃气安装户数', | ||
| 1782 | + value: build1.number || "", | ||
| 1783 | + key: "buildingItemDetail1", | ||
| 1784 | + id: "number" | ||
| 1785 | + }, { | ||
| 1786 | + cardType: 1, | ||
| 1787 | + required: true, | ||
| 1788 | + title: '签约时间(含计划签约)', | ||
| 1789 | + value: build1.time || "", | ||
| 1790 | + key: "buildingItemDetail1", | ||
| 1791 | + id: "time" | ||
| 1792 | + }, { | ||
| 1793 | + cardType: 1, | ||
| 1794 | + required: true, | ||
| 1795 | + title: '预计燃气安装', | ||
| 1796 | + value: build1.installTime || "", | ||
| 1797 | + key: "buildingItemDetail1", | ||
| 1798 | + id: "installTime" | ||
| 1799 | + }, | ||
| 1800 | + // {cardType: 1,required: true,title: `${parseInt(this.fiscalYear)}财年小计`,value: this.reportData.currentInstallSubtotal || "",key: "currentInstallSubtotal"}, | ||
| 1801 | + ) | ||
| 1802 | + // } | ||
| 1812 | }) | 1803 | }) |
| 1813 | - this.data3.push( | ||
| 1814 | - {cardType: 3,required: true,title: `${parseInt(this.fiscalYear)+1}财年`,}, | ||
| 1815 | - ) | 1804 | + } |
| 1805 | + | ||
| 1806 | + // 财年小计 | ||
| 1807 | + this.data3.push({ | ||
| 1808 | + cardType: 1, | ||
| 1809 | + required: true, | ||
| 1810 | + title: `${parseInt(this.fiscalYear)}财年小计`, | ||
| 1811 | + value: this.reportData.currentInstallSubtotal || "", | ||
| 1812 | + key: "currentInstallSubtotal" | ||
| 1813 | + }) | ||
| 1814 | + // 下一年标题 | ||
| 1815 | + this.data3.push({ | ||
| 1816 | + cardType: 3, | ||
| 1817 | + required: true, | ||
| 1818 | + title: `${parseInt(this.fiscalYear)+1}财年`, | ||
| 1819 | + }, ) | ||
| 1820 | + | ||
| 1821 | + // 类型1动态列表2 | ||
| 1822 | + if (this.newBuildingItem.buildingItemDetail2 && this.newBuildingItem.buildingItemDetail2.length) { | ||
| 1823 | + | ||
| 1816 | this.newBuildingItem.buildingItemDetail2.map(build2 => { | 1824 | this.newBuildingItem.buildingItemDetail2.map(build2 => { |
| 1817 | - if (build2.devName && build2.installTime && build2.name && build2.number && build2.time && build2.type) { | ||
| 1818 | - console.log(build2); | ||
| 1819 | - this.data3.push( | ||
| 1820 | - {cardType: 1,required: true,title: '楼盘名称',value:build2.name,key: "buildingItemDetail2",id: "name"}, | ||
| 1821 | - {cardType: 1,required: true,title: '楼盘类型',value: build2.type,key: "buildingItemDetail2",id: "type"}, | ||
| 1822 | - {cardType: 1,required: true,title: '开发商名称',value: build2.devName,key: "buildingItemDetail2",id: "devName"}, | ||
| 1823 | - {cardType: 1,required: true,title: '预计管道天燃气安装户数',value: build2.number,key: "buildingItemDetail2",id: "number"}, | ||
| 1824 | - {cardType: 1,required: true,title: '签约时间(含计划签约)',value: build2.time,key: "buildingItemDetail2",id: "time"}, | ||
| 1825 | - {cardType: 1,required: true,title: '预计燃气安装',value: build2.installTime,key: "buildingItemDetail2",id: "installTime"}, | ||
| 1826 | - {cardType: 1,required: true,title: `${parseInt(this.fiscalYear)+1}财年小计`,value: this.newBuildingItem.afterInstallSubtotal,key: "afterInstallSubtotal"}, | ||
| 1827 | - ) | ||
| 1828 | - } | ||
| 1829 | - }) | ||
| 1830 | - this.data3.push( | ||
| 1831 | - {cardType: 3,required: true,title: `${parseInt(this.fiscalYear)+2}财年`,}, | ||
| 1832 | - ) | ||
| 1833 | - this.newBuildingItem.buildingItemDetail3.map(build2 => { | ||
| 1834 | - if (build2.devName && build2.installTime && build2.name && build2.number && build2.time && build2.type) { | ||
| 1835 | - console.log(build2); | ||
| 1836 | - this.data3.push( | ||
| 1837 | - {cardType: 1,required: true,title: '楼盘名称',value:build2.name,key: "buildingItemDetail3",id: "name"}, | ||
| 1838 | - {cardType: 1,required: true,title: '楼盘类型',value: build2.type,key: "buildingItemDetail3",id: "type"}, | ||
| 1839 | - {cardType: 1,required: true,title: '开发商名称',value: build2.devName,key: "buildingItemDetail3",id: "devName"}, | ||
| 1840 | - {cardType: 1,required: true,title: '预计管道天燃气安装户数',value: build2.number,key: "buildingItemDetail3",id: "number"}, | ||
| 1841 | - {cardType: 1,required: true,title: '签约时间(含计划签约)',value: build2.time,key: "buildingItemDetail3",id: "time"}, | ||
| 1842 | - {cardType: 1,required: true,title: '预计燃气安装',value: build2.installTime,key: "buildingItemDetail3",id: "installTime"}, | ||
| 1843 | - {cardType: 1,required: true,title: `${parseInt(this.fiscalYear)+2}财年小计`,value: this.newBuildingItem.lastInstallSubtotal,key: "lastInstallSubtotal"}, | ||
| 1844 | - ) | ||
| 1845 | - } | 1825 | + // if (build2.devName && build2.installTime && build2.name && build2.number && build2.time && build2.type) { |
| 1826 | + console.log(build2); | ||
| 1827 | + this.data3.push({ | ||
| 1828 | + cardType: 1, | ||
| 1829 | + required: true, | ||
| 1830 | + title: '楼盘名称', | ||
| 1831 | + value: build2.name || "", | ||
| 1832 | + key: "buildingItemDetail2", | ||
| 1833 | + id: "name" | ||
| 1834 | + }, { | ||
| 1835 | + cardType: 1, | ||
| 1836 | + required: true, | ||
| 1837 | + title: '楼盘类型', | ||
| 1838 | + value: build2.type || "", | ||
| 1839 | + key: "buildingItemDetail2", | ||
| 1840 | + id: "type" | ||
| 1841 | + }, { | ||
| 1842 | + cardType: 1, | ||
| 1843 | + required: true, | ||
| 1844 | + title: '开发商名称', | ||
| 1845 | + value: build2.devName || "", | ||
| 1846 | + key: "buildingItemDetail2", | ||
| 1847 | + id: "devName" | ||
| 1848 | + }, { | ||
| 1849 | + cardType: 1, | ||
| 1850 | + required: true, | ||
| 1851 | + title: '预计管道天燃气安装户数', | ||
| 1852 | + value: build2.number || "", | ||
| 1853 | + key: "buildingItemDetail2", | ||
| 1854 | + id: "number" | ||
| 1855 | + }, { | ||
| 1856 | + cardType: 1, | ||
| 1857 | + required: true, | ||
| 1858 | + title: '签约时间(含计划签约)', | ||
| 1859 | + value: build2.time || "", | ||
| 1860 | + key: "buildingItemDetail2", | ||
| 1861 | + id: "time" | ||
| 1862 | + }, { | ||
| 1863 | + cardType: 1, | ||
| 1864 | + required: true, | ||
| 1865 | + title: '预计燃气安装', | ||
| 1866 | + value: build2.installTime || "", | ||
| 1867 | + key: "buildingItemDetail2", | ||
| 1868 | + id: "installTime" | ||
| 1869 | + }, { | ||
| 1870 | + cardType: 1, | ||
| 1871 | + required: true, | ||
| 1872 | + title: `${parseInt(this.fiscalYear)+1}财年小计`, | ||
| 1873 | + value: this.reportData.afterInstallSubtotal || "", | ||
| 1874 | + key: "afterInstallSubtotal" | ||
| 1875 | + }, ) | ||
| 1876 | + // } | ||
| 1846 | }) | 1877 | }) |
| 1847 | - this.data3.push( | ||
| 1848 | - {cardType: 1,required: true,title: '合计',value: this.newBuildingItem.installTotal,key: "installTotal"}, | ||
| 1849 | - ) | ||
| 1850 | - // console.log(this.data3); | ||
| 1851 | - // this.data3.forEach(data => { | ||
| 1852 | - // if (data.key in this.newBuildingItem) { | ||
| 1853 | - // // console.log(this.newBuildingItem[data.key]); | ||
| 1854 | - // if (this.newBuildingItem[data.key].length > 0) { | ||
| 1855 | - // data.value = this.newBuildingItem[data.key][0][data.id]; | ||
| 1856 | - // } else { | ||
| 1857 | - // data.value = this.newBuildingItem[data.key] | ||
| 1858 | - // } | ||
| 1859 | - // } | ||
| 1860 | - // }); | ||
| 1861 | - // console.log(this.data3); | 1878 | + } |
| 1862 | 1879 | ||
| 1863 | - this.data4.forEach(data => { | ||
| 1864 | - if (data.key in this.reportData) { | ||
| 1865 | - let Arr = this.reportData[data.key].split(","); | ||
| 1866 | - data.value = Arr[data.id]; | ||
| 1867 | - } | ||
| 1868 | - }); | 1880 | + this.data3.push({ |
| 1881 | + cardType: 1, | ||
| 1882 | + required: true, | ||
| 1883 | + title: `${parseInt(this.fiscalYear)+1}财年小计`, | ||
| 1884 | + value: this.reportData.afterInstallSubtotal || "", | ||
| 1885 | + key: "afterInstallSubtotal" | ||
| 1886 | + }) | ||
| 1869 | 1887 | ||
| 1870 | - this.data5.forEach(data => { | ||
| 1871 | - if (data.key in this.reportData) { | ||
| 1872 | - let Arr = this.reportData[data.key].split(","); | ||
| 1873 | - data.value = Arr[data.id]; | ||
| 1874 | - } | ||
| 1875 | - }); | ||
| 1876 | - | 1888 | + this.data3.push({ |
| 1889 | + cardType: 3, | ||
| 1890 | + required: true, | ||
| 1891 | + title: `${parseInt(this.fiscalYear)+2}财年`, | ||
| 1892 | + }, ) | ||
| 1877 | 1893 | ||
| 1878 | - this.data6.forEach(data => { | ||
| 1879 | - if (data.key in this.reportData) { | ||
| 1880 | - let Arr = this.reportData[data.key].split(","); | ||
| 1881 | - data.value = Arr[data.id]; | ||
| 1882 | - } | ||
| 1883 | - }); | 1894 | + // 类型2动态列表3 |
| 1895 | + if (this.newBuildingItem.buildingItemDetail3 && this.newBuildingItem.buildingItemDetail3.length) { | ||
| 1896 | + this.newBuildingItem.buildingItemDetail3.map(build2 => { | ||
| 1897 | + // if (build2.devName && build2.installTime && build2.name && build2.number && build2.time && build2.type) { | ||
| 1898 | + console.log(build2); | ||
| 1899 | + this.data3.push({ | ||
| 1900 | + cardType: 1, | ||
| 1901 | + required: true, | ||
| 1902 | + title: '楼盘名称', | ||
| 1903 | + value: build2.name || "", | ||
| 1904 | + key: "buildingItemDetail3", | ||
| 1905 | + id: "name" | ||
| 1906 | + }, { | ||
| 1907 | + cardType: 1, | ||
| 1908 | + required: true, | ||
| 1909 | + title: '楼盘类型', | ||
| 1910 | + value: build2.type || "", | ||
| 1911 | + key: "buildingItemDetail3", | ||
| 1912 | + id: "type" | ||
| 1913 | + }, { | ||
| 1914 | + cardType: 1, | ||
| 1915 | + required: true, | ||
| 1916 | + title: '开发商名称', | ||
| 1917 | + value: build2.devName || "", | ||
| 1918 | + key: "buildingItemDetail3", | ||
| 1919 | + id: "devName" | ||
| 1920 | + }, { | ||
| 1921 | + cardType: 1, | ||
| 1922 | + required: true, | ||
| 1923 | + title: '预计管道天燃气安装户数', | ||
| 1924 | + value: build2.number || "", | ||
| 1925 | + key: "buildingItemDetail3", | ||
| 1926 | + id: "number" | ||
| 1927 | + }, { | ||
| 1928 | + cardType: 1, | ||
| 1929 | + required: true, | ||
| 1930 | + title: '签约时间(含计划签约)', | ||
| 1931 | + value: build2.time || "", | ||
| 1932 | + key: "buildingItemDetail3", | ||
| 1933 | + id: "time" | ||
| 1934 | + }, { | ||
| 1935 | + cardType: 1, | ||
| 1936 | + required: true, | ||
| 1937 | + title: '预计燃气安装', | ||
| 1938 | + value: build2.installTime || "", | ||
| 1939 | + key: "buildingItemDetail3", | ||
| 1940 | + id: "installTime" | ||
| 1941 | + }, { | ||
| 1942 | + cardType: 1, | ||
| 1943 | + required: true, | ||
| 1944 | + title: `${parseInt(this.fiscalYear)+2}财年小计`, | ||
| 1945 | + value: this.reportData.lastInstallSubtotal || "", | ||
| 1946 | + key: "lastInstallSubtotal" | ||
| 1947 | + }, ) | ||
| 1948 | + // } | ||
| 1949 | + }) | ||
| 1950 | + } | ||
| 1951 | + this.data3.push({ | ||
| 1952 | + cardType: 1, | ||
| 1953 | + required: true, | ||
| 1954 | + title: `${parseInt(this.fiscalYear)+2}财年小计`, | ||
| 1955 | + value: this.reportData.lastInstallSubtotal || "", | ||
| 1956 | + key: "lastInstallSubtotal" | ||
| 1957 | + }) | ||
| 1884 | 1958 | ||
| 1885 | - this.data7.forEach(data => { | ||
| 1886 | - if (data.key in this.reportData) { | ||
| 1887 | - data.value = this.reportData[data.key]; | ||
| 1888 | - } | ||
| 1889 | - }); | ||
| 1890 | - this.data8.forEach(data => { | ||
| 1891 | - if (data.key in this.reportData) { | ||
| 1892 | - data.value = this.reportData[data.key]; | ||
| 1893 | - } | ||
| 1894 | - }); | ||
| 1895 | - this.data9.forEach(data => { | ||
| 1896 | - if (data.key in this.reportData) { | ||
| 1897 | - data.value = this.reportData[data.key]; | ||
| 1898 | - } | ||
| 1899 | - }); | ||
| 1900 | - this.data10.forEach(data => { | ||
| 1901 | - if (data.key in this.reportData) { | ||
| 1902 | - let Arr = this.reportData[data.key].split(","); | ||
| 1903 | - data.value = Arr[data.id]; | ||
| 1904 | - } | ||
| 1905 | - }); | ||
| 1906 | - this.data11.forEach(data => { | ||
| 1907 | - if (data.key in this.reportData) { | ||
| 1908 | - data.value = this.reportData[data.key]; | ||
| 1909 | - } | ||
| 1910 | - }); | ||
| 1911 | - this.data12.forEach(data => { | ||
| 1912 | - if (data.key in this.reportData) { | ||
| 1913 | - data.value = this.reportData[data.key]; | ||
| 1914 | - } | ||
| 1915 | - }); | ||
| 1916 | - this.data13.forEach(data => { | ||
| 1917 | - if (data.key in this.reportData) { | ||
| 1918 | - data.value = this.reportData[data.key]; | ||
| 1919 | - } | ||
| 1920 | - }); | ||
| 1921 | - this.data14.forEach(data => { | ||
| 1922 | - if (data.key in this.reportData) { | ||
| 1923 | - let Arr = this.reportData[data.key].split(","); | ||
| 1924 | - data.value = Arr[data.id]; | ||
| 1925 | - } | ||
| 1926 | - }); | ||
| 1927 | - this.data15.forEach(data => { | ||
| 1928 | - if (data.key in this.reportData) { | ||
| 1929 | - data.value = this.reportData[data.key]; | ||
| 1930 | - } | ||
| 1931 | - }); | ||
| 1932 | - this.data16.forEach(data => { | ||
| 1933 | - if (data.key in this.reportData) { | ||
| 1934 | - data.value = this.reportData[data.key]; | ||
| 1935 | - } | ||
| 1936 | - }); | ||
| 1937 | - this.data17.forEach(data => { | ||
| 1938 | - if (data.key in this.reportData) { | ||
| 1939 | - data.value = this.reportData[data.key]; | ||
| 1940 | - } | ||
| 1941 | - }); | ||
| 1942 | - this.data18.forEach(data => { | ||
| 1943 | - if (data.key in this.reportData) { | ||
| 1944 | - data.value = this.reportData[data.key]; | ||
| 1945 | - } | ||
| 1946 | - }); | 1959 | + this.data3.push({ |
| 1960 | + cardType: 1, | ||
| 1961 | + required: true, | ||
| 1962 | + title: '合计', | ||
| 1963 | + value: this.newBuildingItem.installTotal || 0, | ||
| 1964 | + key: "installTotal" | ||
| 1965 | + }, ) | ||
| 1966 | + console.log('动态列表2', JSON.parse(JSON.stringify(this.data3))); | ||
| 1947 | } | 1967 | } |
| 1948 | } | 1968 | } |
| 1949 | } | 1969 | } |
pages/market/components/reportModule4.vue
| 1 | <template> | 1 | <template> |
| 2 | <view class="ComCss"> | 2 | <view class="ComCss"> |
| 3 | - <cardMoudule :cardData="data1" :required="false" title="未来发展规划"></cardMoudule> | ||
| 4 | - <cardMoudule :cardData="data2" :required="true" title="整体开发思路"></cardMoudule> | ||
| 5 | - <cardMoudule :cardData="data3" :required="false" title="所需要资源配置"></cardMoudule> | 3 | + <cardMoudule :cardData="data1" :required="false" title="三年业务指标发展计划"></cardMoudule> |
| 4 | + <cardMoudule :cardData="data2" :required="false" title="天然气安装业务"></cardMoudule> | ||
| 5 | + <cardMoudule :cardData="data3" :required="false" title="回款"></cardMoudule> | ||
| 6 | + <cardMoudule :cardData="data4" :required="false" title="销售气量"></cardMoudule> | ||
| 7 | + <cardMoudule :cardData="data5" :required="false" title="毛差"></cardMoudule> | ||
| 8 | + <cardMoudule :cardData="data6" :required="false" title="毛利"></cardMoudule> | ||
| 9 | + <cardMoudule :cardData="data7" :required="true" title="战略控制点"></cardMoudule> | ||
| 10 | + <cardMoudule :cardData="data8" :required="false" title="所需要资源配置"></cardMoudule> | ||
| 6 | </view> | 11 | </view> |
| 7 | </template> | 12 | </template> |
| 8 | 13 | ||
| @@ -16,264 +21,2394 @@ | @@ -16,264 +21,2394 @@ | ||
| 16 | reportData: { | 21 | reportData: { |
| 17 | type: Object | 22 | type: Object |
| 18 | }, | 23 | }, |
| 19 | - fiscalYear:{ | ||
| 20 | - type:String | 24 | + fiscalYear: { |
| 25 | + type: String | ||
| 21 | } | 26 | } |
| 22 | }, | 27 | }, |
| 23 | data() { | 28 | data() { |
| 24 | return { | 29 | return { |
| 30 | + // data1: [{ | ||
| 31 | + // cardType: 3, | ||
| 32 | + // required: true, | ||
| 33 | + // title: '用户签约(户)', | ||
| 34 | + // }, | ||
| 35 | + // { | ||
| 36 | + // cardType: 1, | ||
| 37 | + // required: true, | ||
| 38 | + // title: `${this.fiscalYear}财年目标`, | ||
| 39 | + // value: "", | ||
| 40 | + // key: "contractGoal", | ||
| 41 | + // id: "0" | ||
| 42 | + // }, | ||
| 43 | + // { | ||
| 44 | + // cardType: 1, | ||
| 45 | + // required: true, | ||
| 46 | + // title: `${parseInt(this.fiscalYear)+1}财年目标`, | ||
| 47 | + // value: "", | ||
| 48 | + // key: "contractGoal", | ||
| 49 | + // id: "1" | ||
| 50 | + // }, | ||
| 51 | + // { | ||
| 52 | + // cardType: 1, | ||
| 53 | + // required: true, | ||
| 54 | + // title: `${parseInt(this.fiscalYear)+2}财年目标`, | ||
| 55 | + // value: "", | ||
| 56 | + // key: "contractGoal", | ||
| 57 | + // id: "2" | ||
| 58 | + // }, | ||
| 59 | + // { | ||
| 60 | + // cardType: 3, | ||
| 61 | + // required: true, | ||
| 62 | + // title: '新户(户)', | ||
| 63 | + // }, | ||
| 64 | + // { | ||
| 65 | + // cardType: 1, | ||
| 66 | + // required: true, | ||
| 67 | + // title: `${this.fiscalYear}财年目标`, | ||
| 68 | + // value: "", | ||
| 69 | + // key: "newUserGoal", | ||
| 70 | + // id: "0" | ||
| 71 | + // }, | ||
| 72 | + // { | ||
| 73 | + // cardType: 1, | ||
| 74 | + // required: true, | ||
| 75 | + // title: `${parseInt(this.fiscalYear)+1}财年目标`, | ||
| 76 | + // value: "", | ||
| 77 | + // key: "newUserGoal", | ||
| 78 | + // id: "1" | ||
| 79 | + // }, | ||
| 80 | + // { | ||
| 81 | + // cardType: 1, | ||
| 82 | + // required: true, | ||
| 83 | + // title: `${parseInt(this.fiscalYear)+2}财年目标`, | ||
| 84 | + // value: "", | ||
| 85 | + // key: "newUserGoal", | ||
| 86 | + // id: "2" | ||
| 87 | + // }, | ||
| 88 | + | ||
| 89 | + // { | ||
| 90 | + // cardType: 3, | ||
| 91 | + // required: true, | ||
| 92 | + // title: '老户(户)', | ||
| 93 | + // }, | ||
| 94 | + // { | ||
| 95 | + // cardType: 1, | ||
| 96 | + // required: true, | ||
| 97 | + // title: `${this.fiscalYear}财年目标`, | ||
| 98 | + // value: "", | ||
| 99 | + // key: "oldUserGoal", | ||
| 100 | + // id: "0" | ||
| 101 | + // }, | ||
| 102 | + // { | ||
| 103 | + // cardType: 1, | ||
| 104 | + // required: true, | ||
| 105 | + // title: `${parseInt(this.fiscalYear)+1}财年目标`, | ||
| 106 | + // value: "", | ||
| 107 | + // key: "oldUserGoal", | ||
| 108 | + // id: "1" | ||
| 109 | + // }, | ||
| 110 | + // { | ||
| 111 | + // cardType: 1, | ||
| 112 | + // required: true, | ||
| 113 | + // title: `${parseInt(this.fiscalYear)+2}财年目标`, | ||
| 114 | + // value: "", | ||
| 115 | + // key: "oldUserGoal", | ||
| 116 | + // id: "2" | ||
| 117 | + // }, | ||
| 118 | + | ||
| 119 | + // { | ||
| 120 | + // cardType: 3, | ||
| 121 | + // required: true, | ||
| 122 | + // title: '乡镇(户)', | ||
| 123 | + // }, | ||
| 124 | + // { | ||
| 125 | + // cardType: 1, | ||
| 126 | + // required: true, | ||
| 127 | + // title: `${this.fiscalYear}财年目标`, | ||
| 128 | + // value: "", | ||
| 129 | + // key: "townsUserGoal", | ||
| 130 | + // id: "0" | ||
| 131 | + // }, | ||
| 132 | + // { | ||
| 133 | + // cardType: 1, | ||
| 134 | + // required: true, | ||
| 135 | + // title: `${parseInt(this.fiscalYear)+1}财年目标`, | ||
| 136 | + // value: "", | ||
| 137 | + // key: "townsUserGoal", | ||
| 138 | + // id: "1" | ||
| 139 | + // }, | ||
| 140 | + // { | ||
| 141 | + // cardType: 1, | ||
| 142 | + // required: true, | ||
| 143 | + // title: `${parseInt(this.fiscalYear)+2}财年目标`, | ||
| 144 | + // value: "", | ||
| 145 | + // key: "townsUserGoal", | ||
| 146 | + // id: "2" | ||
| 147 | + // }, | ||
| 148 | + | ||
| 149 | + // { | ||
| 150 | + // cardType: 3, | ||
| 151 | + // required: true, | ||
| 152 | + // title: '工商福(户)', | ||
| 153 | + // }, | ||
| 154 | + // { | ||
| 155 | + // cardType: 1, | ||
| 156 | + // required: true, | ||
| 157 | + // title: `${this.fiscalYear}财年目标`, | ||
| 158 | + // value: "", | ||
| 159 | + // key: "commerceGoal", | ||
| 160 | + // id: "0" | ||
| 161 | + // }, | ||
| 162 | + // { | ||
| 163 | + // cardType: 1, | ||
| 164 | + // required: true, | ||
| 165 | + // title: `${parseInt(this.fiscalYear)+1}财年目标`, | ||
| 166 | + // value: "", | ||
| 167 | + // key: "commerceGoal", | ||
| 168 | + // id: "1" | ||
| 169 | + // }, | ||
| 170 | + // { | ||
| 171 | + // cardType: 1, | ||
| 172 | + // required: true, | ||
| 173 | + // title: `${parseInt(this.fiscalYear)+2}财年目标`, | ||
| 174 | + // value: "", | ||
| 175 | + // key: "commerceGoal", | ||
| 176 | + // id: "2" | ||
| 177 | + // }, | ||
| 178 | + | ||
| 179 | + // { | ||
| 180 | + // cardType: 3, | ||
| 181 | + // required: true, | ||
| 182 | + // title: '工业(户)', | ||
| 183 | + // }, | ||
| 184 | + // { | ||
| 185 | + // cardType: 1, | ||
| 186 | + // required: true, | ||
| 187 | + // title: `${this.fiscalYear}财年目标`, | ||
| 188 | + // value: "", | ||
| 189 | + // key: "industryGoal", | ||
| 190 | + // id: "0" | ||
| 191 | + // }, | ||
| 192 | + // { | ||
| 193 | + // cardType: 1, | ||
| 194 | + // required: true, | ||
| 195 | + // title: `${parseInt(this.fiscalYear)+1}财年目标`, | ||
| 196 | + // value: "", | ||
| 197 | + // key: "industryGoal", | ||
| 198 | + // id: "1" | ||
| 199 | + // }, | ||
| 200 | + // { | ||
| 201 | + // cardType: 1, | ||
| 202 | + // required: true, | ||
| 203 | + // title: `${parseInt(this.fiscalYear)+2}财年目标`, | ||
| 204 | + // value: "", | ||
| 205 | + // key: "industryGoal", | ||
| 206 | + // id: "2" | ||
| 207 | + // }, | ||
| 208 | + | ||
| 209 | + // { | ||
| 210 | + // cardType: 3, | ||
| 211 | + // required: true, | ||
| 212 | + // title: '用户安装(户)', | ||
| 213 | + // }, | ||
| 214 | + // { | ||
| 215 | + // cardType: 1, | ||
| 216 | + // required: true, | ||
| 217 | + // title: `${this.fiscalYear}财年目标`, | ||
| 218 | + // value: "", | ||
| 219 | + // key: "installUserGoal", | ||
| 220 | + // id: "0" | ||
| 221 | + // }, | ||
| 222 | + // { | ||
| 223 | + // cardType: 1, | ||
| 224 | + // required: true, | ||
| 225 | + // title: `${parseInt(this.fiscalYear)+1}财年目标`, | ||
| 226 | + // value: "", | ||
| 227 | + // key: "installUserGoal", | ||
| 228 | + // id: "1" | ||
| 229 | + // }, | ||
| 230 | + // { | ||
| 231 | + // cardType: 1, | ||
| 232 | + // required: true, | ||
| 233 | + // title: `${parseInt(this.fiscalYear)+2}财年目标`, | ||
| 234 | + // value: "", | ||
| 235 | + // key: "installUserGoal", | ||
| 236 | + // id: "2" | ||
| 237 | + // }, | ||
| 238 | + | ||
| 239 | + // { | ||
| 240 | + // cardType: 3, | ||
| 241 | + // required: true, | ||
| 242 | + // title: '销气量(户)', | ||
| 243 | + // }, | ||
| 244 | + // { | ||
| 245 | + // cardType: 1, | ||
| 246 | + // required: true, | ||
| 247 | + // title: `${this.fiscalYear}财年目标`, | ||
| 248 | + // value: "", | ||
| 249 | + // key: "salesNumberGoal", | ||
| 250 | + // id: "0" | ||
| 251 | + // }, | ||
| 252 | + // { | ||
| 253 | + // cardType: 1, | ||
| 254 | + // required: true, | ||
| 255 | + // title: `${parseInt(this.fiscalYear)+1}财年目标`, | ||
| 256 | + // value: "", | ||
| 257 | + // key: "salesNumberGoal", | ||
| 258 | + // id: "1" | ||
| 259 | + // }, | ||
| 260 | + // { | ||
| 261 | + // cardType: 1, | ||
| 262 | + // required: true, | ||
| 263 | + // title: `${parseInt(this.fiscalYear)+2}财年目标`, | ||
| 264 | + // value: "", | ||
| 265 | + // key: "salesNumberGoal", | ||
| 266 | + // id: "2" | ||
| 267 | + // } | ||
| 268 | + // ], | ||
| 25 | data1: [{ | 269 | data1: [{ |
| 26 | cardType: 3, | 270 | cardType: 3, |
| 271 | + title: '净利润' | ||
| 272 | + }, | ||
| 273 | + { | ||
| 274 | + cardType: 1, | ||
| 275 | + required: true, | ||
| 276 | + title: `${parseInt(this.fiscalYear)-2}财年完成`, | ||
| 277 | + value: "", | ||
| 278 | + key: "newNetProfit", | ||
| 279 | + id: "0" | ||
| 280 | + }, | ||
| 281 | + { | ||
| 282 | + cardType: 1, | ||
| 283 | + required: true, | ||
| 284 | + title: `${parseInt(this.fiscalYear)-1}财年完成`, | ||
| 285 | + value: "", | ||
| 286 | + key: "newNetProfit", | ||
| 287 | + id: "1" | ||
| 288 | + }, | ||
| 289 | + { | ||
| 290 | + cardType: 1, | ||
| 291 | + required: true, | ||
| 292 | + title: `${parseInt(this.fiscalYear)}财年预计`, | ||
| 293 | + value: "", | ||
| 294 | + key: "newNetProfit", | ||
| 295 | + id: "2" | ||
| 296 | + }, | ||
| 297 | + { | ||
| 298 | + cardType: 1, | ||
| 299 | + required: true, | ||
| 300 | + title: `${parseInt(this.fiscalYear)+1}财年预计`, | ||
| 301 | + value: "", | ||
| 302 | + key: "newNetProfit", | ||
| 303 | + id: "2" | ||
| 304 | + }, | ||
| 305 | + { | ||
| 306 | + cardType: 1, | ||
| 307 | + required: true, | ||
| 308 | + title: `${parseInt(this.fiscalYear)+2}财年预计`, | ||
| 309 | + value: "", | ||
| 310 | + key: "newNetProfit", | ||
| 311 | + id: "2" | ||
| 312 | + }, | ||
| 313 | + ], | ||
| 314 | + data2: [{ | ||
| 315 | + cardType: 3, | ||
| 316 | + title: "新户（户）" | ||
| 317 | + }, { | ||
| 318 | + cardType: 1, | ||
| 319 | + required: true, | ||
| 320 | + title: `${parseInt(this.fiscalYear)-2}财年完成`, | ||
| 321 | + value: "", | ||
| 322 | + key: "newInstallNew", | ||
| 323 | + id: "0" | ||
| 324 | + }, { | ||
| 325 | + cardType: 1, | ||
| 326 | + required: true, | ||
| 327 | + title: `${parseInt(this.fiscalYear)-1}财年完成`, | ||
| 328 | + value: "", | ||
| 329 | + key: "newInstallNew", | ||
| 330 | + id: "1" | ||
| 331 | + }, { | ||
| 332 | + cardType: 1, | ||
| 333 | + required: true, | ||
| 334 | + title: `${parseInt(this.fiscalYear)}财年预计`, | ||
| 335 | + value: "", | ||
| 336 | + key: "newInstallNew", | ||
| 337 | + id: "2" | ||
| 338 | + }, { | ||
| 339 | + cardType: 1, | ||
| 340 | + required: true, | ||
| 341 | + title: `${parseInt(this.fiscalYear)+1}财年预计`, | ||
| 342 | + value: "", | ||
| 343 | + key: "newInstallNew", | ||
| 344 | + id: "3" | ||
| 345 | + }, { | ||
| 346 | + cardType: 1, | ||
| 347 | + required: true, | ||
| 348 | + title: `${parseInt(this.fiscalYear)+2}财年预计`, | ||
| 349 | + value: "", | ||
| 350 | + key: "newInstallNew", | ||
| 351 | + id: "4" | ||
| 352 | + }, | ||
| 353 | + // 老户 | ||
| 354 | + { | ||
| 355 | + cardType: 3, | ||
| 356 | + title: "老户（户）" | ||
| 357 | + }, { | ||
| 358 | + cardType: 1, | ||
| 359 | + required: true, | ||
| 360 | + title: `${parseInt(this.fiscalYear)-2}财年完成`, | ||
| 361 | + value: "", | ||
| 362 | + key: "newInstallOld", | ||
| 363 | + id: "0" | ||
| 364 | + }, { | ||
| 365 | + cardType: 1, | ||
| 366 | + required: true, | ||
| 367 | + title: `${parseInt(this.fiscalYear)-1}财年完成`, | ||
| 368 | + value: "", | ||
| 369 | + key: "newInstallOld", | ||
| 370 | + id: "1" | ||
| 371 | + }, { | ||
| 372 | + cardType: 1, | ||
| 373 | + required: true, | ||
| 374 | + title: `${parseInt(this.fiscalYear)}财年预计`, | ||
| 375 | + value: "", | ||
| 376 | + key: "newInstallOld", | ||
| 377 | + id: "2" | ||
| 378 | + }, { | ||
| 379 | + cardType: 1, | ||
| 380 | + required: true, | ||
| 381 | + title: `${parseInt(this.fiscalYear)+1}财年预计`, | ||
| 382 | + value: "", | ||
| 383 | + key: "newInstallOld", | ||
| 384 | + id: "3" | ||
| 385 | + }, { | ||
| 386 | + cardType: 1, | ||
| 387 | + required: true, | ||
| 388 | + title: `${parseInt(this.fiscalYear)+2}财年预计`, | ||
| 389 | + value: "", | ||
| 390 | + key: "newInstallOld", | ||
| 391 | + id: "4" | ||
| 392 | + }, | ||
| 393 | + // 乡村燃气新建居民(户) | ||
| 394 | + { | ||
| 395 | + cardType: 3, | ||
| 396 | + title: "乡村燃气新建居民(户)" | ||
| 397 | + }, { | ||
| 398 | + cardType: 1, | ||
| 399 | + required: true, | ||
| 400 | + title: `${parseInt(this.fiscalYear)-2}财年完成`, | ||
| 401 | + value: "", | ||
| 402 | + key: "newInstallVillageNew", | ||
| 403 | + id: "0" | ||
| 404 | + }, { | ||
| 405 | + cardType: 1, | ||
| 406 | + required: true, | ||
| 407 | + title: `${parseInt(this.fiscalYear)-1}财年完成`, | ||
| 408 | + value: "", | ||
| 409 | + key: "newInstallVillageNew", | ||
| 410 | + id: "1" | ||
| 411 | + }, { | ||
| 412 | + cardType: 1, | ||
| 413 | + required: true, | ||
| 414 | + title: `${parseInt(this.fiscalYear)}财年预计`, | ||
| 415 | + value: "", | ||
| 416 | + key: "newInstallVillageNew", | ||
| 417 | + id: "2" | ||
| 418 | + }, { | ||
| 419 | + cardType: 1, | ||
| 420 | + required: true, | ||
| 421 | + title: `${parseInt(this.fiscalYear)+1}财年预计`, | ||
| 422 | + value: "", | ||
| 423 | + key: "newInstallVillageNew", | ||
| 424 | + id: "3" | ||
| 425 | + }, { | ||
| 426 | + cardType: 1, | ||
| 427 | + required: true, | ||
| 428 | + title: `${parseInt(this.fiscalYear)+2}财年预计`, | ||
| 429 | + value: "", | ||
| 430 | + key: "newInstallVillageNew", | ||
| 431 | + id: "4" | ||
| 432 | + }, | ||
| 433 | + // 乡村燃气存量居民(户) | ||
| 434 | + { | ||
| 435 | + cardType: 3, | ||
| 436 | + title: "乡村燃气存量居民(户)" | ||
| 437 | + }, { | ||
| 438 | + cardType: 1, | ||
| 439 | + required: true, | ||
| 440 | + title: `${parseInt(this.fiscalYear)-2}财年完成`, | ||
| 441 | + value: "", | ||
| 442 | + key: "newInstallVillageOld", | ||
| 443 | + id: "0" | ||
| 444 | + }, { | ||
| 445 | + cardType: 1, | ||
| 446 | + required: true, | ||
| 447 | + title: `${parseInt(this.fiscalYear)-1}财年完成`, | ||
| 448 | + value: "", | ||
| 449 | + key: "newInstallVillageOld", | ||
| 450 | + id: "1" | ||
| 451 | + }, { | ||
| 452 | + cardType: 1, | ||
| 453 | + required: true, | ||
| 454 | + title: `${parseInt(this.fiscalYear)}财年预计`, | ||
| 455 | + value: "", | ||
| 456 | + key: "newInstallVillageOld", | ||
| 457 | + id: "2" | ||
| 458 | + }, { | ||
| 459 | + cardType: 1, | ||
| 460 | + required: true, | ||
| 461 | + title: `${parseInt(this.fiscalYear)+1}财年预计`, | ||
| 462 | + value: "", | ||
| 463 | + key: "newInstallVillageOld", | ||
| 464 | + id: "3" | ||
| 465 | + }, { | ||
| 466 | + cardType: 1, | ||
| 467 | + required: true, | ||
| 468 | + title: `${parseInt(this.fiscalYear)+2}财年预计`, | ||
| 469 | + value: "", | ||
| 470 | + key: "newInstallVillageOld", | ||
| 471 | + id: "4" | ||
| 472 | + }, | ||
| 473 | + // 农村气代煤居民(户) | ||
| 474 | + { | ||
| 475 | + cardType: 3, | ||
| 476 | + title: "农村气代煤居民(户)" | ||
| 477 | + }, { | ||
| 478 | + cardType: 1, | ||
| 479 | + required: true, | ||
| 480 | + title: `${parseInt(this.fiscalYear)-2}财年完成`, | ||
| 481 | + value: "", | ||
| 482 | + key: "newInstallGasCoal", | ||
| 483 | + id: "0" | ||
| 484 | + }, { | ||
| 485 | + cardType: 1, | ||
| 486 | + required: true, | ||
| 487 | + title: `${parseInt(this.fiscalYear)-1}财年完成`, | ||
| 488 | + value: "", | ||
| 489 | + key: "newInstallGasCoal", | ||
| 490 | + id: "1" | ||
| 491 | + }, { | ||
| 492 | + cardType: 1, | ||
| 493 | + required: true, | ||
| 494 | + title: `${parseInt(this.fiscalYear)}财年预计`, | ||
| 495 | + value: "", | ||
| 496 | + key: "newInstallGasCoal", | ||
| 497 | + id: "2" | ||
| 498 | + }, { | ||
| 499 | + cardType: 1, | ||
| 500 | + required: true, | ||
| 501 | + title: `${parseInt(this.fiscalYear)+1}财年预计`, | ||
| 502 | + value: "", | ||
| 503 | + key: "newInstallGasCoal", | ||
| 504 | + id: "3" | ||
| 505 | + }, { | ||
| 506 | + cardType: 1, | ||
| 507 | + required: true, | ||
| 508 | + title: `${parseInt(this.fiscalYear)+2}财年预计`, | ||
| 509 | + value: "", | ||
| 510 | + key: "newInstallGasCoal", | ||
| 511 | + id: "4" | ||
| 512 | + }, | ||
| 513 | + // 工业(户) | ||
| 514 | + { | ||
| 515 | + cardType: 3, | ||
| 516 | + title: "工业(户)" | ||
| 517 | + }, { | ||
| 518 | + cardType: 1, | ||
| 519 | + required: true, | ||
| 520 | + title: `${parseInt(this.fiscalYear)-2}财年完成`, | ||
| 521 | + value: "", | ||
| 522 | + key: "newInstallIndustry", | ||
| 523 | + id: "0" | ||
| 524 | + }, { | ||
| 525 | + cardType: 1, | ||
| 526 | + required: true, | ||
| 527 | + title: `${parseInt(this.fiscalYear)-1}财年完成`, | ||
| 528 | + value: "", | ||
| 529 | + key: "newInstallIndustry", | ||
| 530 | + id: "1" | ||
| 531 | + }, { | ||
| 532 | + cardType: 1, | ||
| 533 | + required: true, | ||
| 534 | + title: `${parseInt(this.fiscalYear)}财年预计`, | ||
| 535 | + value: "", | ||
| 536 | + key: "newInstallIndustry", | ||
| 537 | + id: "2" | ||
| 538 | + }, { | ||
| 539 | + cardType: 1, | ||
| 540 | + required: true, | ||
| 541 | + title: `${parseInt(this.fiscalYear)+1}财年预计`, | ||
| 542 | + value: "", | ||
| 543 | + key: "newInstallIndustry", | ||
| 544 | + id: "3" | ||
| 545 | + }, { | ||
| 546 | + cardType: 1, | ||
| 547 | + required: true, | ||
| 548 | + title: `${parseInt(this.fiscalYear)+2}财年预计`, | ||
| 549 | + value: "", | ||
| 550 | + key: "newInstallIndustry", | ||
| 551 | + id: "4" | ||
| 552 | + }, | ||
| 553 | + // 商业(户) | ||
| 554 | + { | ||
| 555 | + cardType: 3, | ||
| 556 | + title: "商业(户)" | ||
| 557 | + }, { | ||
| 558 | + cardType: 1, | ||
| 559 | + required: true, | ||
| 560 | + title: `${parseInt(this.fiscalYear)-2}财年完成`, | ||
| 561 | + value: "", | ||
| 562 | + key: "newInstallCommerce", | ||
| 563 | + id: "0" | ||
| 564 | + }, { | ||
| 565 | + cardType: 1, | ||
| 566 | + required: true, | ||
| 567 | + title: `${parseInt(this.fiscalYear)-1}财年完成`, | ||
| 568 | + value: "", | ||
| 569 | + key: "newInstallCommerce", | ||
| 570 | + id: "1" | ||
| 571 | + }, { | ||
| 572 | + cardType: 1, | ||
| 573 | + required: true, | ||
| 574 | + title: `${parseInt(this.fiscalYear)}财年预计`, | ||
| 575 | + value: "", | ||
| 576 | + key: "newInstallCommerce", | ||
| 577 | + id: "2" | ||
| 578 | + }, { | ||
| 579 | + cardType: 1, | ||
| 580 | + required: true, | ||
| 581 | + title: `${parseInt(this.fiscalYear)+1}财年预计`, | ||
| 582 | + value: "", | ||
| 583 | + key: "newInstallCommerce", | ||
| 584 | + id: "3" | ||
| 585 | + }, { | ||
| 586 | + cardType: 1, | ||
| 587 | + required: true, | ||
| 588 | + title: `${parseInt(this.fiscalYear)+2}财年预计`, | ||
| 589 | + value: "", | ||
| 590 | + key: "newInstallCommerce", | ||
| 591 | + id: "4" | ||
| 592 | + }, | ||
| 593 | + // 其中：小微商(户) | ||
| 594 | + { | ||
| 595 | + cardType: 3, | ||
| 596 | + title: "其中：小微商(户)" | ||
| 597 | + }, { | ||
| 598 | + cardType: 1, | ||
| 599 | + required: true, | ||
| 600 | + title: `${parseInt(this.fiscalYear)-2}财年完成`, | ||
| 601 | + value: "", | ||
| 602 | + key: "newInstallSmallEnterprise", | ||
| 603 | + id: "0" | ||
| 604 | + }, { | ||
| 605 | + cardType: 1, | ||
| 606 | + required: true, | ||
| 607 | + title: `${parseInt(this.fiscalYear)-1}财年完成`, | ||
| 608 | + value: "", | ||
| 609 | + key: "newInstallSmallEnterprise", | ||
| 610 | + id: "1" | ||
| 611 | + }, { | ||
| 612 | + cardType: 1, | ||
| 613 | + required: true, | ||
| 614 | + title: `${parseInt(this.fiscalYear)}财年预计`, | ||
| 615 | + value: "", | ||
| 616 | + key: "newInstallSmallEnterprise", | ||
| 617 | + id: "2" | ||
| 618 | + }, { | ||
| 619 | + cardType: 1, | ||
| 620 | + required: true, | ||
| 621 | + title: `${parseInt(this.fiscalYear)+1}财年预计`, | ||
| 622 | + value: "", | ||
| 623 | + key: "newInstallSmallEnterprise", | ||
| 624 | + id: "3" | ||
| 625 | + }, { | ||
| 626 | + cardType: 1, | ||
| 627 | + required: true, | ||
| 628 | + title: `${parseInt(this.fiscalYear)+2}财年预计`, | ||
| 629 | + value: "", | ||
| 630 | + key: "newInstallSmallEnterprise", | ||
| 631 | + id: "4" | ||
| 632 | + }, | ||
| 633 | + // 安装户数合计(户) | ||
| 634 | + { | ||
| 635 | + cardType: 3, | ||
| 636 | + title: "安装户数合计(户)" | ||
| 637 | + }, { | ||
| 638 | + cardType: 1, | ||
| 639 | + required: true, | ||
| 640 | + title: `${parseInt(this.fiscalYear)-2}财年完成`, | ||
| 641 | + value: "", | ||
| 642 | + key: "newInstallTotal", | ||
| 643 | + id: "0" | ||
| 644 | + }, { | ||
| 645 | + cardType: 1, | ||
| 646 | + required: true, | ||
| 647 | + title: `${parseInt(this.fiscalYear)-1}财年完成`, | ||
| 648 | + value: "", | ||
| 649 | + key: "newInstallTotal", | ||
| 650 | + id: "1" | ||
| 651 | + }, { | ||
| 652 | + cardType: 1, | ||
| 653 | + required: true, | ||
| 654 | + title: `${parseInt(this.fiscalYear)}财年预计`, | ||
| 655 | + value: "", | ||
| 656 | + key: "newInstallTotal", | ||
| 657 | + id: "2" | ||
| 658 | + }, { | ||
| 659 | + cardType: 1, | ||
| 660 | + required: true, | ||
| 661 | + title: `${parseInt(this.fiscalYear)+1}财年预计`, | ||
| 662 | + value: "", | ||
| 663 | + key: "newInstallTotal", | ||
| 664 | + id: "3" | ||
| 665 | + }, { | ||
| 666 | + cardType: 1, | ||
| 667 | + required: true, | ||
| 668 | + title: `${parseInt(this.fiscalYear)+2}财年预计`, | ||
| 669 | + value: "", | ||
| 670 | + key: "newInstallTotal", | ||
| 671 | + id: "4" | ||
| 672 | + }, | ||
| 673 | + ], | ||
| 674 | + data3: [{ | ||
| 675 | + // 往年应收账款回款（万元） | ||
| 676 | + cardType: 3, | ||
| 677 | + title: "往年应收账款回款（万元）" | ||
| 678 | + }, { | ||
| 679 | + cardType: 1, | ||
| 680 | + required: true, | ||
| 681 | + title: `${parseInt(this.fiscalYear)-2}财年完成`, | ||
| 682 | + value: "", | ||
| 683 | + key: "newRefundPrevious", | ||
| 684 | + id: "0" | ||
| 685 | + }, { | ||
| 686 | + cardType: 1, | ||
| 687 | + required: true, | ||
| 688 | + title: `${parseInt(this.fiscalYear)-1}财年完成`, | ||
| 689 | + value: "", | ||
| 690 | + key: "newRefundPrevious", | ||
| 691 | + id: "1" | ||
| 692 | + }, { | ||
| 693 | + cardType: 1, | ||
| 694 | + required: true, | ||
| 695 | + title: `${parseInt(this.fiscalYear)}财年预计`, | ||
| 696 | + value: "", | ||
| 697 | + key: "newRefundPrevious", | ||
| 698 | + id: "2" | ||
| 699 | + }, { | ||
| 700 | + cardType: 1, | ||
| 701 | + required: true, | ||
| 702 | + title: `${parseInt(this.fiscalYear)+1}财年预计`, | ||
| 703 | + value: "", | ||
| 704 | + key: "newRefundPrevious", | ||
| 705 | + id: "3" | ||
| 706 | + }, { | ||
| 707 | + cardType: 1, | ||
| 708 | + required: true, | ||
| 709 | + title: `${parseInt(this.fiscalYear)+2}财年预计`, | ||
| 710 | + value: "", | ||
| 711 | + key: "newRefundPrevious", | ||
| 712 | + id: "4" | ||
| 713 | + }, | ||
| 714 | + // 其中：新户（万元） | ||
| 715 | + { | ||
| 716 | + cardType: 3, | ||
| 717 | + title: "其中：新户（万元）" | ||
| 718 | + }, { | ||
| 719 | + cardType: 1, | ||
| 720 | + required: true, | ||
| 721 | + title: `${parseInt(this.fiscalYear)-2}财年完成`, | ||
| 722 | + value: "", | ||
| 723 | + key: "newRefundPreviousNew", | ||
| 724 | + id: "0" | ||
| 725 | + }, { | ||
| 726 | + cardType: 1, | ||
| 27 | required: true, | 727 | required: true, |
| 28 | - title: '用户签约(户)', | 728 | + title: `${parseInt(this.fiscalYear)-1}财年完成`, |
| 729 | + value: "", | ||
| 730 | + key: "newRefundPreviousNew", | ||
| 731 | + id: "1" | ||
| 732 | + }, { | ||
| 733 | + cardType: 1, | ||
| 734 | + required: true, | ||
| 735 | + title: `${parseInt(this.fiscalYear)}财年预计`, | ||
| 736 | + value: "", | ||
| 737 | + key: "newRefundPreviousNew", | ||
| 738 | + id: "2" | ||
| 739 | + }, { | ||
| 740 | + cardType: 1, | ||
| 741 | + required: true, | ||
| 742 | + title: `${parseInt(this.fiscalYear)+1}财年预计`, | ||
| 743 | + value: "", | ||
| 744 | + key: "newRefundPreviousNew", | ||
| 745 | + id: "3" | ||
| 746 | + }, { | ||
| 747 | + cardType: 1, | ||
| 748 | + required: true, | ||
| 749 | + title: `${parseInt(this.fiscalYear)+2}财年预计`, | ||
| 750 | + value: "", | ||
| 751 | + key: "newRefundPreviousNew", | ||
| 752 | + id: "4" | ||
| 753 | + }, | ||
| 754 | + // 其中：老户(万元) | ||
| 755 | + { | ||
| 756 | + cardType: 3, | ||
| 757 | + title: "其中：老户(万元)" | ||
| 758 | + }, { | ||
| 759 | + cardType: 1, | ||
| 760 | + required: true, | ||
| 761 | + title: `${parseInt(this.fiscalYear)-2}财年完成`, | ||
| 762 | + value: "", | ||
| 763 | + key: "newRefundPreviousOld", | ||
| 764 | + id: "0" | ||
| 765 | + }, { | ||
| 766 | + cardType: 1, | ||
| 767 | + required: true, | ||
| 768 | + title: `${parseInt(this.fiscalYear)-1}财年完成`, | ||
| 769 | + value: "", | ||
| 770 | + key: "newRefundPreviousOld", | ||
| 771 | + id: "1" | ||
| 772 | + }, { | ||
| 773 | + cardType: 1, | ||
| 774 | + required: true, | ||
| 775 | + title: `${parseInt(this.fiscalYear)}财年预计`, | ||
| 776 | + value: "", | ||
| 777 | + key: "newRefundPreviousOld", | ||
| 778 | + id: "2" | ||
| 779 | + }, { | ||
| 780 | + cardType: 1, | ||
| 781 | + required: true, | ||
| 782 | + title: `${parseInt(this.fiscalYear)+1}财年预计`, | ||
| 783 | + value: "", | ||
| 784 | + key: "newRefundPreviousOld", | ||
| 785 | + id: "3" | ||
| 786 | + }, { | ||
| 787 | + cardType: 1, | ||
| 788 | + required: true, | ||
| 789 | + title: `${parseInt(this.fiscalYear)+2}财年预计`, | ||
| 790 | + value: "", | ||
| 791 | + key: "newRefundPreviousOld", | ||
| 792 | + id: "4" | ||
| 793 | + }, | ||
| 794 | + // 其中：乡村燃气居民(万元) | ||
| 795 | + { | ||
| 796 | + cardType: 3, | ||
| 797 | + title: "其中：乡村燃气居民(万元)" | ||
| 798 | + }, { | ||
| 799 | + cardType: 1, | ||
| 800 | + required: true, | ||
| 801 | + title: `${parseInt(this.fiscalYear)-2}财年完成`, | ||
| 802 | + value: "", | ||
| 803 | + key: "newRefundPreviousVillage", | ||
| 804 | + id: "0" | ||
| 805 | + }, { | ||
| 806 | + cardType: 1, | ||
| 807 | + required: true, | ||
| 808 | + title: `${parseInt(this.fiscalYear)-1}财年完成`, | ||
| 809 | + value: "", | ||
| 810 | + key: "newRefundPreviousVillage", | ||
| 811 | + id: "1" | ||
| 812 | + }, { | ||
| 813 | + cardType: 1, | ||
| 814 | + required: true, | ||
| 815 | + title: `${parseInt(this.fiscalYear)}财年预计`, | ||
| 816 | + value: "", | ||
| 817 | + key: "newRefundPreviousVillage", | ||
| 818 | + id: "2" | ||
| 819 | + }, { | ||
| 820 | + cardType: 1, | ||
| 821 | + required: true, | ||
| 822 | + title: `${parseInt(this.fiscalYear)+1}财年预计`, | ||
| 823 | + value: "", | ||
| 824 | + key: "newRefundPreviousVillage", | ||
| 825 | + id: "3" | ||
| 826 | + }, { | ||
| 827 | + cardType: 1, | ||
| 828 | + required: true, | ||
| 829 | + title: `${parseInt(this.fiscalYear)+2}财年预计`, | ||
| 830 | + value: "", | ||
| 831 | + key: "newRefundPreviousVillage", | ||
| 832 | + id: "4" | ||
| 833 | + }, | ||
| 834 | + // 其中：政府补贴（含煤改气、壁挂炉、老旧小区改造、运营补贴等）(万元) | ||
| 835 | + { | ||
| 836 | + cardType: 3, | ||
| 837 | + title: "其中：政府补贴（含煤改气、壁挂炉、老旧小区改造、运营补贴等）(万元)" | ||
| 838 | + }, { | ||
| 839 | + cardType: 1, | ||
| 840 | + required: true, | ||
| 841 | + title: `${parseInt(this.fiscalYear)-2}财年完成`, | ||
| 842 | + value: "", | ||
| 843 | + key: "newRefundPreviousGov", | ||
| 844 | + id: "0" | ||
| 845 | + }, { | ||
| 846 | + cardType: 1, | ||
| 847 | + required: true, | ||
| 848 | + title: `${parseInt(this.fiscalYear)-1}财年完成`, | ||
| 849 | + value: "", | ||
| 850 | + key: "newRefundPreviousGov", | ||
| 851 | + id: "1" | ||
| 852 | + }, { | ||
| 853 | + cardType: 1, | ||
| 854 | + required: true, | ||
| 855 | + title: `${parseInt(this.fiscalYear)}财年预计`, | ||
| 856 | + value: "", | ||
| 857 | + key: "newRefundPreviousGov", | ||
| 858 | + id: "2" | ||
| 859 | + }, { | ||
| 860 | + cardType: 1, | ||
| 861 | + required: true, | ||
| 862 | + title: `${parseInt(this.fiscalYear)+1}财年预计`, | ||
| 863 | + value: "", | ||
| 864 | + key: "newRefundPreviousGov", | ||
| 865 | + id: "3" | ||
| 866 | + }, { | ||
| 867 | + cardType: 1, | ||
| 868 | + required: true, | ||
| 869 | + title: `${parseInt(this.fiscalYear)+2}财年预计`, | ||
| 870 | + value: "", | ||
| 871 | + key: "newRefundPreviousGov", | ||
| 872 | + id: "4" | ||
| 873 | + }, | ||
| 874 | + // 其中：工商业安装费(万元) | ||
| 875 | + { | ||
| 876 | + cardType: 3, | ||
| 877 | + title: "其中：工商业安装费(万元)" | ||
| 878 | + }, { | ||
| 879 | + cardType: 1, | ||
| 880 | + required: true, | ||
| 881 | + title: `${parseInt(this.fiscalYear)-2}财年完成`, | ||
| 882 | + value: "", | ||
| 883 | + key: "newRefundPreviousCost", | ||
| 884 | + id: "0" | ||
| 885 | + }, { | ||
| 886 | + cardType: 1, | ||
| 887 | + required: true, | ||
| 888 | + title: `${parseInt(this.fiscalYear)-1}财年完成`, | ||
| 889 | + value: "", | ||
| 890 | + key: "newRefundPreviousCost", | ||
| 891 | + id: "1" | ||
| 892 | + }, { | ||
| 893 | + cardType: 1, | ||
| 894 | + required: true, | ||
| 895 | + title: `${parseInt(this.fiscalYear)}财年预计`, | ||
| 896 | + value: "", | ||
| 897 | + key: "newRefundPreviousCost", | ||
| 898 | + id: "2" | ||
| 899 | + }, { | ||
| 900 | + cardType: 1, | ||
| 901 | + required: true, | ||
| 902 | + title: `${parseInt(this.fiscalYear)+1}财年预计`, | ||
| 903 | + value: "", | ||
| 904 | + key: "newRefundPreviousCost", | ||
| 905 | + id: "3" | ||
| 906 | + }, { | ||
| 907 | + cardType: 1, | ||
| 908 | + required: true, | ||
| 909 | + title: `${parseInt(this.fiscalYear)+2}财年预计`, | ||
| 910 | + value: "", | ||
| 911 | + key: "newRefundPreviousCost", | ||
| 912 | + id: "4" | ||
| 913 | + }, | ||
| 914 | + // 往年燃气费欠款回款(万元) | ||
| 915 | + { | ||
| 916 | + cardType: 3, | ||
| 917 | + title: "往年燃气费欠款回款(万元)" | ||
| 918 | + }, { | ||
| 919 | + cardType: 1, | ||
| 920 | + required: true, | ||
| 921 | + title: `${parseInt(this.fiscalYear)-2}财年完成`, | ||
| 922 | + value: "", | ||
| 923 | + key: "newRefundPreviousArrearage", | ||
| 924 | + id: "0" | ||
| 925 | + }, { | ||
| 926 | + cardType: 1, | ||
| 927 | + required: true, | ||
| 928 | + title: `${parseInt(this.fiscalYear)-1}财年完成`, | ||
| 929 | + value: "", | ||
| 930 | + key: "newRefundPreviousArrearage", | ||
| 931 | + id: "1" | ||
| 932 | + }, { | ||
| 933 | + cardType: 1, | ||
| 934 | + required: true, | ||
| 935 | + title: `${parseInt(this.fiscalYear)}财年预计`, | ||
| 936 | + value: "", | ||
| 937 | + key: "newRefundPreviousArrearage", | ||
| 938 | + id: "2" | ||
| 939 | + }, { | ||
| 940 | + cardType: 1, | ||
| 941 | + required: true, | ||
| 942 | + title: `${parseInt(this.fiscalYear)+1}财年预计`, | ||
| 943 | + value: "", | ||
| 944 | + key: "newRefundPreviousArrearage", | ||
| 945 | + id: "3" | ||
| 946 | + }, { | ||
| 947 | + cardType: 1, | ||
| 948 | + required: true, | ||
| 949 | + title: `${parseInt(this.fiscalYear)+2}财年预计`, | ||
| 950 | + value: "", | ||
| 951 | + key: "newRefundPreviousArrearage", | ||
| 952 | + id: "4" | ||
| 953 | + }, | ||
| 954 | + // 当年安装费回款(万元) | ||
| 955 | + { | ||
| 956 | + cardType: 3, | ||
| 957 | + title: "当年安装费回款(万元)" | ||
| 958 | + }, { | ||
| 959 | + cardType: 1, | ||
| 960 | + required: true, | ||
| 961 | + title: `${parseInt(this.fiscalYear)-2}财年完成`, | ||
| 962 | + value: "", | ||
| 963 | + key: "newRefundThisInstallArrearage", | ||
| 964 | + id: "0" | ||
| 965 | + }, { | ||
| 966 | + cardType: 1, | ||
| 967 | + required: true, | ||
| 968 | + title: `${parseInt(this.fiscalYear)-1}财年完成`, | ||
| 969 | + value: "", | ||
| 970 | + key: "newRefundThisInstallArrearage", | ||
| 971 | + id: "1" | ||
| 972 | + }, { | ||
| 973 | + cardType: 1, | ||
| 974 | + required: true, | ||
| 975 | + title: `${parseInt(this.fiscalYear)}财年预计`, | ||
| 976 | + value: "", | ||
| 977 | + key: "newRefundThisInstallArrearage", | ||
| 978 | + id: "2" | ||
| 979 | + }, { | ||
| 980 | + cardType: 1, | ||
| 981 | + required: true, | ||
| 982 | + title: `${parseInt(this.fiscalYear)+1}财年预计`, | ||
| 983 | + value: "", | ||
| 984 | + key: "newRefundThisInstallArrearage", | ||
| 985 | + id: "3" | ||
| 986 | + }, { | ||
| 987 | + cardType: 1, | ||
| 988 | + required: true, | ||
| 989 | + title: `${parseInt(this.fiscalYear)+2}财年预计`, | ||
| 990 | + value: "", | ||
| 991 | + key: "newRefundThisInstallArrearage", | ||
| 992 | + id: "4" | ||
| 993 | + }, | ||
| 994 | + // 其中：新户(万元) | ||
| 995 | + { | ||
| 996 | + cardType: 3, | ||
| 997 | + title: "其中：新户(万元)" | ||
| 998 | + }, { | ||
| 999 | + cardType: 1, | ||
| 1000 | + required: true, | ||
| 1001 | + title: `${parseInt(this.fiscalYear)-2}财年完成`, | ||
| 1002 | + value: "", | ||
| 1003 | + key: "newRefundThisNew", | ||
| 1004 | + id: "0" | ||
| 1005 | + }, { | ||
| 1006 | + cardType: 1, | ||
| 1007 | + required: true, | ||
| 1008 | + title: `${parseInt(this.fiscalYear)-1}财年完成`, | ||
| 1009 | + value: "", | ||
| 1010 | + key: "newRefundThisNew", | ||
| 1011 | + id: "1" | ||
| 1012 | + }, { | ||
| 1013 | + cardType: 1, | ||
| 1014 | + required: true, | ||
| 1015 | + title: `${parseInt(this.fiscalYear)}财年预计`, | ||
| 1016 | + value: "", | ||
| 1017 | + key: "newRefundThisNew", | ||
| 1018 | + id: "2" | ||
| 1019 | + }, { | ||
| 1020 | + cardType: 1, | ||
| 1021 | + required: true, | ||
| 1022 | + title: `${parseInt(this.fiscalYear)+1}财年预计`, | ||
| 1023 | + value: "", | ||
| 1024 | + key: "newRefundThisNew", | ||
| 1025 | + id: "3" | ||
| 1026 | + }, { | ||
| 1027 | + cardType: 1, | ||
| 1028 | + required: true, | ||
| 1029 | + title: `${parseInt(this.fiscalYear)+2}财年预计`, | ||
| 1030 | + value: "", | ||
| 1031 | + key: "newRefundThisNew", | ||
| 1032 | + id: "4" | ||
| 1033 | + }, | ||
| 1034 | + // 其中：老户(万元) | ||
| 1035 | + { | ||
| 1036 | + cardType: 3, | ||
| 1037 | + title: "其中：老户(万元)" | ||
| 1038 | + }, { | ||
| 1039 | + cardType: 1, | ||
| 1040 | + required: true, | ||
| 1041 | + title: `${parseInt(this.fiscalYear)-2}财年完成`, | ||
| 1042 | + value: "", | ||
| 1043 | + key: "newRefundThisOld", | ||
| 1044 | + id: "0" | ||
| 1045 | + }, { | ||
| 1046 | + cardType: 1, | ||
| 1047 | + required: true, | ||
| 1048 | + title: `${parseInt(this.fiscalYear)-1}财年完成`, | ||
| 1049 | + value: "", | ||
| 1050 | + key: "newRefundThisOld", | ||
| 1051 | + id: "1" | ||
| 1052 | + }, { | ||
| 1053 | + cardType: 1, | ||
| 1054 | + required: true, | ||
| 1055 | + title: `${parseInt(this.fiscalYear)}财年预计`, | ||
| 1056 | + value: "", | ||
| 1057 | + key: "newRefundThisOld", | ||
| 1058 | + id: "2" | ||
| 1059 | + }, { | ||
| 1060 | + cardType: 1, | ||
| 1061 | + required: true, | ||
| 1062 | + title: `${parseInt(this.fiscalYear)+1}财年预计`, | ||
| 1063 | + value: "", | ||
| 1064 | + key: "newRefundThisOld", | ||
| 1065 | + id: "3" | ||
| 1066 | + }, { | ||
| 1067 | + cardType: 1, | ||
| 1068 | + required: true, | ||
| 1069 | + title: `${parseInt(this.fiscalYear)+2}财年预计`, | ||
| 1070 | + value: "", | ||
| 1071 | + key: "newRefundThisOld", | ||
| 1072 | + id: "4" | ||
| 1073 | + }, | ||
| 1074 | + // 其中：乡村燃气居民(万元) | ||
| 1075 | + { | ||
| 1076 | + cardType: 3, | ||
| 1077 | + title: "其中：乡村燃气居民(万元)" | ||
| 1078 | + }, { | ||
| 1079 | + cardType: 1, | ||
| 1080 | + required: true, | ||
| 1081 | + title: `${parseInt(this.fiscalYear)-2}财年完成`, | ||
| 1082 | + value: "", | ||
| 1083 | + key: "newRefundThisVillage", | ||
| 1084 | + id: "0" | ||
| 1085 | + }, { | ||
| 1086 | + cardType: 1, | ||
| 1087 | + required: true, | ||
| 1088 | + title: `${parseInt(this.fiscalYear)-1}财年完成`, | ||
| 1089 | + value: "", | ||
| 1090 | + key: "newRefundThisVillage", | ||
| 1091 | + id: "1" | ||
| 1092 | + }, { | ||
| 1093 | + cardType: 1, | ||
| 1094 | + required: true, | ||
| 1095 | + title: `${parseInt(this.fiscalYear)}财年预计`, | ||
| 1096 | + value: "", | ||
| 1097 | + key: "newRefundThisVillage", | ||
| 1098 | + id: "2" | ||
| 1099 | + }, { | ||
| 1100 | + cardType: 1, | ||
| 1101 | + required: true, | ||
| 1102 | + title: `${parseInt(this.fiscalYear)+1}财年预计`, | ||
| 1103 | + value: "", | ||
| 1104 | + key: "newRefundThisVillage", | ||
| 1105 | + id: "3" | ||
| 1106 | + }, { | ||
| 1107 | + cardType: 1, | ||
| 1108 | + required: true, | ||
| 1109 | + title: `${parseInt(this.fiscalYear)+2}财年预计`, | ||
| 1110 | + value: "", | ||
| 1111 | + key: "newRefundThisVillage", | ||
| 1112 | + id: "4" | ||
| 1113 | + }, | ||
| 1114 | + // 其中：政府补贴（含煤改气、壁挂炉、老旧小区改造、运营补贴等）(万元) | ||
| 1115 | + { | ||
| 1116 | + cardType: 3, | ||
| 1117 | + title: "其中：政府补贴（含煤改气、壁挂炉、老旧小区改造、运营补贴等）(万元)" | ||
| 1118 | + }, { | ||
| 1119 | + cardType: 1, | ||
| 1120 | + required: true, | ||
| 1121 | + title: `${parseInt(this.fiscalYear)-2}财年完成`, | ||
| 1122 | + value: "", | ||
| 1123 | + key: "newRefundThisGov", | ||
| 1124 | + id: "0" | ||
| 1125 | + }, { | ||
| 1126 | + cardType: 1, | ||
| 1127 | + required: true, | ||
| 1128 | + title: `${parseInt(this.fiscalYear)-1}财年完成`, | ||
| 1129 | + value: "", | ||
| 1130 | + key: "newRefundThisGov", | ||
| 1131 | + id: "1" | ||
| 1132 | + }, { | ||
| 1133 | + cardType: 1, | ||
| 1134 | + required: true, | ||
| 1135 | + title: `${parseInt(this.fiscalYear)}财年预计`, | ||
| 1136 | + value: "", | ||
| 1137 | + key: "newRefundThisGov", | ||
| 1138 | + id: "2" | ||
| 1139 | + }, { | ||
| 1140 | + cardType: 1, | ||
| 1141 | + required: true, | ||
| 1142 | + title: `${parseInt(this.fiscalYear)+1}财年预计`, | ||
| 1143 | + value: "", | ||
| 1144 | + key: "newRefundThisGov", | ||
| 1145 | + id: "3" | ||
| 1146 | + }, { | ||
| 1147 | + cardType: 1, | ||
| 1148 | + required: true, | ||
| 1149 | + title: `${parseInt(this.fiscalYear)+2}财年预计`, | ||
| 1150 | + value: "", | ||
| 1151 | + key: "newRefundThisGov", | ||
| 1152 | + id: "4" | ||
| 1153 | + }, | ||
| 1154 | + // 其中：工商业安装费(万元) | ||
| 1155 | + { | ||
| 1156 | + cardType: 3, | ||
| 1157 | + title: "其中：工商业安装费(万元)" | ||
| 1158 | + }, { | ||
| 1159 | + cardType: 1, | ||
| 1160 | + required: true, | ||
| 1161 | + title: `${parseInt(this.fiscalYear)-2}财年完成`, | ||
| 1162 | + value: "", | ||
| 1163 | + key: "newRefundThisIndustry", | ||
| 1164 | + id: "0" | ||
| 1165 | + }, { | ||
| 1166 | + cardType: 1, | ||
| 1167 | + required: true, | ||
| 1168 | + title: `${parseInt(this.fiscalYear)-1}财年完成`, | ||
| 1169 | + value: "", | ||
| 1170 | + key: "newRefundThisIndustry", | ||
| 1171 | + id: "1" | ||
| 1172 | + }, { | ||
| 1173 | + cardType: 1, | ||
| 1174 | + required: true, | ||
| 1175 | + title: `${parseInt(this.fiscalYear)}财年预计`, | ||
| 1176 | + value: "", | ||
| 1177 | + key: "newRefundThisIndustry", | ||
| 1178 | + id: "2" | ||
| 1179 | + }, { | ||
| 1180 | + cardType: 1, | ||
| 1181 | + required: true, | ||
| 1182 | + title: `${parseInt(this.fiscalYear)+1}财年预计`, | ||
| 1183 | + value: "", | ||
| 1184 | + key: "newRefundThisIndustry", | ||
| 1185 | + id: "3" | ||
| 1186 | + }, { | ||
| 1187 | + cardType: 1, | ||
| 1188 | + required: true, | ||
| 1189 | + title: `${parseInt(this.fiscalYear)+2}财年预计`, | ||
| 1190 | + value: "", | ||
| 1191 | + key: "newRefundThisIndustry", | ||
| 1192 | + id: "4" | ||
| 1193 | + }, | ||
| 1194 | + // 当年燃气费回款(万元) | ||
| 1195 | + { | ||
| 1196 | + cardType: 3, | ||
| 1197 | + title: "当年燃气费回款(万元)" | ||
| 1198 | + }, { | ||
| 1199 | + cardType: 1, | ||
| 1200 | + required: true, | ||
| 1201 | + title: `${parseInt(this.fiscalYear)-2}财年完成`, | ||
| 1202 | + value: "", | ||
| 1203 | + key: "newRefundThisGasArrearage", | ||
| 1204 | + id: "0" | ||
| 1205 | + }, { | ||
| 1206 | + cardType: 1, | ||
| 1207 | + required: true, | ||
| 1208 | + title: `${parseInt(this.fiscalYear)-1}财年完成`, | ||
| 1209 | + value: "", | ||
| 1210 | + key: "newRefundThisGasArrearage", | ||
| 1211 | + id: "1" | ||
| 1212 | + }, { | ||
| 1213 | + cardType: 1, | ||
| 1214 | + required: true, | ||
| 1215 | + title: `${parseInt(this.fiscalYear)}财年预计`, | ||
| 1216 | + value: "", | ||
| 1217 | + key: "newRefundThisGasArrearage", | ||
| 1218 | + id: "2" | ||
| 1219 | + }, { | ||
| 1220 | + cardType: 1, | ||
| 1221 | + required: true, | ||
| 1222 | + title: `${parseInt(this.fiscalYear)+1}财年预计`, | ||
| 1223 | + value: "", | ||
| 1224 | + key: "newRefundThisGasArrearage", | ||
| 1225 | + id: "3" | ||
| 1226 | + }, { | ||
| 1227 | + cardType: 1, | ||
| 1228 | + required: true, | ||
| 1229 | + title: `${parseInt(this.fiscalYear)+2}财年预计`, | ||
| 1230 | + value: "", | ||
| 1231 | + key: "newRefundThisGasArrearage", | ||
| 1232 | + id: "4" | ||
| 1233 | + }, | ||
| 1234 | + ], | ||
| 1235 | + data4: [{ | ||
| 1236 | + // 零售气量（万方） | ||
| 1237 | + cardType: 3, | ||
| 1238 | + title: "零售气量（万方）" | ||
| 1239 | + }, { | ||
| 1240 | + cardType: 1, | ||
| 1241 | + required: true, | ||
| 1242 | + title: `${parseInt(this.fiscalYear)-2}财年完成`, | ||
| 1243 | + value: "", | ||
| 1244 | + key: "newSell", | ||
| 1245 | + id: "0" | ||
| 1246 | + }, { | ||
| 1247 | + cardType: 1, | ||
| 1248 | + required: true, | ||
| 1249 | + title: `${parseInt(this.fiscalYear)-1}财年完成`, | ||
| 1250 | + value: "", | ||
| 1251 | + key: "newSell", | ||
| 1252 | + id: "1" | ||
| 1253 | + }, { | ||
| 1254 | + cardType: 1, | ||
| 1255 | + required: true, | ||
| 1256 | + title: `${parseInt(this.fiscalYear)}财年预计`, | ||
| 1257 | + value: "", | ||
| 1258 | + key: "newSell", | ||
| 1259 | + id: "2" | ||
| 1260 | + }, { | ||
| 1261 | + cardType: 1, | ||
| 1262 | + required: true, | ||
| 1263 | + title: `${parseInt(this.fiscalYear)+1}财年预计`, | ||
| 1264 | + value: "", | ||
| 1265 | + key: "newSell", | ||
| 1266 | + id: "3" | ||
| 1267 | + }, { | ||
| 1268 | + cardType: 1, | ||
| 1269 | + required: true, | ||
| 1270 | + title: `${parseInt(this.fiscalYear)+2}财年预计`, | ||
| 1271 | + value: "", | ||
| 1272 | + key: "newSell", | ||
| 1273 | + id: "4" | ||
| 1274 | + }, | ||
| 1275 | + // 民用户销售气量（万方） | ||
| 1276 | + { | ||
| 1277 | + cardType: 3, | ||
| 1278 | + title: "民用户销售气量（万方）" | ||
| 1279 | + }, { | ||
| 1280 | + cardType: 1, | ||
| 1281 | + required: true, | ||
| 1282 | + title: `${parseInt(this.fiscalYear)-2}财年完成`, | ||
| 1283 | + value: "", | ||
| 1284 | + key: "newSellResident", | ||
| 1285 | + id: "0" | ||
| 1286 | + }, { | ||
| 1287 | + cardType: 1, | ||
| 1288 | + required: true, | ||
| 1289 | + title: `${parseInt(this.fiscalYear)-1}财年完成`, | ||
| 1290 | + value: "", | ||
| 1291 | + key: "newSellResident", | ||
| 1292 | + id: "1" | ||
| 1293 | + }, { | ||
| 1294 | + cardType: 1, | ||
| 1295 | + required: true, | ||
| 1296 | + title: `${parseInt(this.fiscalYear)}财年预计`, | ||
| 1297 | + value: "", | ||
| 1298 | + key: "newSellResident", | ||
| 1299 | + id: "2" | ||
| 1300 | + }, { | ||
| 1301 | + cardType: 1, | ||
| 1302 | + required: true, | ||
| 1303 | + title: `${parseInt(this.fiscalYear)+1}财年预计`, | ||
| 1304 | + value: "", | ||
| 1305 | + key: "newSellResident", | ||
| 1306 | + id: "3" | ||
| 1307 | + }, { | ||
| 1308 | + cardType: 1, | ||
| 1309 | + required: true, | ||
| 1310 | + title: `${parseInt(this.fiscalYear)+2}财年预计`, | ||
| 1311 | + value: "", | ||
| 1312 | + key: "newSellResident", | ||
| 1313 | + id: "4" | ||
| 1314 | + }, | ||
| 1315 | + // 其中：民用采暖(万方) | ||
| 1316 | + { | ||
| 1317 | + cardType: 3, | ||
| 1318 | + title: "其中：民用采暖(万方)" | ||
| 1319 | + }, { | ||
| 1320 | + cardType: 1, | ||
| 1321 | + required: true, | ||
| 1322 | + title: `${parseInt(this.fiscalYear)-2}财年完成`, | ||
| 1323 | + value: "", | ||
| 1324 | + key: "newSellHeating", | ||
| 1325 | + id: "0" | ||
| 1326 | + }, { | ||
| 1327 | + cardType: 1, | ||
| 1328 | + required: true, | ||
| 1329 | + title: `${parseInt(this.fiscalYear)-1}财年完成`, | ||
| 1330 | + value: "", | ||
| 1331 | + key: "newSellHeating", | ||
| 1332 | + id: "1" | ||
| 1333 | + }, { | ||
| 1334 | + cardType: 1, | ||
| 1335 | + required: true, | ||
| 1336 | + title: `${parseInt(this.fiscalYear)}财年预计`, | ||
| 1337 | + value: "", | ||
| 1338 | + key: "newSellHeating", | ||
| 1339 | + id: "2" | ||
| 1340 | + }, { | ||
| 1341 | + cardType: 1, | ||
| 1342 | + required: true, | ||
| 1343 | + title: `${parseInt(this.fiscalYear)+1}财年预计`, | ||
| 1344 | + value: "", | ||
| 1345 | + key: "newSellHeating", | ||
| 1346 | + id: "3" | ||
| 1347 | + }, { | ||
| 1348 | + cardType: 1, | ||
| 1349 | + required: true, | ||
| 1350 | + title: `${parseInt(this.fiscalYear)+2}财年预计`, | ||
| 1351 | + value: "", | ||
| 1352 | + key: "newSellHeating", | ||
| 1353 | + id: "4" | ||
| 1354 | + }, | ||
| 1355 | + // 工业户销售气量(万方) | ||
| 1356 | + { | ||
| 1357 | + cardType: 3, | ||
| 1358 | + title: "工业户销售气量(万方)" | ||
| 1359 | + }, { | ||
| 1360 | + cardType: 1, | ||
| 1361 | + required: true, | ||
| 1362 | + title: `${parseInt(this.fiscalYear)-2}财年完成`, | ||
| 1363 | + value: "", | ||
| 1364 | + key: "newSellIndustry", | ||
| 1365 | + id: "0" | ||
| 1366 | + }, { | ||
| 1367 | + cardType: 1, | ||
| 1368 | + required: true, | ||
| 1369 | + title: `${parseInt(this.fiscalYear)-1}财年完成`, | ||
| 1370 | + value: "", | ||
| 1371 | + key: "newSellIndustry", | ||
| 1372 | + id: "1" | ||
| 1373 | + }, { | ||
| 1374 | + cardType: 1, | ||
| 1375 | + required: true, | ||
| 1376 | + title: `${parseInt(this.fiscalYear)}财年预计`, | ||
| 1377 | + value: "", | ||
| 1378 | + key: "newSellIndustry", | ||
| 1379 | + id: "2" | ||
| 1380 | + }, { | ||
| 1381 | + cardType: 1, | ||
| 1382 | + required: true, | ||
| 1383 | + title: `${parseInt(this.fiscalYear)+1}财年预计`, | ||
| 1384 | + value: "", | ||
| 1385 | + key: "newSellIndustry", | ||
| 1386 | + id: "3" | ||
| 1387 | + }, { | ||
| 1388 | + cardType: 1, | ||
| 1389 | + required: true, | ||
| 1390 | + title: `${parseInt(this.fiscalYear)+2}财年预计`, | ||
| 1391 | + value: "", | ||
| 1392 | + key: "newSellIndustry", | ||
| 1393 | + id: "4" | ||
| 1394 | + }, | ||
| 1395 | + // 商福户销售气量(万方) | ||
| 1396 | + { | ||
| 1397 | + cardType: 3, | ||
| 1398 | + title: "商福户销售气量(万方)" | ||
| 1399 | + }, { | ||
| 1400 | + cardType: 1, | ||
| 1401 | + required: true, | ||
| 1402 | + title: `${parseInt(this.fiscalYear)-2}财年完成`, | ||
| 1403 | + value: "", | ||
| 1404 | + key: "newSellCommerce", | ||
| 1405 | + id: "0" | ||
| 1406 | + }, { | ||
| 1407 | + cardType: 1, | ||
| 1408 | + required: true, | ||
| 1409 | + title: `${parseInt(this.fiscalYear)-1}财年完成`, | ||
| 1410 | + value: "", | ||
| 1411 | + key: "newSellCommerce", | ||
| 1412 | + id: "1" | ||
| 1413 | + }, { | ||
| 1414 | + cardType: 1, | ||
| 1415 | + required: true, | ||
| 1416 | + title: `${parseInt(this.fiscalYear)}财年预计`, | ||
| 1417 | + value: "", | ||
| 1418 | + key: "newSellCommerce", | ||
| 1419 | + id: "2" | ||
| 1420 | + }, { | ||
| 1421 | + cardType: 1, | ||
| 1422 | + required: true, | ||
| 1423 | + title: `${parseInt(this.fiscalYear)+1}财年预计`, | ||
| 1424 | + value: "", | ||
| 1425 | + key: "newSellCommerce", | ||
| 1426 | + id: "3" | ||
| 1427 | + }, { | ||
| 1428 | + cardType: 1, | ||
| 1429 | + required: true, | ||
| 1430 | + title: `${parseInt(this.fiscalYear)+2}财年预计`, | ||
| 1431 | + value: "", | ||
| 1432 | + key: "newSellCommerce", | ||
| 1433 | + id: "4" | ||
| 1434 | + }, | ||
| 1435 | + // CNG加气量(万方) | ||
| 1436 | + { | ||
| 1437 | + cardType: 3, | ||
| 1438 | + title: "CNG加气量(万方)" | ||
| 1439 | + }, { | ||
| 1440 | + cardType: 1, | ||
| 1441 | + required: true, | ||
| 1442 | + title: `${parseInt(this.fiscalYear)-2}财年完成`, | ||
| 1443 | + value: "", | ||
| 1444 | + key: "newSellCng", | ||
| 1445 | + id: "0" | ||
| 1446 | + }, { | ||
| 1447 | + cardType: 1, | ||
| 1448 | + required: true, | ||
| 1449 | + title: `${parseInt(this.fiscalYear)-1}财年完成`, | ||
| 1450 | + value: "", | ||
| 1451 | + key: "newSellCng", | ||
| 1452 | + id: "1" | ||
| 1453 | + }, { | ||
| 1454 | + cardType: 1, | ||
| 1455 | + required: true, | ||
| 1456 | + title: `${parseInt(this.fiscalYear)}财年预计`, | ||
| 1457 | + value: "", | ||
| 1458 | + key: "newSellCng", | ||
| 1459 | + id: "2" | ||
| 1460 | + }, { | ||
| 1461 | + cardType: 1, | ||
| 1462 | + required: true, | ||
| 1463 | + title: `${parseInt(this.fiscalYear)+1}财年预计`, | ||
| 1464 | + value: "", | ||
| 1465 | + key: "newSellCng", | ||
| 1466 | + id: "3" | ||
| 1467 | + }, { | ||
| 1468 | + cardType: 1, | ||
| 1469 | + required: true, | ||
| 1470 | + title: `${parseInt(this.fiscalYear)+2}财年预计`, | ||
| 1471 | + value: "", | ||
| 1472 | + key: "newSellCng", | ||
| 1473 | + id: "4" | ||
| 1474 | + }, | ||
| 1475 | + // LNG加气量(万方) | ||
| 1476 | + { | ||
| 1477 | + cardType: 3, | ||
| 1478 | + title: "LNG加气量(万方)" | ||
| 1479 | + }, { | ||
| 1480 | + cardType: 1, | ||
| 1481 | + required: true, | ||
| 1482 | + title: `${parseInt(this.fiscalYear)-2}财年完成`, | ||
| 1483 | + value: "", | ||
| 1484 | + key: "newSellLng", | ||
| 1485 | + id: "0" | ||
| 1486 | + }, { | ||
| 1487 | + cardType: 1, | ||
| 1488 | + required: true, | ||
| 1489 | + title: `${parseInt(this.fiscalYear)-1}财年完成`, | ||
| 1490 | + value: "", | ||
| 1491 | + key: "newSellLng", | ||
| 1492 | + id: "1" | ||
| 1493 | + }, { | ||
| 1494 | + cardType: 1, | ||
| 1495 | + required: true, | ||
| 1496 | + title: `${parseInt(this.fiscalYear)}财年预计`, | ||
| 1497 | + value: "", | ||
| 1498 | + key: "newSellLng", | ||
| 1499 | + id: "2" | ||
| 1500 | + }, { | ||
| 1501 | + cardType: 1, | ||
| 1502 | + required: true, | ||
| 1503 | + title: `${parseInt(this.fiscalYear)+1}财年预计`, | ||
| 1504 | + value: "", | ||
| 1505 | + key: "newSellLng", | ||
| 1506 | + id: "3" | ||
| 1507 | + }, { | ||
| 1508 | + cardType: 1, | ||
| 1509 | + required: true, | ||
| 1510 | + title: `${parseInt(this.fiscalYear)+2}财年预计`, | ||
| 1511 | + value: "", | ||
| 1512 | + key: "newSellLng", | ||
| 1513 | + id: "4" | ||
| 1514 | + }, | ||
| 1515 | + // 母站销气量(万方) | ||
| 1516 | + { | ||
| 1517 | + cardType: 3, | ||
| 1518 | + title: "母站销气量(万方)" | ||
| 1519 | + }, { | ||
| 1520 | + cardType: 1, | ||
| 1521 | + required: true, | ||
| 1522 | + title: `${parseInt(this.fiscalYear)-2}财年完成`, | ||
| 1523 | + value: "", | ||
| 1524 | + key: "newSellStation", | ||
| 1525 | + id: "0" | ||
| 1526 | + }, { | ||
| 1527 | + cardType: 1, | ||
| 1528 | + required: true, | ||
| 1529 | + title: `${parseInt(this.fiscalYear)-1}财年完成`, | ||
| 1530 | + value: "", | ||
| 1531 | + key: "newSellStation", | ||
| 1532 | + id: "1" | ||
| 1533 | + }, { | ||
| 1534 | + cardType: 1, | ||
| 1535 | + required: true, | ||
| 1536 | + title: `${parseInt(this.fiscalYear)}财年预计`, | ||
| 1537 | + value: "", | ||
| 1538 | + key: "newSellStation", | ||
| 1539 | + id: "2" | ||
| 1540 | + }, { | ||
| 1541 | + cardType: 1, | ||
| 1542 | + required: true, | ||
| 1543 | + title: `${parseInt(this.fiscalYear)+1}财年预计`, | ||
| 1544 | + value: "", | ||
| 1545 | + key: "newSellStation", | ||
| 1546 | + id: "3" | ||
| 1547 | + }, { | ||
| 1548 | + cardType: 1, | ||
| 1549 | + required: true, | ||
| 1550 | + title: `${parseInt(this.fiscalYear)+2}财年预计`, | ||
| 1551 | + value: "", | ||
| 1552 | + key: "newSellStation", | ||
| 1553 | + id: "4" | ||
| 1554 | + }, | ||
| 1555 | + // 批发气量（管输）(万方) | ||
| 1556 | + { | ||
| 1557 | + cardType: 3, | ||
| 1558 | + title: "批发气量（管输）(万方)" | ||
| 1559 | + }, { | ||
| 1560 | + cardType: 1, | ||
| 1561 | + required: true, | ||
| 1562 | + title: `${parseInt(this.fiscalYear)-2}财年完成`, | ||
| 1563 | + value: "", | ||
| 1564 | + key: "newSellWholesale", | ||
| 1565 | + id: "0" | ||
| 1566 | + }, { | ||
| 1567 | + cardType: 1, | ||
| 1568 | + required: true, | ||
| 1569 | + title: `${parseInt(this.fiscalYear)-1}财年完成`, | ||
| 1570 | + value: "", | ||
| 1571 | + key: "newSellWholesale", | ||
| 1572 | + id: "1" | ||
| 1573 | + }, { | ||
| 1574 | + cardType: 1, | ||
| 1575 | + required: true, | ||
| 1576 | + title: `${parseInt(this.fiscalYear)}财年预计`, | ||
| 1577 | + value: "", | ||
| 1578 | + key: "newSellWholesale", | ||
| 1579 | + id: "2" | ||
| 1580 | + }, { | ||
| 1581 | + cardType: 1, | ||
| 1582 | + required: true, | ||
| 1583 | + title: `${parseInt(this.fiscalYear)+1}财年预计`, | ||
| 1584 | + value: "", | ||
| 1585 | + key: "newSellWholesale", | ||
| 1586 | + id: "3" | ||
| 1587 | + }, { | ||
| 1588 | + cardType: 1, | ||
| 1589 | + required: true, | ||
| 1590 | + title: `${parseInt(this.fiscalYear)+2}财年预计`, | ||
| 1591 | + value: "", | ||
| 1592 | + key: "newSellWholesale", | ||
| 1593 | + id: "4" | ||
| 1594 | + }, | ||
| 1595 | + // 贸易气量(万方) | ||
| 1596 | + { | ||
| 1597 | + cardType: 3, | ||
| 1598 | + title: "贸易气量(万方)" | ||
| 1599 | + }, { | ||
| 1600 | + cardType: 1, | ||
| 1601 | + required: true, | ||
| 1602 | + title: `${parseInt(this.fiscalYear)-2}财年完成`, | ||
| 1603 | + value: "", | ||
| 1604 | + key: "newSellTrade", | ||
| 1605 | + id: "0" | ||
| 1606 | + }, { | ||
| 1607 | + cardType: 1, | ||
| 1608 | + required: true, | ||
| 1609 | + title: `${parseInt(this.fiscalYear)-1}财年完成`, | ||
| 1610 | + value: "", | ||
| 1611 | + key: "newSellTrade", | ||
| 1612 | + id: "1" | ||
| 1613 | + }, { | ||
| 1614 | + cardType: 1, | ||
| 1615 | + required: true, | ||
| 1616 | + title: `${parseInt(this.fiscalYear)}财年预计`, | ||
| 1617 | + value: "", | ||
| 1618 | + key: "newSellTrade", | ||
| 1619 | + id: "2" | ||
| 1620 | + }, { | ||
| 1621 | + cardType: 1, | ||
| 1622 | + required: true, | ||
| 1623 | + title: `${parseInt(this.fiscalYear)+1}财年预计`, | ||
| 1624 | + value: "", | ||
| 1625 | + key: "newSellTrade", | ||
| 1626 | + id: "3" | ||
| 1627 | + }, { | ||
| 1628 | + cardType: 1, | ||
| 1629 | + required: true, | ||
| 1630 | + title: `${parseInt(this.fiscalYear)+2}财年预计`, | ||
| 1631 | + value: "", | ||
| 1632 | + key: "newSellTrade", | ||
| 1633 | + id: "4" | ||
| 1634 | + }, | ||
| 1635 | + // 管道气贸易气量(万方) | ||
| 1636 | + { | ||
| 1637 | + cardType: 3, | ||
| 1638 | + title: "管道气贸易气量(万方)" | ||
| 1639 | + }, { | ||
| 1640 | + cardType: 1, | ||
| 1641 | + required: true, | ||
| 1642 | + title: `${parseInt(this.fiscalYear)-2}财年完成`, | ||
| 1643 | + value: "", | ||
| 1644 | + key: "newSellConduit", | ||
| 1645 | + id: "0" | ||
| 1646 | + }, { | ||
| 1647 | + cardType: 1, | ||
| 1648 | + required: true, | ||
| 1649 | + title: `${parseInt(this.fiscalYear)-1}财年完成`, | ||
| 1650 | + value: "", | ||
| 1651 | + key: "newSellConduit", | ||
| 1652 | + id: "1" | ||
| 1653 | + }, { | ||
| 1654 | + cardType: 1, | ||
| 1655 | + required: true, | ||
| 1656 | + title: `${parseInt(this.fiscalYear)}财年预计`, | ||
| 1657 | + value: "", | ||
| 1658 | + key: "newSellConduit", | ||
| 1659 | + id: "2" | ||
| 1660 | + }, { | ||
| 1661 | + cardType: 1, | ||
| 1662 | + required: true, | ||
| 1663 | + title: `${parseInt(this.fiscalYear)+1}财年预计`, | ||
| 1664 | + value: "", | ||
| 1665 | + key: "newSellConduit", | ||
| 1666 | + id: "3" | ||
| 1667 | + }, { | ||
| 1668 | + cardType: 1, | ||
| 1669 | + required: true, | ||
| 1670 | + title: `${parseInt(this.fiscalYear)+2}财年预计`, | ||
| 1671 | + value: "", | ||
| 1672 | + key: "newSellConduit", | ||
| 1673 | + id: "4" | ||
| 1674 | + }, | ||
| 1675 | + // LNG贸易气量(万方) | ||
| 1676 | + { | ||
| 1677 | + cardType: 3, | ||
| 1678 | + title: "LNG贸易气量(万方)" | ||
| 1679 | + }, { | ||
| 1680 | + cardType: 1, | ||
| 1681 | + required: true, | ||
| 1682 | + title: `${parseInt(this.fiscalYear)-2}财年完成`, | ||
| 1683 | + value: "", | ||
| 1684 | + key: "newSellLngTrade", | ||
| 1685 | + id: "0" | ||
| 1686 | + }, { | ||
| 1687 | + cardType: 1, | ||
| 1688 | + required: true, | ||
| 1689 | + title: `${parseInt(this.fiscalYear)-1}财年完成`, | ||
| 1690 | + value: "", | ||
| 1691 | + key: "newSellLngTrade", | ||
| 1692 | + id: "1" | ||
| 1693 | + }, { | ||
| 1694 | + cardType: 1, | ||
| 1695 | + required: true, | ||
| 1696 | + title: `${parseInt(this.fiscalYear)}财年预计`, | ||
| 1697 | + value: "", | ||
| 1698 | + key: "newSellLngTrade", | ||
| 1699 | + id: "2" | ||
| 1700 | + }, { | ||
| 1701 | + cardType: 1, | ||
| 1702 | + required: true, | ||
| 1703 | + title: `${parseInt(this.fiscalYear)+1}财年预计`, | ||
| 1704 | + value: "", | ||
| 1705 | + key: "newSellLngTrade", | ||
| 1706 | + id: "3" | ||
| 1707 | + }, { | ||
| 1708 | + cardType: 1, | ||
| 1709 | + required: true, | ||
| 1710 | + title: `${parseInt(this.fiscalYear)+2}财年预计`, | ||
| 1711 | + value: "", | ||
| 1712 | + key: "newSellLngTrade", | ||
| 1713 | + id: "4" | ||
| 29 | }, | 1714 | }, |
| 1715 | + ], | ||
| 1716 | + data5: [ | ||
| 1717 | + // 综合销气毛差（元/方） | ||
| 30 | { | 1718 | { |
| 1719 | + cardType: 3, | ||
| 1720 | + title: "综合销气毛差（元/方）" | ||
| 1721 | + }, { | ||
| 31 | cardType: 1, | 1722 | cardType: 1, |
| 32 | required: true, | 1723 | required: true, |
| 33 | - title: `${this.fiscalYear}财年目标`, | 1724 | + title: `${parseInt(this.fiscalYear)-2}财年完成`, |
| 34 | value: "", | 1725 | value: "", |
| 35 | - key: "contractGoal", | 1726 | + key: "newBalanceSell", |
| 36 | id: "0" | 1727 | id: "0" |
| 37 | - }, | ||
| 38 | - { | 1728 | + }, { |
| 39 | cardType: 1, | 1729 | cardType: 1, |
| 40 | required: true, | 1730 | required: true, |
| 41 | - title: `${parseInt(this.fiscalYear)+1}财年目标`, | 1731 | + title: `${parseInt(this.fiscalYear)-1}财年完成`, |
| 42 | value: "", | 1732 | value: "", |
| 43 | - key: "contractGoal", | 1733 | + key: "newBalanceSell", |
| 44 | id: "1" | 1734 | id: "1" |
| 45 | - }, | ||
| 46 | - { | 1735 | + }, { |
| 47 | cardType: 1, | 1736 | cardType: 1, |
| 48 | required: true, | 1737 | required: true, |
| 49 | - title: `${parseInt(this.fiscalYear)+2}财年目标`, | 1738 | + title: `${parseInt(this.fiscalYear)}财年预计`, |
| 50 | value: "", | 1739 | value: "", |
| 51 | - key: "contractGoal", | 1740 | + key: "newBalanceSell", |
| 52 | id: "2" | 1741 | id: "2" |
| 1742 | + }, { | ||
| 1743 | + cardType: 1, | ||
| 1744 | + required: true, | ||
| 1745 | + title: `${parseInt(this.fiscalYear)+1}财年预计`, | ||
| 1746 | + value: "", | ||
| 1747 | + key: "newBalanceSell", | ||
| 1748 | + id: "3" | ||
| 1749 | + }, { | ||
| 1750 | + cardType: 1, | ||
| 1751 | + required: true, | ||
| 1752 | + title: `${parseInt(this.fiscalYear)+2}财年预计`, | ||
| 1753 | + value: "", | ||
| 1754 | + key: "newBalanceSell", | ||
| 1755 | + id: "4" | ||
| 53 | }, | 1756 | }, |
| 1757 | + // 其中：居民（元/方） | ||
| 54 | { | 1758 | { |
| 55 | cardType: 3, | 1759 | cardType: 3, |
| 1760 | + title: "其中：居民（元/方）" | ||
| 1761 | + }, { | ||
| 1762 | + cardType: 1, | ||
| 1763 | + required: true, | ||
| 1764 | + title: `${parseInt(this.fiscalYear)-2}财年完成`, | ||
| 1765 | + value: "", | ||
| 1766 | + key: "newBalanceResident", | ||
| 1767 | + id: "0" | ||
| 1768 | + }, { | ||
| 1769 | + cardType: 1, | ||
| 1770 | + required: true, | ||
| 1771 | + title: `${parseInt(this.fiscalYear)-1}财年完成`, | ||
| 1772 | + value: "", | ||
| 1773 | + key: "newBalanceResident", | ||
| 1774 | + id: "1" | ||
| 1775 | + }, { | ||
| 1776 | + cardType: 1, | ||
| 1777 | + required: true, | ||
| 1778 | + title: `${parseInt(this.fiscalYear)}财年预计`, | ||
| 1779 | + value: "", | ||
| 1780 | + key: "newBalanceResident", | ||
| 1781 | + id: "2" | ||
| 1782 | + }, { | ||
| 1783 | + cardType: 1, | ||
| 1784 | + required: true, | ||
| 1785 | + title: `${parseInt(this.fiscalYear)+1}财年预计`, | ||
| 1786 | + value: "", | ||
| 1787 | + key: "newBalanceResident", | ||
| 1788 | + id: "3" | ||
| 1789 | + }, { | ||
| 1790 | + cardType: 1, | ||
| 56 | required: true, | 1791 | required: true, |
| 57 | - title: '新户(户)', | 1792 | + title: `${parseInt(this.fiscalYear)+2}财年预计`, |
| 1793 | + value: "", | ||
| 1794 | + key: "newBalanceResident", | ||
| 1795 | + id: "4" | ||
| 58 | }, | 1796 | }, |
| 1797 | + // 其中：非居民(元/方) | ||
| 59 | { | 1798 | { |
| 1799 | + cardType: 3, | ||
| 1800 | + title: "其中：非居民(元/方)" | ||
| 1801 | + }, { | ||
| 60 | cardType: 1, | 1802 | cardType: 1, |
| 61 | required: true, | 1803 | required: true, |
| 62 | - title: `${this.fiscalYear}财年目标`, | 1804 | + title: `${parseInt(this.fiscalYear)-2}财年完成`, |
| 63 | value: "", | 1805 | value: "", |
| 64 | - key: "newUserGoal", | 1806 | + key: "newBalanceNoResident", |
| 65 | id: "0" | 1807 | id: "0" |
| 66 | - }, | ||
| 67 | - { | 1808 | + }, { |
| 68 | cardType: 1, | 1809 | cardType: 1, |
| 69 | required: true, | 1810 | required: true, |
| 70 | - title: `${parseInt(this.fiscalYear)+1}财年目标`, | 1811 | + title: `${parseInt(this.fiscalYear)-1}财年完成`, |
| 71 | value: "", | 1812 | value: "", |
| 72 | - key: "newUserGoal", | 1813 | + key: "newBalanceNoResident", |
| 73 | id: "1" | 1814 | id: "1" |
| 74 | - }, | ||
| 75 | - { | 1815 | + }, { |
| 76 | cardType: 1, | 1816 | cardType: 1, |
| 77 | required: true, | 1817 | required: true, |
| 78 | - title: `${parseInt(this.fiscalYear)+2}财年目标`, | 1818 | + title: `${parseInt(this.fiscalYear)}财年预计`, |
| 79 | value: "", | 1819 | value: "", |
| 80 | - key: "newUserGoal", | 1820 | + key: "newBalanceNoResident", |
| 81 | id: "2" | 1821 | id: "2" |
| 1822 | + }, { | ||
| 1823 | + cardType: 1, | ||
| 1824 | + required: true, | ||
| 1825 | + title: `${parseInt(this.fiscalYear)+1}财年预计`, | ||
| 1826 | + value: "", | ||
| 1827 | + key: "newBalanceNoResident", | ||
| 1828 | + id: "3" | ||
| 1829 | + }, { | ||
| 1830 | + cardType: 1, | ||
| 1831 | + required: true, | ||
| 1832 | + title: `${parseInt(this.fiscalYear)+2}财年预计`, | ||
| 1833 | + value: "", | ||
| 1834 | + key: "newBalanceNoResident", | ||
| 1835 | + id: "4" | ||
| 82 | }, | 1836 | }, |
| 83 | - | 1837 | + // 其中：批发及其他(元/方) |
| 84 | { | 1838 | { |
| 85 | cardType: 3, | 1839 | cardType: 3, |
| 1840 | + title: "其中：批发及其他(元/方)" | ||
| 1841 | + }, { | ||
| 1842 | + cardType: 1, | ||
| 1843 | + required: true, | ||
| 1844 | + title: `${parseInt(this.fiscalYear)-2}财年完成`, | ||
| 1845 | + value: "", | ||
| 1846 | + key: "newBalanceWholesale", | ||
| 1847 | + id: "0" | ||
| 1848 | + }, { | ||
| 1849 | + cardType: 1, | ||
| 1850 | + required: true, | ||
| 1851 | + title: `${parseInt(this.fiscalYear)-1}财年完成`, | ||
| 1852 | + value: "", | ||
| 1853 | + key: "newBalanceWholesale", | ||
| 1854 | + id: "1" | ||
| 1855 | + }, { | ||
| 1856 | + cardType: 1, | ||
| 1857 | + required: true, | ||
| 1858 | + title: `${parseInt(this.fiscalYear)}财年预计`, | ||
| 1859 | + value: "", | ||
| 1860 | + key: "newBalanceWholesale", | ||
| 1861 | + id: "2" | ||
| 1862 | + }, { | ||
| 1863 | + cardType: 1, | ||
| 1864 | + required: true, | ||
| 1865 | + title: `${parseInt(this.fiscalYear)+1}财年预计`, | ||
| 1866 | + value: "", | ||
| 1867 | + key: "newBalanceWholesale", | ||
| 1868 | + id: "3" | ||
| 1869 | + }, { | ||
| 1870 | + cardType: 1, | ||
| 86 | required: true, | 1871 | required: true, |
| 87 | - title: '老户(户)', | 1872 | + title: `${parseInt(this.fiscalYear)+2}财年预计`, |
| 1873 | + value: "", | ||
| 1874 | + key: "newBalanceWholesale", | ||
| 1875 | + id: "4" | ||
| 88 | }, | 1876 | }, |
| 89 | - { | 1877 | + ], |
| 1878 | + data6: [{ | ||
| 1879 | + // 安装毛利（万元） | ||
| 1880 | + cardType: 3, | ||
| 1881 | + title: "安装毛利（万元）" | ||
| 1882 | + }, { | ||
| 90 | cardType: 1, | 1883 | cardType: 1, |
| 91 | required: true, | 1884 | required: true, |
| 92 | - title: `${this.fiscalYear}财年目标`, | 1885 | + title: `${parseInt(this.fiscalYear)-2}财年完成`, |
| 93 | value: "", | 1886 | value: "", |
| 94 | - key: "oldUserGoal", | 1887 | + key: "newProfitInstall", |
| 95 | id: "0" | 1888 | id: "0" |
| 96 | - }, | ||
| 97 | - { | 1889 | + }, { |
| 98 | cardType: 1, | 1890 | cardType: 1, |
| 99 | required: true, | 1891 | required: true, |
| 100 | - title: `${parseInt(this.fiscalYear)+1}财年目标`, | 1892 | + title: `${parseInt(this.fiscalYear)-1}财年完成`, |
| 101 | value: "", | 1893 | value: "", |
| 102 | - key: "oldUserGoal", | 1894 | + key: "newProfitInstall", |
| 103 | id: "1" | 1895 | id: "1" |
| 104 | - }, | ||
| 105 | - { | 1896 | + }, { |
| 106 | cardType: 1, | 1897 | cardType: 1, |
| 107 | required: true, | 1898 | required: true, |
| 108 | - title: `${parseInt(this.fiscalYear)+2}财年目标`, | 1899 | + title: `${parseInt(this.fiscalYear)}财年预计`, |
| 109 | value: "", | 1900 | value: "", |
| 110 | - key: "oldUserGoal", | 1901 | + key: "newProfitInstall", |
| 111 | id: "2" | 1902 | id: "2" |
| 1903 | + }, { | ||
| 1904 | + cardType: 1, | ||
| 1905 | + required: true, | ||
| 1906 | + title: `${parseInt(this.fiscalYear)+1}财年预计`, | ||
| 1907 | + value: "", | ||
| 1908 | + key: "newProfitInstall", | ||
| 1909 | + id: "3" | ||
| 1910 | + }, { | ||
| 1911 | + cardType: 1, | ||
| 1912 | + required: true, | ||
| 1913 | + title: `${parseInt(this.fiscalYear)+2}财年预计`, | ||
| 1914 | + value: "", | ||
| 1915 | + key: "newProfitInstall", | ||
| 1916 | + id: "4" | ||
| 112 | }, | 1917 | }, |
| 113 | - | 1918 | + // 居民接驳毛利（万元） |
| 114 | { | 1919 | { |
| 115 | cardType: 3, | 1920 | cardType: 3, |
| 1921 | + title: "居民接驳毛利（万元）" | ||
| 1922 | + }, { | ||
| 1923 | + cardType: 1, | ||
| 1924 | + required: true, | ||
| 1925 | + title: `${parseInt(this.fiscalYear)-2}财年完成`, | ||
| 1926 | + value: "", | ||
| 1927 | + key: "newProfitInstallResident", | ||
| 1928 | + id: "0" | ||
| 1929 | + }, { | ||
| 1930 | + cardType: 1, | ||
| 1931 | + required: true, | ||
| 1932 | + title: `${parseInt(this.fiscalYear)-1}财年完成`, | ||
| 1933 | + value: "", | ||
| 1934 | + key: "newProfitInstallResident", | ||
| 1935 | + id: "1" | ||
| 1936 | + }, { | ||
| 1937 | + cardType: 1, | ||
| 1938 | + required: true, | ||
| 1939 | + title: `${parseInt(this.fiscalYear)}财年预计`, | ||
| 1940 | + value: "", | ||
| 1941 | + key: "newProfitInstallResident", | ||
| 1942 | + id: "2" | ||
| 1943 | + }, { | ||
| 1944 | + cardType: 1, | ||
| 1945 | + required: true, | ||
| 1946 | + title: `${parseInt(this.fiscalYear)+1}财年预计`, | ||
| 1947 | + value: "", | ||
| 1948 | + key: "newProfitInstallResident", | ||
| 1949 | + id: "3" | ||
| 1950 | + }, { | ||
| 1951 | + cardType: 1, | ||
| 116 | required: true, | 1952 | required: true, |
| 117 | - title: '乡镇(户)', | 1953 | + title: `${parseInt(this.fiscalYear)+2}财年预计`, |
| 1954 | + value: "", | ||
| 1955 | + key: "newProfitInstallResident", | ||
| 1956 | + id: "4" | ||
| 118 | }, | 1957 | }, |
| 1958 | + // 工商户接驳毛利（万元） | ||
| 119 | { | 1959 | { |
| 1960 | + cardType: 3, | ||
| 1961 | + title: "工商户接驳毛利（万元）" | ||
| 1962 | + }, { | ||
| 120 | cardType: 1, | 1963 | cardType: 1, |
| 121 | required: true, | 1964 | required: true, |
| 122 | - title: `${this.fiscalYear}财年目标`, | 1965 | + title: `${parseInt(this.fiscalYear)-2}财年完成`, |
| 123 | value: "", | 1966 | value: "", |
| 124 | - key: "townsUserGoal", | 1967 | + key: "newProfitInstallCommerce", |
| 125 | id: "0" | 1968 | id: "0" |
| 126 | - }, | ||
| 127 | - { | 1969 | + }, { |
| 128 | cardType: 1, | 1970 | cardType: 1, |
| 129 | required: true, | 1971 | required: true, |
| 130 | - title: `${parseInt(this.fiscalYear)+1}财年目标`, | 1972 | + title: `${parseInt(this.fiscalYear)-1}财年完成`, |
| 131 | value: "", | 1973 | value: "", |
| 132 | - key: "townsUserGoal", | 1974 | + key: "newProfitInstallCommerce", |
| 133 | id: "1" | 1975 | id: "1" |
| 134 | - }, | ||
| 135 | - { | 1976 | + }, { |
| 136 | cardType: 1, | 1977 | cardType: 1, |
| 137 | required: true, | 1978 | required: true, |
| 138 | - title: `${parseInt(this.fiscalYear)+2}财年目标`, | 1979 | + title: `${parseInt(this.fiscalYear)}财年预计`, |
| 139 | value: "", | 1980 | value: "", |
| 140 | - key: "townsUserGoal", | 1981 | + key: "newProfitInstallCommerce", |
| 141 | id: "2" | 1982 | id: "2" |
| 1983 | + }, { | ||
| 1984 | + cardType: 1, | ||
| 1985 | + required: true, | ||
| 1986 | + title: `${parseInt(this.fiscalYear)+1}财年预计`, | ||
| 1987 | + value: "", | ||
| 1988 | + key: "newProfitInstallCommerce", | ||
| 1989 | + id: "3" | ||
| 1990 | + }, { | ||
| 1991 | + cardType: 1, | ||
| 1992 | + required: true, | ||
| 1993 | + title: `${parseInt(this.fiscalYear)+2}财年预计`, | ||
| 1994 | + value: "", | ||
| 1995 | + key: "newProfitInstallCommerce", | ||
| 1996 | + id: "4" | ||
| 142 | }, | 1997 | }, |
| 143 | - | 1998 | + // 销气毛利（万元） |
| 144 | { | 1999 | { |
| 145 | cardType: 3, | 2000 | cardType: 3, |
| 2001 | + title: "销气毛利（万元）" | ||
| 2002 | + }, { | ||
| 2003 | + cardType: 1, | ||
| 2004 | + required: true, | ||
| 2005 | + title: `${parseInt(this.fiscalYear)-2}财年完成`, | ||
| 2006 | + value: "", | ||
| 2007 | + key: "newProfitSell", | ||
| 2008 | + id: "0" | ||
| 2009 | + }, { | ||
| 2010 | + cardType: 1, | ||
| 2011 | + required: true, | ||
| 2012 | + title: `${parseInt(this.fiscalYear)-1}财年完成`, | ||
| 2013 | + value: "", | ||
| 2014 | + key: "newProfitSell", | ||
| 2015 | + id: "1" | ||
| 2016 | + }, { | ||
| 2017 | + cardType: 1, | ||
| 2018 | + required: true, | ||
| 2019 | + title: `${parseInt(this.fiscalYear)}财年预计`, | ||
| 2020 | + value: "", | ||
| 2021 | + key: "newProfitSell", | ||
| 2022 | + id: "2" | ||
| 2023 | + }, { | ||
| 2024 | + cardType: 1, | ||
| 2025 | + required: true, | ||
| 2026 | + title: `${parseInt(this.fiscalYear)+1}财年预计`, | ||
| 2027 | + value: "", | ||
| 2028 | + key: "newProfitSell", | ||
| 2029 | + id: "3" | ||
| 2030 | + }, { | ||
| 2031 | + cardType: 1, | ||
| 146 | required: true, | 2032 | required: true, |
| 147 | - title: '工商福(户)', | 2033 | + title: `${parseInt(this.fiscalYear)+2}财年预计`, |
| 2034 | + value: "", | ||
| 2035 | + key: "newProfitSell", | ||
| 2036 | + id: "4" | ||
| 148 | }, | 2037 | }, |
| 2038 | + // 居民气量毛利（万元） | ||
| 149 | { | 2039 | { |
| 2040 | + cardType: 3, | ||
| 2041 | + title: "居民气量毛利（万元）" | ||
| 2042 | + }, { | ||
| 150 | cardType: 1, | 2043 | cardType: 1, |
| 151 | required: true, | 2044 | required: true, |
| 152 | - title: `${this.fiscalYear}财年目标`, | 2045 | + title: `${parseInt(this.fiscalYear)-2}财年完成`, |
| 153 | value: "", | 2046 | value: "", |
| 154 | - key: "commerceGoal", | 2047 | + key: "newProfitSellResident", |
| 155 | id: "0" | 2048 | id: "0" |
| 156 | - }, | ||
| 157 | - { | 2049 | + }, { |
| 158 | cardType: 1, | 2050 | cardType: 1, |
| 159 | required: true, | 2051 | required: true, |
| 160 | - title: `${parseInt(this.fiscalYear)+1}财年目标`, | 2052 | + title: `${parseInt(this.fiscalYear)-1}财年完成`, |
| 161 | value: "", | 2053 | value: "", |
| 162 | - key: "commerceGoal", | 2054 | + key: "newProfitSellResident", |
| 163 | id: "1" | 2055 | id: "1" |
| 164 | - }, | ||
| 165 | - { | 2056 | + }, { |
| 166 | cardType: 1, | 2057 | cardType: 1, |
| 167 | required: true, | 2058 | required: true, |
| 168 | - title: `${parseInt(this.fiscalYear)+2}财年目标`, | 2059 | + title: `${parseInt(this.fiscalYear)}财年预计`, |
| 169 | value: "", | 2060 | value: "", |
| 170 | - key: "commerceGoal", | 2061 | + key: "newProfitSellResident", |
| 171 | id: "2" | 2062 | id: "2" |
| 2063 | + }, { | ||
| 2064 | + cardType: 1, | ||
| 2065 | + required: true, | ||
| 2066 | + title: `${parseInt(this.fiscalYear)+1}财年预计`, | ||
| 2067 | + value: "", | ||
| 2068 | + key: "newProfitSellResident", | ||
| 2069 | + id: "3" | ||
| 2070 | + }, { | ||
| 2071 | + cardType: 1, | ||
| 2072 | + required: true, | ||
| 2073 | + title: `${parseInt(this.fiscalYear)+2}财年预计`, | ||
| 2074 | + value: "", | ||
| 2075 | + key: "newProfitSellResident", | ||
| 2076 | + id: "4" | ||
| 172 | }, | 2077 | }, |
| 173 | - | 2078 | + // 工商户气量毛利（万元） |
| 174 | { | 2079 | { |
| 175 | cardType: 3, | 2080 | cardType: 3, |
| 2081 | + title: "工商户气量毛利（万元）" | ||
| 2082 | + }, { | ||
| 2083 | + cardType: 1, | ||
| 2084 | + required: true, | ||
| 2085 | + title: `${parseInt(this.fiscalYear)-2}财年完成`, | ||
| 2086 | + value: "", | ||
| 2087 | + key: "newProfitSellCommerce", | ||
| 2088 | + id: "0" | ||
| 2089 | + }, { | ||
| 2090 | + cardType: 1, | ||
| 2091 | + required: true, | ||
| 2092 | + title: `${parseInt(this.fiscalYear)-1}财年完成`, | ||
| 2093 | + value: "", | ||
| 2094 | + key: "newProfitSellCommerce", | ||
| 2095 | + id: "1" | ||
| 2096 | + }, { | ||
| 2097 | + cardType: 1, | ||
| 2098 | + required: true, | ||
| 2099 | + title: `${parseInt(this.fiscalYear)}财年预计`, | ||
| 2100 | + value: "", | ||
| 2101 | + key: "newProfitSellCommerce", | ||
| 2102 | + id: "2" | ||
| 2103 | + }, { | ||
| 2104 | + cardType: 1, | ||
| 2105 | + required: true, | ||
| 2106 | + title: `${parseInt(this.fiscalYear)+1}财年预计`, | ||
| 2107 | + value: "", | ||
| 2108 | + key: "newProfitSellCommerce", | ||
| 2109 | + id: "3" | ||
| 2110 | + }, { | ||
| 2111 | + cardType: 1, | ||
| 176 | required: true, | 2112 | required: true, |
| 177 | - title: '工业(户)', | 2113 | + title: `${parseInt(this.fiscalYear)+2}财年预计`, |
| 2114 | + value: "", | ||
| 2115 | + key: "newProfitSellCommerce", | ||
| 2116 | + id: "4" | ||
| 178 | }, | 2117 | }, |
| 2118 | + // 汽车加气毛利（万元） | ||
| 179 | { | 2119 | { |
| 2120 | + cardType: 3, | ||
| 2121 | + title: "汽车加气毛利（万元）" | ||
| 2122 | + }, { | ||
| 180 | cardType: 1, | 2123 | cardType: 1, |
| 181 | required: true, | 2124 | required: true, |
| 182 | - title: `${this.fiscalYear}财年目标`, | 2125 | + title: `${parseInt(this.fiscalYear)-2}财年完成`, |
| 183 | value: "", | 2126 | value: "", |
| 184 | - key: "industryGoal", | 2127 | + key: "newProfitSellCar", |
| 185 | id: "0" | 2128 | id: "0" |
| 186 | - }, | ||
| 187 | - { | 2129 | + }, { |
| 188 | cardType: 1, | 2130 | cardType: 1, |
| 189 | required: true, | 2131 | required: true, |
| 190 | - title: `${parseInt(this.fiscalYear)+1}财年目标`, | 2132 | + title: `${parseInt(this.fiscalYear)-1}财年完成`, |
| 191 | value: "", | 2133 | value: "", |
| 192 | - key: "industryGoal", | 2134 | + key: "newProfitSellCar", |
| 193 | id: "1" | 2135 | id: "1" |
| 194 | - }, | ||
| 195 | - { | 2136 | + }, { |
| 196 | cardType: 1, | 2137 | cardType: 1, |
| 197 | required: true, | 2138 | required: true, |
| 198 | - title: `${parseInt(this.fiscalYear)+2}财年目标`, | 2139 | + title: `${parseInt(this.fiscalYear)}财年预计`, |
| 199 | value: "", | 2140 | value: "", |
| 200 | - key: "industryGoal", | 2141 | + key: "newProfitSellCar", |
| 201 | id: "2" | 2142 | id: "2" |
| 2143 | + }, { | ||
| 2144 | + cardType: 1, | ||
| 2145 | + required: true, | ||
| 2146 | + title: `${parseInt(this.fiscalYear)+1}财年预计`, | ||
| 2147 | + value: "", | ||
| 2148 | + key: "newProfitSellCar", | ||
| 2149 | + id: "3" | ||
| 2150 | + }, { | ||
| 2151 | + cardType: 1, | ||
| 2152 | + required: true, | ||
| 2153 | + title: `${parseInt(this.fiscalYear)+2}财年预计`, | ||
| 2154 | + value: "", | ||
| 2155 | + key: "newProfitSellCar", | ||
| 2156 | + id: "4" | ||
| 202 | }, | 2157 | }, |
| 203 | - | 2158 | + // 批发贸易类销气毛利（万元） |
| 204 | { | 2159 | { |
| 205 | cardType: 3, | 2160 | cardType: 3, |
| 2161 | + title: "批发贸易类销气毛利（万元）" | ||
| 2162 | + }, { | ||
| 2163 | + cardType: 1, | ||
| 206 | required: true, | 2164 | required: true, |
| 207 | - title: '用户安装(户)', | 2165 | + title: `${parseInt(this.fiscalYear)-2}财年完成`, |
| 2166 | + value: "", | ||
| 2167 | + key: "newProfitSellTrade", | ||
| 2168 | + id: "0" | ||
| 2169 | + }, { | ||
| 2170 | + cardType: 1, | ||
| 2171 | + required: true, | ||
| 2172 | + title: `${parseInt(this.fiscalYear)-1}财年完成`, | ||
| 2173 | + value: "", | ||
| 2174 | + key: "newProfitSellTrade", | ||
| 2175 | + id: "1" | ||
| 2176 | + }, { | ||
| 2177 | + cardType: 1, | ||
| 2178 | + required: true, | ||
| 2179 | + title: `${parseInt(this.fiscalYear)}财年预计`, | ||
| 2180 | + value: "", | ||
| 2181 | + key: "newProfitSellTrade", | ||
| 2182 | + id: "2" | ||
| 2183 | + }, { | ||
| 2184 | + cardType: 1, | ||
| 2185 | + required: true, | ||
| 2186 | + title: `${parseInt(this.fiscalYear)+1}财年预计`, | ||
| 2187 | + value: "", | ||
| 2188 | + key: "newProfitSellTrade", | ||
| 2189 | + id: "3" | ||
| 2190 | + }, { | ||
| 2191 | + cardType: 1, | ||
| 2192 | + required: true, | ||
| 2193 | + title: `${parseInt(this.fiscalYear)+2}财年预计`, | ||
| 2194 | + value: "", | ||
| 2195 | + key: "newProfitSellTrade", | ||
| 2196 | + id: "4" | ||
| 208 | }, | 2197 | }, |
| 2198 | + // 其他毛利（补贴类）（万元） | ||
| 209 | { | 2199 | { |
| 2200 | + cardType: 3, | ||
| 2201 | + title: "其他毛利（补贴类）（万元）" | ||
| 2202 | + }, { | ||
| 210 | cardType: 1, | 2203 | cardType: 1, |
| 211 | required: true, | 2204 | required: true, |
| 212 | - title: `${this.fiscalYear}财年目标`, | 2205 | + title: `${parseInt(this.fiscalYear)-2}财年完成`, |
| 213 | value: "", | 2206 | value: "", |
| 214 | - key: "installUserGoal", | 2207 | + key: "newProfitOther", |
| 215 | id: "0" | 2208 | id: "0" |
| 216 | - }, | ||
| 217 | - { | 2209 | + }, { |
| 218 | cardType: 1, | 2210 | cardType: 1, |
| 219 | required: true, | 2211 | required: true, |
| 220 | - title: `${parseInt(this.fiscalYear)+1}财年目标`, | 2212 | + title: `${parseInt(this.fiscalYear)-1}财年完成`, |
| 221 | value: "", | 2213 | value: "", |
| 222 | - key: "installUserGoal", | 2214 | + key: "newProfitOther", |
| 223 | id: "1" | 2215 | id: "1" |
| 224 | - }, | ||
| 225 | - { | 2216 | + }, { |
| 226 | cardType: 1, | 2217 | cardType: 1, |
| 227 | required: true, | 2218 | required: true, |
| 228 | - title: `${parseInt(this.fiscalYear)+2}财年目标`, | 2219 | + title: `${parseInt(this.fiscalYear)}财年预计`, |
| 229 | value: "", | 2220 | value: "", |
| 230 | - key: "installUserGoal", | 2221 | + key: "newProfitOther", |
| 231 | id: "2" | 2222 | id: "2" |
| 2223 | + }, { | ||
| 2224 | + cardType: 1, | ||
| 2225 | + required: true, | ||
| 2226 | + title: `${parseInt(this.fiscalYear)+1}财年预计`, | ||
| 2227 | + value: "", | ||
| 2228 | + key: "newProfitOther", | ||
| 2229 | + id: "3" | ||
| 2230 | + }, { | ||
| 2231 | + cardType: 1, | ||
| 2232 | + required: true, | ||
| 2233 | + title: `${parseInt(this.fiscalYear)+2}财年预计`, | ||
| 2234 | + value: "", | ||
| 2235 | + key: "newProfitOther", | ||
| 2236 | + id: "4" | ||
| 232 | }, | 2237 | }, |
| 233 | - | 2238 | + // 新兴业务类毛利（万元） |
| 234 | { | 2239 | { |
| 235 | cardType: 3, | 2240 | cardType: 3, |
| 2241 | + title: "新兴业务类毛利（万元）" | ||
| 2242 | + }, { | ||
| 2243 | + cardType: 1, | ||
| 2244 | + required: true, | ||
| 2245 | + title: `${parseInt(this.fiscalYear)-2}财年完成`, | ||
| 2246 | + value: "", | ||
| 2247 | + key: "newProfitNew", | ||
| 2248 | + id: "0" | ||
| 2249 | + }, { | ||
| 2250 | + cardType: 1, | ||
| 2251 | + required: true, | ||
| 2252 | + title: `${parseInt(this.fiscalYear)-1}财年完成`, | ||
| 2253 | + value: "", | ||
| 2254 | + key: "newProfitNew", | ||
| 2255 | + id: "1" | ||
| 2256 | + }, { | ||
| 2257 | + cardType: 1, | ||
| 2258 | + required: true, | ||
| 2259 | + title: `${parseInt(this.fiscalYear)}财年预计`, | ||
| 2260 | + value: "", | ||
| 2261 | + key: "newProfitNew", | ||
| 2262 | + id: "2" | ||
| 2263 | + }, { | ||
| 2264 | + cardType: 1, | ||
| 2265 | + required: true, | ||
| 2266 | + title: `${parseInt(this.fiscalYear)+1}财年预计`, | ||
| 2267 | + value: "", | ||
| 2268 | + key: "newProfitNew", | ||
| 2269 | + id: "3" | ||
| 2270 | + }, { | ||
| 2271 | + cardType: 1, | ||
| 236 | required: true, | 2272 | required: true, |
| 237 | - title: '销气量(户)', | 2273 | + title: `${parseInt(this.fiscalYear)+2}财年预计`, |
| 2274 | + value: "", | ||
| 2275 | + key: "newProfitNew", | ||
| 2276 | + id: "4" | ||
| 238 | }, | 2277 | }, |
| 2278 | + // 毛利合计（万元） | ||
| 239 | { | 2279 | { |
| 2280 | + cardType: 3, | ||
| 2281 | + title: "毛利合计（万元）" | ||
| 2282 | + }, { | ||
| 240 | cardType: 1, | 2283 | cardType: 1, |
| 241 | required: true, | 2284 | required: true, |
| 242 | - title: `${this.fiscalYear}财年目标`, | 2285 | + title: `${parseInt(this.fiscalYear)-2}财年完成`, |
| 243 | value: "", | 2286 | value: "", |
| 244 | - key: "salesNumberGoal", | 2287 | + key: "newProfitTotal", |
| 245 | id: "0" | 2288 | id: "0" |
| 2289 | + }, { | ||
| 2290 | + cardType: 1, | ||
| 2291 | + required: true, | ||
| 2292 | + title: `${parseInt(this.fiscalYear)-1}财年完成`, | ||
| 2293 | + value: "", | ||
| 2294 | + key: "newProfitTotal", | ||
| 2295 | + id: "1" | ||
| 2296 | + }, { | ||
| 2297 | + cardType: 1, | ||
| 2298 | + required: true, | ||
| 2299 | + title: `${parseInt(this.fiscalYear)}财年预计`, | ||
| 2300 | + value: "", | ||
| 2301 | + key: "newProfitTotal", | ||
| 2302 | + id: "2" | ||
| 2303 | + }, { | ||
| 2304 | + cardType: 1, | ||
| 2305 | + required: true, | ||
| 2306 | + title: `${parseInt(this.fiscalYear)+1}财年预计`, | ||
| 2307 | + value: "", | ||
| 2308 | + key: "newProfitTotal", | ||
| 2309 | + id: "3" | ||
| 2310 | + }, { | ||
| 2311 | + cardType: 1, | ||
| 2312 | + required: true, | ||
| 2313 | + title: `${parseInt(this.fiscalYear)+2}财年预计`, | ||
| 2314 | + value: "", | ||
| 2315 | + key: "newProfitTotal", | ||
| 2316 | + id: "4" | ||
| 246 | }, | 2317 | }, |
| 2318 | + // 费用总额（含折旧摊销及税金、人工成本、财务费用、可控费用）（万元） | ||
| 247 | { | 2319 | { |
| 2320 | + cardType: 3, | ||
| 2321 | + title: "费用总额（含折旧摊销及税金、人工成本、财务费用、可控费用）（万元）" | ||
| 2322 | + }, { | ||
| 2323 | + cardType: 1, | ||
| 2324 | + required: true, | ||
| 2325 | + title: `${parseInt(this.fiscalYear)-2}财年完成`, | ||
| 2326 | + value: "", | ||
| 2327 | + key: "newProfitTotalCost", | ||
| 2328 | + id: "0" | ||
| 2329 | + }, { | ||
| 248 | cardType: 1, | 2330 | cardType: 1, |
| 249 | required: true, | 2331 | required: true, |
| 250 | - title: `${parseInt(this.fiscalYear)+1}财年目标`, | 2332 | + title: `${parseInt(this.fiscalYear)-1}财年完成`, |
| 251 | value: "", | 2333 | value: "", |
| 252 | - key: "salesNumberGoal", | 2334 | + key: "newProfitTotalCost", |
| 253 | id: "1" | 2335 | id: "1" |
| 2336 | + }, { | ||
| 2337 | + cardType: 1, | ||
| 2338 | + required: true, | ||
| 2339 | + title: `${parseInt(this.fiscalYear)}财年预计`, | ||
| 2340 | + value: "", | ||
| 2341 | + key: "newProfitTotalCost", | ||
| 2342 | + id: "2" | ||
| 2343 | + }, { | ||
| 2344 | + cardType: 1, | ||
| 2345 | + required: true, | ||
| 2346 | + title: `${parseInt(this.fiscalYear)+1}财年预计`, | ||
| 2347 | + value: "", | ||
| 2348 | + key: "newProfitTotalCost", | ||
| 2349 | + id: "3" | ||
| 2350 | + }, { | ||
| 2351 | + cardType: 1, | ||
| 2352 | + required: true, | ||
| 2353 | + title: `${parseInt(this.fiscalYear)+2}财年预计`, | ||
| 2354 | + value: "", | ||
| 2355 | + key: "newProfitTotalCost", | ||
| 2356 | + id: "4" | ||
| 254 | }, | 2357 | }, |
| 2358 | + // 净利润合计（万元） | ||
| 255 | { | 2359 | { |
| 2360 | + cardType: 3, | ||
| 2361 | + title: "净利润合计（万元）" | ||
| 2362 | + }, { | ||
| 2363 | + cardType: 1, | ||
| 2364 | + required: true, | ||
| 2365 | + title: `${parseInt(this.fiscalYear)-2}财年完成`, | ||
| 2366 | + value: "", | ||
| 2367 | + key: "newNetProfitTotal", | ||
| 2368 | + id: "0" | ||
| 2369 | + }, { | ||
| 256 | cardType: 1, | 2370 | cardType: 1, |
| 257 | required: true, | 2371 | required: true, |
| 258 | - title: `${parseInt(this.fiscalYear)+2}财年目标`, | 2372 | + title: `${parseInt(this.fiscalYear)-1}财年完成`, |
| 259 | value: "", | 2373 | value: "", |
| 260 | - key: "salesNumberGoal", | 2374 | + key: "newNetProfitTotal", |
| 2375 | + id: "1" | ||
| 2376 | + }, { | ||
| 2377 | + cardType: 1, | ||
| 2378 | + required: true, | ||
| 2379 | + title: `${parseInt(this.fiscalYear)}财年预计`, | ||
| 2380 | + value: "", | ||
| 2381 | + key: "newNetProfitTotal", | ||
| 261 | id: "2" | 2382 | id: "2" |
| 262 | - } | 2383 | + }, { |
| 2384 | + cardType: 1, | ||
| 2385 | + required: true, | ||
| 2386 | + title: `${parseInt(this.fiscalYear)+1}财年预计`, | ||
| 2387 | + value: "", | ||
| 2388 | + key: "newNetProfitTotal", | ||
| 2389 | + id: "3" | ||
| 2390 | + }, { | ||
| 2391 | + cardType: 1, | ||
| 2392 | + required: true, | ||
| 2393 | + title: `${parseInt(this.fiscalYear)+2}财年预计`, | ||
| 2394 | + value: "", | ||
| 2395 | + key: "newNetProfitTotal", | ||
| 2396 | + id: "4" | ||
| 2397 | + }, | ||
| 263 | ], | 2398 | ], |
| 264 | - data2: [{ | 2399 | + data7: [{ |
| 265 | cardType: 2, | 2400 | cardType: 2, |
| 266 | required: true, | 2401 | required: true, |
| 267 | title: '整体开发思路', | 2402 | title: '整体开发思路', |
| 268 | value: "", | 2403 | value: "", |
| 269 | - key:"developmentIdea" | 2404 | + key: "developmentIdea" |
| 270 | }], | 2405 | }], |
| 271 | - data3: [{ | 2406 | + data8: [{ |
| 272 | cardType: 2, | 2407 | cardType: 2, |
| 273 | required: true, | 2408 | required: true, |
| 274 | title: '所需要资源配置', | 2409 | title: '所需要资源配置', |
| 275 | value: "", | 2410 | value: "", |
| 276 | - key:"resourceAllocation" | 2411 | + key: "resourceAllocation" |
| 277 | }], | 2412 | }], |
| 278 | } | 2413 | } |
| 279 | }, | 2414 | }, |
| @@ -285,22 +2420,50 @@ | @@ -285,22 +2420,50 @@ | ||
| 285 | }, | 2420 | }, |
| 286 | methods: { | 2421 | methods: { |
| 287 | initData() { | 2422 | initData() { |
| 288 | - this.data1.forEach(data => { | ||
| 289 | - if (data.key in this.reportData) { | ||
| 290 | - let Arr = this.reportData[data.key].split(","); | ||
| 291 | - data.value = Arr[data.id]; | ||
| 292 | - } | ||
| 293 | - }); | ||
| 294 | - this.data2.forEach(data => { | ||
| 295 | - if (data.key in this.reportData) { | ||
| 296 | - data.value = this.reportData[data.key]; | ||
| 297 | - } | ||
| 298 | - }); | ||
| 299 | - this.data3.forEach(data => { | ||
| 300 | - if (data.key in this.reportData) { | ||
| 301 | - data.value = this.reportData[data.key]; | ||
| 302 | - } | ||
| 303 | - }); | 2423 | + // 逗号分隔分配 |
| 2424 | + const updateData = (dataArray, reportData) => { | ||
| 2425 | + dataArray.forEach(data => { | ||
| 2426 | + if (data.key in reportData) { | ||
| 2427 | + let Arr = reportData[data.key].split(","); | ||
| 2428 | + data.value = Arr[data.id]; | ||
| 2429 | + } | ||
| 2430 | + }); | ||
| 2431 | + }; | ||
| 2432 | + | ||
| 2433 | + // key直接分配 | ||
| 2434 | + const updateDataByKey = (dataArray, reportData) => { | ||
| 2435 | + dataArray.forEach(data => { | ||
| 2436 | + if (data.key in reportData) { | ||
| 2437 | + data.value = reportData[data.key]; | ||
| 2438 | + } | ||
| 2439 | + }); | ||
| 2440 | + }; | ||
| 2441 | + | ||
| 2442 | + updateData(this.data1, this.reportData); | ||
| 2443 | + updateData(this.data2, this.reportData); | ||
| 2444 | + updateData(this.data3, this.reportData); | ||
| 2445 | + updateData(this.data4, this.reportData); | ||
| 2446 | + updateData(this.data5, this.reportData); | ||
| 2447 | + updateData(this.data6, this.reportData); | ||
| 2448 | + | ||
| 2449 | + updateDataByKey(this.data7, this.reportData); | ||
| 2450 | + updateDataByKey(this.data8, this.reportData) | ||
| 2451 | + // this.data1.forEach(data => { | ||
| 2452 | + // if (data.key in this.reportData) { | ||
| 2453 | + // let Arr = this.reportData[data.key].split(","); | ||
| 2454 | + // data.value = Arr[data.id]; | ||
| 2455 | + // } | ||
| 2456 | + // }); | ||
| 2457 | + // this.data7.forEach(data => { | ||
| 2458 | + // if (data.key in this.reportData) { | ||
| 2459 | + // data.value = this.reportData[data.key]; | ||
| 2460 | + // } | ||
| 2461 | + // }); | ||
| 2462 | + // this.data8.forEach(data => { | ||
| 2463 | + // if (data.key in this.reportData) { | ||
| 2464 | + // data.value = this.reportData[data.key]; | ||
| 2465 | + // } | ||
| 2466 | + // }); | ||
| 304 | } | 2467 | } |
| 305 | } | 2468 | } |
| 306 | } | 2469 | } |
pages/market/components/reportModule5.vue
| 1 | <template> | 1 | <template> |
| 2 | <view class="ComCss"> | 2 | <view class="ComCss"> |
| 3 | - <cardMoudule :cardData="data1" :required="false" :title="fiscalYear+'财年市场开发目标'"></cardMoudule> | ||
| 4 | - <cardMoudule :cardData="data2" :required="true" title="市场开发对策"></cardMoudule> | 3 | + <cardMoudule :cardData="data1" :required="false" :title="'本财年市场开发目标'"></cardMoudule> |
| 4 | + <!-- <cardMoudule :cardData="data2" :required="true" title="市场开发对策"></cardMoudule> --> | ||
| 5 | + <cardMoudule :cardData="data3" :required="true" title="定策略"></cardMoudule> | ||
| 5 | </view> | 6 | </view> |
| 6 | </template> | 7 | </template> |
| 7 | 8 | ||
| @@ -15,8 +16,8 @@ | @@ -15,8 +16,8 @@ | ||
| 15 | reportData: { | 16 | reportData: { |
| 16 | type: Object | 17 | type: Object |
| 17 | }, | 18 | }, |
| 18 | - fiscalYear:{ | ||
| 19 | - type:String | 19 | + fiscalYear: { |
| 20 | + type: String | ||
| 20 | } | 21 | } |
| 21 | }, | 22 | }, |
| 22 | data() { | 23 | data() { |
| @@ -26,14 +27,14 @@ | @@ -26,14 +27,14 @@ | ||
| 26 | required: true, | 27 | required: true, |
| 27 | title: `${this.fiscalYear}财年目标计划签约(户)`, | 28 | title: `${this.fiscalYear}财年目标计划签约(户)`, |
| 28 | value: "", | 29 | value: "", |
| 29 | - key:"planSignHousehold" | 30 | + key: "planSignHousehold" |
| 30 | }, | 31 | }, |
| 31 | { | 32 | { |
| 32 | cardType: 1, | 33 | cardType: 1, |
| 33 | required: true, | 34 | required: true, |
| 34 | title: `${this.fiscalYear}财年目标计划安装(户)`, | 35 | title: `${this.fiscalYear}财年目标计划安装(户)`, |
| 35 | value: "", | 36 | value: "", |
| 36 | - key:"planInstallHousehold" | 37 | + key: "planInstallHousehold" |
| 37 | }, | 38 | }, |
| 38 | { | 39 | { |
| 39 | cardType: 3, | 40 | cardType: 3, |
| @@ -44,17 +45,17 @@ | @@ -44,17 +45,17 @@ | ||
| 44 | cardType: 1, | 45 | cardType: 1, |
| 45 | required: true, | 46 | required: true, |
| 46 | title: '计划签约', | 47 | title: '计划签约', |
| 47 | - value:"", | ||
| 48 | - key:"newUserPlan", | ||
| 49 | - id:"0" | 48 | + value: "", |
| 49 | + key: "newUserPlan", | ||
| 50 | + id: "0" | ||
| 50 | }, | 51 | }, |
| 51 | { | 52 | { |
| 52 | cardType: 1, | 53 | cardType: 1, |
| 53 | required: true, | 54 | required: true, |
| 54 | title: '计划安装', | 55 | title: '计划安装', |
| 55 | - value:"", | ||
| 56 | - key:"newUserPlan", | ||
| 57 | - id:"1" | 56 | + value: "", |
| 57 | + key: "newUserPlan", | ||
| 58 | + id: "1" | ||
| 58 | }, | 59 | }, |
| 59 | 60 | ||
| 60 | { | 61 | { |
| @@ -66,17 +67,17 @@ | @@ -66,17 +67,17 @@ | ||
| 66 | cardType: 1, | 67 | cardType: 1, |
| 67 | required: true, | 68 | required: true, |
| 68 | title: '计划签约', | 69 | title: '计划签约', |
| 69 | - value:"", | ||
| 70 | - key:"oldUserPlan", | ||
| 71 | - id:"0" | 70 | + value: "", |
| 71 | + key: "oldUserPlan", | ||
| 72 | + id: "0" | ||
| 72 | }, | 73 | }, |
| 73 | { | 74 | { |
| 74 | cardType: 1, | 75 | cardType: 1, |
| 75 | required: true, | 76 | required: true, |
| 76 | title: '计划安装', | 77 | title: '计划安装', |
| 77 | - value:"", | ||
| 78 | - key:"oldUserPlan", | ||
| 79 | - id:"1" | 78 | + value: "", |
| 79 | + key: "oldUserPlan", | ||
| 80 | + id: "1" | ||
| 80 | }, | 81 | }, |
| 81 | 82 | ||
| 82 | { | 83 | { |
| @@ -88,17 +89,17 @@ | @@ -88,17 +89,17 @@ | ||
| 88 | cardType: 1, | 89 | cardType: 1, |
| 89 | required: true, | 90 | required: true, |
| 90 | title: '计划签约', | 91 | title: '计划签约', |
| 91 | - value:"", | ||
| 92 | - key:"townsUserPlan", | ||
| 93 | - id:"0" | 92 | + value: "", |
| 93 | + key: "townsUserPlan", | ||
| 94 | + id: "0" | ||
| 94 | }, | 95 | }, |
| 95 | { | 96 | { |
| 96 | cardType: 1, | 97 | cardType: 1, |
| 97 | required: true, | 98 | required: true, |
| 98 | title: '计划安装', | 99 | title: '计划安装', |
| 99 | - value:"", | ||
| 100 | - key:"townsUserPlan", | ||
| 101 | - id:"1" | 100 | + value: "", |
| 101 | + key: "townsUserPlan", | ||
| 102 | + id: "1" | ||
| 102 | }, | 103 | }, |
| 103 | 104 | ||
| 104 | { | 105 | { |
| @@ -110,17 +111,17 @@ | @@ -110,17 +111,17 @@ | ||
| 110 | cardType: 1, | 111 | cardType: 1, |
| 111 | required: true, | 112 | required: true, |
| 112 | title: '计划签约', | 113 | title: '计划签约', |
| 113 | - value:"", | ||
| 114 | - key:"commerceUserPlan", | ||
| 115 | - id:"0" | 114 | + value: "", |
| 115 | + key: "commerceUserPlan", | ||
| 116 | + id: "0" | ||
| 116 | }, | 117 | }, |
| 117 | { | 118 | { |
| 118 | cardType: 1, | 119 | cardType: 1, |
| 119 | required: true, | 120 | required: true, |
| 120 | title: '计划安装', | 121 | title: '计划安装', |
| 121 | - value:"", | ||
| 122 | - key:"commerceUserPlan", | ||
| 123 | - id:"1" | 122 | + value: "", |
| 123 | + key: "commerceUserPlan", | ||
| 124 | + id: "1" | ||
| 124 | }, | 125 | }, |
| 125 | 126 | ||
| 126 | { | 127 | { |
| @@ -132,17 +133,17 @@ | @@ -132,17 +133,17 @@ | ||
| 132 | cardType: 1, | 133 | cardType: 1, |
| 133 | required: true, | 134 | required: true, |
| 134 | title: '计划签约', | 135 | title: '计划签约', |
| 135 | - value:"", | ||
| 136 | - key:"industryUserPlan", | ||
| 137 | - id:"0" | 136 | + value: "", |
| 137 | + key: "industryUserPlan", | ||
| 138 | + id: "0" | ||
| 138 | }, | 139 | }, |
| 139 | { | 140 | { |
| 140 | cardType: 1, | 141 | cardType: 1, |
| 141 | required: true, | 142 | required: true, |
| 142 | title: '计划安装', | 143 | title: '计划安装', |
| 143 | - value:"", | ||
| 144 | - key:"industryUserPlan", | ||
| 145 | - id:"1" | 144 | + value: "", |
| 145 | + key: "industryUserPlan", | ||
| 146 | + id: "1" | ||
| 146 | }, | 147 | }, |
| 147 | 148 | ||
| 148 | { | 149 | { |
| @@ -154,22 +155,21 @@ | @@ -154,22 +155,21 @@ | ||
| 154 | cardType: 1, | 155 | cardType: 1, |
| 155 | required: true, | 156 | required: true, |
| 156 | title: '计划签约', | 157 | title: '计划签约', |
| 157 | - value:"", | ||
| 158 | - key:"totalPlan", | ||
| 159 | - id:"0" | 158 | + value: "", |
| 159 | + key: "totalPlan", | ||
| 160 | + id: "0" | ||
| 160 | }, | 161 | }, |
| 161 | { | 162 | { |
| 162 | cardType: 1, | 163 | cardType: 1, |
| 163 | required: true, | 164 | required: true, |
| 164 | title: '计划安装', | 165 | title: '计划安装', |
| 165 | - value:"", | ||
| 166 | - key:"totalPlan", | ||
| 167 | - id:"1" | 166 | + value: "", |
| 167 | + key: "totalPlan", | ||
| 168 | + id: "1" | ||
| 168 | }, | 169 | }, |
| 169 | 170 | ||
| 170 | ], | 171 | ], |
| 171 | - data2: [ | ||
| 172 | - { | 172 | + data2: [{ |
| 173 | cardType: 3, | 173 | cardType: 3, |
| 174 | required: true, | 174 | required: true, |
| 175 | title: '新建房地产', | 175 | title: '新建房地产', |
| @@ -178,7 +178,7 @@ | @@ -178,7 +178,7 @@ | ||
| 178 | cardType: 2, | 178 | cardType: 2, |
| 179 | required: true, | 179 | required: true, |
| 180 | value: "", | 180 | value: "", |
| 181 | - key:"newBuildingIdea" | 181 | + key: "newBuildingIdea" |
| 182 | }, | 182 | }, |
| 183 | 183 | ||
| 184 | { | 184 | { |
| @@ -190,7 +190,7 @@ | @@ -190,7 +190,7 @@ | ||
| 190 | cardType: 2, | 190 | cardType: 2, |
| 191 | required: true, | 191 | required: true, |
| 192 | value: "", | 192 | value: "", |
| 193 | - key:"oldBuildingIdea" | 193 | + key: "oldBuildingIdea" |
| 194 | }, | 194 | }, |
| 195 | 195 | ||
| 196 | { | 196 | { |
| @@ -202,7 +202,7 @@ | @@ -202,7 +202,7 @@ | ||
| 202 | cardType: 2, | 202 | cardType: 2, |
| 203 | required: true, | 203 | required: true, |
| 204 | value: "", | 204 | value: "", |
| 205 | - key:"villageBuildingIdea" | 205 | + key: "villageBuildingIdea" |
| 206 | }, | 206 | }, |
| 207 | 207 | ||
| 208 | { | 208 | { |
| @@ -214,9 +214,44 @@ | @@ -214,9 +214,44 @@ | ||
| 214 | cardType: 2, | 214 | cardType: 2, |
| 215 | required: true, | 215 | required: true, |
| 216 | value: "", | 216 | value: "", |
| 217 | - key:"commerceIdea" | 217 | + key: "commerceIdea" |
| 218 | + }, | ||
| 219 | + ], | ||
| 220 | + data3: [{ | ||
| 221 | + cardType: 5, | ||
| 222 | + required: true, | ||
| 223 | + title: "当前财年及未来3年业绩达成支撑举措", | ||
| 224 | + value: "", | ||
| 225 | + key: "achievedMeasure" | ||
| 226 | + }, | ||
| 227 | + { | ||
| 228 | + cardType: 5, | ||
| 229 | + required: true, | ||
| 230 | + title: "重点目标客户开发计划", | ||
| 231 | + value: "", | ||
| 232 | + key: "newBuildingIdea" | ||
| 233 | + }, | ||
| 234 | + { | ||
| 235 | + cardType: 5, | ||
| 236 | + required: true, | ||
| 237 | + title: "工程投资", | ||
| 238 | + value: "", | ||
| 239 | + key: "oldBuildingIdea" | ||
| 240 | + }, | ||
| 241 | + { | ||
| 242 | + cardType: 5, | ||
| 243 | + required: true, | ||
| 244 | + title: "费用计划", | ||
| 245 | + value: "", | ||
| 246 | + key: "villageBuildingIdea" | ||
| 247 | + }, | ||
| 248 | + { | ||
| 249 | + cardType: 5, | ||
| 250 | + required: true, | ||
| 251 | + title: "内部赋能计划", | ||
| 252 | + value: "", | ||
| 253 | + key: "commerceIdea" | ||
| 218 | }, | 254 | }, |
| 219 | - | ||
| 220 | ], | 255 | ], |
| 221 | } | 256 | } |
| 222 | }, | 257 | }, |
| @@ -230,15 +265,20 @@ | @@ -230,15 +265,20 @@ | ||
| 230 | initData() { | 265 | initData() { |
| 231 | this.data1.forEach(data => { | 266 | this.data1.forEach(data => { |
| 232 | if (data.key in this.reportData) { | 267 | if (data.key in this.reportData) { |
| 233 | - if(data.key != "planInstallHousehold" && data.key != "planSignHousehold"){ | 268 | + if (data.key != "planInstallHousehold" && data.key != "planSignHousehold") { |
| 234 | let Arr = this.reportData[data.key].split(","); | 269 | let Arr = this.reportData[data.key].split(","); |
| 235 | data.value = Arr[data.id]; | 270 | data.value = Arr[data.id]; |
| 236 | - }else{ | 271 | + } else { |
| 237 | data.value = this.reportData[data.key] | 272 | data.value = this.reportData[data.key] |
| 238 | } | 273 | } |
| 239 | } | 274 | } |
| 240 | }); | 275 | }); |
| 241 | - this.data2.forEach(data => { | 276 | + // this.data2.forEach(data => { |
| 277 | + // if (data.key in this.reportData) { | ||
| 278 | + // data.value = this.reportData[data.key]; | ||
| 279 | + // } | ||
| 280 | + // }); | ||
| 281 | + this.data3.forEach(data => { | ||
| 242 | if (data.key in this.reportData) { | 282 | if (data.key in this.reportData) { |
| 243 | data.value = this.reportData[data.key]; | 283 | data.value = this.reportData[data.key]; |
| 244 | } | 284 | } |
pages/market/insight.vue
| @@ -112,7 +112,7 @@ | @@ -112,7 +112,7 @@ | ||
| 112 | newList1: [], | 112 | newList1: [], |
| 113 | newList2: [], | 113 | newList2: [], |
| 114 | fiscalYearShow: false, | 114 | fiscalYearShow: false, |
| 115 | - yaerModal: "", | 115 | + yaerModal: Number(new Date()), |
| 116 | fiscalYear: "", | 116 | fiscalYear: "", |
| 117 | status1: "loadmore", | 117 | status1: "loadmore", |
| 118 | status2: "loadmore", | 118 | status2: "loadmore", |
| @@ -515,4 +515,4 @@ | @@ -515,4 +515,4 @@ | ||
| 515 | .u-empty { | 515 | .u-empty { |
| 516 | background: #fff !important; | 516 | background: #fff !important; |
| 517 | } | 517 | } |
| 518 | -</style> | ||
| 519 | \ No newline at end of file | 518 | \ No newline at end of file |
| 519 | +</style> |
pages/market/reportDetails.vue
| @@ -23,6 +23,8 @@ | @@ -23,6 +23,8 @@ | ||
| 23 | :newBuildingItem="reportData3newBuildingItem" :fiscalYear="fiscalYear"></reportModule3> | 23 | :newBuildingItem="reportData3newBuildingItem" :fiscalYear="fiscalYear"></reportModule3> |
| 24 | <reportModule4 v-if="current == 3" :reportData="reportData4" :fiscalYear="fiscalYear"></reportModule4> | 24 | <reportModule4 v-if="current == 3" :reportData="reportData4" :fiscalYear="fiscalYear"></reportModule4> |
| 25 | <reportModule5 v-if="current == 4" :reportData="reportData5" :fiscalYear="fiscalYear"></reportModule5> | 25 | <reportModule5 v-if="current == 4" :reportData="reportData5" :fiscalYear="fiscalYear"></reportModule5> |
| 26 | + <u-back-top :scroll-top="scrollTop" bottom="10" right="10" z-index="999" :customStyle="{'background':'#CF000D'}" | ||
| 27 | + :iconStyle="{color:'#fff'}"></u-back-top> | ||
| 26 | </view> | 28 | </view> |
| 27 | </view> | 29 | </view> |
| 28 | </template> | 30 | </template> |
| @@ -58,6 +60,7 @@ | @@ -58,6 +60,7 @@ | ||
| 58 | data() { | 60 | data() { |
| 59 | return { | 61 | return { |
| 60 | current: 0, | 62 | current: 0, |
| 63 | + scrollTop: 0, | ||
| 61 | reportNo: null, | 64 | reportNo: null, |
| 62 | fiscalYear: "", | 65 | fiscalYear: "", |
| 63 | reportData1: {}, | 66 | reportData1: {}, |
| @@ -69,21 +72,24 @@ | @@ -69,21 +72,24 @@ | ||
| 69 | reportData4: {}, | 72 | reportData4: {}, |
| 70 | reportData5: {}, | 73 | reportData5: {}, |
| 71 | tabList: [{ | 74 | tabList: [{ |
| 72 | - name: '组织实施落实' | 75 | + name: '"五看"市场调研' |
| 73 | }, { | 76 | }, { |
| 74 | name: '天燃气市场总体概况', | 77 | name: '天燃气市场总体概况', |
| 75 | }, { | 78 | }, { |
| 76 | name: '重点业务市场分析' | 79 | name: '重点业务市场分析' |
| 77 | }, { | 80 | }, { |
| 78 | - name: '未来发展规划、 所需资源配置 ' | 81 | + name: '三定（定战略控制点、定目标）' |
| 79 | }, { | 82 | }, { |
| 80 | - name: '目标思路建议' | 83 | + name: '三定（定策略）' |
| 81 | }], | 84 | }], |
| 82 | } | 85 | } |
| 83 | }, | 86 | }, |
| 84 | computed: { | 87 | computed: { |
| 85 | 88 | ||
| 86 | }, | 89 | }, |
| 90 | + onPageScroll(e) { | ||
| 91 | + this.scrollTop = e.scrollTop; | ||
| 92 | + }, | ||
| 87 | onLoad(data) { | 93 | onLoad(data) { |
| 88 | if (data) { | 94 | if (data) { |
| 89 | this.reportNo = data.reportNo; | 95 | this.reportNo = data.reportNo; |
| @@ -98,54 +104,82 @@ | @@ -98,54 +104,82 @@ | ||
| 98 | 104 | ||
| 99 | }, | 105 | }, |
| 100 | async initData() { | 106 | async initData() { |
| 101 | - await getOrganize(this.reportNo).then(res => { | ||
| 102 | - if (res.code === 200) { | ||
| 103 | - this.reportData1 = res.data; | ||
| 104 | - } | ||
| 105 | - console.log("1、组织", JSON.parse(JSON.stringify(this.reportData1))); | ||
| 106 | - }) | ||
| 107 | - await getGeneralOverview(this.reportNo).then(res => { | ||
| 108 | - if (res.code === 200) { | ||
| 109 | - this.reportData2 = res.data; | ||
| 110 | - } | ||
| 111 | - console.log("2、天然气", JSON.parse(JSON.stringify(this.reportData2))); | ||
| 112 | - }) | ||
| 113 | - await getGeneralOverviewAttach(this.reportNo).then(res => { | ||
| 114 | - if (res.code === 200) { | ||
| 115 | - this.reportData2attachment = res.data; | ||
| 116 | - } | ||
| 117 | - console.log("3、天然气附表", JSON.parse(JSON.stringify(this.reportData2attachment))); | ||
| 118 | - }) | ||
| 119 | - await getBusinessAnalyze(this.reportNo).then(res => { | ||
| 120 | - if (res.code === 200) { | ||
| 121 | - this.reportData3 = res.data; | ||
| 122 | - } | ||
| 123 | - console.log("4、重点业务市场分析", JSON.parse(JSON.stringify(this.reportData3))); | ||
| 124 | - }) | ||
| 125 | - await getNewBuildingInfo(this.reportNo).then(res => { | ||
| 126 | - if (res.code === 200) { | ||
| 127 | - this.reportData3newBuildingInfo = res.data; | ||
| 128 | - } | ||
| 129 | - console.log("5、楼盘预计未来三年确认的新建楼盘信息", JSON.parse(JSON.stringify(this.reportData3newBuildingInfo))); | ||
| 130 | - }) | ||
| 131 | - await getNewBuildingItem(this.reportNo).then(res => { | ||
| 132 | - if (res.code === 200) { | ||
| 133 | - this.reportData3newBuildingItem = res.data; | ||
| 134 | - } | ||
| 135 | - console.log("6、预计未来三年安装确认项目", JSON.parse(JSON.stringify(this.reportData3newBuildingItem))); | ||
| 136 | - }) | ||
| 137 | - await getDevelopmentPlan(this.reportNo).then(res => { | ||
| 138 | - if (res.code === 200) { | ||
| 139 | - this.reportData4 = res.data; | ||
| 140 | - } | ||
| 141 | - console.log("7、未来发展规划", JSON.parse(JSON.stringify(this.reportData4))); | ||
| 142 | - }) | ||
| 143 | - await getTargetSuggestion(this.reportNo).then(res => { | 107 | + // await Promise.all([ |
| 108 | + // this.feachData(this.getOrganize, 'reportData1', '1、组织'), | ||
| 109 | + // this.feachData(this.getGeneralOverview, 'reportData2', '2、天然气'), | ||
| 110 | + // this.feachData(this.getGeneralOverviewAttach, 'reportData2attachment', '3、天然气附表'), | ||
| 111 | + // this.feachData(this.getBusinessAnalyze, 'reportData3', '4、重点业务市场分析'), | ||
| 112 | + // this.feachData(this.getNewBuildingInfo, 'reportData3newBuildingInfo', '5、楼盘预计未来三年确认的新建楼盘信息'), | ||
| 113 | + // this.feachData(this.getNewBuildingItem, 'reportData3newBuildingItem', '6、预计未来三年安装确认项目'), | ||
| 114 | + // this.feachData(this.getDevelopmentPlan, 'reportData4', '7、未来发展规划'), | ||
| 115 | + // this.feachData(this.getTargetSuggestion, 'reportData5', '8、目标思路建议') | ||
| 116 | + // ]); | ||
| 117 | + const getData = async (getDataFunc, dataField, logMessage) => { | ||
| 118 | + const res = await getDataFunc(this.reportNo); | ||
| 144 | if (res.code === 200) { | 119 | if (res.code === 200) { |
| 145 | - this.reportData5 = res.data; | 120 | + this[dataField] = res.data; |
| 146 | } | 121 | } |
| 147 | - console.log("8、目标思路建议", JSON.parse(JSON.stringify(this.reportData5))); | ||
| 148 | - }) | 122 | + console.log(logMessage, JSON.parse(JSON.stringify(this[dataField]))); |
| 123 | + }; | ||
| 124 | + | ||
| 125 | + await Promise.all([ | ||
| 126 | + getData(getOrganize, 'reportData1', '1、组织'), | ||
| 127 | + getData(getGeneralOverview, 'reportData2', '2、天然气'), | ||
| 128 | + getData(getGeneralOverviewAttach, 'reportData2attachment', '3、天然气附表'), | ||
| 129 | + getData(getBusinessAnalyze, 'reportData3', '4、重点业务市场分析'), | ||
| 130 | + getData(getNewBuildingInfo, 'reportData3newBuildingInfo', '5、楼盘预计未来三年确认的新建楼盘信息'), | ||
| 131 | + getData(getNewBuildingItem, 'reportData3newBuildingItem', '6、预计未来三年安装确认项目'), | ||
| 132 | + getData(getDevelopmentPlan, 'reportData4', '7、未来发展规划'), | ||
| 133 | + getData(getTargetSuggestion, 'reportData5', '8、目标思路建议') | ||
| 134 | + ]); | ||
| 135 | + // await getOrganize(this.reportNo).then(res => { | ||
| 136 | + // if (res.code === 200) { | ||
| 137 | + // this.reportData1 = res.data; | ||
| 138 | + // } | ||
| 139 | + // console.log("1、组织", JSON.parse(JSON.stringify(this.reportData1))); | ||
| 140 | + // }) | ||
| 141 | + // await getGeneralOverview(this.reportNo).then(res => { | ||
| 142 | + // if (res.code === 200) { | ||
| 143 | + // this.reportData2 = res.data; | ||
| 144 | + // } | ||
| 145 | + // console.log("2、天然气", JSON.parse(JSON.stringify(this.reportData2))); | ||
| 146 | + // }) | ||
| 147 | + // await getGeneralOverviewAttach(this.reportNo).then(res => { | ||
| 148 | + // if (res.code === 200) { | ||
| 149 | + // this.reportData2attachment = res.data; | ||
| 150 | + // } | ||
| 151 | + // console.log("3、天然气附表", JSON.parse(JSON.stringify(this.reportData2attachment))); | ||
| 152 | + // }) | ||
| 153 | + // await getBusinessAnalyze(this.reportNo).then(res => { | ||
| 154 | + // if (res.code === 200) { | ||
| 155 | + // this.reportData3 = res.data; | ||
| 156 | + // } | ||
| 157 | + // console.log("4、重点业务市场分析", JSON.parse(JSON.stringify(this.reportData3))); | ||
| 158 | + // }) | ||
| 159 | + // await getNewBuildingInfo(this.reportNo).then(res => { | ||
| 160 | + // if (res.code === 200) { | ||
| 161 | + // this.reportData3newBuildingInfo = res.data; | ||
| 162 | + // } | ||
| 163 | + // console.log("5、楼盘预计未来三年确认的新建楼盘信息", JSON.parse(JSON.stringify(this.reportData3newBuildingInfo))); | ||
| 164 | + // }) | ||
| 165 | + // await getNewBuildingItem(this.reportNo).then(res => { | ||
| 166 | + // if (res.code === 200) { | ||
| 167 | + // this.reportData3newBuildingItem = res.data; | ||
| 168 | + // } | ||
| 169 | + // console.log("6、预计未来三年安装确认项目", JSON.parse(JSON.stringify(this.reportData3newBuildingItem))); | ||
| 170 | + // }) | ||
| 171 | + // await getDevelopmentPlan(this.reportNo).then(res => { | ||
| 172 | + // if (res.code === 200) { | ||
| 173 | + // this.reportData4 = res.data; | ||
| 174 | + // } | ||
| 175 | + // console.log("7、未来发展规划", JSON.parse(JSON.stringify(this.reportData4))); | ||
| 176 | + // }) | ||
| 177 | + // await getTargetSuggestion(this.reportNo).then(res => { | ||
| 178 | + // if (res.code === 200) { | ||
| 179 | + // this.reportData5 = res.data; | ||
| 180 | + // } | ||
| 181 | + // console.log("8、目标思路建议", JSON.parse(JSON.stringify(this.reportData5))); | ||
| 182 | + // }) | ||
| 149 | } | 183 | } |
| 150 | } | 184 | } |
| 151 | } | 185 | } |
pages/market/total.vue
| @@ -254,7 +254,14 @@ | @@ -254,7 +254,14 @@ | ||
| 254 | } else { | 254 | } else { |
| 255 | await this.getHistogram(query) | 255 | await this.getHistogram(query) |
| 256 | } | 256 | } |
| 257 | + | ||
| 257 | if (this.isZbOrQy && this.reportCharBarData.length) { | 258 | if (this.isZbOrQy && this.reportCharBarData.length) { |
| 259 | + // const newData = Array(10).fill({ | ||
| 260 | + // time: '中国燃气', | ||
| 261 | + // residentUserValue: Math.floor(Math.random() * 101), | ||
| 262 | + // businessUserValue: Math.floor(Math.random() * 101), | ||
| 263 | + // customerUserValue: Math.floor(Math.random() * 101) | ||
| 264 | + // }); | ||
| 258 | this.reportCharBarData.map(item => { | 265 | this.reportCharBarData.map(item => { |
| 259 | this.data3.push({ | 266 | this.data3.push({ |
| 260 | time: item.entityName, | 267 | time: item.entityName, |
| @@ -262,6 +269,7 @@ | @@ -262,6 +269,7 @@ | ||
| 262 | businessUserValue: item.list[0]?.commerceAndIndustry || 0, | 269 | businessUserValue: item.list[0]?.commerceAndIndustry || 0, |
| 263 | customerUserValue: item.list[0]?.customerRecoveryProgress || 0 | 270 | customerUserValue: item.list[0]?.customerRecoveryProgress || 0 |
| 264 | }) | 271 | }) |
| 272 | + // this.data3 = this.data3.concat(newData); | ||
| 265 | }) | 273 | }) |
| 266 | console.log("区域或总部内容", this.data3); | 274 | console.log("区域或总部内容", this.data3); |
| 267 | } | 275 | } |
| @@ -306,9 +314,11 @@ | @@ -306,9 +314,11 @@ | ||
| 306 | data: this.data3.map(item => item.customerUserValue), | 314 | data: this.data3.map(item => item.customerUserValue), |
| 307 | } | 315 | } |
| 308 | ] | 316 | ] |
| 317 | + console.log("series", series); | ||
| 309 | this.pieOption = { | 318 | this.pieOption = { |
| 310 | tooltip: { | 319 | tooltip: { |
| 311 | - trigger: 'item' | 320 | + trigger: 'item', |
| 321 | + confine: true | ||
| 312 | }, | 322 | }, |
| 313 | legend: { | 323 | legend: { |
| 314 | top: 'middle', | 324 | top: 'middle', |
| @@ -334,7 +344,7 @@ | @@ -334,7 +344,7 @@ | ||
| 334 | show: true, | 344 | show: true, |
| 335 | position: 'center', | 345 | position: 'center', |
| 336 | color: '#4c4a4a', | 346 | color: '#4c4a4a', |
| 337 | - formatter: '{total|' + this.total1 + '}' + '\n\r' + '{active|总预算主体数}', | 347 | + formatter: '{total|' + this.total1 + '}' + '\n\r' + '{active|本财年总预算主体数}', |
| 338 | rich: { | 348 | rich: { |
| 339 | total: { | 349 | total: { |
| 340 | fontSize: 20, | 350 | fontSize: 20, |
| @@ -361,7 +371,8 @@ | @@ -361,7 +371,8 @@ | ||
| 361 | }; | 371 | }; |
| 362 | this.pieOption2 = { | 372 | this.pieOption2 = { |
| 363 | tooltip: { | 373 | tooltip: { |
| 364 | - trigger: 'item' | 374 | + trigger: 'item', |
| 375 | + confine: true | ||
| 365 | }, | 376 | }, |
| 366 | legend: { | 377 | legend: { |
| 367 | orient: 'vertical', | 378 | orient: 'vertical', |
| @@ -415,7 +426,8 @@ | @@ -415,7 +426,8 @@ | ||
| 415 | }; | 426 | }; |
| 416 | this.lineOption = { | 427 | this.lineOption = { |
| 417 | tooltip: { | 428 | tooltip: { |
| 418 | - trigger: 'axis' | 429 | + trigger: 'axis', |
| 430 | + confine: true | ||
| 419 | }, | 431 | }, |
| 420 | legend: { | 432 | legend: { |
| 421 | right: 10, | 433 | right: 10, |
| @@ -432,54 +444,42 @@ | @@ -432,54 +444,42 @@ | ||
| 432 | bottom: '3%', | 444 | bottom: '3%', |
| 433 | containLabel: true | 445 | containLabel: true |
| 434 | }, | 446 | }, |
| 435 | - // dataZoom: [{ | ||
| 436 | - // type: "slider", // 滑动条型数据区域缩放组件 | ||
| 437 | - // show: true, // 是否显示组件(用于 x 轴使用) | ||
| 438 | - // start: 70, // 数据窗口范围的起始百分比(范围是：0 ~ 100。表示 0% ~ 100%) | ||
| 439 | - // end: 100, // 数据窗口范围的结束百分比(范围是：0 ~ 100。表示 0% ~ 100%) | ||
| 440 | - // height: 30, // 组件的高度(水平布局默认 30，竖直布局默认自适应) | ||
| 441 | - // handleSize: '30%', // 控制手柄的尺寸，可以是像素大小，也可以是相对于 dataZoom 组件宽度的百分比，默认跟 dataZoom 宽度相同 | ||
| 442 | - // handleStyle: { | ||
| 443 | - // // color: '#fff', // 图形的颜色 | ||
| 444 | - // // borderColor: 'red', // 图形的描边颜色 | ||
| 445 | - // // borderWidth: 1, // 描边线宽。为 0 时无描边 | ||
| 446 | - // borderType: 'solid' // 描边类型 solid.实线(默认) dashed.虚线 dotted.点虚线 | ||
| 447 | - // }, // 两侧缩放手柄的样式配置 | ||
| 448 | - // showDataShadow: false, // 是否在 dataZoom-silder 组件中显示数据阴影。数据阴影可以简单地反应数据走势 | ||
| 449 | - // }, { | ||
| 450 | - // type: "inside", // 内置型数据区域缩放组件(即在坐标系内平移与缩放) | ||
| 451 | - // start: 70, // 数据窗口范围的起始百分比(范围是：0 ~ 100。表示 0% ~ 100%) | ||
| 452 | - // end: 100 // 数据窗口范围的结束百分比(范围是：0 ~ 100。表示 0% ~ 100%) | ||
| 453 | - // }, { | ||
| 454 | - // type: "slider", // 滑动条型数据区域缩放组件 | ||
| 455 | - // show: false, // 是否显示组件(用于 y 轴使用) | ||
| 456 | - // width: "5%", // 组件的宽度(竖直布局默认 30，水平布局默认自适应) | ||
| 457 | - // height: "70%", // 组件的高度(水平布局默认 30，竖直布局默认自适应) | ||
| 458 | - // yAxisIndex: 0, // 组件控制的 y 轴(即下方 yAxis 数组的索引值) | ||
| 459 | - // filterMode: "empty", // none.不过滤数据只改变数轴范围 empty.当前数据窗口外的数据设置为空，不影响其他轴的数据范围 其他访问https://echarts.apache.org/zh/option.html#dataZoom-slider.filterMode | ||
| 460 | - // handleSize: '30%', // 控制手柄的尺寸，可以是像素大小，也可以是相对于 dataZoom 组件宽度的百分比，默认跟 dataZoom 宽度相同 | ||
| 461 | - // handleStyle: { | ||
| 462 | - // // color: '#fff', // 图形的颜色 | ||
| 463 | - // // borderColor: 'red', // 图形的描边颜色 | ||
| 464 | - // // borderWidth: 1, // 描边线宽。为 0 时无描边 | ||
| 465 | - // borderType: 'solid' // 描边类型 solid.实线(默认) dashed.虚线 dotted.点虚线 | ||
| 466 | - // }, // 两侧缩放手柄的样式配置 | ||
| 467 | - // showDataShadow: false, // 是否在 dataZoom-silder 组件中显示数据阴影。数据阴影可以简单地反应数据走势 | ||
| 468 | - // left: "93%" // 组件离容器左侧的距离 | ||
| 469 | - // }], // 区域缩放 | ||
| 470 | - toolbox: { | ||
| 471 | - feature: { | ||
| 472 | - saveAsImage: {} | ||
| 473 | - } | ||
| 474 | - }, | 447 | + dataZoom: [{ |
| 448 | + type: 'inside', // 放大和缩小 | ||
| 449 | + orient: 'vertical', | ||
| 450 | + }, { | ||
| 451 | + type: 'inside', | ||
| 452 | + }, { | ||
| 453 | + start: 0, //默认为0 | ||
| 454 | + end: 100, //默认为100 | ||
| 455 | + type: 'slider', | ||
| 456 | + show: true, | ||
| 457 | + handleSize: 0, //滑动条的 左右2个滑动条的大小 | ||
| 458 | + startValue: 0, // 初始显示值 | ||
| 459 | + endValue: 500000, // 结束显示值,自己定 | ||
| 460 | + height: 5, //组件高度 | ||
| 461 | + left: '10%', //左边的距离 | ||
| 462 | + right: '10%', //右边的距离 | ||
| 463 | + bottom: 15, //底边的距离 | ||
| 464 | + borderColor: "#ccc", | ||
| 465 | + fillerColor: '#4cccfe', | ||
| 466 | + borderRadius: 5, | ||
| 467 | + backgroundColor: '#efefef', //两边未选中的滑动条区域的颜色 | ||
| 468 | + showDataShadow: false, //是否显示数据阴影 默认auto | ||
| 469 | + showDetail: false, //即拖拽时候是否显示详细数值信息 默认true | ||
| 470 | + realtime: true, //是否实时更新 | ||
| 471 | + filterMode: 'filter', | ||
| 472 | + }], | ||
| 475 | xAxis: { | 473 | xAxis: { |
| 476 | show: true, | 474 | show: true, |
| 477 | type: 'category', | 475 | type: 'category', |
| 478 | boundaryGap: true, | 476 | boundaryGap: true, |
| 477 | + scrollShow: true, | ||
| 479 | data: this.data3.map(item => item.time), | 478 | data: this.data3.map(item => item.time), |
| 480 | axisLabel: { | 479 | axisLabel: { |
| 481 | fontSize: 14, | 480 | fontSize: 14, |
| 482 | color: '#666666', | 481 | color: '#666666', |
| 482 | + // interval:1, | ||
| 483 | formatter: function(value) { | 483 | formatter: function(value) { |
| 484 | if (that.isZbOrQy) { | 484 | if (that.isZbOrQy) { |
| 485 | if (value.length > 3) { | 485 | if (value.length > 3) { |
| @@ -502,17 +502,18 @@ | @@ -502,17 +502,18 @@ | ||
| 502 | 502 | ||
| 503 | <style lang="scss" scoped> | 503 | <style lang="scss" scoped> |
| 504 | .ComCss { | 504 | .ComCss { |
| 505 | + position: relative; | ||
| 505 | background: #f2f4f3; | 506 | background: #f2f4f3; |
| 506 | - padding: 0 0 10rpx 0; | 507 | + padding-bottom: 10rpx; |
| 508 | + height: 100%; | ||
| 507 | } | 509 | } |
| 508 | 510 | ||
| 509 | .bigCardCss { | 511 | .bigCardCss { |
| 510 | - margin: 20rpx 20rpx 0rpx 20rpx; | 512 | + margin: 20rpx; |
| 511 | padding: 40rpx 25rpx; | 513 | padding: 40rpx 25rpx; |
| 512 | height: 177rpx; | 514 | height: 177rpx; |
| 513 | border-radius: 20rpx; | 515 | border-radius: 20rpx; |
| 514 | background-color: #ffffff; | 516 | background-color: #ffffff; |
| 515 | - box-sizing: border-box; | ||
| 516 | } | 517 | } |
| 517 | 518 | ||
| 518 | .cardCss { | 519 | .cardCss { |
| @@ -520,7 +521,6 @@ | @@ -520,7 +521,6 @@ | ||
| 520 | flex-direction: column; | 521 | flex-direction: column; |
| 521 | justify-content: space-between; | 522 | justify-content: space-between; |
| 522 | width: 220rpx; | 523 | width: 220rpx; |
| 523 | - margin: 20rpx 0rpx; | ||
| 524 | padding: 40rpx 25rpx; | 524 | padding: 40rpx 25rpx; |
| 525 | border-radius: 20rpx; | 525 | border-radius: 20rpx; |
| 526 | background-color: #ffffff; | 526 | background-color: #ffffff; |
| @@ -550,7 +550,8 @@ | @@ -550,7 +550,8 @@ | ||
| 550 | 550 | ||
| 551 | .flexCss { | 551 | .flexCss { |
| 552 | display: flex; | 552 | display: flex; |
| 553 | - justify-content: space-around; | 553 | + justify-content: space-between; |
| 554 | + margin: 20rpx; | ||
| 554 | } | 555 | } |
| 555 | 556 | ||
| 556 | .charCardCss { | 557 | .charCardCss { |