Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/views/ecw/box/ladingBill/index.vue

@@ -15,9 +15,9 @@
             <section class="table-goodList">
               <div v-for="(item, index) in scope.row.orderItemList" :key="index" class="goodList-div">
                 <p>{{$t('品名')}}：{{$l(item, 'prodTitle')}}</p>
-                <p>{{$t('品牌')}}：【
-                  <span v-if="item.feeType === 0">{{ $t('无品牌') }}</span>
-                  <dict-tag v-else :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" :value="item.feeType" />{{ $t('】') }}</p>
+                <p>{{$t('品牌')}}：【<template v-if="item.brandName">{{item.brandName}}</template>
+                  <dict-tag v-else :type="DICT_TYPE.ECW_IS_BRAND" :value="item.feeType" />{{ $t('】') }}
+                </p>
                 <p>{{$t('其他')}}：{{getTotlContent(item)}}</p>
               </div>
             </section>
@@ -77,7 +77,7 @@
       </el-col>
     </el-row>
 
-    <el-dialog :title="dialogCfg.title" :visible.sync="dialogCfg.visible" :width="dialogCfg.width" :fullscreen="dialogCfg.fullscreen" append-to-body class="shippingSea-dialog">
+    <el-dialog :title="dialogCfg.title" :visible.sync="dialogCfg.visible" :width="dialogCfg.width" :fullscreen="dialogCfg.fullscreen" append-to-body class="shippingSea-dialog" @closed="dialogclosed">
       <makeLadingBill v-if="['makeBill','queryBill','resetBill'].includes(dialogCfg.type)" :currData="currData" :currRow="currRow" :dialogCfg="dialogCfg" @closeDialog="closeDialog" :selfNo="shipmentObj.selfNo" />
       <previewBill v-if="dialogCfg.type === 'previewBill'" :contentHtml="currData.billContent" :currRow="currRow" :type="dialogCfg.type" />
     </el-dialog>
@@ -126,6 +126,7 @@ export default {
       },
       // 模板内容
       billContent: "",
+      handleType: "",
     };
   },
   created() {
@@ -163,7 +164,13 @@ export default {
         this.$emit("closeDialog");
       }
     },
+    dialogclosed() {
+      if (this.handleType === "resetBill") {
+        this.getBillList();
+      }
+    },
     handleCommand(type, row) {
+      this.handleType = type;
       switch (type) {
         case "previewBill":
           this.getBill(row);
@@ -241,7 +248,7 @@ export default {
   computed: {
     /* 总计 */
     getSumData() {
-      return `${this.billData.totalNum ?? 0}${this.$t('箱')} ${
+      return `${this.billData.totalNum ?? 0}${this.$t("箱")} ${
         this.billData.totalVolume ?? 0
       }m³ ${this.billData.totalWeight ?? 0}kg`;
     },