1、物料结算显示

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

@@ -54,7 +54,7 @@
       </div>
       <div style="margin-top: 10px; width: 1000px;">
         <el-row :gutter="12">
-          <el-col :span="6">
+          <el-col :span="4">
             <el-card :body-style="{padding:'10px'}"shadow="never">
               <div>
                 <span style="font-size: 16px">待结算总金额</span>
@@ -65,7 +65,7 @@
               </div>
             </el-card>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="4">
             <el-card :body-style="{padding:'10px'}"shadow="never">
               <div>
                 <span style="font-size: 16px">待结算材质金额</span>
@@ -76,11 +76,21 @@
               </div>
             </el-card>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="4">
             <el-card :body-style="{padding:'10px'}"shadow="never">
               <div>
-                <span style="font-size: 16px" v-if="shopId == 66">待结算打包快递金额</span>
-                <span style="font-size: 16px" v-else>待结算人工金额</span>
+                <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>
                 <div style="margin-top: 5px">
                   <span v-if="stat.settleLaborAmount" style="color: green; font-weight: bold;font-size: 20px;">+ ¥{{parseFloat(stat.settleLaborAmount).toFixed(2)}}</span>
                   <span v-else style="color: green; font-weight: bold;font-size: 20px;">+ ¥0</span>
@@ -88,7 +98,7 @@
               </div>
             </el-card>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="4">
             <el-card :body-style="{padding:'10px'}"shadow="never">
               <div>
                 <span style="font-size: 16px">售后结算金额</span>
@@ -156,6 +166,14 @@
               <span style="color: green; font-weight: bold;font-size: 16px">+{{scope.row.settleSkuAmount }}</span>
             </template>
           </el-table-column>
+          <el-table-column
+           align="center"
+           label="物料结算金额"
+           prop="settleMaterialAmount">
+           <template slot-scope="scope">
+             <span style="color: green; font-weight: bold;font-size: 16px">+{{scope.row.settleMaterialAmount }}</span>
+           </template>
+         </el-table-column>
           <el-table-column
             align="center"
             width="110px"
@@ -165,15 +183,6 @@
               <span style="color: green; font-weight: bold;font-size: 16px">+{{scope.row.settleLaborAmount }}</span>
             </template>
           </el-table-column>
-          <!--<el-table-column
-            align="center"
-            width="110px"
-            label="快递结算金额(已发货)"
-            prop="settleDeliveryAmount">
-            <template slot-scope="scope">
-              <span style="color: green; font-weight: bold;font-size: 16px">+{{scope.row.settleDeliveryAmount }}</span>
-            </template>
-          </el-table-column>-->
           <el-table-column
             width="110px"
             align="center"
@@ -239,14 +248,6 @@
               <span>{{scope.row.settleOrderSheets }}</span>
             </template>
           </el-table-column>
-<!--          <el-table-column-->
-<!--            align="center"-->
-<!--            prop="settleDeliveryNums"-->
-<!--            label="快递总数">-->
-<!--            <template slot-scope="scope">-->
-<!--              <span>{{scope.row.settleDeliveryNums }}</span>-->
-<!--            </template>-->
-<!--          </el-table-column>-->
           <el-table-column
             align="center"
             prop="status"
@@ -256,6 +257,14 @@
               <el-tag v-if="scope.row.status ===1" type="success" effect="dark">已结算</el-tag>
             </template>
           </el-table-column>
+          <el-table-column
+            align="center"
+            prop="remark"
+            label="备注">
+            <template slot-scope="scope">
+              <span>{{scope.row.remark }}</span>
+            </template>
+          </el-table-column>
           <el-table-column
             align="center"
             :label="$t('crud.menu')"