linwenxin 10 mesiacov pred
rodič
commit
4c68ef6fc0

+ 17 - 14
src/views/mallManagement/order/order_detail/index.vue

@@ -390,10 +390,24 @@
 
     <!-- 收款记录 -->
     <div style="margin-top: 20px">
+      <h3>收款记录</h3>
       <!-- 列表 -->
       <div style="margin-bottom: 20px">
+        <div>
+          <span style="margin-right: 30px; font-size: 18px">订单总金额:{{ orderDetail.payAmount }}</span>
+          <span style="margin-right: 30px; font-size: 18px"
+            >待收款金额:{{ orderDetail.payAmount - orderDetail.paidAmount }}</span
+          >
+          <span style="margin-right: 30px; font-size: 18px">已收款金额:{{ orderDetail.paidAmount }}</span>
+        </div>
         <el-table :data="orderPaymentRecordListData" style="width: 100%" border>
-          <el-table-column prop="payStatus" label="收款标志" align="center"></el-table-column>
+          <el-table-column prop="payStatus" label="收款标志" align="center">
+            <template slot-scope="scope">
+              <div>
+                {{ { NO_PAID: '待收款', PART_PAID: '部分收款', PAID: '完成收款' }[scope.row.payStatus] }}
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column prop="paidBy" label="收款人" align="center"></el-table-column>
           <el-table-column prop="paidTime" label="收款时间" align="center"></el-table-column>
           <el-table-column prop="paidAmount" label="收款金额" align="center"></el-table-column>
@@ -440,7 +454,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="*凭证" prop="fileUrls">
+                <el-form-item label="凭证">
                   <ImageUpload :fileList="ruleForm.fileUrls" :limit="100" :isEdit="true" />
                 </el-form-item>
               </el-col>
@@ -1187,18 +1201,7 @@ export default {
             trigger: 'blur'
           }
         ],
-        fileUrls: [
-          {
-            validator: (rule, value, callback) => {
-              if (!value.length) {
-                callback(new Error('请上传'))
-              } else {
-                callback()
-              }
-            },
-            trigger: 'blur'
-          }
-        ]
+        fileUrls: []
       }
     }
   },