订单

src/api/finance.js

@@ -134,6 +134,15 @@ export function organizeSettleRecord(id) {
     method: 'get'
   })
 }
+/**
+ * 子订单退付款记录
+ */
+export function organizeReturnAndPay(id) {
+  return request({
+    url: '/order/cmReturnedPurchase/returnAndPay/' + id,
+    method: 'get'
+  })
+}
 /**
  * 申请分账
  */

src/views/finance/paycents-list.vue

@@ -153,7 +153,7 @@
       </el-table-column>
       <el-table-column label="操作" align="center">
         <template slot-scope="{row}">
-          <el-button type="text" size="mini" @click="handleToRecord(row.id)">退/付款记录</el-button>
+          <el-button type="text" size="mini" @click="handleToRecord(row.shopOrderId)">退/付款记录</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -286,8 +286,8 @@ export default {
       }
       return flag
     },
-    handleToRecord(id) {
-      this.$router.push({ path: '/finance/payment-record', query: { id: id }})
+    handleToRecord(shopOrderId) {
+      this.$router.push({ path: '/finance/payment-record', query: { shopOrderId: shopOrderId }})
     }
   }
 }

src/views/finance/payment-record.vue

@@ -2,59 +2,60 @@
   <div class="app-container">
     <div id="printBox">
       <el-card ref="print" class="box-card" style="margin: 0 auto;">
-        <div v-for="(repact,index) in repacts" :key="index" class="refund-item">
+        <div class="refund-item">
           <el-row :gutter="24" class="box-row">
-            <el-col :span="6"><b>订单编号(ID)：</b> {{ repact.orderNo }}({{ repact.orderId }})</el-col>
-            <el-col :span="4"><b>下单时间：</b> {{ repact.applyTime }}</el-col>
-            <el-col :span="4"><b>订单金额：</b> {{ repact.payableAmount }}</el-col>
-            <el-col :span="10">
-              <b>所有子订单：</b>
-              <span v-for="child in repact.childOrderId" :key="child">
-                【{{ child }}】
-              </span>
-            </el-col>
-          </el-row>
+            <el-col :span="5"><b>订单编号(ID)：</b> {{ shopOrder.orderNo }}({{ shopOrder.orderId }})</el-col>
+            <el-col :span="5"><b>下单时间：</b> {{ shopOrder.orderTime }}</el-col>
+            <el-col :span="4">
+              <b>订单金额：</b>
+              <span class="el-span-danger">{{ shopOrder.payTotalFee | amountfilters }}</span>
+            </el-col></el-row>
           <el-row :gutter="24" class="box-row">
-            <el-col :span="6"><b>机构名称：</b> {{ repact.clubName }}</el-col>
-            <el-col :span="4"><b>机构运费：</b> <span>{{ repact.postageInfo }}</span></el-col>
-            <el-col :span="4"><b>收款状态：</b> {{ repact.status | statusFilter }}</el-col>
-            <el-col :span="10"><b>收款金额：</b> {{ repact.payableAmount }}</el-col>
-          </el-row>
-          <el-row :gutter="24" class="box-row">
-            <el-col :span="6"><b>子订单编号(ID)</b> {{ repact.orderNo }}({{ repact.orderId }})</el-col>
-            <el-col :span="4"><b>子订单佣金：</b> 5000.00</el-col>
-            <el-col :span="4"><b>商品费：</b> {{ repact.payableAmount }}</el-col>
-            <el-col :span="10"><b>付款状态：</b> {{ repact.status | statusFilter }}</el-col>
-          </el-row>
+            <el-col :span="5"><b>机构名称：</b> {{ shopOrder.clubName }}</el-col>
+            <el-col :span="5"><b>机构运费：</b> <span>{{ shopOrder.postageInfo }}</span></el-col>
+            <el-col :span="4">
+              <b>收款状态：</b>
+              <el-tag v-if="shopOrder.receiptStatus*1===1" type="danger" size="small">待收款</el-tag>
+              <el-tag v-if="shopOrder.receiptStatus*1===2" type="warning" size="small">部分收款</el-tag>
+              <el-tag v-if="shopOrder.receiptStatus*1===3" type="success" size="small">已收款</el-tag>
+            </el-col>
+            <el-col :span="10">
+              <b>收款金额：</b>
+              <span class="el-span-danger">{{ shopOrder.payableAmount | amountfilters }}</span>
+            </el-col></el-row>
           <el-row :gutter="24" class="box-row">
