Merge branch 'feature_approval' of 101.201.121.115:leo/LAPP_MY_WEBFRONT into feature_meiyuan

src/views/reportform/components/LabBarChart.vue

@@ -49,7 +49,7 @@ export default {
         newValue.forEach(item => {
           this.xDataArray.push(item.Descr)
           receivableArray.push(item.Persons)
-          paidArray.push(item.Amount.toFixed(1))
+          paidArray.push(item.Amount)
         })
         this.seriesArray.push({
           name: '欠费户数',

src/views/reportform/monthCharge.vue

@@ -48,18 +48,20 @@
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <!-- <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport">导出</el-button> -->
       </el-form-item>
-      <el-form-item label="陈欠收费金额:">
-        {{ chenQianCharge }} 元
-      </el-form-item>
-			<el-form-item label="当期收费金额:">
-        {{ currentCharge }} 元
-      </el-form-item>
-			<el-form-item label="预缴收费金额:">
-        {{ prepayCharge }} 元
-      </el-form-item>
-			<el-form-item label="实缴金额:">
-        {{ paidInCharge }} 元
-      </el-form-item>
+			<div>
+				<el-form-item label="陈欠收费金额:">
+					{{ chenQianCharge }} 元
+				</el-form-item>
+				<el-form-item label="当期收费金额:">
+					{{ currentCharge }} 元
+				</el-form-item>
+				<el-form-item label="预缴收费金额:">
+					{{ prepayCharge }} 元
+				</el-form-item>
+				<el-form-item label="实缴金额:">
+					{{ paidInCharge }} 元
+				</el-form-item>
+			</div>
     </el-form>
     <el-table v-loading="loading" :data="dataList" border>
       <el-table-column v-for="(item, index) in headers" :key="index" align="center" :label="getColumnName(item)" width="120px" :show-overflow-tooltip="true">

src/views/reportform/parkOwe.vue

@@ -105,12 +105,12 @@ export default {
 					rowPerson.rowFive = this.dataList[4].Persons
 					rowPerson.rowSix = this.dataList[5].Persons
 					rowMoney.rowZero = '欠费金额(万元)'
-					rowMoney.rowOne = this.dataList[0].Amount.toFixed(1)
-					rowMoney.rowTwo = this.dataList[1].Amount.toFixed(1)
-					rowMoney.rowThree = this.dataList[2].Amount.toFixed(1)
-					rowMoney.rowFour = this.dataList[3].Amount.toFixed(1)
-					rowMoney.rowFive = this.dataList[4].Amount.toFixed(1)
-					rowMoney.rowSix = this.dataList[5].Amount.toFixed(1)
+					rowMoney.rowOne = this.dataList[0].Amount
+					rowMoney.rowTwo = this.dataList[1].Amount
+					rowMoney.rowThree = this.dataList[2].Amount
+					rowMoney.rowFour = this.dataList[3].Amount
+					rowMoney.rowFive = this.dataList[4].Amount
+					rowMoney.rowSix = this.dataList[5].Amount
 				}
 				this.dataListTable[0] = rowPerson
 				this.dataListTable[1] = rowMoney