sdfh

build/utils.js

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

config/index.js

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

src/views/RMS/components/editCapacity.vue

@@ -159,6 +159,7 @@ export default {
         map.userDep == null 
       )
         this.$message.error("不能存在空值");
+        else
       this.axios.post("/api/v1/rms/updateCapacity", map).then((res) => {
         if (res.data.code == "200") {
           this.$message.success("修改成功");

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

@@ -0,0 +1,98 @@
+//查看运输订单
+<template>
+  <div class="transportOrder">
+    <template>
+      <div>
+        <el-tabs v-model="activeName" @tab-click="handleClick">
+          <el-tab-pane label="待接收" name="first">
+            <dilTable v-bind.sync="first" ref="table"> </dilTable>
+          </el-tab-pane>
+          <el-tab-pane label="已接收" name="second">
+            <dilTable v-bind.sync="second" ref="table"> </dilTable>
+          </el-tab-pane>
+          <el-tab-pane label="已完成" name="third">
+            <dilTable v-bind.sync="third" ref="table"> </dilTable>
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+    </template>
+    <div class="sache">
+      <el-button type="primary" class="btn" @click="cancel"> 返回 </el-button>
+    </div>
+  </div>
+</template>
+<script>
+import { getCookie } from "@/utils/util.js";
+export default {
+  data() {
+    return {
+      inputText: "",
+      truckInput: null,
+      userCarrierId: "",
+      first: {
+        //
+        requestUrl: "",
+      },
+
+      activeName: "first",
+      second: {
+        requestUrl: "",
+      },
+      third: {
+        requestUrl: "",
+      },
+    };
+  },
+  created() {
+    this.first.requestUrl =
+      "/api/v1/oms/getTransportOrder?apiId=485&orderStatus=4" +
+      "&orderId=" +
+      this.$route.params.orderId;
+    this.second.requestUrl =
+      "/api/v1/oms/getTransportOrder?apiId=485&orderStatus=5" +
+      "&orderId=" +
+      this.$route.params.orderId;
+    this.third.requestUrl =
+      "/api/v1/oms/getTransportOrder?apiId=485&orderStatus=2" +
+      "&orderId=" +
+      this.$route.params.orderId;
+  },
+  methods: {
+    getRequest() {
+      this.first.requestUrl =
+        "/api/v1/oms/getTransportOrder?apiId=485&orderStatus=4" +
+        "&i=" +
+        new Date() +
+        "&orderId=" +
+        this.$route.params.orderId;
+      this.second.requestUrl =
+        "/api/v1/oms/getTransportOrder?apiId=485&orderStatus=5" +
+        "&i=" +
+        new Date() +
+        "&orderId=" +
+        this.$route.params.orderId;
+      this.third.requestUrl =
+        "/api/v1/oms/getTransportOrder?apiId=485&orderStatus=2" +
+        "&i=" +
+        new Date() +
+        "&orderId=" +
+        this.$route.params.orderId;
+    },
+    cancel() {
+      this.$router.go(-1);
+    },
+    handleClick() {
+      this.getRequest();
+    },
+  },
+};
+</script>
+<style lang="scss">
+.transportOrder {
+  margin-top: 20px;
+  margin-left: 20px;
+   .sache{
+       margin-left: 650px;
+   }
+}
+</style>

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

@@ -40,29 +40,35 @@
         <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%" destroy-on-close="true">
+      <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>
+       <div>
+        <el-checkbox
+          v-if="activeName == 'second'"
+          @change="checkout" v-model="checked"
+          >是否关闭该采购订单订单下未接收的运输订单</el-checkbox
+        >
       </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>
@@ -111,7 +117,22 @@
       </el-tab-pane>
       <!-- 已下发 -->
       <el-tab-pane label="已下发" name="second">
-        <dilTable v-bind.sync="option2" @func="func"> </dilTable>
+        <dilTable v-bind.sync="option2" @func="func">
+           
+          <el-table-column fixed="right" label="操作" width="80">
+                           
+            <template slot-scope="scope">
+                               <el-button
+                type="text"
+                size="mini"
+                @click="getTransportReserveOrder(scope)"
+                >运单</el-button
+              >
+                             
+            </template>
+                         
+          </el-table-column>
+        </dilTable>
       </el-tab-pane>
     </el-tabs>
   </div>
@@ -126,6 +147,10 @@ export default {
       input: "",
       Time: "",
       activeName: "first",
+      checked: {
+        type: Boolean,
+        default: false
+      },
       option1: {
         // 表格请求数据的地址
         requestUrl: "",
@@ -137,11 +162,12 @@ export default {
         requestUrl: "",
       },
       purOrderList: [],
-      isMoreTrips:null,
+      isMoreTrips: null,
       dialogVisible: false,
       materialName: null,
       supplierName: null,
-      inputPurOrder:null,
+      inputPurOrder: null,
+      deleteNoReceiveOrder: null,
     };
   },
   created() {
@@ -163,23 +189,31 @@ export default {
     }
   },
   methods: {
-    getRequestUrl(){
-         //判断是否是承运商
-    if (getCookie("orgCode") == "chengyunshang") {
-      this.option1.requestUrl =
-        "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=1&carrierSSOId=" +
-        getCookie("userId") + "&i=" + new Date();
-      this.option2.requestUrl =
-        "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=1&carrierSSOId=" +
-        getCookie("userId") + "&i=" + new Date();;
-    } else {
-      this.option1.requestUrl =
-        "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=1&carrierSSOId=" +
-        null + "&i=" + new Date();;
-      this.option2.requestUrl =
-        "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=1&carrierSSOId=" +
-        null + "&i=" + new Date();;
-    }
+    getRequestUrl() {
+      //判断是否是承运商
+      if (getCookie("orgCode") == "chengyunshang") {
+        this.option1.requestUrl =
+          "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=1&carrierSSOId=" +
+          getCookie("userId") +
+          "&i=" +
+          new Date();
+        this.option2.requestUrl =
+          "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=1&carrierSSOId=" +
+          getCookie("userId") +
+          "&i=" +
+          new Date();
+      } else {
+        this.option1.requestUrl =
+          "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=1&carrierSSOId=" +
+          null +
+          "&i=" +
+          new Date();
+        this.option2.requestUrl =
+          "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=1&carrierSSOId=" +
+          null +
+          "&i=" +
+          new Date();
+      }
     },
     onclick() {
       if (this.activeName == "first") {
@@ -215,30 +249,47 @@ export default {
       }
     },
     closePurOrder() {
-      if(this.inputPurOrder == null){
-        this.$message.warning("请输入需要关闭一车多趟的采购订单号")
-        return
+      if (this.inputPurOrder == null) {
+        this.$message.warning("请输入需要关闭一车多趟的采购订单号");
+        return;
       }
       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;
         }
       });
-      console.log(this.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
+
+    getTransportReserveOrder(scope) {
+      this.$router.push("/getTransportOrder/" + scope.row.orderId);
+    },
+    checkout() {
+      this.deleteNoReceiveOrder = "yes";
+    },
+    closePurOrder1() {
+      this.axios
+        .post(
+          "/api/v1/bp/closePurOrderMoreTrips?purchaseOrderNo=" +
+            this.inputPurOrder +
+            "&deleteNoReceiveOrder=" +
+            this.deleteNoReceiveOrder
+        )
+        .then((res) => {
+          // console.log(res);
+          if (res.data.code == "200") {
+            this.$message.success("关闭成功");
+            this.checked=false;
+            this.getRequestUrl();
+          } else {
+            this.$message.error(res.data.data);
+            this.checked=false;
+          }
+        });
+      this.dialogVisible = false;
+  
     },
     func(res) {
       this.purOrderList = res.list;
@@ -256,7 +307,7 @@ export default {
           type: "success",
           message: "下发成功!",
         });
-        this.getRequestUrl()
+        this.getRequestUrl();
       });
     },
     // 下发
@@ -276,7 +327,7 @@ export default {
               type: "success",
               message: "下发成功!",
             });
-            this.getRequestUrl()
+            this.getRequestUrl();
           });
         })
         .catch(() => {
@@ -305,7 +356,7 @@ export default {
               capacityNumber: capacityNumber,
             })
             .then(() => {
-              this.getRequestUrl()
+              this.getRequestUrl();
             });
         })
         .catch(() => {

src/views/TMS/router/index.js

@@ -101,6 +101,7 @@ import truckQualityFuResultEdit from '../components/importedIngredients/truckQua
 import truckReceiptFuResult from '../components/importedIngredients/truckReceiptFuResult.vue'
 import truckReturnResult from '../components/importedIngredients/truckReturnResult.vue'
 import truckUnloadFuResult from '../components/importedIngredients/truckUnloadFuResult.vue'
+import getTransportOrder from '../components/importedFuel/getTransportOrder.vue'
 
 
 
@@ -409,6 +410,7 @@ const constantRouterMap = [
       {path: 'mineralOutfactory', name: 'mineralOutfactory', meta: {code: 'xtpzgl-jggl'}, component: mineralOutfactory},
       {path: 'mineralEnfactory', name: 'mineralEnfactory', meta: {code: 'xtpzgl-jggl'}, component: mineralEnfactory},      
       {path: 'mineralQuality', name: 'mineralQuality', meta: {code: 'xtpzgl-jggl'}, component: mineralQuality},
+      {path: 'getTransportOrder/:orderId', name: 'getTransportOrder', meta: {code: 'xtpzgl-jggl'}, component: getTransportOrder},
     ]
   }
 ];

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

