1、更新结算显示

src/views/modules/settlement/third-print-settlement.vue

@@ -194,15 +194,15 @@
               <span style="color: green; font-weight: bold;font-size: 16px">+{{scope.row.settleMaterialAmount }}</span>
             </template>
           </el-table-column>
-          <el-table-column
+          <!--<el-table-column
             align="center"
             width="110px"
             :label="(employeeId === 43 || searchForm.printChannel === 'Lightning')? '打包快递结算金额(按件2.55元)':'人工结算金额(按件0.4元)'"
             prop="settleLaborAmount">
             <template slot-scope="scope">
-              <span style="color: green; font-weight: bold;font-size: 16px">+{{scope.row.settleLaborAmount }}</span>
+              <span style="color: green; font-weight: bold;font-size: 16px">+{{scope.row.settleLaborAmount + scope.row.settleDeliveryAmount }}</span>
             </template>
-          </el-table-column>
+          </el-table-column>-->
           <el-table-column
             v-if="employeeType === 0"
             align="center"

src/views/modules/shop/feature/create/edit/components/hot-area/index.vue

@@ -160,7 +160,7 @@
       </div>
     </el-dialog>
     <!-- 弹窗: 输入自定义路径 -->
-    <el-dialog custom-class="up-dialog" :title="$i18n.t('shopFeature.tabNav.customPath')" width="40%" top="30vh" :visible.sync="showPathInputDialog">
+    <el-dialog :close-on-click-modal="false" custom-class="up-dialog" :title="$i18n.t('shopFeature.tabNav.customPath')" width="40%" top="30vh" :visible.sync="showPathInputDialog">
       <div class="custom-path-con">
         <span>{{$t('shopFeature.tabNav.routeLink')}}</span>
         <el-input style="margin-rigth: 10px;" :placeholder="$i18n.t('shopFeature.tabNav.pleaseFillThePath')" size="small" v-model="customPath">

src/views/modules/shop/feature/create/edit/components/image_ad/index.vue

@@ -176,7 +176,7 @@
       </div>
     </el-dialog>
     <!-- 弹窗: 输入自定义路径 -->
-    <el-dialog custom-class="up-dialog" :title="$i18n.t('shopFeature.tabNav.customPath')" width="40%" top="30vh" :visible.sync="showPathInputDialog">
+    <el-dialog :close-on-click-modal="false" custom-class="up-dialog" :title="$i18n.t('shopFeature.tabNav.customPath')" width="40%" top="30vh" :visible.sync="showPathInputDialog">
       <div class="custom-path-con">
         <span>{{$t('shopFeature.tabNav.routeLink')}}</span>
         <el-input style="margin-rigth: 10px;" :placeholder="$i18n.t('shopFeature.tabNav.pleaseFillThePath')" size="small" v-model="customPath">