Commit 6eea308aa9836b63e3341dd0f984fc36dca69e35
1 parent
d8fce1e2
页面onShow 加载
Showing
10 changed files
with
49 additions
and
25 deletions
pages.json
@@ -97,31 +97,31 @@ | @@ -97,31 +97,31 @@ | ||
97 | { | 97 | { |
98 | "path": "pages/work/daily/maintain/water", | 98 | "path": "pages/work/daily/maintain/water", |
99 | "style": { | 99 | "style": { |
100 | - "navigationBarTitleText": "添加养护记录(浇水)" | 100 | + "navigationBarTitleText": "添加养护记录" |
101 | } | 101 | } |
102 | }, | 102 | }, |
103 | { | 103 | { |
104 | "path": "pages/work/daily/maintain/trim", | 104 | "path": "pages/work/daily/maintain/trim", |
105 | "style": { | 105 | "style": { |
106 | - "navigationBarTitleText": "添加养护记录(修剪)" | 106 | + "navigationBarTitleText": "添加养护记录" |
107 | } | 107 | } |
108 | }, | 108 | }, |
109 | { | 109 | { |
110 | "path": "pages/work/daily/maintain/prevention", | 110 | "path": "pages/work/daily/maintain/prevention", |
111 | "style": { | 111 | "style": { |
112 | - "navigationBarTitleText": "添加养护记录(有害生物防治)" | 112 | + "navigationBarTitleText": "添加养护记录" |
113 | } | 113 | } |
114 | }, | 114 | }, |
115 | { | 115 | { |
116 | "path": "pages/work/daily/maintain/weed", | 116 | "path": "pages/work/daily/maintain/weed", |
117 | "style": { | 117 | "style": { |
118 | - "navigationBarTitleText": "添加养护记录(中耕除草)" | 118 | + "navigationBarTitleText": "添加养护记录" |
119 | } | 119 | } |
120 | }, | 120 | }, |
121 | { | 121 | { |
122 | "path": "pages/work/daily/maintain/manure", | 122 | "path": "pages/work/daily/maintain/manure", |
123 | "style": { | 123 | "style": { |
124 | - "navigationBarTitleText": "添加养护记录(施肥)" | 124 | + "navigationBarTitleText": "添加养护记录" |
125 | } | 125 | } |
126 | }, | 126 | }, |
127 | { | 127 | { |
pages/work/case/maintain.vue
@@ -11,9 +11,17 @@ | @@ -11,9 +11,17 @@ | ||
11 | <view class="fs-mt16 fs-flex__between"> | 11 | <view class="fs-mt16 fs-flex__between"> |
12 | <view> | 12 | <view> |
13 | 领导确认: | 13 | 领导确认: |
14 | - <tui-text v-if="item.leaderConfrimStatus == 2" text="已确认" type="success"></tui-text> | ||
15 | - <tui-text v-else text="待确认" type="danger"></tui-text> | 14 | +<!-- <tui-text v-if="item.leaderConfrimStatus == 2" text="已确认" type="success"></tui-text>--> |
15 | +<!-- <tui-text v-else text="待确认" type="danger"></tui-text>--> | ||
16 | + <tui-text v-if="item.taskStatus == 1" text="处理中" type="danger"></tui-text> | ||
17 | + <tui-text v-else-if="item.taskStatus == 2" text="已处理" type="primary"></tui-text> | ||
18 | + <tui-text v-else-if="item.taskStatus == 3" text="已确认" type="success"></tui-text> | ||
19 | + <tui-text v-else-if="item.taskStatus == 4" text="已驳回" type="danger"></tui-text> | ||
20 | + <tui-text v-else-if="item.taskStatus == 5" text="已拒绝" type="danger"></tui-text> | ||
21 | + | ||
16 | </view> | 22 | </view> |
23 | + | ||
24 | + | ||
17 | <view>紧急程度: | 25 | <view>紧急程度: |
18 | <tui-text v-if="item.pressingType == 1" type="primary" text="特急"></tui-text> | 26 | <tui-text v-if="item.pressingType == 1" type="primary" text="特急"></tui-text> |
19 | <tui-text v-else-if="item.pressingType == 2" type="primary" text="紧急"></tui-text> | 27 | <tui-text v-else-if="item.pressingType == 2" type="primary" text="紧急"></tui-text> |
pages/work/case/result.vue
@@ -171,16 +171,20 @@ import { apiTaskHandleDetail } from '@/api/work' | @@ -171,16 +171,20 @@ import { apiTaskHandleDetail } from '@/api/work' | ||
171 | export default { | 171 | export default { |
172 | data() { | 172 | data() { |
173 | return { | 173 | return { |
174 | - info: {} | 174 | + info: {}, |
175 | + problem_no:'' | ||
175 | } | 176 | } |
176 | }, | 177 | }, |
177 | onLoad(options) { | 178 | onLoad(options) { |
178 | - this.getTaskDetail(options.problem_no) | 179 | + this.problem_no = options.problem_no |
179 | }, | 180 | }, |
181 | + onShow(){ | ||
182 | + this.getTaskDetail() | ||
183 | + }, | ||
180 | methods: { | 184 | methods: { |
181 | // 获取任务详情 | 185 | // 获取任务详情 |
182 | - getTaskDetail(problem_no) { | ||
183 | - apiTaskHandleDetail({data:{problem_no:problem_no}}).then(res => { | 186 | + getTaskDetail() { |
187 | + apiTaskHandleDetail({data:{problem_no:this.problem_no}}).then(res => { | ||
184 | const togetherPerson = res.data.commonStaffList.map(item => item.userName) | 188 | const togetherPerson = res.data.commonStaffList.map(item => item.userName) |
185 | res.data.togetherPerson = togetherPerson.join() | 189 | res.data.togetherPerson = togetherPerson.join() |
186 | this.info = res.data | 190 | this.info = res.data |
pages/work/daily/maintain/manure.vue
@@ -141,7 +141,7 @@ export default { | @@ -141,7 +141,7 @@ export default { | ||
141 | staffList: [], | 141 | staffList: [], |
142 | serverURL: uploadURL, | 142 | serverURL: uploadURL, |
143 | currentIndex: 0, | 143 | currentIndex: 0, |
144 | - tabList: ['开始处理照片', '进行中照片', '结束照片', '人员照片', '使用材料照片'], | 144 | + tabList: ['开始', '进行', '结束', '人员', '材料'], |
145 | selectShow: false | 145 | selectShow: false |
146 | } | 146 | } |
147 | }, | 147 | }, |
pages/work/daily/maintain/prevention.vue
@@ -130,7 +130,7 @@ export default { | @@ -130,7 +130,7 @@ export default { | ||
130 | staffList: [], | 130 | staffList: [], |
131 | serverURL: uploadURL, | 131 | serverURL: uploadURL, |
132 | currentIndex: 0, | 132 | currentIndex: 0, |
133 | - tabList: ['开始处理照片', '进行中照片', '结束照片', '人员照片', '使用材料照片'], | 133 | + tabList: ['开始', '进行', '结束', '人员', '材料'], |
134 | selectShow: false | 134 | selectShow: false |
135 | } | 135 | } |
136 | }, | 136 | }, |
pages/work/daily/maintain/subList.vue
@@ -19,23 +19,29 @@ export default { | @@ -19,23 +19,29 @@ export default { | ||
19 | data() { | 19 | data() { |
20 | return { | 20 | return { |
21 | info: {}, | 21 | info: {}, |
22 | - dataList: [] | 22 | + dataList: [], |
23 | + planNo:'', | ||
24 | + | ||
23 | } | 25 | } |
24 | }, | 26 | }, |
25 | onLoad(options) { | 27 | onLoad(options) { |
26 | - this.getList(options.planNo) | ||
27 | - this.getInspectionInfo(options.planNo) | 28 | + this.planNo = options.planNo |
29 | + | ||
28 | }, | 30 | }, |
31 | + onShow(){ | ||
32 | + this.getList() | ||
33 | + this.getInspectionInfo() | ||
34 | + }, | ||
29 | methods: { | 35 | methods: { |
30 | // 获取次数列表 | 36 | // 获取次数列表 |
31 | - getList(planNo) { | ||
32 | - apiMaintainSubList({data:{plan_no:planNo}}).then(res => { | 37 | + getList() { |
38 | + apiMaintainSubList({data:{plan_no:this.planNo}}).then(res => { | ||
33 | this.dataList = res.data | 39 | this.dataList = res.data |
34 | }) | 40 | }) |
35 | }, | 41 | }, |
36 | // 获取养护详情 | 42 | // 获取养护详情 |
37 | - getInspectionInfo(planNo) { | ||
38 | - apiInspectionDetail({data:{plan_no:planNo}}).then(res => { | 43 | + getInspectionInfo() { |
44 | + apiInspectionDetail({data:{plan_no:this.planNo}}).then(res => { | ||
39 | this.info = res.data | 45 | this.info = res.data |
40 | }) | 46 | }) |
41 | }, | 47 | }, |
pages/work/daily/maintain/trim.vue
@@ -132,7 +132,7 @@ export default { | @@ -132,7 +132,7 @@ export default { | ||
132 | staffList: [], | 132 | staffList: [], |
133 | serverURL: uploadURL, | 133 | serverURL: uploadURL, |
134 | currentIndex: 0, | 134 | currentIndex: 0, |
135 | - tabList: ['开始处理照片', '进行中照片', '结束照片', '人员照片', '使用材料照片'], | 135 | + tabList: ['开始', '进行', '结束', '人员', '材料'], |
136 | selectShow: false | 136 | selectShow: false |
137 | } | 137 | } |
138 | }, | 138 | }, |
pages/work/daily/maintain/water.vue
@@ -21,7 +21,8 @@ | @@ -21,7 +21,8 @@ | ||
21 | </tui-input> | 21 | </tui-input> |
22 | --> | 22 | --> |
23 | <tui-input placeholder="请选择" label="共同处理人" v-model="formData.togetherPerson" disabled | 23 | <tui-input placeholder="请选择" label="共同处理人" v-model="formData.togetherPerson" disabled |
24 | - @click="selectOpen(2)"></tui-input> | 24 | + @focus.prevent="handlePreventFocus" |
25 | + @click.stop="selectOpen(2)"></tui-input> | ||
25 | <!-- | 26 | <!-- |
26 | <tui-list-cell :hover="false" unlined padding="26rpx 30rpx"> | 27 | <tui-list-cell :hover="false" unlined padding="26rpx 30rpx"> |
27 | <view class="fs-align__right"><tui-tag type="primary" padding="8rpx 12rpx" size="26rpx" @click="material">添加耗材</tui-tag></view> | 28 | <view class="fs-align__right"><tui-tag type="primary" padding="8rpx 12rpx" size="26rpx" @click="material">添加耗材</tui-tag></view> |
@@ -175,7 +176,7 @@ | @@ -175,7 +176,7 @@ | ||
175 | isLoading: false, | 176 | isLoading: false, |
176 | serverURL: uploadURL, | 177 | serverURL: uploadURL, |
177 | currentIndex: 0, | 178 | currentIndex: 0, |
178 | - tabList: ['开始处理照片', '进行中照片', '结束照片', '人员照片', '使用材料照片'], | 179 | + tabList: ['开始', '进行', '结束', '人员', '材料'], |
179 | selectType: 1, | 180 | selectType: 1, |
180 | selectList: [], | 181 | selectList: [], |
181 | selectShow: false | 182 | selectShow: false |
@@ -201,6 +202,11 @@ | @@ -201,6 +202,11 @@ | ||
201 | uni.removeStorageSync('detailList') | 202 | uni.removeStorageSync('detailList') |
202 | }, | 203 | }, |
203 | methods: { | 204 | methods: { |
205 | + handlePreventFocus(e) { | ||
206 | + // 阻止输入框聚焦 | ||
207 | + e.preventDefault(); | ||
208 | + return false; | ||
209 | + }, | ||
204 | // 上传完成 | 210 | // 上传完成 |
205 | complete(e, type) { | 211 | complete(e, type) { |
206 | if (e.status == 1) this.formData[type] = e.imgArr | 212 | if (e.status == 1) this.formData[type] = e.imgArr |
pages/work/daily/maintain/weed.vue
@@ -129,7 +129,7 @@ export default { | @@ -129,7 +129,7 @@ export default { | ||
129 | staffList: [], | 129 | staffList: [], |
130 | serverURL: uploadURL, | 130 | serverURL: uploadURL, |
131 | currentIndex: 0, | 131 | currentIndex: 0, |
132 | - tabList: ['开始处理照片', '进行中照片', '结束照片', '人员照片', '使用材料照片'], | 132 | + tabList: ['开始', '进行', '结束', '人员', '材料'], |
133 | selectShow: false | 133 | selectShow: false |
134 | } | 134 | } |
135 | }, | 135 | }, |
pages/work/daily/reporting.vue
@@ -19,7 +19,7 @@ | @@ -19,7 +19,7 @@ | ||
19 | </tui-form-item> | 19 | </tui-form-item> |
20 | </view> | 20 | </view> |
21 | <tui-white-space></tui-white-space> | 21 | <tui-white-space></tui-white-space> |
22 | - <tui-textarea :radius="20" placeholder="请输入问题描述" isCounter :size="28" :maxlength="100" v-model="formData.remark"></tui-textarea> | 22 | + <tui-textarea :radius="20" placeholder="请输入问题描述" isCounter :size="28" :maxlength="500" v-model="formData.remark"></tui-textarea> |
23 | <tui-white-space></tui-white-space> | 23 | <tui-white-space></tui-white-space> |
24 | <tui-tab :tabs="tabList" scroll bold :leftGap="30" @change="tabChange"></tui-tab> | 24 | <tui-tab :tabs="tabList" scroll bold :leftGap="30" @change="tabChange"></tui-tab> |
25 | <tui-white-space></tui-white-space> | 25 | <tui-white-space></tui-white-space> |