@@ -250,7 +250,7 @@ export default {
       this.truck.requestUrl =
         "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=929059510763524096" +
         "&con=" +
-        "铁专线精煤";
+        "精煤";
       this.line.requestUrl =
         "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3" +
         "&con=" +
@@ -370,7 +370,7 @@ export default {
           this.truck.requestUrl =
             "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=929059510763524096" +
             "&con=" +
-            "铁专线精煤";
+            "精煤";
         } else {
           this.truck.requestUrl =
             "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +

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

@@ -454,12 +454,16 @@ export default {
           that.endPointName = result.regeocode.formattedAddress;
           setInterval(
             that.initCustomMarkes(
-              that.carNumber + "(" + that.listPath[0].miled + ")",
+              that.carNumber ,
               "起点：" +
                 that.startPointName +
                 "<br/>" +
                 "终点：" +
-                that.endPointName,
+                that.endPointName+
+                "<br/>" +
+                "距离：" +
+                that.listPath[0].miled
+                ,
               lnglatXY[0],
               lnglatXY[1]
             )
@@ -569,10 +573,10 @@ export default {
       let that = this;
       //自定义窗体内容
       var content = [
-        "<div  style='top:1px;width: 180px; background-color: rgba(0, 0, 0, 1);' ><font color='white'>" +
+        "<div  style='top:1px;width: 180px; background-color:  rgba(22, 160, 133, 1);' ><font color='white'>" +
           title +
           "</font>",
-        "<div style='background-color:rgba(255, 255, 255, 0.5);'><font color='white'>" +
+        "<div style='background-color:rgba(22, 160, 133, 1);'><font color='white'>" +
           details +
           "</font></div></div>"
       ];

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

@@ -120,10 +120,10 @@ export default {
       let that = this;
       //自定义窗体内容
       var content = [
-        "<div  style='top:1px;width: 180px; background-color: rgba(0, 0, 0, 1);' ><font color='white'>" +
+        "<div  style='top:1px;width: 180px; background-color:rgba(22, 160, 133, 1);' ><font color='white'>" +
           title +
           "</font>",
-        "<div style='background-color:rgba(255, 255, 255, 0.5);'><font color='white'>" +
+        "<div style='background-color:rgba(22, 160, 133, 1);'><font color='white'>" +
           details +
           "</font></div></div>"
       ];

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

@@ -470,7 +470,7 @@ export default {
             that.geocoder.getAddress(lnglatXY, function(status, result) {
                 if (status === 'complete' && result.info === 'OK') {
                     that.currentPointName = result.regeocode.formattedAddress;
-                    that.initCustomMarkes(that.capacityNumber+"("+that.listPath[0].miled+")",that.currentPointName,lnglatXY[0],lnglatXY[1])
+                    that.initCustomMarkes(that.capacityNumber,"位置："+that.currentPointName+"<br/>"+"距离："+that.listPath[0].miled,lnglatXY[0],lnglatXY[1])
                 }
             });  
         },
@@ -502,8 +502,8 @@ export default {
              let that=this;
             //自定义窗体内容
             var content = [
-                "<div  style='top:1px;width: 180px; background-color: rgba(0, 0, 0, 1);' ><font color='white'>"+title+"</font>",
-                "<div style='background-color:rgba(255, 255, 255, 0.5);'><font color='white'>"+details+"</font></div></div>"
+                "<div  style='top:1px;width: 180px; background-color: rgba(22, 160, 133, 1);' ><font color='white'>"+title+"</font>",
+                "<div style='background-color:(22, 160, 133, 1); ;'><font color='white'>"+details+"</font></div></div>"
             ];
             // 创建 infoWindow 实例	
             var infoWindow = new AMap.InfoWindow({
@@ -684,7 +684,7 @@ export default {
 }
 .driving_information2 {
     position: relative;
-    top: 50px;
+    top: 70px;
 }
 .driving_information3 {
     position: absolute;z-index:99;top:0;left:0;

src/views/sale/components/transport_excute/tms-offsite/arrivalResult.vue

@@ -140,6 +140,7 @@ export default {
       srcList: [],
       dataColumnData: [],
       columnData: [],
+      srcList: [],
       src: "",
       isShow: false,
       input: "",

src/views/statisticalReport/components/purchasFuelMonitor/purchasFuelNewMonitor.vue

@@ -5,14 +5,14 @@
       <span>计毛时间：</span>
       <el-date-picker
         v-model="startTime"
-        type="date"
+        type="datetime"
         placeholder="选择日期"
       >
       </el-date-picker>
       <span>至</span>
       <el-date-picker
         v-model="endTime"
-        type="date"
+        type="datetime"
         placeholder="选择日期"
       >
       </el-date-picker>

src/views/statisticalReport/components/purchasFuelMonitor/purchasFuelOldMonitor.vue

@@ -5,14 +5,14 @@
       <span>计毛时间：</span>
       <el-date-picker
         v-model="startTime"
-        type="date"
+        type="datetime"
         placeholder="选择日期"
       >
       </el-date-picker>
       <span>至</span>
       <el-date-picker
         v-model="endTime"
-        type="date"
+        type="datetime"
         placeholder="选择日期"
       >
       </el-date-picker>