报价单优惠提单模板设置等bug

src/store/modules/permission.js

@@ -64,7 +64,8 @@ function filterAsyncRouter(asyncRouterMap, lastRouter = false, type = false) {
       // debugger
       if (route.parentId === 0) {
         route.component = Layout
-      } else {
+      }
+      else {
         route.component = ParentView
       }
     } else { // 根节点

src/views/ecw/coupon/index.vue

@@ -204,7 +204,7 @@
 import { createCoupon, updateCoupon, deleteCoupon, getCoupon, getCouponPage, exportCouponExcel } from "@/api/ecw/coupon";
 
 export default {
-  name: "Coupon",
+  name: "EcwCouponIndex",
   components: {
   },
   data() {
@@ -266,6 +266,9 @@ export default {
   created() {
     this.getList();
   },
+  activated(){
+    this.getList()
+  },
   methods: {
     /** 查询列表 */
     getList() {

src/views/ecw/offer/detail.vue

@@ -22,7 +22,7 @@
                         {{consignorData.contactsName||$t('无')}}
                     </el-descriptions-item>
                     <el-descriptions-item :label="$t('手机号')+':'">
-                      {{consignorData?(checkCode(consignorData.areaCode)+consignorData.phoneNew)||$t('无'):$t('无')}}
+                      {{consignorData && consignorData.phoneNew ? (checkCode(consignorData.areaCode) + consignorData.phoneNew)||$t('无'):$t('无')}}
                     </el-descriptions-item>
                     <el-descriptions-item :label="$t('联系地址')+':'">
                       {{consignorData.address||$t('无')}}
@@ -44,7 +44,7 @@
                     {{consigneeData.contactsName||$t('无')}}
                     </el-descriptions-item>
                     <el-descriptions-item :label="$t('手机号')+':'">
-                      {{consigneeData?(checkCode(consigneeData.areaCode)+consigneeData.phoneNew)||$t('无'):$t('无')}}
+                      {{consigneeData && consigneeData.phoneNew ?(checkCode(consigneeData.areaCode)+consigneeData.phoneNew)||$t('无'):$t('无')}}
                     </el-descriptions-item>
                     <el-descriptions-item :label="$t('联系地址')+':'">
                       {{consigneeData.address||$t('无')}}

src/views/ecw/offer/index.vue

@@ -148,7 +148,7 @@ import { getCurrencyList } from '@/api/ecw/currency';
 import {getTradeCityList} from '@/api/ecw/region'
 import UserSelector from '@/components/UserSelector'
 export default {
-  name: "Offer",
+  name: "EcwOfferIndex",
   components: {
     UserSelector
   },
@@ -189,6 +189,9 @@ export default {
       return this.tradeCityList.filter(item => item.type == 1)
     },
   },
+  activated(){
+    this.getList()
+  },
   created() {
     getTradeCityList().then(res => this.tradeCityList = res.data)
 

src/views/ecw/order/components/PrintTag.vue

@@ -22,7 +22,7 @@
         <div  v-if="step=='preview'" style="height:250px; overflow-y:hidden">
             <div
                 class="order-print-tag-item"
-                v-for="(item, index) in tags.filter(tag => tag.num >= form.start && tag.num <= form.end)"
+                v-for="(item, index) in printTags"
                 style="width: 80mm; margin: 0 auto;" :id="'order-print-tag' + item.num"
                 :style="{display: index == 0 ? 'block':'none' }"
                 :key="item.num">
@@ -92,6 +92,9 @@ export default {
         }
     },
     computed:{
+        printTags(){
+           return this.tags.filter(tag => tag.num >= this.form.start && tag.num <= this.form.end)
+        },
         detail(){
             return this.tags.length ? this.tags[0] : null
         },
@@ -124,6 +127,9 @@ export default {
             if(this.form.end > this.tags[this.tags.length-1].num){
                 return this.$message.error(this.$t('结束标签不对'))
             }
+            if(!this.printTags.length){
+                return this.$message.error(this.$t('指定区域无可打印标签'))
+            }
             this.$refs["form"].validate(valid => {
                 if (!valid) {
                     return;

src/views/ecw/order/index.vue

@@ -353,7 +353,6 @@
                 <!-- 打印标签 -->
                 <template v-if="
                   exclude(scope.row.status, [0]) &&
-                  exclude(scope.row.shipmentState, [320,322,323]) &&
                   exclude(scope.row.abnormalState, [5,6,7,8])
                 ">
                   <el-dropdown-item @click.native="printTagOrderId=scope.row.orderId">{{$t('打印标签')}}</el-dropdown-item>

src/views/ecw/warehouse/index.vue

@@ -314,7 +314,7 @@
         </el-form-item>
         <el-form-item :label="$t('抬头')" prop="titleZh">
           <el-link type="primary" @click.native="setTpl('sea')">{{ $t('海运模板') }}</el-link> | <el-link type="primary" @click.native="setTpl('air')">{{ $t('空运模板') }}</el-link>
-          <ueditor v-model="ladingform.titleZh" :min-height="192" style="width:960px"/>
+          <ueditor v-if="templateOpen" v-model="ladingform.titleZh" :min-height="192" style="width:960px"/>
         </el-form-item>
 
         <el-card class="box-card">
@@ -366,7 +366,7 @@
         <el-form-item :label="$t('条款')" prop="contentZh">
           <el-link type="primary" @click.native="setAgreementTpl('agreementSea')">{{ $t('海运模板') }}</el-link> |
           <el-link type="primary" @click.native="setAgreementTpl('agreementAir')">{{ $t('空运模板') }}</el-link>
-          <ueditor v-model="ladingform.contentZh" :min-height="192" style="width:960px"/>
+          <ueditor v-if="templateOpen" v-model="ladingform.contentZh" :min-height="192" style="width:960px"/>
         </el-form-item>
 
         <el-form-item v-if="showFlag">