修改

build/utils.js

@@ -15,7 +15,9 @@ const devPathSrc = path.resolve(__dirname, "../../../src"); // node_modules应
 // ['index','appoint'，'configManager','homepage',''inward,'queue','RMS','sale','serviceManager','SporadicManage'
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow']
-let devModules = ['appoint','index','TMS'];
+
+let devModules = ['TMS','index'];
+
 // let devModules = ['index','appoint','sale','statisticalReport','RMS','TMS','WMS']
 // let devModules = ["index", "ADMINISTRATORS", "RMS"];
 // let devModules = ["index", "inward", "statisticalReport"];

src/components/Page/Title/index.vue

@@ -1,14 +1,9 @@
 <template>
-  <div
-    class="page-title"
-    :class="{ 'show-border-buttom': showBorderBottom }"
-  >
-    <div  
-    style="width:10%"
-    @click="onClickBack">
-         <i class="el-icon-back" v-if="showIcon"></i>
-        <span>{{ title }}</span>
-        <slot></slot>
+  <div class="page-title" :class="{ 'show-border-buttom': showBorderBottom }">
+    <div style="width:30%" @click="onClickBack">
+      <i class="el-icon-back" v-if="showIcon"></i>
+      <span>{{ title }}</span>
+      <slot></slot>
     </div>
   </div>
 </template>
@@ -27,7 +22,7 @@ export default {
     // 是否显示底部分割线
     showBorderBottom: {
       default: true
-    },
+    }
     //跳转的地址，默认-1(返回上一个页面)
     // BackURL:{
     //   type:String,
