优化文档内容

package.json

@@ -12,6 +12,7 @@
   "dependencies": {
     "ant-design-vue": "^1.7.8",
     "axios": "^0.26.1",
+    "echarts": "^4.9.0",
     "less": "^4.1.2",
     "less-loader": "^10.2.0",
     "vue": "^2.5.2",

src/components/Sidebar.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="sidebar_body">
-    <a-menu theme="dark" mode="inline" :default-selected-keys="[key]"  class="sidebar" :defaultOpenKeys="[openKey]" :open-keys="openKeys" @openChange="onOpenChange">
+    <a-menu theme="dark" mode="inline" :default-selected-keys="[key]"  class="sidebar" :defaultOpenKeys="[openKey]" :open-keys="openKeys" @openChange="onOpenChange" :selectedKeys="[key]" @click="handleClick">
       <template v-for="item in items1">
         <a-menu-item v-if="!item.children " :key="item.key" :disabled="item.isShow">
           <router-link :to="item.url">
@@ -111,6 +111,9 @@ export default {
     // this.showMenu()
   },
   methods:{
+    handleClick(e){
+      this.key = e.key;
+    },
     onOpenChange(openKeys) {
       const latestOpenKey = openKeys.find(key => this.openKeys.indexOf(key) === -1);
       // console.info(latestOpenKey)
@@ -186,7 +189,9 @@ export default {
       this.showMenu()
     },
     $route(to,form){
+      // this.onOpenChange(to.path)
       // console.info(to)
+      if(to.path=='/Home'){this.key=''}
       // this.key=to.path
       // this.showMenu()
     }

src/components/billDetails/index.vue

@@ -8,7 +8,17 @@
           <span>订单编号：</span>
           <a-input v-model="query.batchcode" />
         </a-col>
-        <a-col :span="18" class="query_item query_item1">
+        <a-col :span="6" class="query_item" >
+          <span>结算状态：</span>
+          <a-select default-value=""  v-model="query.close_status">
+            <a-select-option value="">全部</a-select-option>
+            <a-select-option value="1">无结算信息</a-select-option>
+            <a-select-option value="4">收款信息错误</a-select-option>
+            <a-select-option value="3">用户名和收款人不一致</a-select-option>
+            <a-select-option value="5">结算成功</a-select-option>
+          </a-select>
+        </a-col>
+        <a-col :span="12" class="query_item query_item1">
           <a-space :size="21">
             <a-button type="primary" class="query_button" @click="getList(1)">查 询</a-button>
             <a-button class="query_button" @click="resetQurey">重 置</a-button>
@@ -76,7 +86,8 @@
         endTotal:10,
         limit:10,
         query:{
-          batchcode:''
+          batchcode:'',
+          close_status:''
         },
         // 当前页数
         page:1,
@@ -84,15 +95,15 @@
         income:'',
         data:[],
         columns:[
+          // {
+          //   title: '序号',
+          //   dataIndex: 'id',
+          //   width:'65px',
+          //   align:'center'
+          // },
           {
-            title: '序号',
-            dataIndex: 'id',
-            width:'65px',
-            align:'center'
-          },
-          {
-            title: '结算时间',
-            dataIndex: 'createtime',
+            title: '订单创建时间',
+            dataIndex: 'order_createtime',
             width:'120px',
             // // align:'center'
           },
@@ -210,6 +221,12 @@
             width:'120px',
             // align:'center'
           },
+          {
+            title: '结算时间',
+            dataIndex: 'order_completetime',
+            width:'120px',
+            // // align:'center'
+          },
           {
             title: '结算状态',
             dataIndex: 'close_status',

src/components/page/Home/index.vue

@@ -37,7 +37,8 @@
                 <!-- <a-range-picker  class="picker"/> -->
               </div>
               <a-tab-pane loading="true" tab="销售额" key="1">
-                <schart class="schart" canvasId="bar" :options="options1"></schart>
+                <!-- <schart class="schart" canvasId="bar" :options="options1"></schart> -->
+                <div id="main" style="width: 100%; " class="schart"></div>
               </a-tab-pane>
               <!-- <a-tab-pane tab="访问量" key="2">
                 <schart class="schart" canvasId="bar" :options="options1"></schart>
@@ -136,6 +137,10 @@ export default {
       active1:'year',
       options1: {
         type: 'bar',
+        showValue:false,
+        legend:{
+          display:true
+        },
         // title: {
         //   text: '最近一周各品类销售图'
         // },
@@ -150,10 +155,10 @@ export default {
             label: '百货',
             data: [164, 178, 190, 135, 160]
           },
-          {
-            label: '食品',
-            data: [144, 198, 150, 235, 120]
-          }
+          // {
+          //   label: '食品',
+          //   data: [144, 198, 150, 235, 120]
+          // }
         ]
       },
     }
@@ -164,7 +169,32 @@ export default {
   created(){
     this.getList()
   },
+  mounted() {
+    // this.drawChart();
+  },
   methods:{
+    drawChart() {
+      // 基于准备好的dom，初始化echarts实例  这个和上面的main对应
+      let myChart = this.$echarts.init(document.getElementById("main"));
+      // 指定图表的配置项和数据
+      let option = {
+        // title: {
+        //   text: "ECharts 入门示例",
+        // },
+        color: ['#4A90E2','#F5A623',],
+        tooltip: {},
+        legend: {
+          data: ["订单金额总额",'标的价款总额'],
+        },
+        xAxis: {
+          data: this.options1.labels,
+        },
+        yAxis: {},
+        series: this.options1.datasets
+      };
+      // 使用刚指定的配置项和数据显示图表。
+      myChart.setOption(option);
+    },
     changeTiem(time,type){
       if(type==1){
         this.query.rightDate=time
@@ -196,8 +226,14 @@ export default {
           }
           this.rankList=res.data.entrust_ranking
           this.rankList1=res.data.entrust_sale_ranking
+          // let type={type:'bar'}
+          res.data.treeMap.map(item=>{
+            item.type='bar'
+            item.name=item.label
+          })
           this.options1.datasets=res.data.treeMap
           this.options1.labels=res.data.label
+          this.drawChart()
         }else{
           this.$message.error(res.msg);
         }

src/components/page/afterService/invoice.vue

@@ -25,7 +25,16 @@
             <span>订单编号：</span>
             <a-input v-model="query.batchcode"/>
           </a-col>
-
+          <a-col :lg="8" :xl="8" :xxl="6" class="query_item">
+            <span>开票状态：</span>
+            <a-select  v-model="query.ticketstatus">
+              <a-select-option value="">全部</a-select-option>
+              <a-select-option value="1">未开票</a-select-option>
+              <a-select-option value="2">开票中</a-select-option>
+              <a-select-option value="3">开票成功</a-select-option>
+              <a-select-option value="4">开票失败</a-select-option>
+            </a-select>
+          </a-col>
           <!-- <a-col :lg="8" :xl="8" :xxl="6" class="query_item" >
             <span>订单类型：</span>
             <a-select default-value="全部" >
@@ -48,7 +57,7 @@
             <span>创建时间：</span>
             <a-range-picker valueFormat="YYYY-MM-DD" v-model="query.createtime"/>
           </a-col>
-          <a-col :lg="24" :xl="24" :xxl="18" class="query_item query_item1">
+          <a-col :lg="24" :xl="24" :xxl="12" class="query_item query_item1">
             <a-space :size="21">
               <a-button type="primary" class="query_button" @click="getAllDate(1)">查 询</a-button>
               <a-button class="query_button" @click="resetQurey">重 置</a-button>
@@ -62,6 +71,9 @@
           <!-- <a-button type="primary" class="query_button">获 取</a-button> -->
         </div>
         <a-table :columns="columns" :data-source="data" bordered :pagination="false">
+          <template slot="ticketstatus" slot-scope="ticketstatus">
+            <span>{{ticketstatus==1?'未开票':ticketstatus==2?'开票中':ticketstatus==3?'开票成功':'开票失败'}}</span>
+          </template>
           <template slot="status" slot-scope="status">
             <span>{{status==2?'待交付订单':status==3?'待结算订单':'已终止订单'}}</span>
           </template>
@@ -106,6 +118,7 @@ export default {
         batchcode:'',
         status:'',
         createtime:[],
+        ticketstatus:''
       },
       pageSizeOptions: ['10', '20', '30', '40', '50'],
       //一页多少条
@@ -168,6 +181,13 @@ export default {
           width:'90px'
           // align:'center'
         },
+        {
+          title: '开票状态',
+          dataIndex: 'ticketstatus',
+          scopedSlots: { customRender: 'ticketstatus' },
+          width:'90px'
+          // align:'center'
+        },
         {
           title: '交易状态',
           dataIndex: 'status',

src/main.js

@@ -5,6 +5,8 @@ import App from './App'
 import router from './router'
 import Antd from 'ant-design-vue';
 import 'ant-design-vue/dist/antd.css';
+import echarts from "echarts";
+
 
 //引入svg组件
 // import IconSvg from './components/svgIcon'
@@ -14,6 +16,7 @@ import 'ant-design-vue/dist/antd.css';
 
 Vue.use(Antd);
 Vue.config.productionTip = false
+Vue.prototype.$echarts = echarts;
 Vue.prototype.$host = 'http://58.30.231.138:8899'
 router.beforeEach((to,from,next) => {
   // console.log('beforeEach')