Merge commit 'bc153ac4' into dev

@@ -32,7 +32,8 @@ const useUserStore = defineStore(
       badge: {},
       badge: {},
       reLogin: {show:false,query:{}},
       reLogin: {show:false,query:{}},
       visitor: false,
       visitor: false,
-      language: 0
+      language: 0,
+      activeName:"5"
     }),
     }),
     actions: {
     actions: {
       // 登录
       // 登录
@@ -163,6 +164,9 @@ const useUserStore = defineStore(
         } else {
         } else {
           return true
           return true
         }
         }
+      },
+      updataActiveName(v){
+        this.activeName=v
       }
       }
     }
     }
   })
   })

@@ -166,7 +166,6 @@ const rules = ref({
     {required: true, message: language.value==0?'请输入账户':'Please enter account', trigger: 'blur'}
     {required: true, message: language.value==0?'请输入账户':'Please enter account', trigger: 'blur'}
   ],
   ],
 })
 })
-const isEdit = ref(false)
 let invoiceId
 let invoiceId
 onMounted(() => {
 onMounted(() => {
   if(route.query.activeId){
   if(route.query.activeId){
@@ -197,18 +196,13 @@ function getList() {
     getInvoiceDetailMatch(invoiceId).then(res => {
     getInvoiceDetailMatch(invoiceId).then(res => {
       form.value = res.data;
       form.value = res.data;
       totalMoney.value = form.value.total
       totalMoney.value = form.value.total
-      if (form.value.invoiceForm == '1') {
-        email.value = form.value.address
-      }
+
       getAddrList()
       getAddrList()
     });
     });
   }else{
   }else{
     getInvoiceDetail(invoiceId).then(res => {
     getInvoiceDetail(invoiceId).then(res => {
       form.value = res.data;
       form.value = res.data;
       totalMoney.value = form.value.total
       totalMoney.value = form.value.total
-      if (form.value.invoiceForm == '1') {
-        email.value = form.value.address
-      }
       getAddrList()
       getAddrList()
     });
     });
   }
   }

@@ -225,12 +225,13 @@ import {setToken} from "@/viewsPc/seat/utils/local-store";
 const router = useRouter()
 const router = useRouter()
 const route = useRoute()
 const route = useRoute()
 const language= useStorage('language',0)
 const language= useStorage('language',0)
-const activeName = ref('5')
 const lpName = ref('')
 const lpName = ref('')
 const remark = ref('')
 const remark = ref('')
 const showSJDialog = ref(false)
 const showSJDialog = ref(false)
-const user = useUserStore().user || {}
 const userStore = useUserStore();
 const userStore = useUserStore();
+const user = useUserStore().user || {}
+const activeName = ref(userStore.activeName||'5')
+
 const query = ref({
 const query = ref({
   createById: user.userId,
   createById: user.userId,
   orderType:'5',
   orderType:'5',
@@ -248,6 +249,7 @@ onMounted(() => {
     router.push({name: 'myInfo'})
     router.push({name: 'myInfo'})
     return
     return
   }
   }
+  query.value.orderType= activeName.value=userStore.activeName||'5'
   getList()
   getList()
 })
 })
 const getList = () => {
 const getList = () => {
@@ -291,7 +293,9 @@ const handleClick = (e) => {
   query.value.orderType = e.paneName
   query.value.orderType = e.paneName
   list.value = []
   list.value = []
   query.value.invoiced='0'
   query.value.invoiced='0'
+  userStore.updataActiveName(e.paneName)
   getList()
   getList()
+
 }
 }
 const gokp = (item) => {
 const gokp = (item) => {
   router.push({
   router.push({