Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

src/views/basicdata/brand/basicStorageServices.vue

@@ -250,6 +250,14 @@ export default {
 
     }
   },
+  watch: {
+    '$route'(to, from) {
+      if(to.path == from.path){
+        this.init();
+        this.onLoad(this.page);
+      }
+    }
+  },
   mounted () {
     this.init();
     this.onLoad(this.page);

src/views/basicdata/brand/basicdataStoreBrand.vue

@@ -283,6 +283,14 @@ export default {
       return ids.join(',');
     },
   },
+  watch: {
+    '$route'(to, from) {
+      // 这里可以执行你想要的操作，比如刷新页面
+      if(to.path == from.path){
+        this.onLoad(this.page);
+      }
+    }
+  },
   methods: {
     rowSave(row, done, loading) {
       row.shopId = this.$route.query.id;

src/views/distribution/signfor/asurcharge.vue

@@ -91,7 +91,7 @@
             <div v-if="tabName == 6" class="el_box">
               <div class="el_radio">
                 <span class="title">是否专车：</span>
-                <el-radio-group v-model="form.Specialcar">
+                <el-radio-group v-model="form.Specialcar" @change="SpecialcarChange">
                   <el-radio :label="0">否</el-radio>
                   <el-radio :label="1">是</el-radio>
                 </el-radio-group>
@@ -111,7 +111,7 @@
             <div v-if="tabName == 2" class="el_box">
               <div class="el_radio">
                 <span class="title">是否超区：</span>
-                <el-radio-group v-model="form.SuperZone">
+                <el-radio-group v-model="form.SuperZone"  @change="SuperZoneChange">
                   <el-radio :label="0">否</el-radio>
                   <el-radio :label="1">是</el-radio>
                 </el-radio-group>
@@ -501,14 +501,17 @@ const onLoad = () => {
             form.value.Specialcar = 1;
             form.value.numcost = res.data.data.fee; //上楼
           }
+          if (tabName.value == 2) {
+            //专车费
+            form.value.SuperZone = 1;
+           form.value.fee  = res.data.data.fee
+           form.value.distance   = res.data.data.distance
+          }
         }
         details.data = res.data.data.packageEntityList;
         TcZcInput.value.floolNum = res.data.data.floolNum; //上楼费
         TcZcInput.value.distance = res.data.data.distance; //平移距离
         console.log(TcZcInput.value.floolNum, 'TcZcInput.value.floolNum');
-        if (res.data.data.addvalueId == 6) {
-          res.data.data.packageEntityList[0];
-        }
       }
     })
     .catch(error => {
@@ -519,6 +522,13 @@ const onLoad = () => {
     });
 };
 onLoad();
+const SpecialcarChange=()=>{
+ form.value.numcost=0
+}
+const SuperZoneChange=()=>{
+ form.value.distance =0
+ form.value.fee = 0
+}
 // 页面初始化方法
 const tabchange = row => {
   console.log(row, '当前菜单 ');