凯和首页增加利润统计、入库列表页样式调整

src/views/Warehousing/inStock/index.vue

@@ -457,7 +457,7 @@
           :height="tableHeight"
           @expand-change="expandChange"
         >
-          <el-table-column type="selection" width="60" fixed align="center" />
+          <el-table-column type="selection" fixed align="center" />
           <el-table-column type="expand" fixed="left">
             <template slot-scope="props">
               <el-table
@@ -496,7 +496,7 @@
                 </el-table-column>
                 <el-table-column label="入库净重(kg)" prop="fNetweight" align="center" show-overflow-tooltip width="150">
                 </el-table-column>
-                <el-table-column label="箱号" prop="fCntrno" align="center" show-overflow-tooltip width="100">
+                <el-table-column label="箱号" prop="fCntrno" align="center" show-overflow-tooltip width="180">
                 </el-table-column>
               </el-table>
             </template>
@@ -504,7 +504,6 @@
           <el-table-column
             type="index"
             label="行号"
-            width="50"
             align="center"
             fixed
           />

src/views/finance/Invoicing/index.vue

@@ -633,11 +633,11 @@
             <el-button type="primary" @click="addPage" size="mini"
               >新 增</el-button
             >
-            <el-button
-              type="warning"
-              size="mini"
-              @click="openPrint"
-            >打印</el-button>
+<!--            <el-button-->
+<!--              type="warning"-->
+<!--              size="mini"-->
+<!--              @click="openPrint"-->
+<!--            >打印</el-button>-->
           </div>
           <div style="margin: 0 12px">
             <el-button

src/views/index.vue

@@ -10,7 +10,7 @@
                   class="el-icon-download"
                   style="font-size: 50px; text-align: center"
                 ></i>
-                <p>入库</p>
+                <p>常规入库</p>
               </div>
             </li>
             <li @click="jump('/business/outStock')">
@@ -19,7 +19,7 @@
                   class="el-icon-upload2"
                   style="font-size: 50px; text-align: center"
                 ></i>
-                <p>出库</p>
+                <p>常规出库</p>
               </div>
             </li>
 <!--            <li @click="jump('/basicdata/corps')">-->
@@ -814,6 +814,10 @@
       <div style="width: 100%;margin: 10px auto;float: left">
         <div id="bookingRankingTwo" style="width: 100%;height: 300px;"></div>
       </div>
+<!--      船名航次-->
+      <div style="width: 100%;margin: 10px auto;float: left">
+        <div id="voyage" style="width: 100%;height: 350px;"></div>
+      </div>
     </div>
 <!--    快捷入库-->
     <fast-in-stock
@@ -841,7 +845,8 @@ import {
   boxDistribution,
   shipDynamics,
   bookingSpace,
-  locationRanking
+  locationRanking,
+  getProfitData
 } from "../../src/api/index";
 import Cookies from "js-cookie";
 import fastInStock from '../../src/components/fastStorage/fastInStock/index'
@@ -871,6 +876,11 @@ export default {
           dataTwo:[]
         }
       },
+      // 利润统计数据获得
+      profitData: {
+        xData: [],
+        seriesData: [],
+      },
       chart: [],
       warehouse: [],
       master: [],
@@ -985,17 +995,78 @@ export default {
           })
           i++
         })
-        console.log(this.dataList.bookingRanking.textTwo)
-        console.log(this.dataList.bookingRanking.dataTwo)
         this.rankingTwo()
       })
       shipDynamics().then(res=>{
         console.log(res)
         this.bookingData = res.data
       })
+      this.profitData.xData = []
+      this.profitData.seriesData = []
+      getProfitData({pageSize: 24, pageNum: 1}).then(res => {
+        console.log(res)
+        res.rows.forEach(item => {
+          if (!item.shipsName) {
+            item.shipsName = ''
+          }
+          if (!item.voyage) {
+            item.voyage = ''
+          }
+          let name = item.shipsName + '-' + item.voyage
+          this.profitData.xData.push(name)
+          this.profitData.seriesData.push(Number(item.profit) / 10000)
+          // this.profitData.seriesData.push(item.profit)
+        })
+        this.oceanVessel()
+      })
     }
   },
   methods: {
+    // 船名航次
+    oceanVessel() {
+      console.log(this.profitData.xData)
+      let myChart = this.$echarts.init(document.getElementById("voyage"));
+      const color = ['#EE6666', '#7DD2F3']
+      myChart.setOption({
+        title: {
+          text: '利润统计(前二十四)',
+          left: 'center'
+        },
+        tooltip: {
+          trigger: 'axis'
+        },
+        legend: {
+          orient: 'vertical',
+          left: 'right',
+          data: []
+        },
+        grid: {
+          // left: '10%',
+          bottom:'30%'
+        },
+        xAxis: {
+          axisLabel: {
+            rotate: 40
+          },
+          type: 'category',
+          boundaryGap: false,
+          data: this.profitData.xData,
+          // data: ['凯和志诚-02W1', '凯和志诚-02W2', '凯和志诚-03W3', '凯和志诚2111', '凯和志诚2110', '凯和志诚2110-4', '凯和志诚2114', '凯和志诚2116', '凯和志诚2118', '凯和志诚2118A', '凯和志诚2119N', '凯和志诚2120', '凯和志诚2122', '凯和志诚2123', '凯和志诚2124', '凯和志诚2125', '凯和志诚2127', '凯和志诚2126', '凯和志诚2128', '凯和志诚ABC', '凯和志诚2129', '凯和志诚K8101', '凯和志诚K8102', '凯和志诚K8102E',]
+        },
+        yAxis: {
+          type: 'value',
+          name: '万元'
+        },
+        series: [
+          {
+            type: 'line',
+            smooth: false,
+            data: this.profitData.seriesData,
+            // data:[1000,2112,333,4444,6323,11,234]
+          }
+        ]
+      })
+    },
     //箱分布图表
     ranking() {
       // 基于准备好的dom，初始化echarts实例，所以只能在mounted中调用

src/views/reportManagement/generalLedgerCr/detail.vue

@@ -542,7 +542,7 @@ export default {
         this.options = response.data;
       });
       selectCrDetail(this.$route.query).then((response) => {
-        this.payableList = response.rows;
+        this.payableList = response.data;
         this.total = response.total;
         this.loading = false;
         // 根据浏览器高度设置初始高度