dev

build/utils.js

@@ -19,7 +19,7 @@ const devPathSrc = path.resolve(__dirname, "../../../src"); // node_modules应
 // let devModules = ['index','TMS']
 // let devModules = ["index", "appoint", "sale", "statisticalReport"];
 let devModules = ["all"];
-// let devModules = ['index','statisticalReport','inward']
+// let devModules = ["index", "statisticalReport", "inward", "TMS", "appoint"];
 if (pathSrc.indexOf("node_modules") > -1) {
   devModules = require("../../../cors.js").devModules;
 }

config/index.js

@@ -66,7 +66,7 @@ let proxyTable = {
   // 所有数据的请求域名地址
   "/api/v1": {
     target: "http://172.16.33.166:80",
-    // target: "http://192.168.1.105:8080",
+    // target: "http://192.168.1.107:8080",
     // target: "http://localhost:8080",
     ws: true,
     pathRewrite: {

src/views/appoint/app.js

@@ -44,23 +44,23 @@ const apolloProvider = new VueApollo({
   defaultClient: apollo
 });
 
-//禁止打开控制台
-document.onkeydown = () => {
-  //禁用F12
-  if (window.event && window.event.keyCode == 123) {
-    return false;
-    //禁用ctrl+shift+i,
-  } else if (
-    window.event.ctrlKey &&
-    window.event.shiftKey &&
-    window.event.keyCode == 73
-  ) {
-    return false;
-    //屏蔽Shift+F10
-  } else if (window.event.shiftKey && window.event.keyCode == 121) {
-    return false;
-  }
-};
+// //禁止打开控制台
+// document.onkeydown = () => {
+//   //禁用F12
+//   if (window.event && window.event.keyCode == 123) {
+//     return false;
+//     //禁用ctrl+shift+i,
+//   } else if (
+//     window.event.ctrlKey &&
+//     window.event.shiftKey &&
+//     window.event.keyCode == 73
+//   ) {
+//     return false;
+//     //屏蔽Shift+F10
+//   } else if (window.event.shiftKey && window.event.keyCode == 121) {
+//     return false;
+//   }
+// };
 
 // console.log = function() {};
 // console.error = function() {};

src/views/appoint/components/saleContract/saleOrder.vue

@@ -1,7 +1,23 @@
 <template>
-  <!-- 销售订单页面 -->
+  <!-- 销售化产焦炭派车页面 -->
   <div class="salePlan">
     <div class="top">
+      <span class="text">订单时间：</span>
+      <el-date-picker
+        v-model="startTime"
+        type="datetime"
+        placeholder="选择日期"
+        style="width:200px"
+      >
+      </el-date-picker>
+      <span class="text">至</span>
+      <el-date-picker
+        v-model="endTime"
+        type="datetime"
+        placeholder="选择日期"
+        style="width:200px"
+      >
+      </el-date-picker>
       <el-input
         placeholder="请输入内容"
         v-model="input"
@@ -10,18 +26,18 @@
       >
       </el-input>
       <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
+        <i class="el-icon-search"></i>
       </el-button>
       <el-button type="primary" @click="refresh">
-        <i class="el-icon-refresh"></i>刷新
+        <i class="el-icon-refresh"></i>
       </el-button>
     </div>
     <div class="table">
       <el-tabs v-model="activeName" @tab-click="handleClick">
         <!-- 已审批 -->
         <el-tab-pane label="已审批" name="four">
-          <dilTable v-bind.sync="option4" ref="table">
-            <el-table-column fixed="right" label="操作" width="120">
+          <dilTable v-bind.sync="option4" ref="table" :pageSize="200">
+            <el-table-column fixed="right" label="操作" width="180">
               <template slot-scope="scope">
                 <el-button
                   @click="sendClick(scope.row.saleOrderId)"
@@ -39,7 +55,7 @@
                   @click="checkSaleOrderDetails(scope.row.saleOrderId)"
                   type="text"
                   size="small"
-                  >运单</el-button
+                  >运单详情</el-button
                 >
               </template>
             </el-table-column>
@@ -55,9 +71,8 @@ export default {
   name: "saleOrder",
   data() {
     return {
-      // shiyHeigth:140,
-      // isHeigth:true,
-      // isKuang:false,
+      endTime: null,
+      startTime: null,
       startDate: new Date().getTime() - 3600 * 1000 * 24 * 85,
       endDate: new Date(),
       activeName: "four",
@@ -82,11 +97,21 @@ export default {
       console.log(tab, event);
     },
     onclick() {
-      if (this.activeName == "four") {
-        this.option4.requestUrl =
-          "/api/v1/ams/getSaleOrderListBySaleCompanyes?apiId=475&shipperId=2&con=" +
-          this.input;
+      let startTime = null;
+      let endTime = null;
+      if (this.startTime && this.endTime) {
+        startTime = sjTime(this.startTime);
+        endTime = sjTime(this.endTime);
       }
+      this.option4.requestUrl =
+        "/api/v1/ams/getSaleOrderListBySaleCompanyes?apiId=475&shipperId=2&con=" +
+        this.input +
+        "&startTime=" +
+        startTime +
+        "&endTime=" +
+        endTime +
+        "&i=" +
+        new Date();
     },
     seeclick(saleOrderId) {
       this.$router.push("/saleOrderDetail/" + saleOrderId);
@@ -288,10 +313,6 @@ export default {
   .top {
     margin-left: 20px;
     margin-top: 20px;
-    .el-input {
-      width: 20%;
-      margin-right: 1.25rem;
-    }
   }
   .table {
     margin-left: 20px;

src/views/appoint/components/saleContract/saleOrderCoproduct.vue

@@ -2,15 +2,37 @@
   <!-- 销售订单页面 -->
   <div class="salePlan">
     <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <span class="text">订单时间：</span>
+      <el-date-picker
+        v-model="startTime"
+        type="datetime"
+        placeholder="选择日期"
+        style="width:200px"
+      >
+      </el-date-picker>
+      <span class="text">至</span>
+      <el-date-picker
+        v-model="endTime"
+        type="datetime"
+        placeholder="选择日期"
+        style="width:200px"
+      >
+      </el-date-picker>
+      <el-input
+        placeholder="请输入内容"
+        v-model="input"
+        clearable
+        style="width:200px"
+      >
+      </el-input>
       <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
+        <i class="el-icon-search"></i>
       </el-button>
       <el-button type="primary" class="btn" @click="empower">
         <i class="el-icon-check"></i>销售订单授权承运商
       </el-button>
       <el-button type="primary" @click="refresh">
-        <i class="el-icon-refresh"></i>刷新
+        <i class="el-icon-refresh"></i>
       </el-button>
     </div>
     <div class="table">
@@ -21,8 +43,9 @@
             v-bind.sync="option4"
             @selection-change="selectionChange"
             ref="table"
+            :pageSize="200"
           >
-            <el-table-column fixed="right" label="操作" width="180">
+            <el-table-column fixed="right" label="操作" width="200">
               <template slot-scope="scope">
                 <el-button
                   @click="coproductSendClick(scope.row.saleOrderId)"
@@ -34,7 +57,7 @@
                   @click="checkSaleOrderDetails(scope.row.saleOrderId)"
                   type="text"
                   size="small"
-                  >运单</el-button
+                  >运单详情</el-button
                 >
                 <el-button
                   @click="deleteSaleOrder(scope.row)"
@@ -47,7 +70,8 @@
           </mergeRowTable>
         </el-tab-pane>
         <el-tab-pane label="已关闭" name="first">
-          <mergeRowTable v-bind.sync="option" ref="table"> </mergeRowTable>
+          <mergeRowTable v-bind.sync="option" ref="table" :isPagination="false">
+          </mergeRowTable>
         </el-tab-pane>
       </el-tabs>
     </div>
@@ -89,10 +113,13 @@
   </div>
 </template>
 <script>
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   name: "saleOrder",
   data() {
     return {
+      startTime: null,
+      endTime: null,
       activeName: "four",
       drawer: false,
       input: "",
@@ -175,18 +202,36 @@ export default {
     },
     handleClick(tab, event) {},
     onclick() {
+      let startTime = null;
+      let endTime = null;
+      if (this.startTime && this.endTime) {
+        startTime = sjTime(this.startTime);
+        endTime = sjTime(this.endTime);
+      }
       if (this.activeName == "four") {
         this.option4.requestUrl =
-          "/api/v1/ams/getSaleOrderListBySaleCompanyes?apiId=409&shipperId=1&con=" +
+          "/api/v1/ams/getFuSaleOrderList?apiId=481&con=" +
           this.input +
           "&deleted=" +
-          Number(0);
+          Number(0) +
+          "&startTime=" +
+          startTime +
+          "&endTime=" +
+          endTime +
+          "&i=" +
+          new Date();
       } else {
         this.option.requestUrl =
-          "/api/v1/ams/getSaleOrderListBySaleCompanyes?apiId=409&shipperId=1&con=" +
+          "/api/v1/ams/getFuSaleOrderList?apiId=481&con=" +
           this.input +
           "&deleted=" +
-          Number(2);
+          Number(2) +
+          "&startTime=" +
+          startTime +
+          "&endTime=" +
+          endTime +
+          "&i=" +
+          new Date();
       }
     },
     //模糊查询承运商
@@ -275,10 +320,6 @@ export default {
   .top {
     margin-left: 20px;
     margin-top: 20px;
-    .el-input {
-      width: 20%;
-      margin-right: 1.25rem;
-    }
   }
   .table {
     margin-left: 20px;

src/views/appoint/components/saleContract/saleOrderSteel.vue

@@ -52,6 +52,7 @@
             v-bind.sync="option"
             ref="excelDom"
             @selection-change="selectionChange"
+            :pageSize="200"
           >
             <el-table-column
               fixed="right"
@@ -80,12 +81,11 @@
                 >
               </template>
             </el-table-column>
-            <!-- 物资详情抽屉 -->
           </mergeRowTable>
         </el-tab-pane>
         <!-- 已审批 -->
         <el-tab-pane label="已审批" name="four">
-          <mergeRowTable v-bind.sync="option4" ref="table">
+          <mergeRowTable v-bind.sync="option4" ref="table" :pageSize="200">
             <el-table-column
               fixed="right"
               label="操作"
@@ -105,12 +105,18 @@
                   size="small"
                   >关闭订单</el-button
                 >
+                <el-button
+                  @click="updateSaleOrder(scope.row.saleOrderId)"
+                  type="text"
+                  size="small"
+                  >异常处理</el-button
+                >
               </template>
             </el-table-column>
           </mergeRowTable>
         </el-tab-pane>
         <el-tab-pane label="反审批" name="five">
-          <mergeRowTable v-bind.sync="option5" ref="table2">
+          <mergeRowTable v-bind.sync="option5" ref="table2" :pageSize="200">
             <el-table-column
               fixed="right"
               label="操作"
@@ -119,7 +125,7 @@
             >
               <template slot-scope="scope">
                 <el-button
-                  @click="updateSaleOrder(scope.row.saleOrderId)"
+                  @click="updateSaleOrder(scope.row)"
                   type="text"
                   size="small"
                   >异常处理</el-button
@@ -130,7 +136,8 @@
         </el-tab-pane>
         <!-- 已上报 -->
         <el-tab-pane label="已上报" name="second">
-          <mergeRowTable v-bind.sync="option2" ref="table2"> </mergeRowTable>
+          <mergeRowTable v-bind.sync="option2" ref="table2" :pageSize="200">
+          </mergeRowTable>
         </el-tab-pane>
       </el-tabs>
     </div>
@@ -282,8 +289,11 @@ export default {
           });
         });
     },
-    updateSaleOrder(saleOrderId) {
-      this.$router.push("updateSaleOrderSteel/" + saleOrderId);
+    updateSaleOrder(row) {
+      console.log(row);
+      this.$router.push(
+        "updateSaleOrderSteel/" + row.saleOrderId + "&deleted=1"
+      );
     },
     getOrderDetails(saleOrderId) {
       console.log(saleOrderId);

src/views/appoint/components/saleContract/updateSaleOrderSteel.vue

@@ -490,6 +490,7 @@ export default {
     }
   },
   mounted() {
+    console.log(this.$route);
     this.getOrderList();
     this.getAllProvince();
   },

src/views/appoint/router/index.js

@@ -1,153 +1,473 @@
-import Vue from 'vue'
-import Router from 'vue-router'
-import routerBefore from '@/config/routerBefore.js'
+import Vue from "vue";
+import Router from "vue-router";
+import routerBefore from "@/config/routerBefore.js";
 // 主要
-import main from '@/components/main.vue'
+import main from "@/components/main.vue";
 // 系统配置管理
-import addCargoResult from '../components/ship/addCargoResult.vue'
-import addDeliveryAttorney from '../components/ship/addDeliveryAttorney.vue'
-import addDeliveryNotice from '../components/ship/addDeliveryNotice.vue'
-import attorneytext from '../components/ship/attorneytext.vue'
-import cargoResult from '../components/ship/cargoResult.vue'
-import deliveryAttorney from '../components/ship/deliveryAttorney.vue'
-import deliveryNotice from '../components/ship/deliveryNotice.vue'
-import modifyCargoResult from '../components/ship/modifyCargoResult.vue'
-import modifyDeliveryAttroney from '../components/ship/modifyDeliveryAttroney.vue'
-import modifyDeliveryNotice from '../components/ship/modifyDeliveryNotice.vue'
-import addBreach from '../components/purchase/addBreach.vue'
-import addOtherPrice from '../components/purchase/addOtherPrice.vue'
-import addShipPrice from '../components/purchase/addShipPrice.vue'
-import addTrainPrice from '../components/purchase/addTrainPrice.vue'
-import addTruckPrice from '../components/purchase/addTruckPrice.vue'
-import breach from '../components/purchase/breach.vue'
-import otherPrice from '../components/purchase/otherPrice.vue'
-import purchaseOrder from '../components/purchase/purchaseOrder.vue'
-import shipPrice from '../components/purchase/shipPrice.vue'
-import trainPrice from '../components/purchase/trainPrice.vue'
-import truckPrice from '../components/purchase/truckPrice.vue'
-import updateBreach from '../components/purchase/updateBreach.vue'
-import updateOtherPrice from '../components/purchase/updateOtherPrice.vue'
-import updateShipPrice from '../components/purchase/updateShipPrice.vue'
-import updateTrainPrice from '../components/purchase/updateTrainPrice.vue'
-import updateTruckPrice from '../components/purchase/updateTruckPrice.vue'
-import addSaleCokeSend from '../components/saleContract/addSaleCokeSend.vue'
-import addSaleOrder from '../components/saleContract/addSaleOrder.vue'
-import addSaleOrderArrange from '../components/saleContract/addSaleOrderArrange.vue'
-import addSaleOrderSend from '../components/saleContract/addSaleOrderSend.vue'
-import addSaleOrderCoproductSend from '../components/saleContract/addSaleOrderCoproductSend.vue'
-import addSaleOrderCoproductSendCarrier from '../components/saleContract/addSaleOrderCoproductSendCarrier.vue'
-import addSaleOrderSteelSend from '../components/saleContract/addSaleOrderSteelSend.vue'
-import addSaleOrderSteelSendCarrier from '../components/saleContract/addSaleOrderSteelSendCarrier.vue'
-import addSalePlan from '../components/saleContract/addSalePlan.vue'
-import addSalePlanDetail from '../components/saleContract/addSalePlanDetail.vue'
-import addTransportPrice from '../components/saleContract/addTransportPrice.vue'
-import addTruckNoDetail from '../components/saleContract/addTruckNoDetail.vue'
-import editaddress from '../components/saleContract/editaddress.vue'
-import editSaleOrder from '../components/saleContract/editSaleOrder.vue'
-import editSaleOrderDetail from '../components/saleContract/editSaleOrderDetail.vue'
-import editSalePalnDetail from '../components/saleContract/editSalePalnDetail.vue'
-import editSalePlan from '../components/saleContract/editSalePlan.vue'
-import editTransportPrice from '../components/saleContract/editTransportPrice.vue'
-import editTruckNoDetail from '../components/saleContract/editTruckNoDetail.vue'
-import saleCokeInward from '../components/saleContract/saleCokeInward.vue'
-import saleOrder from '../components/saleContract/saleOrder.vue'
-import saleOrderArrange from '../components/saleContract/saleOrderArrange.vue'
-import saleOrderCoproduct from '../components/saleContract/saleOrderCoproduct.vue'
-import saleOrderCoproductCarrier from '../components/saleContract/saleOrderCoproductCarrier.vue'
-import saleOrderDetail from '../components/saleContract/saleOrderDetail.vue'
-import saleOrderDetailApproved from '../components/saleContract/saleOrderDetailApproved.vue'
-import saleOrderMaterial from '../components/saleContract/saleOrderMaterial.vue'
-import saleOrderSteel from '../components/saleContract/saleOrderSteel.vue'
-import saleOrderSteelCar from '../components/saleContract/saleOrderSteelCar.vue'
-import saleOrderSteelCarrier from '../components/saleContract/saleOrderSteelCarrier.vue'
-import saleOrderSteelEmpower from '../components/saleContract/saleOrderSteelEmpower.vue'
-import saleOrderUpdateLog from '../components/saleContract/saleOrderUpdateLog.vue'
-import salePlan from '../components/saleContract/salePlan.vue'
-import transportPrice from '../components/saleContract/transportPrice.vue'
-import inwardTransPrice from '../components/inward/transPrice.vue'
-import inwardAddTransPrice from '../components/inward/addTransPrice.vue'
-import saleOrderOODetails from '../components/saleContract/saleOrderOODetails.vue'
-import updateSaleOrderSteel from '../components/saleContract/updateSaleOrderSteel.vue'
-Vue.use(Router)
+import addCargoResult from "../components/ship/addCargoResult.vue";
+import addDeliveryAttorney from "../components/ship/addDeliveryAttorney.vue";
+import addDeliveryNotice from "../components/ship/addDeliveryNotice.vue";
+import attorneytext from "../components/ship/attorneytext.vue";
+import cargoResult from "../components/ship/cargoResult.vue";
+import deliveryAttorney from "../components/ship/deliveryAttorney.vue";
+import deliveryNotice from "../components/ship/deliveryNotice.vue";
+import modifyCargoResult from "../components/ship/modifyCargoResult.vue";
+import modifyDeliveryAttroney from "../components/ship/modifyDeliveryAttroney.vue";
+import modifyDeliveryNotice from "../components/ship/modifyDeliveryNotice.vue";
+import addBreach from "../components/purchase/addBreach.vue";
+import addOtherPrice from "../components/purchase/addOtherPrice.vue";
+import addShipPrice from "../components/purchase/addShipPrice.vue";
+import addTrainPrice from "../components/purchase/addTrainPrice.vue";
+import addTruckPrice from "../components/purchase/addTruckPrice.vue";
+import breach from "../components/purchase/breach.vue";
+import otherPrice from "../components/purchase/otherPrice.vue";
+import purchaseOrder from "../components/purchase/purchaseOrder.vue";
+import shipPrice from "../components/purchase/shipPrice.vue";
+import trainPrice from "../components/purchase/trainPrice.vue";
+import truckPrice from "../components/purchase/truckPrice.vue";
+import updateBreach from "../components/purchase/updateBreach.vue";
+import updateOtherPrice from "../components/purchase/updateOtherPrice.vue";
+import updateShipPrice from "../components/purchase/updateShipPrice.vue";
+import updateTrainPrice from "../components/purchase/updateTrainPrice.vue";
+import updateTruckPrice from "../components/purchase/updateTruckPrice.vue";
+import addSaleCokeSend from "../components/saleContract/addSaleCokeSend.vue";
+import addSaleOrder from "../components/saleContract/addSaleOrder.vue";
+import addSaleOrderArrange from "../components/saleContract/addSaleOrderArrange.vue";
+import addSaleOrderSend from "../components/saleContract/addSaleOrderSend.vue";
+import addSaleOrderCoproductSend from "../components/saleContract/addSaleOrderCoproductSend.vue";
+import addSaleOrderCoproductSendCarrier from "../components/saleContract/addSaleOrderCoproductSendCarrier.vue";
+import addSaleOrderSteelSend from "../components/saleContract/addSaleOrderSteelSend.vue";
+import addSaleOrderSteelSendCarrier from "../components/saleContract/addSaleOrderSteelSendCarrier.vue";
+import addSalePlan from "../components/saleContract/addSalePlan.vue";
+import addSalePlanDetail from "../components/saleContract/addSalePlanDetail.vue";
+import addTransportPrice from "../components/saleContract/addTransportPrice.vue";
+import addTruckNoDetail from "../components/saleContract/addTruckNoDetail.vue";
+import editaddress from "../components/saleContract/editaddress.vue";
+import editSaleOrder from "../components/saleContract/editSaleOrder.vue";
+import editSaleOrderDetail from "../components/saleContract/editSaleOrderDetail.vue";
+import editSalePalnDetail from "../components/saleContract/editSalePalnDetail.vue";
+import editSalePlan from "../components/saleContract/editSalePlan.vue";
+import editTransportPrice from "../components/saleContract/editTransportPrice.vue";
+import editTruckNoDetail from "../components/saleContract/editTruckNoDetail.vue";
+import saleCokeInward from "../components/saleContract/saleCokeInward.vue";
+import saleOrder from "../components/saleContract/saleOrder.vue";
+import saleOrderArrange from "../components/saleContract/saleOrderArrange.vue";
+import saleOrderCoproduct from "../components/saleContract/saleOrderCoproduct.vue";
+import saleOrderCoproductCarrier from "../components/saleContract/saleOrderCoproductCarrier.vue";
+import saleOrderDetail from "../components/saleContract/saleOrderDetail.vue";
+import saleOrderDetailApproved from "../components/saleContract/saleOrderDetailApproved.vue";
+import saleOrderMaterial from "../components/saleContract/saleOrderMaterial.vue";
+import saleOrderSteel from "../components/saleContract/saleOrderSteel.vue";
+import saleOrderSteelCar from "../components/saleContract/saleOrderSteelCar.vue";
+import saleOrderSteelCarrier from "../components/saleContract/saleOrderSteelCarrier.vue";
+import saleOrderSteelEmpower from "../components/saleContract/saleOrderSteelEmpower.vue";
+import saleOrderUpdateLog from "../components/saleContract/saleOrderUpdateLog.vue";
+import salePlan from "../components/saleContract/salePlan.vue";
+import transportPrice from "../components/saleContract/transportPrice.vue";
+import inwardTransPrice from "../components/inward/transPrice.vue";
+import inwardAddTransPrice from "../components/inward/addTransPrice.vue";
+import saleOrderOODetails from "../components/saleContract/saleOrderOODetails.vue";
+import updateSaleOrderSteel from "../components/saleContract/updateSaleOrderSteel.vue";
+Vue.use(Router);
 
 const constantRouterMap = [
   {
-    path: '/',
-    name: 'main',
-    meta: {title: '首页', code: 'xtpzgl'},
+    path: "/",
+    name: "main",
+    meta: { title: "首页", code: "xtpzgl" },
     component: main,
-    redirect: {name: 'cargoResult'},
+    redirect: { name: "cargoResult" },
     children: [
-      {path: 'addCargoResult', name: 'addCargoResult', meta: {code: 'xtpzgl-jggl'}, component: addCargoResult},
-      {path: 'addDeliveryAttorney', name: 'addDeliveryAttorney', meta: {code: 'xtpzgl-yhgl'}, component: addDeliveryAttorney},
-      {path: 'addDeliveryNotice', name: 'addDeliveryNotice', meta: {code: 'xtpzgl-yhgl'}, component: addDeliveryNotice},
-      {path: 'attorneytext/:test', name: 'attorneytext', meta: {code: 'xtpzgl-yhgl'}, component: attorneytext},
-      {path: 'cargoResult', name: 'cargoResult', meta: {code: 'xtpzgl-yhgl'}, component: cargoResult},
-      {path: 'deliveryAttorney', name: 'deliveryAttorney', meta: {code: 'xtpzgl-yhgl'}, component: deliveryAttorney},
-      {path: 'deliveryNotice', name: 'deliveryNotice', meta: {code: 'xtpzgl-yhgl'}, component: deliveryNotice},
-      {path: 'modifyCargoResult/:cargoTransferResultId', name: 'modifyCargoResult', meta: {code: 'xtpzgl-yhgl'}, component: modifyCargoResult},
-      {path: 'modifyDeliveryAttroney/:attorneyId', name: 'modifyDeliveryAttroney', meta: {code: 'xtpzgl-yhgl'}, component: modifyDeliveryAttroney},
-      {path: 'modifyDeliveryNotice/:noticeId', name: 'modifyDeliveryNotice', meta: {code: 'xtpzgl-yhgl'}, component: modifyDeliveryNotice},
-      {path: 'addBreach', name: 'addBreach', meta: {code: 'xtpzgl-jggl'}, component: addBreach},
-      {path: 'addOtherPrice', name: 'addOtherPrice', meta: {code: 'xtpzgl-yhgl'}, component: addOtherPrice},
-      {path: 'addShipPrice', name: 'addShipPrice', meta: {code: 'xtpzgl-yhgl'}, component: addShipPrice},
-      {path: 'addTrainPrice', name: 'addTrainPrice', meta: {code: 'xtpzgl-yhgl'}, component: addTrainPrice},
-      {path: 'addTruckPrice', name: 'addTruckPrice', meta: {code: 'xtpzgl-yhgl'}, component: addTruckPrice},
-      {path: 'breach', name: 'breach', meta: {code: 'xtpzgl-yhgl'}, component: breach},
-      {path: 'otherPrice', name: 'otherPrice', meta: {code: 'xtpzgl-yhgl'}, component: otherPrice},
-      {path: 'purchaseOrder', name: 'purchaseOrder', meta: {code: 'xtpzgl-yhgl'}, component: purchaseOrder},
-      {path: 'shipPrice', name: 'shipPrice', meta: {code: 'xtpzgl-yhgl'}, component: shipPrice},
-      {path: 'trainPrice', name: 'trainPrice', meta: {code: 'xtpzgl-yhgl'}, component: trainPrice},
-      {path: 'truckPrice', name: 'truckPrice', meta: {code: 'xtpzgl-yhgl'}, component: truckPrice},
-      {path: 'updateBreach/:breachId', name: 'updateBreach', meta: {code: 'xtpzgl-yhgl'}, component: updateBreach},
-      {path: 'updateOtherPrice/:priceId', name: 'updateOtherPrice', meta: {code: 'xtpzgl-yhgl'}, component: updateOtherPrice},
-      {path: 'updateShipPrice/:priceId', name: 'updateShipPrice', meta: {code: 'xtpzgl-yhgl'}, component: updateShipPrice},
-      {path: 'updateTrainPrice/:priceId', name: 'updateTrainPrice', meta: {code: 'xtpzgl-yhgl'}, component: updateTrainPrice},
-      {path: 'updateTruckPrice/:priceId', name: 'updateTruckPrice', meta: {code: 'xtpzgl-yhgl'}, component: updateTruckPrice},
-      {path: 'addSaleCokeSend/:saleOrderId', name: 'addSaleCokeSend', meta: {code: 'xtpzgl-jggl'}, component: addSaleCokeSend},
-      {path: 'addSaleOrder', name: 'addSaleOrder', meta: {code: 'xtpzgl-jggl'}, component: addSaleOrder},
-      {path: 'addSaleOrderArrange/:saleOrderId', name: 'addSaleOrderArrange', meta: {code: 'xtpzgl-jggl'}, component: addSaleOrderArrange},
-      {path: 'addSaleOrderCoproductSend/:saleOrderId', name: 'addSaleOrderCoproductSend', meta: {code: 'xtpzgl-jggl'}, component: addSaleOrderCoproductSend},
-      {path: 'addSaleOrderCoproductSendCarrier/:saleOrderId', name: 'addSaleOrderCoproductSendCarrier', meta: {code: 'xtpzgl-jggl'}, component: addSaleOrderCoproductSendCarrier},
-      {path: 'addSaleOrderSend/:saleOrderId', name: 'addSaleOrderSend', meta: {code: 'xtpzgl-jggl'}, component: addSaleOrderSend},
-      {path: 'addSaleOrderSteelSend/:saleOrderMaterialId', name: 'addSaleOrderSteelSend', meta: {code: 'xtpzgl-jggl'}, component: addSaleOrderSteelSend},
-      {path: 'addSaleOrderSteelSendCarrier/:saleOrderId', name: 'addSaleOrderSteelSendCarrier', meta: {code: 'xtpzgl-jggl'}, component: addSaleOrderSteelSendCarrier},
-      {path: 'addSalePlan', name: 'addSalePlan', meta: {code: 'xtpzgl-yhgl'}, component: addSalePlan},
-      {path: 'addSalePlanDetail/:planId', name: 'addSalePlanDetail', meta: {code: 'xtpzgl-yhgl'}, component: addSalePlanDetail},
-      {path: 'saleOrderMaterial/:saleOrderId', name: 'saleOrderMaterial', meta: {code: 'xtpzgl-yhgl'}, component: saleOrderMaterial},
-      {path: 'addTransportPrice', name: 'addTransportPrice', meta: {code: 'xtpzgl-yhgl'}, component: addTransportPrice},
-      {path: 'addTruckNoDetail/:saleOrderMaterialId', name: 'addTruckNoDetail', meta: {code: 'xtpzgl-yhgl'}, component: addTruckNoDetail},
-      {path: 'editaddress/:saleOrderMaterialId', name: 'editaddress', meta: {code: 'xtpzgl-yhgl'}, component: editaddress},
-      {path: 'editSaleOrder/:saleOrderId', name: 'editSaleOrder', meta: {code: 'xtpzgl-yhgl'}, component: editSaleOrder},
-      {path: 'editSaleOrderDetail/:saleOrderMaterialId', name: 'editSaleOrderDetail', meta: {code: 'xtpzgl-yhgl'}, component: editSaleOrderDetail},
-      {path: 'editSalePalnDetail/:planMaterialId', name: 'editSalePalnDetail', meta: {code: 'xtpzgl-yhgl'}, component: editSalePalnDetail},
-      {path: 'editSalePlan/:planId', name: 'editSalePlan', meta: {code: 'xtpzgl-yhgl'}, component: editSalePlan},
-      {path: 'editTransportPrice/:priceId', name: 'editTransportPrice', meta: {code: 'xtpzgl-yhgl'}, component: editTransportPrice},
-      {path: 'editTruckNoDetail/:trucknoMaterialId', name: 'editTruckNoDetail', meta: {code: 'xtpzgl-yhgl'}, component: editTruckNoDetail},
-      {path: 'saleCokeInward', name: 'saleCokeInward', meta: {code: 'xtpzgl-yhgl'}, component: saleCokeInward},
-      {path: 'saleOrder', name: 'saleOrder', meta: {code: 'xtpzgl-yhgl'}, component: saleOrder},
-      {path: 'saleOrderArrange', name: 'saleOrderArrange', meta: {code: 'xtpzgl-yhgl'}, component: saleOrderArrange},
-      {path: 'saleOrderCoproduct', name: 'saleOrderCoproduct', meta: {code: 'xtpzgl-yhgl'}, component: saleOrderCoproduct},
-      {path: 'saleOrderCoproductCarrier', name: 'saleOrderCoproductCarrier', meta: {code: 'xtpzgl-yhgl'}, component: saleOrderCoproductCarrier},
-      {path: 'saleOrderSteel', name: 'saleOrderSteel', meta: {code: 'xtpzgl-yhgl'}, component: saleOrderSteel},
-      {path: 'saleOrderSteelCar', name: 'saleOrderSteelCar', meta: {code: 'xtpzgl-yhgl'}, component: saleOrderSteelCar},
-      {path: 'saleOrderSteelCarrier', name: 'saleOrderSteelCarrier', meta: {code: 'xtpzgl-yhgl'}, component: saleOrderSteelCarrier},
-      {path: 'saleOrderSteelEmpower/:saleOrderMaterialId', name: 'saleOrderSteelEmpower', meta: {code: 'xtpzgl-yhgl'}, component: saleOrderSteelEmpower},
-      {path: 'saleOrderDetail/:saleOrderId', name: 'saleOrderDetail', meta: {code: 'xtpzgl-yhgl'}, component: saleOrderDetail},
-      {path: 'saleOrderDetailApproved/:saleOrderId', name: 'saleOrderDetailApproved', meta: {code: 'xtpzgl-yhgl'}, component: saleOrderDetailApproved},
-      {path: 'saleOrderUpdateLog/:saleOrderId', name: 'saleOrderUpdateLog', meta: {code: 'xtpzgl-yhgl'}, component: saleOrderUpdateLog},
-      {path: 'salePlan', name: 'salePlan', meta: {code: 'xtpzgl-yhgl'}, component: salePlan},
-      {path: 'transportPrice', name: 'transportPrice', meta: {code: 'xtpzgl-yhgl'}, component: transportPrice},
-      {path: 'inwardTransPrice', name: 'inwardTransPrice', meta: {code: 'xtpzgl-yhgl'}, component: inwardTransPrice},
-      {path: 'inwardAddTransPrice', name: 'inwardAddTransPrice', meta: {code: 'xtpzgl-yhgl'}, component: inwardAddTransPrice},
-      {path:'saleOrderOODetails/:saleOrderId',name:'saleOrderOODetails',meta:{code:'xtpzgl-yhgl'},component:saleOrderOODetails},
-      {path:'updateSaleOrderSteel/:saleOrderId',name:'updateSaleOrderSteel',meta:{code:'xtpzgl-yhgl'},component:updateSaleOrderSteel}
+      {
+        path: "addCargoResult",
+        name: "addCargoResult",
+        meta: { code: "xtpzgl-jggl" },
+        component: addCargoResult
+      },
+      {
+        path: "addDeliveryAttorney",
+        name: "addDeliveryAttorney",
+        meta: { code: "xtpzgl-yhgl" },
+        component: addDeliveryAttorney
+      },
+      {
+        path: "addDeliveryNotice",
+        name: "addDeliveryNotice",
+        meta: { code: "xtpzgl-yhgl" },
+        component: addDeliveryNotice
+      },
+      {
+        path: "attorneytext/:test",
+        name: "attorneytext",
+        meta: { code: "xtpzgl-yhgl" },
+        component: attorneytext
+      },
+      {
+        path: "cargoResult",
+        name: "cargoResult",
+        meta: { code: "xtpzgl-yhgl" },
+        component: cargoResult
+      },
+      {
+        path: "deliveryAttorney",
+        name: "deliveryAttorney",
+        meta: { code: "xtpzgl-yhgl" },
+        component: deliveryAttorney
+      },
+      {
+        path: "deliveryNotice",
+        name: "deliveryNotice",
+        meta: { code: "xtpzgl-yhgl" },
+        component: deliveryNotice
+      },
+      {
+        path: "modifyCargoResult/:cargoTransferResultId",
+        name: "modifyCargoResult",
+        meta: { code: "xtpzgl-yhgl" },
+        component: modifyCargoResult
+      },
+      {
+        path: "modifyDeliveryAttroney/:attorneyId",
+        name: "modifyDeliveryAttroney",
+        meta: { code: "xtpzgl-yhgl" },
+        component: modifyDeliveryAttroney
+      },
+      {
+        path: "modifyDeliveryNotice/:noticeId",
+        name: "modifyDeliveryNotice",
+        meta: { code: "xtpzgl-yhgl" },
+        component: modifyDeliveryNotice
+      },
+      {
+        path: "addBreach",
+        name: "addBreach",
+        meta: { code: "xtpzgl-jggl" },
+        component: addBreach
+      },
+      {
+        path: "addOtherPrice",
+        name: "addOtherPrice",
+        meta: { code: "xtpzgl-yhgl" },
+        component: addOtherPrice
+      },
+      {
+        path: "addShipPrice",
+        name: "addShipPrice",
+        meta: { code: "xtpzgl-yhgl" },
+        component: addShipPrice
+      },
+      {
+        path: "addTrainPrice",
+        name: "addTrainPrice",
+        meta: { code: "xtpzgl-yhgl" },
+        component: addTrainPrice
+      },
+      {
+        path: "addTruckPrice",
+        name: "addTruckPrice",
+        meta: { code: "xtpzgl-yhgl" },
+        component: addTruckPrice
+      },
+      {
+        path: "breach",
+        name: "breach",
+        meta: { code: "xtpzgl-yhgl" },
+        component: breach
+      },
+      {
+        path: "otherPrice",
+        name: "otherPrice",
+        meta: { code: "xtpzgl-yhgl" },
+        component: otherPrice
+      },
+      {
+        path: "purchaseOrder",
+        name: "purchaseOrder",
+        meta: { code: "xtpzgl-yhgl" },
+        component: purchaseOrder
+      },
+      {
+        path: "shipPrice",
+        name: "shipPrice",
+        meta: { code: "xtpzgl-yhgl" },
+        component: shipPrice
+      },
+      {
+        path: "trainPrice",
+        name: "trainPrice",
+        meta: { code: "xtpzgl-yhgl" },
+        component: trainPrice
+      },
+      {
+        path: "truckPrice",
+        name: "truckPrice",
+        meta: { code: "xtpzgl-yhgl" },
+        component: truckPrice
+      },
+      {
+        path: "updateBreach/:breachId",
+        name: "updateBreach",
+        meta: { code: "xtpzgl-yhgl" },
+        component: updateBreach
+      },
+      {
+        path: "updateOtherPrice/:priceId",
+        name: "updateOtherPrice",
+        meta: { code: "xtpzgl-yhgl" },
+        component: updateOtherPrice
+      },
+      {
+        path: "updateShipPrice/:priceId",
+        name: "updateShipPrice",
+        meta: { code: "xtpzgl-yhgl" },
+        component: updateShipPrice
+      },
+      {
+        path: "updateTrainPrice/:priceId",
+        name: "updateTrainPrice",
+        meta: { code: "xtpzgl-yhgl" },
+        component: updateTrainPrice
+      },
+      {
+        path: "updateTruckPrice/:priceId",
+        name: "updateTruckPrice",
+        meta: { code: "xtpzgl-yhgl" },
+        component: updateTruckPrice
+      },
+      {
+        path: "addSaleCokeSend/:saleOrderId",
+        name: "addSaleCokeSend",
+        meta: { code: "xtpzgl-jggl" },
+        component: addSaleCokeSend
+      },
+      {
+        path: "addSaleOrder",
+        name: "addSaleOrder",
+        meta: { code: "xtpzgl-jggl" },
+        component: addSaleOrder
+      },
+      {
+        path: "addSaleOrderArrange/:saleOrderId",
+        name: "addSaleOrderArrange",
+        meta: { code: "xtpzgl-jggl" },
+        component: addSaleOrderArrange
+      },
+      {
+        path: "addSaleOrderCoproductSend/:saleOrderId",
+        name: "addSaleOrderCoproductSend",
+        meta: { code: "xtpzgl-jggl" },
+        component: addSaleOrderCoproductSend
+      },
+      {
+        path: "addSaleOrderCoproductSendCarrier/:saleOrderId",
+        name: "addSaleOrderCoproductSendCarrier",
+        meta: { code: "xtpzgl-jggl" },
+        component: addSaleOrderCoproductSendCarrier
+      },
+      {
+        path: "addSaleOrderSend/:saleOrderId",
+        name: "addSaleOrderSend",
+        meta: { code: "xtpzgl-jggl" },
+        component: addSaleOrderSend
+      },
+      {
+        path: "addSaleOrderSteelSend/:saleOrderMaterialId",
+        name: "addSaleOrderSteelSend",
+        meta: { code: "xtpzgl-jggl" },
+        component: addSaleOrderSteelSend
+      },
+      {
+        path: "addSaleOrderSteelSendCarrier/:saleOrderId",
+        name: "addSaleOrderSteelSendCarrier",
+        meta: { code: "xtpzgl-jggl" },
+        component: addSaleOrderSteelSendCarrier
+      },
+      {
+        path: "addSalePlan",
+        name: "addSalePlan",
+        meta: { code: "xtpzgl-yhgl" },
+        component: addSalePlan
+      },
+      {
+        path: "addSalePlanDetail/:planId",
+        name: "addSalePlanDetail",
+        meta: { code: "xtpzgl-yhgl" },
+        component: addSalePlanDetail
+      },
+      {
+        path: "saleOrderMaterial/:saleOrderId",
+        name: "saleOrderMaterial",
+        meta: { code: "xtpzgl-yhgl" },
+        component: saleOrderMaterial
+      },
+      {
+        path: "addTransportPrice",
+        name: "addTransportPrice",
+        meta: { code: "xtpzgl-yhgl" },
+        component: addTransportPrice
+      },
+      {
+        path: "addTruckNoDetail/:saleOrderMaterialId",
+        name: "addTruckNoDetail",
+        meta: { code: "xtpzgl-yhgl" },
+        component: addTruckNoDetail
+      },
+      {
+        path: "editaddress/:saleOrderMaterialId",
+        name: "editaddress",
+        meta: { code: "xtpzgl-yhgl" },
+        component: editaddress
+      },
+      {
+        path: "editSaleOrder/:saleOrderId",
+        name: "editSaleOrder",
+        meta: { code: "xtpzgl-yhgl" },
+        component: editSaleOrder
+      },
+      {
+        path: "editSaleOrderDetail/:saleOrderMaterialId",
+        name: "editSaleOrderDetail",
+        meta: { code: "xtpzgl-yhgl" },
+        component: editSaleOrderDetail
+      },
+      {
+        path: "editSalePalnDetail/:planMaterialId",
+        name: "editSalePalnDetail",
+        meta: { code: "xtpzgl-yhgl" },
+        component: editSalePalnDetail
+      },
+      {
+        path: "editSalePlan/:planId",
+        name: "editSalePlan",
+        meta: { code: "xtpzgl-yhgl" },
+        component: editSalePlan
+      },
+      {
+        path: "editTransportPrice/:priceId",
+        name: "editTransportPrice",
+        meta: { code: "xtpzgl-yhgl" },
+        component: editTransportPrice
+      },
+      {
+        path: "editTruckNoDetail/:trucknoMaterialId",
+        name: "editTruckNoDetail",
+        meta: { code: "xtpzgl-yhgl" },
+        component: editTruckNoDetail
+      },
+      {
+        path: "saleCokeInward",
+        name: "saleCokeInward",
+        meta: { code: "xtpzgl-yhgl" },
+        component: saleCokeInward
+      },
+      {
+        path: "saleOrder",
+        name: "saleOrder",
+        meta: { code: "xtpzgl-yhgl" },
+        component: saleOrder
+      },
+      {
+        path: "saleOrderArrange",
+        name: "saleOrderArrange",
+        meta: { code: "xtpzgl-yhgl" },
+        component: saleOrderArrange
+      },
+      {
+        path: "saleOrderCoproduct",
+        name: "saleOrderCoproduct",
+        meta: { code: "xtpzgl-yhgl" },
+        component: saleOrderCoproduct
+      },
+      {
+        path: "saleOrderCoproductCarrier",
+        name: "saleOrderCoproductCarrier",
+        meta: { code: "xtpzgl-yhgl" },
+        component: saleOrderCoproductCarrier
+      },
+      {
+        path: "saleOrderSteel",
+        name: "saleOrderSteel",
+        meta: { code: "xtpzgl-yhgl" },
+        component: saleOrderSteel
+      },
+      {
+        path: "saleOrderSteelCar",
+        name: "saleOrderSteelCar",
+        meta: { code: "xtpzgl-yhgl" },
+        component: saleOrderSteelCar
+      },
+      {
+        path: "saleOrderSteelCarrier",
+        name: "saleOrderSteelCarrier",
+        meta: { code: "xtpzgl-yhgl" },
+        component: saleOrderSteelCarrier
+      },
+      {
+        path: "saleOrderSteelEmpower/:saleOrderMaterialId",
+        name: "saleOrderSteelEmpower",
+        meta: { code: "xtpzgl-yhgl" },
+        component: saleOrderSteelEmpower
+      },
+      {
+        path: "saleOrderDetail/:saleOrderId",
+        name: "saleOrderDetail",
+        meta: { code: "xtpzgl-yhgl" },
+        component: saleOrderDetail
+      },
+      {
+        path: "saleOrderDetailApproved/:saleOrderId",
+        name: "saleOrderDetailApproved",
+        meta: { code: "xtpzgl-yhgl" },
+        component: saleOrderDetailApproved
+      },
+      {
+        path: "saleOrderUpdateLog/:saleOrderId",
+        name: "saleOrderUpdateLog",
+        meta: { code: "xtpzgl-yhgl" },
+        component: saleOrderUpdateLog
+      },
+      {
+        path: "salePlan",
+        name: "salePlan",
+        meta: { code: "xtpzgl-yhgl" },
+        component: salePlan
+      },
+      {
+        path: "transportPrice",
+        name: "transportPrice",
+        meta: { code: "xtpzgl-yhgl" },
+        component: transportPrice
+      },
+      {
+        path: "inwardTransPrice",
+        name: "inwardTransPrice",
+        meta: { code: "xtpzgl-yhgl" },
+        component: inwardTransPrice
+      },
+      {
+        path: "inwardAddTransPrice",
+        name: "inwardAddTransPrice",
+        meta: { code: "xtpzgl-yhgl" },
+        component: inwardAddTransPrice
+      },
+      {
+        path: "saleOrderOODetails/:saleOrderId",
+        name: "saleOrderOODetails",
+        meta: { code: "xtpzgl-yhgl" },
+        component: saleOrderOODetails
+      },
+      {
+        path: "updateSaleOrderSteel/:saleOrderId/:",
+        name: "updateSaleOrderSteel",
+        meta: { code: "xtpzgl-yhgl" },
+        component: updateSaleOrderSteel
+      }
     ]
   }
 ];
 const router = new Router({
   routes: constantRouterMap
-})
+});
 //  before
 routerBefore(router, constantRouterMap);
 

src/views/inward/components/inwardFactory/tareWeightResult.vue

@@ -3,18 +3,40 @@
   <!-- 零星物资计皮作业页面 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
+      <span class="text">装车结束时间：</span>
+      <el-date-picker
+        v-model="startTime"
+        type="datetime"
+        placeholder="选择日期"
+        style="width:200px"
+      >
+      </el-date-picker>
+      <span class="text">至</span>
+      <el-date-picker
+        v-model="endTime"
+        type="datetime"
+        placeholder="选择日期"
+        style="width:200px"
+      >
+      </el-date-picker>
+      <el-input
+        placeholder="请输入内容"
+        v-model="input"
+        clearable
+        style="width:200px"
+      >
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>
+      </el-button>
     </div>
-    <dilTable v-bind.sync="option">      
-    </dilTable>
+    <div class="table"><dilTable v-bind.sync="option"> </dilTable></div>
   </div>
 </template>
 
 <script>
 import { getCookie } from "@/utils/util.js";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   name: "homeworkPath",
   data() {
@@ -22,31 +44,63 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "",
-      },
+        requestUrl: ""
+      }
     };
   },
-  created(){
-      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
-          this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=358&orderType=11"
-      }else{
-          this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=358&orderType=11&userId=" + getCookie("orgCode")
-      }
+  created() {
+    if (
+      getCookie("orgCode") == "dagangadmin" ||
+      getCookie("orgCode") == "zidonghuabu"
+    ) {
+      this.option.requestUrl =
+        "/api/v1/tms/getAllJiMaoResult?apiId=358&orderType=11";
+    } else {
+      this.option.requestUrl =
+        "/api/v1/tms/getAllJiMaoResult?apiId=358&orderType=11&userId=" +
+        getCookie("orgCode");
+    }
   },
   methods: {
     onclick() {
-      this.$message.info("功能暂时关闭")
-    },
-  },
+      let orgCode = null;
+      let startTime = null;
+      let endTime = null;
+      if (this.startTime && this.endTime) {
+        startTime = sjTime(this.startTime);
+        endTime = sjTime(this.endTime);
+      }
+      if (
+        getCookie("orgCode") != "dagangadmin" &&
+        getCookie("orgCode") != "zidonghuabu" &&
+        getCookie("orgCode") != "wuliuchuyunzhongxin"
+      ) {
+        orgCode = getCookie("orgCode");
+      }
+      this.option.requestUrl =
+        "/api/v1/tms/getAllJiMaoResult?apiId=358&orderType=11&userId=" +
+        orgCode +
+        "&startTime=" +
+        startTime +
+        "&endTime=" +
+        endTime +
+        "&con=" +
+        this.input +
+        "&i=" +
+        new Date();
+    }
+  }
 };
 </script>
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .homeworkPath {
   .top {
-    padding: 1.25rem 1.875rem;
-    .el-input{
-      width: 20%;
-    }
+    margin-left: 20px;
+    margin-top: 20px;
+  }
+  .table {
+    margin-left: 20px;
+    margin-top: 20px;
   }
 }
-</style>
+</style>

src/views/inward/components/inwardFactory/truckLoad.vue

@@ -2,51 +2,110 @@
 <template>
   <!-- 装货实绩页面 -->
   <div class="homeworkPath">
-   <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+    <div class="top">
+      <span class="text">装车结束时间：</span>
+      <el-date-picker
+        v-model="startTime"
+        type="datetime"
+        placeholder="选择日期"
+        style="width:200px"
+      >
+      </el-date-picker>
+      <span class="text">至</span>
+      <el-date-picker
+        v-model="endTime"
+        type="datetime"
+        placeholder="选择日期"
+        style="width:200px"
+      >
+      </el-date-picker>
+      <el-input
+        placeholder="请输入内容"
+        v-model="input"
+        clearable
+        style="width:200px"
+      >
+      </el-input>
       <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
+        <i class="el-icon-search"></i>
       </el-button>
     </div>
-    <dilTable v-bind.sync="option"></dilTable>
+    <div class="table">
+      <dilTable v-bind.sync="option"></dilTable>
+    </div>
   </div>
 </template>
 
 <script>
 import { getCookie } from "@/utils/util.js";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   name: "homeworkPath",
   data() {
     return {
+      startTime: null,
+      endTime: null,
       restaurants: [],
-      input: "",
+      input: null,
       option: {
         // 表格请求数据的地址
-        requestUrl: "",
-      },
+        requestUrl: ""
+      }
     };
   },
-  created(){
-      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
-          this.option.requestUrl = "/api/v1/tms/getAllLoadResult?apiId=359&orderType=11&status=0"
-      }else{
-          this.option.requestUrl = "/api/v1/tms/getAllLoadResult?apiId=359&orderType=11&status=0&userId=" + getCookie("orgCode")
-      }
+  created() {
+    if (
+      getCookie("orgCode") == "dagangadmin" ||
+      getCookie("orgCode") == "zidonghuabu"
+    ) {
+      this.option.requestUrl =
+        "/api/v1/tms/getAllLoadResult?apiId=359&orderType=11&status=0";
+    } else {
+      this.option.requestUrl =
+        "/api/v1/tms/getAllLoadResult?apiId=359&orderType=11&status=0&userId=" +
+        getCookie("orgCode");
+    }
   },
   methods: {
     onclick() {
-          this.$message.info("功能暂时关闭")
-    },
-   }
+      let orgCode = null;
+      let startTime = null;
+      let endTime = null;
+      if (this.startTime && this.endTime) {
+        startTime = sjTime(this.startTime);
+        endTime = sjTime(this.endTime);
+      }
+      if (
+        getCookie("orgCode") != "dagangadmin" &&
+        getCookie("orgCode") != "zidonghuabu" &&
+        getCookie("orgCode") != "wuliuchuyunzhongxin"
+      ) {
+        orgCode = getCookie("orgCode");
+      }
+      this.option.requestUrl =
+        "/api/v1/tms/getAllLoadResult?apiId=359&orderType=11&status=0&userId=" +
+        orgCode +
+        "&startTime=" +
+        startTime +
+        "&endTime=" +
+        endTime +
+        "&con=" +
+        this.input +
+        "&i=" +
+        new Date();
+    }
+  }
 };
 </script>
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .homeworkPath {
   .top {
-    padding: 1.25rem 1.875rem;
-    .el-input{
-      width: 20%;
-    }
+    margin-left: 20px;
+    margin-top: 20px;
+  }
+  .table {
+    margin-left: 20px;
+    margin-top: 20px;
   }
 }
