Merge branch 'feature/pyh_辅配件提交优化' of ssh://gogs.zfire.top:2222/zfire-front/zfire-newmall-admin into feature/pyh_辅配件提交优化

* 'feature/pyh_辅配件提交优化' of ssh://gogs.zfire.top:2222/zfire-front/zfire-newmall-admin:
  清空搜索条件
  发货调整

src/views/auxiliaryFittings/salesManagement/components/attachmentNewReturnDetail.vue

@@ -302,7 +302,7 @@
 						</el-form-item>
 					</el-col>
 					<el-col :span="8">
-						<el-form-item label="物料名称" align="center">
+						<el-form-item label="物料名称" prop="goods" align="center">
 							<el-select v-model="formData1.goods" @focus="()=>{
 								if(!this.formData1.websit_id){return this.$message.warning('请先选择网点名称！');}
 							}" value-key="goodsId" placeholder="请选择" style="width: 100%;">

src/views/auxiliaryFittings/salesManagement/components/attachmentOldReturnDetail.vue

@@ -374,7 +374,7 @@
 						</el-form-item>
 					</el-col>
 					<el-col :span="8">
-						<el-form-item label="物料名称" align="center">
+						<el-form-item label="物料名称" prop="goods" align="center">
 							<el-select v-model="formData1.goods" @focus="()=>{
 								if(!this.formData1.websit_id){return this.$message.warning('请先选择网点名称！');}
 							}" value-key="goodsId" placeholder="请选择" style="width: 100%;">

src/views/auxiliaryFittings/salesManagement/components/auxiliarySalesReturnOrderDetail.vue

@@ -326,7 +326,7 @@
 						</el-form-item>
 					</el-col>
 					<el-col :span="8">
-						<el-form-item label="物料名称" align="center">
+						<el-form-item label="物料名称" prop="goods" align="center">
 							<el-select v-model="formData1.goods" @focus="()=>{
 								if(!this.formData1.websit_id){return this.$message.warning('请先选择网点名称！');}
 							}" value-key="goodsId" placeholder="请选择" style="width: 100%;">
@@ -340,7 +340,7 @@
 						</el-form-item>
 					</el-col>
 					<el-col :span="8">
-						<el-form-item label="规格型号" align="center">
+						<el-form-item label="规格型号" prop="goods" align="center">
 							<el-select v-model="formData1.goods" @focus="()=>{
 								if(!this.formData1.websit_id){return this.$message.warning('请先选择网点名称！');}
 							}" value-key="goodsId" placeholder="请选择" style="width: 100%;">

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

@@ -701,7 +701,13 @@ export default {
         this.orderDetail.workerName = this.orderDetail.workerName ? this.orderDetail.workerName : '暂无'
         this.orderDetail.workerPhone = this.orderDetail.workerPhone ? this.orderDetail.workerPhone : ''
         this.evaluateDetail = res.data.orderComment;
-		    this.formData1.list = res.data.orderDetails
+		let arr = []
+		res.data.orderDetails.forEach(item=>{
+			if(item.goodsMaterialId){
+				arr.push(item)
+			}
+		})
+		this.formData1.list = arr
       })
     },
 

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

@@ -858,7 +858,13 @@ export default {
     },
 	getOrderDetail(){
 		getOrderDetail({orderId: this.editOrderId}).then(res => {
-		  this.formData1.list = res.data.orderDetails
+			let arr = []
+			res.data.orderDetails.forEach(item=>{
+				if(item.goodsMaterialId){
+					arr.push(item)
+				}
+			})
+			this.formData1.list = arr
 		})
 	},
 	changeType(){

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

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

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

@@ -473,7 +473,13 @@ export default {
 		
 		getOrderDetail(){
 			getOrderDetail({orderId: this.orderDetail.orderId}).then(res => {
-			  this.formData1.list = res.data.orderDetails
+			  let arr = []
+			  res.data.orderDetails.forEach(item=>{
+			  	if(item.goodsMaterialId){
+			  		arr.push(item)
+			  	}
+			  })
+			  this.formData1.list = arr
 			})
 		},
 		changeType(){