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

src/views/home/index.vue

@@ -428,7 +428,8 @@
           let data = []
           let text = ""
           let formatter = ""
-          let graphicText = '\n\n总计\n\n' + this.chartsData[i].total
+          let graphicText = ''
+          debugger
           switch (i) {
             case 0:
               // 圆环图各环节的颜色
@@ -443,6 +444,8 @@
               }]
               text = '合同总量'
               formatter = '{b}{c}吨 </br> 占比{d}%'
+              graphicText = ' \n\n总量合计\n\n' +Number(this.chartsData[i].total).toFixed(2)
+
               break;
             case 1:
               // 圆环图各环节的颜色
@@ -457,6 +460,7 @@
               }]
               text = '合同总额'
               formatter = '{b}{c}元 </br> 占比{d}%'
+                graphicText = ' \n\n开票合计\n\n' + Number(this.chartsData[i].total).toFixed(2)
               break;
             case 2:
               // 圆环图各环节的颜色
@@ -471,6 +475,7 @@
               }]
               text = '合同总额'
               formatter = '{b}{c}元 </br> 占比{d}%'
+               graphicText = ' \n\n付款合计\n\n' + Number(this.chartsData[i].total).toFixed(2)
               break;
             case 3:
               // 圆环图各环节的颜色
@@ -485,7 +490,7 @@
               }]
               text = '合同总量'
               formatter = '{b}{c}吨 </br> 占比{d}%'
-              break;
+               graphicText = ' \n\n总量合计\n\n' + Number(this.chartsData[i].total).toFixed(2)
             case 4:
               // 圆环图各环节的颜色
               color = ['#247ef4', '#3a3b40'];
@@ -499,6 +504,7 @@
               }]
               text = '合同总额'
               formatter = '{b}{c}元 </br> 占比{d}%'
+              graphicText = ' \n\n开票合计\n\n' + Number(this.chartsData[i].total).toFixed(2)
               break;
             case 5:
               // 圆环图各环节的颜色
@@ -513,6 +519,7 @@
               }]
               text = '合同总额'
               formatter = '{b}{c}元 </br> 占比{d}%'
+               graphicText = ' \n\n付款合计\n\n' + Number(this.chartsData[i].total).toFixed(2)
               break;
           }
           myChart.setOption({

src/views/login/index.vue

@@ -130,7 +130,7 @@
                          @click.native.prevent="handleFastLogin">{{ $t('login.login') }}</el-button>
             </el-form> -->
             <ul>
-              <li @click="
+              <!-- <li @click="
                   tabsOne = false
                   $refs['loginForm2'].resetFields()
                 " :class="{ selected: !tabsOne }">
@@ -141,7 +141,7 @@
                   $refs['loginForm'].resetFields()
                 " :class="{ selected: tabsOne }">
                 {{ $t('login.noLogin') }}
-              </li>
+              </li> -->
             </ul>
             <el-form v-show="tabsOne" ref="loginForm" :model="loginForm" :rules="getFormRules" auto-complete="on"
               label-position="left">
@@ -216,7 +216,7 @@
               </el-button>
             </el-form>
             <div class="make-easier">
-              <p>{{ $t('common.makeEasier') }}</p>
+              <!-- <p>{{ $t('common.makeEasier') }}</p> -->
               <!-- <BaseLink @click="goBackstage" :underline="false" type="primary">
                 &nbsp;&nbsp;{{ $t('common.goBackstage') }}
               </BaseLink> -->

src/views/newTask/listPage.vue

@@ -395,14 +395,11 @@ export default {
           EventBus.$emit('error', this.$t('workNotification.noRelatedType'))
         } else {
           if(url == 'paymentManagement'){
-            //付款模块传参仓库
+            //付款模块传参(仓库)
              axios({
               method: 'get',
               url: process.env.VUE_APP_BASE_API + '/paymentManagement/getInfo?id='+data.businessId,
             }).then((response) => {
-              //编辑接口
-              console.log(response)
-              console.log(response.data.data.warehouseName)
               this.$router.push({
               name: url,
               query:{warehouseName:response.data.data.warehouseName}

src/views/workNotification/utils/index.js

@@ -820,7 +820,7 @@ export function payment (code, state) {
 export function warehouseReceiptRegulation (code, state) {
   if (code === 'TRADE-WAREHOUSE-REPORT') {
     // 付款管理
-    return 'tradeServicesManagement'
+    return 'stockWarehouseReceiptRegulation'
   }
   return undefined
 }