luobang пре 3 година
родитељ
комит
a6d33ff1cd

+ 24 - 5
src/views/inward/components/inwardSettlement/detailOrder.vue

@@ -6,13 +6,19 @@
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
+      <el-button type="primary" @click="exportData()"><i class="el-icon-download"></i>导出(Excel)</el-button>
+      <span style="margin-left: 1rem;">合计净重:</span>
+      <el-input v-model="totalNetWeight" :disabled="true" style="width: 140px;"></el-input>
+      <span style="margin-left: 1rem;">合计金额:</span>
+      <el-input v-model="totalMoney" :disabled="true" style="width: 100px;"></el-input>
     </div>
     <div class="table">
-      <el-tabs v-model="activeName">
+      <el-tabs v-model="activeName" tab-click="handClick">
         <!-- 未结算 -->
         <el-tab-pane label="未结算" name="first">
-        <dilTable v-bind.sync="options1">
-        </dilTable>
+        <div class="table">
+        <dilTable v-bind.sync="options1" ref="excelDom" @func="func"></dilTable>
+        </div>
         </el-tab-pane>
         <!-- 已结算 -->
         <el-tab-pane label="已结算" name="second">
@@ -30,6 +36,10 @@ import { getCookie } from "@/utils/util.js";
 export default {
   data(){
     return{
+      //合计净重
+      totalNetWeight:null,
+      //合计金额
+      totalMoney:null,
       //单价
       Fee:null,
       //加载
@@ -69,7 +79,8 @@ export default {
       // addressText:null,
       //缓存当前选中的运输单价
       priceMap:{},
-      formLabelWidth: '125px'
+      formLabelWidth: '125px',
+      tableTitle:'内转计重详单'
     }
   },
   created(){
@@ -77,6 +88,15 @@ export default {
      this.options2GetRequestUrl();
   },
   methods:{
+    func(res){
+      console.log(res.list)
+      res.list.forEach(e => {
+        console.log(e.resultNetWeight)
+        this.totalNetWeight = this.totalNetWeight + e.resultNetWeight
+        this.totalMoney = this.totalMoney + e.detailsAmount
+        console.log(e.detailsAmount);
+      });
+    },
     //未结算数据
     options1GetRequestUrl(){
     if(getCookie("orgCode") == "chengyunshang"){
@@ -102,7 +122,6 @@ export default {
      toInsert() {
       this.$router.push("/insertCheckInventory");
     },
-
     onclick(){
       console.log("查询待定值")
       // this.options.requestUrl = "/api/v1/bms/getTruckDetailsOrderList?apiId=176&orderType=1&con="+this.input;

+ 0 - 64
src/views/statisticalReport/router/index(1).js

@@ -1,64 +0,0 @@
-import Vue from 'vue'
-import Router from 'vue-router'
-
-import routerBefore from '@/config/routerBefore.js'
-
-// 主要
-import main from '@/components/main.vue'
-// 系统配置管理
-import ShipDynamicTable from '../components/Ship_dynamic_table.vue'
-import purchaseAccessoriesMonitor from '../components/purchaseAccessoriesMonitor.vue'
-import purchasFuelOldMonitor from '../components/purchasFuelMonitor/purchasFuelOldMonitor.vue'
-import purchasFuelNewMonitor from '../components/purchasFuelMonitor/purchasFuelNewMonitor.vue'
-import sporadicReportEnterFactory from '../components/sporadicReport/sporadicReportEnterFactory.vue'
-import sporadicReportExFactory from '../components/sporadicReport/sporadicReportExFactory.vue'
-import transportationPerformance from '../components/salesLogisticsStatistics/transportationPerformance.vue'
-import purchaseChemicalMaterialsNew from '../components/purchaseChemicalMaterials/purchaseChemicalMaterialsNew.vue'
-import purchaseChemicalMaterialsOld from '../components/purchaseChemicalMaterials/purchaseChemicalMaterialsOld.vue'
-import purInwardReport from '../components/inwardReport/putInwardReport.vue'
-import inwardFactory from '../components/inwardReport/inwardFactory.vue'
-import getLoading from '../components/inwardReport/getLoading.vue'
-import getInstall from '../components/inwardReport/getInstall.vue'
-import getUnLoading from '../components/inwardReport/getUnLoading.vue'
-import purchaseMineral from '../components/purachaseMineral.vue'
-import inwardSporadicReport from '../components/sporadicReport/inwardSporadicReport.vue'
-
-
-Vue.use(Router)
-
-const constantRouterMap = [
-  {
-    path: '/',
-    name: 'main',
-    meta: {title: '首页', code: 'xtpzgl'},
-    component: main,
-    redirect: {name: 'cargoResult'},
-    children: [
-      {path: 'purchaseChemicalMaterialsNew', name: 'purchaseChemicalMaterialsNew', meta: {code: 'xtpzgl-yhgl'}, component: purchaseChemicalMaterialsNew},
-      {path: 'purchaseChemicalMaterialsOld', name: 'purchaseChemicalMaterialsOld', meta: {code: 'xtpzgl-yhgl'}, component: purchaseChemicalMaterialsOld},
-      {path: 'ShipDynamicTable', name: 'ShipDynamicTable', meta: {code: 'xtpzgl-yhgl'}, component: ShipDynamicTable},
-      {path: 'purchaseAccessoriesMonitor', name: 'purchaseAccessoriesMonitor', meta: {code: 'xtpzgl-yhgl'}, component: purchaseAccessoriesMonitor},
-      {path: 'purchasFuelOldMonitor', name: 'purchasFuelOldMonitor', meta: {code: 'xtpzgl-yhgl'}, component: purchasFuelOldMonitor},
-      {path: 'purchasFuelNewMonitor', name: 'purchasFuelNewMonitor', meta: {code: 'xtpzgl-yhgl'}, component: purchasFuelNewMonitor},
-      {path: 'sporadicReportEnterFactory',name:'sporadicReportEnterFactory',meta:{code:'xtpzgl-yhgl'},component:sporadicReportEnterFactory},
-      {path: 'sporadicReportExFactory',name:'sporadicReportExFactory',meta:{code:'xtpzgl-yhgl'},component:sporadicReportExFactory},
-      {path: 'transportationPerformance', name: 'transportationPerformance', meta: {code: 'xtpzgl-yhgl'}, component: transportationPerformance},
-      {path: 'purInwardReport', name: 'purInwardReport', meta: {code: 'xtpzgl-yhgl'}, component: purInwardReport},
-      {path: 'inwardFactory', name: 'inwardFactory', meta: {code: 'xtpzgl-yhgl'}, component: inwardFactory},
-      {path: 'getLoading', name: 'getLoading', meta: {code: 'xtpzgl-yhgl'}, component: getLoading},
-      {path: 'getInstall', name: 'getInstall', meta: {code: 'xtpzgl-yhgl'}, component: getInstall},
-      {path: 'getUnLoading', name: 'getUnLoading', meta: {code: 'xtpzgl-yhgl'}, component: getUnLoading},
-      {path: 'purchaseMineral', name: 'purchaseMineral', meta: {code: 'xtpzgl-yhgl'}, component: purchaseMineral},
-      {path: 'inwardSporadicReport', name: 'inwardSporadicReport', meta: {code: 'xtpzgl-yhgl'}, component: inwardSporadicReport}
-    ]
-  }
-];
-const router = new Router({
-  routes: constantRouterMap
-})
-//  before
-routerBefore(router, constantRouterMap);
-
-export default router;
-//  constantRouterMap
-export const routes = constantRouterMap;

+ 3 - 2
src/views/statisticalReport/router/index.js

@@ -21,7 +21,7 @@ import getLoading from '../components/inwardReport/getLoading.vue'
 import getUnLoading from '../components/inwardReport/getUnLoading.vue'
 import purchaseMineral from '../components/purachaseMineral.vue'
 import inwardSporadicReport from '../components/sporadicReport/inwardSporadicReport.vue'
-
+import getInstall from '../components/inwardReport/getInstall.vue'
 
 Vue.use(Router)
 
@@ -47,7 +47,8 @@ const constantRouterMap = [
       {path: 'getLoading', name: 'getLoading', meta: {code: 'xtpzgl-yhgl'}, component: getLoading},
       {path: 'getUnLoading', name: 'getUnLoading', meta: {code: 'xtpzgl-yhgl'}, component: getUnLoading},
       {path: 'purchaseMineral', name: 'purchaseMineral', meta: {code: 'xtpzgl-yhgl'}, component: purchaseMineral},
-      {path: 'inwardSporadicReport', name: 'inwardSporadicReport', meta: {code: 'xtpzgl-yhgl'}, component: inwardSporadicReport}
+      {path: 'inwardSporadicReport', name: 'inwardSporadicReport', meta: {code: 'xtpzgl-yhgl'}, component: inwardSporadicReport},
+      {path: 'getInstall', name: 'getInstall', meta: {code: 'xtpzgl-yhgl'}, component: getInstall},
     ]
   }
 ];