优化退货退款详情

src/views/club/editForm.vue

@@ -61,11 +61,11 @@
           <el-radio :label="91">否</el-radio>
         </el-radio-group>
       </el-form-item>
+      <el-form-item style="width: 430px;text-align: right;float:left;">
+        <el-button style="margin-right:10px;float: left;" type="primary" :loading="loadingbut" @click="onSubmite()">{{ loadingbuttext }}</el-button>
+        <el-button style="margin-right:10px;float: left;" @click="backToList">返回</el-button>
+      </el-form-item>
     </el-form>
-    <div slot="footer" class="dialog-footer" style="width:200px;margin:0 auto;padding:80px 0;float:right;margin-right:70px">
-      <el-button style="margin-right:10px" @click="backToList">返回</el-button>
-      <el-button type="primary" :loading="loadingbut" @click="onSubmite()">{{ loadingbuttext }}</el-button>
-    </div>
   </div>
 </template>
 <script>

src/views/club/form.vue

@@ -62,11 +62,11 @@
           <el-radio :label="91">否</el-radio>
         </el-radio-group>
       </el-form-item>
+      <el-form-item style="width: 430px;text-align: right;float:left;">
+        <el-button style="margin-right:10px;float: left;" type="primary" :loading="loadingbut" @click="onSubmite()">{{ loadingbuttext }}</el-button>
+        <el-button style="margin-right:10px;float: left;" @click="backToList">返回</el-button>
+      </el-form-item>
     </el-form>
-    <div slot="footer" class="dialog-footer" style="width:200px;margin:0 auto;padding:80px 0;float:right;margin-right:70px">
-      <el-button style="margin-right:10px" @click="backToList">返回</el-button>
-      <el-button type="primary" :loading="loadingbut" @click="onSubmite()">{{ loadingbuttext }}</el-button>
-    </div>
   </div>
 </template>
 

src/views/goods/category-create.vue

@@ -5,7 +5,7 @@
       <el-menu-item index="2">添加分类</el-menu-item>
     </el-menu>
     <el-form ref="dataForm" :rules="rules" :model="temp" label-position="left" label-width="120px" style="width:400px; margin:30px 0 0 50px;">
-      <el-form-item label="分类名称" prop="classifyName">
+      <el-form-item label="分类名称:" prop="classifyName">
         <el-input v-model="temp.classifyName" placeholder="请输入分类名称" maxlength="5" />
       </el-form-item>
       <!--<el-form-item label="图标" prop="classifyImage">
@@ -27,17 +27,17 @@
           </el-upload>
         </div>
       </el-form-item>
-      <el-form-item label="排序值" prop="sort">
+      <el-form-item label="排序值:" prop="sort">
         <el-input v-model="temp.sort" type="number" placeholder="请输入排序值" maxlength="3" />
       </el-form-item>
-      <el-form-item label="邮费是否到付" prop="postageToPay" style="width: 500px;">
+      <el-form-item label="邮费是否到付:" prop="postageToPay" style="width: 500px;">
         <el-select v-model="temp.postageToPay" class="filter-item filter-item-temp" placeholder="请选择" value="">
           <el-option label="是" value="1" />
           <el-option label="否" value="2" />
         </el-select>
         <span class="span_tip">注意：仪器分类请选择"是"，其他分类请选择"否"</span>
       </el-form-item>
-      <el-form-item label="状态" prop="status">
+      <el-form-item label="状态:" prop="status">
         <el-select v-model="temp.status" class="filter-item filter-item-temp" placeholder="请选择" value="">
           <el-option label="启用" value="1" />
           <el-option label="停用" value="2" />

src/views/goods/category-edit.vue

@@ -5,7 +5,7 @@
       <el-menu-item index="2">编辑分类</el-menu-item>
     </el-menu>
     <el-form ref="dataForm" :rules="rules" :model="temp" label-position="left" label-width="120px" style="width:400px; margin:30px 0 0 50px;">
-      <el-form-item label="分类名称" prop="classifyName">
+      <el-form-item label="分类名称:" prop="classifyName">
         <el-input v-model="temp.classifyName" placeholder="请输入分类名称" maxlength="5" />
       </el-form-item>
       <!--<el-form-item label="图标" prop="classifyImage">
@@ -27,17 +27,17 @@
           </el-upload>
         </div>
       </el-form-item>
-      <el-form-item label="排序值" prop="sort">
+      <el-form-item label="排序值:" prop="sort">
         <el-input v-model="temp.sort" type="number" placeholder="请输入排序值" maxlength="3" />
       </el-form-item>
-      <el-form-item label="邮费是否到付" prop="postageToPay" style="width: 500px;">
+      <el-form-item label="邮费是否到付:" prop="postageToPay" style="width: 500px;">
         <el-select v-model="temp.postageToPay" class="filter-item filter-item-temp" placeholder="请选择" value="">
           <el-option label="是" value="1" />
           <el-option label="否" value="2" />
         </el-select>
         <span class="span_tip">注意：仪器分类请选择"是"，其他分类请选择"否"</span>
       </el-form-item>
-      <el-form-item label="状态" prop="status">
+      <el-form-item label="状态:" prop="status">
         <el-select v-model="temp.status" class="filter-item filter-item-temp" placeholder="请选择" value="">
           <el-option label="启用" value="1" />
           <el-option label="停用" value="2" />

