1、

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

@@ -26,6 +26,9 @@
           <el-option key="5CFP" label="5寸花式拍立得" value="5CFP"></el-option>
           <el-option key="SBSGG" label="竖版四宫格" value="SBSGG"></el-option>
           <el-option key="TZSGG" label="田字四宫格" value="TZSGG"></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>
         </el-select>
       </el-form-item>
       <el-form-item label="模板风格" prop="templateStyle">
@@ -146,13 +149,13 @@ export default {
           }else if(templateUsage.indexOf("postcard") !== -1 || templateUsage.indexOf("MXP") !== -1){
             width = 1229;
             height = 1796;
-          }else if(templateUsage.indexOf("4CFP") !== -1){
+          }else if(templateUsage.indexOf("4CFP") !== -1 || templateUsage.indexOf("4CFZFP") !== -1){
             width = 921;
             height = 1087;
-          }else if(templateUsage.indexOf("5CFP") !== -1){
+          }else if(templateUsage.indexOf("5CFP") !== -1 || templateUsage.indexOf("5CFZFP") !== -1){
             width = 1346;
             height = 1087;
-          }else if(templateUsage.indexOf("FP") !== -1){
+          }else if(templateUsage.indexOf("FP") !== -1 || templateUsage.indexOf("3CFZFP") !== -1){
             width = 709;
             height = 1087;
           }else if(templateUsage.indexOf("SBSGG") !== -1){

src/views/modules/prod/prodTemplate.vue

@@ -171,10 +171,11 @@ export default {
       resourcesUrl: process.env.VUE_APP_RESOURCES_URL,
       previewPicUrl: null,
       previewPicDialogVisible: false,
-      templateUsageList:[{label:'小卡', value:'YXK'},{label:'3寸拍立得', value:'FP'}
-                        ,{label:'4寸拍立得', value:'4CFP'},{label:'5寸拍立得', value:'5CFP'}
+      templateUsageList:[{label:'小卡', value:'YXK'},{label:'3寸花式拍立得', value:'FP'}
+                        ,{label:'4寸花式拍立得', value:'4CFP'},{label:'5寸花式拍立得', value:'5CFP'}
                         ,{label:'明信片', value:'MXP'},{label:'票根', value:'PG'},{label:'书签', value:'SQ'}
-                        ,{label:'竖版四宫格', value:'SBSGG'},{label:'田字四宫格', value:'TZSGG'}]
+                        ,{label:'竖版四宫格', value:'SBSGG'},{label:'田字四宫格', value:'TZSGG'},
+                        {label:'3寸仿真拍立得', value:'3CFZFP'},{label:'4寸仿真拍立得', value:'4CFZFP'},{label:'5寸仿真拍立得', value:'5CFZFP'}]
     }
   },
   components: {

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

@@ -59,7 +59,7 @@
       </div>
       <div style="margin-top: 10px; width: 1000px;">
         <el-row :gutter="12">
-          <el-col :span="6">
+          <el-col :span="5">
             <el-card :body-style="{padding:'10px'}"shadow="never">
               <div>
                 <span style="font-size: 16px">待结算总金额</span>
@@ -70,7 +70,7 @@
               </div>
             </el-card>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="5">
             <el-card :body-style="{padding:'10px'}"shadow="never">
               <div>
                 <span style="font-size: 16px">待结算材质金额</span>
@@ -81,7 +81,7 @@
               </div>
             </el-card>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="5">
             <el-card :body-style="{padding:'10px'}"shadow="never">
               <div>
                 <span style="font-size: 16px" v-if="shopId == 66">待结算打包快递金额</span>
@@ -93,7 +93,18 @@
               </div>
             </el-card>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="5" v-if="shopId === 66 || shopId === 1">
+            <el-card :body-style="{padding:'10px'}"shadow="never">
+              <div>
+                <span style="font-size: 16px">待结算物料金额</span>
+                <div style="margin-top: 5px">
+                  <span v-if="stat.settleMaterialAmount" style="color: green; font-weight: bold;font-size: 20px;">+ ¥{{parseFloat(stat.settleMaterialAmount).toFixed(2)}}</span>
+                  <span v-else style="color: green; font-weight: bold;font-size: 20px;">+ ¥0</span>
+                </div>
+              </div>
+            </el-card>
+          </el-col>
+          <el-col :span="4">
             <el-card :body-style="{padding:'10px'}"shadow="never">
               <div>
                 <span style="font-size: 16px">售后结算金额</span>
@@ -154,6 +165,7 @@
             </template>
           </el-table-column>
           <el-table-column
+            width="120px"
             align="center"
             prop="settleSkuAmount"
             label="材料结算金额">