优化

.env.development

@@ -5,7 +5,7 @@ ENV = 'development'
 # VUE_APP_BASE_API = '/dev-api'
 # VUE_APP_BASE_API = 'http://192.168.1.22:9104'
 # VUE_APP_BASE_API = 'http://192.168.1.26:9104'
- VUE_APP_BASE_API = 'https://mai-b.caimei365.com'
+VUE_APP_BASE_API = 'https://mai-b.caimei365.com'
 
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
 # to control whether the babel-plugin-dynamic-import-node plugin is enabled.

src/router/modules/finance.js

@@ -12,14 +12,14 @@ const financeRouter = {
       path: 'list',
       name: 'List',
       component: () => import('@/views/finance/list'),
-      meta: { title: '对账列表', icon: 'list' }
-    },
+      meta: { title: '对账列表', icon: 'money' }
+    }/*,
     {
       path: 'refund',
       name: 'Refund',
       component: () => import('@/views/finance/refund'),
       meta: { title: '退款管理', icon: 'skill' }
-    }
+    }*/
   ]
 }
 

src/views/order/detail.vue

@@ -118,7 +118,7 @@
             </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>
-              <div v-if="['12','13','21','22','23','31','32','33','4','5'].indexOf(order.status)>=0" class="op-item"><b>退款(退货)中/已完成:</b> {{ op.returningNum }} / {{ op.returnedNum }}</div>
+              <div v-if="(op.returningNum || op.returnedNum) && ['12','13','21','22','23','31','32','33','4','5'].indexOf(order.status)>=0" class="op-item"><b>退款(退货)中/已完成:</b> {{ op.returningNum }} / {{ op.returnedNum }}</div>
             </el-col>
           </el-row>
         </div>

src/views/order/refund-detail.vue

@@ -131,25 +131,20 @@
             <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">
+            <el-col :span="7">{{ op.name }}</el-col>
+            <el-col :span="5">
               <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>
+            </el-col>
+            <el-col :span="5">
+              <div class="op-item"><b>数量:</b> {{ op.num }}</div>
+              <div class="op-item"><b>已退货:</b> {{ op.returnedPurchaseProductNum }}</div>
               <div class="op-item"><b>已取消:</b> {{ op.cancelProductNum }}</div>
+            </el-col>
+            <el-col :span="5">
+              <div class="op-item"><b>总额:</b> ¥{{ op.totalFee | toThousandFloatFilter }}</div>
+              <div class="op-item"><b>本次退货:</b> {{ op.actualReturnedNum ? op.actualReturnedNum : 0 }}</div>
               <div class="op-item"><b>本次取消:</b> {{ op.actualCancelNum ? op.actualCancelNum : 0 }}</div>
             </el-col>
           </el-row>

src/views/order/refund-return.vue

@@ -168,25 +168,20 @@
               <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">
+              <el-col :span="7">{{ op.name }}</el-col>
+              <el-col :span="5">
                 <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>
+              </el-col>
+              <el-col :span="5">
+                <div class="op-item"><b>数量:</b> {{ op.num }}</div>
+                <div class="op-item"><b>已退货:</b> {{ op.returnedPurchaseProductNum }}</div>
                 <div class="op-item"><b>已取消:</b> {{ op.cancelProductNum }}</div>
+              </el-col>
+              <el-col :span="5">
+                <div class="op-item"><b>总额:</b> ¥{{ op.totalFee | toThousandFloatFilter }}</div>
+                <div class="op-item"><b>本次退货:</b> {{ op.actualReturnedNum ? op.actualReturnedNum : 0 }}</div>
                 <div class="op-item"><b>本次取消:</b> {{ op.actualCancelNum ? op.actualCancelNum : 0 }}</div>
               </el-col>
             </el-row>