no message

src/api/order.js

@@ -83,12 +83,12 @@ export function delCode2(data) {
 
 //导入发货条码
 export function listImport(data) {
-	return handleImport('/jx/goods/import', data.formdata, data.id || '')
+  return handleImport('/jx/goods/import', data.formdata, data.id || '')
 }
 
 //导入退货条码
 export function listImport2(data) {
-	return handleImport('/jx/goods/importRefund', data.formdata, data.id || '')
+  return handleImport('/jx/goods/importRefund', data.formdata, data.id || '')
 }
 
 //规格型号
@@ -306,7 +306,6 @@ export function changeShow(params) {
   })
 }
 
-
 // 获取线下订单列表
 export function getOfflineOrderList(data) {
   return request({
@@ -379,8 +378,6 @@ export function getPrintList(params) {
   })
 }
 
-
-
 // 获取销售退货单列表
 export function getSalesReturnOrderList(data) {
   return request({
@@ -487,4 +484,19 @@ export function salesDeliverOrderRefund(params) {
     method: 'post',
     params
   })
-}
+}
+
+export function orderPaymentRecordList(params) {
+  return request({
+    url: '/order/payment/record/list',
+    method: 'post',
+    params
+  })
+}
+export function orderPaymentRecordAdd(data) {
+  return request({
+    url: '/order/payment/record/add',
+    method: 'post',
+    data
+  })
+}

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

@@ -40,7 +40,6 @@
                       <el-button slot="reference" size="small" type="danger">取消订单</el-button>
                     </el-popconfirm>
                   </template>
-                  <!-- <el-button type="primary" size="small" @click="returnOrder()" v-if="(orderDetail.orderStatus === 'YFH' || orderDetail.orderStatus === 'OVER')">发起退货</el-button> -->
                   <template v-if="orderDetail.orderStatus === 'YFH' || orderDetail.orderStatus === 'OVER'">
                     <el-button size="small" @click="showDialog('query')">查看物流</el-button>
                   </template>
@@ -70,7 +69,7 @@
           <el-col :span="14" style="padding-top: 10px">
             <el-steps :active="orderDetail.orderStatus != 'CLOSE' ? curOrderStatus : -1" align-center>
               <el-step title="买家下单" :description="orderDetail.createTime"></el-step>
-              <el-step title="买家付款" :description="orderDetail.payTime ? orderDetail.payTime : ''"></el-step>
+              <el-step title="审核通过" :description="orderDetail.payTime ? orderDetail.payTime : ''"></el-step>
               <el-step title="商家发货" :description="orderDetail.deliverTime ? orderDetail.deliverTime : ''"></el-step>
               <el-step title="交易成功" :description="orderDetail.overTime ? orderDetail.overTime : ''"></el-step>
             </el-steps>
@@ -115,7 +114,11 @@
             </div>
             <div class="item">
               <div class="label">支付方式：</div>
-              <div class="value">{{ orderDetail.payType }}</div>
+              <div class="value">
+                {{ orderDetail.payType }}--{{
+                  { NO_PAID: '待收款', PART_PAID: '部分收款', PAID: '完成收款' }[orderDetail.payStatus]
+                }}
+              </div>
             </div>
             <div class="item">
               <div class="label">是否开票：</div>
@@ -385,6 +388,74 @@
       </div>
     </div>
 
+    <!-- 收款记录 -->
+    <div style="margin-top: 20px">
+      <!-- 列表 -->
+      <div style="margin-bottom: 20px">
+        <el-table :data="orderPaymentRecordListData" style="width: 100%" border>
+          <el-table-column prop="payStatus" label="收款标志" align="center"></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>
+          <el-table-column prop="fileUrl" label="收款凭证" align="center">
+            <template slot-scope="scope">
+              <div>
+                <el-image
+                  v-for="(url, index) in (scope.row.fileUrl || '').split(',').filter(url => !!url)"
+                  :key="index"
+                  style="width: 100px; height: 100px"
+                  :src="url"
+                  :preview-src-list="[url]"
+                ></el-image>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <!-- 表单 -->
+      <el-card class="box-card" v-if="pageType === 'shoukuan' && orderDetail.payStatus !== 'PAID'">
+        <div>
+          <el-form size="mini" :model="ruleForm" :inline="true" :rules="rules" ref="ruleForm" label-width="120px">
+            <el-row :gutter="20">
+              <el-col :span="8">
+                <el-form-item label="*收款人" prop="paidBy">
+                  <el-input style="width: 100%" v-model="ruleForm.paidBy"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="*收款金额" prop="paidAmount">
+                  <el-input style="width: 100%" type="number" v-model="ruleForm.paidAmount"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="*收款时间" prop="paidTime">
+                  <el-date-picker
+                    style="width: 100%"
+                    v-model="ruleForm.paidTime"
+                    type="datetime"
+                    placeholder="选择日期时间"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="*凭证" prop="fileUrls">
+                  <ImageUpload :fileList="ruleForm.fileUrls" :limit="100" :isEdit="true" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+        <!-- 操作按钮 -->
+        <div style="text-align: right">
+          <el-button size="mini" type="primary" @click="shoukuanhs('PART_PAID')">部分收款</el-button>
+          <el-button size="mini" type="primary" @click="shoukuanhs('PAID')">完成收款</el-button>
+        </div>
+      </el-card>
+    </div>
+    <!-- -------------------------------------------------------------------------------------------- -->
+
     <el-dialog
       :title="dialogTitle"
       :visible.sync="remarkVisible"
@@ -893,6 +964,7 @@
 </template>
 
 <script>
+import ImageUpload from '@/components/file-upload'
 import {
   cancelOrder,
   changePrice,
@@ -911,7 +983,9 @@ import {
   saveCode,
   delCode,
   getPrintList,
-  getDeliverList
+  getDeliverList,
+  orderPaymentRecordList,
+  orderPaymentRecordAdd
 } from '@/api/order'
 import { getExpress, getCompanyList } from '@/api/common'
 import { commonTemplateDownload } from '@/api/common.js'
@@ -919,6 +993,7 @@ import * as Storage from '@/api/storage'
 import { mapGetters } from 'vuex'
 
 export default {
+  components: { ImageUpload },
   name: 'detail',
   data() {
     return {
@@ -1022,7 +1097,6 @@ export default {
       dialogWidth: '50%',
       logisticsLoading: false,
       companyList: [],
-
       compensateFormVisible: false,
       compensateForm: {
         id: null,
@@ -1064,25 +1138,115 @@ export default {
       isEdit2: 0,
       joinCode: JSON.parse(localStorage.getItem('greemall_user')).joinCode,
       orderDetailId: '',
-
       printList: [],
       deliverList: [],
-
       deliverSelection: [],
-      storageName: ''
+      storageName: '',
+      pageType: '',
+      orderPaymentRecordListData: [],
+      ruleForm: {
+        paidAmount: '',
+        paidBy: '',
+        paidTime: '',
+        fileUrls: []
+      },
+      rules: {
+        paidAmount: [
+          {
+            validator: (rule, value, callback) => {
+              if (!value) {
+                callback(new Error('请输入'))
+              } else {
+                callback()
+              }
+            },
+            trigger: 'blur'
+          }
+        ],
+        paidBy: [
+          {
+            validator: (rule, value, callback) => {
+              if (!value) {
+                callback(new Error('请输入'))
+              } else {
+                callback()
+              }
+            },
+            trigger: 'blur'
+          }
+        ],
+        paidTime: [
+          {
+            validator: (rule, value, callback) => {
+              if (!value) {
+                callback(new Error('请输入'))
+              } else {
+                callback()
+              }
+            },
+            trigger: 'blur'
+          }
+        ],
+        fileUrls: [
+          {
+            validator: (rule, value, callback) => {
+              if (!value.length) {
+                callback(new Error('请上传'))
+              } else {
+                callback()
+              }
+            },
+            trigger: 'blur'
+          }
+        ]
+      }
     }
   },
   created() {
     this.orderId = this.$route.query.orderId
+    this.pageType = this.$route.query.type
     this.getDetail()
     this.getStorageList()
     this.getCompanyList()
     this.getCompensateList()
     this.getPrintList()
     this.getDeliverList()
+    setTimeout(() => {
+      if (this.pageType === 'shoukuan') {
+        var elements = document.getElementsByClassName('app-main-view-div')
+        for (var el of elements) {
+          el.scrollTo(1000, 10000000000000000000)
+        }
+      }
+    }, 500)
   },
   methods: {
+    shoukuanhs(type) {
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          orderPaymentRecordAdd({
+            payStatus: type,
+            orderId: this.orderId,
+            ...this.ruleForm,
+            fileUrls: undefined,
+            fileUrl: this.ruleForm.fileUrls.map(item => item.url).join(',')
+          }).then(res => {
+            this.ruleForm = {
+              paidAmount: '',
+              paidBy: '',
+              paidTime: '',
+              fileUrls: []
+            }
+            this.$successMsg('记录成功')
+            this.getDetail()
+          })
+        }
+      })
+    },
     getDetail() {
+      orderPaymentRecordList({ orderId: this.orderId }).then(res => {
+        this.orderPaymentRecordListData = res.data
+      })
       getOrderDetail({ orderId: this.orderId, storageId: this.orderForm.storageId }).then(res => {
         this.orderDetail = res.data
         this.orderDetail.workerName = this.orderDetail.workerName ? this.orderDetail.workerName : '暂无'
@@ -1091,9 +1255,6 @@ export default {
         let arr = []
         res.data.orderDetails.forEach(item => {
           arr.push(item)
-          // if(item.goodsMaterialId){
-          // 	arr.push(item)
-          // }
         })
         this.formData1.list = arr
       })

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

@@ -3,6 +3,7 @@
     <zj-tab-page ref="tabPage" :defaultActives="[{ key: 'list', label: $route.meta.title + '-列表', essential: true }]">
       <template slot-scope="{ activeKey, data }">
         <div v-if="activeKey == 'list'" class="app-container">
+          <!-- 筛选条件 -->
           <div class="screen-container">
             <el-form ref="screenForm" :model="screenForm" label-width="70px" size="small" label-position="left">
               <el-row :gutter="20">
@@ -26,7 +27,6 @@
                     <el-input v-model="screenForm.phone" placeholder="请输入手机号"></el-input>
                   </el-form-item>
                 </el-col>
-
                 <el-col :xs="24" :sm="12" :lg="6">
                   <el-form-item label="网点名称" prop="websitId">
                     <el-select v-model="screenForm.websitId" placeholder="请选择网点名称" filterable clearable>
@@ -39,22 +39,11 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
-
                 <el-col :xs="24" :sm="12" :lg="6">
                   <el-form-item label="兑换码" prop="exchangeCode">
                     <el-input v-model="screenForm.exchangeCode" placeholder="请输入兑换码"></el-input>
                   </el-form-item>
                 </el-col>
-
-                <!--          <el-col :xs="24" :sm="12" :lg="6">-->
-                <!--            <el-form-item label="当前状态" prop="orderStatus">-->
-                <!--              <el-select v-model="screenForm.orderStatus" placeholder="全部">-->
-                <!--                <el-option label="全部" value=""></el-option>-->
-                <!--                <el-option :label="item.label" :value="item.value" v-for="(item, index) in screen_status" :key="index"></el-option>-->
-                <!--              </el-select>-->
-                <!--            </el-form-item>-->
-                <!--          </el-col>-->
-
                 <el-col :xs="24" :sm="12" :lg="6">
                   <el-form-item label="创建时间" prop="createDate" style="height: 33px">
                     <el-date-picker
@@ -68,7 +57,6 @@
                     </el-date-picker>
                   </el-form-item>
                 </el-col>
-
                 <el-col :xs="24" :sm="12" :lg="6">
                   <el-form-item label="支付时间" prop="payDate" style="height: 33px">
                     <el-date-picker
@@ -82,7 +70,6 @@
                     </el-date-picker>
                   </el-form-item>
                 </el-col>
-
                 <el-col :xs="24" :sm="12" :lg="6">
                   <el-form-item label="评价状态" prop="evaluateStatus">
                     <el-select v-model="screenForm.evaluateStatus" placeholder="全部">
@@ -94,7 +81,6 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
-
                 <el-col :xs="24" :sm="12" :lg="6">
                   <el-form-item label="派单异常" prop="sendStatus">
                     <el-select v-model="screenForm.sendStatus" placeholder="全部">
@@ -119,7 +105,6 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
-
                 <el-col :xs="24" :sm="24" :lg="24" class="tr">
                   <el-form-item label="">
                     <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
@@ -129,12 +114,16 @@
               </el-row>
             </el-form>
           </div>
-
+          <!-- --------------------------------------------------------------------------- -->
+          <!-- tab切换 / 操作按钮-->
           <div class="tabs-container order-tabs-container clearfix">
             <div class="fl">
               <el-tabs v-model="tabCurrent" type="card" @tab-click="changeTabs" class="fl" style="margin-right: 20px">
                 <el-tab-pane label="全部" name="ALL"></el-tab-pane>
-                <el-tab-pane label="待付款" name="NOPAY"></el-tab-pane>
+                <el-tab-pane label="微信支付待付款" name="NOPAY"></el-tab-pane>
+                <el-tab-pane label="待收款" name="NO_PAID"></el-tab-pane>
+                <el-tab-pane label="部分收款" name="PART_PAID"></el-tab-pane>
+                <el-tab-pane label="完成收款" name="PAID"></el-tab-pane>
                 <el-tab-pane label="待确认" name="DQR"></el-tab-pane>
                 <el-tab-pane label="待发货" name="DFH"></el-tab-pane>
                 <el-tab-pane label="已发货" name="YFH"></el-tab-pane>
@@ -165,7 +154,10 @@
               <el-button v-if="$restrict('exp')" size="small" type="primary" @click="handleExport">导出报表</el-button>
             </div>
           </div>
+          <!-- --------------------------------------------------------------------------- -->
+          <!-- 列表 -->
           <div class="order-main-container">
+            <!-- 表头 -->
             <div class="table-top">
               <el-row style="width: 100%">
                 <el-col :span="3">
@@ -178,23 +170,24 @@
                   <span class="item product">商品信息</span>
                 </el-col>
                 <el-col :span="3" style="text-align: right"><span class="item">单价(元)/数量</span></el-col>
-                <el-col :span="3" style="text-align: center"><span class="item">买家信息</span></el-col>
-                <el-col :span="3" style="text-align: center"><span class="item">收货信息</span></el-col>
+                <el-col :span="2" style="text-align: center"><span class="item">买家信息</span></el-col>
+                <el-col :span="2" style="text-align: center"><span class="item">收货信息</span></el-col>
                 <el-col :span="2" style="text-align: center"><span class="item">实付金额</span></el-col>
                 <el-col :span="2" style="text-align: center"><span class="item">订单状态</span></el-col>
+                <el-col :span="2" style="text-align: center"><span class="item">收款状态</span></el-col>
                 <el-col :span="2" style="text-align: center"><span class="item">评价状态</span></el-col>
                 <el-col :span="2" style="text-align: center"><span class="item">业务员</span></el-col>
                 <el-col :span="2" style="text-align: center"><span class="item">分销员</span></el-col>
                 <el-col :span="2" style="text-align: center"><span class="item">操作</span></el-col>
               </el-row>
             </div>
+            <!-- --------------------------------------------------------------------------- -->
             <div class="order-item" v-for="order in dataList" :key="order.orderId">
               <div class="order-top">
                 <el-checkbox v-model="order.selected"></el-checkbox>
                 <span><b>订单号</b>：{{ order.orderId }}</span>
                 <span><b>下单时间</b>：{{ order.createTime }}</span>
                 <span><b>商户</b>：{{ order.companyWechatName || '无' }}</span>
-                <!-- <span><b>网点</b>：{{ order.websitName || '无' }}</span> -->
                 <el-tag>{{ { 1: '商城销售', 2: '线下销售' }[order.saleType] }}</el-tag>
                 <el-tag
                   :type="order.payTypeId == 'WECHAT' ? 'success' : order.payTypeId == 'WECHAT_OFFLINE' ? 'warning' : ''"
@@ -212,7 +205,6 @@
                     @click="queryDetail(order.orderId)"
                     >查看详情</el-link
                   >
-                  <!-- <el-link type="primary" :underline="false" @click="queryWorkOrder(order.orderId)">订单工单</el-link> -->
                 </div>
               </div>
               <div class="order-content">
@@ -252,14 +244,14 @@
                       </div>
                     </div>
                   </el-col>
-                  <el-col :span="3" style="height: 100%">
+                  <el-col :span="2" style="height: 100%">
                     <div class="col-item">
                       <div>{{ order.userName }}</div>
                       <div>{{ order.phone }}</div>
                       <div style="color: #409eff">{{ order.isAddCorp ? '（已入驻企微）' : '' }}</div>
                     </div>
                   </el-col>
-                  <el-col :span="3" style="height: 100%">
+                  <el-col :span="2" style="height: 100%">
                     <div class="col-item">
                       <div>{{ order.receUserName }}/{{ order.recePhone }}</div>
                       <div class="ellipsis-2">
@@ -318,6 +310,13 @@
                   </el-col>
                   <el-col :span="2" style="height: 100%">
                     <div class="col-item">
+                      <div style="display: flex; align-items: center">
+                        {{ { NO_PAID: '待收款', PART_PAID: '部分收款', PAID: '完成收款' }[order.payStatus] }}
+                      </div>
+                    </div>
+                  </el-col>
+                  <el-col :span="2" style="height: 100%">
+                    <div class="col-item">
                       <el-popover placement="top" width="220" trigger="hover" v-if="order.commentService">
                         <div class="rate-list">
                           <div style="display: flex; align-items: center; margin-bottom: 5px">
@@ -349,6 +348,13 @@
                     <div class="col-item">
                       <div class="operate">
                         <el-popconfirm
+                          title="确定收款吗？"
+                          @confirm="quediingshoukuan(order.orderId)"
+                          v-if="['NO_PAID', 'PART_PAID'].includes(order.payStatus)"
+                        >
+                          <el-button slot="reference" type="text" size="small">收款</el-button>
+                        </el-popconfirm>
+                        <el-popconfirm
                           title="确定确认订单吗？"
                           @confirm="confirmOrder(order.orderId)"
                           v-if="order.orderStatus === 'DQR' && $restrict('confirmOrder')"
@@ -364,7 +370,6 @@
                         >
                           <el-button slot="reference" type="text" size="small">取消订单</el-button>
                         </el-popconfirm>
-                        <!-- <el-button type="text" size="small" @click="returnOrder(order.orderId)" v-if="(order.orderStatus === 'YFH' || order.orderStatus === 'OVER') && $restrict('returnOrder')">发起退货</el-button> -->
                         <el-button
                           type="text"
                           size="small"
@@ -412,7 +417,6 @@
                         >
                           查看发货条码
                         </el-button>
-                        <!-- toWorkOrderDetail(order.orderId) -->
                         <el-button
                           type="text"
                           size="small"
@@ -438,6 +442,7 @@
             </div>
             <div class="no-data" v-if="dataList.length <= 0">暂无订单</div>
           </div>
+          <!-- --------------------------------------------------------------------------- -->
           <div class="pagination clearfix">
             <div class="fr">
               <el-pagination
@@ -724,7 +729,6 @@
                           label="库存总数量"
                           width="100"
                         ></el-table-column>
-                        <!-- <el-table-column prop="stockNum" align="center" label="库存数量"></el-table-column> -->
                         <el-table-column prop="insideNum" align="center" label="内机数量"></el-table-column>
                         <el-table-column prop="outNum" align="center" label="外机数量"></el-table-column>
                         <el-table-column prop="partNum" align="center" label="配件数量"></el-table-column>
@@ -1285,6 +1289,7 @@ export default {
         memberName: '', // 会员昵称
         phone: '', // 手机号
         websitId: '', // 网点名称
+        payStatus: '', //支付状态
         orderStatus: '', // 状态
         createDate: '', // 创建时间
         payDate: '', // 支付时间
@@ -1294,14 +1299,6 @@ export default {
         workerOrderNo: '', // 信息编号
         payTypes: ''
       },
-      screen_status: [
-        // 筛选字段 - 状态
-        { label: '待付款', value: 'NOPAY' },
-        { label: '待发货', value: 'DFH' },
-        { label: '已发货', value: 'YFH' },
-        { label: '已完成', value: 'OVER' },
-        { label: '已退款', value: 'CLOSE' }
-      ],
       tabCurrent: 'ALL',
       currentPage: 1, // 当前页码
       pageSize: 10, // 每页数量
@@ -1436,8 +1433,19 @@ export default {
       })
     },
     changeTabs(tab, event) {
-      // this.$refs.screenForm.resetFields();
-      this.screenForm.orderStatus = this.tabCurrent === 'ALL' ? '' : tab.$options.propsData.name
+      if (this.tabCurrent === 'ALL') {
+        var v = tab.$options.propsData.name
+        if (['ALL', 'NOPAY', 'DQR', 'DFH', 'YFH', 'OVER', 'CLOSE', 'TIMEOUT'].includes(v)) {
+          this.screenForm.payStatus = ''
+          this.screenForm.orderStatus = v
+        } else if (['NO_PAID', 'PART_PAID', 'PAID'].includes(v)) {
+          this.screenForm.payStatus = v
+          this.screenForm.orderStatus = ''
+        }
+      } else {
+        this.screenForm.payStatus = ''
+        this.screenForm.orderStatus = ''
+      }
       this.currentPage = 1
       this.getList()
     },
@@ -1453,6 +1461,7 @@ export default {
         websitId: this.screenForm.websitId,
         exchangeCode: this.screenForm.exchangeCode,
         orderStatus: this.screenForm.orderStatus, // 状态
+        payStatus: this.screenForm.payStatus, // 状态
         startCreateTime: this.screenForm.createDate[0] ? this.screenForm.createDate[0] : null, // 创建时间
         endCreateTime: this.screenForm.createDate[1] ? this.screenForm.createDate[1] : null, // 创建时间
         startPayTime: this.screenForm.payDate[0] ? this.screenForm.payDate[0] : null, // 支付时间
@@ -1468,21 +1477,13 @@ export default {
       getList(params).then(res => {
         res.data.records.forEach(item => {
           item.selected = false
-          // item.websitName = this.handleText(item.websitName);
         })
         this.dataList = res.data.records
         this.listTotal = res.data.total
-        // this.listLoading = false;
       })
     },
     getOrderDetail() {
       getOrderDetail({ orderId: this.editOrderId, storageId: this.logisticsForm.storageId }).then(res => {
-        // let arr = []
-        // res.data.orderDetails.forEach(item=>{
-        // 	if(item.goodsMaterialId){
-        // 		arr.push(item)
-        // 	}
-        // })
         this.formData1.list = res.data.orderDetails
       })
     },
@@ -1621,8 +1622,6 @@ export default {
     },
     // 查看详情
     queryDetail(orderId) {
-      // let {href} = this.$router.resolve({path: `/order/detail?orderId=${orderId}`});
-      // window.open(href, '_blank');
       this.$router.push({
         name: 'order_detail',
         query: {
@@ -1630,6 +1629,15 @@ export default {
         }
       })
     },
+    quediingshoukuan(orderId) {
+      this.$router.push({
+        name: 'order_detail',
+        query: {
+          orderId,
+          type: 'shoukuan'
+        }
+      })
+    },
     openForm(type, order) {
       this.$refs.tabPage.addTab({
         // 对应显示的模块
@@ -2027,6 +2035,7 @@ export default {
           editAddress({
             orderId: this.addressFormOrder.orderId,
             orderStatus: this.addressFormOrder.orderStatus,
+            payStatus: this.addressFormOrder.payStatus,
             receUserName: this.addressForm.name,
             recePhone: this.addressForm.phone,
             province,
@@ -2060,6 +2069,7 @@ export default {
         websitId: this.screenForm.websitId,
         exchangeCode: this.screenForm.exchangeCode,
         orderStatus: this.screenForm.orderStatus, // 状态
+        payStatus: this.screenForm.payStatus, // 状态
         startCreateTime: this.screenForm.createDate[0] ? this.screenForm.createDate[0] : null, // 创建时间
         endCreateTime: this.screenForm.createDate[1] ? this.screenForm.createDate[1] : null, // 创建时间
         startPayTime: this.screenForm.payDate[0] ? this.screenForm.payDate[0] : null, // 支付时间
@@ -2145,9 +2155,6 @@ export default {
 
     // 查看工单
     toWorkOrderDetail(orderId) {
-      // let {href} = this.$router.resolve({path: `/order/workOrder_detail?orderId=${orderId}`});
-      // window.open(href, '_blank');
-
       this.$router.push({
         name: 'workOrder_detail',
         query: {
@@ -2383,8 +2390,6 @@ export default {
 
     handleRefreshList() {
       this.getList()
-      // this.recordSelected = []
-      // this.$refs.pageRef.refreshList()
     },
 
     handleInitPrint() {