显示调整

src/views/club/list.vue

@@ -59,8 +59,8 @@
           {{ ((pageNum-1)*listQuery.pageSize)+scope.$index+1 }}
         </template>
       </el-table-column>
-      <el-table-column label="账号" width="150" align="center" prop="account" />
-      <el-table-column label="会所名称" width="200" align="center" prop="userName" />
+      <el-table-column label="账号" min-width="90" align="center" prop="account" />
+      <el-table-column label="会所名称" min-width="120" align="center" prop="userName" />
       <el-table-column label="联系人" width="100" align="center" prop="linkMan" />
       <el-table-column label="手机号" width="110" align="center" prop="bindMobile" />
       <el-table-column class-name="status-col" label="上线状态" width="150" align="center" prop="status">
@@ -71,7 +71,7 @@
           <el-button v-else type="primary" size="mini" @click="handOffline(row)">下线</el-button>
         </template>
       </el-table-column>
-      <el-table-column align="center" label="会所地址" prop="address">
+      <el-table-column align="center" label="会所地址" prop="address" min-width="120">
         <template slot-scope="{row}">
           <span>{{ `${row.province}${row.city}${row.town}${row.address}` }}</span>
         </template>

src/views/order/components/remarks.vue

@@ -1,9 +1,9 @@
 <template>
   <el-dialog :title="dialogTitle" :visible.sync="dialogFormVisible">
     <div v-if="remarkList.length>0">
-      <div v-for="item in remarkList" :key="item.id" class="info">
+      <div v-for="item in remarkList" :key="item.id + 'remarks'" class="info">
         <div class="clearfix">
-          <span class="title">{{ item.sysUserName }}</span>
+          <span class="title">{{ item.sysUserName + '【' + item.no + '】' }}</span>
           <time class="time">{{ new Date(item.createDate) | parseTime('{y}-{m}-{d} {h}:{i}:{s}') }}</time>
         </div>
         <p class="content">{{ item.remarks }}</p>
@@ -12,14 +12,14 @@
     <div v-else class="info">
       <p class="title">暂无信息,有需要请备注！</p>
     </div>
-    <el-form label-position="left" label-width="100px">
+    <!--<el-form label-position="left" label-width="100px">
       <el-form-item label="备注" prop="remark">
         <el-input v-model="remark" type="textarea" />
       </el-form-item>
-    </el-form>
+    </el-form>-->
     <div slot="footer" class="dialog-footer">
       <el-button @click="dialogFormVisible = false">关闭</el-button>
-      <el-button type="primary" @click="submitRemark">确认</el-button>
+      <!--<el-button type="primary" @click="submitRemark">确认</el-button>-->
     </div>
   </el-dialog>
 </template>

src/views/order/detail.vue

@@ -60,14 +60,11 @@
         </el-row>
         <el-row :gutter="24" class="box-row">
           <el-col :span="6"><b>订单金额：</b> ¥{{ order.payTotalFee | toThousandFloatFilter }}</el-col>
-          <el-col :span="6"><b>应收金额：</b> ¥{{ order.payableAmount | toThousandFloatFilter }}<span style="color:red;"> (账户余额抵扣:¥{{ order.balancePayFee | toThousandFloatFilter }})</span></el-col>
           <el-col :span="6"><b>已收金额：</b>
             <template v-if="order.receiptStatus*1===1">¥0.00</template>
             <template v-else>¥{{ receiptAmount | toThousandFloatFilter }}</template>
           </el-col>
-          <el-col :span="6"><b>退款金额(已完成):</b> ¥{{ returnValue | toThousandFloatFilter }}
-            <span style="color:red;">({{ '原:¥' + returnedPurchaseFee + '，折扣取消:¥' + (order.discountFee>returnedPurchaseFee ? returnedPurchaseFee : order.discountFee) }})</span>
-          </el-col>
+          <el-col :span="12"><b>应收金额：</b> ¥{{ order.payableAmount | toThousandFloatFilter }}<span style="color:red;"> (账户余额抵扣:¥{{ order.balancePayFee | toThousandFloatFilter }})</span></el-col>
         </el-row>
         <el-row :gutter="24" class="box-row">
           <el-col :span="6"><b>经理折扣：</b>
@@ -83,6 +80,9 @@
             <template v-else-if="order.freight*1===-2">仪器到付-产品包邮</template>
             <template v-else>¥{{ order.freight }}</template>
           </el-col>
