丽格版本V1.0.1

src/views/order/detail.vue

@@ -12,9 +12,9 @@
     <el-card v-if="listLoading" class="box-card">
       <div class="refund-item">
         <el-row :gutter="24" class="box-row">
-          <el-col :span="6"><b>下单时间：</b> {{ order.orderTime }}</el-col>
+          <el-col :span="5"><b>下单时间：</b> {{ order.orderTime }}</el-col>
           <el-col
-            :span="6"
+            :span="5"
           ><b>订单编号(ID)：</b> {{ order.orderNo + "(" + order.orderId + ")" }}</el-col>
           <el-col
             :span="4"
@@ -34,11 +34,16 @@
               }}</el-tag>
             </template>
           </el-col>
-          <el-col :span="6"><b>订单来源：</b> 【丽格集采联盟】平台</el-col>
+          <el-col :span="5">
+            <b>订单类型：</b>
+            <span style="margin: 0;">{{ order.orderType === 1 ? '自主订单' : '采购员订单' }}</span>
+            <span v-if="order.orderType === 0" style="margin: 0;">({{ order.spName }})</span>
+          </el-col>
+          <el-col :span="4"><b>订单来源：</b> 【丽格集采联盟】平台</el-col>
         </el-row>
         <el-row :gutter="24" class="box-row">
           <el-col
-            :span="6"
+            :span="5"
           ><b>收款状态：</b>
             <el-tag
               v-if="order.receiptStatus * 1 === 1"
@@ -57,7 +62,7 @@
             >已收款</el-tag>
           </el-col>
           <el-col
-            :span="6"
+            :span="5"
           ><b>发货状态：</b>
             <el-tag
               v-if="order.sendOutStatus * 1 === 1"

src/views/order/list.vue

@@ -117,12 +117,20 @@
           @change="getList"
         />
       </div>
-      <!-- <div class="filter-control orderSource">
+      <div class="filter-control orderSource">
+        <span>订单类型:</span>
+        <el-select v-model="listQuery.orderType" style="width:180px;" @change="getList">
+          <el-option label="所有" value="" />
+          <el-option label="采购员订单" :value="0" />
+          <el-option label="自主订单" :value="1" />
+        </el-select>
+      </div>
+      <div class="filter-control orderSource">
         <span>订单来源:</span>
         <el-select v-model="listQuery.organizeId" style="width:180px;" @change="getList">
           <el-option label="【丽格集采联盟】平台" :value="4" />
         </el-select>
-      </div> -->
+      </div>
       <div class="filter-control">
         <el-button type="primary" icon="el-icon-search" @click="getList">查询</el-button>
       </div>
@@ -138,6 +146,12 @@
     >
       <el-table-column label="订单ID" align="center" prop="orderId" width="65" />
       <el-table-column label="订单编号" align="center" prop="orderNo" />
+      <el-table-column label="订单类型" align="center" prop="payTotalFee">
+        <template slot-scope="{row}">
+          <p style="margin: 0;">{{ row.orderType === 1 ? '自主订单' : '采购员订单' }}</p>
+          <p v-if="row.orderType === 0" style="margin: 0;">({{ row.spName }})</p>
+        </template>
+      </el-table-column>
       <el-table-column label="机构" align="center" prop="clubName" />
       <el-table-column label="收货人" align="center" prop="receiver" width="100" />
       <el-table-column label="订单状态" align="center" prop="status" width="150">
@@ -223,6 +237,7 @@ export default {
       listQuery: {
         index: 1,
         pageSize: 10,
+        orderType: '',
         organizeId: 4,
         orderId: '',
         orderNo: '',