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

src/views/home/index.vue

@@ -37,13 +37,13 @@
             <el-col :span="12" class="chart-card">
               <div style="font-weight: bold;">
                 <div ref="myEchart2" style="height: 288px;" class="roseChart"></div>
-                <div class="bottom-tip">统计单位：元</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"></div>
-                <div class="bottom-tip">统计单位：元</div>
+                <div class="bottom-tip">统计单位：万</div>
               </div>
             </el-col>
           </el-row>
@@ -117,13 +117,13 @@
             <el-col :span="12" class="chart-card">
               <div style="font-weight: bold;">
                 <div ref="myEchart5" style="height: 288px;" class="roseChart" @click="contract(1)"></div>
-                <div class="bottom-tip">统计单位：元</div>
+                <div class="bottom-tip">统计单位：万</div>
               </div>
             </el-col>
             <el-col :span="12" class="chart-card">
               <div style="font-weight: bold;">
                 <div ref="myEchart6" style="height: 288px;" class="roseChart" @click="contract(1)"></div>
-                <div class="bottom-tip">统计单位：元</div>
+                <div class="bottom-tip">统计单位：万</div>
               </div>
             </el-col>
           </el-row>
@@ -419,6 +419,7 @@
         this.position = Number(Number(this.physicalInventory)+Number(this.procurementPending) - Number(this.salesPending)).toFixed(2)
         this.totalReserves = res[8].biViewInfoList
         this.mapInfo = res[9]
+        console.log(res)
         this.initCharts()
       })
       // if (this.vesselBankFlag !== 'V') {
@@ -585,17 +586,17 @@
               color = ['#247ef4', '#3a3b40'];
               // 圆环图各环节的名称和值(系列中各数据项的名称和值)
               data = [{
-                name: '已开票',
-                value: Number(this.chartsData[i].biViewInfoList[0].count).toFixed(2),
+                name: '已开票1',
+                value: Number((this.chartsData[i].biViewInfoList[0].count)/10000).toFixed(2),
                 type: '采购合同'
               }, {
                 name: '待开票',
-                value: Number(this.chartsData[i].biViewInfoList[1].count).toFixed(2),
+                value: Number((this.chartsData[i].biViewInfoList[1].count)/10000).toFixed(2),
                 type: '采购合同'
               }]
               text = '合同总额'
-              formatter = '{b}{c}元 </br> 占比{d}%'
-              graphicText = ' \n\n开票合计\n\n' + Number(this.chartsData[i].total).toFixed(2)
+              formatter = '{b}{c}万 </br> 占比{d}%'
+              graphicText = ' \n\n开票合计\n\n' + Number((this.chartsData[i].total)/10000).toFixed(2)
               break;
             case 2:
               // 圆环图各环节的颜色
@@ -603,16 +604,16 @@
               // 圆环图各环节的名称和值(系列中各数据项的名称和值)
               data = [{
                 name: '已付款',
-                value: Number(this.chartsData[i].biViewInfoList[0].count).toFixed(2),
+                value: Number((this.chartsData[i].biViewInfoList[0].count/10000)).toFixed(2),
                 type: '采购合同'
               }, {
                 name: '待付款',
-                value: Number(this.chartsData[i].biViewInfoList[1].count).toFixed(2),
+                value: Number((this.chartsData[i].biViewInfoList[1].count)/10000).toFixed(2),
                 type: '采购合同'
               }]
               text = '合同总额'
-              formatter = '{b}{c}元 </br> 占比{d}%'
-              graphicText = ' \n\n付款合计\n\n' + Number(this.chartsData[i].total).toFixed(2)
+              formatter = '{b}{c}万 </br> 占比{d}%'
+              graphicText = ' \n\n付款合计\n\n' + Number((this.chartsData[i].total)/10000).toFixed(2)
               break;
             case 3:
               // 圆环图各环节的颜色
@@ -636,14 +637,14 @@
               // 圆环图各环节的名称和值(系列中各数据项的名称和值)
               data = [{
                 name: '已开票',
-                value: Number(this.chartsData[i].biViewInfoList[0].count).toFixed(2),
+                value: Number((this.chartsData[i].biViewInfoList[0].count)/10000).toFixed(2),
               }, {
                 name: '待开票',
-                value: Number(this.chartsData[i].biViewInfoList[1].count).toFixed(2),
+                value: Number((this.chartsData[i].biViewInfoList[1].count)/10000).toFixed(2),
               }]
               text = '合同总额'
-              formatter = '{b}{c}元 </br> 占比{d}%'
-              graphicText = ' \n\n开票合计\n\n' + Number(this.chartsData[i].total).toFixed(2)
+              formatter = '{b}{c}万 </br> 占比{d}%'
+              graphicText = ' \n\n开票合计\n\n' + Number((this.chartsData[i].total)/10000).toFixed(2)
               break;
             case 5:
               // 圆环图各环节的颜色
@@ -651,14 +652,14 @@
               // 圆环图各环节的名称和值(系列中各数据项的名称和值)
               data = [{
                 name: '已付款',
-                value: Number(this.chartsData[i].biViewInfoList[0].count).toFixed(2),
+                value: Number((this.chartsData[i].biViewInfoList[0].count)/10000).toFixed(2),
               }, {
                 name: '待付款',
-                value: Number(this.chartsData[i].biViewInfoList[1].count).toFixed(2),
+                value: Number((this.chartsData[i].biViewInfoList[1].count)/10000).toFixed(2),
               }]
               text = '合同总额'
-              formatter = '{b}{c}元 </br> 占比{d}%'
-              graphicText = ' \n\n付款合计\n\n' + Number(this.chartsData[i].total).toFixed(2)
+              formatter = '{b}{c}万 </br> 占比{d}%'
+              graphicText = ' \n\n付款合计\n\n' + Number((this.chartsData[i].total)/10000).toFixed(2)
               break;
           }
           myChart.setOption({

src/views/outboundManagement/weighingManagementNew.vue

@@ -262,8 +262,8 @@
           </el-col>
           <el-col :span="12">
             <div class="list-info">
-              <div style="justify-content: space-between" class="flex">
-                <div>
+              <div style="justify-content: space-between;" class="flex">
+                <div style="min-width:146px;">
                   <el-button v-if="tpyeNo == 1" @click="add" type="primary">新增</el-button>
                   <el-button v-if="tpyeNo == 1" @click="deletelist" type="danger">删除</el-button>
                   <el-button v-if="tpyeNo == 2" @click="statustypechangelist(3)"
@@ -2004,7 +2004,7 @@
     text-align: right;
     padding: 0 10px 0 20px;
     border-radius: 10px;
-    margin: 0 20px 20px 20px;
+    margin: 0 20px 20px 21px;
     position: absolute;
     top: 140px;
     width: 465px;