修改上传图片

build/utils.js

@@ -18,13 +18,13 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 
 
 
-// //  let devModules = ['all']
+// let devModules = ['index','inward','SporadicManage']
 // let devModules = ['index','inward']
 // let devModules = ['index','SporadicManage','RMS','statisticalReport']
 // let devModules = ['index','inward','statisticalReport']
 //  let devModules = ['index','WMS','sale','TMS','inward','SporadicManage']
-// let devModules = ['index','SporadicManage','TMS','statisticalReport','RMS'];
-let devModules = ['index','RMS'];
+let devModules = ['index','SporadicManage','appoint','TMS','statisticalReport','RMS'];
+// let devModules = ['index','RMS'];
 
 
 if (pathSrc.indexOf('node_modules') > -1) {

config/index.js

@@ -77,8 +77,8 @@ let proxyTable = {
     }
   },
   "/views/api/v1": {
-    target: "http://172.16.33.166:8080",
-    // target: "http://172.16.33.166:8080",
+    // target: "http://localhost:8080",
+     target: "http://172.16.33.166:8080",
     // target: "http://192.168.1.115:8080",
     ws: true,
     pathRewrite: {

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/app.js

@@ -20,7 +20,6 @@ import DilCommonUI from "@/components/DilCommonUI";
 Vue.use(DilCommonUI);
 
 import 'xe-utils' 
-
 import VXETable from 'vxe-table'
 import 'vxe-table/lib/style.css'
 Vue.use(VXETable)

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

@@ -219,7 +219,6 @@ export default {
     };
   },
   created(){
-      this.first.requestUrl = "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=1",
       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"  
@@ -227,17 +226,15 @@ export default {
   mounted(){
     this.getAddPlan()
     this.start()
-    
-    // this.getAddPlan()
   },
   beforeDestroy(){
     this.timer
   },
   methods: {
     getAddPlan(){
-        this.axios.post("/api/v1/ams/getTruckRequirementList?apiId=250&requirementStatus=2").then((res) =>{
-          console.log(res.data.data.list.length)
-          this.addPlanCount = res.data.data.list.length
+        this.axios.post("/api/v1/uc/getPlanCount").then((res) =>{
+          console.log(res.data)
+          this.addPlanCount = res.data
         })
     },
     start(){

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

@@ -46,7 +46,7 @@ export default {
     };
   }, 
   created(){
-          this.option.requestUrl = '/api/v1/tms/getInwardReport?apiId=452&startTime=null&endTime=null&i=' +new Date()
+          this.option.requestUrl = '/api/v1/tms/getInwardReport?apiId=459&startTime=null&endTime=null&i=' +new Date()
   },
   methods: {
     func(res){
@@ -61,7 +61,7 @@ export default {
         this.totalCapacity = currentCapacityTotal;
     },
     getRequestUrl(){
-        this.option.requestUrl = '/api/v1/tms/getInwardReport?apiId=452&startTime=null&endTime=null&i=' +new Date();
+        this.option.requestUrl = '/api/v1/tms/getInwardReport?apiId=459&startTime=null&endTime=null&i=' +new Date();
      
     },
     onclick() {
@@ -75,7 +75,7 @@ export default {
       }
       if(startTime && endTime){
         if(startTime < endTime){
-          this.option.requestUrl = '/api/v1/tms/getInwardReport?apiId=441' + "&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          this.option.requestUrl = '/api/v1/tms/getInwardReport?apiId=459' + "&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
         }else{
           this.startTime = null;
           this.endTime = null;