Browse Source

no message

pengyh 1 year ago
parent
commit
ad5eae1970

+ 2 - 2
src/views/mallManagement/order/order_detail/index.vue

@@ -270,9 +270,9 @@
           <el-table-column prop="createTime" align="center" label="操作时间" width="160"></el-table-column>
           <el-table-column align="center" label="操作" fixed="right">
             <template slot-scope="scope">
-			  <el-button v-if="!~['TIMEOUT', 'CLOSE'].indexOf(orderDetail.orderStatus)" size="mini" type="text"
+			 <!-- <el-button v-if="!~['TIMEOUT', 'CLOSE'].indexOf(orderDetail.orderStatus)" size="mini" type="text"
 			    @click="handleRefund(scope.row)" :disabled="!orderDetail.refundAble || scope.row.refundNum >= scope.row.num">退款
-			  </el-button>
+			  </el-button> -->
               <el-button type="text" size="small" @click="returnOrder(scope.row.deliveryId)">发起退货</el-button>
             </template>
           </el-table-column>

+ 4 - 3
src/views/mallManagement/order/order_refund/index.vue

@@ -582,9 +582,10 @@ export default {
       getOrderDetail({ orderId: orderId || this?.order_cp?.orderId || "" }).then(res => {
         let arr = []
         res.data.orderDetails.forEach(item=>{
-        	if(item.goodsMaterialId){
-        		arr.push(item)
-        	}
+			arr.push(item)
+        	// if(item.goodsMaterialId){
+        	// 	arr.push(item)
+        	// }
         })
         this.formData1.list = arr
       })