no message

src/views/mallManagement/order/order_detail/index.vue

@@ -226,9 +226,9 @@
         <el-table-column prop="refundTime" label="退款时间" align="center" min-width="160"></el-table-column>
         <el-table-column label="操作" align="center" width="160" v-if="orderDetail.orderStatus != 'CLOSE' && orderDetail.payTypeId == 'WECHAT'">
           <template slot-scope="scope">
-            <el-button v-if="!~['TIMEOUT', 'CLOSE'].indexOf(orderDetail.orderStatus)" size="mini" type="primary"
+            <!-- <el-button v-if="!~['TIMEOUT', 'CLOSE'].indexOf(orderDetail.orderStatus)" size="mini" type="primary"
               @click="handleRefund(scope.row)"
-              :disabled="!orderDetail.refundAble || scope.row.refundNum >= scope.row.num">退款</el-button>
+              :disabled="!orderDetail.refundAble || scope.row.refundNum >= scope.row.num">退款</el-button> -->
             <el-button v-if="!~['TIMEOUT'].indexOf(orderDetail.orderStatus)" size="mini"
               @click="handleCompensate(scope.row)">理赔</el-button>
           </template>
@@ -270,6 +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"
+			    @click="handleRefund(scope.row)" :disabled="!orderDetail.refundAble || scope.row.refundNum >= scope.row.num">退款
+			  </el-button>
               <el-button type="text" size="small" @click="returnOrder(scope.row.deliveryId)">发起退货</el-button>
             </template>
           </el-table-column>

src/views/mallManagement/order/order_list/index.vue

@@ -366,7 +366,10 @@
 							<el-form-item label="仓储" prop="storageId" v-if="logisticsType != 'edit'"
 							  :rules="joinCode == 'NO' ? [] : [{ required: true, message: '请选择仓储', trigger: 'change' }]">
 							  <el-input v-if="logisticsType == 'detail'" v-model="logisticsForm.storageName" :disabled="true" placeholder="请输入提货人"></el-input>
-							  <el-select v-else v-model="logisticsForm.storageId" placeholder="请选择仓储" style="width: 100%;">
+							  <el-select v-else v-model="logisticsForm.storageId" @change="(e)=>{
+								  logisticsForm.storageName = storageList.find(item => item.storageId == e).storageName
+								  getOrderDetail()
+							  }" placeholder="请选择仓储" style="width: 100%;">
 							    <el-option :label="item.storageName" :value="item.storageId" v-for="(item, index) in storageList"
 							      :key="index"></el-option>
 							  </el-select>
@@ -391,7 +394,7 @@
 						<el-col :span="24">
 							<el-card class="box-card">
 								<el-tabs v-model="typeIndex" @tab-click="changeType">
-								    <el-tab-pane label="发货数量" name="1"></el-tab-pane>
+								    <el-tab-pane v-if="orderDetail.orderStatus != 'YFH' && orderDetail.orderStatus != 'OVER'" label="发货数量" name="1"></el-tab-pane>
 								    <el-tab-pane v-if="joinCode == 'CODE'" label="发货条码" name="2"></el-tab-pane>
 								    <el-tab-pane label="发货记录" name="3"></el-tab-pane>
 								</el-tabs>
@@ -414,11 +417,19 @@
 													{{scope.row.goodsMaterialUnit == 'C' ? '整套' : scope.row.goodsMaterialUnit == 'I' ? '单个' : ''}}
 												</template>
 											</el-table-column>
-											<el-table-column prop="num" align="center" label="数量">
-                        <template slot-scope="scope">
-                          <el-input v-model="scope.row.num" placeholder="请输入" type="number"></el-input>
-                        </template>
-                      </el-table-column>
+											<el-table-column prop="num" align="center" label="订单数量">
+												<template slot-scope="scope">
+													<el-input v-model="scope.row.num" placeholder="请输入" type="number"></el-input>
+												</template>
+											</el-table-column>
+											<el-table-column prop="sendStockNum" align="center" label="发货数量"></el-table-column>
+											<el-table-column v-if="joinCode != 'NO'" prop="" align="center" label="发货仓库">
+												<template slot-scope="scope">
+													{{logisticsForm.storageName}}
+												</template>
+											</el-table-column>
+											<el-table-column v-if="joinCode != 'NO'" prop="stockOnQty" align="center" label="发货仓库库存"></el-table-column>
+											<el-table-column v-if="joinCode != 'NO'" prop="allStockQty" align="center" label="库存总数量"></el-table-column>
 											<el-table-column prop="stockNum" align="center" label="库存数量"></el-table-column>
 											<el-table-column prop="insideNum" align="center" label="内机数量"></el-table-column>
 											<el-table-column prop="outNum" align="center" label="外机数量"></el-table-column>
@@ -818,6 +829,7 @@ export default {
       billTitle: JSON.parse(localStorage.getItem('greemall_user')).billTitle,//打印名称
 
       deliverSelection: [],
+	  orderDetail: {}
     }
   },
   computed: {
@@ -905,7 +917,7 @@ export default {
       })
     },
 	getOrderDetail(){
-		getOrderDetail({orderId: this.editOrderId}).then(res => {
+		getOrderDetail({orderId: this.editOrderId,storageId: this.logisticsForm.storageId}).then(res => {
 			// let arr = []
 			// res.data.orderDetails.forEach(item=>{
 			// 	if(item.goodsMaterialId){
@@ -1186,14 +1198,15 @@ export default {
     },
     // 显示快递信息填写
     showLogistics(item, type) {
+		this.orderDetail = item
 			this.logisticsType = type;
 			this.logisticsIdVisible = true;
 			this.editOrderId = item.orderId;
 			if(type == 'add'){
 				this.getOrderDetail()
 				this.getCodeDetail()
-        this.getDeliverList();
-        this.getStorageList();
+				this.getDeliverList();
+				this.getStorageList();
 				this.openForm('deliverGoods',item)
 			}else if(type == 'edit'){
 				this.openForm('editExpressage',item)
@@ -1209,7 +1222,7 @@ export default {
 				this.logisticsForm.pickPhone = item.pickPhone
 				this.getOrderDetail()
 				this.getCodeDetail()
-        this.getDeliverList();
+				this.getDeliverList();
 				this.openForm('deliverGoodsDetail',item)
 			}
     },