修改付款合计

src/layout/index/top/index.vue

@@ -921,7 +921,7 @@
   }
 
   .input-Style {
-    opacity: 0;
+    opacity: 1;
     margin-right: 20px;
     // visibility: hidden;
   }

src/views/home/index.vue

@@ -27,22 +27,22 @@
         </div>
         <div class="content2">
           <el-row class="content2-aside">
-            <h3 class="title">采购合同完成进度</h3>
+            <h3 class="title" @click="contract(0)">采购合同完成进度</h3>
             <el-col :span="12" class="chart-card" >
               <div style="font-weight: bold;" class="">
-                <div ref="myEchart1" style="height: 288px;" class="roseChart" @click="contract(0)"></div>
+                <div ref="myEchart1" style="height: 288px;" class="roseChart"></div>
                 <div class="bottom-tip">统计单位：吨</div>
               </div>
             </el-col>
             <el-col :span="12" class="chart-card" >
               <div style="font-weight: bold;">
-                <div ref="myEchart2" style="height: 288px;" class="roseChart" @click="contract(0)"></div>
+                <div ref="myEchart2" style="height: 288px;" class="roseChart"></div>
                 <div class="bottom-tip">统计单位：元</div>
               </div>
             </el-col>
             <el-col :span="12" class="chart-card">
               <div style="font-weight: bold;">
-                <div ref="myEchart3" style="height: 288px;" class="roseChart" @click="contract(0)"></div>
+                <div ref="myEchart3" style="height: 288px;" class="roseChart"></div>
                 <div class="bottom-tip">统计单位：元</div>
               </div>
             </el-col>
@@ -375,7 +375,7 @@
       } else {
         alert('当前浏览器不支持websocket')
       }
-              
+
       let that = this
       this.getChartsData()
       // this.timer = setInterval(function(){
