Merge branch 'linwenxin_dev' of https://gogs.zfire.top/zfire-front/zfire-newmall-admin

src/views/mallManagement/order/sales_return_order_list/index.vue

@@ -155,13 +155,11 @@
               <el-table-column align="center" label="退货数量" prop="waitRefundNum" min-width="120">
                 <template slot-scope="scope">
                   {{scope.row.waitRefundNum}}
-                  <!-- <el-input size="small" type="number" v-model="scope.row.waitRefundNum"></el-input> -->
                 </template>
               </el-table-column>
               <el-table-column align="center" label="退货单价" prop="waitRefundPrice" min-width="120">
                 <template slot-scope="scope">
                   {{scope.row.waitRefundPrice}}
-                  <!-- <el-input size="small" type="number" v-model="scope.row.waitRefundPrice"></el-input> -->
                 </template>
               </el-table-column>
               <el-table-column align="center" label="退货金额" prop="amount" min-width="120">
@@ -169,14 +167,21 @@
                   {{scope.row.waitRefundNum * scope.row.waitRefundPrice * 100 / 100}}
                 </template>
               </el-table-column>
-
-              <el-table-column align="center" label="已退数量" prop="refundNum" min-width="120"></el-table-column>
+              <el-table-column align="center" label="已退数量" prop="" min-width="120">
+                <template slot-scope="scope">
+                  {{0}}
+                </template>
+              </el-table-column>
               <el-table-column align="center" label="已退单价" min-width="120">
                 <template slot-scope="scope">
-                  {{(scope.row.refundAmount / scope.row.refundNum) || 0}}
+                  {{0}}
+                </template>
+              </el-table-column>
+              <el-table-column align="center" label="已退金额" prop="" min-width="120">
+                <template slot-scope="scope">
+                  {{0}}
                 </template>
               </el-table-column>
-              <el-table-column align="center" label="已退金额" prop="refundAmount" min-width="120"></el-table-column>
               <el-table-column align="center" label="订单数量" prop="num" min-width="120"></el-table-column>
               <el-table-column align="center" label="订单单价" prop="price" min-width="120"></el-table-column>
               <el-table-column align="center" label="订单金额" prop="payAmount" min-width="120"></el-table-column>
@@ -338,13 +343,22 @@
               </template>
             </el-table-column>
 
-            <el-table-column align="center" label="已退数量" prop="retiredNum" min-width="120"></el-table-column>
-            <el-table-column align="center" label="已退单价" min-width="120">
+            <el-table-column align="center" label="已退数量" prop="refundNum" min-width="120">
               <template slot-scope="scope">
-                {{(scope.row.retiredAmount / scope.row.retiredNum) || 0}}
+                {{ detailData.examineStatus=="OK"?  (scope.row.refundNum) : 0}}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="已退金额" prop="retiredAmount" min-width="120"></el-table-column>
+            <el-table-column align="center" label="已退单价" prop="refundAmount" min-width="120">
+              <template slot-scope="scope">
+                {{detailData.examineStatus=="OK"? (scope.row.refundAmount):0}}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="已退金额" min-width="120">
+              <template slot-scope="scope">
+                {{detailData.examineStatus=="OK"? ((scope.row.refundAmount * scope.row.refundNum) * 100 / 100) : 0}}
+              </template>
+            </el-table-column>
+
             <el-table-column align="center" label="订单数量" prop="num" min-width="120"></el-table-column>
             <el-table-column align="center" label="订单单价" prop="price" min-width="120"></el-table-column>
             <el-table-column align="center" label="订单金额" prop="payAmount" min-width="120"></el-table-column>