Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

config/index.js

@@ -64,9 +64,9 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址
   "/api/v1": {
-     target: "http://172.16.33.166:8080",
+    target: "http://172.16.33.166:8080",
     // target: "http://localhost:8080",
- 
+    // target: "http://localhost:8019",
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"

src/views/RMS/components/addCapacity.vue

@@ -145,18 +145,18 @@ export default {
       var result = false;
       if (vehicleNumber.length == 7) {
         var express =
-          /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}[A-Z0-9]{4}[A-Z0-9挂学警港澳]{1}$/;
+          /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使场领A-Z]{1}[A-Z]{1}[A-Z0-9]{4}[A-Z0-9挂学警港澳]{1}$/;
         result = express.test(vehicleNumber);
       }
       return result;
     },
     makeSure() {
       this.addLoading = true;
-      if (!this.isVehicleNumber(this.form1.capacityNumber.toUpperCase())) {
-        this.$message.error("车牌号格式不正确");
-        this.addLoading = false;
-        return;
-      }
+      // if (!this.isVehicleNumber(this.form1.capacityNumber.toUpperCase())) {
+      //   this.$message.error("车牌号格式不正确");
+      //   this.addLoading = false;
+      //   return;
+      // }
       if (this.carrierIds == null) {
         this.$message.error("请选择承运商");
         this.addLoading = false;
@@ -173,6 +173,7 @@ export default {
         carrierId: this.carrierIds,
         state: this.state,
       };
+      console.log(RmsCapacity)
       if (
         RmsCapacity.capacityNumber == null ||
         RmsCapacity.capacityCorlor == null ||

src/views/RMS/components/addCarrier.vue

@@ -35,7 +35,7 @@
     <el-upload
       class="upload-demo"
       ref="upload1"
-      action="http://localhost:8014/api/v1/rms/rmscarrier/uploadCarrier1"
+      action="https://wl.dasteel.cn:32322/api/v1/rms/uploadCarrier1"
       :before-upload="beforeUpload"
       :multiple="false"
       list-type="picture"
@@ -58,7 +58,7 @@
     <el-upload
       class="upload-demo"
       ref="upload2"
-      action="http://localhost:8014/api/v1/rms/rmscarrier/uploadCarrier1"
+      action="https://wl.dasteel.cn:32322/api/v1/rms/uploadCarrier1"
       :before-upload="beforeUpload"
       :multiple="false"
       list-type="picture"
@@ -81,7 +81,7 @@
     <el-upload
       class="upload-demo"
       ref="upload3"
-      action="http://localhost:8014/api/v1/rms/rmscarrier/uploadCarrier1"
+      action="https://wl.dasteel.cn:32322/api/v1/rms/uploadCarrier1"
       :before-upload="beforeUpload"
       :multiple="false"
       list-type="picture"
@@ -196,15 +196,15 @@ export default {
         if (this.num == 1) {
           this.shippingCertificate = null;
           this.imageUrl1 = null;
-          this.$message.error("上传失败");
+          // this.$message.error("上传失败");
         } else if (this.num == 2) {
           this.businessLicense = null;
           this.imageUrl2 = null;
-          this.$message.error("上传失败");
+          // this.$message.error("上传失败");
         } else if (this.num == 3) {
           this.businessLicense1 = null;
           this.imageUrl3 = null;
-          this.$message.error("上传失败");
+          // this.$message.error("上传失败");
         }
       }
     },
@@ -358,6 +358,9 @@ export default {
       justify-content: center;
       align-items: center;
       margin-right: 10px;
+      width: 40px;
+      position: relative;
+      left: 40px;
     }
     .input {
       width: 250px;
@@ -410,7 +413,7 @@ export default {
   }
   .site{
     position: relative;
-    left: 32px;
+    left: -50px;
   }
   span.text {
     position: relative;

src/views/RMS/components/showCarrier.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- 修改承运商信息 -->
   <div id="contractDetails">
-    <page-title>编辑</page-title>
+    <page-title>查看详情</page-title>
     <div class="main">
     </div>
     <div class="contractimage">

src/views/SporadicManage/components/oldAreaSporadic/inwardSporadicFactory/LeaveFactory.vue

@@ -61,6 +61,10 @@ export default {
           value: 14,
           label: "中转",
         },
+        {
+          value: 19,
+          label: "退货",
+        },
         ]
     };
   },

src/views/SporadicManage/components/oldAreaSporadic/inwardSporadicFactory/Load.vue

@@ -53,6 +53,10 @@ export default {
           value: 14,
           label: "中转",
         },
+        {
+          value: 19,
+          label: "退货",
+        },
         ]
     };
   },

