Merge branch 'master' of http://git.zthymaoyi.com:3000/gdc/yiliangyiyun-pc

src/views/home/index.vue

@@ -10,7 +10,7 @@
             <img src="../../../public/img/8b2c7255e9b19c71d68b33a08f20f74.png" alt="">
 
           </div>
-         <div class="right">
+          <div class="right">
             <div class="top">
               {{ nowDate }}
             </div>
@@ -58,11 +58,13 @@
                   </div>
                   <div class="item">
                     <p>装货车辆</p>
-                     <p><span class="number" style="color:#ffa523">{{carCount2}}</span><span class="number-text">台</span></p>
+                    <p><span class="number" style="color:#ffa523">{{carCount2}}</span><span class="number-text">台</span>
+                    </p>
                   </div>
                   <div class="item">
                     <p>卸货车辆</p>
-                     <p><span class="number" style="color:#2483ff">{{carCount3}}</span><span class="number-text">台</span></p>
+                    <p><span class="number" style="color:#2483ff">{{carCount3}}</span><span class="number-text">台</span>
+                    </p>
                   </div>
                 </div>
               </el-col>
@@ -74,7 +76,7 @@
             <el-row>
               <h3 class="content2-map">库点流向分布</h3>
               <div class="center-map">
-                <map-drag></map-drag>
+                <map-drag :listData=' mapInfo'></map-drag>
               </div>
             </el-row>
             <el-row>
@@ -96,7 +98,7 @@
             </el-row>
           </div>
           <el-row class="content2-aside">
-            <h3 class="left-title">采购合同完成进度</h3>
+            <h3 class="left-title">销售合同完成进度</h3>
             <el-col :span="12" class="chart-card">
               <div style="font-weight: bold;">
                 <div ref="myEchart4" style="height: 288px;" class="roseChart"></div>
@@ -211,12 +213,13 @@
 
     data() {
       return {
-        totalReserves:'',
-        inventoryCost:'',
-        inventoryValue:'',
-        carCount1:'',
-        carCount2:'',
-        carCount3:'',
+        mapInfo: [],
+        totalReserves: '',
+        inventoryCost: '',
+        inventoryValue: '',
+        carCount1: '',
+        carCount2: '',
+        carCount3: '',
         chartsData: [],
         nowDate: null, //存放年月日变量
         nowTime: null, //存放时分秒变量
@@ -329,7 +332,7 @@
       this.getRouteList()
       // this.checkUserInfoDialog()
       // {
-        this.timer = setInterval(this.getTime, 1000);
+      this.timer = setInterval(this.getTime, 1000);
       // }
     },
     beforeDestroy() {
@@ -364,8 +367,9 @@
         this.carCount2 = res[6].biViewInfoList[1].count
         this.carCount3 = res[6].biViewInfoList[2].count
         this.inventoryCost = res[7].biViewInfoList[0].count
-        this.inventoryValue =  res[7].biViewInfoList[1].count
+        this.inventoryValue = res[7].biViewInfoList[1].count
         this.totalReserves = res[8].biViewInfoList
+        this.mapInfo = res[9]
         this.initCharts()
       })
       // if (this.vesselBankFlag !== 'V') {
@@ -455,7 +459,7 @@
               }]
               text = '合同总量'
               formatter = '{b}{c}吨 </br> 占比{d}%'
-              graphicText = ' \n\n总量合计\n\n' +Number(this.chartsData[i].total).toFixed(2)
+              graphicText = ' \n\n总量合计\n\n' + Number(this.chartsData[i].total).toFixed(2)
 
               break;
             case 1:
@@ -471,7 +475,7 @@
               }]
               text = '合同总额'
               formatter = '{b}{c}元 </br> 占比{d}%'
-                graphicText = ' \n\n开票合计\n\n' + Number(this.chartsData[i].total).toFixed(2)
+              graphicText = ' \n\n开票合计\n\n' + Number(this.chartsData[i].total).toFixed(2)
               break;
             case 2:
               // 圆环图各环节的颜色
