修改进口矿和厂厂外

src/views/ADMINISTRATORS/router/index.js

@@ -1,29 +1,35 @@
-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 ADMINISTRATORS1 from '../components/ADMINISTRATORS1.vue'
+// import ADMINISTRATORS1 from "../components/ADMINISTRATORS1.vue";
 
-Vue.use(Router)
+Vue.use(Router);
 
 const constantRouterMap = [
   {
-    path: '/',
-    name: 'main',
-    meta: {title: '首页', code: 'xtpzgl'},
+    path: "/",
+    name: "main",
+    meta: { title: "首页", code: "xtpzgl" },
     component: main,
-    redirect: {name: 'ADMINISTRATORS1'},
+    redirect: { name: "ADMINISTRATORS1" },
     children: [
-      {path: 'ADMINISTRATORS1', name: 'ADMINISTRATORS1', meta: {code: 'xtpzgl-jggl'}, component: ADMINISTRATORS1}
+      {
+        path: "ADMINISTRATORS1",
+        name: "ADMINISTRATORS1",
+        meta: { code: "xtpzgl-jggl" },
+        component: () =>
+          import("@/views/ADMINISTRATORS/components/ADMINISTRATORS1")
+      }
     ]
   }
 ];
 
 const router = new Router({
   routes: constantRouterMap
-})
+});
 //  before
 routerBefore(router, constantRouterMap);
 

src/views/RMS/components/addPersonnel.vue

@@ -2,50 +2,50 @@
   <!-- 添加人员信息 -->
   <div class="addWagonLoad">
     <PageTitle>返回</PageTitle>
-    <div class="form-box" style="margin-right: 10rem">
-      <dil-form :formId="325" v-model="form1" ref="from1"></dil-form>
-    </div>
-
-    <div class="department">
-      <div class="department2">
-        <span>二级部门：</span>
-        <el-select v-model="value1" placeholder="请选择" @change="onchange1">
-          <el-option
-            v-for="(item, i) in options1"
-            :key="i"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
+     <div class="form-box" style="margin-right: 10rem">
+        <dil-form :formId="325" v-model="form1" ref="from1"></dil-form>
       </div>
-      <div class="department3">
-        <span>三级部门：</span>
-        <el-select v-model="value2" placeholder="请选择" @change="onchange2">
-          <el-option
-            v-for="(item, i) in options2"
-            :key="i"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
+
+      <div class="department">
+        <div class="department2">
+                <span>二级部门：</span>
+                <el-select v-model="value1" placeholder="请选择" @change="onchange1">
+                    <el-option
+                    v-for="(item,i) in options1"
+                    :key="i"
+                    :label="item.label"
+                    :value="item.value"
+                    >
+                    </el-option>
+                </el-select>
+            </div>
+            <div class="department3">
+                <span>三级部门：</span>
+                <el-select v-model="value2" placeholder="请选择" @change="onchange2">
+                    <el-option
+                        v-for="(item,i) in options2"
+                        :key="i"
+                        :label="item.label"
+                        :value="item.value"
+                    >
+                    </el-option>
+                </el-select>
+            </div>
       </div>
-    </div>
-    <div>
-      <div class="role">
-        <span>赋权角色：</span>
-        <el-select v-model="value3" placeholder="请选择">
-          <el-option
-            v-for="(item, i) in options3"
-            :key="i"
-            :label="item.roleName"
-            :value="item.roleId"
-          >
-          </el-option>
-        </el-select>
+      <div>
+        <div class="role">
+                <span>赋权角色：</span>
+                <el-select v-model="value3" placeholder="请选择">
+                    <el-option
+                        v-for="(item,i) in options3"
+                        :key="i"
+                        :label="item.roleName"
+                        :value="item.roleId"
+                    >
+                    </el-option>
+                </el-select>
+            </div>
       </div>
-    </div>
 
     <div class="button-box">
       <el-button @click="cancel">取消</el-button>
