Merge branch 'feature/pyh_工程调整'

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

@@ -291,7 +291,7 @@
 				<el-form ref="formData1" :rules="rules1" :model="formData1" label-width="110px" size="small" label-position="left">
 					<el-row :gutter="20" justify="start">
 						<el-col :span="24">
-							<el-form-item label="收款金额">
+							<el-form-item label="收款金额" prop="price">
 								<el-input type="text" style="width: 30%" v-model="formData1.price" placeholder="请输入"></el-input>
 								<span style="color: #FF8F47;margin-left: 10px">注:操作【提交】时，系统方可记录收款信息</span>
 							</el-form-item>
@@ -451,6 +451,11 @@
 					workerName: [
 						{ required: true, message: '请输入客户姓名', trigger: 'blur' }
 					],
+				},
+				rules1: {
+					price: [
+						{ pattern:/^[1-9]\d*(\.\d+)?$|^0\.[1-9]\d*$/, message: '请输入大于0的数字', trigger: 'blur' }
+					],
 				}
 			};
 		},
@@ -590,27 +595,31 @@
 				this.dataList.splice(index,1)
 			},
 			submit(){
-				this.$confirm(`请确定是否提交订单, 是否继续?`, '提示', {
-					confirmButtonText: '确定',
-					cancelButtonText: '取消',
-					type: 'warning'
-				}).then(() => {
-					submit({
-						salesId: this.formData.salesId,
-						price: this.formData1.price,
-						urlPrc: this.formData1.fileUrl.length> 0 ?this.formData1.fileUrl[0].url: '',
-						remark: this.formData1.remark
-					}).then(res => {
-						if(res.code == 200){
-							this.$message.success('提交成功！')
-							if(this.formData.payType == 'WECHAT'){
-								this.wxPay()
-							}else{
-								this.goBack()
-							}
-						}
-					})
-				});
+				this.$refs.formData1.validate((valid, invalidFields, errLabels) => {
+					if (valid) {
+						this.$confirm(`请确定是否提交订单, 是否继续?`, '提示', {
+							confirmButtonText: '确定',
+							cancelButtonText: '取消',
+							type: 'warning'
+						}).then(() => {
+							submit({
+								salesId: this.formData.salesId,
+								price: this.formData1.price,
+								urlPrc: this.formData1.fileUrl.length> 0 ?this.formData1.fileUrl[0].url: '',
+								remark: this.formData1.remark
+							}).then(res => {
+								if(res.code == 200){
+									this.$message.success('提交成功！')
+									if(this.formData.payType == 'WECHAT'){
+										this.wxPay()
+									}else{
+										this.goBack()
+									}
+								}
+							})
+						});
+					}
+				})
 			},
 			confirm(){
 				this.$confirm(`请确定是否确认提货, 是否继续?`, '提示', {

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

@@ -316,7 +316,7 @@
 				<el-form ref="formData1" :rules="rules1" :model="formData1" label-width="110px" size="small" label-position="left">
 					<el-row :gutter="20" justify="start">
 						<el-col :span="24">
-							<el-form-item label="收款金额">
+							<el-form-item label="收款金额" prop="price">
 								<el-input type="text" style="width: 30%" v-model="formData1.price" placeholder="请输入"></el-input>
 								<span style="color: #FF8F47;margin-left: 10px">注:操作【提交】时，系统方可记录收款信息</span>
 							</el-form-item>
@@ -478,7 +478,11 @@
 						{ required: true, message: '请输入客户姓名', trigger: 'blur' }
 					],
 				},
-				rules1: {}
+				rules1: {
+					price: [
+						{ pattern:/^[1-9]\d*(\.\d+)?$|^0\.[1-9]\d*$/, message: '请输入大于0的数字', trigger: 'blur' }
+					],
+				}
 			};
 		},
 		computed: {},
@@ -666,27 +670,31 @@
 				this.dataList.splice(index,1)
 			},
 			submit(){
-				this.$confirm(`请确定是否提交订单, 是否继续?`, '提示', {
-					confirmButtonText: '确定',
-					cancelButtonText: '取消',
-					type: 'warning'
-				}).then(() => {
-					submit({
-						salesId: this.formData.salesId,
-						price: this.formData1.price,
-						urlPrc: this.formData1.fileUrl.length> 0 ?this.formData1.fileUrl[0].url: '',
-						remark: this.formData1.remark
-					}).then(res => {
-						if(res.code == 200){
-							this.$message.success('提交成功！')
-							if(this.formData.payType == 'WECHAT'){
-								this.wxPay()
-							}else{
-								this.goBack()
-							}
-						}
-					})
-				});
+				this.$refs.formData1.validate((valid, invalidFields, errLabels) => {
+					if (valid) {
+						this.$confirm(`请确定是否提交订单, 是否继续?`, '提示', {
+							confirmButtonText: '确定',
+							cancelButtonText: '取消',
+							type: 'warning'
+						}).then(() => {
+							submit({
+								salesId: this.formData.salesId,
+								price: this.formData1.price,
+								urlPrc: this.formData1.fileUrl.length> 0 ?this.formData1.fileUrl[0].url: '',
+								remark: this.formData1.remark
+							}).then(res => {
+								if(res.code == 200){
+									this.$message.success('提交成功！')
+									if(this.formData.payType == 'WECHAT'){
+										this.wxPay()
+									}else{
+										this.goBack()
+									}
+								}
+							})
+						});
+					}
+				})
 			},
 			confirm(){
 				this.$confirm(`请确定是否确认提货, 是否继续?`, '提示', {