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

src/views/RMS/components/editTruckCalculate.vue

@@ -71,7 +71,7 @@ export default {
       inputText:"",
       option1:{
         // first请求数据的地址
-        requestUrl: "/api/v1/rms/getCalculateOfMaterialList?apiId=379&truckCalculateId="+this.$route.params.truckCalulateId,
+        requestUrl: "/api/v1/rms/getCalculateOfMaterialList?apiId=379&truckCalculateId="+this.$route.params.truckCalculateId,
         
       },
       option2:{
@@ -96,12 +96,12 @@ export default {
     // },
     information() {
       //编辑 
-   console.log(this.$route.params)            
-   console.log("truckCalculateId",this.$route.params.truckCalulateId);  
+   console.log("information")          
+   console.log("truckCalculateId",this.$route.params.truckCalculateId);  
       this.axios
         .post(
           "/api/v1/rms/getTruckCalculateById/" +
-            this.$route.params.truckCalulateId
+            this.$route.params.truckCalculateId
         )
 
         .then((res) => {

src/views/RMS/components/truckCalculate.vue

@@ -21,7 +21,7 @@
                <el-button
                type="text"
                size="small"
-               @click="updateTruckCalculate(scope.row.truckCalculateId)"
+               @click="updateTruckCalculate(scope)"
              >
                详细
              </el-button> 
@@ -57,8 +57,8 @@ export default {
       this.$router.push("/addTruckCalculate");
 
     },
-   updateTruckCalculate(truckCalculateId){
-      this.$router.push("/editTruckCalculate/" + truckCalculateId)
+   updateTruckCalculate(scope){
+      this.$router.push("/editTruckCalculate/" + scope.row.truckCalculateId)
     },
    deleteTruckCalculate(scope){
       this.$confirm("是否删除", "提示", {

src/views/RMS/router/index.js

@@ -93,7 +93,7 @@ const constantRouterMap = [
 		{path: 'editRawWarehouse/:warehouseId', name: 'editRawWarehouse', meta: {code: 'xtpzgl-yhgl'}, component: editRawWarehouse},
 		{path: 'editRmsShipper/:shipperId', name: 'editRmsShipper', meta: {code: 'xtpzgl-yhgl'}, component: editRmsShipper},
 		{path: 'editSupplier/:supplierId', name: 'editSupplier', meta: {code: 'xtpzgl-yhgl'}, component: editSupplier},
-		{path: 'editTruckCalculate', name: 'editTruckCalculate', meta: {code: 'xtpzgl-yhgl'}, component: editTruckCalculate},
+		{path: 'editTruckCalculate/:truckCalculateId', name: 'editTruckCalculate', meta: {code: 'xtpzgl-yhgl'}, component: editTruckCalculate},
 		{path: 'gatepost', name: 'gatepost', meta: {code: 'xtpzgl-yhgl'}, component: gatepost},
 		{path: 'material', name: 'material', meta: {code: 'xtpzgl-yhgl'}, component: material},
 		{path: 'oilPrice', name: 'oilPrice', meta: {code: 'xtpzgl-yhgl'}, component: oilPrice},