tj

build/utils.js

@@ -17,6 +17,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow']
 
  let devModules = ['all']
+// let devModules = ['index','inward']
 //  let devModules = ['index','WMS','sale','TMS','inward','SporadicManage']
 // let devModules = ['index','SporadicManage','TMS','statisticalReport','RMS'];
 // let devModules = ['index','appoint','WMS'];

config/index.js

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

src/views/RMS/app.js

@@ -25,6 +25,10 @@ Vue.use(VueApollo)
 import DilCommonUI from "@/components/DilCommonUI";
 Vue.use(DilCommonUI);
 
+// 导出Excel全局组件
+import tableToExcel from '@/components/exportExcel/exportExcel'
+Vue.use(tableToExcel)
+
 const apolloProvider = new VueApollo({
     defaultClient: apollo
 })

src/views/RMS/components/capacity.vue

@@ -13,9 +13,11 @@
        <el-button type="primary" class="btn" @click="toInsert">
         <i class="el-icon-plus"></i>新增
       </el-button>
+      <el-button type="primary" @click="exportData()"><i class="el-icon-download"></i>导出(Excel)</el-button>
     </div>
     <div class="table">
-      <dilTable 
+      <dilTable
+        ref="excelDom"
         v-bind.sync="options"
         :loading="tableloading"
         @func="func"

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

@@ -114,6 +114,24 @@ 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();;
+    }
+    },
     onclick() {
       if (this.activeName == "first") {
         //判断是否是承运商
@@ -159,9 +177,7 @@ export default {
           type: "success",
           message: "下发成功!",
         });
-        this.option1.requestUrl =
-          "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=1&i=" +
-          new Date();
+        this.getRequestUrl()
       });
     },
     // 下发
@@ -181,9 +197,7 @@ export default {
               type: "success",
               message: "下发成功!",
             });