@@ -48,7 +43,7 @@ export default {
   height: 3.75rem;
   padding-left: 2.5rem;
   color: #0c2278;
-  background:  #f5f5f5;;
+  background: #f5f5f5;
   line-height: 3;
   font-weight: 800;
   font-size: 1.25rem;

src/views/ADMINISTRATORS/components/ADMINISTRATORS1.vue

@@ -198,6 +198,44 @@
               </div>
             </div>
           </el-tab-pane>
+          <el-tab-pane label="手动车辆排队" name="fourth">
+            <div class="admin2">
+              <div class="carrier from">
+                <el-form
+                  :inline="true"
+                  class="demo-form-inline"
+                  label-width="80px"
+                >
+                  <el-form-item label="车牌号:">
+                    <el-autocomplete
+                      class="inline-input"
+                      v-model="capacityName"
+                      :fetch-suggestions="querySearchCapacity"
+                      placeholder="车牌号"
+                      :trigger-on-focus="false"
+                      @select="handleSelectCapacity"
+                    >
+                      <template slot-scope="{ item }">
+                        <div class="name">{{ item.capacityNumber }}</div>
+                      </template>
+                    </el-autocomplete>
+                  </el-form-item>
+                </el-form>
+              </div>
+              <div class="poundNo from">
+                <span class="text">运输订单号:</span>
+                <el-input v-model="orderNumber" disabled></el-input>
+              </div>
+              <div class="button_box">
+                <el-button
+                  type="primary"
+                  @click="queueClick"
+                  :disabled="disabled"
+                  >确认</el-button
+                >
+              </div>
+            </div>
+          </el-tab-pane>
         </el-tabs>
       </div>
     </template>
@@ -243,6 +281,16 @@ export default {
     this.information();
   },
   methods: {
+    queueClick() {
+      this.axios
+        .post("/api/v1/qms/addQueueResult?vno=" + this.capacityName)
+        .then(res => {
+          if (res.data.code == 200) {
+            this.$message.success("操作成功");
+            this.$router.go(0);
+          }
+        });
+    },
     deleteMoreResult() {
       console.log(this.orderNumber);
       this.axios

src/views/RMS/components/rawWarehouse.vue

@@ -2,15 +2,12 @@
 <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" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
-       <el-button type="primary" class="btn" @click="toInsert">
+      <el-button type="primary" class="btn" @click="toInsert">
         <i class="el-icon-plus"></i>新增
       </el-button>
     </div>
@@ -18,18 +15,10 @@
       <dilTable v-bind.sync="options">
         <el-table-column fixed="right" label="操作" width="100">
           <template slot-scope="scope">
-            <el-button
-              type="text"
-              size="small"
-              @click="updateWarehouse(scope)"
-            >
+            <el-button type="text" size="small" @click="updateWarehouse(scope)">
               修改
             </el-button>
-            <el-button
-              type="text"
-              size="mini"
-              @click="deleteWarehouse(scope)"
-            >
+            <el-button type="text" size="mini" @click="deleteWarehouse(scope)">
               删除
             </el-button>
           </template>
@@ -41,48 +30,48 @@
 
 <script>
 export default {
-  data(){
-    return{
-      inputText:"",
-      options:{
+  data() {
+    return {
+      inputText: null,
+      options: {
         // first请求数据的地址
-        requestUrl: "/api/v1/rms/getWarehouseList?apiId=415",
-      },
-    }
+        requestUrl: "/api/v1/rms/getWarehouseList?apiId=415"
+      }
+    };
   },
-  methods:{
-    onclick(){
-      this.options.requestUrl="/api/v1/rms/getWarehouseList?apiId=415&con="+this.inputText;
+  methods: {
+    onclick() {
+      this.options.requestUrl =
+        "/api/v1/rms/getWarehouseList?apiId=415&con=" + this.inputText;
     },
-     toInsert() {
+    toInsert() {
       this.$router.push("/addRawWarehouse");
-
     },
-    updateWarehouse(scope){
-       console.log(scope.row.warehouseId)
-      this.$router.push("/editRawWarehouse/" +scope.row.warehouseId)
+    updateWarehouse(scope) {
+      console.log(scope.row.warehouseId);
+      this.$router.push("/editRawWarehouse/" + scope.row.warehouseId);
     },
-    deleteWarehouse(scope){
+    deleteWarehouse(scope) {
       this.$confirm("是否删除", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
-        center: true,
+        center: true
       })
         .then(() => {
           this.axios
             .post("/api/v1/rms/deleteWarehouse/" + scope.row.warehouseId)
-            .then((res) => {
+            .then(res => {
               if (res.data.code == 200) {
                 this.$message({
                   type: "success",
-                  message: "删除成功!",
-                });     
+                  message: "删除成功!"
+                });
                 this.$router.go(0);
               } else {
                 this.$message({
                   message: "删除失败",
-                  type: "warning",
+                  type: "warning"
                 });
               }
             });
@@ -90,23 +79,22 @@ export default {
         .catch(() => {
           this.$message({
             type: "info",
-            message: "删除操作已取消!",
+            message: "删除操作已取消!"
           });
         });
-    },
-    },
+    }
   }
-
+};
 </script>
 
 <style lang="scss" scode>
-.steel_inbound{
-  .sache{
+.steel_inbound {
+  .sache {
     padding: 1.25rem 0.375rem;
     .el-input {
       width: 20%;
       margin-right: 1.25rem;
     }
   }
-  }
+}
 </style>

src/views/TMS/components/domesticMine/wagonLoadAdd.vue

@@ -56,14 +56,14 @@
         <el-table-column
         align="center"
           prop="sendStation"
-          label="火车发站"
+          label="发站"
           width="180px">
         </el-table-column>
         <el-table-column
         align="center"
         width="180px"
           prop="arrivalStation"
-          label="火车到站">
+          label="到站">
         </el-table-column>
          <el-table-column
          align="center"
@@ -572,7 +572,7 @@ export default {
             that.tableData=[];
             if((typeof rows[0]['车号'])=='undefined'){
               that.$message({
-                message: "导入Excel格式错误!",
+                message: "导入Excel格式错误，请参考下方表头格式!",
                 type: "warning",
               });
               return;
@@ -593,6 +593,12 @@ export default {
                 wagonNo:row['车号'],
                 weight:row['标重']
               }
+              if(typeof temp.materialName=='undefined' || temp.materialName==null){
+                temp.materialName=row['品名'];
+              }
+              if(typeof temp.materialName=='undefined' || temp.materialName==null){
+                temp.materialName=row['物资'];
+              }
               that.tableData.push(temp);
             }
             else{

src/views/TMS/components/importedEmergency/addWagonLoadEmergency.vue

@@ -82,7 +82,7 @@
         <el-table-column
         align="center"
           prop="wagonNo"
-          label="车号"
+          label="车皮号"
           width="120px">
         </el-table-column>
         <el-table-column
@@ -643,7 +643,7 @@ export default {
             that.disable=false;
             if((typeof rows[0]['车皮号'])=='undefined'){
               that.$message({
-                message: "导入Excel格式错误!",
+                message: "车皮号不存在!请参考下方格式！",
                 type: "warning",
               });
               return;
@@ -653,7 +653,7 @@ export default {
           rows.forEach((row,index) => {
             let carNumber=row['车皮号'];
             if((typeof carNumber)!="undefined" && carNumber.length == 7){
-              //车号表
+              //车皮号表
               that.list.push(carNumber);
               //表格数据
               let temp={
@@ -667,7 +667,7 @@ export default {
               that.tableData.push(temp);
             }
             else{
-              console.log("车号"+carNumber+"不是7位数!");
+              console.log("车皮号"+carNumber+"不是7位数!");
             }
         });
         };

src/views/TMS/components/importedMine/addWagonLoad.vue

@@ -82,7 +82,7 @@
         <el-table-column
         align="center"
           prop="wagonNo"
-          label="车号"
+          label="车皮号"
           width="120px">
         </el-table-column>
         <el-table-column
@@ -643,7 +643,7 @@ export default {
             that.disable=false;
             if((typeof rows[0]['车皮号'])=='undefined'){
               that.$message({
-                message: "导入Excel格式错误!",
+                message: "车皮号不存在!请参考下方格式！",
                 type: "warning",
               });
               return;
@@ -653,7 +653,7 @@ export default {
           rows.forEach((row,index) => {
             let carNumber=row['车皮号'];
             if((typeof carNumber)!="undefined" && carNumber.length == 7){
-              //车号表
+              //车皮号表
               that.list.push(carNumber);
               //表格数据
               let temp={
@@ -667,7 +667,7 @@ export default {
               that.tableData.push(temp);
             }
             else{
-              console.log("车号"+carNumber+"不是7位数!");
+              console.log("车皮号"+carNumber+"不是7位数!");
             }
         });
         };

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

@@ -32,6 +32,8 @@
           placeholder="请输入下单客户名称"
           :trigger-on-focus="false"
           @select="handleSelectConsignee"
+          style="width:300px"
+          :disabled="consigneeDisable"
         >
           <template slot-scope="{ item }">
             <div class="name">{{ item.consigneeCompanyName }}</div>
@@ -649,11 +651,13 @@
 </template>
 <script>
 import PageTitle from "@/components/Page/Title";
+import { getCookie } from "@/utils/util.js";
 import { sjTime, isIntegerNumber } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {
     return {
+      consigneeDisable: false,
       isCellClick: 0,
       truckRemark: "",
       shipperName: "四川省达州钢铁集团有限责任公司",
@@ -898,6 +902,46 @@ export default {
     //获取所有的业务员
     this.getAllsaleMan();
   },
+  mounted() {
+    if (getCookie("orgCode") == "shouhuokehu") {
+      this.consigneeDisable = true;
+      this.axios
+        .get("/api/v1/uc/getConsigneeByuserid?userId=" + getCookie("userId"))
+        .then(res => {
+          console.log(res);
+          if (res.status == 200) {
+            console.log(res.data);
+            this.consigneeName = res.data.consigneeCompanyName;
+            this.consigneeId = res.data.consigneeId;
+            //带出摘要
+            this.axios
+              .post("/api/v1/uc/getSaleArea?receiveId=" + this.consigneeId)
+              .then(res => {
+                this.remarks = res.data.data;
+              });
+            this.axios
+              .post(
+                "/api/v1/ams/matchingAddressRecently?receiveId=" +
+                  this.consigneeId
+              )
+              .then(res => {
+                const place = res.data.data;
+                console.log(place);
+                this.saleShipperAddressName =
+                  place[0].addressProvince +
+                  place[0].addressDistrict +
+                  place[0].addressTown +
+                  place[0].place;
+                this.saleShipperAddressId = place[0].shipperAddressId;
+                this.place1 = place[0].place;
+                this.saleMan = place[0].salerId;
+                this.saleOrderConsigneeTel = place[0].saleOrderConsigneeTel;
+              });
+          }
+        });
+      console.log(getCookie("userId"));
+    }
+  },
   methods: {
     onblur() {
       this.isCellClick = 0;

src/views/inward/components/inwardSettlement/detailOrder.vue

@@ -47,6 +47,9 @@
         <el-tab-pane label="已结算" name="second">
           <dilTable v-bind.sync="options2"> </dilTable>
         </el-tab-pane>
+        <el-tab-pane label="未生成详单" name="third">
+          <dilTable v-bind.sync="options3"> </dilTable>
+        </el-tab-pane>
       </el-tabs>
     </div>
   </div>
@@ -81,6 +84,9 @@ export default {
         // second请求数据的地址
         requestUrl: ""
       },
+      options3: {
+        requestUrl: ""
+      },
       //是否打开修改详单地址弹出框
       dialogFormVisible: false,
       //原详单单价
@@ -110,6 +116,7 @@ export default {
   created() {
     this.options1GetRequestUrl();
     this.options2GetRequestUrl();
+    this.options3GetRequestUrl();
   },
   methods: {
     func(res) {
@@ -176,6 +183,9 @@ export default {
           new Date();
       }
     },
+    options3GetRequestUrl() {
+      this.options3.requestUrl = "/api/v1/bms/getNoInwardDetails?apiId=490";
+    },
     toInsert() {
       this.$router.push("/insertCheckInventory");
     },
@@ -211,6 +221,14 @@ export default {
               endTime +
               "&i" +
               new Date();
+            this.options3.requestUrl =
+              "/api/v1/bms/getNoInwardDetails?apiId=490" +
+              "&startTime=" +
+              startTime +
+              "&endTime=" +
+              endTime +
+              "&i" +
+              new Date();
           } else if (getCookie("orgCode") == "chengyunshang") {
             this.options1.requestUrl =
               "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=0&carrierSsoId=" +
@@ -230,6 +248,15 @@ export default {
               endTime +
               "&i" +
               new Date();
+            this.options3.requestUrl =
+              "/api/v1/bms/getNoInwardDetails?apiId=490&carrierSsoId=" +
+              getCookie("userId") +
+              "&startTime=" +
+              startTime +
+              "&endTime=" +
+              endTime +
+              "&i" +
+              new Date();
           } else {
             this.options1.requestUrl =
               "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=0&userId=" +
@@ -249,6 +276,15 @@ export default {
               endTime +
               "&i" +
               new Date();
+            this.options3.requestUrl =
+              "/api/v1/bms/getNoInwardDetails?apiId=490&userId=" +
+              getCookie("orgCode") +
+              "&startTime=" +
+              startTime +
+              "&endTime=" +
+              endTime +
+              "&i" +
+              new Date();
           }
         } else {
           this.startTime = null;

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

@@ -55,7 +55,12 @@
             </dilTable>
           </el-tab-pane>
           <el-tab-pane label="已下发" name="second">
-            <dilTable v-bind.sync="second" ref="table1">
+            <dilTable
+              v-bind.sync="second"
+              ref="table1"
+              :isPagination="false"
+              :pageSize="2000"
+            >
               <el-table-column fixed="right" label="操作" width="80">
                 <template slot-scope="scope">
                   <el-button

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

@@ -291,6 +291,9 @@ export default {
         this.$message.error("未选择车辆");
         this.disabled = false;
         return;
+      } else if (this.orderType == null) {
+        this.$message.error("请选择订单类型");
+        return;
       }
       this.axios
         .post("/api/v1/oms/addPurInwardOrder", {

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

@@ -280,6 +280,9 @@ export default {
         this.$message.error("未选择车辆");
         this.disabled = false;
         return;
+      } else if (this.orderType == null) {
+        this.$message.error("请选择订单类型");
+        return;
       }
       this.axios
         .post("/api/v1/oms/addPurInwardOrder", {

src/views/queue/components/qmsEnFacotory/queueFStart.vue

@@ -3,6 +3,23 @@
   <div class="sale">
     <div class="top">
       <el-form :inline="true" style="margin-top: 1rem;">
+        <el-form-item>
+          <el-input
+            v-model="capacityNo"
+            style="width:250px"
+            placeholder="输入车牌号查询"
+            clearable
+          >
+          </el-input>
+          <el-button
+            type="primary"
+            class="btn"
+            @click="onclick"
+            style="margin-left: 4px;"
+            clearable
+            ><i class="el-icon-search"></i>查询车辆</el-button
+          >
+        </el-form-item>
         <el-form-item>
           <el-button
             type="primary"
@@ -15,7 +32,7 @@
         </el-form-item>
         <el-form-item
           ><el-button type="primary" class="btn" @click="refresh">
-            <i class="el-icon-d-arrow-right"></i>刷新
+            <i class="el-icon-refresh"></i>刷新
           </el-button></el-form-item
         >
         <el-form-item
@@ -361,7 +378,7 @@ export default {
         columnIndex === 4 ||
         columnIndex === 9 ||
         columnIndex === 10 ||
-        columnIndex === 12
+        columnIndex === 13
       ) {
         const _row = this.spanArr[rowIndex];
         const _col = _row > 0 ? 1 : 0;
@@ -398,12 +415,20 @@ export default {
         });
     },
     onclick() {
+      console.log("我到了这里");
+      console.log(this.capacityNo);
       if (this.activeName == "first") {
-        this.option1.requestUrl =
-          "/api/v1/qms/getQueueListByQueueUp?apiId=473&isSpelling=0?capacityNumber=" +
-          this.capacityNo +
-          "&i=" +
-          new Date();
+        this.axios
+          .post(
+            "/api/v1/qms/getQueueListByQueueUp?isSpelling=0&i=" +
+              new Date() +
+              "&capacityNumber=" +
+              this.capacityNo
+          )
+          .then(res => {
+            this.tableData1 = res.data.data;
+          });
+        console.log("wzxxx");
       } else {
         this.axios
           .post(
@@ -454,7 +479,12 @@ export default {
         return;
       }
       for (let i = 0; i < this.maplist.length; i++) {
-        if (typeof this.maplist[i].id == "undefined") {
+        console.log(typeof this.maplist[i].id);
+        if (
+          typeof this.maplist[i].id == "undefined" ||
+          this.maplist[i].id == null ||
+          this.maplist[i].id == "null"
+        ) {
           this.$message.error("请选择装货点");
           return;
         }

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

@@ -1,5 +1,6 @@
 <template>
   <div class="container">
+    <!-- 车辆轨迹 -->
     <div id="amap-container"></div>
     <div class="controller">
       <div class="btnx">

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

@@ -1,5 +1,6 @@
 <template>
   <div class="container">
+    <!-- 实时路径 -->
     <div class="btnx">
       <el-button type="primary" class="" @click="openInfo"
         >打开信息窗体</el-button
@@ -87,9 +88,13 @@ export default {
       let regExp = /(^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}[A-Z0-9]{4}[A-Z0-9挂学警港澳]{1}$)/;
       if (that.carNumber == "") {
         this.$message.error("车牌号不能为空！");
+        //清除旧的定时器
+        clearTimeout(this.timer);
         return;
       } else if (!regExp.test(that.carNumber)) {
         this.$message.error("请输入正确的车牌号！");
+        //清除旧的定时器
+        clearTimeout(this.timer);
         return;
       }
       that.axios
@@ -133,6 +138,8 @@ export default {
             this.lat = res.data.data.result.lat;
           } else {
             this.$message.error("车辆暂时无GPS");
+            //清除定时器
+            clearTimeout(this.timer);
           }
         });
     },
@@ -164,7 +171,31 @@ export default {
       var pointmarker = new AMap.Marker({
         position: new AMap.LngLat(lon, lat), // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
         icon: pointicon,
-        title: title
+        title: title,
+      });
+      // 将创建的点标记添加到已有的地图实例：
+      that.pointmarker = pointmarker;
+      that.map.add(pointmarker);
+    },
+    initPoint(weight, height, image, lon, lat, title) {
+      let that = this;
+      //图标标记点
+      let pointicon = new AMap.Icon({
+        //size: new AMap.Size(weight, height), // 图标尺寸
+        image: image, // Icon的图像
+        imageOffset: new AMap.Pixel(0, 10), // 图像相对展示区域的偏移量，适于雪碧图等
+        imageSize: new AMap.Size(weight, height) // 根据所设置的大小拉伸或压缩图片
+      });
+      // 创建一个 Marker 实例：
+      var pointmarker = new AMap.Marker({
+        position: new AMap.LngLat(lon, lat), // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+        icon: pointicon,
+        title: title,
+        label: {
+            direction: 'top',
+            content: title,
+            offset: new AMap.Pixel(-2,10),
+        }
       });
       // 将创建的点标记添加到已有的地图实例：
       that.pointmarker = pointmarker;
@@ -216,10 +247,13 @@ export default {
       clearTimeout(this.timer);
       that.startTime=that.formatDate(new Date(),"yyyy年MM月dd日 hh:mm:ss");
       that.endTime=that.formatDate(new Date(),"yyyy年MM月dd日 hh:mm:ss");
+      console.log(that.startTime+"至"+that.endTime);
       //清除path
       that.path=[];
       //清除所有覆盖物
       that.map.clearMap();
+      //设置所有的门岗和汽车衡
+      that.setPoints();
       //设置定时器
       that.timer=setInterval(()=>{
           //清除之前车的图标
@@ -228,8 +262,26 @@ export default {
           that.endTime=that.formatDate(new Date(),"yyyy年MM月dd日 hh:mm:ss");
       },5000);
     },
-    
-
+    //初始化厂内标记点
+    setPoints(){
+      //请求所有汽车衡和门岗
+      let that=this;
+      that.axios.get("/api/v1/otms/mapvertexs/findSelections").then((res)=>{
+        console.log(res.data.data);
+        if(res.data.data){
+          res.data.data.forEach(vertex => {
+             that.initPoint(
+              20,
+              25,
+              require("@/assets/img/map_site.png"),
+              vertex.longitude,
+              vertex.latitude,
+              vertex.addressName
+            );
+          });
+        }
+      });
+    },
     //初始化窗体
     initCustomMarkes(title, details, lon, lat) {
       let that = this;
@@ -261,37 +313,6 @@ 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

@@ -1,5 +1,5 @@
 <template>
-  <!-- 在途运输信息选择页面 -->
+  <!-- 车辆运输 -->
   <div class="inTransit">
     <el-form :inline="true">
       <el-form-item>

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

@@ -33,6 +33,12 @@
         <el-tab-pane label="厂外-厂内内转报表" name="fifth"
           ><dilTable ref="excelDom" v-bind.sync="fifth"></dilTable
         ></el-tab-pane>
+        <el-tab-pane label="拼装车辆进厂统计" name="six"
+          ><dilTable ref="excelDom" v-bind.sync="six"></dilTable
+        ></el-tab-pane>
+        <el-tab-pane label="一焦化采购进厂" name="seven"
+          ><dilTable ref="excelDom" v-bind.sync="seven"></dilTable
+        ></el-tab-pane>
       </el-tabs>
     </div>
   </div>
@@ -53,8 +59,14 @@ export default {
       purInward: [],
       //销售内转数据
       saleReport: [],
+      //采购燃料统计报表
       purReport: [],
+      //厂外-厂内统计报表
       outFactory: [],
+      //拼装车辆统计报表
+      assembleReport: [],
+      //一焦化-厂内统计报表
+      oneCokeReport: [],
       input: null,
       activeName: "first",
       startTime: null,
@@ -73,6 +85,12 @@ export default {
       },
       fifth: {
         requestUrl: ""
+      },
+      six: {
+        requestUrl: ""
+      },
+      seven: {
+        requestUrl: ""
       }
     };
   },
@@ -261,6 +279,54 @@ export default {
               loading.close();
             }, 2000);
           });
+      } else if (this.activeName == "six") {
+        this.axios
+          .post(
+            "/api/v1/tms/getInwardReportForAssemble?apiId=486&isPage=yes&startTime=" +
+              startTime +
+              "&endTime=" +
+              endTime +
+              "&index=" +
+              this.input +
+              "&orgCode=" +
+              orgCode +
+              "&orderType=15"
+          )
+          .then(res => {
+            this.totalArr = [];
+            this.assembleReport = [];
+            this.tableTitle = "拼装车皮进厂统计报表";
+            this.assembleReport = res.data.data;
+            this.totalArr = this.totalArr.concat(this.assembleReport);
+            this.exportAllReportToExcel();
+            setTimeout(() => {
+              loading.close();
+            }, 2000);
+          });
+      } else if (this.activeName == "seven") {
+        this.axios
+          .post(
+            "/api/v1/tms/getInwardReportForAssemble?apiId=486&isPage=yes&startTime=" +
+              startTime +
+              "&endTime=" +
+              endTime +
+              "&index=" +
+              this.input +
+              "&orgCode=" +
+              orgCode +
+              "&orderType=16"
+          )
+          .then(res => {
+            this.totalArr = [];
+            this.oneCokeReport = [];
+            this.tableTitle = "一焦化-进厂统计报表";
+            this.oneCokeReport = res.data.data;
+            this.totalArr = this.totalArr.concat(this.oneCokeReport);
+            this.exportAllReportToExcel();
+            setTimeout(() => {
+              loading.close();
+            }, 2000);
+          });
       }
     },
     openFullScreen() {
@@ -357,11 +423,49 @@ export default {
                             this.totalArr = this.totalArr.concat(
                               this.outFactory
                             );
-                            this.tableTitle = "全部内转车辆报表";
-                            this.exportAllReportToExcel();
-                            setTimeout(() => {
-                              loading.close();
-                            }, 2000);
+                            this.axios
+                              .post(
+                                "/api/v1/tms/getInwardReportForAssemble?apiId=486&orgCode=null&isPage=yes&startTime=" +
+                                  startTime +
+                                  "&endTime=" +
+                                  endTime +
+                                  "&orderType=15" +
+                                  "&index=" +
+                                  this.input +
+                                  "&i=" +
+                                  new Date()
+                              )
+                              .then(res => {
+                                this.assembleReport = [];
+                                this.assembleReport = res.data.data;
+                                this.totalArr = this.totalArr.concat(
+                                  this.assembleReport
+                                );
+                                this.axios
+                                  .post(
+                                    "/api/v1/tms/getInwardReportForAssemble?apiId=486&orgCode=null&isPage=yes&startTime=" +
+                                      startTime +
+                                      "&endTime=" +
+                                      endTime +
+                                      "&orderType=16" +
+                                      "&index=" +
+                                      this.input +
+                                      "&i=" +
+                                      new Date()
+                                  )
+                                  .then(res => {
+                                    this.oneCokeReport = [];
+                                    this.oneCokeReport = res.data.data;
+                                    this.totalArr = this.totalArr.concat(
+                                      this.oneCokeReport
+                                    );
+                                    this.tableTitle = "全部内转车辆报表";
+                                    this.exportAllReportToExcel();
+                                    setTimeout(() => {
+                                      loading.close();
+                                    }, 2000);
+                                  });
+                              });
                           });
                       });
                   });
@@ -445,6 +549,18 @@ export default {
                             this.totalArr = this.totalArr.concat(
                               this.outFactory
                             );
+                            this.axios
+                              .post(
+                                "/api/v1/tms/getInwardReportForAssemble?apiId=477&startTime=" +
+                                  startTime +
+                                  "&endTime=" +
+                                  endTime +
+                                  "&index=" +
+                                  this.input +
+                                  "&orgCode=" +
+                                  getCookie("orgCode")
+                              )
+                              .then(res => {});
                             this.tableTitle = "全部内转车辆报表";
                             this.exportAllReportToExcel();
                             setTimeout(() => {
@@ -512,6 +628,14 @@ export default {
           null +
           "&i=" +
           new Date();
+        this.six.requestUrl =
+          "/api/v1/tms/getInwardReportForAssemble?apiId=486&startTime=null&endTime=null&i=" +
+          new Date() +
+          "&orderType=15";
+        this.seven.requestUrl =
+          "/api/v1/tms/getInwardReportForAssemble?apiId=486&startTime=null&endTime=null&i=" +
+          new Date() +
+          "&orderType=16";
       } else {
         this.first.requestUrl =
           "/api/v1/tms/getInwardInFactory?apiId=486&orgCode=" +
@@ -538,6 +662,18 @@ export default {
           getCookie("orgCode") +
           "&i=" +
           new Date();
+        this.six.requestUrl =
+          "/api/v1/tms/getInwardReportForAssemble?apiId=486&startTime=null&endTime=null&i=" +
+          new Date() +
+          "&orgCode=" +
+          getCookie("orgCode") +
+          "&orderType=15";
+        this.seven.requestUrl =
+          "/api/v1/tms/getInwardReportForAssemble?apiId=486&startTime=null&endTime=null&i=" +
+          new Date() +
+          "&orgCde=" +
+          getCookie("orgCode") +
+          "&orderType=16";
       }
     },
     onClick() {
@@ -613,6 +749,28 @@ export default {
             this.input +
             "&i=" +
             new Date();
+        } else if (this.activeName == "six") {
+          this.six.requestUrl =
+            "/api/v1/tms/getInwardReportForAssemble?apiId=486&startTime=" +
+            startTime +
+            "&endTime=" +
+            endTime +
+            "&input=" +
+            this.input +
+            "&i=" +
+            new Date() +
+            "&orderType=15";
+        } else if (this.activeName == "seven") {
+          this.seven.requestUrl =
+            "/api/v1/tms/getInwardReportForAssemble?apiId=486&startTime=" +
+            startTime +
+            "&endTime=" +
+            endTime +
+            "&input=" +
+            this.input +
+            "&i=" +
+            new Date() +
+            "&orderType=16";
         }
       } else {
         if (this.activeName == "first") {
@@ -675,6 +833,32 @@ export default {
             this.input +
             "&i=" +
             new Date();
+        } else if (thia.activeName == "six") {
+          this.six.requestUrl =
+            "/api/v1/tms/getInwardReportForAssemble?apiId=486&startTime=" +
+            startTime +
+            "&endTime=" +
+            endTime +
+            "&input=" +
+            this.input +
+            "&i=" +
+            new Date() +
+            "&orgCode=" +
+            getCookie("orgCode") +
+            "&orderType=15";
+        } else if (thia.activeName == "seven") {
+          this.seven.requestUrl =
+            "/api/v1/tms/getInwardReportForAssemble?apiId=486&startTime=" +
+            startTime +
+            "&endTime=" +
+            endTime +
+            "&input=" +
+            this.input +
+            "&i=" +
+            new Date() +
+            "&orgCode=" +
+            getCookie("orgCode") +
+            "&orderType=16";
         }
       }
     },

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

@@ -11,7 +11,6 @@
             v-model="startTime"
             type="datetime"
             placeholder="选择日期时间"
-            style="width:200px"
           >
           </el-date-picker>
           <span>至</span>
@@ -19,7 +18,6 @@
             v-model="endTime"
             type="datetime"
             placeholder="选择日期时间"
-            style="width:200px"
           >
           </el-date-picker>
           <el-form-item>
@@ -34,7 +32,7 @@
             <el-input
               v-model="inputMaterial"
               style="width:200px"
-              placeholder="输入仓库或物资名称或备注"
+              placeholder="可输入条件查询"
               clearable
             ></el-input>
           </el-form-item>
@@ -54,7 +52,7 @@
           </el-button>
         </el-form-item>
         <el-form-item>
-          <span style="margin-left: 1rem;width:68px">合计净重：</span>
+          <span>合计净重：</span>
           <el-input
             v-model="totalNumber"
             :disabled="true"
@@ -62,7 +60,7 @@
           ></el-input>
         </el-form-item>
         <el-form-item>
-          <span style="margin-left: 1rem;width:68px">合计车数：</span>
+          <span>合计车数：</span>
           <el-input
             v-model="totalCapacity"
             :disabled="true"