订单模块

src/views/finance/payfinance-remit-record.vue

@@ -4,38 +4,69 @@
       <el-card ref="print" class="box-card" style="margin: 0 auto;">
         <div class="refund-item">
           <el-row :gutter="24" class="box-row">
-            <el-col :span="5"><b>订单编号(ID)：</b> {{ repacts.orderNo }}({{ repacts.orderId }})</el-col>
-            <el-col :span="4"><b>下单时间：</b> {{ repacts.applyTime }}</el-col>
-            <el-col :span="4"><b>机构名称：</b> {{ repacts.clubName }}</el-col>
+            <el-col :span="5"><b>订单编号(ID)：</b> {{ dataOrder.order.orderNo }}({{ dataOrder.order.orderId }})</el-col>
+            <el-col :span="4"><b>下单时间：</b> {{ dataOrder.order.orderTime }}</el-col>
+            <el-col :span="4"><b>机构名称：</b> {{ dataOrder.order.clubName }}</el-col>
           </el-row>
           <el-row :gutter="24" class="box-row">
-            <el-col :span="5"><b>订单状态：</b> 交易中</el-col>
-            <el-col :span="4"><b>收款状态：</b> {{ repacts.status | statusFilter }}</el-col>
-            <el-col :span="4"><b>付款状态：</b> {{ repacts.status | statusFilter }}</el-col>
+            <el-col :span="5">
+              <b>订单状态：</b>
+              <template v-if="['11','12','13','21','22','23','31','32','33'].indexOf(dataOrder.order.status)>=0">
+                <el-tag type="success" size="small">{{ '交易中('+statusObj[dataOrder.order.status]+')' }}</el-tag>
+              </template>
+              <template v-else>
+                <el-tag :type="dataOrder.order.status*1===6?'info':''" size="small">{{ statusObj[dataOrder.order.status] }}</el-tag>
+              </template>
+            </el-col>
+            <el-col :span="4">
+              <b>收款状态：</b>
+              <el-tag v-if="dataOrder.order.receiptStatus*1===1" type="danger" size="small">待收款</el-tag>
+              <el-tag v-if="dataOrder.order.receiptStatus*1===2" type="warning" size="small">部分收款</el-tag>
+              <el-tag v-if="dataOrder.order.receiptStatus*1===3" type="success" size="small">已收款</el-tag>
+            </el-col>
+            <el-col :span="4">
+              <b>付款状态：</b>
+              <el-tag v-if="dataOrder.order.payStatus*1===1" type="danger" size="small">待付款</el-tag>
+              <el-tag v-if="dataOrder.order.payStatus*1===2" type="warning" size="small">部分付款</el-tag>
+              <el-tag v-if="dataOrder.order.payStatus*1===3" type="success" size="small">已付款</el-tag>
+            </el-col>
           </el-row>
           <el-row :gutter="24" class="box-row">
-            <el-col :span="5"><b>收货人：</b> 黄志国</el-col>
-            <el-col :span="4"><b>手机：</b> 15817887257</el-col>
-            <el-col :span="15"><b>地址：</b> 广东省深圳市龙华区大浪街道上早新村</el-col>
+            <el-col :span="5">
+              <b>收货人：</b>
+              {{ dataOrder.order.receiver }}
+            </el-col>
+            <el-col :span="4">
+              <b>手机：</b>
+              {{ dataOrder.order.mobile }}</el-col>
+            <el-col :span="15">
+              <b>地址：</b>
+              {{ dataOrder.order.address }}</el-col>
           </el-row>
           <el-row :gutter="24" class="box-row">
-            <el-col :span="5"><b>订单金额：</b> {{ repacts.payableAmount }}</el-col>
-            <el-col :span="4"><b>应收金额：</b> {{ repacts.payableAmount }}</el-col>
-            <el-col :span="4"><b>运费：</b> 包邮</el-col>
-            <el-col :span="4"><b>退款金额：</b> {{ repacts.payableAmount }}</el-col>
+            <el-col :span="5"><b>订单金额：</b> {{ dataOrder.order.payTotalFee | amountfilters }}</el-col>
+            <el-col :span="4"><b>应收金额：</b> {{ dataOrder.order.payableAmount | amountfilters }}</el-col>
+            <el-col :span="4">
+              <b>运费：</b>
+              <span v-if="dataOrder.order.freight*1===0">包邮</span>
+              <span v-else-if="dataOrder.order.freight*1===-1">到付</span>
+              <span v-else-if="dataOrder.order.freight*1===-2">仪器到付-产品包邮</span>
+              <span v-else>¥{{ dataOrder.order.freight }}</span>
+            </el-col>
+            <el-col :span="4"><b>退款金额：</b> {{ dataOrder.order.returnValue | amountfilters }}</el-col>
           </el-row>
           <h1 class="refund-item-title">收款记录</h1>