@@ -486,7 +490,7 @@
               }]
               text = '合同总额'
               formatter = '{b}{c}元 </br> 占比{d}%'
-               graphicText = ' \n\n付款合计\n\n' + Number(this.chartsData[i].total).toFixed(2)
+              graphicText = ' \n\n付款合计\n\n' + Number(this.chartsData[i].total).toFixed(2)
               break;
             case 3:
               // 圆环图各环节的颜色
@@ -501,7 +505,8 @@
               }]
               text = '合同总量'
               formatter = '{b}{c}吨 </br> 占比{d}%'
-               graphicText = ' \n\n总量合计\n\n' + Number(this.chartsData[i].total).toFixed(2)
+              graphicText = ' \n\n总量合计\n\n' + Number(this.chartsData[i].total).toFixed(2)
+                break;
             case 4:
               // 圆环图各环节的颜色
               color = ['#247ef4', '#3a3b40'];
@@ -530,7 +535,7 @@
               }]
               text = '合同总额'
               formatter = '{b}{c}元 </br> 占比{d}%'
-               graphicText = ' \n\n付款合计\n\n' + Number(this.chartsData[i].total).toFixed(2)
+              graphicText = ' \n\n付款合计\n\n' + Number(this.chartsData[i].total).toFixed(2)
               break;
           }
           myChart.setOption({
@@ -616,15 +621,14 @@
             app.dialogVisible = true
           })
         }
-        debugger
         console.log(this.totalReserves)
         let _x = []
         let _y = []
-        for(let i = 0;i<this.totalReserves.length;i++){
+        for (let i = 0; i < this.totalReserves.length; i++) {
           _x.push(this.totalReserves[i].name)
           _y.push(this.totalReserves[i].count)
         }
-        
+
         // 柱状图
         let myChart7 = app.$echarts.init(this.$refs.myEchart7);
         var zoption = {
@@ -648,10 +652,10 @@
               color: '#fff'
             }
           },
-        
+
           //  ------  X轴 ------
           xAxis: {
-          
+
             axisLabel: { // 坐标轴标签
               show: true, // 是否显示
               inside: false, // 是否朝内
@@ -661,7 +665,7 @@
               interval: 0,
               rotate: 40
             },
-         
+
             splitArea: { // 网格区域
               show: false // 是否显示，默认为false
             },
@@ -669,12 +673,12 @@
           },
           //   ------   y轴  ----------
           yAxis: {
-          
+
             axisLine: { // 坐标轴 轴线
               show: false, // 是否显示
-           
+
             },
-           
+
             axisLabel: { // 坐标轴的标签
               show: true, // 是否显示
               inside: false, // 是否朝内
@@ -1871,12 +1875,12 @@
     }
 
   }
-  .bottom-tip{
+
+  .bottom-tip {
     position: absolute;
     z-index: 11;
     color: #8c8c8d;
     right: 10px;
     bottom: 10px;
   }
-
 </style>

src/views/warehouse/warehouseManagementGross.vue

@@ -1752,7 +1752,7 @@
         if (
           this.deptBudgetList.grossWeight &&
           this.deptBudgetList.tare &&
-          this.deptBudgetList.deductionWeight
+          (this.deptBudgetList.deductionWeight||this.deptBudgetList.deductionWeight == 0)
         ) {
           this.deptBudgetList.netWeight = Number(
             this.deptBudgetList.grossWeight -
@@ -1765,7 +1765,7 @@
         if (
           this.deptBudgetList.grossWeight &&
           this.deptBudgetList.tare &&
-          this.deptBudgetList.deductionWeight
+          (this.deptBudgetList.deductionWeight||this.deptBudgetList.deductionWeight == 0)
         ) {
           this.deptBudgetList.netWeight = Number(
             this.deptBudgetList.grossWeight -