@@ -62,46 +62,46 @@ export default {
   data() {
     return {
       form1: {
-        personnelJobNumber: "",
-        personnelName: "",
-        personnelPost: "",
-        personnelWorkshopid: "",
-        shipperId: "",
-        personnelShifts: "",
-        personnelTeam: ""
+        personnelJobNumber : '',
+        personnelName : '',
+        personnelPost : '',
+        personnelWorkshopid : '',
+        shipperId : '',
+        personnelShifts : '',
+        personnelTeam : ''
       },
       value: undefined,
       //新增用户的SSO主键
-      personnelSsoId: "",
+      personnelSsoId:'',
       //token
       token: null,
       //二级部门
-      options1: [],
+      options1:[],
       //选中的二级部门名称
-      value1: "",
+      value1:'',
       //选中的二级部门机构ID和机构编码
-      map1: {
-        shipperOrgCode: "",
-        shipperSsoId: ""
+      map1:{
+          shipperOrgCode : '',
+          shipperSsoId : ''
       },
       // 三级部门
-      options2: [],
+      options2:[],
       // 选中的三级部门名称
-      value2: "",
+      value2:'',
       //选中的三级部门机构ID和机构编码
-      map2: {
-        shipperOrgCode: "",
-        shipperSsoId: ""
+      map2:{
+          shipperOrgCode : '',
+          shipperSsoId : ''
       },
       // 角色
-      options3: [],
+      options3:[],
       // 选中的角色名称
-      value3: "",
+      value3:'',
       // 选中的角色ID
-      roleId: ""
+      roleId:''
     };
   },
-  created() {
+  created(){
     this.token = getCookie("accessToken");
   },
   mounted() {
@@ -109,217 +109,204 @@ export default {
     this.initialization();
   },
   methods: {
-    initialization() {
-      //初始化选择二级机构
-      this.axios.get("/api/v1/rms/getSecondShipper").then(res => {
-        this.options1 = res.data.data;
-      });
-      //初始化角色
-      const formData = new FormData();
-      this.$store.dispatch("system/rolesManage/list", formData).then(res => {
-        var roleList = [];
-        roleList = res.data;
-        roleList.forEach((item, i) => {
-          if (item.roleId != "superadmin") {
-            this.options3.push(item);
-          }
-        });
-        // this.options3 = res.data;
-      });
-    },
-    onchange1(val) {
-      //  查询选中的二级机构下的三级机构
-      this.value2 = "";
-      this.axios
-        .get("/api/v1/rms/getThirdShipper?shipperId=" + val)
-        .then(res => {
-          this.options2 = res.data.data;
-        });
-      //获取二级部门的机构ID和机构编码
-      this.axios
-        .post("/api/v1/rms/getShipperMap?shipperId=" + val)
-        .then(res => {
-          this.map1 = res.data.data;
-        });
-    },
-    onchange2(val) {
-      //获取三级部门的机构ID和机构编码
-      this.axios
-        .post("/api/v1/rms/getShipperMap?shipperId=" + val)
-        .then(res => {
-          this.map2 = res.data.data;
-        });
-    },
+     initialization(){
+       //初始化选择二级机构
+         this.axios.get('/api/v1/rms/getSecondShipper').then((res)=>{
+             this.options1 = res.data.data;
+         })
+         //初始化角色
+        const formData = new FormData();
+        this.$store.dispatch('system/rolesManage/list',formData)
+        .then((res)=>{
+          var roleList = [];
+          roleList=res.data;
+          roleList.forEach((item,i)=>{
+              if(item.roleId!='superadmin'){
+                this.options3.push(item);
+              }
+          })
+          // this.options3 = res.data;
+        })
+     },
+     onchange1(val){
+            //  查询选中的二级机构下的三级机构
+             this.value2 = '';
+             this.axios.get('/api/v1/rms/getThirdShipper?shipperId='+val).then((res)=>{
+             this.options2 = res.data.data;    
+         })
+         //获取二级部门的机构ID和机构编码
+         this.axios.post('/api/v1/rms/getShipperMap?shipperId='+val).then((res)=>{
+             this.map1 = res.data.data;
+         })
+     },
+     onchange2(val){
+         //获取三级部门的机构ID和机构编码
+         this.axios.post('/api/v1/rms/getShipperMap?shipperId='+val).then((res)=>{
+             this.map2 = res.data.data; 
+         })
+     },
 
-    //确定人员新增
-    makeSure() {
+     //确定人员新增
+     makeSure() {
       //初始化用户信息
       let userInfo = {
-        orgCode: "",
-        orgName: "",
-        orgId: ""
+        orgCode : '',
+        orgName : '',
+        orgId : '',
       };
       //该用户没有三级部门
-      if (this.options2.length == 0) {
-        userInfo = {
-          userName: this.form1.personnelName,
-          userCode: this.form1.personnelJobNumber,
-          orgCode: this.map1.shipperOrgCode,
-          orgName: this.value1,
-          orgId: this.map1.shipperSsoId,
-          // mobile : '13500000011',
-          // email : '123456789@qq.com',
-          groupId: "506514577756917769",
-          companyId: "713710108567277568"
-        };
-        //该用户有三级部门
-      } else {
+      if(this.options2.length==0){
+      userInfo = {
+        userName : this.form1.personnelName,
+        userCode : this.form1.personnelJobNumber,
+        orgCode : this.map1.shipperOrgCode,
+        orgName : this.value1,
+        orgId : this.map1.shipperSsoId,
+        // mobile : '13500000011',
+        // email : '123456789@qq.com',
+        groupId : '506514577756917769',
+        companyId : '713710108567277568'
+      }
+      //该用户有三级部门
+      }else{
         userInfo = {
-          userName: this.form1.personnelName,
-          userCode: this.form1.personnelJobNumber,
-          orgCode: this.map2.shipperOrgCode,
-          orgName: this.value1,
-          orgId: this.map2.shipperSsoId,
-          // mobile : '13500000011',
-          // email : '123456789@qq.com',
-          groupId: "506514577756917769",
-          companyId: "713710108567277568"
-        };
+        userName : this.form1.personnelName,
+        userCode : this.form1.personnelJobNumber,
+        orgCode : this.map2.shipperOrgCode,
+        orgName : this.value1,
+        orgId : this.map2.shipperSsoId,
+        // mobile : '13500000011',
+        // email : '123456789@qq.com',
+        groupId : '506514577756917769',
+        companyId : '713710108567277568'
+      }
       }
-      //先新增SSO中的用户
+       //先新增SSO中的用户
       const formData = new FormData();
-
-      Object.keys(userInfo).forEach(key => {
-        formData.append(key, userInfo[key]);
+      
+      Object.keys(userInfo).forEach((key) => {
+      formData.append(key, userInfo[key]);
       });
       //判断数据是否都填了
-      if (
-        this.form1.personnelJobNumber == "" ||
-        this.form1.personnelPost == "" ||
-        this.form1.personnelName == "" ||
-        // RmsPersonnel.personnelWorkshopid==null ||
-        this.form1.shipperId == "" ||
-        this.form1.personnelShifts == "" ||
-        this.form1.personnelTeam == "" ||
-        this.form1.ConcatTelephone == "" ||
-        userInfo.orgName == "" ||
-        userInfo.orgCode == "" ||
-        userInfo.orgId == "" ||
-        this.value3 == ""
-      ) {
-        this.$message.error("存在空值！");
-      } else {
-        //判断RMS_PERSONNEL表中是否存在该人员信息，存在提示存在，否则开始赋权新增
-        this.axios
-          .post(
-            "/api/v1/rms/isInHere?personnelJobNumber=" +
-              this.form1.personnelJobNumber
-          )
-          .then(res => {
-            console.log("res", res);
-            if (res.data == 0) {
-              this.$message.error("新增失败,该账号已存在！");
-            } else {
-              //开始赋权新增
-              //新增用户表
-              this.$store
-                .dispatch("system/usersManage/addUser", formData)
-                .then(res => {
-                  //console.log("role",res)
-                  //保存权限表中的用户主键Id
-                  this.personnelSsoId = res.data.userId;
-                  //再新增RMS_PERSONNEL表信息
-                  let map1 = {
-                    personnelJobNumber: this.form1.personnelJobNumber,
-                    personnelPost: this.form1.personnelPost,
-                    personnelName: this.form1.personnelName,
-                    personnelDepartmentId: this.form1.shipperId,
-                    // personnelWorkshopid : this.form1.personnelWorkshopid,
-                    personnelShifts: this.form1.personnelShifts,
-                    personnelTeam: this.form1.personnelTeam,
-                    personnelSsoId: this.personnelSsoId,
-                    //联系电话
-                    ConcatTelephone: this.form1.ConcatTelephone,
-                    userId: getCookie("userId")
-                  };
-                  //  console.log("rmsPersonnel",rmsPersonnel)
-                  this.axios
-                    .post("/api/v1/rms/addPersonnel", map1)
-                    .then(res => {
-                      if (res.data.code == 200) {
+      if(
+            this.form1.personnelJobNumber =='' ||
+            this.form1.personnelPost =='' ||
+            this.form1.personnelName =='' ||
+            // RmsPersonnel.personnelWorkshopid==null ||
+            this.form1.shipperId=='' ||
+            this.form1.personnelShifts=='' ||
+            this.form1.personnelTeam=='' ||
+            this.form1.ConcatTelephone==''||
+            userInfo.orgName=='' ||
+            userInfo.orgCode=='' ||
+            userInfo.orgId=='' ||
+            this.value3==''
+          ){
+              this.$message.error("存在空值！");
+      }else{
+      //判断RMS_PERSONNEL表中是否存在该人员信息，存在提示存在，否则开始赋权新增
+      this.axios.post('/api/v1/rms/isInHere?personnelJobNumber='+this.form1.personnelJobNumber)
+      .then((res)=>{
+        console.log("res",res);
+        if(res.data==0){
+          this.$message.error("新增失败,该账号已存在！");
+        }else{
+          //开始赋权新增
+          //新增用户表
+          this.$store.dispatch('system/usersManage/addUser',formData)
+          .then((res)=>{
+              //console.log("role",res)
+              //保存权限表中的用户主键Id
+              this.personnelSsoId = res.data.userId;
+              //再新增RMS_PERSONNEL表信息
+              let map1 = {
+                personnelJobNumber : this.form1.personnelJobNumber,
+                personnelPost : this.form1.personnelPost,
+                personnelName : this.form1.personnelName,
+                personnelDepartmentId : this.form1.shipperId,
+                // personnelWorkshopid : this.form1.personnelWorkshopid,
+                personnelShifts : this.form1.personnelShifts,
+                personnelTeam : this.form1.personnelTeam,
+                personnelSsoId : this.personnelSsoId,
+                //联系电话
+                ConcatTelephone : this.form1.ConcatTelephone,
+                userId: getCookie("userId"),
+              }
+              //  console.log("rmsPersonnel",rmsPersonnel)
+                  this.axios.post('/api/v1/rms/addPersonnel',map1)
+                  .then((res)=>{
+                        if (res.data.code == 200) {
                         this.$message({
                           type: "success",
-                          message: "新增成功!"
+                          message: "新增成功!",
                         });
                         // this.$refs.table.refreshData();
                         //最后新增角色赋权表
-                        this.axios
-                          .post(
-                            "pass/v1/sysuserroles/addUserroles?userId=" +
-                              this.personnelSsoId +
-                              "&userCode=" +
-                              this.form1.personnelJobNumber +
-                              "&roleId=" +
-                              this.value3
-                          )
-                          .then(res => {
+                          this.axios.post('pass/v1/sysuserroles/addUserroles?userId='
+                          +this.personnelSsoId+'&userCode='+this.form1.personnelJobNumber+'&roleId='+this.value3)
+                          .then((res)=>{
                             // console.log("success")
-                            // this.$router.go(-1);
-                          });
+                              this.$router.go(-1);
+                          })
+
                       } else {
                         this.$message.error("新增失败,可能存在重复！");
                       }
                       // this.$refs['table'].resetField();
-                    });
-                }); //end
-            }
-          });
-      } //else
+                  })
+
+          });//end
+
+        }
+      });
+      
+      }//else
+      
     },
     // 取消
     cancel() {
       this.$router.go(-1);
-    }
-  }
+    },
+  },
 };
 </script>
-<style lang="scss">
-.button-box {
-  display: flex;
-  justify-content: center;
-  margin-top: 2rem;
-  .el-button {
-    width: 80px;
-    margin-right: 10px;
+<style lang='scss' >
+ .button-box{
+    display: flex;
+    justify-content: center;
+    margin-top: 2rem;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
   }
-}
-.form-box {
+.form-box{
   display: flex;
   justify-content: center;
-  .el-form-item {
+  .el-form-item{
     display: flex;
     justify-content: center;
-    .el-form-item__label {
+    .el-form-item__label{
       display: flex;
       align-items: center;
     }
-    .el-form-item__content {
-      .el-input {
-        .el-input__inner {
+    .el-form-item__content{
+      .el-input{
+        .el-input__inner{
           width: 250px;
         }
       }
     }
   }
 }
-.department {
+.department{
   display: flex;
   justify-content: center;
-  .department3 {
+  .department3{
     margin-left: 2rem;
   }
 }
-.role {
+.role{
   display: flex;
   justify-content: center;
   margin-top: 2rem;

src/views/TMS/components/importedFuel/transportReserveRan.vue

@@ -9,6 +9,22 @@
         clearable
       >
       </el-input>
+      <span class="text" v-if="activeName == 'second'">下发时间：</span>
+      <el-date-picker
+        v-if="activeName == 'second'"
+        v-model="startTime"
+        type="datetime"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
+      <span class="text" v-if="activeName == 'second'">至</span>
+      <el-date-picker
+        v-if="activeName == 'second'"
+        v-model="endTime"
+        type="datetime"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -144,26 +160,29 @@
 
 <script>
 import { getCookie } from "@/utils/util.js";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   name: "inplantTMS",
   data() {
     return {
       input: "",
       Time: "",
+      startTime: null,
+      endTime: null,
       activeName: "first",
       checked: {
         type: Boolean,
-        default: false
+        default: false,
       },
       option1: {
         // 表格请求数据的地址
         requestUrl: "",
         selectionType: "select",
-        mapList: []
+        mapList: [],
       },
       option2: {
         // 表格请求数据的地址
-        requestUrl: ""
+        requestUrl: "",
       },
       purOrderList: [],
       isMoreTrips: null,
@@ -171,7 +190,7 @@ export default {
       materialName: null,
       supplierName: null,
       inputPurOrder: null,
-      deleteNoReceiveOrder: null
+      deleteNoReceiveOrder: null,
     };
   },
   created() {
@@ -236,19 +255,64 @@ export default {
             this.input;
         }
       } else {
-        //判断是否是承运商
-        if (getCookie("orgCode") == "chengyunshang") {
-          this.option1.requestUrl =
-            "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=1&carrierSSOId=" +
-            getCookie("userId") +
-            "&con=" +
-            this.input;
-        } else {
-          this.option1.requestUrl =
-            "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=1&carrierSSOId=" +
-            null +
-            "&con=" +
-            this.input;
+        let startTime = null;
+        let endTime = null;
+        if (this.startTime) {
+          startTime = sjTime(this.startTime);
+        }
+        if (this.endTime) {
+          endTime = sjTime(this.endTime);
+        }
+        if (startTime && endTime) {
+          if (startTime < endTime) {
+            //判断是否是承运商
+            if (getCookie("orgCode") == "chengyunshang") {
+              this.option2.requestUrl =
+                "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=1&carrierSSOId=" +
+                getCookie("userId") +
+                "&con=" +
+                this.input +
+                "&startTime=" +
+                startTime +
+                "&endTime=" +
+                endTime +
+                "&i=" +
+                new Date();
+            } else {
+              this.option2.requestUrl =
+                "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=1&carrierSSOId=" +
+                null +
+                "&con=" +
+                this.input +
+                "&startTime=" +
+                startTime +
+                "&endTime=" +
+                endTime +
+                "&i=" +
+                new Date();
+            }
+          }
+        }
+        else{
+            console.log("我进来了");
+            //判断是否是承运商
+            if (getCookie("orgCode") == "chengyunshang") {
+              this.option2.requestUrl =
+                "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=1&carrierSSOId=" +
+                getCookie("userId") +
+                "&con=" +
+                this.input +
+                "&i=" +
+                new Date();
+            } else {
+              this.option2.requestUrl =
+                "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=1&carrierSSOId=" +
+                null +
+                "&con=" +
+                this.input +
+                "&i=" +
+                new Date();
+            }
         }
       }
     },
@@ -257,7 +321,7 @@ export default {
         this.$message.warning("请输入需要关闭一车多趟的采购订单号");
         return;
       }
-      this.purOrderList.forEach(e => {
+      this.purOrderList.forEach((e) => {
         if (e.purchaseOrderNo == this.inputPurOrder) {
           this.materialName = e.materialName;
           this.supplierName = e.supplierName;
@@ -281,7 +345,7 @@ export default {
             "&deleteNoReceiveOrder=" +
             this.deleteNoReceiveOrder
         )
-        .then(res => {
+        .then((res) => {
           // console.log(res);
           if (res.data.code == "200") {
             this.$message.success("关闭成功");
@@ -303,12 +367,12 @@ export default {
     },
     issue() {
       let mapvalue = {
-        mapList: this.mapList
+        mapList: this.mapList,
       };
       this.axios.post("/api/v1/oms/dispatchOrder", mapvalue).then(() => {
         this.$message({
           type: "success",
-          message: "下发成功!"
+          message: "下发成功!",
         });
         this.getRequestUrl();
       });
@@ -316,19 +380,19 @@ export default {
     // 下发
     sendClick(orderId) {
       let mapvalue = {
-        mapList: [{ orderId: orderId }]
+        mapList: [{ orderId: orderId }],
       };
       this.$confirm("是否下发", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
-        center: true
+        center: true,
       })
         .then(() => {
           this.axios.post("/api/v1/oms/dispatchOrder", mapvalue).then(() => {
             this.$message({
               type: "success",
-              message: "下发成功!"
+              message: "下发成功!",
             });
             this.getRequestUrl();
           });
@@ -336,7 +400,7 @@ export default {
         .catch(() => {
           this.$message({
             type: "info",
-            message: "取消下发!"
+            message: "取消下发!",
           });
         });
     },
@@ -346,17 +410,17 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
-        center: true
+        center: true,
       })
         .then(() => {
           this.$message({
             type: "success",
-            message: "删除成功!"
+            message: "删除成功!",
           });
           this.axios
             .post("/api/v1/oms/deleteOrder", {
               orderId: orderId,
-              capacityNumber: capacityNumber
+              capacityNumber: capacityNumber,
             })
             .then(() => {
               this.getRequestUrl();
@@ -365,7 +429,7 @@ export default {
         .catch(() => {
           this.$message({
             type: "info",
-            message: "取消删除!"
+            message: "取消删除!",
           });
         });
     },
@@ -376,8 +440,8 @@ export default {
     //修改
     updateClick(orderId) {
       this.$router.push("/transportReserveRanEdit/" + orderId);
-    }
-  }
+    },
+  },
 };
 </script>
 <style lang="scss" scoped>

src/views/TMS/components/importedFuel/truckDriverReceiveRan.vue

@@ -9,16 +9,32 @@
         clearable
       >
       </el-input>
+      <span class="text">下发时间：</span>
+      <el-date-picker
+        v-model="startTime"
+        type="datetime"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
+      <span class="text">至</span>
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
-      <el-button type="primary" class="btn" @click="clickClose" v-if="activeName == 'option'">
+      <el-button
+        type="primary"
+        class="btn"
+        @click="clickClose"
+        v-if="activeName == 'option'"
+      >
         <i class="el-icon-close"></i>关闭
       </el-button>
     </div>
     <el-tabs v-model="activeName">
       <el-tab-pane label="未接收" name="option">
-        <dilTable v-bind.sync="option" @selection-change="selectionChange"> </dilTable>
+        <dilTable v-bind.sync="option" @selection-change="selectionChange">
+        </dilTable>
       </el-tab-pane>
       <el-tab-pane label="已接收" name="first">
         <dilTable v-bind.sync="option1"> </dilTable>
@@ -32,115 +48,264 @@
 
 <script>
 import { getCookie } from "@/utils/util.js";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   name: "inplantTMS",
   data() {
     return {
+      startTime: null,
+      endTime: null,
       input: "",
       Time: "",
       activeName: "option",
       option: {
         // 表格请求数据的地址
-        requestUrl:"",
+        requestUrl: "",
         selectionType: "select",
       },
       option1: {
         // 表格请求数据的地址
-        requestUrl:"",
+        requestUrl: "",
       },
       option2: {
         // 表格请求数据的地址
-        requestUrl:"",
+        requestUrl: "",
       },
-      list:[],
+      list: [],
     };
   },
-  watch:{
-    activeName(val){
+  watch: {
+    activeName(val) {
       if (getCookie("orgCode") == "chengyunshang") {
-        if(val == "option"){
-          this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=4&i="+new Date()+"&carrierSSOId=" + getCookie("userId");
-        }else if(val == "first"){
-          this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=5&i="+new Date()+"&carrierSSOId=" + getCookie("userId");
-        }else if(val == "second"){
-          this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=6&i="+new Date()+"&carrierSSOId=" + getCookie("userId");
+        if (val == "option") {
+          this.option.requestUrl =
+            "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=4&i=" +
+            new Date() +
+            "&carrierSSOId=" +
+            getCookie("userId");
+        } else if (val == "first") {
+          this.option1.requestUrl =
+            "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=5&i=" +
+            new Date() +
+            "&carrierSSOId=" +
+            getCookie("userId");
+        } else if (val == "second") {
+          this.option1.requestUrl =
+            "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=6&i=" +
+            new Date() +
+            "&carrierSSOId=" +
+            getCookie("userId");
         }
-      }else{
-        if(val == "option"){
-          this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=4&i="+new Date()+"&carrierSSOId=" + null;
-        }else if(val == "first"){
-          this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=5&i="+new Date()+"&carrierSSOId=" + null;
-        }else if(val == "second"){
-          this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=6&i="+new Date()+"&carrierSSOId=" + null;
+      } else {
+        if (val == "option") {
+          this.option.requestUrl =
+            "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=4&i=" +
+            new Date() +
+            "&carrierSSOId=" +
+            null;
+        } else if (val == "first") {
+          this.option1.requestUrl =
+            "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=5&i=" +
+            new Date() +
+            "&carrierSSOId=" +
+            null;
+        } else if (val == "second") {
+          this.option1.requestUrl =
+            "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=6&i=" +
+            new Date() +
+            "&carrierSSOId=" +
+            null;
         }
       }
-      
-    }
+    },
   },
   created() {
     //判断是否是承运商
     if (getCookie("orgCode") == "chengyunshang") {
-      this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=4&carrierSSOId=" + getCookie("userId");
-      this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=5&carrierSSOId=" + getCookie("userId");
-      this.option2.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=6&carrierSSOId=" + getCookie("userId");
+      this.option.requestUrl =
+        "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=4&carrierSSOId=" +
+        getCookie("userId");
+      this.option1.requestUrl =
+        "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=5&carrierSSOId=" +
+        getCookie("userId");
+      this.option2.requestUrl =
+        "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=6&carrierSSOId=" +
+        getCookie("userId");
     } else {
-      this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=4&carrierSSOId=" + null;
-      this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=5&carrierSSOId=" + null;
-      this.option2.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=6&carrierSSOId=" + null;
+      this.option.requestUrl =
+        "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=4&carrierSSOId=" +
+        null;
+      this.option1.requestUrl =
+        "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=5&carrierSSOId=" +
+        null;
+      this.option2.requestUrl =
+        "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=6&carrierSSOId=" +
+        null;
     }
   },
   methods: {
-    getRequestUrl(){
+    getRequestUrl() {
       if (getCookie("orgCode") == "chengyunshang") {
-      this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=4&carrierSSOId=" + getCookie("userId") +"&i="+new Date();
-      this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=5&carrierSSOId=" + getCookie("userId") +"&i="+new Date();
-      this.option2.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=6&carrierSSOId=" + getCookie("userId") +"&i="+new Date();
-    } else {
-      this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=4&carrierSSOId=" + null +"&i="+new Date();
-      this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=5&carrierSSOId=" + null +"&i="+new Date();
-      this.option2.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=6&carrierSSOId=" + null +"&i="+new Date();
-    }
+        this.option.requestUrl =
+          "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=4&carrierSSOId=" +
+          getCookie("userId") +
+          "&i=" +
+          new Date();
+        this.option1.requestUrl =
+          "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=5&carrierSSOId=" +
+          getCookie("userId") +
+          "&i=" +
+          new Date();
+        this.option2.requestUrl =
+          "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=6&carrierSSOId=" +
+          getCookie("userId") +
+          "&i=" +
+          new Date();
+      } else {
+        this.option.requestUrl =
+          "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=4&carrierSSOId=" +
+          null +
+          "&i=" +
+          new Date();
+        this.option1.requestUrl =
+          "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=5&carrierSSOId=" +
+          null +
+          "&i=" +
+          new Date();
+        this.option2.requestUrl =
+          "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=6&carrierSSOId=" +
+          null +
+          "&i=" +
+          new Date();
+      }
     },
     onclick() {
-    if (getCookie("orgCode") == "chengyunshang") {
-       if(this.activeName == "option"){
-        this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=4&con=" + this.input +"&i="+new Date() + "&carrierSSOId=" + getCookie("userId");
-      }else if (this.activeName == "first") {
-        this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=5&con=" + this.input +"&i="+new Date() + "&carrierSSOId=" + getCookie("userId");
-      } else if (this.activeName == "second") {
-        this.option2.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=6&con=" + this.input +"&i="+new Date() + "&carrierSSOId=" + getCookie("userId");
-      }
-    }else{
-      if(this.activeName == "option"){
-        this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=4&con=" + this.input +"&i="+new Date() + "&carrierSSOId=" + null;
-      }else if (this.activeName == "first") {
-        this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=5&con=" + this.input +"&i="+new Date() + "&carrierSSOId=" + null;
-      } else if (this.activeName == "second") {
-        this.option2.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=6&con=" + this.input +"&i="+new Date() + "&carrierSSOId=" + null;
+      if (getCookie("orgCode") == "chengyunshang") {
+        if (this.activeName == "option") {
+          this.option.requestUrl =
+            "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=4&con=" +
+            this.input +
+            "&i=" +
+            new Date() +
+            "&carrierSSOId=" +
+            getCookie("userId");
+        } else if (this.activeName == "first") {
+          this.option1.requestUrl =
+            "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=5&con=" +
+            this.input +
+            "&i=" +
+            new Date() +
+            "&carrierSSOId=" +
+            getCookie("userId");
+        } else if (this.activeName == "second") {
+          this.option2.requestUrl =
+            "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=6&con=" +
+            this.input +
+            "&i=" +
+            new Date() +
+            "&carrierSSOId=" +
+            getCookie("userId");
+        }
+      } else {
+        let startTime = null;
+        let endTime = null;
+        if (this.startTime) {
+          startTime = sjTime(this.startTime);
+        }
+        if (this.endTime) {
+          endTime = sjTime(this.endTime);
+        }
+        if (startTime && endTime) {
+          if (startTime < endTime) {
+            if (this.activeName == "option") {
+              this.option.requestUrl =
+                "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=4&con=" +
+                this.input +
+                "&i=" +
+                new Date() +
+                "&carrierSSOId=" +
+                null +
+                "&startTime=" +
+                startTime +
+                "&endTime=" +
+                endTime;
+            } else if (this.activeName == "first") {
+              this.option1.requestUrl =
+                "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=5&con=" +
+                this.input +
+                "&i=" +
+                new Date() +
+                "&carrierSSOId=" +
+                null +
+                "&startTime=" +
+                startTime +
+                "&endTime=" +
+                endTime;
+            } else if (this.activeName == "second") {
+              this.option2.requestUrl =
+                "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=6&con=" +
+                this.input +
+                "&i=" +
+                new Date() +
+                "&carrierSSOId=" +
+                null +
+                "&startTime=" +
+                startTime +
+                "&endTime=" +
+                endTime;
+            }
+          }
+        } else {
+          console.log("aaaa");
+          if (this.activeName == "option") {
+            this.option.requestUrl =
+              "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=4&con=" +
+              this.input +
+              "&i=" +
+              new Date() +
+              "&carrierSSOId=" +
+              null;
+          } else if (this.activeName == "first") {
+            this.option1.requestUrl =
+              "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=5&con=" +
+              this.input +
+              "&i=" +
+              new Date() +
+              "&carrierSSOId=" +
+              null;
+          } else if (this.activeName == "second") {
+            this.option2.requestUrl =
+              "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=6&con=" +
+              this.input +
+              "&i=" +
+              new Date() +
+              "&carrierSSOId=" +
+              null;
+          }
+        }
       }
-    }
-      
     },
-    clickClose(){
-      console.log(this.list)
-      if(this.list.length == 0){
-        this.$message.warning('请选择订单之后在关闭')
-      }else{
-        this.axios.post('/api/v1/oms/deleteOrders',{list:this.list}).then((res)=>{
-          if(res.data.code == "200"){
-            this.$message.success('关闭成功')
-            this.getRequestUrl()
-          }
-        })
+    clickClose() {
+      console.log(this.list);
+      if (this.list.length == 0) {
+        this.$message.warning("请选择订单之后在关闭");
+      } else {
+        this.axios
+          .post("/api/v1/oms/deleteOrders", { list: this.list })
+          .then((res) => {
+            if (res.data.code == "200") {
+              this.$message.success("关闭成功");
+              this.getRequestUrl();
+            }
+          });
       }
-
     },
-    selectionChange(selection){
-      this.list = [],
-      selection.forEach(e => {
-        this.list.push(e.orderId)
-      });
-    }
+    selectionChange(selection) {
+      (this.list = []),
+        selection.forEach((e) => {
+          this.list.push(e.orderId);
+        });
+    },
   },
 };
 </script>

src/views/TMS/components/importedIngredients/transportReserveFu.vue

@@ -9,6 +9,23 @@
         clearable
       >
       </el-input>
+      <!-- 时间查询框 -->
+      <span class="text" v-if="activeName == 'second'">下发时间：</span>
+      <el-date-picker
+        v-if="activeName == 'second'"
+        v-model="startTime"
+        type="datetime"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
+      <span class="text" v-if="activeName == 'second'">至</span>
+      <el-date-picker
+        v-if="activeName == 'second'"
+        v-model="endTime"
+        type="datetime"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -40,29 +57,28 @@
         <i class="el-icon-plus"></i>下发
       </el-button>
     </div>
-    <el-dialog
-      title="提醒"
-      :visible.sync="dialogVisible"
-      width="30%"
-    >
-      <div v-if="this.isMoreTrips != 1" style="color:red">
+    <el-dialog title="提醒" :visible.sync="dialogVisible" width="30%">
+      <div v-if="this.isMoreTrips != 1" style="color: red">
         <span>该订单不是一车多趟的订单</span>
       </div>
       <div>
         <span>采购订单号:</span>
-        <span>{{inputPurOrder}}</span>
+        <span>{{ inputPurOrder }}</span>
       </div>
       <div>
         <span>发货单位:</span>
-        <span>{{supplierName}}</span>
+        <span>{{ supplierName }}</span>
       </div>
       <div>
         <span>物资名称:</span>
-        <span>{{materialName}}</span>
+        <span>{{ materialName }}</span>
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="closePurOrder1" v-if="this.isMoreTrips == 1"
+        <el-button
+          type="primary"
+          @click="closePurOrder1"
+          v-if="this.isMoreTrips == 1"
           >确 定</el-button
         >
       </span>
@@ -119,30 +135,32 @@
 
 <script>
 import { getCookie } from "@/utils/util.js";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   name: "inplantTMS",
   data() {
     return {
       input: "",
       Time: "",
+      startTime: null,
+      endTime: null,
       activeName: "first",
       dialogVisible: false,
       materialName: null,
       supplierName: null,
-      inputPurOrder:null,
+      inputPurOrder: null,
       option1: {
         // 表格请求数据的地址
         requestUrl: "",
         selectionType: "select",
         mapList: [],
-        
       },
-      isMoreTrips:null,
+      isMoreTrips: null,
       option2: {
         // 表格请求数据的地址
-        requestUrl: ""
+        requestUrl: "",
       },
-      purOrderList: []
+      purOrderList: [],
     };
   },
   created() {
@@ -210,19 +228,61 @@ export default {
             this.input;
         }
       } else {
-        //判断是否是承运商
-        if (getCookie("orgCode") == "chengyunshang") {
-          this.option1.requestUrl =
-            "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&orderType=5&carrierSSOId=" +
-            getCookie("userId") +
-            "&con=" +
-            this.input;
+        let startTime = null;
+        let endTime = null;
+        if (this.startTime) {
+          startTime = sjTime(this.startTime);
+        }
+        if (this.endTime) {
+          endTime = sjTime(this.endTime);
+        }
+        if (startTime && endTime) {
+          if (startTime < endTime) {
+            //判断是否是承运商
+            if (getCookie("orgCode") == "chengyunshang") {
+              this.option2.requestUrl =
+                "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&orderType=5&carrierSSOId=" +
+                getCookie("userId") +
+                "&con=" +
+                this.input +
+                "&startTime=" +
+                startTime +
+                "&endTime=" +
+                endTime +
+                "&i=" +
+                new Date();
+            } else {
+              this.option2.requestUrl =
+                "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&orderType=5&carrierSSOId=" +
+                null +
+                "&con=" +
+                this.input +
+                "&startTime=" +
+                startTime +
+                "&endTime=" +
+                endTime +
+                "&i=" +
+                new Date();
+            }
+          }
         } else {
-          this.option1.requestUrl =
-            "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&orderType=5&carrierSSOId=" +
-            null +
-            "&con=" +
-            this.input;
+          if (getCookie("orgCode") == "chengyunshang") {
+            this.option2.requestUrl =
+              "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&orderType=5&carrierSSOId=" +
+              getCookie("userId") +
+              "&con=" +
+              this.input +
+              "&i=" +
+              new Date();
+          } else {
+            this.option2.requestUrl =
+              "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&orderType=5&carrierSSOId=" +
+              null +
+              "&con=" +
+              this.input +
+              "&i=" +
+              new Date();
+          }
         }
       }
     },
@@ -230,29 +290,34 @@ export default {
       this.mapList = selection;
     },
     closePurOrder() {
-      if(this.inputPurOrder == null){
-        this.$message.warning("请输入需要关闭一车多趟的采购订单号")
-        return
+      if (this.inputPurOrder == null) {
+        this.$message.warning("请输入需要关闭一车多趟的采购订单号");
+        return;
       }
-      this.purOrderList.forEach(e => {
+      this.purOrderList.forEach((e) => {
         if (e.purchaseOrderNo == this.inputPurOrder) {
           this.materialName = e.materialName;
           this.supplierName = e.supplierName;
-          this.isMoreTrips = e.isMoreTrips
+          this.isMoreTrips = e.isMoreTrips;
         }
       });
-      this.dialogVisible = true
+      this.dialogVisible = true;
     },
-    closePurOrder1(){
-      this.axios.post("/api/v1/bp/closePurOrderMoreTrips?purchaseOrderNo=" + this.inputPurOrder).then((res) =>{
-        console.log(res)
-        if(res.data.code == '200'){
-          this.$message.success("关闭成功")
-        }else{
-          this.$message.error(res.data.data)
-        }
-      })
-      this.dialogVisible = false
+    closePurOrder1() {
+      this.axios
+        .post(
+          "/api/v1/bp/closePurOrderMoreTrips?purchaseOrderNo=" +
+            this.inputPurOrder
+        )
+        .then((res) => {
+          console.log(res);
+          if (res.data.code == "200") {
+            this.$message.success("关闭成功");
+          } else {
+            this.$message.error(res.data.data);
+          }
+        });
+      this.dialogVisible = false;
     },
     func(res) {
       this.purOrderList = res.list;
@@ -260,12 +325,12 @@ export default {
     },
     issue() {
       let mapvalue = {
-        mapList: this.mapList
+        mapList: this.mapList,
       };
       this.axios.post("/api/v1/oms/dispatchOrder", mapvalue).then(() => {
         this.$message({
           type: "success",
-          message: "下发成功!"
+          message: "下发成功!",
         });
         this.option1.requestUrl =
           "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&orderType=5&i=" +
@@ -275,19 +340,19 @@ export default {
     // 下发
     sendClick(orderId) {
       let mapvalue = {
-        mapList: [{ orderId: orderId }]
+        mapList: [{ orderId: orderId }],
       };
       this.$confirm("是否下发", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
-        center: true
+        center: true,
       })
         .then(() => {
           this.axios.post("/api/v1/oms/dispatchOrder", mapvalue).then(() => {
             this.$message({
               type: "success",
-              message: "下发成功!"
+              message: "下发成功!",
             });
             this.getRequestUrl();
           });
@@ -295,7 +360,7 @@ export default {
         .catch(() => {
           this.$message({
             type: "info",
-            message: "取消下发!"
+            message: "取消下发!",
           });
         });
     },
@@ -305,17 +370,17 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
-        center: true
+        center: true,
       })
         .then(() => {
           this.$message({
             type: "success",
-            message: "删除成功!"
+            message: "删除成功!",
           });
           this.axios
             .post("/api/v1/oms/deleteOrder", {
               orderId: orderId,
-              capacityNumber: capacityNumber
+              capacityNumber: capacityNumber,
             })
             .then(() => {
               this.getRequestUrl();
@@ -324,7 +389,7 @@ export default {
         .catch(() => {
           this.$message({
             type: "info",
-            message: "取消删除!"
+            message: "取消删除!",
           });
         });
     },
@@ -335,8 +400,8 @@ export default {
     //修改
     updateClick(orderId) {
       this.$router.push("/transportReserveFuEdit/" + orderId);
-    }
-  }
+    },
+  },
 };
 </script>
 <style lang="scss" scoped>

src/views/TMS/components/importedIngredients/truckDriverReceiveFu.vue

@@ -9,16 +9,32 @@
         clearable
       >
       </el-input>
+      <span class="text">下发时间：</span>
+      <el-date-picker
+        v-model="startTime"
+        type="datetime"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
+      <span class="text">至</span>
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
-      <el-button type="primary" class="btn" @click="clickClose" v-if="activeName == 'option'">
+      <el-button
+        type="primary"
+        class="btn"
+        @click="clickClose"
+        v-if="activeName == 'option'"
+      >
         <i class="el-icon-close"></i>关闭
       </el-button>
     </div>
     <el-tabs v-model="activeName">
       <el-tab-pane label="未接收" name="option">
-        <dilTable v-bind.sync="option" @selection-change="selectionChange"> </dilTable>
+        <dilTable v-bind.sync="option" @selection-change="selectionChange">
+        </dilTable>
       </el-tab-pane>
       <el-tab-pane label="已接收" name="first">
         <dilTable v-bind.sync="option1"> </dilTable>
@@ -32,116 +48,264 @@
 
 <script>
 import { getCookie } from "@/utils/util.js";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   name: "inplantTMS",
   data() {
     return {
+      startTime: null,
+      endTime: null,
       input: "",
       Time: "",
       activeName: "option",
       option: {
         // 表格请求数据的地址
-        requestUrl:"",
+        requestUrl: "",
         selectionType: "select",
       },
       option1: {
         // 表格请求数据的地址
-        requestUrl:"",
+        requestUrl: "",
       },
       option2: {
         // 表格请求数据的地址
-        requestUrl:"",
+        requestUrl: "",
       },
-      list:[],
+      list: [],
     };
   },
-  watch:{
-    activeName(val){
+  watch: {
+    activeName(val) {
       if (getCookie("orgCode") == "chengyunshang") {
-        if(val == "option"){
-          this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=4&i="+new Date()+"&carrierSSOId=" + getCookie("userId");
-        }else if(val == "first"){
-          this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=5&i="+new Date()+"&carrierSSOId=" + getCookie("userId");
-        }else if(val == "second"){
-          this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=6&i="+new Date()+"&carrierSSOId=" + getCookie("userId");
+        if (val == "option") {
+          this.option.requestUrl =
+            "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=4&i=" +
+            new Date() +
+            "&carrierSSOId=" +
+            getCookie("userId");
+        } else if (val == "first") {
+          this.option1.requestUrl =
+            "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=5&i=" +
+            new Date() +
+            "&carrierSSOId=" +
+            getCookie("userId");
+        } else if (val == "second") {
+          this.option1.requestUrl =
+            "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=6&i=" +
+            new Date() +
+            "&carrierSSOId=" +
+            getCookie("userId");
         }
-      }else{
-        if(val == "option"){
-          this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=4&i="+new Date()+"&carrierSSOId=" + null;
-        }else if(val == "first"){
-          this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=5&i="+new Date()+"&carrierSSOId=" + null;
-        }else if(val == "second"){
-          this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=6&i="+new Date()+"&carrierSSOId=" + null;
+      } else {
+        if (val == "option") {
+          this.option.requestUrl =
+            "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=4&i=" +
+            new Date() +
+            "&carrierSSOId=" +
+            null;
+        } else if (val == "first") {
+          this.option1.requestUrl =
+            "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=5&i=" +
+            new Date() +
+            "&carrierSSOId=" +
+            null;
+        } else if (val == "second") {
+          this.option1.requestUrl =
+            "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=6&i=" +
+            new Date() +
+            "&carrierSSOId=" +
+            null;
         }
       }
-      
-    }
+    },
   },
   created() {
     //判断是否是承运商
     if (getCookie("orgCode") == "chengyunshang") {
-      this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=4&carrierSSOId=" + getCookie("userId");
-      this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=5&carrierSSOId=" + getCookie("userId");
-      this.option2.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=6&carrierSSOId=" + getCookie("userId");
+      this.option.requestUrl =
+        "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=4&carrierSSOId=" +
+        getCookie("userId");
+      this.option1.requestUrl =
+        "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=5&carrierSSOId=" +
+        getCookie("userId");
+      this.option2.requestUrl =
+        "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=6&carrierSSOId=" +
+        getCookie("userId");
     } else {
-      this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=4&carrierSSOId=" + null;
-      this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=5&carrierSSOId=" + null;
-      this.option2.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=6&carrierSSOId=" + null;
+      this.option.requestUrl =
+        "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=4&carrierSSOId=" +
+        null;
+      this.option1.requestUrl =
+        "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=5&carrierSSOId=" +
+        null;
+      this.option2.requestUrl =
+        "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=6&carrierSSOId=" +
+        null;
     }
   },
   methods: {
-    getRequestUrl(){
+    getRequestUrl() {
       //判断是否是承运商
-    if (getCookie("orgCode") == "chengyunshang") {
-      this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=4&carrierSSOId=" + getCookie("userId") +"&i="+new Date();
-      this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=5&carrierSSOId=" + getCookie("userId") +"&i="+new Date();
-      this.option2.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=6&carrierSSOId=" + getCookie("userId") +"&i="+new Date();
-    } else {
-      this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=4&carrierSSOId=" + null +"&i="+new Date();
-      this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=5&carrierSSOId=" + null +"&i="+new Date();
-      this.option2.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=6&carrierSSOId=" + null +"&i="+new Date();
-    }
+      if (getCookie("orgCode") == "chengyunshang") {
+        this.option.requestUrl =
+          "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=4&carrierSSOId=" +
+          getCookie("userId") +
+          "&i=" +
+          new Date();
+        this.option1.requestUrl =
+          "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=5&carrierSSOId=" +
+          getCookie("userId") +
+          "&i=" +
+          new Date();
+        this.option2.requestUrl =
+          "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=6&carrierSSOId=" +
+          getCookie("userId") +
+          "&i=" +
+          new Date();
+      } else {
+        this.option.requestUrl =
+          "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=4&carrierSSOId=" +
+          null +
+          "&i=" +
+          new Date();
+        this.option1.requestUrl =
+          "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=5&carrierSSOId=" +
+          null +
+          "&i=" +
+          new Date();
+        this.option2.requestUrl =
+          "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=6&carrierSSOId=" +
+          null +
+          "&i=" +
+          new Date();
+      }
     },
     onclick() {
-    if (getCookie("orgCode") == "chengyunshang") {
-       if(this.activeName == "option"){
-        this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=4&con=" + this.input +"&i="+new Date() + "&carrierSSOId=" + getCookie("userId");
-      }else if (this.activeName == "first") {
-        this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=5&con=" + this.input +"&i="+new Date() + "&carrierSSOId=" + getCookie("userId");
-      } else if (this.activeName == "second") {
-        this.option2.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=6&con=" + this.input +"&i="+new Date() + "&carrierSSOId=" + getCookie("userId");
-      }
-    }else{
-      if(this.activeName == "option"){
-        this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=4&con=" + this.input +"&i="+new Date() + "&carrierSSOId=" + null;
-      }else if (this.activeName == "first") {
-        this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=5&con=" + this.input +"&i="+new Date() + "&carrierSSOId=" + null;
-      } else if (this.activeName == "second") {
-        this.option2.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=6&con=" + this.input +"&i="+new Date() + "&carrierSSOId=" + null;
+      if (getCookie("orgCode") == "chengyunshang") {
+        if (this.activeName == "option") {
+          this.option.requestUrl =
+            "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=4&con=" +
+            this.input +
+            "&i=" +
+            new Date() +
+            "&carrierSSOId=" +
+            getCookie("userId");
+        } else if (this.activeName == "first") {
+          this.option1.requestUrl =
+            "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=5&con=" +
+            this.input +
+            "&i=" +
+            new Date() +
+            "&carrierSSOId=" +
+            getCookie("userId");
+        } else if (this.activeName == "second") {
+          this.option2.requestUrl =
+            "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=6&con=" +
+            this.input +
+            "&i=" +
+            new Date() +
+            "&carrierSSOId=" +
+            getCookie("userId");
+        }
+      } else {
+        let startTime = null;
+        let endTime = null;
+        if (this.startTime) {
+          startTime = sjTime(this.startTime);
+        }
+        if (this.endTime) {
+          endTime = sjTime(this.endTime);
+        }
+        if (startTime && endTime) {
+          if (startTime < endTime) {
+            if (this.activeName == "option") {
+              this.option.requestUrl =
+                "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=4&con=" +
+                this.input +
+                "&i=" +
+                new Date() +
+                "&carrierSSOId=" +
+                null +
+                "&startTime=" +
+                startTime +
+                "&endTime=" +
+                endTime;
+            } else if (this.activeName == "first") {
+              this.option1.requestUrl =
+                "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=5&con=" +
+                this.input +
+                "&i=" +
+                new Date() +
+                "&carrierSSOId=" +
+                null +
+                "&startTime=" +
+                startTime +
+                "&endTime=" +
+                endTime;
+            } else if (this.activeName == "second") {
+              this.option2.requestUrl =
+                "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=6&con=" +
+                this.input +
+                "&i=" +
+                new Date() +
+                "&carrierSSOId=" +
+                null +
+                "&startTime=" +
+                startTime +
+                "&endTime=" +
+                endTime;
+            }
+          }
+        } else {
+          if (this.activeName == "option") {
+            this.option.requestUrl =
+              "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=4&con=" +
+              this.input +
+              "&i=" +
+              new Date() +
+              "&carrierSSOId=" +
+              null;
+          } else if (this.activeName == "first") {
+            this.option1.requestUrl =
+              "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=5&con=" +
+              this.input +
+              "&i=" +
+              new Date() +
+              "&carrierSSOId=" +
+              null;
+          } else if (this.activeName == "second") {
+            this.option2.requestUrl =
+              "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=6&con=" +
+              this.input +
+              "&i=" +
+              new Date() +
+              "&carrierSSOId=" +
+              null;
+          }
+        }
       }
-    }
-      
     },
-    clickClose(){
-      console.log(this.list)
-      if(this.list.length == 0){
-        this.$message.warning('请选择订单之后在关闭')
-      }else{
-        this.axios.post('/api/v1/oms/deleteOrders',{list:this.list}).then((res)=>{
-          if(res.data.code == "200"){
-            this.$message.success('关闭成功')
-            this.getRequestUrl()
-          }
-        })
+    clickClose() {
+      console.log(this.list);
+      if (this.list.length == 0) {
+        this.$message.warning("请选择订单之后在关闭");
+      } else {
+        this.axios
+          .post("/api/v1/oms/deleteOrders", { list: this.list })
+          .then((res) => {
+            if (res.data.code == "200") {
+              this.$message.success("关闭成功");
+              this.getRequestUrl();
+            }
+          });
       }
-
     },
-    selectionChange(selection){
-      this.list = [],
-      selection.forEach(e => {
-        this.list.push(e.orderId)
-      });
-    }
+    selectionChange(selection) {
+      (this.list = []),
+        selection.forEach((e) => {
+          this.list.push(e.orderId);
+        });
+    },
   },
 };
 </script>

src/views/TMS/components/importedIngredients/truckJiMaoFuResult.vue

@@ -2,22 +2,39 @@
   <!-- 辅料计毛实绩页面 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" class="input" v-model="input" clearable> </el-input>
+      <el-input
+        placeholder="请输入内容"
+        class="input"
+        v-model="input"
+        clearable
+      >
+      </el-input>
+      <span class="text">计毛时间：</span>
+      <el-date-picker
+        v-model="startTime"
+        type="datetime"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
+      <span class="text">至</span>
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
     </div>
-    <dilTable v-bind.sync="option">
-      
-    </dilTable>
+    <dilTable v-bind.sync="option"> </dilTable>
   </div>
 </template>
 
 <script>
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   name: "homeworkPath",
   data() {
     return {
+      startTime: null,
+      endTime: null,
       restaurants: [],
       input: "",
       option: {
@@ -29,16 +46,42 @@ export default {
 
   methods: {
     onclick() {
-     this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=102&orderType=5&con=" + this.input;
+      let startTime = null;
+      let endTime = null;
+      if (this.startTime) {
+        startTime = sjTime(this.startTime);
+      }
+      if (this.endTime) {
+        endTime = sjTime(this.endTime);
+      }
+      if (startTime && endTime) {
+        if (startTime < endTime) {
+          this.option.requestUrl =
+            "/api/v1/tms/getAllJiMaoResult?apiId=102&orderType=5&con=" +
+            this.input +
+            "&startTime=" +
+            startTime +
+            "&endTime=" +
+            endTime +
+            "&i=" +
+            new Date();
+        }
+      } else {
+        this.option.requestUrl =
+          "/api/v1/tms/getAllJiMaoResult?apiId=102&orderType=5&con=" +
+          this.input +
+          "&i=" +
+          new Date();
+      }
     },
-   }
+  },
 };
 </script>
 <style lang='scss'>
 .homeworkPath {
-   .top {
+  .top {
     padding: 40px;
-    .input{
+    .input {
       width: 250px;
       margin-right: 10px;
     }

src/views/TMS/components/importedIngredients/truckJiPiFuResult.vue

@@ -2,22 +2,39 @@
   <!-- 辅料计皮实绩页面 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" class="input" v-model="input" clearable> </el-input>
+      <el-input
+        placeholder="请输入内容"
+        class="input"
+        v-model="input"
+        clearable
+      >
+      </el-input>
+      <span class="text">计皮时间：</span>
+      <el-date-picker
+        v-model="startTime"
+        type="datetime"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
+      <span class="text">至</span>
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
     </div>
-    <dilTable v-bind.sync="option">
-      
-    </dilTable>
+    <dilTable v-bind.sync="option"> </dilTable>
   </div>
 </template>
 
 <script>
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   name: "homeworkPath",
   data() {
     return {
+      startTime:null,
+      endTime:null,
       restaurants: [],
       input: "",
       option: {
@@ -28,18 +45,45 @@ export default {
   },
 
   methods: {
-
     onclick() {
-     this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=146&orderType=5&con=" + this.input;
+      let startTime = null;
+      let endTime = null;
+      if (this.startTime) {
+        startTime = sjTime(this.startTime);
+        // console.log("startTime", startTime);
+      }
+      if (this.endTime) {
+        endTime = sjTime(this.endTime);
+        // console.log("endTime", endTime);
+      }
+      if (startTime && endTime) {
+        if (startTime < endTime) {
+          this.option.requestUrl =
+            "/api/v1/tms/getAllJiPiResult?apiId=146&orderType=5&con=" +
+            this.input +
+            "&startTime=" +
+            startTime +
+            "&endTime=" +
+            endTime +
+            "&i=" +
+            new Date();
+        }
+      } else {
+        this.option.requestUrl =
+          "/api/v1/tms/getAllJiPiResult?apiId=146&orderType=5&con=" +
+          this.input +
+          "&i=" +
+          new Date();
+      }
     },
-   }
+  },
 };
 </script>
 <style lang='scss'>
 .homeworkPath {
-   .top {
+  .top {
     padding: 40px;
-    .input{
+    .input {
       width: 250px;
       margin-right: 10px;
     }

src/views/TMS/components/importedIngredients/truckQualityFuResult.vue

@@ -2,17 +2,35 @@
   <!-- 辅料质检作业 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" class="input" v-model="input" clearable> </el-input>
+      <el-input
+        placeholder="请输入内容"
+        class="input"
+        v-model="input"
+        clearable
+      >
+      </el-input>
+      <span class="text">质检时间：</span>
+      <el-date-picker
+        v-model="startTime"
+        type="datetime"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
+      <span class="text">至</span>
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
-
     </div>
-    
     <dilTable v-bind.sync="option">
       <el-table-column fixed="right" label="操作" width="50">
         <template slot-scope="scope">
-          <el-button @click="updateClick(scope.row.resultId)" type="text" size="small">
+          <el-button
+            @click="updateClick(scope.row.resultId)"
+            type="text"
+            size="small"
+          >
             修改
           </el-button>
         </template>
@@ -22,36 +40,71 @@
 </template>
 
 
+
 <script>
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   name: "wagonPlease",
   data() {
     return {
+      startTime: null,
+      endTime: null,
       status: "",
       input: "",
-      option: {       
+      option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getQualityResult?apiId=150&orderType=5",
+        requestUrl: "/api/v1/tms/getQualityResult?apiId=150&orderType=5&i="+new Date(),
       },
     };
   },
 
   methods: {
     onclick() {
-         this.option.requestUrl = "/api/v1/tms/getQualityResult?apiId=150&orderType=5&con=" + this.input;
+      let startTime = null;
+      let endTime = null;
+      if (this.startTime) {
+        startTime = sjTime(this.startTime);
+        // console.log("startTime", startTime);
+      }
+      if (this.endTime) {
+        endTime = sjTime(this.endTime);
+        // console.log("endTime", endTime);
+      }
+      if (startTime && endTime) {
+        if (startTime < endTime) {
+          this.option.requestUrl =
+            "/api/v1/tms/getQualityResult?apiId=150&orderType=5&con=" +
+            this.input +
+            "&startTime=" +
+            startTime +
+            "&endTime=" +
+            endTime +
+            "&i=" +
+            new Date();
+        }
+      } else {
+        this.option.requestUrl =
+          "/api/v1/tms/getQualityResult?apiId=150&orderType=5&con=" +
+          this.input +
+          "&startTime=" +
+          startTime +
+          "&endTime=" +
+          endTime +
+          "&i=" +
+          new Date();
+      }
     },
     updateClick(resultId) {
       this.$router.push("/truckQualityRanLaoResultEdit/" + resultId);
     },
-    
   },
 };
 </script>
 <style lang='scss'>
 .homeworkPath {
-   .top {
+  .top {
     padding: 40px;
-    .input{
+    .input {
       width: 250px;
       margin-right: 10px;
     }

src/views/TMS/components/importedIngredients/truckReceiptFuResult.vue

@@ -2,24 +2,42 @@
   <!-- 辅料收货作业页面 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" class="input" v-model="input" clearable> </el-input>
+      <el-input
+        placeholder="请输入内容"
+        class="input"
+        v-model="input"
+        clearable
+      >
+      </el-input>
+
+      <span class="text">收货时间：</span>
+      <el-date-picker
+        v-model="startTime"
+        type="datetime"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
+      <span class="text">至</span>
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
     </div>
-    <dilTable v-bind.sync="option">
-      
-    </dilTable>
+    <dilTable v-bind.sync="option"> </dilTable>
   </div>
 </template>
 
 <script>
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   name: "homeworkPath",
   data() {
     return {
       restaurants: [],
       input: "",
+      startTime: null,
+      endTime: null,
       option: {
         // 表格请求数据的地址
         requestUrl: "/api/v1/tms/getReceiveResult?apiId=149&orderType=5",
@@ -28,16 +46,44 @@ export default {
   },
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getReceiveResult?apiId=149&orderType=5&con=" + this.input;
+      let startTime = null;
+      let endTime = null;
+      if (this.startTime) {
+        startTime = sjTime(this.startTime);
+        // console.log("startTime", startTime);
+      }
+      if (this.endTime) {
+        endTime = sjTime(this.endTime);
+        // console.log("endTime", endTime);
+      }
+      if (startTime && endTime) {
+        if (startTime < endTime) {
+          this.option.requestUrl =
+            "/api/v1/tms/getReceiveResult?apiId=149&orderType=5&con=" +
+            this.input +
+            "&startTime=" +
+            startTime +
+            "&endTime=" +
+            endTime +
+            "&i=" +
+            new Date();
+        }
+      } else {
+        this.option.requestUrl =
+          "/api/v1/tms/getReceiveResult?apiId=149&orderType=5&con=" +
+          this.input +
+          "&i=" +
+          new Date();
+      }
     },
-   }
+  },
 };
 </script>
 <style lang='scss'>
 .homeworkPath {
-   .top {
+  .top {
     padding: 40px;
-    .input{
+    .input {
       width: 250px;
       margin-right: 10px;
     }

src/views/TMS/components/importedIngredients/truckUnloadFuResult.vue

@@ -1,8 +1,24 @@
 <template>
   <!-- 卸货实绩页面 -->
   <div class="homeworkPath">
-   <div class="top">
-      <el-input placeholder="请输入内容" class="input" v-model="input" clearable> </el-input>
+    <div class="top">
+      <el-input
+        placeholder="请输入内容"
+        class="input"
+        v-model="input"
+        clearable
+      >
+      </el-input>
+      <span class="text">卸货时间：</span>
+      <el-date-picker
+        v-model="startTime"
+        type="datetime"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
+      <span class="text">至</span>
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -12,10 +28,13 @@
 </template>
 
 <script>
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   name: "homeworkPath",
   data() {
     return {
+      startTime: null,
+      endTime: null,
       restaurants: [],
       input: "",
       option: {
@@ -24,19 +43,45 @@ export default {
       },
     };
   },
- 
+
   methods: {
     onclick() {
-          this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=145&orderType=5&con=" + this.input;
+      let startTime = null;
+      let endTime = null;
+      if (this.startTime) {
+        startTime = sjTime(this.startTime);
+      }
+      if (this.endTime) {
+        endTime = sjTime(this.endTime);
+      }
+      if (startTime && endTime) {
+        if (startTime < endTime) {
+          this.option.requestUrl =
+            "/api/v1/tms/getUnloadResult?apiId=145&orderType=5&con=" +
+            this.input +
+            "&startTime=" +
+            startTime +
+            "&endTime=" +
+            endTime +
+            "&i=" +
+            new Date();
+        }
+      } else {
+        this.option.requestUrl =
+          "/api/v1/tms/getUnloadResult?apiId=145&orderType=5&con=" +
+          this.input +
+          "&i=" +
+          new Date();
+      }
     },
-   }
+  },
 };
 </script>
 <style lang='scss'>
 .homeworkPath {
-   .top {
+  .top {
     padding: 40px;
-    .input{
+    .input {
       width: 250px;
       margin-right: 10px;
     }

src/views/TMS/components/importedMineral/transportAppoint.vue

@@ -9,6 +9,23 @@
         clearable
       >
       </el-input>
+      <!-- 时间查询框 -->
+      <span class="text" v-if="activeName == 'second'">下发时间：</span>
+      <el-date-picker
+        v-if="activeName == 'second'"
+        v-model="startTime"
+        type="datetime"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
+      <span class="text" v-if="activeName == 'second'">至</span>
+      <el-date-picker
+        v-if="activeName == 'second'"
+        v-model="endTime"
+        type="datetime"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -76,6 +93,7 @@
 
 <script>
 import { getCookie } from "@/utils/util.js";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   name: "inplantTMS",
   data() {
@@ -83,6 +101,8 @@ export default {
       input: "",
       Time: "",
       activeName: "first",
+      startTime: null,
+      endTime: null,
       option1: {
         // 表格请求数据的地址
         requestUrl: "",
@@ -114,26 +134,34 @@ export default {
     }
   },
   methods: {
-    handleClick(){
-      this.getRequestUrl()
+    handleClick() {
+      this.getRequestUrl();
     },
-    getRequestUrl(){
-        //判断是否是承运商
-    if (getCookie("orgCode") == "chengyunshang") {
-      this.option1.requestUrl =
-        "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&orderType=8&carrierSSOId=" +
-        getCookie("userId") + "&i=" + new Date();
-      this.option2.requestUrl =
-        "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&orderType=8&carrierSSOId=" +
-        getCookie("userId") + "&i=" + new Date();
-    } else {
-      this.option1.requestUrl =
-        "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&orderType=8&carrierSSOId=" +
-        null + "&i=" + new Date();
-      this.option2.requestUrl =
-        "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&orderType=8&carrierSSOId=" +
-        null + "&i=" + new Date();
-    }
+    getRequestUrl() {
+      //判断是否是承运商
+      if (getCookie("orgCode") == "chengyunshang") {
+        this.option1.requestUrl =
+          "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&orderType=8&carrierSSOId=" +
+          getCookie("userId") +
+          "&i=" +
+          new Date();
+        this.option2.requestUrl =
+          "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&orderType=8&carrierSSOId=" +
+          getCookie("userId") +
+          "&i=" +
+          new Date();
+      } else {
+        this.option1.requestUrl =
+          "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&orderType=8&carrierSSOId=" +
+          null +
+          "&i=" +
+          new Date();
+        this.option2.requestUrl =
+          "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&orderType=8&carrierSSOId=" +
+          null +
+          "&i=" +
+          new Date();
+      }
     },
     onclick() {
       if (this.activeName == "first") {
@@ -152,19 +180,45 @@ export default {
             this.input;
         }
       } else {
-        //判断是否是承运商
-        if (getCookie("orgCode") == "chengyunshang") {
-          this.option1.requestUrl =
-            "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&orderType=8&carrierSSOId=" +
-            getCookie("userId") +
-            "&con=" +
-            this.input;
-        } else {
-          this.option1.requestUrl =
-            "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&orderType=8&carrierSSOId=" +
-            null +
-            "&con=" +
-            this.input;
+        let startTime = null;
+        let endTime = null;
+        if (this.startTime) {
+          startTime = sjTime(this.startTime);
+          // console.log("startTime", startTime);
+        }
+        if (this.endTime) {
+          endTime = sjTime(this.endTime);
+          // console.log("endTime", endTime);
+        }
+        if (startTime && endTime) {
+          if (startTime < endTime) {
+            //判断是否是承运商
+            if (getCookie("orgCode") == "chengyunshang") {
+              this.option1.requestUrl =
+                "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&orderType=8&carrierSSOId=" +
+                getCookie("userId") +
+                "&con=" +
+                this.input +
+                "&startTime=" +
+                startTime +
+                "&endTime=" +
+                endTime +
+                "&i=" +
+                new Date();
+            } else {
+              this.option1.requestUrl =
+                "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&orderType=8&carrierSSOId=" +
+                null +
+                "&con=" +
+                this.input +
+                "&startTime=" +
+                startTime +
+                "&endTime=" +
+                endTime +
+                "&i=" +
+                new Date();
+            }
+          }
         }
       }
     },
@@ -180,7 +234,7 @@ export default {
           type: "success",
           message: "下发成功!",
         });
-        this.getRequestUrl()
+        this.getRequestUrl();
       });
     },
     // 下发
@@ -200,7 +254,7 @@ export default {
               type: "success",
               message: "下发成功!",
             });
-            this.getRequestUrl()
+            this.getRequestUrl();
           });
         })
         .catch(() => {
@@ -229,7 +283,7 @@ export default {
               capacityNumber: capacityNumber,
             })
             .then(() => {
-              this.getRequestUrl()
+              this.getRequestUrl();
             });
         })
         .catch(() => {

src/views/TMS/components/purchaseChemicalMaterials/transportationDispatch.vue

@@ -9,8 +9,18 @@
         clearable
       >
       </el-input>
+      <span class="text">下发时间：</span>
+      <el-date-picker
+        v-model="startTime"
+        type="datetime"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
+      <span class="text">至</span>
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
       <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询1
+        <i class="el-icon-search"></i>查询
       </el-button>
     </div>
     <el-tabs v-model="activeName">
@@ -28,20 +38,23 @@
 
 <script>
 import { getCookie } from "@/utils/util.js";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   name: "inplantTMS",
   data() {
     return {
       input: "",
       Time: "",
+      startTime: null,
+      endTime: null,
       activeName: "first",
       option1: {
         // 表格请求数据的地址
-        requestUrl:"",
+        requestUrl: "",
       },
       option2: {
         // 表格请求数据的地址
-        requestUrl:"",
+        requestUrl: "",
       },
     };
   },
@@ -65,14 +78,52 @@ export default {
   },
   methods: {
     onclick() {
-      if (this.activeName == "first") {
-        this.option1.requestUrl =
-          "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=2&orderStatus=111&con=" +
-          this.input;
+      let startTime = null;
+      let endTime = null;
+      if (this.startTime) {
+        startTime = sjTime(this.startTime);
+      }
+      if (this.endTime) {
+        endTime = sjTime(this.endTime);
+      }
+      if (startTime && endTime) {
+        if (startTime < endTime) {
+          if (this.activeName == "first") {
+            this.option1.requestUrl =
+              "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=2&orderStatus=111&con=" +
+              this.input +
+              "&startTime=" +
+              startTime +
+              "&endTime=" +
+              endTime +
+              "&i=" +
+              new Date();
+          } else {
+            this.option2.requestUrl =
+              "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=2&orderStatus=6&con=" +
+              this.input +
+              "&startTime=" +
+              startTime +
+              "&endTime=" +
+              endTime +
+              "&i=" +
+              new Date();
+          }
+        }
       } else {
-        this.option2.requestUrl =
-          "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=2&orderStatus=6&con=" +
-          this.input;
+        if (this.activeName == "first") {
+          this.option1.requestUrl =
+            "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=2&orderStatus=111&con=" +
+            this.input +
+            "&i=" +
+            new Date();
+        } else {
+          this.option2.requestUrl =
+            "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=2&orderStatus=6&con=" +
+            this.input +
+            "&i=" +
+            new Date();
+        }
       }
     },
   },

src/views/TMS/components/purchaseChemicalMaterials/transportationReservation.vue

@@ -9,6 +9,22 @@
         clearable
       >
       </el-input>
+      <span class="text" v-if="activeName == 'second'">下发时间：</span>
+      <el-date-picker
+        v-if="activeName == 'second'"
+        v-model="startTime"
+        type="datetime"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
+      <span class="text" v-if="activeName == 'second'">至</span>
+      <el-date-picker
+        v-if="activeName == 'second'"
+        v-model="endTime"
+        type="datetime"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -76,12 +92,15 @@
 
 <script>
 import { getCookie } from "@/utils/util.js";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   name: "inplantTMS",
   data() {
     return {
       input: "",
       Time: "",
+      startTime: null,
+      endTime: null,
       activeName: "first",
       option1: {
         // 表格请求数据的地址
@@ -95,61 +114,162 @@ export default {
       },
     };
   },
-  watch:{
-    activeName(val){
-      if(val == 'first'){
-        if (getCookie("orgCode") == "chengyunshang") {
-          this.option1.requestUrl = "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=2&carrierSSOId=" + getCookie("userId")+"&i="+ new Date();
-        }else{
-          this.option1.requestUrl = "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=2&carrierSSOId=" + null + "&i="+ new Date();
-        }
-      }else{
-        if (getCookie("orgCode") == "chengyunshang") {
-          this.option2.requestUrl = "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=2&carrierSSOId=" + getCookie("userId") + "&i="+ new Date();
-        }else{
-          this.option2.requestUrl = "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=2&carrierSSOId=" + null + "&i="+ new Date();
-        }
+
+  activeName(val) {
+    if (val == "first") {
+      if (getCookie("orgCode") == "chengyunshang") {
+        this.option1.requestUrl =
+          "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=2&carrierSSOId=" +
+          getCookie("userId") +
+          "&i=" +
+          new Date();
+      } else {
+        this.option1.requestUrl =
+          "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=2&carrierSSOId=" +
+          null +
+          "&i=" +
+          new Date();
+      }
+    } else {
+      if (getCookie("orgCode") == "chengyunshang") {
+        this.option2.requestUrl =
+          "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=2&carrierSSOId=" +
+          getCookie("userId") +
+          "&i=" +
+          new Date();
+      } else {
+        this.option2.requestUrl =
+          "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=2&carrierSSOId=" +
+          null +
+          "&i=" +
+          new Date();
       }
     }
   },
+
   created() {
     //判断是否是承运商
     if (getCookie("orgCode") == "chengyunshang") {
-      this.option1.requestUrl = "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=2&carrierSSOId=" + getCookie("userId");
-      this.option2.requestUrl = "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=2&carrierSSOId=" + getCookie("userId");
+      this.option1.requestUrl =
+        "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=2&carrierSSOId=" +
+        getCookie("userId");
+      this.option2.requestUrl =
+        "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=2&carrierSSOId=" +
+        getCookie("userId");
     } else {
-      this.option1.requestUrl = "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=2&carrierSSOId=" + null;
-      this.option2.requestUrl = "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=2&carrierSSOId=" + null;
+      this.option1.requestUrl =
+        "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=2&carrierSSOId=" +
+        null;
+      this.option2.requestUrl =
+        "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=2&carrierSSOId=" +
+        null;
     }
   },
   methods: {
-    getRequestUrl(){
-       //判断是否是承运商
-    if (getCookie("orgCode") == "chengyunshang") {
-      this.option1.requestUrl = "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=2&carrierSSOId=" + getCookie("userId") + "&i=" + new Date();
-      this.option2.requestUrl = "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=2&carrierSSOId=" + getCookie("userId") + "&i=" + new Date();
-    } else {
-      this.option1.requestUrl = "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=2&carrierSSOId=" + null + "&i=" + new Date();
-      this.option2.requestUrl = "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=2&carrierSSOId=" + null + "&i=" + new Date();
-    }
+    getRequestUrl() {
+      //判断是否是承运商
+      if (getCookie("orgCode") == "chengyunshang") {
+        this.option1.requestUrl =
+          "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=2&carrierSSOId=" +
+          getCookie("userId") +
+          "&i=" +
+          new Date();
+        this.option2.requestUrl =
+          "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=2&carrierSSOId=" +
+          getCookie("userId") +
+          "&i=" +
+          new Date();
+      } else {
+        this.option1.requestUrl =
+          "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=2&carrierSSOId=" +
+          null +
+          "&i=" +
+          new Date();
+        this.option2.requestUrl =
+          "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=2&carrierSSOId=" +
+          null +
+          "&i=" +
+          new Date();
+      }
     },
     onclick() {
       if (this.activeName == "first") {
         //判断是否是承运商
         if (getCookie("orgCode") == "chengyunshang") {
-          this.option1.requestUrl = "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=2&carrierSSOId=" + getCookie("userId") + "&con=" + this.input;
+          this.option1.requestUrl =
+            "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=2&carrierSSOId=" +
+            getCookie("userId") +
+            "&con=" +
+            this.input;
         } else {
-          this.option1.requestUrl = "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=2&carrierSSOId=" + null + "&con=" + this.input;
+          this.option1.requestUrl =
+            "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=2&carrierSSOId=" +
+            null +
+            "&con=" +
+            this.input;
         }
       } else {
-        //判断是否是承运商
-        if (getCookie("orgCode") == "chengyunshang") {
-          this.option1.requestUrl = "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=2&carrierSSOId=" + getCookie("userId") + "&con=" + this.input;
-        } else {
-          this.option1.requestUrl = "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=2&carrierSSOId=" + null + "&con=" + this.input;
+        let startTime = null;
+        let endTime = null;
+        if (this.startTime) {
+          startTime = sjTime(this.startTime);
+        }
+        if (this.endTime) {
+          endTime = sjTime(this.endTime);
+        }
+        if (startTime && endTime) {
+          if (startTime < endTime) {
+            //判断是否是承运商
+            if (getCookie("orgCode") == "chengyunshang") {
+              this.option2.requestUrl =
+                "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=2&carrierSSOId=" +
+                getCookie("userId") +
+                "&con=" +
+                this.input +
+                "&startTime=" +
+                startTime +
+                "&endTime=" +
+                endTime +
+                "&i=" +
+                new Date();
+            } else {
+              this.option2.requestUrl =
+                "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=2&carrierSSOId=" +
+                null +
+                "&con=" +
+                this.input +
+                "&startTime=" +
+                startTime +
+                "&endTime=" +
+                endTime +
+                "&i=" +
+                new Date();
+            }
+          } 
+        }else{
+            console.log("我进来了");
+            //判断是否是承运商
+            if (getCookie("orgCode") == "chengyunshang") {
+              this.option2.requestUrl =
+                "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=2&carrierSSOId=" +
+                getCookie("userId") +
+                "&con=" +
+                this.input +
+                "&i=" +
+                new Date();
+            } else {
+              this.option2.requestUrl =
+                "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=2&carrierSSOId=" +
+                null +
+                "&con=" +
+                this.input +
+                "&i=" +
+                new Date();
+            }
         }
       }
     },
+
     selectionChange(selection) {
       this.mapList = selection;
     },
@@ -162,7 +282,7 @@ export default {
           type: "success",
           message: "下发成功!",
         });
-        this.getRequestUrl()
+        this.getRequestUrl();
       });
     },
     // 下发
@@ -182,7 +302,7 @@ export default {
               type: "success",
               message: "下发成功!",
             });
-            this.getRequestUrl()
+            this.getRequestUrl();
           });
         })
         .catch(() => {
@@ -211,7 +331,7 @@ export default {
               capacityNumber: capacityNumber,
             })
             .then(() => {
-              this.getRequestUrl()
+              this.getRequestUrl();
             });
         })
         .catch(() => {

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/components/ship/modifyDeliveryNotice.vue

@@ -102,7 +102,7 @@
       label-width="80px"
       style="margin-left: 450px; display: flex"
     >
-      <el-form-item label="上传货权转移附件">
+      <el-form-item label="上传货权转移图片">
         <el-upload
           class="upload-demo"
           style="width: 270px"
@@ -119,7 +119,7 @@
           <el-input
             class="shippingCertificate"
             style="width: 270px; display: flex"
-            placeholder="请选择货权转移附件(必填项,可支持重新上传)"
+            placeholder="请选择货权转移图片(必填项,可支持重新上传)"
             v-model="shippingCertificate"
             disabled
           >
@@ -136,7 +136,7 @@
             "
             @click="upCLick(1)"
           >
-            点击上传附件</el-button
+            点击上传图片</el-button
           >
         </el-upload>
       </el-form-item>

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/homepage/components/about.vue

@@ -0,0 +1,60 @@
+<template>
+  <div class="about">
+    <span
+      class="about-lable"
+      style="
+        margin-left: 450px;
+        display: flex;
+        font: bold 40px arial, sans-serif;
+      "
+      >达州钢铁智慧物流平台异常处理参考</span
+    >
+    <div class="el-front">
+      <p class="front" style="font: 23px arial, sans-serif">
+        &nbsp;&nbsp;&nbsp;此文档由达州钢铁智慧物流平台-视拓信息驻达州钢铁项目组提供。鉴于各部门多
+        次出现上报的异常不知道如何处理，
+        项目组整理出以下情况，供各位参考。如遇特殊情况不在此文档内方可联系项目组技术人员，
+        在此文档内的情况没有说明 需技术人员解决的问题项目组技术人员概不受理。
+      </p>
+    </div>
+    <div class="el-container">
+      <p class="container" style="font: 23px arial, sans-serif">
+        &nbsp;&nbsp;&nbsp;
+        1）运输车辆进厂出现异常。如出现<span style="color:blue;">”审批未通过不能进厂”</span>，表示财务未审批。
+        保卫部则不能允许车辆进厂，可通知司机联系老板核实是否已经向四川省达州钢铁有限公司付款（可联系销售公司）。<br />
+        &nbsp;&nbsp;&nbsp;2）进厂出现<span style="color:blue;">”委托发送失败“</span>，表示物流系统向计量系统发送委托失败，司机进厂也无法计量，需保卫部禁止司机进厂待处理异常后方可进厂。
+        请联系相关技术人员处理异常。可在微信群里<span style="color:CornflowerBlue;">@有关技术人员</span>。<br />
+        &nbsp;&nbsp;&nbsp;3）进厂出现<span style="color:blue;">”没有获取到门岗”</span>,说明运输订单选择的线路错误。需让司机联系给他下单的客户，选择正确的线路，
+        同时需司机撤销订单。接正确的运输订单。<br />
+        &nbsp;&nbsp;&nbsp;4）司机进厂的时候，如果为采购进来的物资请仔细核实<span style="color:green;">卸货厂区</span>，例如，月亮湾进来的煤炭，如果是卸货厂区是二厂。请让司机及时联系给他下单的人员更改订单。<br />
+        如遇特殊情况不知道下单人员，联系技术人员。务必不能让司机进厂。特殊情况下，司机进厂了完成了作业环节，到最后才发现卸货厂区错误，
+        请通过流程先找自动化部，然后将由自动化部通知物流，方可更改。<br />
+        &nbsp;&nbsp;&nbsp;5）司机计量时出现无法扫码，请先查看其他司机是否可以正确计量。如果出现大面积无法正确过磅，可先联系计量，
+        计量确认与计量无关以后，再联系物流系统。<br />
+        &nbsp;&nbsp;&nbsp;
+        6）装货作业如果出现无法确认，请先确认司机运输订单是否有时间，且作业点是否点亮。如果时间点点亮，说明已经装过货。不影响司机的后续环节。
+        <span style="color:red;"><br />注：任何一个环节，如果扫码成功或者已完成，运输进程线路会出现时间，且进程会点亮</span><br />
+        &nbsp;&nbsp;&nbsp;
+        7）装货环节提示<span style="color:blue;">”请通知司机完成前序操作再来装货”</span>，请确认司机订单是否有未完成，未完成的判断在于时间点有无点亮以及是否有时间。<br />
+        &nbsp;&nbsp;&nbsp;
+        8）车辆出现进厂计完皮发现无货的情况，可扫码填写备注<span style="color:blue;">“未装货”</span>以后让司机出厂。
+        <span style="color:red;"><br />注:关注司机的运输订单是否作业环节除出厂以外，是否全部点亮。</span><br />
+        &nbsp;&nbsp;&nbsp;
+        9）出厂时，出现<span style="color:blue;">“未装货不能出厂”</span>请提醒司机去装货扫码，务必不能让司机出厂。<br />
+      </p>
+    </div>
+  </div>
+</template>
+<script>
+export default {};
+</script>
+
+<style lang="less" >
+.dbout {
+  .el-front {
+    .front {
+      font: 32px arial, sans-serif;
+    }
+  }
+}
+</style>

src/views/homepage/components/homepage.vue

@@ -1,5 +1,6 @@
 <template>
   <div>首页</div>
+  
 </template>
 
 <script>

src/views/homepage/router/index.js

@@ -7,6 +7,8 @@ import routerBefore from '@/config/routerBefore.js'
 import main from '@/components/main.vue'
 // 系统配置管理
 import homepage from '../components/homepage.vue'
+// 关于-帮助文档
+import about from '../components/about.vue'
 Vue.use(Router)
 
 const constantRouterMap = [
@@ -18,6 +20,7 @@ const constantRouterMap = [
     redirect: {name: 'cargoResult'},
     children: [
       {path: 'homepage', name: 'homepage', meta: {code: 'xtpzgl-jggl'}, component: homepage},
+      {path: 'about', name: 'about', meta: {code: 'xtpzgl-jggl'}, component: about},
     ]
   }
 ];

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/inward/components/truckAppoint/plan.vue

@@ -4,7 +4,7 @@
     <div class="sache">
       <el-input placeholder="请输入内容" v-model="inputText" clearable>
       </el-input>
-      <el-button type="primary" class="btn" @click="bofang">
+      <el-button type="primary" class="btn">
         <i class="el-icon-search"></i>查询
       </el-button>
       <el-badge
@@ -134,7 +134,7 @@
               </el-table-column>
             </dilTable>
           </el-tab-pane>
-          <el-tab-pane label="已完成" name="fourth">
+          <!-- <el-tab-pane label="已完成" name="fourth">
             <dilTable
               v-bind.sync="fourth"
               @selection-change="selectionChange"
@@ -156,7 +156,6 @@
                   </el-button>
                 </template>
               </el-table-column>
-              <!-- 物资详情抽屉 -->
               <el-table-column type="expand" width="1">
                 <template slot-scope="props">
                   <el-form
@@ -180,7 +179,7 @@
                 </template>
               </el-table-column>
             </dilTable>
-          </el-tab-pane>
+          </el-tab-pane> -->
         </el-tabs>
       </div>
     </template>
@@ -205,9 +204,9 @@ export default {
         // second请求数据的地址
         requestUrl: ""
       },
-      fourth: {
-        requestUrl: ""
-      },
+      // fourth: {
+      //   requestUrl: ""
+      // },
       activeName: "second",
       //记录旧的row对象(未下发)
       oldRow: "",
@@ -261,12 +260,12 @@ export default {
     };
   },
   created() {
-    (this.second.requestUrl =
-      "/api/v1/ams/getTruckPlanList?apiId=257&planStatus=0"),
-      (this.third.requestUrl =
-        "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=1"),
-      (this.fourth.requestUrl =
-        "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=4");
+    this.second.requestUrl =
+      "/api/v1/ams/getTruckPlanList?apiId=257&planStatus=0";
+    this.third.requestUrl =
+      "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=1";
+    // this.fourth.requestUrl =
+    //   "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=4";
   },
   mounted() {
     this.getAddPlan();
@@ -394,21 +393,21 @@ export default {
       this.getRequirementMaterial();
     },
     getRequestUrl() {
-      (this.first.requestUrl =
-        "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=1&i=" +
-        new Date()),
-        (this.second.requestUrl =
-          "/api/v1/ams/getTruckPlanList?apiId=257&planStatus=0" +
-          "&i=" +
-          new Date()),
-        (this.third.requestUrl =
-          "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=1" +
-          "&i=" +
-          new Date()),
-        (this.fourth.requestUrl =
-          "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=4" +
-          "&i=" +
-          new Date());
+      // this.first.requestUrl =
+      //   "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=1&i=" +
+      //   new Date();
+      this.second.requestUrl =
+        "/api/v1/ams/getTruckPlanList?apiId=257&planStatus=0" +
+        "&i=" +
+        new Date();
+      this.third.requestUrl =
+        "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=1" +
+        "&i=" +
+        new Date();
+      // (this.fourth.requestUrl =
+      //   "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=4" +
+      //   "&i=" +
+      //   new Date());
     },
     selectionChange(selection) {
       this.second.mapList = selection;

src/views/inward/components/truckAppoint/purInwardRequirement.vue

@@ -2,9 +2,29 @@
 <template>
   <div class="steel_inbound">
     <div class="sache">
-      <el-input placeholder="请输入内容" v-model="inputText" clearable>
+      <el-input
+        placeholder="可查询采购订单号、发货单位、卸货点、物资名称、船名"
+        v-model="inputText"
+        clearable
+      >
       </el-input>
-      <el-button type="primary" class="btn">
+      <span>需求时间：</span>
+      <el-date-picker
+        v-model="startTime"
+        type="datetime"
+        placeholder="选择日期"
+        style="width:220px"
+      >
+      </el-date-picker>
+      <span>至</span>
+      <el-date-picker
+        v-model="endTime"
+        type="datetime"
+        placeholder="选择日期"
+        style="width:220px"
+      >
+      </el-date-picker>
+      <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
       <el-button
@@ -62,12 +82,15 @@
 </template>
 <script>
 import { getCookie } from "@/utils/util.js";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   data() {
     return {
+      endTime: null,
+      startTime: null,
       startStop: null,
       startStopValue: null,
-      inputText: "",
+      inputText: null,
       first: {
         // first请求数据的地址
         requestUrl: "",
@@ -109,6 +132,48 @@ export default {
         }
       });
     },
+    //查询方法，支持查采购订单号、发货单位、卸货点、物资名称、船名
+    onclick() {
+      console.log(this.inputText);
+      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"
+      ) {
+        orgCode = getCookie("orgCode");
+      }
+      if (this.activeName == "first") {
+        this.first.requestUrl =
+          "/api/v1/ams/getPurRequirementList?apiId=431&requirementStatus=0&orgCode=" +
+          orgCode +
+          "&con=" +
+          this.inputText +
+          "&startTime=" +
+          startTime +
+          "&endTime=" +
+          endTime +
+          "&i=" +
+          new Date();
+      } else {
+        this.second.requestUrl =
+          "/api/v1/ams/getPurRequirementList?apiId=431&requirementStatus=1&orgCode=" +
+          orgCode +
+          "&con=" +
+          this.inputText +
+          "&startTime=" +
+          startTime +
+          "&endTime=" +
+          endTime +
+          "&i=" +
+          new Date();
+      }
+    },
     getRequestUrl() {
       if (
         getCookie("orgCode") == "dagangadmin" ||

src/views/inward/components/truckAppoint/requirement.vue

@@ -4,6 +4,22 @@
     <div class="sache">
       <el-input placeholder="请输入内容" v-model="inputText" clearable>
       </el-input>
+      <span>需求时间：</span>
+      <el-date-picker
+        v-model="startTime"
+        type="datetime"
+        placeholder="选择日期"
+        style="width:220px"
+      >
+      </el-date-picker>
+      <span>至</span>
+      <el-date-picker
+        v-model="endTime"
+        type="datetime"
+        placeholder="选择日期"
+        style="width:220px"
+      >
+      </el-date-picker>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -25,7 +41,7 @@
               @selection-change="selectionChange"
               ref="table"
             >
-              <el-table-column fixed="right" label="操作" width="120">
+              <el-table-column fixed="right" label="操作" width="80">
                 <template slot-scope="scope">
                   <el-button
                     type="text"
@@ -59,12 +75,14 @@
 </template>
 <script>
 import { getCookie } from "@/utils/util.js";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   data() {
     return {
-      tableTitle: "null",
       inputText: null,
       orgCode: "",
+      startTime: null,
+      endTime: null,
       first: {
         // first请求数据的地址
         requestUrl: "",
@@ -106,6 +124,12 @@ export default {
   methods: {
     onclick() {
       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"
@@ -117,13 +141,25 @@ export default {
           "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=0&orgCode=" +
           orgCode +
           "&index=" +
-          this.inputText;
+          this.inputText +
+          "&startTime=" +
+          startTime +
+          "&endTime=" +
+          endTime +
+          "&i=" +
+          new Date();
       } else {
         this.second.requestUrl =
           "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=1&orgCode=" +
           orgCode +
           "&index=" +
-          this.inputText;
+          this.inputText +
+          "&startTime=" +
+          startTime +
+          "&endTime=" +
+          endTime +
+          "&i=" +
+          new Date();
       }
     },
     //查看需求下面的运单

src/views/inward/components/truckAppoint/requirementOther.vue

@@ -4,6 +4,22 @@
     <div class="sache">
       <el-input placeholder="请输入内容" v-model="inputText" clearable>
       </el-input>
+      <span>需求时间：</span>
+      <el-date-picker
+        v-model="startTime"
+        type="datetime"
+        placeholder="选择日期"
+        style="width:220px"
+      >
+      </el-date-picker>
+      <span>至</span>
+      <el-date-picker
+        v-model="endTime"
+        type="datetime"
+        placeholder="选择日期"
+        style="width:220px"
+      >
+      </el-date-picker>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -33,7 +49,7 @@
               @selection-change="selectionChange"
               ref="table1"
             >
-              <el-table-column fixed="right" label="操作" width="120">
+              <el-table-column fixed="right" label="操作" width="90">
                 <template slot-scope="scope">
                   <el-button
                     type="text"
@@ -67,11 +83,14 @@
 </template>
 <script>
 import { getCookie } from "@/utils/util.js";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   data() {
     return {
-      inputText: "",
-      orgCode: "",
+      inputText: null,
+      orgCode: null,
+      endTime: null,
+      startTime: null,
       first: {
         // first请求数据的地址
         requestUrl: "",
@@ -112,6 +131,12 @@ export default {
   methods: {
     onclick() {
       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"
@@ -123,13 +148,25 @@ export default {
           "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=0&orgCode=" +
           orgCode +
           "&index=" +
-          this.inputText;
+          this.inputText +
+          "&startTime=" +
+          startTime +
+          "&endTime=" +
+          endTime +
+          "&i=" +
+          new Date();
       } else {
         this.second.requestUrl =
           "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=1&orgCode=" +
           orgCode +
           "&index=" +
-          this.inputText;
+          this.inputText +
+          "&startTime=" +
+          startTime +
+          "&endTime=" +
+          endTime +
+          "&i=" +
+          new Date();
       }
     },
     //查看需求下面的运单

src/views/inward/components/truckOrder/dispatchPlan.vue

@@ -2,9 +2,29 @@
 <template>
   <div class="inwardOrder">
     <div class="sache">
-      <el-input placeholder="请输入内容" v-model="inputText" clearable>
+      <el-input
+        placeholder="可查询车牌号、物资、装卸货点"
+        v-model="inputText"
+        clearable
+      >
       </el-input>
-      <el-button type="primary" class="btn">
+      <span>订单时间：</span>
+      <el-date-picker
+        v-model="startTime"
+        type="datetime"
+        placeholder="选择日期"
+        style="width:220px"
+      >
+      </el-date-picker>
+      <span>至</span>
+      <el-date-picker
+        v-model="endTime"
+        type="datetime"
+        placeholder="选择日期"
+        style="width:220px"
+      >
+      </el-date-picker>
+      <el-button type="primary" class="btn" @click="onClick">
         <i class="el-icon-search"></i>查询
       </el-button>
     </div>
@@ -71,20 +91,18 @@
 </template>
 <script>
 import { getCookie } from "@/utils/util.js";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   data() {
     return {
-      inputText: "",
+      startTime: null,
+      endTime: null,
+      inputText: null,
       truckInput: null,
       userCarrierId: "",
       //是否弹出对话框
       dialogTableVisible: false,
-      first: {
-        //
-        requestUrl:
-          "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=4&carrierId=" +
-          ""
-      },
+      first: {},
       //车辆信息的表格
       truck: {
         requestUrl:
@@ -124,6 +142,56 @@ export default {
     }
   },
   methods: {
+    onClick() {
+      console.log("dks");
+      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") == "chengyunshang") {
+        orgCode = getCookie("userId");
+      }
+      if (this.activeName == "first") {
+        this.first.requestUrl =
+          "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=4&orgCode=" +
+          orgCode +
+          "&con=" +
+          this.inputText +
+          "&startTime=" +
+          startTime +
+          "&endTime=" +
+          endTime +
+          "&i=" +
+          new Date();
+      } else if (this.activeName == "second") {
+        this.second.requestUrl =
+          "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=5&orgCode=" +
+          orgCode +
+          "&con=" +
+          this.inputText +
+          "&startTime=" +
+          startTime +
+          "&endTime=" +
+          endTime +
+          "&i=" +
+          new Date();
+      } else {
+        this.third.requestUrl =
+          "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=2&orgCode=" +
+          orgCode +
+          "&con=" +
+          this.inputText +
+          "&startTime=" +
+          startTime +
+          "&endTime=" +
+          endTime +
+          "&i=" +
+          new Date();
+      }
+    },
     getRequest() {
       if (getCookie("orgCode") == "chengyunshang") {
         this.first.requestUrl =
@@ -157,7 +225,6 @@ export default {
       }
     },
     handleClick() {
-      this.getRequirementMaterial();
       this.getRequest();
     },
     handleClose(done) {
@@ -219,39 +286,6 @@ export default {
         "&index=" +
         this.truckInput;
     },
-    getRequirementMaterial(row) {
-      // 记录重复点击次数
-      if (this.oldRow === row) {
-        this.oldRowCount += 1;
-      }
-      // 切换当前详情表
-      this.$refs.table.toggleRowExpansion(row);
-      // 打开前关闭上一个详情表
-      if (this.oldRow != "") {
-        if (this.oldRow != row) {
-          if (this.oldRowCount % 2 === 1) {
-            this.$refs.table.toggleRowExpansion(this.oldRow);
-          } else {
-            this.oldRowCount = 1;
-          }
-        } else {
-          this.oldRow = null;
-          return;
-        }
-      }
-      // 重置上一个点击对象
-      this.oldRow = row;
-      this.getMaterial(row.requirementId);
-    },
-    getMaterial(requirementId) {
-      console.log(requirementId);
-      this.axios
-        .post("/api/v1/ams/getRequirementMaterial/" + requirementId)
-        .then(res => {
-          this.tableData = res.data.data;
-          console.log(res.data.data);
-        });
-    },
     //删除运输订单
     deleteClick(scope) {
       this.$confirm("是否删除?", "提示", {
@@ -292,7 +326,6 @@ export default {
   margin-top: 20px;
   margin-left: 20px;
   .sache {
-    padding: 1.25rem 0.375rem;
     .el-input {
       width: 20%;
       margin-right: 1.25rem;

src/views/inward/components/truckOrder/purInwardTruckOrder.vue

@@ -126,12 +126,12 @@ export default {
         "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null;
     }
     if (getCookie("orgCode") == "chengyunshang") {
-      (this.first.requestUrl =
+      this.first.requestUrl =
         "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=4&planEnableStatus=1&carrierId=" +
-        getCookie("userId")),
-        (this.Received.requestUrl =
-          "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=5&carrierId=" +
-          getCookie("userId"));
+        getCookie("userId");
+      this.Received.requestUrl =
+        "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=5&carrierId=" +
+        getCookie("userId");
       this.completed.requestUrl =
         "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=2&carrierId=" +
         getCookie("userId");
@@ -282,41 +282,6 @@ export default {
     handleClick(tab, event) {
       this.getRequestUrl();
     },
-    // 查看物资详情
-    detailclick(row) {
-      // 记录重复点击次数
-      if (this.oldRow === row) {
-        this.oldRowCount += 1;
-      }
-      // 切换当前详情表
-      this.$refs.table.toggleRowExpansion(row);
-      // 打开前关闭上一个详情表
-      if (this.oldRow != "") {
-        if (this.oldRow != row) {
-          if (this.oldRowCount % 2 === 1) {
-            this.$refs.table.toggleRowExpansion(this.oldRow);
-          } else {
-            this.oldRowCount = 1;
-          }
-        } else {
-          this.oldRow = null;
-          return;
-        }
-      }
-      // 重置上一个点击对象
-      this.oldRow = row;
-      this.materialDetails(row.orderId);
-    },
-    //查看当前订单的物资信息
-    materialDetails(orderId) {
-      this.axios
-        .post("/api/v1/uc/getOrderMaterialMesByOrderId/" + orderId)
-        .then(res => {
-          if (res.data.code == "200") {
-            this.tableData = res.data.data;
-          }
-        });
-    },
     Insert() {
       this.$router.push("addPurInwardOrder");
     }

src/views/inward/router/index.js

@@ -1,264 +1,639 @@
-import Vue from 'vue'
-import Router from 'vue-router'
+import Vue from "vue";
+import Router from "vue-router";
 
-import routerBefore from '@/config/routerBefore.js'
+import routerBefore from "@/config/routerBefore.js";
 
 // 主要
-import main from '@/components/main.vue'
+import main from "@/components/main.vue";
 // 系统配置管理
 //运输预约--提出需求
-import requirement from '@/views/inward/components/truckAppoint/requirement.vue'
+import requirement from "@/views/inward/components/truckAppoint/requirement.vue";
 // 没有提出需求页面
-import requirementOther from '@/views/inward/components/truckAppoint/requirementOther.vue'
+import requirementOther from "@/views/inward/components/truckAppoint/requirementOther.vue";
 //运输预约--提出采购内转需求
-import purInwardRequirement from '@/views/inward/components/truckAppoint/purInwardRequirement.vue'
+import purInwardRequirement from "@/views/inward/components/truckAppoint/purInwardRequirement.vue";
 //运输预约--制定计划
-import truckAppointPlan from '@/views/inward/components/truckAppoint/plan.vue'
+import truckAppointPlan from "@/views/inward/components/truckAppoint/plan.vue";
 //运输订单--新增采购内转派单
-import addPurInwardOrder from '@/views/inward/components/truckOrder/addPurInwardOrder.vue'
+import addPurInwardOrder from "@/views/inward/components/truckOrder/addPurInwardOrder.vue";
 //运输订单--采购内转派单
-import purInwardTruckOrder from '@/views/inward/components/truckOrder/purInwardTruckOrder.vue'
+import purInwardTruckOrder from "@/views/inward/components/truckOrder/purInwardTruckOrder.vue";
 
 //运输预约--制定内转钢材到异地库计划
-import RailPlan from '@/views/inward/components/truckAppoint/RailPlan.vue'
+import RailPlan from "@/views/inward/components/truckAppoint/RailPlan.vue";
 //运输订单--分解计划
-import truckOrderPlan from '@/views/inward/components/truckOrder/plan.vue'
+import truckOrderPlan from "@/views/inward/components/truckOrder/plan.vue";
 //运输订单--分解内转异地库计划
-import truckOrderRailPlan from '@/views/inward/components/truckOrder/RailPlan.vue'
+import truckOrderRailPlan from "@/views/inward/components/truckOrder/RailPlan.vue";
 //运输订单--分派计划
-import dispatchPlan from '@/views/inward/components/truckOrder/dispatchPlan.vue'
+import dispatchPlan from "@/views/inward/components/truckOrder/dispatchPlan.vue";
 //内转钢材到异地库--汽车运输--进厂作业
-import enFactoryResult from '@/views/inward/components/offsetSteel/truckTransport/enFactoryResult.vue'
+import enFactoryResult from "@/views/inward/components/offsetSteel/truckTransport/enFactoryResult.vue";
 //内转钢材到异地库--汽车运输--计皮作业
-import tareWeightResult from '@/views/inward/components/offsetSteel/truckTransport/tareWeightResult.vue'
+import tareWeightResult from "@/views/inward/components/offsetSteel/truckTransport/tareWeightResult.vue";
 //内转钢材到异地库--汽车运输--装车作业
-import loadTruckResult from '@/views/inward/components/offsetSteel/truckTransport/loadTruckResult.vue'
+import loadTruckResult from "@/views/inward/components/offsetSteel/truckTransport/loadTruckResult.vue";
 //内转钢材到异地库--汽车运输--质检作业
-import qualityResult from '@/views/inward/components/offsetSteel/truckTransport/qualityResult.vue'
+import qualityResult from "@/views/inward/components/offsetSteel/truckTransport/qualityResult.vue";
 //内转钢材到异地库--汽车运输--计毛作业
-import grossWeightResult from '@/views/inward/components/offsetSteel/truckTransport/grossWeightResult.vue'
+import grossWeightResult from "@/views/inward/components/offsetSteel/truckTransport/grossWeightResult.vue";
 //内转钢材到异地库--汽车运输--出厂作业
-import outFactory from '@/views/inward/components/offsetSteel/truckTransport/outFactory.vue'
+import outFactory from "@/views/inward/components/offsetSteel/truckTransport/outFactory.vue";
 //内转钢材到异地库--汽车运输--收货作业
-import truckReceiptResult from '@/views/inward/components/offsetSteel/truckTransport/truckReceiptResult.vue'
+import truckReceiptResult from "@/views/inward/components/offsetSteel/truckTransport/truckReceiptResult.vue";
 //内转钢材到异地库--火车运输--请车作业
-import wagonPlease from '@/views/inward/components/offsetSteel/truckTrain/wagonPlease.vue'
+import wagonPlease from "@/views/inward/components/offsetSteel/truckTrain/wagonPlease.vue";
 //内转钢材到异地库--火车运输--批车作业
-import wagonApprove from '@/views/inward/components/offsetSteel/truckTrain/wagonApprove.vue'
+import wagonApprove from "@/views/inward/components/offsetSteel/truckTrain/wagonApprove.vue";
 //内转钢材到异地库--火车运输--装车作业
-import wagonLoad from '@/views/inward/components/offsetSteel/truckTrain/wagonLoad.vue'
+import wagonLoad from "@/views/inward/components/offsetSteel/truckTrain/wagonLoad.vue";
 //内转钢材到异地库--火车运输--卸车作业
-import wagonUnLoad from '@/views/inward/components/offsetSteel/truckTrain/wagonUnLoad.vue'
+import wagonUnLoad from "@/views/inward/components/offsetSteel/truckTrain/wagonUnLoad.vue";
 //内转进口矿/国产矿/燃料--达州站-厂内料场--火车卸车
-import trainUnload from '@/views/inward/components/inwardImport/daZhou/trainUnload.vue'
+import trainUnload from "@/views/inward/components/inwardImport/daZhou/trainUnload.vue";
 //内转进口矿/国产矿/燃料--达州站-厂内料场--汽车装车
-import truckLoad from '@/views/inward/components/inwardImport/daZhou/truckLoad.vue'
+import truckLoad from "@/views/inward/components/inwardImport/daZhou/truckLoad.vue";
 //内转进口矿/国产矿/燃料--达州站-厂内料场--进厂作业
-import daZhouEnFactoryResult from '@/views/inward/components/inwardImport/daZhou/enFactoryResult.vue'
+import daZhouEnFactoryResult from "@/views/inward/components/inwardImport/daZhou/enFactoryResult.vue";
 //内转进口矿/国产矿/燃料--达州站-厂内料场--计毛作业
-import daZhouGrossWeightResult from '@/views/inward/components/inwardImport/daZhou/grossWeightResult.vue'
+import daZhouGrossWeightResult from "@/views/inward/components/inwardImport/daZhou/grossWeightResult.vue";
 //内转进口矿/国产矿/燃料--达州站-厂内料场--卸货作业
-import unload from '@/views/inward/components/inwardImport/daZhou/unload.vue'
+import unload from "@/views/inward/components/inwardImport/daZhou/unload.vue";
 //内转进口矿/国产矿/燃料--达州站-厂内料场--质检作业
-import daZhouQualityResult from '@/views/inward/components/inwardImport/daZhou/qualityResult.vue'
+import daZhouQualityResult from "@/views/inward/components/inwardImport/daZhou/qualityResult.vue";
 //内转进口矿/国产矿/燃料--达州站-厂内料场--计皮作业
-import daZhouTareWeightResult from '@/views/inward/components/inwardImport/daZhou/tareWeightResult.vue'
+import daZhouTareWeightResult from "@/views/inward/components/inwardImport/daZhou/tareWeightResult.vue";
 //内转进口矿/国产矿/燃料--达州站-厂内料场--收货作业
-import receipt from '@/views/inward/components/inwardImport/daZhou/receipt.vue'
+import receipt from "@/views/inward/components/inwardImport/daZhou/receipt.vue";
 //内转进口矿/国产矿/燃料--达州站-厂内料场--出厂作业
-import daZhouOutFactory from '@/views/inward/components/inwardImport/daZhou/outFactory.vue'
+import daZhouOutFactory from "@/views/inward/components/inwardImport/daZhou/outFactory.vue";
 //内转进口矿/国产矿/燃料--老区轨道衡-厂内料场--铁路专用线卸货
-import trainLineUnload from '@/views/inward/components/inwardImport/oldAreaRailScale/trainLineUnload.vue'
+import trainLineUnload from "@/views/inward/components/inwardImport/oldAreaRailScale/trainLineUnload.vue";
 //内转进口矿/国产矿/燃料--老区轨道衡-厂内料场--质检作业
-import oldAreaRailScaleQualityResult from '@/views/inward/components/inwardImport/oldAreaRailScale/qualityResult.vue'
+import oldAreaRailScaleQualityResult from "@/views/inward/components/inwardImport/oldAreaRailScale/qualityResult.vue";
 //内转进口矿-轨道衡厂内料场-质检作业
-import oldAreaEnfactoryResult from '@/views/inward/components/inwardImport/oldAreaRailScale/enFactory.vue'
+import oldAreaEnfactoryResult from "@/views/inward/components/inwardImport/oldAreaRailScale/enFactory.vue";
 //内转老区轨道衡进厂
-import oldAreaOutfactoryResult from '@/views/inward/components/inwardImport/oldAreaRailScale/outFactory.vue'
+import oldAreaOutfactoryResult from "@/views/inward/components/inwardImport/oldAreaRailScale/outFactory.vue";
 //内转进口矿/国产矿/燃料--老区轨道衡-厂内料场--汽车装货
-import oldAreaRailScaleTruckLoad from '@/views/inward/components/inwardImport/oldAreaRailScale/truckLoad.vue'
+import oldAreaRailScaleTruckLoad from "@/views/inward/components/inwardImport/oldAreaRailScale/truckLoad.vue";
 //内转进口矿/国产矿/燃料--老区轨道衡-厂内料场--计毛作业
-import oldAreaRailScaleGrossWeightResult from '@/views/inward/components/inwardImport/oldAreaRailScale/grossWeightResult.vue'
+import oldAreaRailScaleGrossWeightResult from "@/views/inward/components/inwardImport/oldAreaRailScale/grossWeightResult.vue";
 //内转进口矿/国产矿/燃料--老区轨道衡-厂内料场--卸货作业
-import oldAreaRailScaleUnload from '@/views/inward/components/inwardImport/oldAreaRailScale/unload.vue'
+import oldAreaRailScaleUnload from "@/views/inward/components/inwardImport/oldAreaRailScale/unload.vue";
 //内转进口矿/国产矿/燃料--老区轨道衡-厂内料场--计皮作业
-import oldAreaRailScaleTareWeightResult from '@/views/inward/components/inwardImport/oldAreaRailScale/tareWeightResult.vue'
+import oldAreaRailScaleTareWeightResult from "@/views/inward/components/inwardImport/oldAreaRailScale/tareWeightResult.vue";
 //内转进口矿/国产矿/燃料--老区轨道衡-厂内料场--收货作业
-import oldAreaRailScaleReceipt from '@/views/inward/components/inwardImport/oldAreaRailScale/receipt.vue'
+import oldAreaRailScaleReceipt from "@/views/inward/components/inwardImport/oldAreaRailScale/receipt.vue";
 //内转进口矿/国产矿/燃料--内转厂内物资--进厂作业
-import inwardFactoryEnFactoryResult from '@/views/inward/components/inwardFactory/enFactoryResult.vue'
+import inwardFactoryEnFactoryResult from "@/views/inward/components/inwardFactory/enFactoryResult.vue";
 //内转进口矿/国产矿/燃料--内转厂内物资--装车作业
-import inwardFactoryTruckLoad from '@/views/inward/components/inwardFactory/truckLoad.vue'
+import inwardFactoryTruckLoad from "@/views/inward/components/inwardFactory/truckLoad.vue";
 //内转进口矿/国产矿/燃料--内转厂内物资--计量作业
-import inwardFactoryTareWeightResult from '@/views/inward/components/inwardFactory/tareWeightResult.vue'
+import inwardFactoryTareWeightResult from "@/views/inward/components/inwardFactory/tareWeightResult.vue";
 //内转进口矿/国产矿/燃料--内转厂内物资--卸车作业
-import inwardFactoryUnload from '@/views/inward/components/inwardFactory/unload.vue'
+import inwardFactoryUnload from "@/views/inward/components/inwardFactory/unload.vue";
 //内转进口矿/国产矿/燃料--内转厂内物资--出厂作业
-import inwardFactoryOutFactory from '@/views/inward/components/inwardFactory/outFactory.vue'
+import inwardFactoryOutFactory from "@/views/inward/components/inwardFactory/outFactory.vue";
 //内转进口矿/国产矿/燃料--内转厂内物资--计时作业
-import timeTaskResult from '@/views/inward/components/inwardFactory/timeTaskResult.vue'
+import timeTaskResult from "@/views/inward/components/inwardFactory/timeTaskResult.vue";
 //内转进口矿/国产矿/燃料--内转厂内物资--计数作业
-import countResult from '@/views/inward/components/inwardFactory/countResult.vue'
+import countResult from "@/views/inward/components/inwardFactory/countResult.vue";
 //内转进口矿/国产矿/燃料--内转厂内物资--包月作业
-import monthResult from '@/views/inward/components/inwardFactory/monthResult.vue'
-
-
+import monthResult from "@/views/inward/components/inwardFactory/monthResult.vue";
 
 //**************************************跳转界面**************************************/
 
 //新增采购内转需求
-import addRequirement from '@/views/inward/components/truckAppoint/addRequirement.vue'
+import addRequirement from "@/views/inward/components/truckAppoint/addRequirement.vue";
 //新增厂内内转需求
-import addRequirement2 from '@/views/inward/components/truckAppoint/addRequirement2.vue'
+import addRequirement2 from "@/views/inward/components/truckAppoint/addRequirement2.vue";
 //修改需求
-import updateRequirement from '@/views/inward/components/truckAppoint/updateRequirement.vue'
+import updateRequirement from "@/views/inward/components/truckAppoint/updateRequirement.vue";
 //新增计划
-import addPlan from '@/views/inward/components/truckAppoint/addPlan.vue'
+import addPlan from "@/views/inward/components/truckAppoint/addPlan.vue";
 //修改计划
-import updatePlan from '@/views/inward/components/truckAppoint/updatePlan.vue'
+import updatePlan from "@/views/inward/components/truckAppoint/updatePlan.vue";
 //新增内转钢材到异地库计划
-import addRailPlan from '@/views/inward/components/truckAppoint/addRailPlan.vue'
+import addRailPlan from "@/views/inward/components/truckAppoint/addRailPlan.vue";
 //计划分解
-import decomposePlan from '@/views/inward/components/truckOrder/decomposePlan.vue'
+import decomposePlan from "@/views/inward/components/truckOrder/decomposePlan.vue";
 
 //查看计划运单详情
-import getPlanOrder from '@/views/inward/components/truckOrder/getPlanOrder.vue'
+import getPlanOrder from "@/views/inward/components/truckOrder/getPlanOrder.vue";
 //查看需求运单详情
-import getRequirementOrder from '@/views/inward/components/truckAppoint/getRequirementOrder.vue'
+import getRequirementOrder from "@/views/inward/components/truckAppoint/getRequirementOrder.vue";
 //内转异地库计划分解
-import decomposeRailPlan from '@/views/inward/components/truckOrder/decomposeRailPlan.vue'
+import decomposeRailPlan from "@/views/inward/components/truckOrder/decomposeRailPlan.vue";
 //请车作业新增
-import addWagonPlease from '@/views/inward/components/offsetSteel/truckTrain/addWagonPlease.vue'
+import addWagonPlease from "@/views/inward/components/offsetSteel/truckTrain/addWagonPlease.vue";
 //请车作业修改
-import editWagonPlease from '@/views/inward/components/offsetSteel/truckTrain/editWagonPlease.vue'
+import editWagonPlease from "@/views/inward/components/offsetSteel/truckTrain/editWagonPlease.vue";
 //批车作业新增
-import addApproveWagonPlease from '@/views/inward/components/offsetSteel/truckTrain/addApproveWagonPlease.vue'
+import addApproveWagonPlease from "@/views/inward/components/offsetSteel/truckTrain/addApproveWagonPlease.vue";
 //新增批车作业
-import editApproveWagonPlease from '@/views/inward/components/offsetSteel/truckTrain/editApproveWagonPlease.vue'
+import editApproveWagonPlease from "@/views/inward/components/offsetSteel/truckTrain/editApproveWagonPlease.vue";
 //装车作业新增
-import addWagonLoad from '@/views/inward/components/offsetSteel/truckTrain/addWagonLoad.vue'
+import addWagonLoad from "@/views/inward/components/offsetSteel/truckTrain/addWagonLoad.vue";
 //装车作业修改
-import editWagonLoad from '@/views/inward/components/offsetSteel/truckTrain/editWagonLoad.vue'
+import editWagonLoad from "@/views/inward/components/offsetSteel/truckTrain/editWagonLoad.vue";
 //车皮卸车作业新增
-import addWagonUnLoad from '@/views/inward/components/offsetSteel/truckTrain/addWagonUnLoad.vue'
+import addWagonUnLoad from "@/views/inward/components/offsetSteel/truckTrain/addWagonUnLoad.vue";
 //车皮卸车作业修改
-import editWagonUnLoad from '@/views/inward/components/offsetSteel/truckTrain/editWagonUnLoad.vue'
+import editWagonUnLoad from "@/views/inward/components/offsetSteel/truckTrain/editWagonUnLoad.vue";
 //新增汽车装货
-import addTruckLoad from '@/views/inward/components/inwardImport/daZhou/addTruckLoad.vue'
+import addTruckLoad from "@/views/inward/components/inwardImport/daZhou/addTruckLoad.vue";
 //修改汽车装货
-import updateTruckLoad from '@/views/inward/components/inwardImport/daZhou/updateTruckLoad.vue'
+import updateTruckLoad from "@/views/inward/components/inwardImport/daZhou/updateTruckLoad.vue";
 //新增汽车装车
-import oldAreaRailScaleAddTruckLoad from '@/views/inward/components/inwardImport/oldAreaRailScale/addTruckLoad.vue'
+import oldAreaRailScaleAddTruckLoad from "@/views/inward/components/inwardImport/oldAreaRailScale/addTruckLoad.vue";
 //内转厂内物资--新增汽车装货
-import inwardFactoryAddTruckLoad from '@/views/inward/components/inwardFactory/addTruckLoad.vue'
+import inwardFactoryAddTruckLoad from "@/views/inward/components/inwardFactory/addTruckLoad.vue";
 
 //内转结算--纯内转计费详单
-import inwardDetailOrders from '../components/inwardSettlement/detailOrder.vue'
+import inwardDetailOrders from "../components/inwardSettlement/detailOrder.vue";
 //内转结算--采购内转计费详单
-import inwardPurDetailsOrders from '../components/inwardSettlement/purInwardDetailsOrder.vue'
+import inwardPurDetailsOrders from "../components/inwardSettlement/purInwardDetailsOrder.vue";
 //内转结算--计时计费详单
-import inwardTimeDetailsOrders from '../components/inwardSettlement/timeDetailsWeight.vue'
+import inwardTimeDetailsOrders from "../components/inwardSettlement/timeDetailsWeight.vue";
 //内转结算--计数计费详单
-import inwardCountDetailsOrders from '../components/inwardSettlement/countDetailOrder.vue'
+import inwardCountDetailsOrders from "../components/inwardSettlement/countDetailOrder.vue";
 //内转结算--计时和计重计费详单
-import  inwardWeightTimeDetailsOrder from '../components/inwardSettlement/inwardAllDetailsOrder.vue'
+import inwardWeightTimeDetailsOrder from "../components/inwardSettlement/inwardAllDetailsOrder.vue";
 
-Vue.use(Router)
+Vue.use(Router);
 
-const constantRouterMap = [{
-  path: '/',
-  name: 'main',
-  meta: {
-    title: '首页',
-    code: 'xtpzgl'
-  },
-  component: main,
-  redirect: {
-    name: 'requirement'
-  },
-  children: [
-    {path: 'requirement',name: 'requirement',meta: {code: 'xtpzgl-yhgl'},component: requirement},
-    {path: 'requirementOther',name: 'requirementOther',meta: {code: 'xtpzgl-yhgl'},component: requirementOther}, 
-    {path: 'purInwardRequirement',name: 'purInwardRequirement',meta: {code: 'xtpzgl-yhgl'},component: purInwardRequirement}, 
-    {path: 'truckAppointPlan',name: 'truckAppointPlan',meta: {code: 'xtpzgl-yhgl'},component: truckAppointPlan},
-    {path: 'purInwardTruckOrder',name: 'purInwardTruckOrder',meta: {code: 'xtpzgl-yhgl'},component: purInwardTruckOrder},
-    {path: 'addPurInwardOrder',name: 'addPurInwardOrder',meta: {code: 'xtpzgl-yhgl'},component: addPurInwardOrder},
-    {path: 'truckAppointPlan',name: 'truckAppointPlan',meta: {code: 'xtpzgl-yhgl'},component: truckAppointPlan},
-    {path: 'RailPlan',name: 'RailPlan',meta: {code: 'xtpzgl-yhgl'},component: RailPlan}, 
-    {path: 'truckOrderPlan',name: 'truckOrderPlan',meta: {code: 'xtpzgl-yhgl'},component: truckOrderPlan}, 
-    {path: 'truckOrderRailPlan',name: 'truckOrderRailPlan',meta: {code: 'xtpzgl-yhgl'},component: truckOrderRailPlan}, 
-    {path: 'dispatchPlan',name: 'dispatchPlan',meta: {code: 'xtpzgl-yhgl'},component: dispatchPlan}, 
-    {path: 'enFactoryResult',name: 'enFactoryResult',meta: {code: 'xtpzgl-yhgl'},component: enFactoryResult}, 
-    {path: 'tareWeightResult',name: 'tareWeightResult',meta: {code: 'xtpzgl-yhgl'},component: tareWeightResult}, 
-    {path: 'loadTruckResult',name: 'loadTruckResult',meta: {code: 'xtpzgl-yhgl'},component: loadTruckResult}, 
-    {path: 'qualityResult',name: 'qualityResult',meta: {code: 'xtpzgl-yhgl'},component: qualityResult}, 
-    {path: 'grossWeightResult',name: 'grossWeightResult',meta: {code: 'xtpzgl-yhgl'},component: grossWeightResult}, 
-    {path: 'outFactory',name: 'outFactory',meta: {code: 'xtpzgl-yhgl'},component: outFactory}, 
-    {path: 'truckReceiptResult',name: 'truckReceiptResult',meta: {code: 'xtpzgl-yhgl'},component: truckReceiptResult}, 
-    {path: 'wagonPlease',name: 'wagonPlease',meta: {code: 'xtpzgl-yhgl'},component: wagonPlease}, 
-    {path: 'wagonApprove',name: 'wagonApprove',meta: {code: 'xtpzgl-yhgl'},component: wagonApprove}, 
-    {path: 'wagonLoad',name: 'wagonLoad',meta: {code: 'xtpzgl-yhgl'},component: wagonLoad}, 
-    {path: 'wagonUnLoad',name: 'wagonUnLoad',meta: {code: 'xtpzgl-yhgl'},component: wagonUnLoad}, 
-    {path: 'trainUnload',name: 'trainUnload',meta: {code: 'xtpzgl-yhgl'},component: trainUnload}, 
-    {path: 'truckLoad',name: 'truckLoad',meta: {code: 'xtpzgl-yhgl'},component: truckLoad}, 
-    {path: 'daZhouEnFactoryResult',name: 'daZhouEnFactoryResult',meta: {code: 'xtpzgl-yhgl'},component: daZhouEnFactoryResult}, 
-    {path: 'daZhouGrossWeightResult',name: 'daZhouGrossWeightResult',meta: {code: 'xtpzgl-yhgl'},component: daZhouGrossWeightResult}, 
-    {path: 'unload',name: 'unload',meta: {code: 'xtpzgl-yhgl'},component: unload}, 
-    {path: 'daZhouQualityResult',name: 'daZhouQualityResult',meta: {code: 'xtpzgl-yhgl'},component: daZhouQualityResult}, 
-    {path: 'daZhouTareWeightResult',name: 'daZhouTareWeightResult',meta: {code: 'xtpzgl-yhgl'},component: daZhouTareWeightResult}, 
-    {path: 'receipt',name: 'receipt',meta: {code: 'xtpzgl-yhgl'},component: receipt}, 
-    {path: 'daZhouOutFactory',name: 'daZhouOutFactory',meta: {code: 'xtpzgl-yhgl'},component: daZhouOutFactory}, 
-    {path: 'trainLineUnload',name: 'trainLineUnload',meta: {code: 'xtpzgl-yhgl'},component: trainLineUnload}, 
-    {path: 'oldAreaRailScaleQualityResult',name: 'oldAreaRailScaleQualityResult',meta: {code: 'xtpzgl-yhgl'},component: oldAreaRailScaleQualityResult}, 
-    {path: 'oldAreaOutfactoryResult',name: 'oldAreaOutfactoryResult',meta: {code: 'xtpzgl-yhgl'},component: oldAreaOutfactoryResult},
-    {path: 'oldAreaEnfactoryResult',name: 'oldAreaEnfactoryResult',meta: {code: 'xtpzgl-yhgl'},component: oldAreaEnfactoryResult},
-    {path: 'oldAreaRailScaleTruckLoad',name: 'oldAreaRailScaleTruckLoad',meta: {code: 'xtpzgl-yhgl'},component: oldAreaRailScaleTruckLoad}, 
-    {path: 'oldAreaRailScaleGrossWeightResult',name: 'oldAreaRailScaleGrossWeightResult',meta: {code: 'xtpzgl-yhgl'},component: oldAreaRailScaleGrossWeightResult}, 
-    {path: 'oldAreaRailScaleUnload',name: 'oldAreaRailScaleUnload',meta: {code: 'xtpzgl-yhgl'},component: oldAreaRailScaleUnload}, 
-    {path: 'oldAreaRailScaleTareWeightResult',name: 'oldAreaRailScaleTareWeightResult',meta: {code: 'xtpzgl-yhgl'},component: oldAreaRailScaleTareWeightResult}, 
-    {path: 'oldAreaRailScaleReceipt',name: 'oldAreaRailScaleReceipt',meta: {code: 'xtpzgl-yhgl'},component: oldAreaRailScaleReceipt}, 
-    {path: 'inwardFactoryEnFactoryResult',name: 'inwardFactoryEnFactoryResult',meta: {code: 'xtpzgl-yhgl'},component: inwardFactoryEnFactoryResult}, 
-    {path: 'inwardFactoryTruckLoad',name: 'inwardFactoryTruckLoad',meta: {code: 'xtpzgl-yhgl'},component: inwardFactoryTruckLoad}, 
-    {path: 'inwardFactoryTareWeightResult',name: 'inwardFactoryTareWeightResult',meta: {code: 'xtpzgl-yhgl'},component: inwardFactoryTareWeightResult}, 
-    {path: 'inwardFactoryUnload',name: 'inwardFactoryUnload',meta: {code: 'xtpzgl-yhgl'},component: inwardFactoryUnload}, 
-    {path: 'inwardFactoryOutFactory',name: 'inwardFactoryOutFactory',meta: {code: 'xtpzgl-yhgl'},component: inwardFactoryOutFactory}, 
-    {path: 'timeTaskResult',name: 'timeTaskResult',meta: {code: 'xtpzgl-yhgl'},component: timeTaskResult}, 
-    {path: 'countResult',name: 'countResult',meta: {code: 'xtpzgl-yhgl'},component: countResult}, 
-    {path: 'monthResult',name: 'monthResult',meta: {code: 'xtpzgl-yhgl'},component: monthResult}, 
-    /*****************************************跳转页面*****************************************/
-    {path: 'addRequirement',name: 'addRequirement',meta: {code: 'xtpzgl-yhgl'},component: addRequirement}, 
-    {path: 'addRequirement2',name: 'addRequirement2',meta: {code: 'xtpzgl-yhgl'},component: addRequirement2}, 
-    {path: 'updateRequirement/:requirementId',name: 'updateRequirement',meta: {code: 'xtpzgl-yhgl'},component: updateRequirement}, 
-    {path: 'addPlan',name: 'addPlan',meta: {code: 'xtpzgl-yhgl'},component: addPlan}, 
-    {path: 'updatePlan/:planId',name: 'updatePlan',meta: {code: 'xtpzgl-yhgl'},component: updatePlan}, 
-    {path: 'addRailPlan',name: 'addRailPlan',meta: {code: 'xtpzgl-yhgl'},component: addRailPlan}, 
-    {path: 'decomposePlan/:planId',name: 'decomposePlan',meta: {code: 'xtpzgl-yhgl'},component: decomposePlan},
-    {path: 'getPlanOrder/:planId',name: 'getPlanOrder',meta: {code: 'xtpzgl-yhgl'},component: getPlanOrder},
-    {path: 'getRequirementOrder/:requirementId',name: 'getRequirementOrder',meta: {code: 'xtpzgl-yhgl'},component: getRequirementOrder},  
-    {path: 'decomposeRailPlan/:dayPlanId',name: 'decomposeRailPlan',meta: {code: 'xtpzgl-yhgl'},component: decomposeRailPlan}, 
-    {path: 'addWagonPlease',name: 'addWagonPlease',meta: {code: 'xtpzgl-yhgl'},component: addWagonPlease}, 
-    {path: 'editWagonPlease/:resultId',name: 'editWagonPlease',meta: {code: 'xtpzgl-yhgl'},component: editWagonPlease}, 
-    {path: 'addApproveWagonPlease',name: 'requaddApproveWagonPleaseirement',meta: {code: 'xtpzgl-yhgl'},component: addApproveWagonPlease}, 
-    {path: 'editApproveWagonPlease/:resultId',name: 'editApproveWagonPlease',meta: {code: 'xtpzgl-yhgl'},component: editApproveWagonPlease}, 
-    {path: 'addWagonLoad',name: 'addWagonLoad',meta: {code: 'xtpzgl-yhgl'},component: addWagonLoad}, 
-    {path: 'editWagonLoad/:resultId',name: 'editWagonLoad',meta: {code: 'xtpzgl-yhgl'},component: editWagonLoad}, 
-    {path: 'addWagonUnLoad',name: 'addWagonUnLoad',meta: {code: 'xtpzgl-yhgl'},component: addWagonUnLoad}, 
-    {path: 'editWagonUnLoad/:unloadingId',name: 'editWagonUnLoad',meta: {code: 'xtpzgl-yhgl'},component: editWagonUnLoad}, 
-    {path: 'addTruckLoad',name: 'addTruckLoad',meta: {code: 'xtpzgl-yhgl'},component: addTruckLoad}, 
-    {path: 'updateTruckLoad/:resultId',name: 'updateTruckLoad',meta: {code: 'xtpzgl-yhgl'},component: updateTruckLoad}, 
-    {path: 'oldAreaRailScaleAddTruckLoad',name: 'oldAreaRailScaleAddTruckLoad',meta: {code: 'xtpzgl-yhgl'},component: oldAreaRailScaleAddTruckLoad}, 
-    {path: 'inwardFactoryAddTruckLoad',name: 'inwardFactoryAddTruckLoad',meta: {code: 'xtpzgl-yhgl'},component: inwardFactoryAddTruckLoad},
-    {path: 'inwardDetailOrders',name: 'inwardDetailOrders',meta: {code: 'xtpzgl-yhgl'},component: inwardDetailOrders},
-    {path: 'inwardCountDetailsOrders',name: 'inwardCountDetailsOrders',meta: {code: 'xtpzgl-yhgl'},component: inwardCountDetailsOrders},
-    {path: 'inwardTimeDetailsOrders',name: 'inwardTimeDetailsOrders',meta: {code: 'xtpzgl-yhgl'},component: inwardTimeDetailsOrders},
-    {path: 'inwardPurDetailsOrders',name: 'inwardPurDetailsOrders',meta: {code: 'xtpzgl-yhgl'},component: inwardPurDetailsOrders},
-    {path: 'inwardWeightTimeDetailsOrder',name: 'inwardWeightTimeDetailsOrder',meta: {code: 'xtpzgl-yhgl'},component: inwardWeightTimeDetailsOrder},
-  ]
-}];
+const constantRouterMap = [
+  {
+    path: "/",
+    name: "main",
+    meta: {
+      title: "首页",
+      code: "xtpzgl"
+    },
+    component: main,
+    redirect: {
+      name: "requirement"
+    },
+    children: [
+      {
+        path: "requirement",
+        name: "requirement",
+        meta: { code: "xtpzgl-yhgl" },
+        component: requirement
+      },
+      {
+        path: "requirementOther",
+        name: "requirementOther",
+        meta: { code: "xtpzgl-yhgl" },
+        component: requirementOther
+      },
+      {
+        path: "purInwardRequirement",
+        name: "purInwardRequirement",
+        meta: { code: "xtpzgl-yhgl" },
+        component: purInwardRequirement
+      },
+      {
+        path: "truckAppointPlan",
+        name: "truckAppointPlan",
+        meta: { code: "xtpzgl-yhgl" },
+        component: truckAppointPlan
+      },
+      {
+        path: "purInwardTruckOrder",
+        name: "purInwardTruckOrder",
+        meta: { code: "xtpzgl-yhgl" },
+        component: purInwardTruckOrder
+      },
+      {
+        path: "addPurInwardOrder",
+        name: "addPurInwardOrder",
+        meta: { code: "xtpzgl-yhgl" },
+        component: addPurInwardOrder
+      },
+      {
+        path: "truckAppointPlan",
+        name: "truckAppointPlan",
+        meta: { code: "xtpzgl-yhgl" },
+        component: truckAppointPlan
+      },
+      {
+        path: "RailPlan",
+        name: "RailPlan",
+        meta: { code: "xtpzgl-yhgl" },
+        component: RailPlan
+      },
+      {
+        path: "truckOrderPlan",
+        name: "truckOrderPlan",
+        meta: { code: "xtpzgl-yhgl" },
+        component: truckOrderPlan
+      },
+      {
+        path: "truckOrderRailPlan",
+        name: "truckOrderRailPlan",
+        meta: { code: "xtpzgl-yhgl" },
+        component: truckOrderRailPlan
+      },
+      {
+        path: "dispatchPlan",
+        name: "dispatchPlan",
+        meta: { code: "xtpzgl-yhgl" },
+        component: dispatchPlan
+      },
+      {
+        path: "enFactoryResult",
+        name: "enFactoryResult",
+        meta: { code: "xtpzgl-yhgl" },
+        component: enFactoryResult
+      },
+      {
+        path: "tareWeightResult",
+        name: "tareWeightResult",
+        meta: { code: "xtpzgl-yhgl" },
+        component: tareWeightResult
+      },
+      {
+        path: "loadTruckResult",
+        name: "loadTruckResult",
+        meta: { code: "xtpzgl-yhgl" },
+        component: loadTruckResult
+      },
+      {
+        path: "qualityResult",
+        name: "qualityResult",
+        meta: { code: "xtpzgl-yhgl" },
+        component: qualityResult
+      },
+      {
+        path: "grossWeightResult",
+        name: "grossWeightResult",
+        meta: { code: "xtpzgl-yhgl" },
+        component: grossWeightResult
+      },
+      {
+        path: "outFactory",
+        name: "outFactory",
+        meta: { code: "xtpzgl-yhgl" },
+        component: outFactory
+      },
+      {
+        path: "truckReceiptResult",
+        name: "truckReceiptResult",
+        meta: { code: "xtpzgl-yhgl" },
+        component: truckReceiptResult
+      },
+      {
+        path: "wagonPlease",
+        name: "wagonPlease",
+        meta: { code: "xtpzgl-yhgl" },
+        component: wagonPlease
+      },
+      {
+        path: "wagonApprove",
+        name: "wagonApprove",
+        meta: { code: "xtpzgl-yhgl" },
+        component: wagonApprove
+      },
+      {
+        path: "wagonLoad",
+        name: "wagonLoad",
+        meta: { code: "xtpzgl-yhgl" },
+        component: wagonLoad
+      },
+      {
+        path: "wagonUnLoad",
+        name: "wagonUnLoad",
+        meta: { code: "xtpzgl-yhgl" },
+        component: wagonUnLoad
+      },
+      {
+        path: "trainUnload",
+        name: "trainUnload",
+        meta: { code: "xtpzgl-yhgl" },
+        component: trainUnload
+      },
+      {
+        path: "truckLoad",
+        name: "truckLoad",
+        meta: { code: "xtpzgl-yhgl" },
+        component: truckLoad
+      },
+      {
+        path: "daZhouEnFactoryResult",
+        name: "daZhouEnFactoryResult",
+        meta: { code: "xtpzgl-yhgl" },
+        component: daZhouEnFactoryResult
+      },
+      {
+        path: "daZhouGrossWeightResult",
+        name: "daZhouGrossWeightResult",
+        meta: { code: "xtpzgl-yhgl" },
+        component: daZhouGrossWeightResult
+      },
+      {
+        path: "unload",
+        name: "unload",
+        meta: { code: "xtpzgl-yhgl" },
+        component: unload
+      },
+      {
+        path: "daZhouQualityResult",
+        name: "daZhouQualityResult",
+        meta: { code: "xtpzgl-yhgl" },
+        component: daZhouQualityResult
+      },
+      {
+        path: "daZhouTareWeightResult",
+        name: "daZhouTareWeightResult",
+        meta: { code: "xtpzgl-yhgl" },
+        component: daZhouTareWeightResult
+      },
+      {
+        path: "receipt",
+        name: "receipt",
+        meta: { code: "xtpzgl-yhgl" },
+        component: receipt
+      },
+      {
+        path: "daZhouOutFactory",
+        name: "daZhouOutFactory",
+        meta: { code: "xtpzgl-yhgl" },
+        component: daZhouOutFactory
+      },
+      {
+        path: "trainLineUnload",
+        name: "trainLineUnload",
+        meta: { code: "xtpzgl-yhgl" },
+        component: trainLineUnload
+      },
+      {
+        path: "oldAreaRailScaleQualityResult",
+        name: "oldAreaRailScaleQualityResult",
+        meta: { code: "xtpzgl-yhgl" },
+        component: oldAreaRailScaleQualityResult
+      },
+      {
+        path: "oldAreaOutfactoryResult",
+        name: "oldAreaOutfactoryResult",
+        meta: { code: "xtpzgl-yhgl" },
+        component: oldAreaOutfactoryResult
+      },
+      {
+        path: "oldAreaEnfactoryResult",
+        name: "oldAreaEnfactoryResult",
+        meta: { code: "xtpzgl-yhgl" },
+        component: oldAreaEnfactoryResult
+      },
+      {
+        path: "oldAreaRailScaleTruckLoad",
+        name: "oldAreaRailScaleTruckLoad",
+        meta: { code: "xtpzgl-yhgl" },
+        component: oldAreaRailScaleTruckLoad
+      },
+      {
+        path: "oldAreaRailScaleGrossWeightResult",
+        name: "oldAreaRailScaleGrossWeightResult",
+        meta: { code: "xtpzgl-yhgl" },
+        component: oldAreaRailScaleGrossWeightResult
+      },
+      {
+        path: "oldAreaRailScaleUnload",
+        name: "oldAreaRailScaleUnload",
+        meta: { code: "xtpzgl-yhgl" },
+        component: oldAreaRailScaleUnload
+      },
+      {
+        path: "oldAreaRailScaleTareWeightResult",
+        name: "oldAreaRailScaleTareWeightResult",
+        meta: { code: "xtpzgl-yhgl" },
+        component: oldAreaRailScaleTareWeightResult
+      },
+      {
+        path: "oldAreaRailScaleReceipt",
+        name: "oldAreaRailScaleReceipt",
+        meta: { code: "xtpzgl-yhgl" },
+        component: oldAreaRailScaleReceipt
+      },
+      {
+        path: "inwardFactoryEnFactoryResult",
+        name: "inwardFactoryEnFactoryResult",
+        meta: { code: "xtpzgl-yhgl" },
+        component: inwardFactoryEnFactoryResult
+      },
+      {
+        path: "inwardFactoryTruckLoad",
+        name: "inwardFactoryTruckLoad",
+        meta: { code: "xtpzgl-yhgl" },
+        component: inwardFactoryTruckLoad
+      },
+      {
+        path: "inwardFactoryTareWeightResult",
+        name: "inwardFactoryTareWeightResult",
+        meta: { code: "xtpzgl-yhgl" },
+        component: inwardFactoryTareWeightResult
+      },
+      {
+        path: "inwardFactoryUnload",
+        name: "inwardFactoryUnload",
+        meta: { code: "xtpzgl-yhgl" },
+        component: inwardFactoryUnload
+      },
+      {
+        path: "inwardFactoryOutFactory",
+        name: "inwardFactoryOutFactory",
+        meta: { code: "xtpzgl-yhgl" },
+        component: inwardFactoryOutFactory
+      },
+      {
+        path: "timeTaskResult",
+        name: "timeTaskResult",
+        meta: { code: "xtpzgl-yhgl" },
+        component: timeTaskResult
+      },
+      {
+        path: "countResult",
+        name: "countResult",
+        meta: { code: "xtpzgl-yhgl" },
+        component: countResult
+      },
+      {
+        path: "monthResult",
+        name: "monthResult",
+        meta: { code: "xtpzgl-yhgl" },
+        component: monthResult
+      },
+      /*****************************************跳转页面*****************************************/
+      {
+        path: "addRequirement",
+        name: "addRequirement",
+        meta: { code: "xtpzgl-yhgl" },
+        component: addRequirement
+      },
+      {
+        path: "addRequirement2",
+        name: "addRequirement2",
+        meta: { code: "xtpzgl-yhgl" },
+        component: addRequirement2
+      },
+      {
+        path: "updateRequirement/:requirementId",
+        name: "updateRequirement",
+        meta: { code: "xtpzgl-yhgl" },
+        component: updateRequirement
+      },
+      {
+        path: "addPlan",
+        name: "addPlan",
+        meta: { code: "xtpzgl-yhgl" },
+        component: addPlan
+      },
+      {
+        path: "updatePlan/:planId",
+        name: "updatePlan",
+        meta: { code: "xtpzgl-yhgl" },
+        component: updatePlan
+      },
+      {
+        path: "addRailPlan",
+        name: "addRailPlan",
+        meta: { code: "xtpzgl-yhgl" },
+        component: addRailPlan
+      },
+      {
+        path: "decomposePlan/:planId",
+        name: "decomposePlan",
+        meta: { code: "xtpzgl-yhgl" },
+        component: decomposePlan
+      },
+      {
+        path: "getPlanOrder/:planId",
+        name: "getPlanOrder",
+        meta: { code: "xtpzgl-yhgl" },
+        component: getPlanOrder
+      },
+      {
+        path: "getRequirementOrder/:requirementId",
+        name: "getRequirementOrder",
+        meta: { code: "xtpzgl-yhgl" },
+        component: getRequirementOrder
+      },
+      {
+        path: "decomposeRailPlan/:dayPlanId",
+        name: "decomposeRailPlan",
+        meta: { code: "xtpzgl-yhgl" },
+        component: decomposeRailPlan
+      },
+      {
+        path: "addWagonPlease",
+        name: "addWagonPlease",
+        meta: { code: "xtpzgl-yhgl" },
+        component: addWagonPlease
+      },
+      {
+        path: "editWagonPlease/:resultId",
+        name: "editWagonPlease",
+        meta: { code: "xtpzgl-yhgl" },
+        component: editWagonPlease
+      },
+      {
+        path: "addApproveWagonPlease",
+        name: "requaddApproveWagonPleaseirement",
+        meta: { code: "xtpzgl-yhgl" },
+        component: addApproveWagonPlease
+      },
+      {
+        path: "editApproveWagonPlease/:resultId",
+        name: "editApproveWagonPlease",
+        meta: { code: "xtpzgl-yhgl" },
+        component: editApproveWagonPlease
+      },
+      {
+        path: "addWagonLoad",
+        name: "addWagonLoad",
+        meta: { code: "xtpzgl-yhgl" },
+        component: addWagonLoad
+      },
+      {
+        path: "editWagonLoad/:resultId",
+        name: "editWagonLoad",
+        meta: { code: "xtpzgl-yhgl" },
+        component: editWagonLoad
+      },
+      {
+        path: "addWagonUnLoad",
+        name: "addWagonUnLoad",
+        meta: { code: "xtpzgl-yhgl" },
+        component: addWagonUnLoad
+      },
+      {
+        path: "editWagonUnLoad/:unloadingId",
+        name: "editWagonUnLoad",
+        meta: { code: "xtpzgl-yhgl" },
+        component: editWagonUnLoad
+      },
+      {
+        path: "addTruckLoad",
+        name: "addTruckLoad",
+        meta: { code: "xtpzgl-yhgl" },
+        component: addTruckLoad
+      },
+      {
+        path: "updateTruckLoad/:resultId",
+        name: "updateTruckLoad",
+        meta: { code: "xtpzgl-yhgl" },
+        component: updateTruckLoad
+      },
+      {
+        path: "oldAreaRailScaleAddTruckLoad",
+        name: "oldAreaRailScaleAddTruckLoad",
+        meta: { code: "xtpzgl-yhgl" },
+        component: oldAreaRailScaleAddTruckLoad
+      },
+      {
+        path: "inwardFactoryAddTruckLoad",
+        name: "inwardFactoryAddTruckLoad",
+        meta: { code: "xtpzgl-yhgl" },
+        component: inwardFactoryAddTruckLoad
+      },
+      {
+        path: "inwardDetailOrders",
+        name: "inwardDetailOrders",
+        meta: { code: "xtpzgl-yhgl" },
+        component: inwardDetailOrders
+      },
+      {
+        path: "inwardCountDetailsOrders",
+        name: "inwardCountDetailsOrders",
+        meta: { code: "xtpzgl-yhgl" },
+        component: inwardCountDetailsOrders
+      },
+      {
+        path: "inwardTimeDetailsOrders",
+        name: "inwardTimeDetailsOrders",
+        meta: { code: "xtpzgl-yhgl" },
+        component: inwardTimeDetailsOrders
+      },
+      {
+        path: "inwardPurDetailsOrders",
+        name: "inwardPurDetailsOrders",
+        meta: { code: "xtpzgl-yhgl" },
+        component: inwardPurDetailsOrders
+      },
+      {
+        path: "inwardWeightTimeDetailsOrder",
+        name: "inwardWeightTimeDetailsOrder",
+        meta: { code: "xtpzgl-yhgl" },
+        component: inwardWeightTimeDetailsOrder
+      }
+    ]
+  }
+];
 
 const router = new Router({
   routes: constantRouterMap
-})
+});
 //  before
 routerBefore(router, constantRouterMap);
 

src/views/sale/components/offSiteTransportation/checkGPS.vue

@@ -451,7 +451,10 @@ export default {
             //设置自定义窗体
             that.initCustomMarkes(
               that.carNumber,
-              "起点：" +
+              that.formatDate(that.time[0], "yyyy-MM-dd") +
+                "至" +
+                that.formatDate(that.time[1], "yyyy-MM-dd") +
+                "起点：" +
                 that.startPointName +
                 "<br/>" +
                 "终点：" +

src/views/sale/components/offSiteTransportation/currentLocation.vue

@@ -8,6 +8,7 @@
         >关闭信息窗口</el-button
       >
     </div>
+    <div id="amap-container"></div>
     <div class="controller">
       <div class="in_transit_information">
         <span class="item_details">车牌号:</span>
@@ -17,12 +18,17 @@
           v-model.trim="carNumber"
         >
         </el-input>
-        <el-button type="primary" class="searchstyle" @click="initData();initTimer()"
+        <el-button
+          type="primary"
+          class="searchstyle"
+          @click="
+            initData();
+            initTimer();
+          "
           >查询</el-button
         >
       </div>
     </div>
-    <div id="amap-container"></div>
   </div>
 </template>
 <script>
@@ -35,12 +41,6 @@ import Vue from "vue";
 var infoWindow;
 export default {
   name: "PathView",
-  data() {
-    return {
-      lon: null,
-      lat: null
-    };
-  },
   setup() {
     const map = shallowRef(null);
     return {
@@ -88,7 +88,7 @@ export default {
       if (that.carNumber == "") {
         this.$message.error("车牌号不能为空！");
         return;
-      }else if(!regExp.test(that.carNumber)){
+      } else if (!regExp.test(that.carNumber)) {
         this.$message.error("请输入正确的车牌号！");
         return;
       }
@@ -97,9 +97,8 @@ export default {
         .then(res => {
           console.log(res.data.data);
           if (res.data.data == "-1") {
-            this.$message.error("自提车辆无权查看!");
+            this.$message.error("运输订单未关闭,自提车辆无权查看!");
           } else if (res.data.data.status != "1006") {
-            console.log("res.data.data.status");
             that.map.setCenter([
               res.data.data.result.lon,
               res.data.data.result.lat
@@ -168,7 +167,7 @@ export default {
         title: title
       });
       // 将创建的点标记添加到已有的地图实例：
-      that.pointmarker=pointmarker;
+      that.pointmarker = pointmarker;
       that.map.add(pointmarker);
     },
     //初始化轨迹
@@ -251,7 +250,6 @@ export default {
       });
       // 打开信息窗体
       infoWindow.open(that.map, [lon, lat]);
-      infoWindow.close();
     },
     // 关闭信息窗口
     closeinfo() {
@@ -263,6 +261,37 @@ export default {
       console.log(this.lat);
       this.infoClose=false;
       infoWindow.open(this.map, [this.lon, this.lat]);
+    },
+    //初始化轨迹
+    initPolyline() {
+      let that = this;
+      // 创建一个 Polyline 实例：
+      var polyline = new AMap.Polyline({
+        path: that.path,
+        borderWeight: 2, // 线条宽度，默认为 1
+        strokeColor: "#18BFA6", // 线条颜色
+        lineJoin: "round" // 折线拐点连接处样式
+        // arrowIconPath: require("@/assets/img/traffic_texture_darkred-pass.png")//箭头图片，似乎不支持
+      });
+      // 将创建的线路添加到已有的线路中去：
+      that.map.add(polyline);
+    },
+
+    //定时取得当前位置并加入轨迹中去，点击查询时触发，同时清除path和旧的定时器
+    initTimer() {
+      let that = this;
+      //清除旧的定时器
+      clearTimeout(this.timer);
+      //清除path
+      that.path = [];
+      //清除所有覆盖物
+      that.map.clearMap();
+      //设置定时器
+      that.timer = setInterval(() => {
+        //清除之前车的图标
+        that.map.remove(that.pointmarker);
+        that.initData();
+      }, 4000);
     }
   }
 };

src/views/sale/components/offSiteTransportation/transportationPerformance.vue

@@ -278,6 +278,7 @@ export default {
 
     //other
     click(row) {
+     
         this.pathOption.orderNumber=row.orderNumber;
         this.pathOption.capacityNumber=row.capacityNumber;
         this.pathOption.startPointName="达钢集团"+row.outGatepostName,

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

@@ -128,7 +128,8 @@ export default {
       }
       if (
         getCookie("orgCode") != "dagangadmin" &&
-        getCookie("orgCode") != "zidonghuabu"
+        getCookie("orgCode") != "zidonghuabu" &&
+        getCookie("orgCode") != "wuliuchuyunzhongxin"
       ) {
         orgCode = getCookie("orgCode");
       }
@@ -248,7 +249,8 @@ export default {
       });
       if (
         getCookie("orgCode") == "dagangadmin" ||
-        getCookie("orgCode") == "zidonghuabu"
+        getCookie("orgCode") == "zidonghuabu" ||
+        getCookie("orgCode") == "wuliuchuyunzhongxin"
       ) {
         this.axios
           .post(
@@ -415,7 +417,8 @@ export default {
     getRequestUrl() {
       if (
         getCookie("orgCode") == "dagangadmin" ||
-        getCookie("orgCode") == "zidonghuabu"
+        getCookie("orgCode") == "zidonghuabu" ||
+        getCookie("orgCode") == "wuliuchuyunzhongxin"
       ) {
         this.first.requestUrl =
           "/api/v1/tms/getInwardInFactory?apiId=486&orgCode=" +
@@ -470,9 +473,9 @@ export default {
       }
       if (
         getCookie("orgCode") == "dagangadmin" ||
-        getCookie("orgCode") == "zidonghuabu"
+        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>