-            <el-col :span="6"><b>供应商名称：</b> {{ repact.shopName }}</el-col>
-            <el-col :span="4"><b>供应商运费：</b> 15.00</el-col>
+            <el-col :span="5"><b>子订单编号(ID)</b> {{ shopOrder.shopOrderNo }}({{ shopOrder.shopOrderId }})</el-col>
+            <el-col :span="5"><b>商品费：</b> {{ shopOrder.payableAmount | amountfilters }}</el-col>
+            <el-col :span="10">
+              <b>付款状态：</b>
+              <el-tag v-if="shopOrder.payStatus*1===1" type="danger" size="small">待付款</el-tag>
+              <el-tag v-if="shopOrder.payStatus*1===2" type="warning" size="small">部分付款</el-tag>
+              <el-tag v-if="shopOrder.payStatus*1===3" type="success" size="small">已付款</el-tag>
+            </el-col>
           </el-row>
           <el-row :gutter="24" class="box-row">
-            <el-col :span="24">
+            <el-col :span="5"><b>供应商名称：</b> {{ shopOrder.shopName }}</el-col>
+            <el-col :span="5"><b>供应商运费：</b> {{ shopOrder.shopPostFee | amountfilters }}</el-col>
+            <el-col :span="14">
               <b>付供应商：</b>
-              <b style="margin-left: 10px;">应付采美:</b>10000.00
-              <b style="margin-left: 10px;">已付采美:</b>10000.00
-              <b style="margin-left: 10px;">待付采美:</b>0.00
-              <b style="margin-left: 10px;">应付供应商:</b>10000.00
-              <b style="margin-left: 10px;">已付供应商:</b>10000.00
-              <b style="margin-left: 10px;">待付供应商:</b>0.00
+              <b style="margin-left: 10px;">已付采美:</b>¥{{ shopOrder.payTotalFee | amountfilters }}
+              <b style="margin-left: 10px;">已付供应商:</b>¥{{ shopOrder.payTotalFee | amountfilters }}
             </el-col>
           </el-row>
           <el-row :gutter="24" class="box-row">
-            <el-table :data="repact.products" border fit highlight-current-row :header-cell-style="{background:'#eef1f6',color:'#606266'}">
-              <el-table-column label="商品名" align="center" prop="productName" />
+            <el-table :data="shopOrder.newOrderProducts" border fit highlight-current-row :header-cell-style="{background:'#eef1f6',color:'#606266'}">
+              <el-table-column label="商品名" align="center" prop="name" />
               <el-table-column label="规格" align="center" prop="unit" />
               <el-table-column label="数量" align="center" prop="num" />
-              <el-table-column label="退货" align="center" prop="returnNum" />
+              <el-table-column label="退货" align="center" prop="returnedNum" />
               <el-table-column label="单价" align="center" prop="price" />
-              <el-table-column label="总价" align="center" prop="totalPrice" />
+              <el-table-column label="总价" align="center" prop="totalAmount" />
             </el-table>
           </el-row>
         </div>
         <div class="refund-item">
           <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="pays" border fit highlight-current-row :header-cell-style="{background:'#e9f3f7',color:'#606266'}">
             <el-table-column label="序号" align="center" prop="productName" />
             <el-table-column label="付款单ID" align="center" prop="unit" />
             <el-table-column label="付款时间" align="center" prop="num" />
@@ -64,7 +65,7 @@
         </div>
         <div class="refund-item">
           <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="returns" border fit highlight-current-row :header-cell-style="{background:'#e9f3f7',color:'#606266'}">
             <el-table-column label="序号" align="center" prop="productName" />
             <el-table-column label="退款记录ID" align="center" prop="unit" />
             <el-table-column label="退款时间" align="center" prop="num" />
