有限空间作业

api/index.js

@@ -38,3 +38,5 @@ export const getConfinedSpaceSelectList = (params) => post("/app/gfLimitSpace/li
 	loading: false,
 	...params
 }) //获取受限空间名称选择列表
+export const getOtherAssignmentsSelectList = (params) => post("/app/eightwork/list", params) //关联的其他特殊作业及安全作业票编号选择列表
+export const getRiskIdentificationResultsSelectList = (params) => post("/app/eightwork/getInfo", params) //风险辨识结果选择列表

pages.json

@@ -191,6 +191,12 @@
 			"style": {
 				"navigationBarTitleText": "受限空间安全作业申请"
 			}
+		},
+		{
+			"path": "pages/map/index",
+			"style": {
+				"navigationBarTitleText": "位置定位"
+			}
 		}
 	],
 	"globalStyle": {

pages/eight_assignments/confined_space/apply.vue

@@ -21,7 +21,7 @@
 				<u-form-item label="受限空间内原有介质名称" prop="MEDIUM_NAME" borderBottom required>
 					<u--input v-model="form.MEDIUM_NAME" border="none" />
 				</u-form-item>
-				<u-form-item label="作业内容" prop="WORK_CONTENT" borderBottom required>
+				<u-form-item label="作业内容" prop="WORK_CONTENT" borderBottom required labelPosition="top">
 					<u--textarea v-model="form.WORK_CONTENT" border="none" autoHeight />
 				</u-form-item>
 				<u-form-item label="作业开始时间" prop="WORK_START_DATE" borderBottom required
@@ -32,12 +32,42 @@
 					@click="fnDateTimePickerClick('WORK_END_DATE')">
 					<u--input v-model="form.WORK_END_DATE" border="none" readonly />
 				</u-form-item>
+				<u-form-item label="地点坐标" borderBottom required>
+					<u-button type="primary" size="small" text="定位" :customStyle="{width:'100upx',margin:0}"
+						@click="fnLocation" />
+				</u-form-item>
+				<u-form-item label="经度" prop="WORK_LONGITUDE" borderBottom required>
+					<u--input v-model="form.WORK_LONGITUDE" border="none" readonly />
+				</u-form-item>
+				<u-form-item label="纬度" prop="WORK_LATITUDE" borderBottom required>
+					<u--input v-model="form.WORK_LATITUDE" border="none" readonly />
+				</u-form-item>
+				<u-form-item label="作业人" prop="WORK_USER" borderBottom required>
+					<u--input v-model="form.WORK_USER" border="none" />
+				</u-form-item>
+				<u-form-item label="关联的其他特殊作业及安全作业票编号" prop="SPECIAL_WORK" borderBottom required labelPosition="top"
+					labelWidth="auto">
+					<u-button type="primary" size="mini" text="选择其它"
+						:customStyle="{position: 'absolute',top: '-46upx',right: '20upx',width: '150upx'}"
+						@click="otherAssignmentsShow = true" />
+					<u--textarea v-model="form.SPECIAL_WORK" border="none" autoHeight maxlength="-1" />
+				</u-form-item>
+				<u-form-item label="风险辨识结果" prop="RISK_IDENTIFICATION" borderBottom required labelPosition="top"
+					labelWidth="auto">
+					<u-button type="primary" size="mini" text="选择其它"
+						:customStyle="{position: 'absolute',top: '-46upx',right: '20upx',width: '150upx'}"
+						@click="otherIdentificationShow = true" />
+					<u--textarea v-model="form.RISK_IDENTIFICATION" border="none" autoHeight maxlength="-1" />
+				</u-form-item>
 			</u--form>
 		</view>
-		<u-picker :show="picker.show" :columns="picker.columns" :keyName="picker.key" :key="picker.type" @confirm="fnSingleChoiceConfirm"
+		<u-picker :show="picker.show" :columns="picker.columns" :keyName="picker.key" :key="picker.type"
-			@cancel="fnSingleChoiceCancel" />
+			@confirm="fnSingleChoiceConfirm" @cancel="fnSingleChoiceCancel" />
 		<u-datetime-picker :show="datetimePicker.show" v-model="datetimePicker.value" :mode="datetimePicker.mode"
-			:minDate="datetimePicker.min" :key="datetimePicker.type" @confirm="fnDateTimePickerConfirm" @cancel="fnDateTimePickerCancel" />
+			:minDate="datetimePicker.min" :key="datetimePicker.type" @confirm="fnDateTimePickerConfirm"
+			@cancel="fnDateTimePickerCancel" />
+		<other-select :visible.sync="otherAssignmentsShow" v-model="form.SPECIAL_WORK" type="assignments" />
+		<other-select :visible.sync="otherIdentificationShow" v-model="form.RISK_IDENTIFICATION" type="identification" />
 	</view>
 </template>
 
@@ -45,8 +75,12 @@
 	import {
 		getConfinedSpaceSelectList
 	} from '../../../api/index'
+	import OtherSelect from '@/components/other-select/index.vue';
 
 	export default {
+		components: {
+			OtherSelect
+		},
 		data() {
 			return {
 				form: {
@@ -59,8 +93,12 @@
 					LIMITSPACE_ID: '',
 					MEDIUM_NAME: '',
 					WORK_CONTENT: '',
-					WORK_START_DATE:'',
+					WORK_START_DATE: '',
-					WORK_END_DATE:'',
+					WORK_END_DATE: '',
+					WORK_LONGITUDE: '',
+					WORK_LATITUDE: '',
+					WORK_USER: '',
+					SPECIAL_WORK: '',
 				},
 				rules: {},
 				picker: {
@@ -75,7 +113,9 @@
 					min: new Date().getTime(),
 					mode: 'datetime',
 					type: ''
-				}
+				},
+				otherAssignmentsShow: false,
+				otherIdentificationShow: false,
 			}
 		},
 		onLoad(options) {
@@ -114,6 +154,17 @@
 			fnDateTimePickerCancel() {
 				this.datetimePicker.show = false
 			},
+			fnLocation() {
+				uni.navigateTo({
+					url: '/pages/map/index',
+					events: {
+						acceptLocationData: (event) => {
+							this.form.WORK_LONGITUDE = event.data.longitue;
+							this.form.WORK_LATITUDE = event.data.latitude;
+						}
+					},
+				})
+			}
 		}
 	}
 </script>

utils/request.js

@@ -14,6 +14,7 @@ function post(url, data) {
             url: requestPath + url,
             data: {
                 USER_ID: store.state.userInfo.USER_ID || '',
+                CORPINFO_ID: store.state.userInfo.CORPINFO_ID || '',
                 ...data
             },
             method: 'POST',