1、更新结算显示

src/views/modules/prod/prodTemplate-add-or-update.vue

@@ -27,6 +27,7 @@
           <el-option key="SBSGG" label="竖版四宫格" value="SBSGG"></el-option>
           <el-option key="TZSGG" label="田字四宫格" value="TZSGG"></el-option>
           <el-option key="EGG" label="横版二宫格" value="EGG"></el-option>
+          <el-option key="FS3CFZFP" label="富士3寸仿真拍立得" value="FS3CFZFP"></el-option>
           <el-option key="3CFZFP" label="3寸仿真拍立得" value="3CFZFP"></el-option>
           <el-option key="4CFZFP" label="4寸仿真拍立得" value="4CFZFP"></el-option>
           <el-option key="5CFZFP" label="5寸仿真拍立得" value="5CFZFP"></el-option>
@@ -160,7 +161,8 @@ export default {
           }else if(templateUsage.indexOf("5CFP") !== -1 || templateUsage.indexOf("5CFZFP") !== -1){
             width = 1346;
             height = 1087;
-          }else if(templateUsage.indexOf("FP") !== -1 || templateUsage.indexOf("3CFZFP") !== -1 || templateUsage.indexOf("XL3CFZFP") !== -1){
+          }else if(templateUsage.indexOf("FP") !== -1 || templateUsage.indexOf("3CFZFP") !== -1
+            || templateUsage.indexOf("XL3CFZFP") !== -1 || templateUsage.indexOf("FS3CFZFP") !== -1){
             width = 709;
             height = 1087;
           }else if(templateUsage.indexOf("EGG") !== -1){

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

@@ -194,7 +194,7 @@
               <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元)'"
@@ -202,7 +202,7 @@
             <template slot-scope="scope">
               <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/goods/index.vue

@@ -420,6 +420,7 @@ export default {
         }
       )
     }
+
     if (!this.goodsList.length) {
       this.goodsList = this.demoGoods
     }