Merge branch 'master' of http://bore.pub:10439/r/ERP_override

chenlu

2024-07-22 fa4ca85ccb4323fcbb687b8ac673301a3c043b12

Merge branch 'master' of http://bore.pub:10439/r/ERP_override

 north-glass-erp/northglass-erp/src/layout/MainErpView.vue

@@ -6,6 +6,7 @@
import {onMounted, reactive, ref, watch} from "vue"
import deepClone from "@/utils/deepClone"
import userInfo from '@/stores/userInfo'
import userOrderInfo from '@/stores/sd/order/orderInfo'
import {Close, Grid, Histogram, MessageBox, SwitchButton} from "@element-plus/icons-vue"
import { useI18n } from 'vue-i18n'
import i18n from "@/lang/index"
@@ -17,6 +18,9 @@
const router = useRouter()
const userStore = useUserInfoStore()
const user = userStore.user?.userName
const orderInfo = userOrderInfo()
orderInfo.clearSelectDate()

//监听异步返回代码
watch(()=>userStore.responseCode,(newVal) => {
    switch (newVal){

 north-glass-erp/northglass-erp/src/stores/sd/order/orderInfo.js

@@ -21,6 +21,9 @@
        clearOrderInfo(){
            this.orderId = null
            this.reviewList = []
        },
        clearSelectDate(){
            this.selectDate=["",""]
        }
    },
    persist: true