优化项

src/filters/index.js

@@ -59,6 +59,23 @@ export function toThousandFilter(num) {
   return (+num || 0).toString().replace(/^-?\d+/g, m => m.replace(/(?=(?!\b)(\d{3})+$)/g, ','))
 }
 
+/**
+ * 10000 => "10,000.00"
+ * @param {number} num
+ */
+export function toThousandFloatFilter(num) {
+  let result = toThousandFilter(num)
+  const temp = result.split('.')
+  if (temp.length === 1) {
+    result += '.00'
+  } else if (temp.length > 1) {
+    if (temp[1].length < 2) {
+      result += '0'
+    }
+  }
+  return result
+}
+
 /**
  * Upper case first char
  * @param {String} string

src/views/dashboard/admin/components/TransactionTable.vue

@@ -7,7 +7,7 @@
     </el-table-column>
     <el-table-column label="Price" width="195" align="center">
       <template slot-scope="scope">
-        ¥{{ scope.row.price | toThousandFilter }}
+        ¥{{ scope.row.price | toThousandFloatFilter }}
       </template>
     </el-table-column>
     <el-table-column label="Status" width="100" align="center">

src/views/dashboard/admin/index.vue

@@ -26,7 +26,7 @@
           </div>
           <div class="chartText">
             <p>应收金额</p>
-            <p class="money">￥{{ payTotalFee | toThousandFilter }}元</p>
+            <p class="money">￥{{ payTotalFee | toThousandFloatFilter }}元</p>
           </div>
           <raddar-chart v-if="isRequest" :receivab="ReceivableData" />
         </div>

src/views/goods/category-create.vue

@@ -44,9 +44,7 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <router-link :to="{path:'/goods/category'}">
-          <el-button type="primary" plain style="margin-right:10px">返回</el-button>
-        </router-link>
+        <el-button type="primary" plain style="margin-right:10px" @click="backToList">返回</el-button>
         <el-button type="primary" @click="updateData">提交</el-button>
       </el-form-item>
     </el-form>
@@ -107,9 +105,7 @@ export default {
               type: response.code * 1 === 1 ? 'success' : 'error',
               duration: 2000
             })
-            setTimeout(() => {
-              this.$router.push({ path: '/goods/category' })
-            }, 2000)
+            this.backToList()
           })
         }
       })

src/views/goods/category-edit.vue

@@ -44,9 +44,7 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <router-link :to="{path:'/goods/category'}">
-          <el-button type="primary" plain style="margin-right:10px">返回</el-button>
-        </router-link>
+        <el-button type="primary" plain style="margin-right:10px" @click="backToList">返回</el-button>
         <el-button type="primary" @click="updateData">提交</el-button>
       </el-form-item>
     </el-form>
@@ -118,9 +116,7 @@ export default {
               type: response.code * 1 === 1 ? 'success' : 'error',
               duration: 2000
             })
-            setTimeout(() => {
-              this.$router.push({ path: '/goods/category' })
-            }, 2000)
+            this.backToList()
           })
         }
       })

src/views/goods/category.vue

@@ -46,7 +46,7 @@
       </el-table-column>
       <el-table-column align="center" label="添加时间" prop="addTime">
         <template slot-scope="{row}">
-          <span>{{ row.addTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>
+          <span>{{ row.addTime | parseTime('{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">

src/views/goods/list-commonly.vue

@@ -73,7 +73,7 @@
       <el-table-column label="商品分类" align="center" prop="productClassifyName" />
       <el-table-column align="center" label="添加时间" prop="addTime">
         <template v-if="row.addTime" slot-scope="{row}">
-          <span>{{ row.addTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>
+          <span>{{ row.addTime | parseTime('{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="排序值" align="center" prop="commonlyProductSort">

src/views/goods/list-preferential.vue

@@ -73,7 +73,7 @@
       <el-table-column label="商品分类" align="center" prop="productClassifyName" />
       <el-table-column align="center" label="添加时间" prop="addTime">
         <template v-if="row.addTime" slot-scope="{row}">
-          <span>{{ row.addTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>
+          <span>{{ row.addTime | parseTime('{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="排序值" align="center" prop="preferentialProductSort">

src/views/goods/list-preferred.vue

@@ -73,7 +73,7 @@
       <el-table-column label="商品分类" align="center" prop="productClassifyName" />
       <el-table-column align="center" label="添加时间" prop="addTime">
         <template v-if="row.addTime" slot-scope="{row}">
-          <span>{{ row.addTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>
+          <span>{{ row.addTime | parseTime('{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="排序值" align="center" prop="preferredProductSort">

src/views/goods/list-select.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container" style="padding: 0 20px 20px 20px;">
 
-    <el-menu :default-active="moduleId" class="el-menu-demo" mode="horizontal">
-      <el-menu-item v-if="moduleId===1 && modules && modules.firstModulesName" index="1">{{ modules.firstModulesName }}</el-menu-item>
-      <el-menu-item v-if="moduleId===2 && modules && modules.secondModulesName" index="2">{{ modules.secondModulesName }}</el-menu-item>
-      <el-menu-item v-if="moduleId===3 && modules && modules.thirdModulesName" index="3">{{ modules.thirdModulesName }}</el-menu-item>
+    <el-menu :default-active="moduleId+''" class="el-menu-demo" mode="horizontal">
+      <el-menu-item v-if="moduleId===1 && modules && modules.firstModulesName" index="1">添加【{{ modules.firstModulesName }}】</el-menu-item>
+      <el-menu-item v-if="moduleId===2 && modules && modules.secondModulesName" index="2">添加【{{ modules.secondModulesName }}】</el-menu-item>
+      <el-menu-item v-if="moduleId===3 && modules && modules.thirdModulesName" index="3">添加【{{ modules.thirdModulesName }}】</el-menu-item>
     </el-menu>
 
     <div class="filter-container" style="margin-top:20px;">

src/views/goods/list.vue

@@ -115,7 +115,7 @@
       <el-table-column label="商品分类" align="center" prop="productClassifyName" width="100" />
       <el-table-column align="center" label="添加时间" prop="addTime">
         <template v-if="row.addTime" slot-scope="{row}">
-          <span>{{ row.addTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>
+          <span>{{ row.addTime | parseTime('{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">

src/views/order/components/remarks.vue

@@ -4,7 +4,7 @@
       <div v-for="item in remarkList" :key="item.id" class="info">
         <div class="clearfix">
           <span class="title">{{ item.sysUserName }}</span>
-          <time class="time">{{ new Date(item.createDate) | parseTime('{y}-{m}-{d} {h}:{i}') }}</time>
+          <time class="time">{{ new Date(item.createDate) | parseTime('{y}-{m}-{d} {h}:{i}:{s}') }}</time>
         </div>
         <p class="content">{{ item.remarks }}</p>
       </div>

src/views/order/detail.vue

@@ -7,119 +7,121 @@
     </el-menu>
 
     <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> {{ order.orderTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</el-col>
-        <el-col :span="6"><b>订单状态:</b>
-          <template v-if="['11','12','13','21','22','23','31','32','33'].indexOf(order.status)>=0">
-            <el-tag type="success" size="small">{{ '交易中('+statusObj[order.status]+')' }}</el-tag>
-          </template>
-          <template v-else>
-            <el-tag :type="order.status*1===6?'info':''" size="small">{{ statusObj[order.status] }}</el-tag>
-          </template>
-        </el-col>
-        <el-col v-if="order.bpOrderUserinfo" :span="6"><b>买家:</b> {{ order.bpOrderUserinfo.name }}</el-col>
-      </el-row>
-      <el-row :gutter="24" class="box-row">
-        <el-col :span="6"><b>收款状态:</b>
-          <el-tag v-if="order.receiptStatus*1===1" type="danger" size="small">待收款</el-tag>
-          <el-tag v-if="order.receiptStatus*1===2" type="warning" size="small">部分收款</el-tag>
-          <el-tag v-if="order.receiptStatus*1===3" type="success" size="small">已收款</el-tag>
-        </el-col>
-        <el-col :span="6"><b>退款状态:</b>
-          <el-tag v-if="order.refundType*1===1" type="warning" size="small">部分退</el-tag>
-          <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-col :span="6">
-          <el-dropdown class="dropdown">
-            <el-button type="primary">
-              功能<i class="el-icon-arrow-down el-icon--right" />
-            </el-button>
-            <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item><div @click="RemarksOrder(order.orderID)">备注</div></el-dropdown-item>
-              <el-dropdown-item v-if="['0','11','21','6','4'].indexOf(order.status)<0"><router-link :to="'/order/logistics/' + order.orderID ">发货记录</router-link></el-dropdown-item>
-              <el-dropdown-item v-if="['0','11','6'].indexOf(order.status)<0"><router-link :to="'/order/refund-record/' + order.orderID ">收退款记录</router-link></el-dropdown-item>
-              <el-dropdown-item v-if="['0','11','6'].indexOf(order.status)<0"><router-link :to="'/order/refund-return/' + order.orderID ">退款（退货）记录</router-link></el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown>
-        </el-col>
-      </el-row>
-    </el-card>
-
-    <el-card v-if="order" class="box-card">
-      <el-row v-if="order.bpOrderUserinfo" :gutter="24" class="box-row">
-        <el-col :span="6"><b>收货人:</b> {{ order.bpOrderUserinfo.shouHuoRen }}</el-col>
-        <el-col :span="6"><b>手机:</b> {{ order.bpOrderUserinfo.mobile }}</el-col>
-        <el-col :span="12"><b>地址:</b> {{ order.bpOrderUserinfo.province +' '+ order.bpOrderUserinfo.city +' '+ order.bpOrderUserinfo.town +' '+ order.bpOrderUserinfo.address }}</el-col>
-      </el-row>
-      <el-row :gutter="24" class="box-row">
-        <el-col :span="6"><b>订单金额:</b> ¥{{ order.payTotalFee | toThousandFilter }}</el-col>
-        <el-col :span="6"><b>应收金额:</b> ¥{{ order.payableAmount | toThousandFilter }}<span style="color:red;"> (账户余额抵扣:¥{{ order.balancePayFee | toThousandFilter }})</span></el-col>
-        <el-col :span="6"><b>已收金额:</b>
-          <template v-if="order.receiptStatus*1===1">¥0</template>
-          <template v-else>¥{{ receiptAmount | toThousandFilter }}</template>
-        </el-col>
-        <el-col :span="6"><b>退款金额(已完成):</b> ¥{{ returnValue | toThousandFilter }}
-          <span style="color:red;">({{ '原:¥' + returnedPurchaseFee + '，折扣取消:¥' + (order.discountFee>returnedPurchaseFee ? returnedPurchaseFee : order.discountFee) }})</span>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="box-row">
-        <el-col :span="6"><b>经理折扣:</b>
-          <template v-if="order.discountFee<0">¥0</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>
-          <template v-else-if="order.freight*1===-2">仪器到付-产品包邮</template>
-          <template v-else>¥{{ order.freight }}</template>
-        </el-col>
-      </el-row>
-
-      <div v-for="shopOrder in order.newShopOrders" :key="shopOrder.shopOrderID" class="order-item">
-        <el-row :gutter="22" class="box-row">
-          <el-col :span="9"><b>子订单号(ID):</b> {{ shopOrder.shopOrderNo + '(' + shopOrder.shopOrderID + ')' }}</el-col>
-          <el-col :span="5"><b>下单时间:</b> {{ shopOrder.orderTime }}</el-col>
-          <el-col :span="5"><b>子订单金额:</b> ¥{{ shopOrder.needPayAmount | toThousandFilter }}</el-col>
-          <el-col :span="5"><b>发货状态:</b>
-            <el-tag v-if="shopOrder.sendOutStatus*1===1" type="danger" size="small">待发货</el-tag>
-            <el-tag v-if="shopOrder.sendOutStatus*1===2" type="warning" size="small">部分发货</el-tag>
-            <el-tag v-if="shopOrder.sendOutStatus*1===3" type="success" size="small">已发货</el-tag>
+      <div class="refund-item">
+        <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> {{ order.orderTime | parseTime('{y}-{m}-{d} {h}:{i}:{s}') }}</el-col>
+          <el-col :span="6"><b>订单状态:</b>
+            <template v-if="['11','12','13','21','22','23','31','32','33'].indexOf(order.status)>=0">
+              <el-tag type="success" size="small">{{ '交易中('+statusObj[order.status]+')' }}</el-tag>
+            </template>
+            <template v-else>
+              <el-tag :type="order.status*1===6?'info':''" size="small">{{ statusObj[order.status] }}</el-tag>
+            </template>
           </el-col>
+          <el-col v-if="order.bpOrderUserinfo" :span="6"><b>买家:</b> {{ order.bpOrderUserinfo.name }}</el-col>
         </el-row>
-        <el-row :gutter="22" class="box-row">
-          <el-col :span="22"><b>留言:</b> {{ shopOrder.note ? shopOrder.note : '无' }}</el-col>
+        <el-row :gutter="24" class="box-row">
+          <el-col :span="6"><b>收款状态:</b>
+            <el-tag v-if="order.receiptStatus*1===1" type="danger" size="small">待收款</el-tag>
+            <el-tag v-if="order.receiptStatus*1===2" type="warning" size="small">部分收款</el-tag>
+            <el-tag v-if="order.receiptStatus*1===3" type="success" size="small">已收款</el-tag>
+          </el-col>
+          <el-col :span="6"><b>退款状态:</b>
+            <el-tag v-if="order.refundType*1===1" type="warning" size="small">部分退款</el-tag>
+            <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-col :span="6">
+            <el-dropdown class="dropdown">
+              <el-button type="primary">
+                功能<i class="el-icon-arrow-down el-icon--right" />
+              </el-button>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item><div @click="RemarksOrder(order.orderID)">备注</div></el-dropdown-item>
+                <el-dropdown-item v-if="['0','11','21','6','4'].indexOf(order.status)<0"><router-link :to="'/order/logistics/' + order.orderID ">发货记录</router-link></el-dropdown-item>
+                <el-dropdown-item v-if="['0','11','6'].indexOf(order.status)<0"><router-link :to="'/order/refund-record/' + order.orderID ">收退款记录</router-link></el-dropdown-item>
+                <el-dropdown-item v-if="['0','11','6'].indexOf(order.status)<0"><router-link :to="'/order/refund-return/' + order.orderID ">退款（退货）记录</router-link></el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </el-col>
         </el-row>
-        <el-row :gutter="22" class="box-row">
-          <el-col :span="22"><b>供应商:</b> {{ shopOrder.shopName }}</el-col>
+      </div>
+      <div class="refund-item">
+        <el-row v-if="order.bpOrderUserinfo" :gutter="24" class="box-row">
+          <el-col :span="6"><b>收货人:</b> {{ order.bpOrderUserinfo.shouHuoRen }}</el-col>
+          <el-col :span="6"><b>手机:</b> {{ order.bpOrderUserinfo.mobile }}</el-col>
+          <el-col :span="12"><b>地址:</b> {{ order.bpOrderUserinfo.province +' '+ order.bpOrderUserinfo.city +' '+ order.bpOrderUserinfo.town +' '+ order.bpOrderUserinfo.address }}</el-col>
         </el-row>
-        <el-row v-for="op in shopOrder.newOrderProducts" :key="op.orderProductID" :gutter="22" class="product-row">
-          <el-col :span="2">
-            <img :src="op.productImage" width="60" alt="">
+        <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</template>
+            <template v-else>¥{{ receiptAmount | toThousandFloatFilter }}</template>
           </el-col>
-          <el-col :span="7">{{ op.name }}</el-col>
-          <el-col :span="5">
-            <div class="op-item"><b>数量</b>{{ op.productID*1!==999 ? ('(赠品数): x'+op.num+'('+op.presentNum+')') : (': x'+op.num) }}</div>
-            <div v-if="op.productID*1!==999" class="op-item">规格: {{ op.unit }}</div>
+          <el-col :span="6"><b>退款金额(已完成):</b> ¥{{ returnValue | toThousandFloatFilter }}
+            <span style="color:red;">({{ '原:¥' + returnedPurchaseFee + '，折扣取消:¥' + (order.discountFee>returnedPurchaseFee ? returnedPurchaseFee : order.discountFee) }})</span>
           </el-col>
-          <el-col v-if="op.productID*1!==999" :span="5">
-            <div class="op-item"><b>单价:</b> ¥{{ op.price | toThousandFilter }}</div>
-            <div class="op-item"><b>总额:</b> ¥{{ op.totalFee | toThousandFilter }}</div>
+        </el-row>
+        <el-row :gutter="24" class="box-row">
+          <el-col :span="6"><b>经理折扣:</b>
+            <template v-if="order.discountFee<0">¥0</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 v-if="op.productID*1!==999" :span="5">
-            <div v-if="order.sendOutStatus*1 === 2 || order.sendOutStatus*1 === 3" class="op-item"><b>已发/已收:</b> {{ ((op.num ? op.num : 0) - (op.notOutStore ? op.notOutStore : 0)) + '/' + op.receivedNum }}</div>
+          <el-col :span="6"><b>运费:</b>
+            <template v-if="order.freight*1===0">包邮</template>
+            <template v-else-if="order.freight*1===-1">到付</template>
+            <template v-else-if="order.freight*1===-2">仪器到付-产品包邮</template>
+            <template v-else>¥{{ order.freight }}</template>
           </el-col>
         </el-row>
       </div>
+      <div class="refund-item">
+        <div v-for="shopOrder in order.newShopOrders" :key="shopOrder.shopOrderID" class="order-item">
+          <el-row :gutter="22" class="box-row">
+            <el-col :span="9"><b>子订单号(ID):</b> {{ shopOrder.shopOrderNo + '(' + shopOrder.shopOrderID + ')' }}</el-col>
+            <el-col :span="5"><b>下单时间:</b> {{ shopOrder.orderTime }}</el-col>
+            <el-col :span="5"><b>子订单金额:</b> ¥{{ shopOrder.needPayAmount | toThousandFloatFilter }}</el-col>
+            <el-col :span="5"><b>发货状态:</b>
+              <el-tag v-if="shopOrder.sendOutStatus*1===1" type="danger" size="small">待发货</el-tag>
+              <el-tag v-if="shopOrder.sendOutStatus*1===2" type="warning" size="small">部分发货</el-tag>
+              <el-tag v-if="shopOrder.sendOutStatus*1===3" type="success" size="small">已发货</el-tag>
+            </el-col>
+          </el-row>
+          <el-row :gutter="22" class="box-row">
+            <el-col :span="22"><b>留言:</b> {{ shopOrder.note ? shopOrder.note : '无' }}</el-col>
+          </el-row>
+          <el-row :gutter="22" class="box-row">
+            <el-col :span="22"><b>供应商:</b> {{ shopOrder.shopName }}</el-col>
+          </el-row>
+          <el-row v-for="op in shopOrder.newOrderProducts" :key="op.orderProductID" :gutter="22" class="product-row">
+            <el-col :span="2">
+              <img :src="op.productImage" width="60" alt="">
+            </el-col>
+            <el-col :span="7">{{ op.name }}</el-col>
+            <el-col :span="5">
+              <div class="op-item"><b>数量</b>{{ op.productID*1!==999 ? ('(赠品数): x'+op.num+'('+op.presentNum+')') : (': x'+op.num) }}</div>
+              <div v-if="op.productID*1!==999" class="op-item">规格: {{ op.unit }}</div>
+            </el-col>
+            <el-col v-if="op.productID*1!==999" :span="5">
+              <div class="op-item"><b>单价:</b> ¥{{ op.price | toThousandFloatFilter }}</div>
+              <div class="op-item"><b>总额:</b> ¥{{ op.totalFee | toThousandFloatFilter }}</div>
+            </el-col>
+            <el-col v-if="op.productID*1!==999" :span="5">
+              <div v-if="order.sendOutStatus*1 === 2 || order.sendOutStatus*1 === 3" class="op-item"><b>已发/已收:</b> {{ ((op.num ? op.num : 0) - (op.notOutStore ? op.notOutStore : 0)) + '/' + op.receivedNum }}</div>
+            </el-col>
+          </el-row>
+        </div>
+      </div>
     </el-card>
 
     <Remarks dialog-title="订单备注信息" :is-visible.sync="dialogRemarksVisible" :order-id="dialogRemarksOrderId" :remark-list="dialogRemarkList" />
@@ -218,6 +220,10 @@ export default {
   .box-row .dropdown{
     margin-top: -10px;
   }
+  .refund-item{
+    border-bottom:1px dashed #E4E7ED;
+    margin-bottom: 20px;
+  }
   .order-item{
     border-bottom: 1px solid #DCDFE6;
     background:#F2F6FC;

src/views/order/list.vue

@@ -139,12 +139,12 @@
       </el-table-column>
       <el-table-column label="订单金额" align="center" prop="payTotalFee">
         <template slot-scope="{row}">
-          ¥{{ row.payTotalFee | toThousandFilter }}
+          ¥{{ row.payTotalFee | toThousandFloatFilter }}
         </template>
       </el-table-column>
       <el-table-column align="center" label="下单时间" prop="orderTime">
         <template v-if="row.orderTime" slot-scope="{row}">
-          <span>{{ row.orderTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>
+          <span>{{ row.orderTime | parseTime('{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">

src/views/order/refund-detail.vue

@@ -11,8 +11,8 @@
       <div class="refund-item">
         <el-row :gutter="24" class="box-row">
           <el-col :span="6"><b>退款编号:</b> {{ refund.returnedNo }}</el-col>
-          <el-col :span="6"><b>申请时间:</b> <template v-if="refund.returnTime">{{ refund.returnTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</template></el-col>
-          <el-col :span="6"><b>申请金额:</b> ¥{{ refund.refundFee | toThousandFilter }}</el-col>
+          <el-col :span="6"><b>申请时间:</b> <template v-if="refund.returnTime">{{ refund.returnTime | parseTime('{y}-{m}-{d} {h}:{i}:{s}') }}</template></el-col>
+          <el-col :span="6"><b>申请金额:</b> ¥{{ refund.refundFee | toThousandFloatFilter }}</el-col>
           <el-col :span="6"><b>退款状态:</b>
             <el-tag v-if="refund.status*1===1" type="warning" size="small">待审核</el-tag>
             <el-tag v-if="refund.status*1===2" type="danger" size="small">审核不通过</el-tag>
@@ -23,9 +23,9 @@
           <el-col :span="20"><b>退款方式:</b>
             <template v-if="refund.returnedWay*1===4">未支付无退款</template>
             <template v-else-if="refund.returnedWay*1===1">
-              <span v-if="refund.refundBalanceFee*1 !== 0">余额账户:¥{{ refund.refundBalanceFee | toThousandFilter }}</span>
-              <span v-if="refund.refundOnlineFee*1 !== 0">线上退回:¥{{ refund.refundOnlineFee | toThousandFilter }}</span>
-              <span v-if="refund.refundOfflineFee*1 !== 0">线下转账:¥{{ refund.refundOfflineFee | toThousandFilter }}</span>
+              <span v-if="refund.refundBalanceFee*1 !== 0">余额账户:¥{{ refund.refundBalanceFee | toThousandFloatFilter }}</span>
+              <span v-if="refund.refundOnlineFee*1 !== 0">线上退回:¥{{ refund.refundOnlineFee | toThousandFloatFilter }}</span>
+              <span v-if="refund.refundOfflineFee*1 !== 0">线下转账:¥{{ refund.refundOfflineFee | toThousandFloatFilter }}</span>
             </template>
             <template v-else>----</template>
           </el-col>
@@ -57,7 +57,7 @@
         <template v-if="order">
           <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}') }}</template></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="6"><b>订单状态:</b>
               <template v-if="['11','12','13','21','22','23','31','32','33'].indexOf(order.status)>=0">
                 <el-tag type="success" size="small">{{ '交易中('+statusObj[order.status]+')' }}</el-tag>
@@ -66,7 +66,17 @@
                 <el-tag :type="order.status*1===6?'info':''" size="small">{{ statusObj[order.status] }}</el-tag>
               </template>
             </el-col>
-            <el-col v-if="order.bpOrderUserinfo" :span="6"><b>买家:</b> {{ order.bpOrderUserinfo.name }}</el-col>
+          </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 }}</el-col>
+            <el-col :span="6"><b>经理折扣:</b>¥{{ order.discountFee | toThousandFloatFilter }}</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>
+              <template v-else-if="order.freight*1===-2">仪器到付-产品包邮</template>
+              <template v-else>¥{{ order.freight | toThousandFloatFilter }}</template>
+            </el-col>
           </el-row>
           <el-row :gutter="24" class="box-row">
             <el-col :span="6"><b>收款状态:</b>
@@ -74,9 +84,14 @@
               <el-tag v-if="order.receiptStatus*1===2" type="warning" size="small">部分收款</el-tag>
               <el-tag v-if="order.receiptStatus*1===3" type="success" size="small">已收款</el-tag>
             </el-col>
+            <el-col :span="6"><b>付款状态:</b>
+              <el-tag v-if="order.payStatus*1===1" type="danger" size="small">待付款</el-tag>
+              <el-tag v-if="order.payStatus*1===2" type="warning" size="small">部分付款</el-tag>
+              <el-tag v-if="order.payStatus*1===3" type="success" size="small">已付款</el-tag>
+            </el-col>
             <el-col :span="6"><b>退款状态:</b>
-              <el-tag v-if="order.refundType*1===1" type="warning" size="small">部分退</el-tag>
-              <el-tag v-else-if="order.refundType*1===2" type="danger" size="small">全部退</el-tag>
+              <el-tag v-if="order.refundType*1===1" type="warning" size="small">部分退款</el-tag>
+              <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>
@@ -86,76 +101,60 @@
             </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>
             <el-col :span="6"><b>收货人:</b> {{ order.bpOrderUserinfo.shouHuoRen }}</el-col>
             <el-col :span="6"><b>手机:</b> {{ order.bpOrderUserinfo.mobile }}</el-col>
-            <el-col :span="12"><b>地址:</b> {{ order.bpOrderUserinfo.province +' '+ order.bpOrderUserinfo.city +' '+ order.bpOrderUserinfo.town +' '+ order.bpOrderUserinfo.address }}</el-col>
+            <el-col :span="6"><b>地址:</b> {{ order.bpOrderUserinfo.province +' '+ order.bpOrderUserinfo.city +' '+ order.bpOrderUserinfo.town +' '+ order.bpOrderUserinfo.address }}</el-col>
           </el-row>
-
-          <div v-for="shopOrder in refund.shopOrderReturnedList" :key="shopOrder.shopOrderID" class="order-item">
-            <el-row :gutter="22" class="box-row">
-              <el-col :span="9"><b>子订单号(ID):</b> {{ shopOrder.shopOrderNo + '(' + shopOrder.shopOrderID + ')' }}</el-col>
-              <el-col :span="5"><b>子订单金额:</b> ¥{{ shopOrder.needPayAmount | toThousandFilter }}</el-col>
-              <el-col :span="5"><b>付款状态:</b>
-                <el-tag v-if="shopOrder.payStatus*1===1" type="danger" size="small">待付款</el-tag>
-                <el-tag v-if="shopOrder.payStatus*1===2" type="warning" size="small">部分付款</el-tag>
-                <el-tag v-if="shopOrder.payStatus*1===3" type="success" size="small">已付款</el-tag>
-              </el-col>
-              <el-col :span="5"><b>发货状态:</b>
-                <el-tag v-if="shopOrder.sendOutStatus*1===1" type="danger" size="small">待发货</el-tag>
-                <el-tag v-if="shopOrder.sendOutStatus*1===2" type="warning" size="small">部分发货</el-tag>
-                <el-tag v-if="shopOrder.sendOutStatus*1===3" type="success" size="small">已发货</el-tag>
-              </el-col>
-            </el-row>
-            <el-row :gutter="22" class="box-row">
-              <el-col :span="22"><b>供应商:</b> {{ shopOrder.shopName }}</el-col>
-            </el-row>
-            <el-row v-for="op in shopOrder.cmReturnedPurchaseProductList" :key="op.orderProductID" :gutter="22" class="product-row">
-              <el-col :span="2">
-                <img :src="op.mainImage" width="60" alt="">
-              </el-col>
-              <el-col :span="7">{{ op.name }}</el-col>
-              <el-col :span="5">
-                <div class="op-item"><b>数量</b>{{ op.productID*1!==999 ? ('(赠品数): x'+op.num+'('+op.presentNum+')') : (': x'+op.num) }}</div>
-                <div v-if="op.productID*1!==999" class="op-item">规格: {{ op.unit }}</div>
-              </el-col>
-              <el-col v-if="op.productID*1!==999" :span="5">
-                <div class="op-item"><b>单价:</b> ¥{{ op.price | toThousandFilter }}</div>
-                <div class="op-item"><b>总额:</b> ¥{{ op.totalFee | toThousandFilter }}</div>
-              </el-col>
-              <el-col v-if="op.productID*1!==999" :span="5">
-                <div v-if="order.sendOutStatus*1 === 2 || order.sendOutStatus*1 === 3" class="op-item"><b>已发/已收:</b> {{ ((op.num ? op.num : 0) - (op.notOutStore ? op.notOutStore : 0)) + '/' + op.receivedNum }}</div>
-              </el-col>
-            </el-row>
-          </div>
         </template>
       </div>
-      <!-- <div class="refund-item"><el-card v-if="order && order.orderInvoice" class="box-card">
-        <el-row :gutter="24" class="box-row">
-          <b>发票信息:</b>
-          <template v-if="order.orderInvoice.type*1===0">不需要发票</template>
-          <template v-else-if="order.orderInvoice.type*1===1">普通发票</template>
-          <template v-else-if="order.orderInvoice.type*1===2">增值税发票</template>
-        </el-row>
-        <el-row v-if="order.orderInvoice.invoiceTitleType*1===0" :gutter="24" class="box-row">
-          <el-col :span="6"><b>个人抬头:</b>{{ order.orderInvoice.invoiceTitle }}</el-col>
-        </el-row>
-        <el-row v-if="order.orderInvoice.invoiceTitleType*1===1" :gutter="24" class="box-row">
-          <el-col :span="6"><b>企业抬头:</b>{{ order.orderInvoice.invoiceTitle }}</el-col>
-          <el-col :span="6"><b>纳税人识别号:</b>{{ order.orderInvoice.corporationTaxNum }}</el-col>
-        </el-row>
-        <template v-if="order.orderInvoice.type*1===2">
-          <el-row :gutter="24" class="box-row">
-            <el-col :span="6"><b>单位名称:</b>{{ order.orderInvoice.invoiceTitle }}</el-col>
-            <el-col :span="6"><b>纳税人识别号:</b>{{ order.orderInvoice.corporationTaxNum }}</el-col>
-            <el-col :span="6"><b>注册地址:</b>{{ order.orderInvoice.registeredAddress }}</el-col>
+      <div class="refund-item">
+        <div v-for="shopOrder in refund.shopOrderReturnedList" :key="shopOrder.shopOrderID" class="order-item">
+          <el-row :gutter="22" class="box-row">
+            <el-col :span="9"><b>子订单号(ID):</b> {{ shopOrder.shopOrderNo + '(' + shopOrder.shopOrderID + ')' }}</el-col>
+            <el-col :span="5"><b>子订单金额:</b> ¥{{ shopOrder.needPayAmount | toThousandFloatFilter }}</el-col>
+            <el-col :span="5"><b>付款状态:</b>
+              <el-tag v-if="shopOrder.payStatus*1===1" type="danger" size="small">待付款</el-tag>
+              <el-tag v-if="shopOrder.payStatus*1===2" type="warning" size="small">部分付款</el-tag>
+              <el-tag v-if="shopOrder.payStatus*1===3" type="success" size="small">已付款</el-tag>
+            </el-col>
+            <el-col :span="5"><b>发货状态:</b>
+              <el-tag v-if="shopOrder.sendOutStatus*1===1" type="danger" size="small">待发货</el-tag>
+              <el-tag v-if="shopOrder.sendOutStatus*1===2" type="warning" size="small">部分发货</el-tag>
+              <el-tag v-if="shopOrder.sendOutStatus*1===3" type="success" size="small">已发货</el-tag>
+            </el-col>
           </el-row>
-          <el-row :gutter="24" class="box-row">
-            <el-col :span="6"><b>注册电话:</b>{{ order.orderInvoice.registeredPhone }}</el-col>
-            <el-col :span="6"><b>开户银行:</b>{{ order.orderInvoice.openBank }}</el-col>
-            <el-col :span="6"><b>银行账号:</b>{{ order.orderInvoice.bankAccountNo }}</el-col>
+          <el-row :gutter="22" class="box-row">
+            <el-col :span="22"><b>供应商:</b> {{ shopOrder.shopName }}</el-col>
           </el-row>
-        </template>
-      </el-card></div>-->
+          <el-row v-for="op in shopOrder.cmReturnedPurchaseProductList" :key="op.orderProductID" :gutter="22" class="product-row">
+            <el-col :span="2">
+              <img :src="op.mainImage" width="60" alt="">
+            </el-col>
+            <el-col :span="6">{{ op.name }}</el-col>
+            <el-col :span="4">
+              <div class="op-item"><b>折后单价:</b> ¥{{ op.discountPrice | toThousandFloatFilter }}</div>
+              <div class="op-item"><b>数量(赠品数):</b> x{{ op.num }}</div>
+              <div class="op-item"><b>总额:</b> ¥{{ op.totalFee | toThousandFloatFilter }}</div>
+            </el-col>
+            <el-col :span="4">
+              <div class="op-item"><b>单价:</b> ¥{{ op.price | toThousandFloatFilter }}</div>
+              <div class="op-item"><b>折扣:</b> {{ op.discount }}</div>
+              <div class="op-item"><b>税费(税率):</b> ¥{{ op.totalAddedValueTax | toThousandFloatFilter }} ({{ op.taxRate }})</div>
+            </el-col>
+            <el-col :span="4">
+              <div class="op-item"><b>已发货:</b> {{ op.num - op.notOutStore }}</div>
+              <div class="op-item"><b>已退货:</b> {{ op.returnedPurchaseProductNum }}</div>
+              <div class="op-item"><b>本次退货:</b> {{ op.actualReturnedNum ? op.actualReturnedNum : 0 }}</div>
+            </el-col>
+            <el-col :span="4">
+              <div class="op-item"><b>待发货:</b> {{ op.notOutStore - op.cancelProductNum }}</div>
+              <div class="op-item"><b>已取消:</b> {{ op.cancelProductNum }}</div>
+              <div class="op-item"><b>本次取消:</b> {{ op.actualCancelNum ? op.actualCancelNum : 0 }}</div>
+            </el-col>
+          </el-row>
+        </div>
+      </div>
 
       <div class="refund-item">
         <h3>审核信息</h3>
@@ -179,7 +178,7 @@
         <h3>申请信息</h3>
         <el-row :gutter="24" class="box-row">
           <el-col :span="6"><b>申请人:</b> {{ refund.applicationUserName }}</el-col>
-          <el-col :span="6"><b>申请时间:</b> <template v-if="refund.returnTime">{{ refund.returnTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</template></el-col>
+          <el-col :span="6"><b>申请时间:</b> <template v-if="refund.returnTime">{{ refund.returnTime | parseTime('{y}-{m}-{d} {h}:{i}:{s}') }}</template></el-col>
           <el-col :span="6"><b>退款备注:</b> {{ refund.remarks ? refund.remarks : '无' }}</el-col>
         </el-row>
         <el-row v-if="refund.image1 || refund.image2 || refund.image3 || refund.image4 || refund.image5 " :gutter="24" class="box-row">
@@ -195,7 +194,7 @@
       </div>
       <div class="refund-item">
         <el-row :gutter="24" class="box-row">
-          <el-col :span="6"><b>申请退款金额:</b> ¥{{ refund.refundFee | toThousandFilter }}</el-col>
+          <el-col :span="6"><b>申请退款金额:</b> ¥{{ refund.refundFee | toThousandFloatFilter }}</el-col>
           <el-col :span="6"><b>财务签名:</b></el-col>
           <el-col :span="6"><b>总经理签名:</b></el-col>
         </el-row>

src/views/order/refund-record.vue

@@ -9,7 +9,7 @@
     <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}') }}</template></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-row>
       <el-row :gutter="24" class="box-row">
         <el-col :span="6"><b>订单状态:</b>
@@ -26,8 +26,8 @@
           <el-tag v-if="order.receiptStatus*1===3" type="success" size="small">已收款</el-tag>
         </el-col>
         <el-col :span="6"><b>退款状态:</b>
-          <el-tag v-if="order.refundType*1===1" type="warning" size="small">部分退</el-tag>
-          <el-tag v-else-if="order.refundType*1===2" type="danger" size="small">全部退</el-tag>
+          <el-tag v-if="order.refundType*1===1" type="warning" size="small">部分退款</el-tag>
+          <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-row>
@@ -38,9 +38,9 @@
         <el-col :span="6"><b>地址:</b> {{ order.bpOrderUserinfo.province +' '+ order.bpOrderUserinfo.city +' '+ order.bpOrderUserinfo.town +' '+ order.bpOrderUserinfo.address }}</el-col>
       </el-row>
       <el-row :gutter="24" class="box-row">
-        <el-col :span="6"><b>订单金额:</b> ¥{{ order.payTotalFee | toThousandFilter }}</el-col>
-        <el-col :span="6"><b>应收总额:</b> ¥{{ order.payableAmount | toThousandFilter }}</el-col>
-        <el-col :span="6"><b>应收总额:</b> ¥{{ order.discountFee | toThousandFilter }}</el-col>
+        <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.freight*1===0">包邮</template>
           <template v-else-if="order.freight*1===-1">到付</template>
@@ -49,7 +49,7 @@
         </el-col>
       </el-row>
       <el-row :gutter="24" class="box-row">
-        <el-col><b>退款总额:</b> ¥{{ refundFee | toThousandFilter }}</el-col>
+        <el-col><b>退款总额:</b> ¥{{ refundFee | toThousandFloatFilter }}</el-col>
       </el-row>
     </el-card>
 
@@ -73,13 +73,13 @@
       <el-table-column label="收款方式" align="center" prop="payType" />
       <el-table-column label="金额" align="center" prop="associateAmount">
         <template slot-scope="{row}">
-          ¥{{ row.associateAmount | toThousandFilter }}
+          ¥{{ row.associateAmount | toThousandFloatFilter }}
         </template>
       </el-table-column>
       <el-table-column label="收款时间" align="center" prop="receiptDate">
         <template v-if="row.receiptDate" slot-scope="{row}">
           <i class="el-icon-time" />
-          <span>{{ row.receiptDate | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>
+          <span>{{ row.receiptDate | parseTime('{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
     </el-table>
@@ -103,13 +103,13 @@
       <el-table-column label="退款编号" align="center" prop="returnedNo" />
       <el-table-column label="退款金额" align="center" prop="refundFee">
         <template slot-scope="{row}">
-          ¥{{ row.refundFee | toThousandFilter }}
+          ¥{{ row.refundFee | toThousandFloatFilter }}
         </template>
       </el-table-column>
       <el-table-column label="申请时间" align="center" prop="returnTime">
         <template v-if="row.returnTime" slot-scope="{row}">
           <i class="el-icon-time" />
-          <span>{{ row.returnTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>
+          <span>{{ row.returnTime | parseTime('{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="退款状态" align="center" prop="payType">

src/views/order/refund-return.vue

@@ -30,7 +30,7 @@
           <h3>申请信息</h3>
           <el-row :gutter="24" class="box-row">
             <el-col :span="6"><b>申请人:</b> {{ refund.applicationUserName }}</el-col>
-            <el-col :span="6"><b>申请时间:</b> <template v-if="refund.returnTime">{{ refund.returnTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</template></el-col>
+            <el-col :span="6"><b>申请时间:</b> <template v-if="refund.returnTime">{{ refund.returnTime | parseTime('{y}-{m}-{d} {h}:{i}:{s}') }}</template></el-col>
             <el-col :span="6"><b>退款备注:</b> {{ refund.remarks ? refund.remarks : '无' }}</el-col>
           </el-row>
           <el-row v-if="refund.image1 || refund.image2 || refund.image3 || refund.image4 || refund.image5 " :gutter="24" class="box-row">
@@ -48,8 +48,8 @@
           <h3>退款信息</h3>
           <el-row :gutter="24" class="box-row">
             <el-col :span="6"><b>退款编号:</b> {{ refund.returnedNo }}</el-col>
-            <el-col :span="6"><b>申请时间:</b> <template v-if="refund.returnTime">{{ refund.returnTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</template></el-col>
-            <el-col :span="6"><b>申请金额:</b> ¥{{ refund.refundFee | toThousandFilter }}</el-col>
+            <el-col :span="6"><b>申请时间:</b> <template v-if="refund.returnTime">{{ refund.returnTime | parseTime('{y}-{m}-{d} {h}:{i}:{s}') }}</template></el-col>
+            <el-col :span="6"><b>申请金额:</b> ¥{{ refund.refundFee | toThousandFloatFilter }}</el-col>
             <el-col :span="6"><b>退款状态:</b>
               <el-tag v-if="refund.status*1===1" type="warning" size="small">待审核</el-tag>
               <el-tag v-if="refund.status*1===2" type="danger" size="small">审核不通过</el-tag>
@@ -60,9 +60,9 @@
             <el-col :span="20"><b>退款方式:</b>
               <template v-if="refund.returnedWay*1===4">未支付无退款</template>
               <template v-else-if="refund.returnedWay*1===1">
-                <span v-if="refund.refundBalanceFee*1 !== 0">余额账户:¥{{ refund.refundBalanceFee | toThousandFilter }}</span>
-                <span v-if="refund.refundOnlineFee*1 !== 0">线上退回:¥{{ refund.refundOnlineFee | toThousandFilter }}</span>
-                <span v-if="refund.refundOfflineFee*1 !== 0">线下转账:¥{{ refund.refundOfflineFee | toThousandFilter }}</span>
+                <span v-if="refund.refundBalanceFee*1 !== 0">余额账户:¥{{ refund.refundBalanceFee | toThousandFloatFilter }}</span>
+                <span v-if="refund.refundOnlineFee*1 !== 0">线上退回:¥{{ refund.refundOnlineFee | toThousandFloatFilter }}</span>
+                <span v-if="refund.refundOfflineFee*1 !== 0">线下转账:¥{{ refund.refundOfflineFee | toThousandFloatFilter }}</span>
               </template>
               <template v-else>----</template>
             </el-col>
@@ -94,7 +94,7 @@
           <template v-if="order">
             <el-row :gutter="24" class="box-row">
               <el-col :span="6"><b>订单编号:</b> {{ order.orderID }}</el-col>
-              <el-col :span="6"><b>下单时间:</b> <template v-if="order.orderTime">{{ order.orderTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</template></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="6"><b>订单状态:</b>
                 <template v-if="['11','12','13','21','22','23','31','32','33'].indexOf(order.status)>=0">
                   <el-tag type="success" size="small">{{ '交易中('+statusObj[order.status]+')' }}</el-tag>
@@ -112,8 +112,8 @@
                 <el-tag v-if="order.receiptStatus*1===3" type="success" size="small">已收款</el-tag>
               </el-col>
               <el-col :span="6"><b>退款状态:</b>
-                <el-tag v-if="order.refundType*1===1" type="warning" size="small">部分退</el-tag>
-                <el-tag v-else-if="order.refundType*1===2" type="danger" size="small">全部退</el-tag>
+                <el-tag v-if="order.refundType*1===1" type="warning" size="small">部分退款</el-tag>
+                <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>
@@ -132,7 +132,7 @@
         <div v-for="shopOrder in refund.shopOrderReturnedList" :key="shopOrder.shopOrderID" class="order-item">
           <el-row :gutter="22" class="box-row">
             <el-col :span="9"><b>子订单号(ID):</b> {{ shopOrder.shopOrderNo + '(' + shopOrder.shopOrderID + ')' }}</el-col>
-            <el-col :span="5"><b>子订单金额:</b> ¥{{ shopOrder.needPayAmount | toThousandFilter }}</el-col>
+            <el-col :span="5"><b>子订单金额:</b> ¥{{ shopOrder.needPayAmount | toThousandFloatFilter }}</el-col>
             <el-col :span="5"><b>付款状态:</b>
               <el-tag v-if="shopOrder.payStatus*1===1" type="danger" size="small">待付款</el-tag>
               <el-tag v-if="shopOrder.payStatus*1===2" type="warning" size="small">部分付款</el-tag>
@@ -157,8 +157,8 @@
               <div v-if="op.productID*1!==999" class="op-item">规格: {{ op.unit }}</div>
             </el-col>
             <el-col v-if="op.productID*1!==999" :span="5">
-              <div class="op-item"><b>单价:</b> ¥{{ op.price | toThousandFilter }}</div>
-              <div class="op-item"><b>总额:</b> ¥{{ op.totalFee | toThousandFilter }}</div>
+              <div class="op-item"><b>单价:</b> ¥{{ op.price | toThousandFloatFilter }}</div>
+              <div class="op-item"><b>总额:</b> ¥{{ op.totalFee | toThousandFloatFilter }}</div>
             </el-col>
             <el-col v-if="op.productID*1!==999" :span="5">
               <div v-if="order.sendOutStatus*1 === 2 || order.sendOutStatus*1 === 3" class="op-item"><b>已发/已收:</b> {{ ((op.num ? op.num : 0) - (op.notOutStore ? op.notOutStore : 0)) + '/' + op.receivedNum }}</div>

src/views/order/refund.vue

@@ -75,15 +75,15 @@
         <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 | toThousandFilter }}</template>
+        <template slot-scope="{row}">{{ row.refundFee | toThousandFloatFilter }}</template>
       </el-table-column>
       <el-table-column label="退款方式" align="center" prop="returnedWay">
         <template slot-scope="{row}">
           <template v-if="row.returnedWay*1===4">未支付无退款</template>
           <template v-else-if="row.returnedWay*1===1">
-            <span v-if="row.refundBalanceFee*1 !== 0">余额账户:¥{{ row.refundBalanceFee | toThousandFilter }}</span>
-            <span v-if="row.refundOnlineFee*1 !== 0">线上退回:¥{{ row.refundOnlineFee | toThousandFilter }}</span>
-            <span v-if="row.refundOfflineFee*1 !== 0">线下转账:¥{{ row.refundOfflineFee | toThousandFilter }}</span>
+            <span v-if="row.refundBalanceFee*1 !== 0">余额账户:¥{{ row.refundBalanceFee | toThousandFloatFilter }}</span>
+            <span v-if="row.refundOnlineFee*1 !== 0">线上退回:¥{{ row.refundOnlineFee | toThousandFloatFilter }}</span>
+            <span v-if="row.refundOfflineFee*1 !== 0">线下转账:¥{{ row.refundOfflineFee | toThousandFloatFilter }}</span>
           </template>
           <template v-else>----</template>
         </template>
@@ -91,13 +91,13 @@
       <el-table-column label="申请人" align="center" prop="applicationUserName" />
       <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}') }}</span>
+          <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 align="center" label="审核时间" prop="confirmReturnTime">
         <template v-if="row.confirmReturnTime" slot-scope="{row}">
-          <span>{{ row.confirmReturnTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>
+          <span>{{ row.confirmReturnTime | parseTime('{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">