修复

src/router/index.js

@@ -16,32 +16,7 @@ import campaign from './modules/campaign'
 import orderRouter from './modules/order'
 import financeRouter from './modules/finance'
 import otherRouter from './modules/other'
-/**
- * Note: sub-menu only appear when route children.length >= 1
- * Detail see: https://panjiachen.github.io/vue-element-admin-site/guide/essentials/router-and-nav.html
- *
- * hidden: true                   if set true, item will not show in the sidebar(default is false)
- * alwaysShow: true               if set true, will always show the root menu
- *                                if not set alwaysShow, when item has more than one children route,
- *                                it will becomes nested mode, otherwise not show the root menu
- * redirect: noRedirect           if set noRedirect will no redirect in the breadcrumb
- * name:'router-name'             the name is used by <keep-alive> (must set!!!)
- * meta : {
-    roles: ['admin','editor']    control the page roles (you can set multiple roles)
-    title: 'title'               the name show in sidebar and breadcrumb (recommend set)
-    icon: 'svg-name'             the icon show in the sidebar
-    noCache: true                if set true, the page will no be cached(default is false)
-    affix: true                  if set true, the tag will affix in the tags-view
-    breadcrumb: false            if set false, the item will hidden in breadcrumb(default is true)
-    activeMenu: '/example/list'  if set path, the sidebar will highlight the path you set
-  }
- */
 
