合并分支拉取新代码

src/views/components/phone.vue

@@ -138,13 +138,6 @@ const setPhone = item => {
   console.log('item', item)
   console.log('item', item)
   menuList.value[0].value = item.code
   menuList.value[0].value = item.code
   menuList.value[1].value = item.mobile
   menuList.value[1].value = item.mobile
-  // menuList.value.forEach(e => {
-  //   for (const key in item) {
-  //     if (e.key === key) {
-  //       e.value = item[e.key]
-  //     }
-  //   }
-  // })
 }
 }
 // 关闭国家地区的抽屉
 // 关闭国家地区的抽屉
 const hanleCountryClose = () => {
 const hanleCountryClose = () => {

src/views/sign/FnaList/components/customer.vue

@@ -468,6 +468,8 @@ const handleCloseDrawer = () => {
 }
 }
 // 点击了抽屉的确定
 // 点击了抽屉的确定
 const confirmDrawer = info => {
 const confirmDrawer = info => {
+  console.log('抽屉info', info)
+
   // info 为抽屉返回的值
   // info 为抽屉返回的值
   if (drawerInfo.value.type == 'arrowRight' && drawerInfo.value.drawerType) {
   if (drawerInfo.value.type == 'arrowRight' && drawerInfo.value.drawerType) {
     console.log('drawerInfo.value', drawerInfo.value)
     console.log('drawerInfo.value', drawerInfo.value)
@@ -476,10 +478,23 @@ const confirmDrawer = info => {
     //要判断drawerType
     //要判断drawerType
     switch (drawerInfo.value.drawerType) {
     switch (drawerInfo.value.drawerType) {
       case 'phone':
       case 'phone':
+        let phoneString = ''
         newObj.objType = drawerInfo.value.drawerType
         newObj.objType = drawerInfo.value.drawerType
         // 因为电话有多个，根据点击的电话类型在抽屉里回显，所以要用drawerInfo.value.code来控制
         // 因为电话有多个，根据点击的电话类型在抽屉里回显，所以要用drawerInfo.value.code来控制
-        form.value[info.key] = `${newObj[drawerInfo.value.code]} ${newObj[drawerInfo.value.key]}`
+        form.value[info.key] = phoneString = `${newObj[drawerInfo.value.code]} ${
+          newObj[drawerInfo.value.key]
+          }`
+        newObj.phoneString = phoneString
         saveKey.value[drawerInfo.value.key] = newObj
         saveKey.value[drawerInfo.value.key] = newObj
+        phoneQuickList.value.push({
+          phoneString,
+          code: newObj[drawerInfo.value.code],
+          mobile: newObj[drawerInfo.value.key]
+        })
+        phoneQuickList.value = removeDuplicates(phoneQuickList.value, 'phoneString')
+        
+        console.log('phoneQuickList.value', phoneQuickList.value)
+        console.log('saveKey.value', saveKey.value)
         break
         break
       case 'address':
       case 'address':
         newObj.objType = drawerInfo.value.drawerType
         newObj.objType = drawerInfo.value.drawerType
@@ -668,8 +683,6 @@ const setFormValue = (obj, formData, exportValue) => {
   } else {
   } else {
     form.value.age = null
     form.value.age = null
   }
   }
-  console.log('form.value回填', form.value)
-
   phoneQuickList.value = removeDuplicates(tempPhoneList, 'phoneString')
   phoneQuickList.value = removeDuplicates(tempPhoneList, 'phoneString')
   addressQuickList.value = removeDuplicates(tempAddressList, 'addressString')
   addressQuickList.value = removeDuplicates(tempAddressList, 'addressString')