From 9992e676096878d16c993898d966cdcd553c81c2 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Tue, 16 Aug 2022 17:32:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                    |  6 ++--
 .../raininspection/raininspection.vue         | 32 ++++++++++++++-----
 rainmaintain/rainmaintain/rainmaintain.vue    | 23 ++++++++++---
 3 files changed, 45 insertions(+), 16 deletions(-)

diff --git a/pages.json b/pages.json
index 3186368..f4419ac 100644
--- a/pages.json
+++ b/pages.json
@@ -148,21 +148,21 @@
 		"pages": [{
 			"path": "order/order",
 			"style": {
-				"navigationBarTitleText": "工单执行",
+				"navigationBarTitleText": "我的工单",
 				"enablePullDownRefresh": false
 			}
 
 		},{
 			"path": "orderList/orderList",
 			"style": {
-				"navigationBarTitleText": "工单执行",
+				"navigationBarTitleText": "我的工单",
 				"enablePullDownRefresh": true,
 				"disableScroll": true
 			}
 		},{
 			"path": "orderInfo/orderInfo",
 			"style": {
-				"navigationBarTitleText": "工单执行",
+				"navigationBarTitleText": "我的工单",
 				"enablePullDownRefresh": false,
 				 "disableScroll": true
 				
diff --git a/raininspection/raininspection/raininspection.vue b/raininspection/raininspection/raininspection.vue
index 4da3329..97780a2 100644
--- a/raininspection/raininspection/raininspection.vue
+++ b/raininspection/raininspection/raininspection.vue
@@ -24,10 +24,10 @@
 					<u-select v-model="askShow" mode="single-column" value-name="id" label-name="value"
 						:list="rainArr.askContentList" @confirm="confirmAskType"></u-select>
 				</u-form-item>
-				<u-form-item labelWidth="180" label="覆盖范围(米)" label-position="left">
+				<u-form-item labelWidth="180" prop="scope" label="覆盖范围(米)" label-position="left" required>
 					<u-input type="number" v-model="form.scope" placeholder="请填写覆盖范围"/>
 				</u-form-item>
-				<u-form-item labelWidth="180" label="点位名称" label-position="left">
+				<u-form-item labelWidth="180" prop="point_name" label="点位名称" label-position="left" required>
 					<u-input v-model="form.point_name" type='text' placeholder="请填写点位名称"/>
 				</u-form-item>
 			</block>
@@ -248,15 +248,26 @@
 					status: "",
 					remark: "",
 					is_law: "",
-					break_id: ""
+					break_id: "",
+					mobile_worksheet_id:""
 				},
-				rules: {
+				rules: {
+					scope: [{
+						required: true,
+						message: '请填写覆盖范围',
+						trigger: ['blur'],
+					}],
+					point_name: [{
+						required: true,
+						message: '请填写点位名称',
+						trigger: ['blur'],
+					}],
 					content: [{
 						required: true,
 						message: '请填写描述',
-						// 可以单个或者同时写两个触发验证方式 
 						trigger: ['blur'],
-					}]
+					}],
+				
 				},
 				apis: {
 					store: [
@@ -289,7 +300,10 @@
 				this.form.road_id = options.roadid
 				this.roadName = options.roadname
 			}
-
+			if(options.orderId){
+				this.form.mobile_worksheet_id = options.orderId
+			}
+			console.log(this.form.mobile_worksheet_id)
 			this.action = this.util.HOST + "/api/mobile/upload-file";
 			this.otherData.token = uni.getStorageSync("userInfo_token").access_token;
 		},
@@ -668,7 +682,9 @@
 					}
 				}
 				that.form.files_list = list;
-				that.form.files_end_list = deallist;
+				that.form.files_end_list = deallist;
+				console.log(that.form)
+				// return
 				let api = "";
 				if (this.infoId) {
 					api = this.apis.save[this.instype]
diff --git a/rainmaintain/rainmaintain/rainmaintain.vue b/rainmaintain/rainmaintain/rainmaintain.vue
index f828273..236b92f 100644
--- a/rainmaintain/rainmaintain/rainmaintain.vue
+++ b/rainmaintain/rainmaintain/rainmaintain.vue
@@ -34,11 +34,11 @@
 				<u-input v-model="form.number" type='text' placeholder="请填写出水口编号" />
 			</u-form-item>
 			<block v-if="!aboutShow">
-				<u-form-item labelWidth="180" label="覆盖范围(米)" label-position="left">
-					<u-input v-model="form.scope" type="number" placeholder="请填写覆盖范围" />
+				<u-form-item labelWidth="180" label="覆盖范围(米)" label-position="left" required>
+					<u-input v-model="form.scope" prop="scope" type="number" placeholder="请填写覆盖范围" />
 				</u-form-item>
-				<u-form-item labelWidth="180" label="点位名称" label-position="left">
-					<u-input v-model="form.point_name" type='text' placeholder="请填写点位名称" />
+				<u-form-item labelWidth="180" label="点位名称" label-position="left" required>
+					<u-input v-model="form.point_name" prop="point_name" type='text' placeholder="请填写点位名称" />
 				</u-form-item>
 			</block>
 			<block v-if="!formshow">
@@ -188,7 +188,17 @@
 					point_name: "",
 					title_id: ""
 				},
-				rules: {
+				rules: {
+					scope: [{
+						required: true,
+						message: '请填写覆盖范围',
+						trigger: ['blur'],
+					}],
+					point_name: [{
+						required: true,
+						message: '请填写点位名称',
+						trigger: ['blur'],
+					}],
 					content: [{
 						required: true,
 						message: '请填写描述',
@@ -226,6 +236,9 @@
 			if (options.roadid) {
 				this.form.road_id = options.roadid
 				this.roadName = options.roadname
+			}
+			if(options.orderId){
+				this.form.mobile_worksheet_id = options.orderId
 			}
 			that.loadAskContent();