-/**
- * constantRoutes
- * a base page that does not have permission requirements
- * all roles can be accessed
- */
 export const constantRoutes = [
   {
     path: '/redirect',

src/views/club/list.vue

@@ -62,6 +62,7 @@
           </span>
         </template>
       </el-table-column>
+      <!-- <el-table-column label="采购员" align="center" prop="linkMan" /> -->
       <el-table-column label="状态" align="center" prop="status">
         <template slot-scope="{row}">
           <template v-if="row.clubStatus*1===1">

src/views/club/procure-edit.vue

@@ -2,7 +2,7 @@
   <div class="app-container" style="width: 800px;margin: 0 auto;">
     <el-form ref="bannerForm" :model="form" label-width="100px">
       <el-form-item label="姓名:" prop="name" :rules="rules.name">
-        <el-input v-model="form.name" placeholder="请填写姓名" maxlength="6" style="width: 250px;" />
+        <el-input v-model="form.name" placeholder="请填写姓名" maxlength="6" style="width: 200px;" />
       </el-form-item>
       <el-form-item label="手机号:" prop="mobile" :rules="rules.mobile">
         <el-input v-model="form.mobile" placeholder="请填写手机号" style="width: 200px" />

src/views/club/procure-list.vue

@@ -5,7 +5,6 @@
         <span style="width: auto;">机构名称:</span>
         <el-input
           v-model="listQuery.userName"
-          style="width:130px;"
           placeholder="请输入机构名称"
           clearable
           @keyup.enter.native="getList"
@@ -16,7 +15,6 @@
         <span style="width: auto;">联系人:</span>
         <el-input
           v-model="listQuery.linkMan"
-          style="width:130px;"
           placeholder="请输入联系人姓名"
           clearable
           @keyup.enter.native="getList"
@@ -27,7 +25,6 @@
         <span style="width: auto;">手机号:</span>
         <el-input
           v-model="listQuery.bindMobile"
-          style="width:130px;"
           placeholder="请输入手机号"
           clearable
           @keyup.enter.native="getList"

src/views/finance/details.vue

@@ -26,6 +26,7 @@
           <el-row :gutter="24" class="box-row">
             <el-col :span="5"><b>机构名称：</b> {{ order.clubName }}</el-col>
             <el-col :span="5"><b>下单日期：</b> {{ order.orderTime }}</el-col>
+            <!-- <el-col :span="5"><b>订单类型：</b> {{ order.orderTime }}</el-col> -->
           </el-row>
           <template v-if="repacts.payWay === 1">
             <h1 class="refund-item-title">订单收款记录：</h1>
@@ -40,13 +41,15 @@
             </el-table>
           </template>
         </div>
-        <template v-if="repacts.payWay === 2">
+        <template v-if="repacts.payWay === 2 && repacts.vouchers.length > 0">
           <h1 style="font-size: 14px;color: #409EFF;">线下支付凭证：</h1>
           <el-row v-for="(vouch,index) in repacts.vouchers" :key="index" style="padding:5px 0">
             <p class="refund-item-p">{{ vouch.addTime }}</p>
             <div class="refund-item-imgs">
               <div v-for="(imgage,imgIndex) in vouch.images" :key="imgIndex" class="item-image">
-                <img :src="imgage" alt="">
+                <a :href="imgage" target="_blank" rel="noopener noreferrer">
+                  <img :src="imgage" alt="">
+                </a>
               </div>
             </div>
             <p class="refund-item-p">备注：{{ vouch.remarks }}</p>
@@ -166,7 +169,12 @@ export default {
     border: 1px dashed #E1E1E1;
     float: left;
   }
-  .refund-item-imgs .item-image img{
+  .refund-item-imgs .item-image a{
+    width: 148px;
+    height: 148px;
+    display: block;
+  }
+  .refund-item-imgs .item-image a img{
     width: 148px;
     height: 148px;
     display: block;

src/views/finance/list.vue

@@ -36,6 +36,14 @@
           @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="99" />
+          <el-option label="自主订单" value="7" />
+        </el-select>
+      </div> -->
       <div class="filter-control">
         <span>机构名称:</span>
         <el-input

src/views/finance/payapply-list.vue

@@ -71,10 +71,10 @@
       </div>
       <div class="filter-control">
         <span>付款状态:</span>
-        <el-select v-model="listQuery.status" style="width:180px;" clearable @change="getList">
+        <el-select v-model="listQuery.paystatus" style="width:180px;" clearable @change="getList">
           <el-option value="" label="所有" />
-          <el-option label="未付款" value="0" />
-          <el-option label="部分付款" value="1" />
+          <el-option label="未付款" :value="1" />
+          <el-option label="部分付款" :value="2" />
         </el-select>
       </div>
       <div class="filter-control">

src/views/order/detail.vue

@@ -9,7 +9,7 @@
         <el-row :gutter="24" class="box-row">
           <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>
+          <el-col :span="4"><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>
@@ -17,7 +17,30 @@
               <el-tag :type="order.status*1===6?'info':''" size="small">{{ order.status | orderStatusFilter }}</el-tag>
             </template>
           </el-col>
-          <el-col :span="6">
+          <!-- <el-col :span="4"><b>订单类型：</b> {{ order.orderTime }}</el-col> -->
+        </el-row>
+        <el-row :gutter="24" class="box-row">
+          <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.sendOutStatus*1===1" type="danger" size="small">待发货</el-tag>
+            <el-tag v-if="order.sendOutStatus*1===2" type="warning" size="small">部分发货</el-tag>
+            <el-tag v-if="order.sendOutStatus*1===3" type="success" size="small">已发货</el-tag>
+          </el-col>
+          <el-col :span="4"><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="4"><b>退款状态：</b>
+            <el-tag v-if="order.refundType*1===1" type="warning" size="small">部分退款</el-tag>
+            <el-tag v-else-if="order.refundType*1===2" type="danger" size="small">已退款</el-tag>
+            <el-tag v-else type="info" size="small">无退款</el-tag>
+          </el-col>
+          <el-col :span="4">
             <el-dropdown class="dropdown">
               <el-button type="primary" size="mini">
                 功能<i class="el-icon-arrow-down el-icon--right" />
@@ -45,28 +68,6 @@
             </el-dropdown>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="box-row">
-          <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.sendOutStatus*1===1" type="danger" size="small">待发货</el-tag>
-            <el-tag v-if="order.sendOutStatus*1===2" type="warning" size="small">部分发货</el-tag>
-            <el-tag v-if="order.sendOutStatus*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.refundType*1===1" type="warning" size="small">部分退款</el-tag>
-            <el-tag v-else-if="order.refundType*1===2" type="danger" size="small">已退款</el-tag>
-            <el-tag v-else type="info" size="small">无退款</el-tag>
-          </el-col>
-        </el-row>
       </div>
       <div class="refund-item">
         <el-row v-if="order.bpOrderUserinfo" :gutter="24" class="box-row">
@@ -196,10 +197,12 @@
           <p class="refund-item-p">{{ vouch.addTime }}</p>
           <div class="refund-item-imgs">
             <div v-for="(imgage,imgIndex) in vouch.images" :key="imgIndex" class="item-image">
-              <img :src="imgage" alt="">
+              <a :href="imgage" target="_blank" rel="noopener noreferrer">
+                <img :src="imgage" alt="">
+              </a>
             </div>
           </div>
-          <p class="refund-item-p">备注：{{ vouch.remarks }}</p>
+          <p v-if="vouch.remarks" class="refund-item-p">备注：{{ vouch.remarks }}</p>
         </el-row>
       </div>
       <el-dialog title="更改收款状态" :visible.sync="dialogFormVisible" width="600px">
@@ -418,7 +421,12 @@ export default {
     border: 1px dashed #E1E1E1;
     float: left;
   }
-  .refund-item-imgs .item-image img{
+  .refund-item-imgs .item-image a{
+    width: 148px;
+    height: 148px;
+    display: block;
+  }
+  .refund-item-imgs .item-image a img{
     width: 148px;
     height: 148px;
     display: block;

src/views/order/list.vue

@@ -57,6 +57,14 @@
           @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="99" />
+          <el-option label="自主订单" value="7" />
+        </el-select>
+      </div> -->
       <div class="filter-control">
         <span>订单状态:</span>
         <el-select v-model="listQuery.status" style="width:180px;" clearable @change="getList">