厂外

build/utils.js

@@ -16,7 +16,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow']
 // let devModules = ['index','inward']
-let devModules = ['index','appoint','sale','statisticalReport','RMS','TMS']
+let devModules = ['index','appoint','sale','statisticalReport','RMS','TMS','WMS']
 // let devModules = ['index','TMS']
 // let devModules = ['index','statisticalReport','inward']
 if (pathSrc.indexOf('node_modules') > -1) {

src/views/RMS/components/addPersonnel.vue

@@ -196,6 +196,7 @@ export default {
             this.form1.shipperId=='' ||
             this.form1.personnelShifts=='' ||
             this.form1.personnelTeam=='' ||
+            this.form1.ConcatTelephone==''||
             userInfo.orgName=='' ||
             userInfo.orgCode=='' ||
             userInfo.orgId=='' ||
@@ -218,7 +219,7 @@ export default {
               //保存权限表中的用户主键Id
               this.personnelSsoId = res.data.userId;
               //再新增RMS_PERSONNEL表信息
-              let rmsPersonnel = {
+              let map1 = {
                 personnelJobNumber : this.form1.personnelJobNumber,
                 personnelPost : this.form1.personnelPost,
                 personnelName : this.form1.personnelName,
@@ -226,21 +227,21 @@ export default {
                 // personnelWorkshopid : this.form1.personnelWorkshopid,
                 personnelShifts : this.form1.personnelShifts,
                 personnelTeam : this.form1.personnelTeam,
-                personnelSsoId : this.personnelSsoId
+                personnelSsoId : this.personnelSsoId,
+                //联系电话
+                ConcatTelephone : this.form1.ConcatTelephone,
+                userId: getCookie("userId"),
               }
               //  console.log("rmsPersonnel",rmsPersonnel)
-                  this.axios.post('/api/v1/rms/addPersonnel',rmsPersonnel)
+                  this.axios.post('/api/v1/rms/addPersonnel',map1)
                   .then((res)=>{
-                              // console.log("Personnel",res)
                         if (res.data.code == 200) {
                         this.$message({
                           type: "success",
                           message: "新增成功!",
                         });
                         // this.$refs.table.refreshData();
-                        
                         //最后新增角色赋权表
-
                           this.axios.post('pass/v1/sysuserroles/addUserroles?userId='
                           +this.personnelSsoId+'&userCode='+this.form1.personnelJobNumber+'&roleId='+this.value3)
                           .then((res)=>{

src/views/TMS/components/importedShip/addLoadShip.vue

@@ -209,25 +209,6 @@ export default {
       //   this.$message.error("存在空值！");
       // else if (!isNumber(val)) this.$message.warning("实装数量必须为数字!");
       // else
-      this.axios
-        .post("/api/v1/tms/addLoadShip", {
-          mapVal: mapVal,
-          rowMap: this.rowMap
-        })
-        .then(res => {
-          if (res.data.code == 200) {
-            this.$message({
-              type: "success",
-              message: "新增成功!"
-            });
-            this.$router.go(-1);
-          } else if (res.data.code == 201) {
-            this.$message.warning(res.data.data);
-          } else {
-            this.$message.error("新增失败！");
-          }
-          this.$refs["table"].resetField();
-        });
     },
     handleSelect(item) {
       console.log(item);

src/views/TMS/components/importedShip/addShipmentInstructions.vue

@@ -80,7 +80,7 @@ export default {
         this.$set(
           this.form1,
           "batchId",
-          selection.resultForeignShipName + selection.materialName
+          selection.resultForeignShipName +"-"+selection.materialName+"-" +selection.infactoryShipName
         );
         this.batchId = selection.batchId;
       }

src/views/TMS/components/importedShip/shipLocation.vue

@@ -208,8 +208,6 @@ export default {
         });
     },
     click(row) {
-      let locationRouteTime = sjTime(row.locationRouteTime);
-      row.locationRouteTime = locationRouteTime;
       this.axios.post("/api/v1/tms/updateShipLocation", row).then(res => {
         if (res.data.code == "200") {
           this.$message({

src/views/appoint/components/ship/addDeliveryNotice.vue

@@ -120,7 +120,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"
@@ -137,7 +137,7 @@
           <el-input
             class="shippingCertificate"
             style="width: 270px; display: flex"
-            placeholder="请选择货权附件(必填项)"
+            placeholder="请选择货权图片(必填项)"
             v-model="shippingCertificate"
             disabled
           >
@@ -154,7 +154,7 @@
             "
             @click="upCLick(1)"
           >
-            点击上传附件</el-button
+            点击上传图片</el-button
           >
         </el-upload>
       </el-form-item>

src/views/appoint/components/ship/modifyDeliveryAttroney.vue

@@ -25,6 +25,7 @@ export default {
       form1: {},
       value2: undefined,
       value3: undefined,
+      batchInfactoryId:null,
     };
   },
   mounted() {
@@ -39,7 +40,9 @@ export default {
         )
         .then((res) => {
           res.data.data.forEach((e) => {
+            this.batchInfactoryId=e.batchInfactoryId;
             this.form1 = e;
+            console.log(this.form1.batchId);
           });
         });
     },
@@ -52,7 +55,8 @@ export default {
       let AmsshipDeliveryAttorney = {
         resultId: this.$route.params.attorneyId,
         portId: this.form1.portId,
-        attorneyContactTelephone: this.form1.attorneyContactTelephone,
+        batchId:this.batchInfactoryId,
+        attorneyContactTelephone:this.form1.attorneyContactTelephone,
         attorenyPickupIdcard: this.form1.attorenyPickupIdcard,
         attorneyPickupContactPerson: this.form1.attorneyPickupContactPerson,
         downSwimPortId: this.form1.downSwimPortId,

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/sale/components/offSiteTransportation/checkGPS.vue

@@ -439,8 +439,11 @@ export default {
         if (status === "complete" && result.info === "OK") {
           that.endPointName = result.regeocode.formattedAddress;
           setInterval(
+            //设置自定义窗体
             that.initCustomMarkes(
               that.carNumber,
+              that.formatDate(that.time[0],"yyyy-MM-dd")+"至"+that.formatDate(that.time[1],"yyyy-MM-dd")+
+              "<br/>" +
               "起点：" +
                 that.startPointName +
                 "<br/>" +
@@ -488,7 +491,7 @@ export default {
         })
         .then(res => {
           if (res.data.data == "-1") {
-            this.$message.error("自提车辆无权查看!");
+            this.$message.error("运输订单未关闭,自提车辆无权查看!");
           } else if (res.data.data.startAndEndRoutes != "") {
             that.listPath = res.data.data.startAndEndRoutes;
             that.initMap([105.602725, 37.076636]);

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

@@ -5,7 +5,7 @@
       <div class="in_transit_information">
         <span class="item_details">车牌号:</span>
         <el-input style="width: 120px;" class="inputStyle" v-model.trim="carNumber"> </el-input>
-        <el-button type="primary" class="searchstyle" @click="initData">查询</el-button>
+        <el-button type="primary" class="searchstyle" @click="initData();initTimer()">查询</el-button>
       </div>
     </div>
   </div>
@@ -43,37 +43,53 @@ export default {
       carNumber: "",
       //地图组件
       map:null,
-
+      path:[],
+      pointmarker:null,
+      //定时器
+      timer: null,
     };
   },
   created() {
     let that =this;
     that.initMap(105.602725,37.076636)
   },
-  mounted() {},
+  mounted() {
+    
+  },
   methods: {
     
 
     //初始化数据
     initData() {
       let that = this;
+      let regExp = /(^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}[A-Z0-9]{4}[A-Z0-9挂学警港澳]{1}$)/;
       if (that.carNumber == "") {
         this.$message.error("车牌号不能为空！");
         return;
+      }else if(!regExp.test(that.carNumber)){
+        this.$message.error("请输入正确的车牌号！");
+        return;
       }
       that.axios
         .get("/api/v1/otms/getCurrentLocation?capcityNumber="+that.carNumber)
         .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]);
-                  //画车
-                  that.initMarkes( 45,60, require("@/assets/img/car1.png"),res.data.data.result.lon,res.data.data.result.lat,"现在所在位置");
-                  //显示窗体
-                  that.initCustomMarkes(that.carNumber,res.data.data.result.adr,res.data.data.result.lon,res.data.data.result.lat);
+                that.map.setCenter([res.data.data.result.lon,res.data.data.result.lat]);
+                //画车
+                that.initMarkes( 45,60, require("@/assets/img/car1.png"),res.data.data.result.lon,res.data.data.result.lat,"现在所在位置");
+                //给路径加点
+                let point=new AMap.LngLat(res.data.data.result.lon, res.data.data.result.lat);
+                if(that.path.length<=0 || !that.path[that.path.length-1].equals(point)){
+                  that.path.push(point);
+                }
+                console.log(that.path);
+                //初始化轨迹
+                that.initPolyline();
+                //显示窗体
+                that.initCustomMarkes(that.carNumber,res.data.data.result.adr,res.data.data.result.lon,res.data.data.result.lat);
               }else{
                   this.$message.error("车辆暂时无GPS");
               }
@@ -112,6 +128,7 @@ export default {
         title: title
       });
       // 将创建的点标记添加到已有的地图实例：
+      that.pointmarker=pointmarker;
       that.map.add(pointmarker);
     },
    
@@ -135,6 +152,38 @@ export default {
       // 打开信息窗体
       infoWindow.open(that.map, [lon, 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/statisticalReport/components/Ship_dynamic_table.vue

@@ -157,11 +157,8 @@ export default {
         if (res.data.code == "200") {
           this.tableData = res.data.data;
           console.log("aaad" +res.data.data);
-        } else {
-          this.$message({
-            type: "warning",
-            message: res.data.data,
-          });
+        } else if(res.data.data=="暂时没有船舶动态") { 
+            this.tableData = [];
         }
       });
     },