YY há 2 anos atrás
pai
commit
c86f3dfc86

+ 1 - 0
src/views/platmanag/goods/spec.vue

@@ -100,6 +100,7 @@ export default {
         { label: '实际销售价格', model: 'sell_money', type: 'number' },
         { label: '划掉销售价格', model: 'flow_money', type: 'number' },
         { label: '运费', model: 'freight', type: 'number' },
+        { label: '排序', model: 'sort', type: 'number' },
         { label: '状态', model: 'status', type: 'select' },
         { label: '是否可以团购', model: 'can_group', type: 'select' },
         { label: '团购金额', model: 'money', type: 'number' },

+ 1 - 11
src/views/platmanag/order/detail_order.vue

@@ -40,16 +40,6 @@
                 <el-col :span="18" class="other" v-if="!goods.freight == '0'">{{ goods.freight }}</el-col>
                 <el-col :span="18" class="other" v-else>包邮</el-col>
               </el-col>
-              <!-- <el-col :span="24" class="bode">
-                <el-col :span="6">查看商品来源:</el-col>
-                <el-col :span="18" class="other"">{{ goods.goods.source || '暂无来源' }}</el-col>
-              </el-col> -->
-              <!-- <el-col :span="24" class="bode">
-                <el-col :span="6">网址:</el-col>
-                <el-col :span="18" class="other">
-                  <span class="spanfour" @click="toUrl(goods.goods.url)"> {{ goods.goods.url || '暂无网址' }} </span>
-                </el-col>
-              </el-col> -->
               <el-col :span="24">
                 <el-col :span="6">订单备注</el-col>
                 <el-col :span="18" class="other" v-if="item.remarks">{{ item.remarks }}</el-col>
@@ -136,7 +126,7 @@ export default {
       if (url) {
         window.open(url, '_blank');
       } else {
-        this.$message.error('该商品还未添加网址,无法跳转');
+        this.$message.error('该商品还未添加来源网址,无法跳转');
       }
     },
     // 返回

+ 1 - 12
src/views/platmanag/order/detail_orderDetail.vue

@@ -57,16 +57,6 @@
               <el-col :span="18" class="other" v-if="!item.goods.freight == '0'">{{ item.goods.freight }}</el-col>
               <el-col :span="18" class="other" v-else>包邮</el-col>
             </el-col>
-            <!-- <el-col :span="24" class="bode">
-              <el-col :span="6">查看商品来源:</el-col>
-              <el-col :span="18" class="other">{{ item.goods.source || '暂无来源' }}</el-col>
-            </el-col>
-            <el-col :span="24" class="bode">
-              <el-col :span="6">网址:</el-col>
-              <el-col :span="18" class="other">
-                <span class="spanfour" @click="toUrl(goods.goods.url)"> {{ goods.goods.url || '暂无网址' }} </span>
-              </el-col>
-            </el-col> -->
           </el-col>
           <el-col :span="24" class="bode">
             <el-col :span="6">订单备注</el-col>
@@ -255,11 +245,10 @@ export default {
       this.loading = false;
     },
     toUrl(url) {
-      console.log(url);
       if (url) {
         window.open(url, '_blank');
       } else {
-        this.$message.error('该商品还未添加网址,无法跳转');
+        this.$message.error('该商品还未添加来源网址,无法跳转');
       }
     },
     handleSelect(value) {},

+ 1 - 0
src/views/selfShop/goods/spec.vue

@@ -100,6 +100,7 @@ export default {
         { label: '库存', model: 'num', type: 'number' },
         { label: '实际销售价格', model: 'sell_money', type: 'number' },
         { label: '划掉销售价格', model: 'flow_money', type: 'number' },
+        { label: '排序', model: 'sort', type: 'number' },
         { label: '运费', model: 'freight', type: 'number' },
         { label: '状态', model: 'status', type: 'select' },
         { label: '是否可以团购', model: 'can_group', type: 'select' },

+ 1 - 11
src/views/selfShop/order/detail_order.vue

@@ -40,16 +40,6 @@
                 <el-col :span="18" class="other" v-if="!goods.freight == '0'">{{ goods.freight }}</el-col>
                 <el-col :span="18" class="other" v-else>包邮</el-col>
               </el-col>
-              <!-- <el-col :span="24" class="bode">
-                <el-col :span="6">查看商品来源:</el-col>
-                <el-col :span="18" class="other" >{{ goods.goods.source || '暂无来源' }}</el-col>
-              </el-col> -->
-              <!-- <el-col :span="24" class="bode">
-                <el-col :span="6">网址:</el-col>
-                <el-col :span="18" class="other">
-                  <span class="spanfour" @click="toUrl(goods.goods.url)"> {{ goods.goods.url || '暂无网址' }} </span>
-                </el-col>
-              </el-col> -->
               <el-col :span="24">
                 <el-col :span="6">订单备注</el-col>
                 <el-col :span="18" class="other" v-if="item.remarks">{{ item.remarks }}</el-col>
@@ -136,7 +126,7 @@ export default {
       if (url) {
         window.open(url, '_blank');
       } else {
-        this.$message.error('该商品还未添加网址,无法跳转');
+        this.$message.error('该商品还未添加来源网址,无法跳转');
       }
     },
     // 返回

+ 1 - 12
src/views/selfShop/order/detail_orderDetail.vue

@@ -57,16 +57,6 @@
               <el-col :span="18" class="other" v-if="!item.goods.freight == '0'">{{ item.goods.freight }}</el-col>
               <el-col :span="18" class="other" v-else>包邮</el-col>
             </el-col>
-            <!-- <el-col :span="24" class="bode">
-              <el-col :span="6">查看商品来源:</el-col>
-              <el-col :span="18" class="other">{{ item.goods.source || '暂无来源' }}</el-col>
-            </el-col>
-            <el-col :span="24" class="bode">
-              <el-col :span="6">网址:</el-col>
-              <el-col :span="18" class="other">
-                <span class="spanfour" @click="toUrl(goods.goods.url)"> {{ goods.goods.url || '暂无网址' }} </span>
-              </el-col>
-            </el-col> -->
           </el-col>
           <el-col :span="24" class="bode">
             <el-col :span="6">订单备注</el-col>
@@ -255,11 +245,10 @@ export default {
       this.loading = false;
     },
     toUrl(url) {
-      console.log(url);
       if (url) {
         window.open(url, '_blank');
       } else {
-        this.$message.error('该商品还未添加网址,无法跳转');
+        this.$message.error('该商品还未添加来源网址,无法跳转');
       }
     },
     handleSelect(value) {},

+ 4 - 4
src/views/selfShop/sales/detail.vue

@@ -92,8 +92,8 @@
           </el-col>
         </el-col>
         <el-col :span="12" class="two">
-          <steps-1 v-if="info.type == '1'" @exam="exam" :active="active"></steps-1>
-          <steps-2 v-if="info.type == '2'" @exam="exam" :active="active" :customer="customer" :activit="activit"></steps-2>
+          <steps-1 v-if="info.type == '1'" @exam="exam" :active="active" :form="form" :info="info"></steps-1>
+          <steps-2 v-if="info.type == '2'" @exam="exam" :active="active" :customer="customer" :activit="activit" :form="form" :info="info"></steps-2>
           <steps-3
             v-if="info.type == '3'"
             @exam="exam"
@@ -247,7 +247,7 @@ export default {
         this.loading = false;
       }
     },
-    async exam(status) {
+    async exam(status, form) {
       let info = this.info;
       info.status = status;
       if (status == '-2' && info.transport) info.transport.shop_receive = true;
@@ -262,6 +262,7 @@ export default {
         transport.customer_receive = true;
         info.transport = transport;
       }
+      if (form.money != undefined && form.money != '') info.money = form.money;
       let res;
       this.$confirm('是否确认修改售后状态', '提示', {
         confirmButtonText: '确定',
@@ -296,7 +297,6 @@ export default {
         this.search();
       }
     },
-
     // 查询其他信息
     async searchOther() {
       let res;

+ 30 - 5
src/views/selfShop/sales/parts/steps-1.vue

@@ -10,8 +10,20 @@
         <el-col :span="24" style="text-align: center">
           <el-col v-if="active == '0'"> 买家已申请仅退款 </el-col>
           <el-col v-if="active == '1'" style="text-align: center; margin: 15px 0; font-size: 18px">
-            <el-button type="primary" @click="exam('1')">同意售后,处理退款</el-button>
-            <el-button type="primary" @click="exam('!1')">拒绝</el-button>
+            <el-form :model="form" ref="form" label-width="100px">
+              <el-form-item label="退款金额" prop="money">
+                <el-input v-model="form.money" placeholder="请输入退款金额" size="small" type="Number" @input="toMoney"></el-input>
+                <p class="p1">
+                  用于部分退款,退款金额不得超过<span>{{ info.money || '退款最大金额' }}元</span>
+                </p>
+              </el-form-item>
+              <el-form-item>
+                <el-col>
+                  <el-button type="primary" @click="exam('1')">同意售后,处理退款</el-button>
+                  <el-button type="primary" @click="exam('!1')">拒绝</el-button>
+                </el-col>
+              </el-form-item>
+            </el-form>
           </el-col>
           <el-col v-if="active == 3">
             <el-col style="text-align: center; margin: 15px 0; font-size: 18px">已退款成功</el-col>
@@ -29,17 +41,24 @@
 import { mapState, createNamespacedHelpers } from 'vuex';
 export default {
   name: 'steps-1',
-  props: { active: { type: Number } },
+  props: { active: { type: Number }, form: { type: Object }, info: { type: Object } },
   components: {},
   data: function () {
     return {
       status: '0',
     };
   },
+
   created() {},
   methods: {
     exam(status) {
-      this.$emit('exam', status);
+      this.$emit('exam', status, this.form);
+    },
+    toMoney(val) {
+      if (val > this.info.money) {
+        this.$message.error('超过退款最大金额');
+        this.$set(this.form, `money`, '');
+      }
     },
   },
   computed: {
@@ -58,4 +77,10 @@ export default {
 };
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.p1 {
+  span {
+    color: red;
+  }
+}
+</style>

+ 21 - 3
src/views/selfShop/sales/parts/steps-2.vue

@@ -11,8 +11,20 @@
         <el-col :span="24">
           <el-col v-if="active == 0"> 买家已申请退货 </el-col>
           <el-col v-if="active == 1" style="text-align: center; margin: 15px 0; font-size: 18px">
-            <el-button type="primary" @click="exam('2')">同意售后,处理退货</el-button>
-            <el-button type="primary" @click="exam('!2')">拒绝</el-button>
+            <el-form :model="form" ref="form" label-width="100px" class="demo-ruleForm">
+              <el-form-item label="退款金额" prop="money">
+                <el-input v-model="form.money" placeholder="请输入退款金额" size="small" type="Number" @input="toMoney"></el-input>
+                <p class="p1">
+                  用于部分退款,退款金额不得超过<span>{{ info.money || '退款最大金额' }}元</span>
+                </p>
+              </el-form-item>
+              <el-form-item>
+                <el-col>
+                  <el-button type="primary" @click="exam('2')">同意售后,处理退货</el-button>
+                  <el-button type="primary" @click="exam('!2')">拒绝</el-button>
+                </el-col>
+              </el-form-item>
+            </el-form>
           </el-col>
           <el-col v-if="active == 2">
             <el-col :span="24" style="text-align: center; margin-top: 15px">
@@ -45,7 +57,7 @@ const _ = require('lodash');
 import { mapState, createNamespacedHelpers } from 'vuex';
 export default {
   name: 'steps-1',
-  props: { active: { type: Number }, customer: { type: Array }, activit: { type: Object } },
+  props: { active: { type: Number }, customer: { type: Array }, activit: { type: Object }, form: { type: Object }, info: { type: Object } },
   components: {},
   data: function () {
     return {
@@ -63,6 +75,12 @@ export default {
     getCheck() {
       return _.get(this.activit, 'customer.is_check');
     },
+    toMoney(val) {
+      if (val > this.info.money) {
+        this.$message.error('超过退款最大金额');
+        this.$set(this.form, `money`, '');
+      }
+    },
   },
   computed: {
     ...mapState(['user']),