提交陆运修改

src/views/landTransportation/dispatchingCars/detailPage.vue

@@ -1,15 +1,31 @@
 <template>
   <div>
     <div class="customer-head">
-      <div class="customer-back">
+      <div class="customer-back" v-if="!home">
         <el-button
             type="danger"
             style="border: none;background: none;color: red"
             icon="el-icon-arrow-left"
-            @click="backToList"
+            @click="backToList(0)"
         >返回列表
         </el-button>
       </div>
+      <div class="customer-back" v-else>
+        <el-button
+            type="danger"
+            style="border: none;background: none;color: red"
+            icon="el-icon-arrow-left"
+            @click="backToList(1)"
+        >返回列表
+        </el-button>
+        <el-button
+            type="danger"
+            style="border: none;background: none;color: red"
+            icon="el-icon-arrow-left"
+            @click="backToList(2)"
+        >返回台账
+        </el-button>
+      </div>
     </div>
     <containerTitle title="委托信息" style="margin-top: 50px"></containerTitle>
     <basic-container>
@@ -552,6 +568,9 @@ export default {
   props: {
     id: {
       type: String
+    },
+    home: {
+      type: Boolean
     }
   },
   data() {
@@ -1750,8 +1769,16 @@ export default {
       this.tableData.splice(this.tableData.length - 1, 0, {leas: 1111})
     },
     //返回主列表
-    backToList() {
-      this.$emit('backToList')
+    backToList(value) {
+      if (value === 0){
+        this.$emit('backToList')
+      }else if(value === 1){
+        this.$emit('backToList',true)
+      }else if (value === 2){
+        this.$router.push({
+          path: '/landTransportation/reportAnalysis/index'
+        });
+      }
     },
     //删除途径地址
     deleteAddress(scope) {

src/views/landTransportation/dispatchingCars/index.vue

@@ -100,7 +100,7 @@
         </template>
       </avue-crud>
     </basic-container>
-    <detail-page v-if="!show" @backToList="backToList" :id="id"></detail-page>
+    <detail-page v-if="!show" @backToList="backToList" :id="id" :home="home"></detail-page>
   </div>
 </template>
 
@@ -268,13 +268,15 @@ export default {
             width: 140,
             search: true,
           }]
-      }
+      },
+      home:false
     }
   },
   activated() {
     if (this.$route.query.orderId){
       this.rowCell({id:this.$route.query.orderId},0)
       this.$router.$avueRouter.closeTag(window.location.hash.slice(1))
+      this.home = true
     }
     // if (this.$route.query.params){
     //   this.rowCell({id:this.$route.query.params},0)
@@ -391,7 +393,12 @@ export default {
     rowSave() {
       this.show = false
     },
-    backToList() {
+    backToList(type) {
+      if (type){
+        this.$router.push({
+          path: '/landTransportation/dispatchingCars/index'
+        });
+      }
       this.show = true
       this.onLoad(this.page)
     },

src/views/landTransportation/placeAnOrder/detailPage.vue

@@ -1,15 +1,31 @@
 <template>
   <div>
     <div class="customer-head">
-      <div class="customer-back">
+      <div class="customer-back" v-if="!home">
         <el-button
             type="danger"
             style="border: none;background: none;color: red"
             icon="el-icon-arrow-left"
-            @click="backToList"
+            @click="backToList(0)"
         >返回列表
         </el-button>
       </div>
+      <div class="customer-back" v-else>
+        <el-button
+            type="danger"
+            style="border: none;background: none;color: red"
+            icon="el-icon-arrow-left"
+            @click="backToList(1)"
+        >返回列表
+        </el-button>
+        <el-button
+            type="danger"
+            style="border: none;background: none;color: red"
+            icon="el-icon-arrow-left"
+            @click="backToList(2)"
+        >返回首页
+        </el-button>
+      </div>
       <div>
         <el-button
             class="el-button--small-yh add-customer-btn"
@@ -518,6 +534,9 @@ export default {
   props: {
     id: {
       type: String
+    },
+    home: {
+      type: Boolean
     }
   },
   data() {
@@ -1676,9 +1695,18 @@ export default {
       this.tableData.splice(this.tableData.length - 1, 0, {})
     },
     //返回主列表
-    backToList() {
-      this.goodsForm = {}
-      this.$emit('backToList')
+    backToList(value) {
+      if (value === 0){
+        this.goodsForm = {}
+        this.$emit('backToList')
+      }else if(value === 1){
+        this.goodsForm = {}
+        this.$emit('backToList',true)
+      }else if (value === 1){
+        this.$router.push({
+          path: '/wel/index'
+        });
+      }
     },
     //删除途径地址
     deleteAddress(scope) {

src/views/landTransportation/placeAnOrder/index.vue

@@ -161,7 +161,7 @@
         </template>
       </avue-crud>
     </basic-container>
-    <detail-page v-if="!show" @backToList="backToList" :id="id"></detail-page>
+    <detail-page v-if="!show" @backToList="backToList" :id="id" :home="home"></detail-page>
   </div>
 </template>
 
@@ -333,14 +333,16 @@ export default {
             width: 140,
             search: true,
           }]
-      }
+      },
+      home:false,
     }
   },
   activated() {
     if (this.$route.query.id){
       this.rowCell({id:this.$route.query.id},0)
       this.$router.$avueRouter.closeTag(window.location.hash.slice(1))
-      this.$router.push({ query: {} });
+      this.home = true
+      // this.$router.push({ query: {} });
     }
   },
   async created() {
@@ -468,7 +470,13 @@ export default {
       this.id = 'copy' + this.selectionList[0].id
       this.show = false
     },
-    backToList() {
+    backToList(type) {
+      if(type){
+        this.home = false
+        this.$router.push({
+          path: '/landTransportation/placeAnOrder/index'
+        });
+      }
       this.id = ''
       this.show = true
       this.onLoad(this.page)

src/views/landTransportation/reportAnalysis/index.vue

@@ -397,6 +397,9 @@ export default {
         return this.goodsOptionCrud.menu = true
       }else if (item == '平台') {
         this.goodsOptionCrud.menu = false
+        for (let item of this.goodsOptionCrud.column){
+          if (item.prop === 'landAmountC') return
+        }
         return this.goodsOptionCrud.column.push( {
           label: '应付运费',
           overHidden: true,
@@ -499,6 +502,10 @@ export default {
           return this.goodsOptionCrud.menu = true
         }else if (item == '平台') {
           this.goodsOptionCrud.menu = false
+          for (let item of this.goodsOptionCrud.column){
+            console.log(item.prop)
+            if (item.prop === 'landAmountC') return
+          }
           return this.goodsOptionCrud.column.push( {
             label: '应付运费',
             overHidden: true,