首页添加财富图表

package.json

@@ -45,7 +45,7 @@
     "clipboard": "2.0.4",
     "core-js": "3.6.5",
     "corps": "^0.1.0",
-    "echarts": "4.2.1",
+    "echarts": "^4.2.1",
     "element-ui": "2.14.1",
     "file-saver": "2.0.1",
     "fuse.js": "3.4.4",

src/api/index.js

@@ -77,3 +77,17 @@ export function remindExpirationData(query){
     params: query
   })
 }
+// 财务图表
+export function getFeeStatistics(){
+  return request({
+    url:'/basicdata/fees/getFeeStatistics',
+    method:'get'
+  })
+}
+// 客户欠款
+export function getArrearsStatistics(){
+  return request({
+    url:'/basicdata/fees/getArrearsStatistics',
+    method:'get'
+  })
+}

src/settings.js

@@ -1,5 +1,5 @@
 module.exports = {
-  title: '途宝智慧云仓平台',
+  title: '智慧云仓平台',
 
   /**
    * 侧边栏主题 深色主题theme-dark，浅色主题theme-light

src/views/Warehousing/goodsTransfer/AddOrUpdate.vue

@@ -639,9 +639,7 @@
       <el-collapse-item>
         <template slot="title">
           <i class="el-icon-s-order" style="font-size: 16px"></i>
-          <span style="font-size: 16px; font-weight: bolder; margin-left: 5px"
-            >附件明细</span
-          >
+          <span style="font-size: 16px; font-weight: bolder; margin-left: 5px">附件明细</span>
         </template>
         <up-load
           :relevantAttachments="relevantAttachments"
@@ -653,9 +651,7 @@
       <el-collapse-item>
         <template slot="title">
           <i class="el-icon-circle-plus" style="font-size: 16px"></i>
-          <span style="font-size: 16px; font-weight: bolder; margin-left: 5px"
-            >收款信息</span
-          >
+          <span style="font-size: 16px; font-weight: bolder; margin-left: 5px">收款信息</span>
         </template>
         <div
           class="dialogTableTitle flex a-center jlr"
@@ -664,29 +660,25 @@
             justify-content: space-between;
             align-items: center;
             margin: 10px 0;
-          "
-        >
+          ">
           <div>
             <el-button
               size="small"
               type="primary"
               :disabled="browseStatus"
-              @click.prevent="addCollection()"
-              >新行
+              @click.prevent="addCollection()">新行
             </el-button>
             <el-button
               type="primary"
               size="small"
               :disabled="browseStatus"
               @click="saveForm"
-              >保 存</el-button
-            >
+              >保 存</el-button>
             <el-button
               size="small"
               @click.prevent="handleSelect(3)"
               type="danger"
-              >作业费协议</el-button
-            >
+              >作业费协议</el-button>
             <el-button
               size="small"
               type="primary"
@@ -697,8 +689,7 @@
               type="primary"
               size="small"
               v-if="browseStatus"
-              @click="feeChange('D')"
-            >
+              @click="feeChange('D')">
               费用变更
             </el-button>
           </div>
@@ -792,22 +783,19 @@
             header-align="center"
             align="center"
             width="180px"
-            label="计价单位"
-          >
+            label="计价单位">
             <template slot-scope="scope">
               <el-select
                 v-model="scope.row.fFeeUnitid"
                 placeholder="请选择计价单位"
                 clearable
                 :disabled="browseStatus || scope.row.fBillstatus == 6"
-                @change="changeFeeUnit(scope.row)"
-              >
+                @change="changeFeeUnit(scope.row)">
                 <el-option
                   v-for="(item, index) in fFeetUnitOptions"
                   :key="index.dictValue"
                   :label="item.dictLabel"
-                  :value="item.dictValue"
-                />
+                  :value="item.dictValue"/>
               </el-select>
             </template>
           </el-table-column>
@@ -816,8 +804,7 @@
             header-align="center"
             align="center"
             width="130px"
-            label="数量"
-          >
+            label="数量">
             <template slot-scope="scope">
               <el-input
                 oninput='this.value=this.value.replace(/[^0-9.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d).*$/,"$1$2.$3")'
@@ -825,8 +812,7 @@
                 placeholder="数量"
                 :disabled="browseStatus || scope.row.fBillstatus == 6"
                 @change="changeContractAmt(scope.row)"
-                show-word-limit
-              />
+                show-word-limit/>
             </template>
           </el-table-column>
           <el-table-column
@@ -843,8 +829,7 @@
                 placeholder="单价"
                 :disabled="browseStatus || scope.row.fSrcTypeId !== 0 || scope.row.fBillstatus == 6"
                 @change="changeContractAmt(scope.row)"
-                show-word-limit
-              />
+                show-word-limit/>
             </template>
           </el-table-column>
           <el-table-column
@@ -852,16 +837,14 @@
             header-align="center"
             align="center"
             width="130px"
-            label="金额"
-          >
+            label="金额">
             <template slot-scope="scope">
               <el-input
                 disabled
                 oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
                 v-model="scope.row.fAmount"
                 placeholder="金额"
-                show-word-limit
-              />
+                show-word-limit/>
             </template>
           </el-table-column>
           <el-table-column
@@ -869,14 +852,12 @@
             header-align="center"
             align="center"
             width="130px"
-            label="结算方式"
-          >
+            label="结算方式">
             <template slot-scope="scope">
               <el-select
                 v-model="scope.row.fStltypeid"
                 placeholder="请选择结算表票结、月结"
-                :disabled="browseStatus || scope.row.fBillstatus == 6"
-              >
+                :disabled="browseStatus || scope.row.fBillstatus == 6">
                 <el-option
                   v-for="(item, index) in fStltypeOptions"
                   :key="index.dictValue"
@@ -891,15 +872,13 @@
             header-align="center"
             align="center"
             width="130px"
-            label="币别"
-          >
+            label="币别">
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.fCurrency"
                 :disabled="browseStatus || scope.row.fBillstatus == 6"
                 placeholder="币别"
-                show-word-limit
-              />
+                show-word-limit/>
             </template>
           </el-table-column>
           <el-table-column
@@ -907,15 +886,13 @@
             header-align="center"
             align="center"
             width="130px"
-            label="汇率"
-          >
+            label="汇率">
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.fExrate"
                 :disabled="browseStatus || scope.row.fBillstatus == 6"
                 placeholder="汇率"
-                show-word-limit
-              />
+                show-word-limit/>
             </template>
           </el-table-column>
           <el-table-column
@@ -923,15 +900,13 @@
             header-align="center"
             align="center"
             width="130px"
-            label="税率"
-          >
+            label="税率">
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.fTaxrate"
                 :disabled="browseStatus || scope.row.fBillstatus == 6"
                 placeholder="税率"
-                show-word-limit
-              />
+                show-word-limit/>
             </template>
           </el-table-column>
           <el-table-column
@@ -939,15 +914,13 @@
             header-align="center"
             align="center"
             width="130px"
-            label="提单号"
-          >
+            label="提单号">
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.fMblno"
                 :disabled="browseStatus || scope.row.fBillstatus == 6"
                 placeholder="提单号"
-                show-word-limit
-              />
+                show-word-limit/>
             </template>
           </el-table-column>
           <el-table-column
@@ -955,15 +928,13 @@
             header-align="center"
             align="center"
             width="140px"
-            label="品名"
-          >
+            label="品名">
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.fProductName"
                 :disabled="browseStatus || scope.row.fBillstatus == 6"
                 placeholder="品名"
-                show-word-limit
-              />
+                show-word-limit/>
             </template>
           </el-table-column>
           <el-table-column
@@ -971,15 +942,13 @@
             header-align="center"
             align="center"
             width="130px"
-            label="品牌"
-          >
+            label="品牌">
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.fMarks"
                 :disabled="browseStatus || scope.row.fBillstatus == 6"
                 placeholder="品牌"
-                show-word-limit
-              />
+                show-word-limit/>
             </template>
           </el-table-column>
           <el-table-column
@@ -987,29 +956,25 @@
             header-align="center"
             align="center"
             width="130px"
-            label="来源"
-          >
+            label="来源">
             <template slot-scope="scope">
               <span v-if="scope.row.fSrcTypeId === 0">录入</span>
               <span v-if="scope.row.fSrcTypeId == 1">协议</span>
               <span v-if="scope.row.fSrcTypeId == 10">变更</span>
             </template>
           </el-table-column>
-
           <el-table-column
             prop="remark"
             header-align="center"
             align="center"
             width="150px"
-            label="备注"
-          >
+            label="备注">
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.remark"
                 :disabled="browseStatus || scope.row.fBillstatus == 6"
                 placeholder="备注"
-                show-word-limit
-              />
+                show-word-limit/>
             </template>
           </el-table-column>
           <el-table-column
@@ -1017,15 +982,13 @@
             align="center"
             label="操作"
             width="200px"
-            fixed="right"
-          >
+            fixed="right">
             <template slot-scope="scope">
               <el-button
                 @click.native.prevent="deleteRow(scope.$index, warehouseDrList)"
                 size="small"
                 :disabled="browseStatus || scope.row.fBillstatus == 6"
-                >移除</el-button
-              >
+                >移除</el-button>
               <el-button
                 size="small"
                 @click="listCheck(scope.row)"
@@ -1042,13 +1005,10 @@
           </el-table-column>
         </el-table>
       </el-collapse-item>
-
       <el-collapse-item>
         <template slot="title">
           <i class="el-icon-remove" style="font-size: 16px"></i>
-          <span style="font-size: 16px; font-weight: bolder; margin-left: 5px"
-            >付款信息</span
-          >
+          <span style="font-size: 16px; font-weight: bolder; margin-left: 5px">付款信息</span>
         </template>
         <div
           class="dialogTableTitle flex a-center jlr"
@@ -1057,37 +1017,32 @@
             justify-content: space-between;
             align-items: center;
             margin: 10px 0;
-          "
-        >
+          ">
           <div>
             <el-button
               type="primary"
               :disabled="browseStatus"
               @click.prevent="addpayment()"
-              size="small"
-              >新行
+              size="small">新行
             </el-button>
             <el-button
               type="primary"
               size="small"
               @click="saveForm"
               :disabled="browseStatus"
-              >保 存</el-button
-            >
+              >保 存</el-button>
             <el-button
               type="danger"
               size="small"
               @click.prevent="handleSelect(1)"
-              >作业费协议</el-button
-            >
+              >作业费协议</el-button>
             <el-button
               type="info"
               size="small"
               @click.prevent="printCr"
               v-if="isShowInvoice == 0"
             >请款单
-            </el-button
-            >
+            </el-button>
             <el-button
               size="small"
               type="primary"
@@ -1099,9 +1054,7 @@
               size="small"
               v-if="browseStatus"
               @click="feeChange('C')"
-            >
-              费用变更
-            </el-button>
+            >费用变更</el-button>
           </div>
         </div>
         <el-table
@@ -1112,31 +1065,27 @@
           stripe
           show-summary
           :summary-method="warehouseDrSummaries"
-          @selection-change="SelectCr"
-        >
+          @selection-change="SelectCr">
           <el-table-column type="selection" width="50" align="center" fixed />
           <el-table-column
             label="序号"
             type="index"
             width="50"
             fixed
-            align="center"
-          />
+            align="center"/>
           <el-table-column
             prop="fCorpid"
             header-align="center"
             align="center"
             width="300px"
-            label="客户名称"
-          >
+            label="客户名称">
             <template slot-scope="scope">
               <el-select
                 v-model="scope.row.fCorpid"
                 filterable
                 clearable
                 placeholder="客户名称"
-                :disabled="browseStatus || scope.row.fBillstatus == 6"
-              >
+                :disabled="browseStatus || scope.row.fBillstatus == 6">
                 <el-option
                   v-for="(item, index) in fMblnoOptions"
                   :key="index.fId"
@@ -1151,16 +1100,14 @@
             header-align="center"
             align="center"
             width="240px"
-            label="费用名称"
-          >
+            label="费用名称">
             <template slot-scope="scope">
               <el-select
                 v-model="scope.row.fFeeid"
                 clearable
                 filterable
                 placeholder="费用名称"
-                :disabled="browseStatus || scope.row.fBillstatus == 6"
-              >
+                :disabled="browseStatus || scope.row.fBillstatus == 6">
                 <el-option
                   v-for="(item, index) in fCNameOptions"
                   :key="index.fId"
@@ -1175,15 +1122,13 @@
             header-align="center"
             align="center"
             width="180px"
-            label="作业类型"
-          >
+            label="作业类型">
             <template slot-scope="scope">
               <el-select
                 style="width: 80%"
                 v-model="scope.row.fBusinessType"
                 filterable
-                disabled
-              >
+                disabled>
                 <el-option
                   v-for="(item, index) in businessTypeOption"
                   :key="index.dictValue"
@@ -1193,28 +1138,24 @@
               </el-select>
             </template>
           </el-table-column>
-
           <el-table-column
             prop="fFeeUnitid"
             header-align="center"
             align="center"
             width="180px"
-            label="计价单位"
-          >
+            label="计价单位">
             <template slot-scope="scope">
               <el-select
                 v-model="scope.row.fFeeUnitid"
                 placeholder="请选择计价单位"
                 clearable
                 :disabled="browseStatus || scope.row.fBillstatus == 6"
-                @change="changeFeeUnit(scope.row)"
-              >
+                @change="changeFeeUnit(scope.row)">
                 <el-option
                   v-for="(item, index) in fFeetUnitOptions"
                   :key="index.dictValue"
                   :label="item.dictLabel"
-                  :value="item.dictValue"
-                />
+                  :value="item.dictValue"/>
               </el-select>
             </template>
           </el-table-column>
@@ -1223,8 +1164,7 @@
             header-align="center"
             align="center"
             width="150px"
-            label="数量"
-          >
+            label="数量">
             <template slot-scope="scope">
               <el-input
                 oninput='this.value=this.value.replace(/[^0-9.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d).*$/,"$1$2.$3")'
@@ -1232,8 +1172,7 @@
                 :disabled="browseStatus || scope.row.fBillstatus == 6"
                 @change="changeContractAmt(scope.row)"
                 placeholder="数量"
-                show-word-limit
-              />
+                show-word-limit/>
             </template>
           </el-table-column>
           <el-table-column
@@ -1241,8 +1180,7 @@
             header-align="center"
             align="center"
             width="150px"
-            label="单价"
-          >
+            label="单价">
             <template slot-scope="scope">
               <el-input
                 oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
@@ -1250,8 +1188,7 @@
                 :disabled="browseStatus || scope.row.fSrcTypeId !== 0 || scope.row.fBillstatus == 6"
                 @change="changeContractAmt(scope.row)"
                 placeholder="单价"
-                show-word-limit
-              />
+                show-word-limit/>
             </template>
           </el-table-column>
           <el-table-column
@@ -1259,16 +1196,14 @@
             header-align="center"
             align="center"
             width="150px"
-            label="金额"
-          >
+            label="金额">
             <template slot-scope="scope">
               <el-input
                 disabled
                 oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
                 v-model="scope.row.fAmount"
                 placeholder="金额"
-                show-word-limit
-              />
+                show-word-limit/>
             </template>
           </el-table-column>
           <el-table-column
@@ -1276,14 +1211,12 @@
             header-align="center"
             align="center"
             width="130px"
-            label="结算方式"
-          >
+            label="结算方式">
             <template slot-scope="scope">
               <el-select
                 v-model="scope.row.fStltypeid"
                 placeholder="请选择结算表票结、月结"
-                :disabled="browseStatus || scope.row.fBillstatus == 6"
-              >
+                :disabled="browseStatus || scope.row.fBillstatus == 6">
                 <el-option
                   v-for="(item, index) in fStltypeOptions"
                   :key="index.dictValue"
@@ -1293,21 +1226,18 @@
               </el-select>
             </template>
           </el-table-column>
-
           <el-table-column
             prop="fCurrency"
             header-align="center"
             align="center"
             width="150px"
-            label="币别"
-          >
+            label="币别">
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.fCurrency"
                 :disabled="browseStatus || scope.row.fBillstatus == 6"
                 placeholder="币别"
-                show-word-limit
-              />
+                show-word-limit/>
             </template>
           </el-table-column>
           <el-table-column
@@ -1315,15 +1245,13 @@
             header-align="center"
             align="center"
             width="150px"
-            label="汇率"
-          >
+            label="汇率">
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.fExrate"
                 :disabled="browseStatus || scope.row.fBillstatus == 6"
                 placeholder="汇率"
-                show-word-limit
-              />
+                show-word-limit/>
             </template>
           </el-table-column>
           <el-table-column
@@ -1331,25 +1259,21 @@
             header-align="center"
             align="center"
             width="150px"
-            label="税率"
-          >
+            label="税率">
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.fTaxrate"
                 :disabled="browseStatus || scope.row.fBillstatus == 6"
                 placeholder="税率"
-                show-word-limit
-              />
+                show-word-limit/>
             </template>
           </el-table-column>
-
           <el-table-column
             prop="fMblno"
             header-align="center"
             align="center"
             width="130px"
-            label="提单号"
-          >
+            label="提单号">
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.fMblno"

src/views/index.vue

@@ -839,13 +839,15 @@
         <div id="voyage" style="width: 100%;height: 350px;"></div>
       </div>
     </div>
-<!--    快捷入库-->
+    <div id="finance" v-if="wealthChart" style="width: 100%;height: 600px;"></div>
+    <div id="arrears" v-if="wealthChart" style="width: 100%;height: 600px;"></div>
+<!--快捷入库-->
     <fast-in-stock
       ref="fastInStock"
       v-if="fastInStockVisble"
       @closeDialog="closeInStock"
     ></fast-in-stock>
-<!--    快速出库-->
+<!--快速出库-->
     <fast-out-stock
       ref="fastOutStock"
       v-if="fastOutStockVisble"
@@ -867,13 +869,15 @@ import {
   bookingSpace,
   locationRanking,
   getProfitData,
-  remindExpirationData
+  remindExpirationData,
+  getFeeStatistics, getArrearsStatistics
 } from "../../src/api/index";
 import Cookies from "js-cookie";
 import fastInStock from '../../src/components/fastStorage/fastInStock/index'
 import fastOutStock from '../../src/components/fastStorage/fastOutStock/index'
 import {getToken} from "@/utils/auth";
 import {currentLogin} from "@/api/warehouseCheck";
+import { getUserProfile } from "@/api/system/user";
 
 export default {
   name: "index",
@@ -881,6 +885,7 @@ export default {
     return {
       fastInStockVisble: false,
       fastOutStockVisble: false,
+      wealthChart:false,
       bookingData:[],
       editModel: {},
       // 版本号
@@ -1046,6 +1051,19 @@ export default {
         this.oceanVessel()
       })
     }
+    getUserProfile().then(res=>{
+      for (let item in res.data.roles){
+        if (res.data.roles[item].roleKey == "wealthStatistics"){
+          getFeeStatistics().then(res=>{
+            this.financeLine(res.data)
+          })
+          getArrearsStatistics().then(res=>{
+            this.customerArrears(res.data)
+          })
+          this.wealthChart = true
+        }
+      }
+    })
   },
   methods: {
     // 船名航次
@@ -1521,6 +1539,116 @@ export default {
     goTarget(href) {
       window.open(href, "_blank");
     },
+    //财务图表
+    financeLine(data) {
+      // 基于准备好的dom，初始化echarts实例，所以只能在mounted中调用
+      let myChart = this.$echarts.init(document.getElementById("finance"));
+      // 绘制图表
+      myChart.setOption({
+        legend: {
+          left: '10%',
+          top: '4%'
+        },
+        title: {
+          text: "利润分析",
+          left: "center",
+          subtext: "实时数据"
+        },
+        tooltip: {},
+        color: ["#5470c6","#92cc75","#fac858"],
+        dataset: data,
+        xAxis: { type: 'category' },
+        yAxis: [
+          {
+            type: 'value',
+            scale: true,
+            axisLabel: {
+              formatter: '{value} 万元'
+            }
+          }
+        ],
+        grid: {
+          left: "3%",
+          right: "4%",
+          bottom: "3%",
+          containLabel: true,
+        },
+        // Declare several bar series, each will be mapped
+        // to a column of dataset.source by default.
+        series: [{ type: 'bar',
+          label: {
+            show: true,
+            position: 'top',
+            valueAnimation: true
+          }}, { type: 'bar',
+          label: {
+            show: true,
+            position: 'top',
+            valueAnimation: true
+          }}, { type: 'bar',
+          label: {
+            show: true,
+            position: 'top',
+            valueAnimation: true
+          }}]
+      });
+    },
+    customerArrears(data){
+      // 基于准备好的dom，初始化echarts实例，所以只能在mounted中调用
+      let myChart = this.$echarts.init(document.getElementById("arrears"));
+      // 绘制图表
+      myChart.setOption({
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'shadow'
+          }
+        },
+        title: {
+          text: "欠款排行",
+          left: "center",
+          subtext: "实时数据"
+        },
+        color: ["#3298db"],
+        grid: {
+          left: '3%',
+          right: '4%',
+          bottom: '3%',
+          containLabel: true
+        },
+        xAxis: [
+          {
+            type: 'category',
+            data: data.key,
+            axisTick: {
+              alignWithLabel: true
+            }
+          }
+        ],
+        yAxis: [
+          {
+            type: 'value',
+            scale: true,
+            axisLabel: {
+              formatter: '{value} 万元'
+            }
+          }
+        ],
+        series: [
+          {
+            name: '欠款',
+            type: 'bar',
+            barWidth: '60%',
+            data: data.value,
+            label: {
+              show: true,
+              position: 'top',
+              valueAnimation: true
+            }
+          }
+        ]
+      })
+    },
     //仓库图表
     drawLine() {
       // 基于准备好的dom，初始化echarts实例，所以只能在mounted中调用
@@ -1733,7 +1861,7 @@ export default {
         ],
         yAxis: [
           {
-            type: "value",
+            type: "value"
           },
         ],
         series: [
@@ -1742,6 +1870,11 @@ export default {
             type: "bar",
             barWidth: "60%",
             data: this.commoditytwo,
+            label: {
+              show: true,
+              position: 'top',
+              valueAnimation: true
+            }
           },
         ],
       });

src/views/login.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">途宝智慧云仓平台</h3>
+      <h3 class="title">智慧云仓平台</h3>
 <!--      靖润-->
 <!--      <h3 class="title" style="font-family: '微软雅黑 Light'; color: #265EE4">靖润科技陆运平台</h3>-->
 
@@ -20,7 +20,6 @@
           @keyup.enter.native="handleLogin"
         >
 <!--          <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />-->
-
           <i slot="prefix" class="el-icon-lock" style="font-size: 20px;padding-top: 11px;padding-left: 2px;color: #565656;"></i>
         </el-input>
       </el-form-item>