@@ -78,7 +79,7 @@
 </template>
 
 <script>
-import { getDetail, getRemarks } from '@/api/order'
+import { organizeReturnAndPay } from '@/api/finance'
 export default {
   name: 'PaymentRecord',
   filters: {
@@ -93,223 +94,35 @@ 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'],
-          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'
-            },
-            {
-              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'
-        },
-        {
-          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'
-        },
-        {
-          productName: '阶雪山之恋保滋润面霜吖',
-          unit: '50ml',
-          num: 3,
-          returnNum: 0,
-          price: '2000.00',
-          totalPrice: '6000.00',
-          costPrice: '1000.00',
-          totalCostPrice: '3000.00'
-        }
-      ],
-      activeIndex: '2',
-      order: null,
-      receiptAmount: 0,
-      returnValue: 0,
-      returnedPurchaseFee: 0,
-      bpClauses: null,
-      dialogRemarkList: [],
-      dialogRemarksVisible: false,
-      dialogRemarksOrderId: 0,
-      statusObj: {
-        '0': '待确认',
-        '4': '交易完成',
-        '5': '订单完成',
-        '6': '已关闭',
-        '7': '交易全退',
-        '11': '待收款、待发货',
-        '12': '待收款、部分发货',
-        '13': '待收款、全部发货',
-        '21': '部分收款、待发货',
-        '22': '部分收款、部分发货',
-        '23': '部分收款、全部发货',
-        '31': '全部收款、待发货',
-        '32': '全部收款、部分发货',
-        '33': '全部收款、全部发货'
-      }
+      shopOrder: {},
+      pays: [],
+      returns: []
     }
   },
   computed: {
-    orderID: function() {
-      return this.$route.query.orderID * 1
+    shopOrderId: function() {
+      return this.$route.query.shopOrderId * 1
     }
   },
   created() {
-    // this.fetchData()
+    this.organizeReturnAndPay()
   },
   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
-        this.listLoading = false
-      }).catch(() => {
-        this.listLoading = false
-      })
-    },
-    RemarksOrder: function(id) {
-      getRemarks({ orderID: id }).then(response => {
-        this.dialogRemarkList = response.data
-      })
-      this.dialogRemarksOrderId = id
-      this.dialogRemarksVisible = true
+    async organizeReturnAndPay() {
+      try {
+        const res = await organizeReturnAndPay(this.shopOrderId)
+        this.shopOrder = res.data.shopOrder
+        this.pays = res.data.pays
+        this.returns = res.data.returns
+      } catch (error) {
+        console.log('error', error)
+      }
     },
     backToList() {
       this.$store.dispatch('tagsView/delView', this.$route).then(() => {
         this.$nextTick(() => {
           this.$router.replace({
-            path: '/finance/list'
+            path: '/finance/paysettle-list'
           })
         })
       })

src/views/finance/paysettle-record.vue

@@ -2,58 +2,60 @@
   <div class="app-container">
     <div id="printBox">
       <el-card ref="print" class="box-card" style="margin: 0 auto;">
-        <div v-for="(repact,index) in repacts" :key="index" class="refund-item">
+        <div class="refund-item">
           <el-row :gutter="24" class="box-row">
-            <el-col :span="6"><b>订单编号(ID)：</b> {{ repact.orderNo }}({{ repact.orderId }})</el-col>
-            <el-col :span="4"><b>下单时间：</b> {{ repact.applyTime }}</el-col>
-            <el-col :span="4"><b>订单金额：</b> {{ repact.payableAmount }}</el-col>
-            <el-col :span="10">
-              <b>所有子订单：</b>
-              <span v-for="child in repact.childOrderId" :key="child">
-                【{{ child }}】
-              </span>
+            <el-col :span="6"><b>下单时间：</b> {{ order.orderTime }}</el-col>
+            <el-col :span="6"><b>订单编号(ID)：</b> {{ order.orderNo + '(' + order.orderId + ')' }}</el-col>
+            <el-col :span="6"><b>订单状态：</b>
+              <template v-if="['11','12','13','21','22','23','31','32','33'].indexOf(order.status)>=0">
+                <el-tag type="success" size="small">交易中</el-tag>
+              </template>
+              <template v-else>
+                <el-tag :type="order.status*1===6?'info':''" size="small">{{ order.status | orderStatusFilter }}</el-tag>
+              </template>
             </el-col>
           </el-row>
           <el-row :gutter="24" class="box-row">
-            <el-col :span="6"><b>机构名称：</b> {{ repact.clubName }}</el-col>
-            <el-col :span="4"><b>机构运费：</b> {{ repact.postageInfo }}</el-col>
-            <el-col :span="4"><b>收款状态：</b> {{ repact.status | statusFilter }}</el-col>
-            <el-col :span="10"><b>收款金额：</b> {{ repact.payableAmount }}</el-col>
-          </el-row>
-          <el-row :gutter="24" class="box-row">
-            <el-col :span="6"><b>子订单编号(ID)</b> {{ repact.orderNo }}({{ repact.orderId }})</el-col>
-            <el-col :span="4"><b>子订单佣金：</b> 5000.00</el-col>
-            <el-col :span="4"><b>商品费：</b> {{ repact.payableAmount }}</el-col>
-            <el-col :span="10"><b>付款状态：</b> {{ repact.status | statusFilter }}</el-col>
+            <el-col :span="6"><b>收款状态：</b>
+              <el-tag v-if="order.receiptStatus*1===1" type="danger" size="small">待收款</el-tag>
+              <el-tag v-if="order.receiptStatus*1===2" type="warning" size="small">部分收款</el-tag>
+              <el-tag v-if="order.receiptStatus*1===3" type="success" size="small">已收款</el-tag>
+            </el-col>
+            <el-col :span="6"><b>付款状态：</b>
+              <el-tag v-if="order.payStatus*1===1" type="danger" size="small">待付款</el-tag>
+              <el-tag v-if="order.payStatus*1===2" type="warning" size="small">部分付款</el-tag>
+              <el-tag v-if="order.payStatus*1===3" type="success" size="small">已付款</el-tag>
+            </el-col>
+            <el-col :span="6"><b>结算状态：</b>
+              <el-tag v-if="order.settleStatus*1===1" type="danger" size="small">未结算</el-tag>
+              <el-tag v-if="order.settleStatus*1===2" type="warning" size="small">部分结算</el-tag>
+              <el-tag v-if="order.settleStatus*1===3" type="success" size="small">已结算</el-tag>
+            </el-col>
           </el-row>
           <el-row :gutter="24" class="box-row">
-            <el-col :span="6"><b>供应商名称：</b> {{ repact.shopName }}</el-col>
-            <el-col :span="4"><b>供应商运费：</b> 15.00</el-col>
-            <el-col :span="6">
-              <b>付供应商：</b>
-              <b style="margin-left: 10px;">应付:</b>10000.00
-              <b style="margin-left: 10px;">已付:</b>10000.00
-              <b style="margin-left: 10px;">待付:</b>0.00</el-col>
+            <el-col :span="6"><b>机构名称：</b> {{ order.clubName }}</el-col>
+            <el-col :span="4"><b>收货人：</b> {{ order.receiver }}</el-col>
+            <el-col :span="4"><b>手机：</b> {{ order.mobile }}</el-col>
+            <el-col :span="10"><b>地址：</b> {{ order.address }}</el-col>
           </el-row>
           <el-row :gutter="24" class="box-row">
-            <el-table :data="repact.products" border fit highlight-current-row :header-cell-style="{background:'#eef1f6',color:'#606266'}">
-              <el-table-column label="商品名" align="center" prop="productName" />
-              <el-table-column label="规格" align="center" prop="unit" />
-              <el-table-column label="数量" align="center" prop="num" />
-              <el-table-column label="退货" align="center" prop="returnNum" />
-              <el-table-column label="单价" align="center" prop="price" />
-              <el-table-column label="总价" align="center" prop="totalPrice" />
-            </el-table>
+            <el-col :span="6"><b>订单金额：</b> ¥{{ order.payTotalFee | amountfilters }}</el-col>
+            <el-col :span="4"><b>应收金额：</b> ¥{{ order.payableAmount | amountfilters }}</el-col>
+            <el-col :span="4"><b>运费：</b> {{ order.postageInfo }}</el-col>
+            <el-col :span="10"><b>退款总额：</b> ¥{{ order.refundFee | amountfilters }}</el-col>
           </el-row>
         </div>
         <div class="refund-item">
           <h1 class="refund-item-title">结算记录</h1>
           <el-table :data="settleRecord" border fit highlight-current-row :header-cell-style="{background:'#e9f3f7',color:'#606266'}">
-            <el-table-column label="序号" align="center" prop="productName" />
-            <el-table-column label="付款单ID" align="center" prop="unit" />
-            <el-table-column label="付款时间" align="center" prop="num" />
-            <el-table-column label="付款方式" align="center" prop="returnNum" />
-            <el-table-column label="付款金额" align="center" prop="price" />
+            <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="shopOrderId" />
+            <el-table-column label="结算时间" align="center" prop="settleTime" />
+            <el-table-column label="供应商结算金额" align="center" prop="shouldSettleShop" />
+            <el-table-column label="丽格结算金额" align="center" prop="shouldSettleOrganize" />
+            <el-table-column label="采美结算金额" align="center" prop="shouldSettleCm" />
           </el-table>
         </div>
       </el-card>
@@ -77,8 +79,7 @@ export default {
   },
   data() {
     return {
-      repacts: {},
-      products: [],
+      order: {},
       settleRecord: []
     }
   },
@@ -94,7 +95,7 @@ export default {
     async organizeSettleRecord() {
       try {
         const res = await organizeSettleRecord(this.orderId)
-        this.repacts = res.data.repacts
+        this.order = res.data.order
         this.settleRecord = res.data.settleRecord
       } catch (error) {
         console.log('error', error)
@@ -104,7 +105,7 @@ export default {
       this.$store.dispatch('tagsView/delView', this.$route).then(() => {
         this.$nextTick(() => {
           this.$router.replace({
-            path: '/finance/list'
+            path: '/finance/paysettle-list'
           })
         })
       })

src/views/order/addLogistics.vue

@@ -57,7 +57,7 @@
           </el-row>
           <el-row :gutter="24" class="box-row">
             <el-form-item label="图片备注:" prop="logImage">
-              <div class="form-el-upload">
+              <div class="form-el-upload" style="width: 148px;height: 148px;">
                 <el-upload
                   class="avatar-uploader"
                   :action="actionUrl"
@@ -326,9 +326,6 @@ export default {
   .el-form-item__label{
       text-align: right !important;
   }
-  .form-el-upload{
-    width: 100% !important;
-  }
   .el-upload__tip{
     line-height: 20px;
     color: red;

src/views/order/deliver.vue

@@ -7,7 +7,7 @@
           <el-col :span="4"><b>手机号：</b> {{ orderInfo.mobile }} </el-col>
           <el-col :span="16"><b>收货地址：</b> {{ orderInfo.address }} </el-col>
         </el-row>
-        <el-row :gutter="24" class="box-row">
+        <el-row v-if="orderInfo.notes" :gutter="24" class="box-row">
           <el-col :span="24"><b>买家留言：</b>
             <span v-for="(msg,index) in orderInfo.notes" :key="index">
               【{{ `${index+1}.${msg}` }}】

src/views/order/detail.vue

@@ -11,7 +11,7 @@
           <el-col :span="6"><b>订单编号(ID)：</b> {{ order.orderNo + '(' + order.orderId + ')' }}</el-col>
           <el-col :span="6"><b>订单状态：</b>
             <template v-if="['11','12','13','21','22','23','31','32','33'].indexOf(order.status)>=0">
-              <el-tag type="success" size="small">交易中({{ order.status | orderStatusFilter }})</el-tag>
+              <el-tag type="success" size="small">交易中</el-tag>
             </template>
             <template v-else>
               <el-tag :type="order.status*1===6?'info':''" size="small">{{ order.status | orderStatusFilter }}</el-tag>
@@ -23,9 +23,6 @@
                 功能<i class="el-icon-arrow-down el-icon--right" />
               </el-button>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item>
-                  <div @click="RemarksOrder(order.orderId)">订单备注</div>
-                </el-dropdown-item>
                 <el-dropdown-item v-if="order.checkFlag === 1">
                   <div @click="handeleDialogFormVisible"> 更改收款状态</div>
                 </el-dropdown-item>
@@ -41,6 +38,9 @@
                 <el-dropdown-item>
                   <div @click="handeleDropdown(4,order.orderId)">退款（退货）记录</div>
                 </el-dropdown-item>
+                <el-dropdown-item>
+                  <div @click="RemarksOrder(order.orderId)">订单备注</div>
+                </el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </el-col>
@@ -202,13 +202,6 @@
               <template slot="prepend">￥</template>
             </el-input>
           </el-form-item>
-          <el-form-item label="修改订单收款状态:" prop="sataus">
-            <el-select v-model="chengeOrder.status" placeholder="请选择">
-              <el-option label="请选择" value="" />
-              <el-option label="部分收款" :value="2" />
-              <el-option label="已收款" :value="3" />
-            </el-select>
-          </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button @click="dialogFormVisible = false">取消</el-button>
@@ -249,8 +242,7 @@ export default {
       dialogFormVisible: false,
       chengeOrder: {
         orderId: this.$route.query.id * 1,
-        amount: '',
-        status: ''// 2部分收款 3已收款
+        amount: ''
       },
       orderInvoice: {},
       voucher: [],

src/views/order/list.vue

@@ -19,13 +19,12 @@
       </div>
       <div class="filter-control">
         <span>商品名称:</span>
-        <el-input v-model="listQuery.receiver" style="width:180px;" placeholder="商品名称" clearable @keyup.enter.native="getList" @clear="getList" />
+        <el-input v-model="listQuery.productName" style="width:180px;" placeholder="商品名称" clearable @keyup.enter.native="getList" @clear="getList" />
       </div>
       <div class="filter-control">
         <span>订单状态:</span>
         <el-select v-model="listQuery.status" style="width:180px;" clearable @change="getList">
           <el-option value="" label="所有" />
-          <el-option label="待确认" value="0" />
           <el-option label="交易中" value="99" />
           <el-option label="交易完成" value="4" />
           <el-option label="订单完成" value="5" />

src/views/order/refund-record.vue

@@ -18,7 +18,7 @@
       <el-row :gutter="24" class="box-row">
         <el-col :span="6"><b>订单状态:</b>
           <template v-if="['11','12','13','21','22','23','31','32','33'].indexOf(order.status)>=0">
-            <el-tag type="success" size="small">{{ '交易中('+statusObj[order.status]+')' }}</el-tag>
+            <el-tag type="success" size="small">交易中</el-tag>
           </template>
           <template v-else>
             <el-tag :type="order.status*1===6?'info':''" size="small">{{ statusObj[order.status] }}</el-tag>

src/views/order/refund-return.vue

@@ -111,7 +111,7 @@
               <el-col :span="6"><b>下单时间:</b> <template v-if="order.orderTime">{{ order.orderTime | parseTime('{y}-{m}-{d} {h}:{i}:{s}') }}</template></el-col>
               <el-col :span="6"><b>订单状态:</b>
                 <template v-if="['11','12','13','21','22','23','31','32','33'].indexOf(order.status)>=0">
-                  <el-tag type="success" size="small">{{ '交易中('+statusObj[order.status]+')' }}</el-tag>
+                  <el-tag type="success" size="small">交易中</el-tag>
                 </template>
                 <template v-else>
                   <el-tag :type="order.status*1===6?'info':''" size="small">{{ statusObj[order.status] }}</el-tag>