-          <el-table :data="products" border fit highlight-current-row :header-cell-style="{background:'#e9f3f7',color:'#606266'}">
+          <el-table :data="dataOrder.payList" border fit highlight-current-row :header-cell-style="{background:'#e9f3f7',color:'#606266'}">
             <el-table-column label="序号" align="center" width="50">
               <template slot-scope="scope">{{ scope.$index + 1 }}</template>
             </el-table-column>
-            <el-table-column label="收款ID" align="center" prop="unit" />
+            <el-table-column label="收款ID" align="center" prop="receiptId" />
             <el-table-column label="收款方式" align="center" prop="returnNum" />
             <el-table-column label="收款金额" align="center" prop="price" />
             <el-table-column label="收款时间" align="center" prop="verifyTimes" />
           </el-table>
           <h1 class="refund-item-title">付款记录</h1>
-          <el-table :data="products" border fit highlight-current-row :header-cell-style="{background:'#e9f3f7',color:'#606266'}">
+          <el-table :data="dataOrder.receiptList" border fit highlight-current-row :header-cell-style="{background:'#e9f3f7',color:'#606266'}">
             <el-table-column label="序号" align="center" width="50">
               <template slot-scope="scope">{{ scope.$index + 1 }}</template>
             </el-table-column>
@@ -51,7 +82,7 @@
 </template>
 
 <script>
