e 5 years ago
parent
commit
460cd7ede7

+ 1 - 1
src/views/goods/category.vue

@@ -29,7 +29,7 @@
       </el-table-column>
       <el-table-column label="排序值" align="center" prop="sort">
         <template slot-scope="{row}">
-          <el-input v-model="row.sort" style="width:100px;" size="small" type="number" maxlength="3" min="1" />
+          <el-input v-model="row.sort" style="width:55px;" size="mini" type="number" maxlength="3" min="1" />
         </template>
       </el-table-column>
       <el-table-column class-name="status-col" label="状态" align="center" prop="status">

+ 1 - 1
src/views/goods/list-commonly.vue

@@ -78,7 +78,7 @@
       </el-table-column>
       <el-table-column label="排序值" align="center" prop="commonlyProductSort">
         <template slot-scope="{row}">
-          <el-input v-model="row.commonlyProductSort" size="small" type="number" min="1" />
+          <el-input v-model="row.commonlyProductSort" size="mini" type="number" min="1" style="width:55px;" />
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">

+ 1 - 1
src/views/goods/list-preferential.vue

@@ -78,7 +78,7 @@
       </el-table-column>
       <el-table-column label="排序值" align="center" prop="preferentialProductSort">
         <template slot-scope="{row}">
-          <el-input v-model="row.preferentialProductSort" size="small" type="number" min="1" />
+          <el-input v-model="row.preferentialProductSort" size="mini" type="number" min="1" style="width:55px;" />
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">

+ 1 - 1
src/views/goods/list-preferred.vue

@@ -78,7 +78,7 @@
       </el-table-column>
       <el-table-column label="排序值" align="center" prop="preferredProductSort">
         <template slot-scope="{row}">
-          <el-input v-model="row.preferredProductSort" size="small" type="number" min="1" />
+          <el-input v-model="row.preferredProductSort" size="mini" type="number" min="1" style="width:55px;" />
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">

+ 15 - 2
src/views/order/refund-record.vue

@@ -8,8 +8,8 @@
 
     <el-card v-if="order" class="box-card">
       <el-row :gutter="24" class="box-row">
-        <el-col :span="6"><b>订单编号(ID):</b> {{ order.orderNo + '(' + order.orderID + ')' }}</el-col>
         <el-col :span="6"><b>下单时间:</b> <template v-if="order.orderTime">{{ order.orderTime | parseTime('{y}-{m}-{d} {h}:{i}:{s}') }}</template></el-col>
+        <el-col :span="12"><b>订单编号(ID):</b> {{ order.orderNo + '(' + order.orderID + ')' }}</el-col>
       </el-row>
       <el-row :gutter="24" class="box-row">
         <el-col :span="6"><b>订单状态:</b>
@@ -30,6 +30,11 @@
           <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="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-row>
       <el-row v-if="order.bpOrderUserinfo" :gutter="24" class="box-row">
         <el-col :span="6"><b>买家:</b> {{ order.bpOrderUserinfo.name }}</el-col>
@@ -40,7 +45,13 @@
       <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 }}</el-col>
-        <el-col :span="6"><b>应收总额:</b> ¥{{ order.discountFee | toThousandFloatFilter }}</el-col>
+        <el-col :span="6"><b>经理折扣:</b>
+          <template v-if="order.discountFee<0">¥0.00</template>
+          <template v-else>
+            ¥{{ order.discountFee>returnedPurchaseFee ? (order.discountFee - returnedPurchaseFee) : '0' }}
+            <span style="color:red;">({{ '原:¥' + order.discountFee + ',折扣取消:¥' + (order.discountFee>returnedPurchaseFee ? returnedPurchaseFee : order.discountFee) }})</span>
+          </template>
+        </el-col>
         <el-col :span="6"><b>运费:</b>
           <template v-if="order.freight*1===0">包邮</template>
           <template v-else-if="order.freight*1===-1">到付</template>
@@ -138,6 +149,7 @@ export default {
       cmReturnedPurchaseList: [],
       order: null,
       refundFee: 0,
+      returnedPurchaseFee: 0,
       statusObj: {
         '0': '待确认',
         '4': '交易完成',
@@ -170,6 +182,7 @@ export default {
       getRefundRecord({ orderID: this.orderID }).then(response => {
         this.order = response.data.order
         this.refundFee = response.data.refundFee
+        this.returnedPurchaseFee = response.data.returnedPurchaseFee
         this.receipt = response.data.receipt
         this.cmReturnedPurchaseList = response.data.cmReturnedPurchaseList
         this.listLoading = false