src/views/SporadicManage/components/oldAreaSporadic/inwardSporadicFactory/enFactory.vue

@@ -61,6 +61,10 @@ export default {
           value: 14,
           label: "中转",
         },
+        {
+          value: 19,
+          label: "退货",
+        },
         ]
     };
   },

src/views/SporadicManage/components/oldAreaSporadic/inwardSporadicFactory/grossWeight.vue

@@ -54,6 +54,10 @@ export default {
           value: 14,
           label: "中转",
         },
+        {
+          value: 19,
+          label: "退货",
+        },
         ]
     };
   },

src/views/SporadicManage/components/oldAreaSporadic/inwardSporadicFactory/tareWeight.vue

@@ -54,6 +54,10 @@ export default {
           value: 14,
           label: "中转",
         },
+        {
+          value: 19,
+          label: "退货",
+        },
         ]
     };
   },

src/views/SporadicManage/components/oldAreaSporadic/inwardSporadicFactory/unload.vue

@@ -53,6 +53,10 @@ export default {
           value: 14,
           label: "中转",
         },
+        {
+          value: 19,
+          label: "退货",
+        },
         ]
     };
   },

src/views/SporadicManage/components/oldAreaSporadic/transportAppoint/addSporadicTransportAppoint.vue

@@ -98,6 +98,23 @@
         :inline="true"
         class="demo-form-inline"
         label-width="80px"
+      >
+        <el-form-item label="趟次">
+         <el-input
+          class="inline-input"
+          v-model="materialTimes"
+          placeholder="趟次-非必填"
+          :trigger-on-focus="false"
+          @input="onInputTimes()"
+          @blur="onblur()"
+        >
+        </el-input>
+        </el-form-item>
+        </el-form>
+        <el-form
+        :inline="true"
+        class="demo-form-inline"
+        label-width="80px"
       >
         <el-form-item label="选择物资">      
         </el-form-item>
@@ -282,6 +299,10 @@ export default {
         {
           value:14,
           label:'中转'
+        },
+        {
+          value:19,
+          label:'退货'
         }
       ],
       orderType:null,
@@ -400,6 +421,16 @@ export default {
         this.$message.warning('趟次请输入数字')
       }
     },
