辅材优化

src/views/auxiliaryFittings/salesManagement/attachmentSalesOrder/index.vue

@@ -313,7 +313,7 @@ export default {
 		  </div>
 		  <div style="display: flex;justify-content: space-between;font-size: 16px;margin-bottom: 10px;">
 		  	<div>联系电话: ${data.workerMobile}</div>
-		  	<div>收货地址: </div>
+		  	<div>收货地址: ${data.province?(data.province + data.city + data.area + data.street + data.address):''}</div>
 			<div style="width: 28%;"></div>
 		  </div>
 	      <div >

src/views/auxiliaryFittings/salesManagement/auxiliarySalesOrder/index.vue

@@ -311,7 +311,7 @@ export default {
 		  </div>
 		  <div style="display: flex;font-size: 16px;margin-bottom: 10px;">
 		  	<div>联系电话: ${data.workerMobile}</div>
-		  	<div style="margin-left: 50px;">收货地址: </div>
+		  	<div style="margin-left: 50px;">收货地址: ${data.province?(data.province + data.city + data.area + data.street + data.address):''}</div>
 		  </div>
 	      <div >
 	        <table border=".5" cellspacing="0" width="856"

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

@@ -558,8 +558,8 @@
 				this.dataList[this.isEdit].normType = e.normType
 			},
 			add(){
-				if(this.dataList.length != 0){this.isEdit += 1}
-				this.dataList.push({
+				if(this.dataList.length != 0){this.isEdit = 0}
+				this.dataList.unshift({
 					goodsList: [],
 					goods: {},
 					goodsId: '',
@@ -592,7 +592,7 @@
 					submit({
 						salesId: this.formData.salesId,
 						price: this.formData1.price,
-						urlPrc: this.formData1.fileUrl[0].url,
+						urlPrc: this.formData1.fileUrl.length> 0 ?this.formData1.fileUrl[0].url: '',
 						remark: this.formData1.remark
 					}).then(res => {
 						if(res.code == 200){

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

@@ -628,8 +628,8 @@
 				this.dataList[this.isEdit].normType = e.normType
 			},
 			add(){
-				if(this.dataList.length != 0){this.isEdit += 1}
-				this.dataList.push({
+				if(this.dataList.length != 0){this.isEdit = 0}
+				this.dataList.unshift({
 					goodsList: [],
 					parentCategory: {},
 					parentCategoryId: '',
@@ -666,7 +666,7 @@
 					submit({
 						salesId: this.formData.salesId,
 						price: this.formData1.price,
-						urlPrc: this.formData1.fileUrl[0].url,
+						urlPrc: this.formData1.fileUrl.length> 0 ?this.formData1.fileUrl[0].url: '',
 						remark: this.formData1.remark
 					}).then(res => {
 						if(res.code == 200){

src/views/engineeringMaintenance/basicData/detail.vue

@@ -931,7 +931,7 @@
 				}
 			},
 			del(index){
-				let name = this.typeIndex == 1?'productList':this.typeIndex == 2?'byList':'websitList'
+				let name = this.typeIndex == 1?'productList':this.typeIndex == 2?'byList':this.typeIndex == 3?'websitList':'itemList'
 				this['formData' + this.typeIndex][name].splice(index,1)
 			},
 			confirm(){
@@ -950,14 +950,14 @@
 							that.typeIndex = '3'
 							return that.$message.error('请添加服务网点信息');
 						}
-						if(that.formData4.itemList.length == 0){
-							that.typeIndex = '4'
-							return that.$message.error('请添加辅材配置信息');
-						}
-						if(that.formData5.itemList.length == 0){
-							that.typeIndex = '5'
-							return that.$message.error('请添加配件配置信息');
-						}
+						// if(that.formData4.itemList.length == 0){
+						// 	that.typeIndex = '4'
+						// 	return that.$message.error('请添加辅材配置信息');
+						// }
+						// if(that.formData5.itemList.length == 0){
+						// 	that.typeIndex = '5'
+						// 	return that.$message.error('请添加配件配置信息');
+						// }
 						if(!that.preserveRuleForm('formData1')){
 							return that.typeIndex = '1'
 						}
@@ -967,12 +967,12 @@
 						if(!that.preserveRuleForm('formData3')){
 							return that.typeIndex = '3'
 						}
-						if(!that.preserveRuleForm('formData4')){
-							return that.typeIndex = '4'
-						}
-						if(!that.preserveRuleForm('formData5')){
-							return that.typeIndex = '5'
-						}
+						// if(!that.preserveRuleForm('formData4')){
+						// 	return that.typeIndex = '4'
+						// }
+						// if(!that.preserveRuleForm('formData5')){
+						// 	return that.typeIndex = '5'
+						// }
 						this.save()
 					}
 				})