+          <el-col :span="12"><b>退款金额(已完成):</b> ¥{{ returnValue | toThousandFloatFilter }}
+            <span style="color:red;">({{ '原:¥' + returnedPurchaseFee + '，折扣取消:¥' + (order.discountFee>returnedPurchaseFee ? returnedPurchaseFee : order.discountFee) }})</span>
+          </el-col>
         </el-row>
       </div>
       <div class="refund-item">

src/views/order/list.vue

@@ -96,7 +96,7 @@
       highlight-current-row
       :header-cell-style="{background:'#eef1f6',color:'#606266'}"
     >
-      <el-table-column label="订单ID" align="center" prop="orderID" />
+      <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="buyer" />
       <el-table-column label="收货人" align="center" prop="receiver" />
@@ -131,18 +131,18 @@
           <el-tag v-else type="info" size="small">无退款</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="待审核退款" align="center" prop="returnedPurchaseStatus">
+      <el-table-column label="待审核退款" align="center" prop="returnedPurchaseStatus" width="65">
         <template slot-scope="{row}">
           <el-tag v-if="row.returnedPurchaseStatus*1===1" type="warning" size="small">有</el-tag>
           <el-tag v-else type="info" size="small">无</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="订单金额" align="center" prop="payTotalFee">
+      <el-table-column label="订单金额" align="center" prop="payTotalFee" min-width="90">
         <template slot-scope="{row}">
           ¥{{ row.payTotalFee | toThousandFloatFilter }}
         </template>
       </el-table-column>
-      <el-table-column align="center" label="下单时间" prop="orderTime">
+      <el-table-column align="center" label="下单时间" prop="orderTime" min-width="90">
         <template v-if="row.orderTime" slot-scope="{row}">
           <span>{{ row.orderTime | parseTime('{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>

src/views/order/refund.vue

@@ -58,7 +58,7 @@
       :header-cell-style="{background:'#eef1f6',color:'#606266'}"
     >
       <el-table-column label="退款编号" align="center" prop="returnedNo" />
-      <el-table-column label="退款审核状态" align="center" prop="status">
+      <el-table-column label="退款审核状态" align="center" prop="status" width="90">
         <template slot-scope="{row}">
           <el-tag v-if="row.status*1===1" type="warning" size="small">待审核</el-tag>
           <el-tag v-if="row.status*1===2" type="success" size="small">审核通过</el-tag>
@@ -66,13 +66,13 @@
         </template>
       </el-table-column>
       <el-table-column label="买家" align="center" prop="userName" />
-      <el-table-column label="订单编号(ID)" align="center" prop="orderNo">
+      <el-table-column label="订单编号(ID)" align="center" prop="orderNo" min-width="70">
         <template slot-scope="{row}">{{ row.orderNo + '(' + row.orderID + ')' }}</template>
       </el-table-column>
       <el-table-column label="退款金额" align="center" prop="refundFee">
         <template slot-scope="{row}">¥{{ row.refundFee | toThousandFloatFilter }}</template>
       </el-table-column>
-      <el-table-column label="退款方式" align="center" prop="returnedWay">
+      <el-table-column label="退款方式" align="center" prop="returnedWay" min-width="130">
         <template slot-scope="{row}">
           <template v-if="row.returnedWay*1===4">未支付无退款</template>
           <template v-else-if="row.returnedWay*1===1">
@@ -83,13 +83,13 @@
           <template v-else>----</template>
         </template>
       </el-table-column>
-      <el-table-column label="申请人" align="center" prop="applicationUserName" />
+      <el-table-column label="申请人" align="center" prop="applicationUserName" width="100" />
       <el-table-column align="center" label="申请时间" prop="returnTime">
         <template v-if="row.returnTime" slot-scope="{row}">
           <span>{{ row.returnTime | parseTime('{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="审核人" align="center" prop="reviewUserName" />
+      <el-table-column label="审核人" align="center" prop="reviewUserName" width="100" />
       <el-table-column align="center" label="审核时间" prop="confirmReturnTime">
         <template v-if="row.confirmReturnTime" slot-scope="{row}">
           <span>{{ row.confirmReturnTime | parseTime('{y}-{m}-{d} {h}:{i}:{s}') }}</span>