第一次更新，完成了初版调整

admin-vue/src/views/partners/order/Index.vue

@@ -5,13 +5,16 @@
       <!-- 搜索板块 -->
       <a-row class="row-item-search">
         <a-form class="search-form" :form="searchForm" layout="inline" @submit="handleSearch">
-          <a-form-item label="用户电话">
-            <a-input v-decorator="['search']" placeholder="请输入用户电话" />
+          <a-form-item label="司机手机号">
+            <a-input v-decorator="['search']" placeholder="请输入司机手机号" />
           </a-form-item>
-          <a-form-item label="商品编码">
-            <a-input v-decorator="['goods_no']" placeholder="商品编码" />
+          <a-form-item label="司机姓名">
+            <a-input v-decorator="['driver_name']" placeholder="请输入司机姓名" />
           </a-form-item>
-          <a-form-item label="分油状态">
+          <a-form-item label="单号">
+            <a-input v-decorator="['orderNo']" placeholder="油卡编号/销售单号/批次号/运单号" />
+          </a-form-item>
+          <a-form-item label="发放状态">
             <a-select v-decorator="['oil_status', { initialValue: -1 }]">
               <a-select-option :value="-1">全部</a-select-option>
               <a-select-option
@@ -21,7 +24,15 @@
               >{{ item.name }}</a-select-option>
             </a-select>
           </a-form-item>
-          <a-form-item label="使用状态">
+          <a-form-item label="企油通发放态">
+            <a-select v-decorator="['oil_status_zsy', { initialValue: -1 }]">
+              <a-select-option :value="-1">全部</a-select-option>
+              <a-select-option :value="0">未提交</a-select-option>
+              <a-select-option :value="2">发放成功</a-select-option>
+              <a-select-option :value="3">发放失败</a-select-option>
+            </a-select>
+          </a-form-item>
+          <a-form-item label="加油核销">
             <a-select v-decorator="['use_status', { initialValue: -1 }]">
               <a-select-option :value="-1">全部</a-select-option>
               <a-select-option
@@ -55,7 +66,7 @@
       </a-row>
       <!-- 操作板块 -->
       <div class="row-item-tab clearfix flex-box">
-        <span class="form-total">油卡金额：￥{{ total_money }}</span>
+        <span class="form-total">发放总金额：￥{{ total_money }}</span>
       </div>
     </div>
     <s-table
@@ -66,52 +77,62 @@
       :data="loadData"
       :pageSize="15"
     >
-      <span slot="goods" slot-scope="text">
-        <GoodsItem
-          :data="{
-            image: text.images[0].file.preview_url,
-            imageAlt: '商品图片',
-            title: text.goods_name,
-            goods_no: text.goods_no,
-            goodsProps: text.goods_props
-          }"
-        />
-      </span>
       <span slot="partners" slot-scope="text">
         <p>{{ text.name }}</p>
       </span>
+      <div slot="driver" slot-scope="item">
+        <p class="mtb-2">{{ item.driver_name || '-' }}</p>
+        <p class="mtb-2 f-13">{{ item.mobile }}</p>
+      </div>
+      <div slot="qyt" slot-scope="item">
+        <p class="mtb-2 f-13">批次：{{ item.batch_no || '-' }}</p>
+        <p class="mtb-2 f-13">运单：{{ item.waybill_no || '-' }}</p>
+      </div>
+      <div slot="consume" slot-scope="item">
+        <template v-if="item.use_status === 1">
+          <p class="mtb-2 f-13">{{ item.station_name || '-' }}</p>
+          <p class="mtb-2 f-13">{{ item.oil_name }} {{ item.litter }}L</p>
+          <p class="mtb-2 f-13">实付：￥{{ (item.pay_fee / 100).toFixed(2) }}</p>
+        </template>
+        <span v-else>-</span>
+      </div>
       <div slot="status" slot-scope="item">
         <p class="mtb-2">
-          <span class="f-13">分油状态：</span>
+          <span class="f-13">发放状态：</span>
           <a-tag
               :color="item.oil_status == OilStatusEnum.OIL.value ? 'green' : ''"
           >{{ OilStatusEnum[item.oil_status].name }}</a-tag>
         </p>
         <p class="mtb-2">
