YY %!s(int64=2) %!d(string=hai) anos
pai
achega
35343e06ac

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

@@ -72,7 +72,7 @@
           </el-col>
           <el-col :span="24" v-if="info.type == '1' || info.type == '2' || info.type == '4' || info.type == '5'">
             <el-col :span="6">退款金额</el-col>
-            <el-col :span="18" class="other">{{ info.money }}</el-col>
+            <el-col :span="18" class="other">{{ info.money || '' }}</el-col>
           </el-col>
           <el-col :span="24">
             <el-col :span="6">售后状态</el-col>
@@ -238,7 +238,7 @@ export default {
                 let shopList = res.data.shop.list;
                 this.$set(this, `shopList`, shopList);
                 shopList[0].color = '#0bbd87';
-                if (res.data.shop.is_check == '已签收' && this.info.status == '3') this.$set(this, `active`, 4);
+                if (res.data.shop.is_check == '已签收' && this.info.status == '3') this.$set(this, `active`, 5);
               }
               this.$set(this, `activit`, res.data);
             }
@@ -262,8 +262,9 @@ export default {
         transport.customer_receive = true;
         info.transport = transport;
       }
-      if (form.money != undefined && form.money != '') info.money = form.money;
+      if (form != undefined && form.money != undefined && (status == '2' || status == '1')) info.money = form.money;
       let res;
+      console.log(info);
       this.$confirm('是否确认修改售后状态', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',

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

@@ -26,9 +26,9 @@
               </el-form-item>
             </el-form>
           </el-col>
-          <el-col v-if="active == 2">
+          <el-col v-if="active == 2 || active == 3">
             <el-col :span="24" style="text-align: center; margin-top: 15px">
-              <el-button type="primary" style="margin: 10px 0" @click="exam('-2')">已退货</el-button>
+              <el-button type="primary" style="margin: 10px 0" @click="exam('-2')" v-if="active == 3">已退货</el-button>
             </el-col>
             <el-col :span="24" style="text-align: center; margin: 15px 0; font-size: 18px">买家{{ getCheck() || '暂无快递信息' }}</el-col>
             <el-col :span="24">

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

@@ -27,30 +27,30 @@
           </el-col>
           <el-col v-if="active == 3">
             <el-col :span="24" style="text-align: center; margin: 15px 0; font-size: 18px">店铺{{ getCheck() || '暂无快递信息' }}</el-col>
-            <el-col>
-              <data-form :fields="infoFields" :rules="rules" v-model="form" labelWidth="150px" @save="onSubmit">
-                <template #shop_transport_type>
-                  <el-select
-                    v-model="form.shop_transport_type"
-                    filterable
-                    remote
-                    reserve-keyword
-                    placeholder="请选择快递类型,运单号,同时填入"
-                    :remote-method="querySearch"
-                    :loading="loading"
-                    @change="handleSelect"
-                    size="small"
-                    style="width: 100%"
-                  >
-                    <el-option v-for="item in shop_transport_typeList" :key="item.id" :label="item.label" :value="item.value"> </el-option>
-                  </el-select>
-                </template>
-              </data-form>
-            </el-col>
           </el-col>
-          <el-col v-if="active == 4">
+          <el-col v-if="active == 3 || active == 4">
+            <data-form :fields="infoFields" :rules="rules" v-model="form" labelWidth="150px" @save="onSubmit">
+              <template #shop_transport_type>
+                <el-select
+                  v-model="form.shop_transport_type"
+                  filterable
+                  remote
+                  reserve-keyword
+                  placeholder="请选择快递类型,运单号,同时填入"
+                  :remote-method="querySearch"
+                  :loading="loading"
+                  @change="handleSelect"
+                  size="small"
+                  style="width: 100%"
+                >
+                  <el-option v-for="item in shop_transport_typeList" :key="item.id" :label="item.label" :value="item.value"> </el-option>
+                </el-select>
+              </template>
+            </data-form>
+          </el-col>
+          <el-col v-if="active == 4 || active == 5">
             <el-col :span="24" style="text-align: center; margin-top: 15px">
-              <el-button type="primary" @click="exam('-3')" style="margin: 10px 0">已换货</el-button>
+              <el-button type="primary" @click="exam('-3')" style="margin: 10px 0" v-if="active == 5">已换货</el-button>
             </el-col>
             <el-col :span="24" style="text-align: center; margin: 15px 0; font-size: 18px" v-if="transport.customer_receive == true"
               >买家{{ getCheckOne() || '暂无快递信息' }}</el-col