-</style>
+</style>

src/views/statisticalReport/components/inwardReport/allInwardReport.vue

@@ -476,7 +476,6 @@ export default {
         getCookie("orgCode") == "zidonghuabu" ||
         getCookie("orgCode") == "wuliuchuyunzhongxin"
       ) {
-        console.log("jl");
         if (this.activeName == "first") {
           this.first.requestUrl =
             "/api/v1/tms/getInwardInFactory?apiId=486&orgCode=" +

src/views/statisticalReport/components/salesLogisticsStatistics/saleChemicalCokeForm.vue

@@ -1,72 +1,76 @@
 //化产焦炭统计报表
 <template>
   <div class="purchasFuelNewMonitor">
-    <el-form :inline="true" style="margin-top :5px">
-      <el-form-item>
-        <label class="el-form-item__label" style="width: auto;"
-          >计毛时间：</label
-        >
-        <el-date-picker
-          v-model="startTime"
-          type="datetime"
-          placeholder="选择日期时间"
-        >
-        </el-date-picker>
-        <span>至</span>
-        <el-date-picker
-          v-model="endTime"
-          type="datetime"
-          placeholder="选择日期时间"
-        >
-        </el-date-picker>
+    <div class="frameCalculation">
+      <el-form :inline="true" style="margin-top :5px">
         <el-form-item>
-          <el-input
-            v-model="inputReceiveName"
+          <label class="el-form-item__label" style="width: auto;"
+            >计毛时间：</label
+          >
+          <el-date-picker
+            v-model="startTime"
+            type="datetime"
+            placeholder="选择日期时间"
+            style="width:200px"
+          >
+          </el-date-picker>
+          <span>至</span>
+          <el-date-picker
+            v-model="endTime"
+            type="datetime"
+            placeholder="选择日期时间"
             style="width:200px"
-            placeholder="输入收货单位"
-            clearable="true"
+          >
+          </el-date-picker>
+          <el-form-item>
+            <el-input
+              v-model="inputReceiveName"
+              style="width:200px"
+              placeholder="输入收货单位"
+              clearable="true"
+            ></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-input
+              v-model="inputMaterial"
+              style="width:200px"
+              placeholder="输入仓库或物资名称或备注"
+              clearable="true"
+            ></el-input>
+          </el-form-item>
+          <el-button type="primary" class="btn" @click="onclick">
+            <i class="el-icon-search"></i>
+          </el-button>
+        </el-form-item>
+
+        <el-form-item>
+          <el-button type="primary" @click="exportData()"
+            ><i class="el-icon-download"></i>Excel</el-button
+          >
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="refresh">
+            <i class="el-icon-refresh"></i>
+          </el-button>
+        </el-form-item>
+        <el-form-item>
+          <span style="margin-left: 1rem;width:68px">合计净重：</span>
+          <el-input
+            v-model="totalNumber"
+            :disabled="true"
+            style="width: 100px;"
           ></el-input>
         </el-form-item>
         <el-form-item>
+          <span style="margin-left: 1rem;width:68px">合计车数：</span>
           <el-input
-            v-model="inputMaterial"
-            style="width:200px"
-            placeholder="输入仓库或物资名称或备注"
-            clearable="true"
+            v-model="totalCapacity"
+            :disabled="true"
+            style="width: 50px;"
           ></el-input>
         </el-form-item>
-        <el-button type="primary" class="btn" @click="onclick">
-          <i class="el-icon-search"></i>查询
-        </el-button>
-      </el-form-item>
-
-      <el-form-item>
-        <el-button type="primary" @click="exportData()"
-          ><i class="el-icon-download"></i>导出(Excel)</el-button
-        >
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" @click="refresh">
-          <i class="el-icon-refresh"></i>刷新
-        </el-button>
-      </el-form-item>
-      <el-form-item>
-        <span style="margin-left: 1rem;width:68px">合计净重：</span>
-        <el-input
-          v-model="totalNumber"
-          :disabled="true"
-          style="width: 150px;"
-        ></el-input>
-      </el-form-item>
-      <el-form-item>
-        <span style="margin-left: 1rem;width:68px">合计车数：</span>
-        <el-input
-          v-model="totalCapacity"
-          :disabled="true"
-          style="width: 150px;"
-        ></el-input>
-      </el-form-item>
-    </el-form>
+      </el-form>
+    </div>
     <div class="table">
       <dilTable
         ref="excelDom"
@@ -293,4 +297,15 @@ export default {
 };
 </script>
 
-<style lang="scss"></style>
+<style lang="scss">
+.purchasFuelNewMonitor {
+  .frameCalculation {
+    margin-left: 20px;
+    margin-top: 20px;
+  }
+  .table {
+    margin-left: 20px;
+    margin-top: 20px;
+  }
+}
+</style>

src/views/statisticalReport/components/sporadicReport/inwardSporadicReport.vue

@@ -6,6 +6,7 @@
         v-model="startTime"
         type="datetime"
         placeholder="选择日期"
+        style="width:200px"
       >
       </el-date-picker>
       <span>至</span>
@@ -13,16 +14,33 @@
         v-model="endTime"
         type="datetime"
         placeholder="选择日期"
+        style="width:200px"
       >
       </el-date-picker>
+      <el-input
+        v-model="input"
+        placeholder="请输入发货单位或物资或车牌号"
+        style="width:200px"
+        clearable
+      ></el-input>
       <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
+        <i class="el-icon-search"></i>
       </el-button>
-      <el-button type="primary" @click="exportData()"><i class="el-icon-download"></i>导出(Excel)</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="totalNumberFrist" :disabled="true" style="width: 140px;"></el-input>
+      <el-input
+        v-model="totalNumberFrist"
+        :disabled="true"
+        style="width: 140px;"
+      ></el-input>
       <span style="margin-left: 1rem;">合计车数：</span>
-      <el-input v-model="totalCapacity" :disabled="true" style="width: 100px;"></el-input>
+      <el-input
+        v-model="totalCapacity"
+        :disabled="true"
+        style="width: 50px;"
+      ></el-input>
     </div>
     <div class="table">
       <dilTable ref="excelDom" v-bind.sync="option" @func="func"></dilTable>
@@ -31,79 +49,84 @@
 </template>
 
 <script>
-import { sjTime } from '@/utils/sharedJsFile';
-import { getCookie } from '@/utils/util.js';
+import { sjTime } from "@/utils/sharedJsFile";
+import { getCookie } from "@/utils/util.js";
 export default {
   data() {
     return {
-      totalNumberSecond:null,
-      totalNumberFrist:null,
-      totalCapacity:null,
+      input: null,
+      totalNumberSecond: null,
+      totalNumberFrist: null,
+      totalCapacity: null,
       option: {
-        requestUrl: "",
+        requestUrl: ""
       },
       startTime: null,
       endTime: null,
-      tableTitle:'零星出厂统计报表'
+      tableTitle: "零星中转统计报表"
     };
-  }, 
-  created(){
-          this.option.requestUrl = '/api/v1/tms/getLXInwardReport?apiId=457&startTime=null&endTime=null&i=' +new Date()
+  },
+  created() {
+    this.option.requestUrl =
+      "/api/v1/tms/getLXInwardReport?apiId=457&startTime=null&endTime=null&i=" +
+      new Date();
   },
   methods: {
-    func(res){
-        var resultNetWeightTotalFirst = 0
-        var resultNetWeightTotalSecond = 0
-        var currentCapacityTotal = 0
-        res.list.forEach(e => {
-          currentCapacityTotal++
-          resultNetWeightTotalFirst = resultNetWeightTotalFirst+e.netWeightFirst
-          resultNetWeightTotalSecond = resultNetWeightTotalSecond + e.netWeightSecond
-        });
-        this.totalNumberFrist = resultNetWeightTotalFirst.toFixed(2) + "t" + "/" + resultNetWeightTotalSecond.toFixed(2) + "t"
-        this.totalCapacity = currentCapacityTotal;
+    func(res) {
+      var resultNetWeightTotalFirst = 0;
+      var resultNetWeightTotalSecond = 0;
+      var currentCapacityTotal = 0;
+      res.list.forEach(e => {
+        currentCapacityTotal++;
+        resultNetWeightTotalFirst =
+          resultNetWeightTotalFirst + e.netWeightFirst;
+        resultNetWeightTotalSecond =
+          resultNetWeightTotalSecond + e.netWeightSecond;
+      });
+      this.totalNumberFrist =
+        resultNetWeightTotalFirst.toFixed(2) +
+        "t" +
+        "/" +
+        resultNetWeightTotalSecond.toFixed(2) +
+        "t";
+      this.totalCapacity = currentCapacityTotal;
     },
-    getRequestUrl(){
-        this.option.requestUrl = '/api/v1/tms/getLXInwardReport?apiId=457&startTime=null&endTime=null&i=' +new Date();
-     
+    getRequestUrl() {
+      this.option.requestUrl =
+        "/api/v1/tms/getLXInwardReport?apiId=457&startTime=null&endTime=null&i=" +
+        new Date();
     },
     onclick() {
       let startTime = null;
       let endTime = null;
-      if(this.startTime){
+      if (this.startTime && this.endTime) {
         startTime = sjTime(this.startTime);
-      }
-      if(this.endTime){
         endTime = sjTime(this.endTime);
       }
-      if(startTime && endTime){
-        if(startTime < endTime){
-          this.option.requestUrl = '/api/v1/tms/getLXInwardReport?apiId=457' + "&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
-        }else{
-          this.startTime = null;
-          this.endTime = null;
-          this.$message.warning('开始时间要比结束时间早')
-        }
-      }else{
-        console.log(startTime && endTime)
-        this.getRequestUrl()
-      }
-    },
-  },
+      this.option.requestUrl =
+        "/api/v1/tms/getLXInwardReport?apiId=457" +
+        "&startTime=" +
+        startTime +
+        "&endTime=" +
+        endTime +
+        "&con=" +
+        this.input +
+        "&i=" +
+        new Date();
+    }
+  }
 };
 </script>
 
 <style lang="scss">
 .purchasFuelNewMonitor {
   .frameCalculation {
-    width: 100%;
-    height: 100px;
-    display: flex;
-    align-items: center;
-    padding-left: 50px;
-    .el-date-editor{
-      margin: 20px;
-    }
+    margin-left: 20px;
+    margin-top: 20px;
+  }
+  .table {
+    margin-left: 20px;
+    margin-top: 20px;
   }
 }
-</style>
+</style>

src/views/statisticalReport/components/sporadicReport/sporadicReportEnterFactory.vue

@@ -1,39 +1,45 @@
 <template>
   <div class="purchasFuelNewMonitor">
     <div class="frameCalculation">
-      <span>计皮时间：</span>
+      <span>计皮时间:</span>
       <el-date-picker
         v-model="startTime"
         type="datetime"
         placeholder="选择日期"
+        style="width:200px"
       >
       </el-date-picker>
       <span>至</span>
-      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      <el-date-picker
+        v-model="endTime"
+        type="datetime"
+        placeholder="选择日期"
+        style="width:200px"
+      >
       </el-date-picker>
       <el-input
         v-model="input"
         placeholder="请输入发货单位或物资或车牌号"
-        style="width:250px"
+        style="width:200px"
         clearable
       ></el-input>
       <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
+        <i class="el-icon-search"></i>
       </el-button>
       <el-button type="primary" @click="exportData()"
-        ><i class="el-icon-download"></i>导出(Excel)</el-button
+        ><i class="el-icon-download"></i>Excel</el-button
       >
       <span style="margin-left: 1rem;">合计净重：</span>
       <el-input
         v-model="totalNumber"
         :disabled="true"
-        style="width: 100px;"
+        style="width: 100px"
       ></el-input>
       <span style="margin-left: 1rem;">合计车数：</span>
       <el-input
         v-model="totalCapacity"
         :disabled="true"
-        style="width: 100px;"
+        style="width: 50px;"
       ></el-input>
     </div>
     <div class="table">
@@ -169,14 +175,20 @@ export default {
 <style lang="scss">
 .purchasFuelNewMonitor {
   .frameCalculation {
-    width: 100%;
-    height: 100px;
-    display: flex;
-    align-items: center;
-    padding-left: 50px;
-    .el-date-editor {
-      margin: 20px;
-    }
+    margin-top: 20px;
+    margin-left: 20px;
+    // width: 100%;
+    // height: 100px;
+    // display: flex;
+    // align-items: center;
+    // padding-left: 50px;
+    // .el-date-editor {
+    //   margin: 20px;
+    // }
+  }
+  .table {
+    margin-top: 20px;
+    margin-left: 20px;
   }
 }
 </style>

src/views/statisticalReport/components/sporadicReport/sporadicReportExFactory.vue

@@ -6,22 +6,28 @@
         v-model="startTime"
         type="datetime"
         placeholder="选择日期"
+        style="width:200px"
       >
       </el-date-picker>
       <span>至</span>
-      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      <el-date-picker
+        v-model="endTime"
+        type="datetime"
+        placeholder="选择日期"
+        style="width:200px"
+      >
       </el-date-picker>
       <el-input
         v-model="input"
         placeholder="请输入收货单位或物资或车牌号"
-        style="width:250px"
+        style="width:200px"
         clearable
       ></el-input>
       <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
+        <i class="el-icon-search"></i>
       </el-button>
       <el-button type="primary" @click="exportData()"
-        ><i class="el-icon-download"></i>导出(Excel)</el-button
+        ><i class="el-icon-download"></i>Excel</el-button
       >
       <span style="margin-left: 1rem;">合计净重：</span>
       <el-input
@@ -33,7 +39,7 @@
       <el-input
         v-model="totalCapacity"
         :disabled="true"
-        style="width: 100px;"
+        style="width: 50px;"
       ></el-input>
     </div>
     <div class="table">
@@ -168,14 +174,12 @@ export default {
 <style lang="scss">
 .purchasFuelNewMonitor {
   .frameCalculation {
-    width: 100%;
-    height: 100px;
-    display: flex;
-    align-items: center;
-    padding-left: 50px;
-    .el-date-editor {
-      margin: 20px;
-    }
+    margin-left: 20px;
+    margin-top: 20px;
+  }
+  .table {
+    margin-left: 20px;
+    margin-top: 20px;
   }
 }
 </style>