-          <span class="f-13">使用状态：</span>
+          <span class="f-13">加油核销：</span>
           <a-tag
               :color="item.use_status == UseStatusEnum.USE.value ? 'green' : ''"
           >{{ UseStatusEnum[item.use_status].name }}</a-tag>
         </p>
+        <p class="mtb-2">
+          <span class="f-13">企油通：</span>
+          <a-tag :color="qytColor(item.oil_status_zsy)">{{ qytText(item.oil_status_zsy) }}</a-tag>
+        </p>
+        <p v-if="item.oil_text" class="mtb-2 f-13 order-remark">{{ item.oil_text }}</p>
       </div>
       <div class="actions" slot="action" slot-scope="item">
         <!--有付款权限，订单状态为进行中，已支付，并且未使用-->
         <a
             v-if="(inArray(item.oil_status_zsy, [3])) && item.oil_status === 0 && item.oilCardType === 'zsy_ticket'"
             @click="handleShare(item)"
-        >手动分油</a>
+        >重新发放</a>
         <a
             v-if="(inArray(item.oil_status_zsy, [2])) && item.oil_status === 1 && item.use_status === 0 && item.oilCardType === 'zsy_ticket'"
             @click="handlePay(item)"
-        >付款码</a>
+        >加油链接</a>
         <a
             v-if="(inArray(item.oil_status_zsy, [2])) && item.oil_status === 1 && item.oilCardType === 'zsy_ticket'"
             @click="handleOil(item)"
-        >分油结果回调</a>
+        >重推发放结果</a>
         <a
             v-if="(inArray(item.oil_status_zsy, [2])) && item.oil_status === 1 && item.use_status === 1 && item.oilCardType === 'zsy_ticket'"
             @click="handleUse(item)"
-        >使用结果回调</a>
+        >重推加油结果</a>
       </div>
     </s-table>
     <ShareForm ref="ShareForm" @handleSubmit="handleRefresh" />
@@ -123,7 +144,7 @@
 
 <script>
 import * as Api from '@/api/partners/order'
-import { STable, GoodsItem } from '@/components/Table'
+import { STable } from '@/components/Table'
 import {
   OilStatusEnum, UseStatusEnum
 } from '@/common/enum/order'
@@ -136,7 +157,6 @@ export default {
   name: 'Index',
   components: {
     STable,
-    GoodsItem,
     ShareForm,
     PayForm,
     OilForm,
@@ -162,9 +182,8 @@ export default {
           scopedSlots: { customRender: 'oilCardNo' }
         },
         {
-          title: '分油记录编号',
-          dataIndex: 'shareNo',
-          scopedSlots: { customRender: 'shareNo' }
+          title: '企油通单号',
+          scopedSlots: { customRender: 'qyt' }
         },
         {
           title: '对接公司内部销售单号',
@@ -172,23 +191,21 @@ export default {
           scopedSlots: { customRender: 'partners_order_no' }
         },
         {
-          title: '油卡数量',
+          title: '数量',
           dataIndex: 'total_num',
           scopedSlots: { customRender: 'total_num' }
         },
         {
-          title: '油卡金额',
+          title: '发放金额',
           dataIndex: 'total_price'
         },
         {
-          title: '商品信息',
-          dataIndex: 'goods',
-          scopedSlots: { customRender: 'goods' }
+          title: '司机',
+          scopedSlots: { customRender: 'driver' }
         },
         {
-          title: '手机号',
-          dataIndex: 'mobile',
-          scopedSlots: { customRender: 'mobile' }
+          title: '加油信息',
+          scopedSlots: { customRender: 'consume' }
         },
         {
           title: '合作商',
@@ -256,7 +273,16 @@ export default {
       })
     },
 
-    // 手动分油
+    // 企油通发放态文案
+    qytText (v) {
+      return { 0: '未提交', 1: '处理中', 2: '发放成功', 3: '发放失败' }[v] || '未知'
+    },
+    // 企油通发放态颜色
+    qytColor (v) {
+      return { 2: 'green', 3: 'red' }[v] || ''
+    },
+
+    // 重新发放
     handleShare (record) {
       this.$refs.ShareForm.show(record)
     },