Browse Source

fix: 使用家贤jiaxianOrderId

zh 2 years ago
parent
commit
32b67a1367

+ 1 - 1
src/views/sales_control/sales_management/components/customer_sales_details.vue

@@ -16,7 +16,7 @@
         </el-button>
       </template>
     </sales-table>
-    <LogisticsTabs v-if="details.status == 2 && details.stockType == 1 " style="margin:20px;" :details-id="detailsId" />
+    <LogisticsTabs v-if="details.status == 2 && details.stockType == 1 " style="margin:20px;" :details-id="detailsId" :jiaxian-order-id="details.jiaxianOrderId"/>
     <sales-dialog
       :dialog-visible="dialogVisible"
       :customer-number="customerNumber"

+ 4 - 11
src/views/sales_control/sales_management/components/return_sales_details.vue

@@ -26,7 +26,7 @@
           <el-button v-if="(details.stockType ==1 && details.status == 1)" size="mini" :disabled="dis" @click="handleInform(2)">退货通知</el-button>
         </div>
         <div v-else>
-          <el-button v-if="(details.stockType ==1 && details.status == 1)" size="mini"  @click="handleInform(2)">退货通知</el-button>
+          <el-button v-if="(details.stockType ==1 && details.status == 1)" size="mini" @click="handleInform(2)">退货通知</el-button>
           <el-button v-if="(details.status == 2 && details.stockType == 1) || (details.status == 2 && details.stockType == 2)" size="mini" @click="handleSendRevoke(1)">撤销退货</el-button>
         </div>
       </template>
@@ -43,7 +43,7 @@
         </el-popconfirm>
       </template>
     </sales-table>
-    <LogisticsTabs v-if="details.stockType == 1 " style="margin:20px;" :details-id="detailsId" :return-show="false" />
+    <LogisticsTabs v-if="details.status == 2 && details.stockType == 1 " style="margin:20px;" :jiaxian-order-id="details.jiaxianOrderId"  :details-id="detailsId" :return-show="false" />
 
     <sales-dialog
       ref="dia"
@@ -114,13 +114,6 @@ export default {
           label: '退货数量',
           width: '180'
         },
-
-        {
-          prop: '',
-          label: '已退数量',
-          width: '180',
-          isCustom: true
-        },
         // {
         //   prop: 'totalVolume',
         //   label: '总体积',
@@ -148,7 +141,7 @@ export default {
       detailRefund({ id: this.detailsId }).then(res => {
         this.dataList = res.data.orders
         this.details = res.data
-        console.log( this.details, 99);
+        console.log(this.details, 99)
         this.dataList.forEach(k => {
           this.$set(k, 'refundQty', k.qty)
           k.diffQty = Number(k.qty) - Number(k.refundQty || 0)
@@ -362,7 +355,7 @@ export default {
       }
     },
     handleInform(status = 2) {
-      sendRefund({ id: this.details.id , status }).then(res => {
+      sendRefund({ id: this.details.id, status }).then(res => {
         this.$successMsg('退货通知')
         this.handleBack()
       })