Merge branch 'master' into moss_dev

* master:
  no message
  no message
  no message
  no message
  no message

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

@@ -388,7 +388,10 @@
 				</el-col>
 				<el-col :span="6">
 					<el-form-item label="仓储" prop="storageId">
-					  <el-select v-model="orderForm.storageId" placeholder="请选择仓储" style="width: 100%;">
+					  <el-select v-model="orderForm.storageId" placeholder="请选择仓储" @change="(e)=>{
+								  storageName = storageList.find(item => item.storageId == e).storageName
+								  getDetail()
+							  }" style="width: 100%;">
 					    <el-option :label="item.storageName" :value="item.storageId" v-for="(item, index) in storageList"
 					      :key="index"></el-option>
 					  </el-select>
@@ -405,7 +408,7 @@
 				<el-col :span="24">
 					<el-card class="box-card">
 						<el-tabs v-model="typeIndex">
-						    <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" label="发货条码" name="2"></el-tab-pane>
 						</el-tabs>
 						<br/>
@@ -427,11 +430,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="joinCodeText != 'NO'" prop="" align="center" label="发货仓库">
+										<template slot-scope="scope">
+											{{storageName}}
+										</template>
+									</el-table-column>
+									<el-table-column v-if="joinCodeText != 'NO'" prop="stockOnQty" align="center" label="发货仓库库存" width="100"></el-table-column>
+									<el-table-column v-if="joinCodeText != 'NO'" prop="allStockQty" align="center" label="库存总数量" width="100"></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>
 									<el-table-column prop="partNum" align="center" label="配件数量"></el-table-column>
@@ -772,12 +783,14 @@ export default {
 	  isEdit1: 0,
 	  isEdit2: 0,
 	  joinCode: JSON.parse(localStorage.getItem('greemall_user')).joinCode === "CODE",
+	  joinCodeText: JSON.parse(localStorage.getItem('greemall_user')).joinCode,
 	  orderDetailId: '',
 
     printList: [],
     deliverList: [],
 
     deliverSelection: [],
+	storageName: ''
     }
   },
   created() {
@@ -791,16 +804,17 @@ export default {
   },
   methods: {
     getDetail() {
-      getOrderDetail({ orderId: this.orderId }).then((res) => {
+      getOrderDetail({ orderId: this.orderId,storageId: this.orderForm.storageId }).then((res) => {
         this.orderDetail = res.data
         this.orderDetail.workerName = this.orderDetail.workerName ? this.orderDetail.workerName : '暂无'
         this.orderDetail.workerPhone = this.orderDetail.workerPhone ? this.orderDetail.workerPhone : ''
         this.evaluateDetail = res.data.orderComment;
 		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
       })

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

@@ -428,9 +428,9 @@
 													{{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 v-if="joinCode != 'NO'" prop="stockOnQty" align="center" label="发货仓库库存" width="100"></el-table-column>
+											<el-table-column v-if="joinCode != 'NO'" prop="allStockQty" align="center" label="库存总数量" width="100"></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>
 											<el-table-column prop="partNum" align="center" label="配件数量"></el-table-column>

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

@@ -479,9 +479,10 @@ export default {
 			getOrderDetail({orderId: this.orderDetail.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
 			})

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

@@ -155,13 +155,11 @@
               <el-table-column align="center" label="退货数量" prop="waitRefundNum" min-width="120">
                 <template slot-scope="scope">
                   {{scope.row.waitRefundNum}}
-                  <!-- <el-input size="small" type="number" v-model="scope.row.waitRefundNum"></el-input> -->
                 </template>
               </el-table-column>
               <el-table-column align="center" label="退货单价" prop="waitRefundPrice" min-width="120">
                 <template slot-scope="scope">
                   {{scope.row.waitRefundPrice}}
-                  <!-- <el-input size="small" type="number" v-model="scope.row.waitRefundPrice"></el-input> -->
                 </template>
               </el-table-column>
               <el-table-column align="center" label="退货金额" prop="amount" min-width="120">
@@ -169,14 +167,21 @@
                   {{scope.row.waitRefundNum * scope.row.waitRefundPrice * 100 / 100}}
                 </template>
               </el-table-column>
-
-              <el-table-column align="center" label="已退数量" prop="refundNum" min-width="120"></el-table-column>
+              <el-table-column align="center" label="已退数量" prop="" min-width="120">
+                <template slot-scope="scope">
+                  {{0}}
+                </template>
+              </el-table-column>
               <el-table-column align="center" label="已退单价" min-width="120">
                 <template slot-scope="scope">
-                  {{(scope.row.refundAmount / scope.row.refundNum) || 0}}
+                  {{0}}
+                </template>
+              </el-table-column>
+              <el-table-column align="center" label="已退金额" prop="" min-width="120">
+                <template slot-scope="scope">
+                  {{0}}
                 </template>
               </el-table-column>
-              <el-table-column align="center" label="已退金额" prop="refundAmount" min-width="120"></el-table-column>
               <el-table-column align="center" label="订单数量" prop="num" min-width="120"></el-table-column>
               <el-table-column align="center" label="订单单价" prop="price" min-width="120"></el-table-column>
               <el-table-column align="center" label="订单金额" prop="payAmount" min-width="120"></el-table-column>
@@ -338,13 +343,22 @@
               </template>
             </el-table-column>
 
-            <el-table-column align="center" label="已退数量" prop="retiredNum" min-width="120"></el-table-column>
-            <el-table-column align="center" label="已退单价" min-width="120">
+            <el-table-column align="center" label="已退数量" prop="refundNum" min-width="120">
               <template slot-scope="scope">
-                {{(scope.row.retiredAmount / scope.row.retiredNum) || 0}}
+                {{ detailData.examineStatus=="OK"?  (scope.row.refundNum) : 0}}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="已退金额" prop="retiredAmount" min-width="120"></el-table-column>
+            <el-table-column align="center" label="已退单价" prop="refundAmount" min-width="120">
+              <template slot-scope="scope">
+                {{detailData.examineStatus=="OK"? (scope.row.refundAmount):0}}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="已退金额" min-width="120">
+              <template slot-scope="scope">
+                {{detailData.examineStatus=="OK"? ((scope.row.refundAmount * scope.row.refundNum) * 100 / 100) : 0}}
+              </template>
+            </el-table-column>
+
             <el-table-column align="center" label="订单数量" prop="num" min-width="120"></el-table-column>
             <el-table-column align="center" label="订单单价" prop="price" min-width="120"></el-table-column>
             <el-table-column align="center" label="订单金额" prop="payAmount" min-width="120"></el-table-column>