@@ -398,7 +398,7 @@
         compId:localStorage.getItem('ws-pf_compId'),
 		seachMoth:'2021'
       }).toPromise().then(res => {
-        console.log(res)
+        console.log('··············',res)
         this.chartsData = res
         this.carCount1 = res[6].biViewInfoList[0].count
         this.carCount2 = res[6].biViewInfoList[1].count
@@ -551,11 +551,11 @@
               // 圆环图各环节的名称和值(系列中各数据项的名称和值)
               data = [{
                 name: '已完成量',
-                value: this.chartsData[i].biViewInfoList[0].count,
+                value:Number(this.chartsData[i].biViewInfoList[0].count).toFixed(2) ,
                 type:'采购合同'
               }, {
                 name: '待完成量',
-                value: this.chartsData[i].biViewInfoList[1].count,
+                value:Number(this.chartsData[i].biViewInfoList[1].count).toFixed(2) ,
                 type:'采购合同'
               }]
               text = '合同总量'
@@ -569,11 +569,11 @@
               // 圆环图各环节的名称和值(系列中各数据项的名称和值)
               data = [{
                 name: '已开票',
-                value: this.chartsData[i].biViewInfoList[0].count,
+                value:Number(this.chartsData[i].biViewInfoList[0].count).toFixed(2),
                 type:'采购合同'
               }, {
                 name: '待开票',
-                value: this.chartsData[i].biViewInfoList[1].count,
+                value:Number(this.chartsData[i].biViewInfoList[1].count).toFixed(2),
                 type:'采购合同'
               }]
               text = '合同总额'
@@ -586,11 +586,11 @@
               // 圆环图各环节的名称和值(系列中各数据项的名称和值)
               data = [{
                 name: '已付款',
-                value: this.chartsData[i].biViewInfoList[0].count,
+                value: Number(this.chartsData[i].biViewInfoList[0].count).toFixed(2),
                 type: '采购合同'
               }, {
                 name: '待付款',
-                value: this.chartsData[i].biViewInfoList[1].count,
+                value:Number(this.chartsData[i].biViewInfoList[1].count).toFixed(2),
                    type: '采购合同'
               }]
               text = '合同总额'
@@ -603,11 +603,11 @@
               // 圆环图各环节的名称和值(系列中各数据项的名称和值)
               data = [{
                 name: '已完成量',
-                value: this.chartsData[i].biViewInfoList[0].count,
+                value: Number(this.chartsData[i].biViewInfoList[0].count).toFixed(2),
                   type: '销售合同'
               }, {
                 name: '待完成量',
-                value: this.chartsData[i].biViewInfoList[1].count
+                value:Number(this.chartsData[i].biViewInfoList[1].count).toFixed(2),
               }]
               text = '合同总量'
               formatter = '{b}{c}吨 </br> 占比{d}%'
@@ -619,10 +619,10 @@
               // 圆环图各环节的名称和值(系列中各数据项的名称和值)
               data = [{
                 name: '已开票',
-                value: this.chartsData[i].biViewInfoList[0].count
+                value: Number(this.chartsData[i].biViewInfoList[0].count).toFixed(2),
               }, {
                 name: '待开票',
-                value: this.chartsData[i].biViewInfoList[1].count
+                value: Number(this.chartsData[i].biViewInfoList[1].count).toFixed(2),
               }]
               text = '合同总额'
               formatter = '{b}{c}元 </br> 占比{d}%'
@@ -634,10 +634,10 @@
               // 圆环图各环节的名称和值(系列中各数据项的名称和值)
               data = [{
                 name: '已付款',
-                value: this.chartsData[i].biViewInfoList[0].count
+                value: Number(this.chartsData[i].biViewInfoList[0].count).toFixed(2),
               }, {
                 name: '待付款',
-                value: this.chartsData[i].biViewInfoList[1].count
+                value: Number(this.chartsData[i].biViewInfoList[1].count).toFixed(2),
               }]
               text = '合同总额'
               formatter = '{b}{c}元 </br> 占比{d}%'
@@ -1892,7 +1892,7 @@
     .content2-middle {
       width: calc(100% - 720px);
       margin: 0 20px 0 15px;
-
+      min-width:910px ;
       .left-card {
         display: flex;
         // background: green;

src/views/houseSelfCollect/paymentManagement.vue

@@ -366,7 +366,7 @@
         customerlist: {
           payeeAddressUrls: [],
         },
-        
+
         ruleForm: {
           type: [
             '打印身份证（正反面）',
@@ -647,6 +647,7 @@
       },
       //合计
       getSummaries(param) {
+        debugger
         console.log(param)
         const {
           columns,
@@ -658,11 +659,8 @@
             console.log(column, index)
             if (index === 0) {
               sums[index] = '合计'
-            } else if (
-              index === 10 ||
-              index === 11 || index === 15 || index === 16
-
-            ) {
+            } else if (index === 10 || index === 11 || index === 15 || index === 16) {
+              debugger
               const values = this.modification.map((item) => Number(item[column.property]))
               if (!values.every((value) => isNaN(value))) {
                 sums[index] = values.reduce((prev, curr) => {
@@ -685,9 +683,7 @@
           columns.forEach((column, index) => {
             if (index === 0) {
               sums[index] = '合计'
-            } else if (
-              index === 11 || index === 16 || index === 17
-            ) {
+            } else if (index === 10 || index === 11 || index === 15 ||index === 16 || index === 17) {
               const values = data.map((item) => Number(item[column.property]))
               if (!values.every((value) => isNaN(value))) {
                 sums[index] = values.reduce((prev, curr) => {
@@ -1221,12 +1217,16 @@
               })
               .toPromise()
               .then((response) => {
-                 workflowcontent({workflowId:item.workflowId,businessKey:item.id,type:'付款管理'}).toPromise()
-            .then((response1) => {
-              console.log(response1)
-              // this.$message.success('审核成功')
-              // this.$router.push({ path: 'tranManagementWarehouseInOuttask' })
-            })
+                workflowcontent({
+                    workflowId: item.workflowId,
+                    businessKey: item.id,
+                    type: '付款管理'
+                  }).toPromise()
+                  .then((response1) => {
+                    console.log(response1)
+                    // this.$message.success('审核成功')
+                    // this.$router.push({ path: 'tranManagementWarehouseInOuttask' })
+                  })
                 this.audit(
                   this.modification[index + 1],
                   index + 1,
@@ -1244,12 +1244,16 @@
               })
               .toPromise()
               .then((response) => {
-                 workflowcontent({workflowId:item.workflowId,businessKey:item.id,type:'付款管理'}).toPromise()
-            .then((response1) => {
-              console.log(response1)
-              // this.$message.success('审核成功')
-              // this.$router.push({ path: 'tranManagementWarehouseInOuttask' })
-            })
+                workflowcontent({
+                    workflowId: item.workflowId,
+                    businessKey: item.id,
+                    type: '付款管理'
+                  }).toPromise()
+                  .then((response1) => {
+                    console.log(response1)
+                    // this.$message.success('审核成功')
+                    // this.$router.push({ path: 'tranManagementWarehouseInOuttask' })
+                  })
                 // postqueryhandle({workflowId:item.workflowId}).toPromise()
                 // .then((response) => {
                 this.audit(
@@ -1259,7 +1263,7 @@
                   status2,
                   reason
                 )
-              // })
+                // })
               })
               .catch((req) => {
                 this.$message.warning(req.message)