-import { getDetail, getRemarks } from '@/api/order'
+import { organizeReceiptRecord } from '@/api/finance'
 export default {
   name: 'RemitRecord',
   filters: {
@@ -66,170 +97,7 @@ export default {
   },
   data() {
     return {
-      printObj: {
-        id: 'printBox', // 局部打印的<div> Id
-        popTitle: '', // 打印配置页上方标题
-        extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签,使用逗号分隔
-        preview: '', // 是否启动预览模式，默认是false（开启预览模式，可以先预览后打印）
-        previewTitle: '', // 打印预览的标题（开启预览模式后出现）,
-        previewPrintBtnLabel: '', // 打印预览的标题的下方按钮文本，点击可进入打印（开启预览模式后出现）
-        zIndex: '', // 预览的窗口的z-index，默认是 20002（此值要高一些，这涉及到预览模式是否显示在最上面）
-        previewBeforeOpenCallback() {}, // 预览窗口打开之前的callback（开启预览模式调用）
-        previewOpenCallback() {}, // 预览窗口打开之后的callback（开启预览模式调用）
-        beforeEntryIframe() {
-          const cells = document.querySelectorAll('.cell')
-          const tableNode = document.querySelectorAll('.el-table__header,.el-table__body')
-          // el-table 打印不全的问题
-          for (let j = 0; j < tableNode.length; j++) {
-            const tableItem = tableNode[j]
-            tableItem.style.width = '100%'
-            const child = tableItem.childNodes
-            for (let i = 0; i < child.length; i++) {
-              const element = child[i]
-              if (element.localName === 'colgroup') {
-                element.innerHTML = ''
-              }
-            }
-          }
-          // el-table 格子里面打印超过格子的问题
-          for (let i = 0; i < cells.length; i++) {
-            const cell = cells[i]
-            cell.style.width = '100%'
-            cell.removeAttribute('style')
-          }
-        },
-        openCallback() {
-
-        }, // 调用打印之后的回调事件
-        closeCallback() {}, // 关闭打印的回调事件（无法确定点击的是确认还是取消）
-        url: '',
-        standard: '',
-        extraCss: '',
-        loading: false
-      },
-      payRepacts: {
-        name: '卢海珠',
-        account: '6214 8328 2826 4957 ',
-        accountBank: '中国建设银行',
-        accountType: '公账'
-      },
-      repacts: {
-        id: 7580,
-        name: '卢海珠',
-        account: '6214 8328 2826 4957 ',
-        accountBank: '中国建设银行',
-        accountType: '公账',
-        type: '子订单付款',
-        shopName: '采美信息技术有限公司',
-        payableAmount: '20000.00',
-        shopOrderNo: 'P1682650952091471001',
-        shopOrderId: '19747',
-        orderNo: 'P16265095220221471',
-        orderId: '18179',
-        clubName: '广州白云区松洲蒂亚美容院',
-        applyMan: '路海珠',
-        applyTime: '2020-01-01:20:30:56',
-        verifyMan: '李昕',
-        verifyTime: '2020-01-01:20:30:56',
-        status: 0,
-        totalProduct: '3000.00',
-        payShopTotal: '3000.00',
-        childOrderId: ['P16265095220221471', 'P16265095220221471', 'P16265095220221471'],
-        shopOrderIdList: [
-          {
-            shopName: '采美信息技术有限公司',
-            shopOrderNos: 'P1682650952091471001',
-            shopOrderIds: '19747',
-            orderNos: 'P16265095220221471',
-            orderIds: '18179',
-            clubNames: '广州白云区松洲蒂亚美容院',
-            applyMans: '路海珠',
-            applyTimes: '2020-01-01:20:30:56',
-            verifyMans: '李昕',
-            verifyTimes: '2020-01-01:20:30:56',
-            statuss: 0,
-            totalProducts: '3000.00',
-            payShopTotals: '3000.00',
-            products: [
-              {
-                productName: '阶雪山之恋保滋润面霜吖',
-                unit: '50ml',
-                num: 3,
-                returnNum: 0,
-                price: '2000.00',
-                totalPrice: '6000.00',
-                costPrice: '1000.00',
-                totalCostPrice: '3000.00'
-              },
-              {
-                productName: '阶雪山之恋保滋润面霜吖',
-                unit: '50ml',
-                num: 3,
-                returnNum: 0,
-                price: '2000.00',
-                totalPrice: '6000.00',
-                costPrice: '1000.00',
-                totalCostPrice: '3000.00'
-              }
-            ]
-          }
-        ]
-      },
-      products: [
-        {
-          productName: '阶雪山之恋保滋润面霜吖',
-          unit: '50ml',
-          num: 3,
-          returnNum: 0,
-          price: '2000.00',
-          totalPrice: '6000.00',
-          costPrice: '1000.00',
-          totalCostPrice: '3000.00',
-          verifyTimes: '2020-01-01:20:30:56'
-        },
-        {
-          productName: '阶雪山之恋保滋润面霜吖',
-          unit: '50ml',
-          num: 3,
-          returnNum: 0,
-          price: '2000.00',
-          totalPrice: '6000.00',
-          costPrice: '1000.00',
-          totalCostPrice: '3000.00',
-          verifyTimes: '2020-01-01:20:30:56'
-        },
-        {
-          productName: '阶雪山之恋保滋润面霜吖',
-          unit: '50ml',
-          num: 3,
-          returnNum: 0,
-          price: '2000.00',
-          totalPrice: '6000.00',
-          costPrice: '1000.00',
-          totalCostPrice: '3000.00',
-          verifyTimes: '2020-01-01:20:30:56'
-        },
-        {
-          productName: '阶雪山之恋保滋润面霜吖',
-          unit: '50ml',
-          num: 3,
-          returnNum: 0,
-          price: '2000.00',
-          totalPrice: '6000.00',
-          costPrice: '1000.00',
-          totalCostPrice: '3000.00',
-          verifyTimes: '2020-01-01:20:30:56'
-        }
-      ],
-      activeIndex: '2',
-      order: null,
-      receiptAmount: 0,
-      returnValue: 0,
-      returnedPurchaseFee: 0,
-      bpClauses: null,
-      dialogRemarkList: [],
-      dialogRemarksVisible: false,
-      dialogRemarksOrderId: 0,
+      dataOrder: {},
       statusObj: {
         '0': '待确认',
         '4': '交易完成',
@@ -249,33 +117,24 @@ export default {
     }
   },
   computed: {
-    orderID: function() {
-      return this.$route.query.orderID * 1
+    orderId: function() {
+      return this.$route.query.orderId * 1
     }
   },
   created() {
-    // this.fetchData()
+    this.organizeReceiptRecord()
   },
   methods: {
-    fetchData() {
-      this.listLoading = true
-      getDetail({ id: this.orderID }).then(response => {
-        this.order = response.data.order
-        this.bpClauses = response.data.bpClauses
-        this.receiptAmount = response.data.receiptAmount
-        this.returnValue = response.data.returnValue
-        this.returnedPurchaseFee = response.data.returnedPurchaseFee
+    async organizeReceiptRecord() {
+      try {
+        const res = await organizeReceiptRecord(this.orderId)
+        console.log('res', res)
+        this.dataOrder = res.data
         this.listLoading = false
-      }).catch(() => {
+      } catch (error) {
         this.listLoading = false
-      })
-    },
-    RemarksOrder: function(id) {
-      getRemarks({ orderID: id }).then(response => {
-        this.dialogRemarkList = response.data
-      })
-      this.dialogRemarksOrderId = id
-      this.dialogRemarksVisible = true
+      }
+      this.listLoading = true
     },
     backToList() {
       this.$store.dispatch('tagsView/delView', this.$route).then(() => {