yangyuxuan 6 månader sedan
förälder
incheckning
00c554fe41

+ 3 - 2
src/views/mobileControl/TaskProgressUpdate.vue

@@ -50,7 +50,7 @@
                 readonly
                 label="位置信息"
                 placeholder="点击获取当前位置信息"
-                :rules="rules.processing_status"
+                :rules="rules.address"
                 @click="isGetAddress = true"
             />
           </div>
@@ -101,7 +101,8 @@ let uploaderErrors = ref('');
 const rules = reactive({
   processing_status: [{ required: true, message: '请选择任务完成情况' }],
   feedback_content: [{ required: true, message: '反馈内容不能为空' }],
-  fileList: [{ validator: validateFile, message: '请上传文件' }]
+  fileList: [{ validator: validateFile, message: '请上传文件' }],
+  address: [{  required: true, message: "请选择位置信息"  }]
 });
 let showPicker = ref(false);
 

+ 28 - 2
src/views/mobileControl/Workbenches.vue

@@ -54,6 +54,16 @@
                   </FileUpload>
                 </template>
               </van-field>
+              <van-field
+                v-model="form.address"
+                class="common-field"
+                right-icon="location"
+                readonly
+                label="位置信息"
+                placeholder="点击获取当前位置信息"
+                :rules="rules.address"
+                @click="isGetAddress = true"
+              />
             </div>
           </div>
         </div>
@@ -74,6 +84,13 @@
         round
         position="bottom"
       />
+      <PositionSelect
+        v-if="isGetAddress"
+        v-model:visible="isGetAddress"
+        :address="form.address"
+        :lnglat="form.lnglat"
+        @confirm="handlePositionSelect"
+      />
     </div>
   </van-popup>
 </template>
@@ -93,20 +110,29 @@ const showRight = ref(true);
 const route = useRoute();
 const router = useRouter();
 let id = ref("");
+let isGetAddress = ref(false);
 // 表单数据
 const form = ref({
   processing_status: "",
   processing_status_text: "",
   feedback_content: "",
-  fileList: []
+  fileList: [],
+  address: "",
+  lnglat: [],
 });
+// 地点选择回调
+const handlePositionSelect = data => {
+  form.value.lnglat = data.lnglat;
+  form.value.address = data.address;
+};
 const pickerValue = ref<Numeric[]>([]);
 let uploaderErrors = ref("");
 // 表单校验规则
 const rules = reactive({
   processing_status: [{ required: true, message: "请输入报送单位" }],
   feedback_content: [{ required: true, message: "请输入事件描述" }],
-  fileList: [{ validator: validateFile, message: "请上传文件" }]
+  fileList: [{ validator: validateFile, message: "请上传文件" }],
+  address: [{  required: true, message: "请选择位置信息"  }]
 });
 let showPicker = ref(false);
 // 是否在提交