-            this.option1.requestUrl =
-              "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=1&i=" +
-              new Date();
+            this.getRequestUrl()
           });
         })
         .catch(() => {
@@ -212,7 +226,7 @@ export default {
               capacityNumber: capacityNumber,
             })
             .then(() => {
-              this.$router.go(0);
+              this.getRequestUrl()
             });
         })
         .catch(() => {

src/views/TMS/components/importedIngredients/transportReserveFuAddIngredients.vue

@@ -338,7 +338,7 @@ export default {
     drawer(val) {
       if (val) {
         this.input = null;
-      }
+      }   
     },
     value() {
       if (this.value) {
@@ -521,13 +521,8 @@ export default {
       this.isKuang = false;
     },
     refreshTable(){
-        var arr = this.selectionList
-        this.selectionList = []
-   
     },
     ondrawer(num) {
-      this.truckList = this.selectionList
-      this.selectionList = []
       if(this.supplierId == null){
           this.$message.warning("请先选择发货单位")
           return
@@ -603,6 +598,20 @@ export default {
     },
     currentRadioChange3(selection) {
       this.selectionList = selection;
+      console.log(selection)
+      selection.forEach((e) => {
+            var addmap = {
+              orderMaterialWeight:e.orderMaterialWeight,
+              carrierName:e.carrierName,
+              capacityNumber:e.capacityNumber,
+              remark:e.remark,
+              carrierId:e.carrierId,
+              capacityId:e.capacityId
+            };
+            this.selectionList.push(addmap)
+            console.log(this.selectionList)
+      })
+      this.truckList = selection
     },
     // 确认
     onClickConfirm() {

src/views/TMS/components/purchaseChemicalMaterials/transportationReservation.vue

@@ -123,6 +123,16 @@ export default {
     }
   },
   methods: {
+    getRequestUrl(){
+       //判断是否是承运商
+    if (getCookie("orgCode") == "chengyunshang") {
+      this.option1.requestUrl = "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=2&carrierSSOId=" + getCookie("userId") + "&i=" + new Date();
+      this.option2.requestUrl = "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=2&carrierSSOId=" + getCookie("userId") + "&i=" + new Date();
+    } else {
+      this.option1.requestUrl = "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=2&carrierSSOId=" + null + "&i=" + new Date();
+      this.option2.requestUrl = "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=2&carrierSSOId=" + null + "&i=" + new Date();
+    }
+    },
     onclick() {
       if (this.activeName == "first") {
         //判断是否是承运商
@@ -152,9 +162,7 @@ export default {
           type: "success",
           message: "下发成功!",
         });
-        this.option1.requestUrl =
-          "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=2&i=" +
-          new Date();
+        this.getRequestUrl()
       });
     },
     // 下发
@@ -174,9 +182,7 @@ export default {
               type: "success",
               message: "下发成功!",
             });
-            this.option1.requestUrl =
-              "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=2&i=" +
-              new Date();
+            this.getRequestUrl()
           });
         })
         .catch(() => {
@@ -205,7 +211,7 @@ export default {
               capacityNumber: capacityNumber,
             })
             .then(() => {
-              this.$router.go(0);
+              this.getRequestUrl()
             });
         })
         .catch(() => {

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

@@ -305,7 +305,6 @@ export default {
     // 确认
     onClickConfirm() {
       console.log(this.purchaseOrgLable,this.materialName,this.supplierName,this.purchaseOrderNo,this.unloadPointName,this.stateCarrier)
-      debugger
       this.disabled = true
       var state = 0;
       if (

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

@@ -112,7 +112,7 @@
           <template slot-scope="scope">
             <template v-if="item.slot">
                 <!-- 装货点 -->
-               <template v-if="item.prop == 'requirementPlatformName'">
+               <template v-if="item.prop == 'requirementPlatformName'" style="width:400px">
                 <el-input
                   class="textinput"
                   v-model="scope.row.requirementPlatformName"
@@ -236,7 +236,7 @@
       </el-drawer>
     </div>
     <div class="button-box">
-      <el-button type="primary" @click="makeSure">确认新增</el-button>
+      <el-button type="primary" @click="makeSure" :disabled = "disabled">确认新增</el-button>
       <el-button type="primary" @click="cancel">返回</el-button>
     </div>
   </div>
@@ -314,7 +314,7 @@ export default {
         mapList1: []
       },
       second1: {
-        requestUrl: "/api/v1/uc/getUnloadingMesByLike?apiId=374",
+        requestUrl: "",
         selectionType: "radio",
         mapList2: []
       },
@@ -355,6 +355,9 @@ export default {
       this.shipperId = item.shipperId
       this.requireUnitName = item.shipperName 
     },
+    getUnloadRequestUrl(){
+      this.second1.requestUrl = "/api/v1/uc/getUnloadingMesByLike?apiId=374&i=" + new Date()
+    },
     //以下是用车单位边输边查搜索
     querySearchCarrier(queryString, cb) {
         this.axios.post('/api/v1/uc/getRequireUnitName?index='+queryString).then((res)=>{
@@ -378,16 +381,16 @@ export default {
       this.selectionList1 = selection;
     },
     unloadPoint(index) {
-      // console.log(index)
+      this.getUnloadRequestUrl()
       this.index= index
       this.a = 3
-      this.drawer = true;
+      this.drawer = true; 
     },
     loadPoint(index) {
-      // console.log(index)
+      this.getUnloadRequestUrl()
       this.index = index
       this.a = 4
-      this.drawer = true;
+      this.drawer = true; 
     },
     //以上是用车单位边输边查搜索
     ondrawer(num) {   
@@ -496,22 +499,28 @@ export default {
     },
     // 新增
     makeSure() {
+      this.disabled = true
       if(this.shipperId == null){
         this.$message.error("请选择用车单位")
+        this.disabled = false
         return
       }if(typeof(this.form.requirementTruckTime) == 'undefined'){
         this.$message.error("请输入用车时间")
+        this.disabled = false
         return
       }if(typeof(this.form.requirementType) == 'undefined'){
         this.$message.error("请选择需求类型")
+        this.disabled = false
         return
       }if(this.tableData.length == 0){
         this.$message.error("请点击浏览选择物资")
+        this.disabled = false
         return
       }if(typeof(this.form.requirementOverlimit) != 'undefined'){
         console.log((typeof(this.form.remark) == 'undefined'))
         if((typeof(this.form.remark) == 'undefined')){
           this.$message.error("请填写超限备注")
+          this.disabled = false
           return
         }
       }
@@ -523,6 +532,7 @@ export default {
       })
       if(i==0){
          this.$message.error("请选择装卸点")
+         this.disabled = false
          return
       }
       // console.log(this.tableData)
@@ -558,6 +568,7 @@ export default {
             this.$router.go(-1);
           } else {
             this.$message.error("新增失败！");
+            this.disabled = false
           }
         });
     },

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

@@ -416,6 +416,7 @@ export default {
                   message: "删除成功!",
                 });
                 this.getRequestUrl()
+                this.getAddPlan()
               } else {
                 this.$message({
                   message: "删除失败",
@@ -453,6 +454,7 @@ export default {
                   message: "下发成功!",
                 });
                 this.getRequestUrl()
+                this.getAddPlan()
                 this.activeName = 'third'
               } else {
                 this.$message({

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

@@ -107,7 +107,7 @@
           </vxe-column>
 		</vxe-table>
 		<div class="button-box">
-			<el-button type="primary" @click="makeSure">确认分解</el-button>
+			<el-button type="primary" @click="makeSure" :disabled = "disabled">确认分解</el-button>
 			<el-button type="primary" @click="cancel">返回</el-button>
 		</div>
 	</div>
@@ -122,6 +122,7 @@ export default {
   },
   data() {
     return {
+      disabled:false,
       truckText:null,
       shiyHeigth:140,
       isHeigth:true,
@@ -188,13 +189,35 @@ export default {
     };
   },
   created(){
-    this.userCarrierId = getCookie("userId")
-    this.second.requestUrl = "/api/v1/oms/getCapacityAndDriverList?apiId=246"
+      if (getCookie("orgCode") == "chengyunshang") {
+      this.second.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
+        getCookie("userId");
+    } else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
+      this.second.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" + null + "&con="+"物流储运中心";
+    }else {
+      this.second.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" + null
+    }
   },
   mounted(){
       this.information()
   },
   methods: {
+    getInwardRequestUrl(){
+      if (getCookie("orgCode") == "chengyunshang") {
+      this.second.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
+        getCookie("userId") + "&i=" + new Date();
+    } else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
+      this.second.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" + null + "&con="+"物流储运中心" + "&i=" + new Date();
+    }else {
+      this.second.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" + null + "&i=" + new Date();
+    }
+    },
     getRequirementMaterial(row) {
       // 记录重复点击次数
       if (this.oldRow === row) {
@@ -226,10 +249,10 @@ export default {
         this.tableData1 = res.data.data
       })
     },
-    drawerCapacity(){ 
+    drawerCapacity(){
+      this.getInwardRequestUrl()
       this.drawer = true;
-      //重新初始化
-      this.second.requestUrl = "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null + "&i=" + new Date();
+      //重新初始化  
     },
     onConfirm(){
       console.log(this.mapList1)
@@ -244,7 +267,6 @@ export default {
       this.linedrawer = true
     },
     onclick(){
-      console.log(this.truckText,"truckText")
       if(this.truckText != null){
         this.second.requestUrl = "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId="+this.input +"&carrierId=" + getCookie('userId') + "&index=" + this.truckText;
       }else{
@@ -309,9 +331,11 @@ export default {
             },
     // 修改
     makeSure() {
+      this.disabled = true
       for(var i=0;i<this.$refs.xTable.getInsertRecords().length;i++){
         if(this.$refs.xTable.getInsertRecords()[i].capacityNumber == null){
           this.$alert('未选择车牌，请选择车牌')
+          this.disabled = false
           return
         }     
       }
@@ -333,6 +357,7 @@ export default {
             
           } else {
             this.$message.error("分解失败！");
+            this.disabled = false
           }
         });
     },

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

@@ -151,10 +151,15 @@ export default {
     };
   },
   created(){
-      this.carrierId = getCookie('userId')
-      this.first.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=1"
-      this.second.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=2"
-      this.third.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=3"
+      if(getCookie("orgCode") == "chengyunshang"){
+        this.first.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=1&carrierId=" + getCookie("userId")
+        this.second.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=2&carrierId=" + getCookie("userId")
+        this.third.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=3&carrierId=" + getCookie("userId")
+      }else{
+        this.first.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=1"
+        this.second.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=2"
+        this.third.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=3"
+      } 
   },
   methods: {
     getRequirementMaterial(row) {
@@ -242,9 +247,15 @@ export default {
       this.getRequirementMaterial()
     },
     getRequestUrl(){
-      this.first.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=1&i=" + new Date()
-      this.second.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=2&i="  + new Date()
-      this.third.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=3&i=" + new Date()
+      if(getCookie("orgCode") == "chengyunshang"){
+        this.first.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=1&carrierId=" + getCookie("userId") + "&i=" + new Date()
+        this.second.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=2&carrierId=" + getCookie("userId") + "&i=" + new Date()
+        this.third.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=3&carrierId=" + getCookie("userId") + "&i=" + new Date()
+      }else{
+        this.first.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=1" + "&i=" + new Date()
+        this.second.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=2" + "&i=" + new Date()
+        this.third.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=3" + "&i=" + new Date()
+      } 
     },
     receiver(scope) {
       this.$confirm("是否接收", "提示", {