+    onblur(){
+      this.isMoreTrips = false
+      if(this.materaialTimes <= 0){
+        this.$message.warning('趟次必须大于0')
+        this.materialTimes = null
+      }
+      if(this.materialTimes > 1 ){
+        this.isMoreTrips = true
+      }
+    },
     onInputPriority(scope){
       if(!isNumber(scope)){
         this.$message.warning('装卸货次序请输入数字')
@@ -426,6 +457,9 @@ export default {
       if(this.orderType == 14){
         this.inputLine = "零星中转"
       }
+      if(this.orderType == 19){
+        this.inputLine = "退货"
+      }
     },
     drawTable(){
       this.materialOptions.requestUrl = "/api/v1/uc/selectAllMaterialName?apiId=395" +"&test=" + new Date()
@@ -517,7 +551,8 @@ export default {
             materialSpecification:e.materialSpecification,
             materialName:e.materialName,
             materialCode:e.materialCode,
-            materialId:e.materialId
+            materialId:e.materialId,
+            materialPriority:1
           }
           this.tableData.push(addmap)
         })
@@ -562,18 +597,12 @@ export default {
     },
     // 确认
     makeSure() {
-        let amOrder = {
-          supplierId:this.supplierId,
-          lineId:this.lineId,
-          carrierId: this.carrierId,
-          orderType:this.orderType,
-          receiveId: this.consigneeId,
-          userId:getCookie("orgCode"),
-          mapList: this.tableData,
-          isMoreTrips:Number(this.isMoreTrips)
+        if(this.isMoreTrips == false){
+          this.materialTimes = 1
+        }
+        if(Number(this.materialTimes) != 0){
+          this.isMoreTrips = true
         }
-        console.log(amOrder)
-        debugger
         this.disabled = true
         if(this.supplierId==null||this.lineId==null||this.consigneeId==null||this.carrierId==null){
           this.disabled = false
@@ -609,10 +638,13 @@ export default {
           orderType:this.orderType,
           receiveId: this.consigneeId,
           userId:getCookie("orgCode"),
+          orderTime:this.materialTimes,
           mapList: this.tableData,
           isMoreTrips:Number(this.isMoreTrips)
           
         };
+        console.log(amsOrder)
+        debugger
         this.axios.post("/api/v1/ams/addSporadicOrders", amsOrder).then((res) => {
           if (res.data.code == "200") {
             this.onClickCancel()

src/views/SporadicManage/router/index.js

@@ -44,7 +44,7 @@ import oldSporadicInwardTenfactory from '../components/oldAreaSporadic/inwardSpo
 import oldSporadicInwardGrossWeight from '../components/oldAreaSporadic/inwardSporadicFactory/grossWeight.vue'
 import oldSporadicInwardoutFactory from '../components/oldAreaSporadic/inwardSporadicFactory/LeaveFactory.vue'
 import oldSporadicInwardtareWeight from '../components/oldAreaSporadic/inwardSporadicFactory/tareWeight.vue'
-import oldSporadicInwardload from '../components/oldAreaSporadic/inwardSporadicFactory/tareWeight.vue'
+import oldSporadicInwardload from '../components/oldAreaSporadic/inwardSporadicFactory/Load.vue'
 import oldSporadicInwardUnload from '../components/oldAreaSporadic/inwardSporadicFactory/unload.vue'
 
 //钢材退货运输预约
@@ -177,7 +177,7 @@ const constantRouterMap = [
       {path:'oldSporadicInwardoutFactory',name:'oldSporadicInwardoutFactory',meta:{code:'xtpzgl-yhgl'},component:oldSporadicInwardoutFactory},
       {path:'oldSporadicInwardtareWeight',name:'oldSporadicInwardtareWeight',meta:{code:'xtpzgl-yhgl'},component:oldSporadicInwardtareWeight},
       {path:'oldSporadicInwardUnload',name:'oldSporadicInwardUnload',meta:{code:'xtpzgl-yhgl'},component:oldSporadicInwardUnload},
-
+      {path:'oldSporadicInwardload',name:'oldSporadicInwardload',meta:{code:'xtpzgl-yhgl'},component:oldSporadicInwardload},
     ]    
   }
 ];

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

@@ -565,7 +565,7 @@ export default {
               } 
             });
         })
-        .catch(() => {this.$message({ type: "info", message: "已取消删除",});});
+        .catch(() => {this.$message({ type: "info", message: "已取消",});});
     },
     //失焦事件后确定车牌号与承运商是否有绑定关系
     checkRelationship(index){
@@ -682,11 +682,16 @@ export default {
     makeSure(){
       //获取当前派车的数量和预估吨位的总和
       var sendCount = this.selectionList.length*this.uniteOrderPlanWeight;
-      //判断是否达到95%
-      var canDo = ((this.totalWeight+sendCount)/this.number).toFixed(2);
-      if(canDo>0.95){
-        var canSend = Math.floor(((this.number*0.95)-this.totalWeight)/this.uniteOrderPlanWeight);
+      //判断是否达到总重量减80吨的重量
+      var canDo = ((this.number-80)-(this.totalWeight+sendCount));
+      if(canDo<0&&this.number>=100){
+        var canSend = Math.floor(((this.number-80)-this.totalWeight)/this.uniteOrderPlanWeight);
+        if(canSend<0){
+          canSend = 0;
+        }
         this.$message.error('当前已派发吨数接近订单总吨数,最多还可派 ('+canSend+') 辆车!')
+      }else if(this.number<100&&this.totalWeight>20){
+        this.$message.error('当前可派发车数已用完!')
       }else{
         let state = false;
         var beReady = 0;
@@ -750,7 +755,7 @@ export default {
             this.cancel();
           }else{
             //若该销售订单的净重已达到97%!
-            this.$confirm("该销售订单的净重已达到97%! 是否仍然派车", "提示", {
+            this.$confirm("当前已派发吨数接近订单总吨数! 是否仍然派车", "提示", {
               confirmButtonText: "确定",
               cancelButtonText: "取消",
               type: "warning",

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

@@ -681,11 +681,16 @@ export default {
     makeSure(){
       //获取当前派车的数量和预估吨位的总和
       var sendCount = this.selectionList.length*this.uniteOrderPlanWeight;
-      //判断是否达到95%
-      var canDo = ((this.totalWeight+sendCount)/this.number).toFixed(2);
-      if(canDo>0.95){
-        var canSend = Math.floor(((this.number*0.95)-this.totalWeight)/this.uniteOrderPlanWeight);
+      //判断是否达到总重量减80吨的重量
+      var canDo = ((this.number-80)-(this.totalWeight+sendCount));
+      if(canDo<0&&this.number>=100){
+        var canSend = Math.floor(((this.number-80)-this.totalWeight)/this.uniteOrderPlanWeight);
+        if(canSend<0){
+          canSend = 0;
+        }
         this.$message.error('当前已派发吨数接近订单总吨数,最多还可派 ('+canSend+') 辆车!')
+      }else if(this.number<100&&this.totalWeight>20){
+        this.$message.error('当前可派发车数已用完!')
       }else{
         let state = false;
         var beReady = 0;
@@ -740,6 +745,7 @@ export default {
     },
     //发送请求
     sendRequest(beReady){
+      console.log("send");
       if(beReady==this.selectionList.length){
           this.axios.post('/api/v1/ams/dispatchTruckOrderBySale',{
           saleOrderId:this.$route.params.saleOrderId,
@@ -750,7 +756,7 @@ export default {
             this.cancel();
           }else{
             //若该销售订单的净重已达到97%!
-            this.$confirm("该销售订单的净重已达到97%! 是否仍然派车", "提示", {
+            this.$confirm("当前已派发吨数接近订单总吨数! 是否仍然派车", "提示", {
               confirmButtonText: "确定",
               cancelButtonText: "取消",
               type: "warning",
@@ -931,7 +937,7 @@ export default {
             if(res.data.data==null){
               this.receiveCarrierId = null;
               this.receiveCarrierName = null;
-              this.$message.warning('该收货单位尚未注册为承运商!')
+              this.$message.warning('该账号未注册为承运商!')
             }else{
               this.receiveCarrierId = res.data.data.carrierId;
               this.receiveCarrierName = res.data.data.carrierName;

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

@@ -1,10 +1,11 @@
 // 制定计划
 <template>
   <div class="inwardPlan">
+    
     <div class="sache">
       <el-input placeholder="请输入内容" v-model="inputText" clearable>
       </el-input>
-      <el-button type="primary" class="btn">
+      <el-button type="primary" class="btn" @click="bofang">
         <i class="el-icon-search"></i>查询
       </el-button>
       <el-badge :value="addPlanCount" class="item" v-if="activeName == 'second'">
@@ -17,7 +18,13 @@
         <i class="el-icon-plus"></i>制定计划
       </el-button>
       </el-badge>
-      
+      <!-- <audio 
+       id="audioId"
+       controls="controls"
+       preload="auto"
+       loop = "isloop"
+       src="/static/music/y682.mp3">
+      </audio> -->
       <el-button
         type="primary"
         class="btn"
@@ -26,6 +33,7 @@
       >
         <i class="el-icon-download"></i>下发
       </el-button>
+      
     </div>
     <template>
       <div>
@@ -219,6 +227,7 @@ 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"  
@@ -240,6 +249,16 @@ export default {
     start(){
         this.timer = setInterval(this.getAddPlan,60000)
     },
+    bofang(){
+      let obj = new Object();
+      obj = document.getElementById('audioId');
+      console.log(obj)
+      if(obj.paused){
+        obj.play()
+      }else{
+        obj.paused
+      }
+    },
     getRequirementMaterial(row) {
       // 记录重复点击次数
       if (this.oldRow === row) {