Merge branch 'dev_officer' of maoming/yjxp-web into master

src/views/threePreventionResponsiblePerson/editPersonInformation.vue

@@ -200,7 +200,7 @@ const rules = reactive({
 const props = defineProps({
   isShowStructure: Boolean
 });
-const emits = defineEmits(["confirm"]);
+const emits = defineEmits(["confirm", "cancel"]);
 
 let showPicker = ref(false);
 const handleSelect = data => {
@@ -251,7 +251,8 @@ const handleEdit = () => {
 let submitting = ref(false);
 // 返回
 const onCancel = () => {
-  pageStatus.value = "1";
+  // pageStatus.value = "1";
+  emits("cancel");
 };
 
 // 提交表单

src/views/threePreventionResponsiblePerson/organizationalStructure.vue

@@ -54,7 +54,7 @@
         </div>
       </div>
     </div>
-    <editPersonInformation v-if="isShowInformation" :isShowStructure="isShowStructure" @confirm="closeContent" />
+    <editPersonInformation v-if="isShowInformation" :isShowStructure="isShowStructure" @confirm="closeContent" @cancel="cancelContent" />
     <div class="footer">
       <div class="footer-item1">
         <img v-if="!isShowInformation" :src="archSel" style="height: 24px" />
@@ -138,6 +138,9 @@ const closeContent = data1 => {
   emits("update:isShowStructure", false);
   emits("confirm");
 };
+const cancelContent = () => {
+  isShowInformation.value = false;
+}
 
 interface Tree {
   name: string;

src/views/threePreventionResponsiblePerson/personInformation2.vue

@@ -65,7 +65,7 @@
                 <div>办公电话:</div>
               </div>
               <van-field
-                  v-model="form.phone"
+                  v-model="form.telephone"
                   class="common-field"
                   readonly
               />