Merge branch 'dev' into 'test'

Dev

See merge request quanshu/mp-ui-pc!114

src/views/index.vue

@@ -27,8 +27,8 @@ export default {
   },
 
   created() {
-    //this.getPayAmtList()
-    // this.getPayUserCntList()
+    this.getPayAmtList()
+    this.getPayUserCntList()
     this.getSiteIncreaseList()
   },
   methods: {

src/views/order/channel/detail.vue

@@ -31,6 +31,12 @@
             <div class="title">经销商：</div>
             <div class="txt">{{ info.channel && info.channel.name }}</div>
           </div>
+          <div class="info-item-content-one">
+            <div class="title">上级渠道：</div>
+            <div class="txt">{{ info.channel && info.channel.parentName }}</div>
+          </div>
+        </div>
+        <div class="info-item-content">
           <div class="info-item-content-one">
             <div class="title">收货人：</div>
             <div class="txt">{{ info.receiver || "--" }}</div>
@@ -39,8 +45,6 @@
             <div class="title">联系电话：</div>
             <div class="txt">{{ info.tel || "--" }}</div>
           </div>
-        </div>
-        <div class="info-item-content">
           <div class="info-item-content-one">
             <div class="title">收货地址：</div>
             <div class="">
@@ -118,6 +122,15 @@
               <div>{{ $numberFormat(row.pkgSalePrice * row.orderNum) }}</div>
             </template>
           </el-table-column>
+          <el-table-column v-if="status.value === 2" label="附加信息">
+            <template slot-scope="{ row }">
+              <div>序列号：
+                 <div v-for="(item, index) in row.detailList" :key="index">
+                   {{item.startSn}} 至 {{item.endSn}}
+                 </div>
+              </div>
+            </template>
+          </el-table-column>
         </el-table>
       </div>
       <div class="info-amt">

src/views/order/channel/index.vue

@@ -123,17 +123,18 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="数量" prop="pkgNum" min-width="85">
+      <el-table-column label="数量" prop="pkgNum" min-width="65">
         <template slot-scope="{ row }">
           <div>{{ row.pkgNum }}包</div>
         </template>
       </el-table-column>
-      <el-table-column label="实付金额(元)" min-width="85">
+      <el-table-column label="实付金额(元)" min-width="65">
         <template slot-scope="{ row }">
           <div>{{ $numberFormat(row.payAmt) }}</div>
         </template>
       </el-table-column>
       <el-table-column label="经销商" prop="channelName" min-width="80" />
+      <el-table-column label="上级渠道" prop="parentName" min-width="80" />
       <el-table-column label="收货人/收货地址" prop="addr" min-width="120">
         <template slot-scope="{ row }">
           <div>
@@ -341,4 +342,4 @@ export default {
 ::v-deep .el-tabs--border-card > .el-tabs__content {
   padding: 0;
 }
-</style>
+</style>