1、订单备注查询

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

@@ -57,9 +57,9 @@
           新增结算
         </div>
       </div>
-      <div style="margin-top: 10px; width: 1000px;">
+      <div style="margin-top: 10px; width: 1200px;">
         <el-row :gutter="12">
-          <el-col :span="5">
+          <el-col :span="4">
             <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="5">
+          <el-col :span="4">
             <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="5">
+          <el-col :span="4">
             <el-card :body-style="{padding:'10px'}"shadow="never">
               <div>
                 <span style="font-size: 16px" v-if="shopId == 66">待结算打包快递金额</span>
@@ -93,7 +93,7 @@
               </div>
             </el-card>
           </el-col>
-          <el-col :span="5" v-if="shopId === 66 || shopId === 1">
+          <el-col :span="4" v-if="shopId === 66 || shopId === 1">
             <el-card :body-style="{padding:'10px'}"shadow="never">
               <div>
                 <span style="font-size: 16px">待结算物料金额</span>
@@ -115,6 +115,17 @@
               </div>
             </el-card>
           </el-col>
+          <el-col :span="4" 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.settleReduceAmount" style="color: red; font-weight: bold;font-size: 20px">- ¥{{parseFloat(stat.settleReduceAmount).toFixed(2)}}</span>
+                  <span v-else style="color: red; font-weight: bold;font-size: 20px">- ¥0</span>
+                </div>
+              </div>
+            </el-card>
+          </el-col>
         </el-row>
       </div>
 
@@ -251,6 +262,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')"
@@ -532,7 +551,7 @@
       resetSearchForm (formName) {
         this.$refs[formName].resetFields()
         this.searchForm = {};
-        this.stat = {settleAmount:0, settleSkuAmount:0, settleAfterCostAmount:0, settleLaborAmount:0}
+        this.stat = {settleAmount:0, settleSkuAmount:0, settleAfterCostAmount:0, settleLaborAmount:0, settleReduceAmount: 0}
       },
       handleSizeChange (val) {
         this.page.pageSize = val