运力新增修改备注功能

build/utils.js

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

config/index.js

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

src/views/RMS/components/capacity.vue

@@ -29,13 +29,13 @@
       >
         <el-table-column fixed="right" label="操作" width="100">
           <template slot-scope="scope">
-            <!-- <el-button
+             <el-button
               type="text"
               size="small"
-              @click="updateCapacity(scope.row.capacityId)"
+              @click="updateCapacity(scope.row.capacityCarrierId)"
             >
-              修改
-            </el-button> -->
+              修改备注
+            </el-button> 
             <el-button
               type="text"
               size="small"
@@ -127,8 +127,9 @@ export default {
     toInsert1() {
       this.$router.push("/addOtherCapacity");
     },
-    updateCapacity(capacityId){
-      this.$router.push("/editCapacity/" + capacityId)
+    updateCapacity(capacityCarrierId){
+      // console.log("capacityCarrierId" +capacityCarrierId);
+      this.$router.push("/editCapacity/" + capacityCarrierId);
     },
     showCapacity(capacityId){
       this.$router.push("/showCapacity/" + capacityId)
@@ -137,6 +138,7 @@ export default {
       this.axios.delete("pass/v1/sysusers/" + userId) .then((res) => {
       });
     },
+    
     deleteCapacity(row) {
       console.log("row",row)
       let map = {

src/views/RMS/components/editCapacity.vue

@@ -1,16 +1,20 @@
 <template>
-  <!-- 修改运力信息 -->
-<div class="editCapacity">
-  <div id="contractDetails">
-    <page-title>编辑</page-title>
-    <div class="main">
-    </div>
-    <div class="contractTitle">
-      <div class="form_box" style="margin-right: 10rem">
-          <dil-form :formId="310" v-model="form1"></dil-form>
-      </div>
-    </div>
-<div class="elForm">
+   
+  <!-- 修改运力信息 -->
+  <div class="editCapacity">
+     
+    <div id="contractDetails">
+          <page-title>编辑</page-title>    
+      <div class="main">   </div>
+         
+      <div class="contractTitle">
+             
+        <div class="form_box" style="margin-right: 10rem">
+                    <dil-form :formId="380" v-model="form1"></dil-form>      
+        </div>
+           
+      </div>
+      <!-- <div class="elForm">
   <el-form
         :inline="true"
         class="demo-form-inline"
@@ -30,204 +34,186 @@
         </template>
         </el-autocomplete>
         </el-form-item>
-    </el-form>
-</div>
-    
-</div>
-    <div class="button_box">
-      <el-button type="primary" @click="onClickConfirm">确认</el-button>
-    </div>
-  </div>
-
+    </el-form> -->
+      <!-- </div> -->
+    </div>
+       
+    <div class="button_box">
+            <el-button type="primary" @click="onClickConfirm">确认</el-button>  
+       
+    </div>
+     
+  </div>
 </template>
 
 <script>
 import PageTitle from "@/components/Page/Title";
 import { getCookie } from "@/utils/util.js";
 export default {
-  components: { PageTitle },
-  data() {
-    return {
+  components: { PageTitle },
+  data() {
+    return {
       state: "",
-      userId:null,
+      userId: null,
       restaurants: [],
-      accessToken:null,
-      userCode:null,
-      carrierUserId:null,
-      carrierId:null,
-      carrierIds:null,
-      direction: 'rtl',
-      inputText:"",
-      form1: {},
-      carrierUserId:null,
-      carrierName:"",
-      options:{
-        requestUrl:"/api/v1/rms/getCarrierList?apiId=417",
-        selectionType:"radio",
-        mapList:[]
-      }
-    };
-  },
-  created(){
-      this.carrierUserId = getCookie("userId");
-      console.log(this.carrierUserId ,'carrierUserId')     
+      accessToken: null,
+      userCode: null,
+      carrierUserId: null,
+      carrierId: null,
+      capacityCarrierId:null,
+      carrierIds: null,
+      direction: "rtl",
+      inputText: "",
+      form1: {},
+      carrierUserId: null,
+      carrierName: "",
+      map:[],
+      options: {
+        requestUrl: "/api/v1/rms/getCarrierList?apiId=417",
+        selectionType: "radio",
+        mapList: [],
+      },
+    };
   },
+  // created(){
+  //     this.carrierUserId = getCookie("userId");
+  //     // console.log(this.carrierUserId ,'carrierUserId')
+  // },
   mounted() {
-   this.information();
-   this.axios.post(
-       "/api/v1/rms/getCarrierNameBySSOId?carrierSSOId=" + this.carrierUserId
-      )
-      .then((res) => {
-        if(res.data.code == "200"){
-        console.log(res.data.data)
-        this.state = res.data.data.carrierName
-        this.carrierIds = res.data.data.carrierId
-        }      
-  })},
-  methods: {
+    this.information();
+  },
+  //   mounted() {
+  //    this.information();
+  //    this.axios.post(
+  //        "/api/v1/rms/getCarrierNameBySSOId?carrierSSOId=" + this.carrierUserId
+  //       )
+  //       .then((res) => {
+  //         if(res.data.code == "200"){
+  //         console.log(res.data.data)
+  //         this.state = res.data.data.carrierName
+  //         this.carrierIds = res.data.data.carrierId
+  //         }
+  //   })},
+  methods: {
     //承运商弹出层
-    handleSelect(item){    
-      this.carrierIds = item.carrierId
-      item.carrierName = this.state
-    },
-    //以下是承运商边输边查搜索
-    querySearch(queryString, cb) {
-        this.axios.post('/api/v1/uc/getCarrierMesByLike?index='+queryString).then((res)=>{
-        if(res.data.code == "200"){
-          console.log(res.data.data)
-          var restaurants = res.data.data
-          console.log(restaurants,"restaurants");
-          var results = queryString ? restaurants.filter(this.createFilter(queryString)) :restaurants;
-           // 调用 callback 返回建议列表的数据
-          cb(results);
-        }
-        })     
-      },
-    createFilter(queryString) {
-        return (restaurants)  =>  {
-          return (restaurants.value.toLowerCase().indexOf(queryString.toLowerCase()) > -1);
-        };
-      },
-    //以上是承运商边输边查搜索
-    currentRadioChange(selection){
-      this.mapList=selection,
-      console.log(this.mapList)
-      this.carrierName=this.mapList.carrierName
-    },
-    onclick(){
-      this.options.requestUrl="/api/v1/rms/getCarrierList?apiId=417&con=" +this.inputText;
-    },
-    information() {
-      //编辑 
-    console.log(this.$route.params)            
-     
-      this.axios
-        .post(
-          "/api/v1/rms/getCapacityById/" +
-            this.$route.params.capacityId
-        )
-        .then((res) => {
-            console.log(res.data.data)
-          res.data.data.forEach((e) => {          
-            this.form1 = e;
-            console.log(e);
-            console.log(this.form1);
-            console.log( this.$route.params.capacityId);
-          }); 
-        this.axios
+    // handleSelect(item){
+    //   this.carrierIds = item.carrierId
+    //   item.carrierName = this.state
+    // },
+    // //以下是承运商边输边查搜索
+    // querySearch(queryString, cb) {
+    //     this.axios.post('/api/v1/uc/getCarrierMesByLike?index='+queryString).then((res)=>{
+    //     if(res.data.code == "200"){
+    //       console.log(res.data.data)
+    //       var restaurants = res.data.data
+    //       console.log(restaurants,"restaurants");
+    //       var results = queryString ? restaurants.filter(this.createFilter(queryString)) :restaurants;
+    //        // 调用 callback 返回建议列表的数据
+    //       cb(results);
+    //     }
+    //     })
+    //   },
+    // createFilter(queryString) {
+    //     return (restaurants)  =>  {
+    //       return (restaurants.value.toLowerCase().indexOf(queryString.toLowerCase()) > -1);
+    //     };
+    //   },
+    // //以上是承运商边输边查搜索
+    // currentRadioChange(selection){
+    //   this.mapList=selection,
+    //   // console.log(this.mapList)
+    //   this.carrierName=this.mapList.carrierName
+    // },
+    // onclick(){
+    //   this.options.requestUrl="/api/v1/rms/getCarrierList?apiId=417&con=" +this.inputText;
+    // },
+    information() {
+      //       //编辑
+      //     console.log(this.$route.params)
+      // console.log(this.$route.params)
+      this.axios
         .post(
-          "/api/v1/rms/getCarrierNameById/" +
-          this.$route.params.capacityId
+          "/api/v1/rms/getCapacityInfoById/" +
+            this.$route.params.capacityCarrierId
         )
         .then((res) => {
-          this.state=res.data.data.carrierName
-          console.log("carrierName",this.carrierName);
-        }); 
-        });
-    },
-    // 返回
-    onClickCancel() {
-      this.$router.go(-1);
-    },
-    // 确认
-    onClickConfirm() {
-      console.log(this.form1)
-       let RmsCapacity={
-         capacityId:this.form1.capacityId,
-         capacityTypeId:this.form1.capacityTypeId,
-         capacityNumber:this.form1.capacityNumber.toUpperCase(),
-         capacityCorlor:this.form1.capacityCorlor,
-         capacityOwneris:this.form1.capacityOwneris,
-         capacityVip:this.form1.capacityVip,
-         capacityBlacklist:this.form1.capacityBlacklist,
-         carrierId:this.carrierIds,
-       };if(
-         RmsCapacity.capacityNumber==null ||
-         RmsCapacity.capacityCorlor==null ||
-         RmsCapacity.capacityOwneris==null ||
-         RmsCapacity.capacityVip==null ||
-         RmsCapacity.capacityBlacklist==null 
-         //RmsCapacity.carrierId==null
-       )this.$message.error("存在空值！");  
-        console.log( this.$route.params.capacityId);
-        this.axios
-          .post(
-            "/api/v1/rms/updateCapacity",
-           RmsCapacity
-          )
-          .then((res) => {
-            if (res.data.code == "200") {
-              this.$message.success("修改成功")
-              this.$router.go(-1);           
-            }
-          });
-    },
-  },
+          console.log(res);
+          res.data.data.forEach((e) => {
+            console.log("from", this.form1);
+            this.form1 = e;
+          });
+        });
+    }, // 返回
+    onClickCancel() {
+      this.$router.go(-1);
+    }, // 确认
+    onClickConfirm() {
+      console.log(this.form1);
+      let map = {
+        remark: this.form1.remark,
+        userDep:this.form1.userDep,
+        capacityCarrierId:this.$route.params.capacityCarrierId 
+      };
+      if (
+        map.remark == null ||
+        map.userDep == null 
+      )
+        this.$message.error("不能存在空值");
+      this.axios.post("/api/v1/rms/updateCapacity", map).then((res) => {
+        if (res.data.code == "200") {
+          this.$message.success("修改成功");
+          this.$router.go(-1);
+        }else{
+          this.$message.success("修改失败");
+          this.$router.go(-1);
+        }
+      });
+    },
+  },
 };
 </script>
 <style lang='scss' scoped>
-.editCapacity{
-    .elForm{
-      margin-left: 40%;
-    }
-    .form_box {
+.editCapacity {
+  .elForm {
+    margin-left: 40%;
+  }
+  .form_box {
     width: 100%;
     margin-top: 30px;
     display: flex;
     justify-content: center;
-    .el-form-item{
+    .el-form-item {
       display: flex;
       justify-content: center;
-      .el-form-item__label{
+      .el-form-item__label {
         display: flex;
         align-items: center;
       }
-      .el-form-item__content{
-         .el-select{
-            width: 250px;
-          }
-          .el-input{
-            width: 250px;
-          }
+      .el-form-item__content {
+        .el-select {
+          width: 250px;
+        }
+        .el-input {
+          width: 250px;
+        }
       }
     }
- }
- .button_box{
+  }
+  .button_box {
     display: flex;
     justify-content: center;
-    .el-button{
+    .el-button {
       width: 80px;
       margin-right: 10px;
     }
- }
- .disableBox{
-  display: flex;
-  text-align: center;
-  align-items: center;
-  justify-content: center;
-  margin-top: 1.5rem;
-  margin-bottom: 1.25rem;
-}
+  }
+  .disableBox {
+    display: flex;
+    text-align: center;
+    align-items: center;
+    justify-content: center;
+    margin-top: 1.5rem;
+    margin-bottom: 1.25rem;
+  }
 }
- 
 </style>

src/views/RMS/router/index.js

@@ -87,7 +87,7 @@ const constantRouterMap = [
 		{path: 'capacity', name: 'capacity', meta: {code: 'xtpzgl-yhgl'}, component: capacity},
 		{path: 'carDriver', name: 'carDriver', meta: {code: 'xtpzgl-yhgl'}, component: carDriver},
 		{path: 'carrier', name: 'carrier', meta: {code: 'xtpzgl-yhgl'}, component: carrier},  
-		{path: 'editCapacity/:capacityId', name: 'editCapacity', meta: {code: 'xtpzgl-yhgl'}, component: editCapacity},
+		{path: 'editCapacity/:capacityCarrierId', name: 'editCapacity', meta: {code: 'xtpzgl-yhgl'}, component: editCapacity},
 		{path: 'editCarDriver/:driverId', name: 'editCarDriver', meta: {code: 'xtpzgl-yhgl'}, component: editCarDriver},
 		{path: 'editCarrier/:carrierId', name: 'editCarrier', meta: {code: 'xtpzgl-yhgl'}, component: editCarrier},
 		{path: 'showCarrier/:carrierId', name: 'showCarrier', meta: {code: 'xtpzgl-yhgl'}, component: showCarrier},

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

@@ -195,7 +195,7 @@ export default {
         getCookie("userId");
     } else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
       this.second.requestUrl =
-        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null + "&con="+"物流储运中心";
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null + "&indexText="+"物流储运中心";
     }else {
       this.second.requestUrl =
         "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null
@@ -212,7 +212,7 @@ export default {
         getCookie("userId") + "&i=" + new Date();
     } else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
       this.second.requestUrl =
-        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null + "&con="+"物流储运中心" + "&i=" + new Date();
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null + "&indexText="+"物流储运中心" + "&i=" + new Date();
     }else {
       this.second.requestUrl =
         "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null + "&i=" + new Date();

src/views/sale/components/transport_order/saleSteelOrder.vue

@@ -276,8 +276,8 @@ export default {
       this.option2.requestUrl =
         "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=6&shipperId=1&carrierSsoId=" +
         getCookie("userId") +
-        "&t=" +
-        new Date();
+        "&t=";
+      new Date();
       this.option3.requestUrl =
         "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=4&shipperId=1&carrierSsoId=" +
         getCookie("userId") +

src/views/statisticalReport/components/sporadicReport/inwardSporadicReport.vue

@@ -52,7 +52,6 @@ export default {
   },
   methods: {
     func(res){
-        // console.log(res)
         var resultNetWeightTotalFirst = 0
         var resultNetWeightTotalSecond = 0
         var currentCapacityTotal = 0