src/views/goods/list-commonly.vue

@@ -126,6 +126,9 @@ export default {
   computed: {
     organizeID() {
       return this.$store.getters.organizeID
+    },
+    onKeypress() {
+      return (/[\d]/.test(String.fromCharCode(event.keyCode)))
     }
   },
   created() {
@@ -156,7 +159,7 @@ export default {
       const sorts = []
       this.list.map(item => {
         if (item.commonlyProductSort) {
-          sorts.push(item.id + '-' + item.commonlyProductSort)
+          sorts.push(item.id + '-' + Math.abs(item.commonlyProductSort))
         }
       })
       this.listQuery.id = ''

src/views/goods/list-preferential.vue

@@ -126,6 +126,9 @@ export default {
   computed: {
     organizeID() {
       return this.$store.getters.organizeID
+    },
+    onKeypress() {
+      return (/[\d]/.test(String.fromCharCode(event.keyCode)))
     }
   },
   created() {
@@ -156,7 +159,7 @@ export default {
       const sorts = []
       this.list.map(item => {
         if (item.preferentialProductSort) {
-          sorts.push(item.id + '-' + item.preferentialProductSort)
+          sorts.push(item.id + '-' + Math.abs(item.preferentialProductSort))
         }
       })
       this.listQuery.id = ''

src/views/goods/list-preferred.vue

@@ -126,6 +126,9 @@ export default {
   computed: {
     organizeID() {
       return this.$store.getters.organizeID
+    },
+    onKeypress() {
+      return (/[\d]/.test(String.fromCharCode(event.keyCode)))
     }
   },
   created() {
@@ -156,7 +159,7 @@ export default {
       const sorts = []
       this.list.map(item => {
         if (item.preferredProductSort) {
-          sorts.push(item.id + '-' + item.preferredProductSort)
+          sorts.push(item.id + '-' + Math.abs(item.preferredProductSort))
         }
       })
       this.listQuery.id = ''

src/views/order/detail.vue

@@ -104,7 +104,7 @@
             <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">
+            <el-col :span="1.5">
               <img :src="op.productImage" width="60" alt="">
             </el-col>
             <el-col :span="7">{{ op.name }}</el-col>

src/views/order/refund-detail.vue

@@ -15,8 +15,8 @@
           <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>
-            <el-tag v-if="refund.status*1===3" type="success" size="small">审核通过</el-tag>
+            <el-tag v-if="refund.status*1===2" type="success" size="small">审核通过</el-tag>
+            <el-tag v-if="refund.status*1===3" type="danger" size="small">审核不通过</el-tag>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="box-row">
@@ -84,11 +84,6 @@
               <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>
@@ -112,12 +107,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 | 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> ¥{{ shopOrder.productAmount | 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>
@@ -128,7 +118,7 @@
             <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">
+            <el-col :span="1.5">
               <img :src="op.mainImage" width="60" alt="">
             </el-col>
             <el-col :span="7">{{ op.name }}</el-col>
@@ -156,17 +146,22 @@
         <el-row :gutter="24" class="box-row">
           <el-col :span="6"><b>审核人:</b> {{ refund.reviewUserName }}</el-col>
           <el-col :span="6"><b>审核时间:</b> {{ refund.confirmReturnTime }}</el-col>
-          <el-col :span="6"><b>审核备注:</b> {{ refund.reviewRemarks ? refund.reviewRemarks : '无' }}</el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24"><b>审核备注:</b> {{ refund.reviewRemarks ? refund.reviewRemarks : '无' }}</el-col>
         </el-row>
         <el-row v-if="refund.reviewImage1 || refund.reviewImage2 || refund.reviewImage3 || refund.reviewImage4 || refund.reviewImage5 " :gutter="24" class="box-row">
-          <el-col :span="4"><b>审核凭证:</b></el-col>
-          <el-col :span="20">
+          <el-col :span="2"><b>审核凭证:</b></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="22">
             <img v-if="refund.reviewImage1" :src="refund.reviewImage1" width="65" alt="">
             <img v-if="refund.reviewImage2" :src="refund.reviewImage2" width="65" alt="">
             <img v-if="refund.reviewImage3" :src="refund.reviewImage3" width="65" alt="">
             <img v-if="refund.reviewImage4" :src="refund.reviewImage4" width="65" alt="">
             <img v-if="refund.reviewImage5" :src="refund.reviewImage5" width="65" alt="">
           </el-col>
+
         </el-row>
       </div>
       <div class="refund-item">
@@ -174,11 +169,15 @@
         <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}:{s}') }}</template></el-col>
-          <el-col :span="6"><b>退款备注:</b> {{ refund.remarks ? refund.remarks : '无' }}</el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24"><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">
-          <el-col :span="4"><b>申请凭证:</b></el-col>
-          <el-col :span="20">
+          <el-col :span="2"><b>申请凭证:</b></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="22">
             <img v-if="refund.image1" :src="refund.image1" width="65" alt="">
             <img v-if="refund.image2" :src="refund.image2" width="65" alt="">
             <img v-if="refund.image3" :src="refund.image3" width="65" alt="">

src/views/order/refund-return.vue

@@ -165,7 +165,7 @@
               <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">
+              <el-col :span="1.5">
                 <img :src="op.mainImage" width="60" alt="">
               </el-col>
               <el-col :span="7">{{ op.name }}</el-col>