| 
					
				 | 
			
			
				@@ -137,6 +137,9 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 <el-select v-else-if="item.prop === 'paymentType'" v-model="form[item.prop]" placeholder="请选择" clearable filterable style="width: 100%" size="small" :disabled="detailData.seeDisabled"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                   <el-option v-for="(item,index) in paymentOption" :key="index" :label="item.dictValue" :value="item.dictValue"></el-option> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 </el-select> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                <el-select v-else-if="item.prop === 'packageRemarks'" v-model="form[item.prop]" placeholder="请选择" clearable filterable style="width: 100%" size="small" :disabled="detailData.seeDisabled"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                  <el-option v-for="(item,index) in packageOptions" :key="index" :label="item.dictValue" :value="item.dictValue"></el-option> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                </el-select> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 <el-select v-else-if="item.prop === 'arrivalAddress'" v-model="form[item.prop]" placeholder="请选择" clearable filterable style="width: 100%" size="small" :disabled="detailData.seeDisabled" allow-create default-first-option> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                   <el-option v-for="(item,index) in arrivalOptions" :key="index" :label="item.label" :value="item.label"></el-option> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 </el-select> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1434,6 +1437,7 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       shippingOptions: [], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       applicationDialog:false, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       itemType: '销售', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      packageOptions: [], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   mounted() { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1461,6 +1465,9 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     this.getWorkDicts("order_status").then(res => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.statusOption = res.data.data 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    this.getWorkDicts("packageRemarks").then(res => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      this.packageOptions = res.data.data; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     this.$set(this.form, 'orderStatus', '录入') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     this.$set(this.form, 'caseOverPayment', 0) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     this.$set(this.form, 'overPayment', 0) 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1770,7 +1777,7 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.goodsConfiguration.dicData = this.goodsConfiguration.dicData.concat(goodsData) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.removeGoodsRepeat() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.contactsData = this.contactsData.concat(res.data) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      this.goodsShowData = this.goodsShowData.concat(res.data) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     //遮罩层 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -2588,7 +2595,7 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           this.form.orderFeesList = this.$refs.feeInfo.submitData() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           let packFee; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          if (this.form.packageRemarks) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          if (this.form.packageRemarks && this.form.packageRemarks !== '无包装') { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             let arr = this.form.orderFeesList.filter(item => item.feesType == 1) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             packFee = arr.findIndex(item => item.feeName == '包装费') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           } 
			 |