Merge branch 'master' of git.caimei365.com:git_lijun/caimei-mall-admin-ui

.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/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/goods/category.vue

@@ -27,9 +27,9 @@
           <img :src="row.classifyImage" alt="" width="50">
         </template>
       </el-table-column>
-      <el-table-column label="排序值" align="center" prop="sort" width="90">
+      <el-table-column label="排序值" align="center" prop="sort">
         <template slot-scope="{row}">
-          <el-input v-model="row.sort" style="width:65px;" 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">

src/views/goods/list-commonly.vue

@@ -76,9 +76,9 @@
           <span>{{ row.addTime | parseTime('{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="排序值" align="center" prop="commonlyProductSort" width="90">
+      <el-table-column label="排序值" align="center" prop="commonlyProductSort">
         <template slot-scope="{row}">
-          <el-input v-model="row.commonlyProductSort" style="60px" size="small" type="number" min="1" maxlength="3" />
+          <el-input v-model="row.commonlyProductSort" style="width:55px;" size="small" type="number" min="1" maxlength="3" />
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -156,7 +156,7 @@ export default {
       const sorts = []
       this.list.map(item => {
         if (item.commonlyProductSort) {
-          sorts.push(item.id + '-' + Math.abs(item.commonlyProductSort))
+          sorts.push(item.id + '-' + item.commonlyProductSort)
         }
       })
       saveGoodsSort({ newProducSorttList: sorts.join(','), modules: this.modulesId }).then(response => {

src/views/goods/list-preferential.vue

@@ -76,9 +76,9 @@
           <span>{{ row.addTime | parseTime('{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="排序值" align="center" prop="preferentialProductSort" width="90">
+      <el-table-column label="排序值" align="center" prop="preferentialProductSort">
         <template slot-scope="{row}">
-          <el-input v-model="row.preferentialProductSort" style="60px" size="small" type="number" min="1" maxlength="3" />
+          <el-input v-model="row.preferentialProductSort" size="mini" type="number" min="1" style="width:55px;" maxlength="3" />
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -156,7 +156,7 @@ export default {
       const sorts = []
       this.list.map(item => {
         if (item.preferentialProductSort) {
-          sorts.push(item.id + '-' + Math.abs(item.preferentialProductSort))
+          sorts.push(item.id + '-' + item.preferentialProductSort)
         }
       })
       saveGoodsSort({ newProducSorttList: sorts.join(','), modules: this.modulesId }).then(response => {

src/views/goods/list-preferred.vue

@@ -76,9 +76,9 @@
           <span>{{ row.addTime | parseTime('{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="排序值" align="center" prop="preferredProductSort" width="90">
+      <el-table-column label="排序值" align="center" prop="preferredProductSort">
         <template slot-scope="{row}">
-          <el-input v-model="row.preferredProductSort" style="60px" size="small" type="number" min="1" maxlength="3" />
+          <el-input v-model="row.preferredProductSort" size="mini" type="number" min="1" style="width:55px;" maxlength="3" />
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -156,7 +156,7 @@ export default {
       const sorts = []
       this.list.map(item => {
         if (item.preferredProductSort) {
-          sorts.push(item.id + '-' + Math.abs(item.preferredProductSort))
+          sorts.push(item.id + '-' + item.preferredProductSort)
         }
       })
       saveGoodsSort({ newProducSorttList: sorts.join(','), modules: this.modulesId }).then(response => {

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">
@@ -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/list.vue

@@ -89,7 +89,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" />
@@ -124,18 +124,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-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-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

src/views/order/refund-return.vue

@@ -6,8 +6,10 @@
       <el-menu-item index="2">退款退货详情</el-menu-item>
     </el-menu>
 
+    <el-card v-if="refundList.length === 0" class="box-card" style="text-align:center;">暂无退款退货详情记录.....</el-card>
+
     <template v-for="refund in refundList">
-      <el-card :key="'review'+refund.orderID" class="box-card">
+      <el-card :key="'review-return'+refund.orderID" class="box-card">
         <div class="refund-item">
           <h3>审核信息</h3>
           <el-row :gutter="24" class="box-row">
@@ -168,25 +170,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.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>