20231219

.env

@@ -1,6 +1,6 @@
 NODE_ENV = 'production'
-VUE_APP_BASE_URL1 = 'http://192.168.11.77:8100/'
-VUE_APP_BASE_URL2 = 'http://192.168.11.77:8110/'
+VUE_APP_BASE_URL1 = 'https://godown.coldbaozhida.com/oauth/'
+VUE_APP_BASE_URL2 = 'https://godown.coldbaozhida.com/godown/'
 
 
 

env.development

@@ -1,6 +1,6 @@
 NODE_ENV = 'development'
-VUE_APP_BASE_URL1 = 'http://192.168.11.77:8100/'
-VUE_APP_BASE_URL2 = 'http://192.168.11.77:8110/'
+VUE_APP_BASE_URL1 = 'https://godown.coldbaozhida.com/oauth/'
+VUE_APP_BASE_URL2 = 'https://godown.coldbaozhida.com/godown/'
 
 
 

env.production

@@ -1,7 +1,10 @@
 NODE_ENV = 'production'
 
-VUE_APP_BASE_URL1 = 'http://192.168.11.77:8100/'
-VUE_APP_BASE_URL2 = 'http://192.168.11.77:8110/'
+VUE_APP_BASE_URL1 = 'https://godown.coldbaozhida.com/oauth/'
+VUE_APP_BASE_URL2 = 'https://godown.coldbaozhida.com/godown/'
+
+
+
 
 
 VUE_APP_BASE_URL_PORT1 = '8100/' 

src/api/index.ts

@@ -12,6 +12,8 @@ export * from './module/storageFrom'
 export * from './module/printUilts'//打印，导出
 
 export * from './module/home'
+export * from './module/menu'
+
 
 
 

src/api/module/login.ts

@@ -4,4 +4,11 @@ import $http from '@/utils/index'
 // 项目列表（财务）
 export const login = (params: any) => $http.post('/login', params)
 
-export const CompanyTree = (params: any) => $http.post('/product/list', params)
+export const CompanyTree = (params: any) => $http.post('/product/list', params)
+
+/**
+ * 刷新token
+ * @param params 
+ * @returns 
+ */
+export const refToken = (params: any) => $http.get('/refresh_token', params)

src/api/module/menu.ts

@@ -0,0 +1,11 @@
+
+import $http from '@/utils/index'
+
+/**
+ * bar-row数据
+ * @param params 
+ * @returns 
+ */
+export const menuList = (params: any) => $http.get('/menu/list', params)
+
+

src/components/404.vue

@@ -2,11 +2,9 @@
   <div class="not-container">
     <img src="@/assets/img/404.png" class="not-img" alt="404" />
     <div class="not-detail">
-      <h2>404</h2>
-      <h4>抱歉，您访问的页面不存在~🤷‍♂️🤷‍♀️</h4>
+      <p>很遗憾，您访问的页面不存在</p>
       <el-button type="primary" @click="router.push('/')">返回首页</el-button>
     </div>
-    1
   </div>
 </template>
 
@@ -16,5 +14,22 @@ const router = useRouter()
 </script>
 
 <style scoped lang="scss">
+.not-container{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-direction: column;
+  height: 100%;
+}
+.not-detail{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-direction: column;
+  line-height: 80px;
+  p{
+    font-size: 24px;
+  }
+}
 // @import './index.scss';
 </style>

src/hooks/useTable.ts

@@ -61,7 +61,7 @@ export const useTable = (
       ...initParam
     }
     requestApi(params).then(res => {
-      state.tableData = res.data?.list
+      state.tableData = res.data?.list || []
       // dataCallback && (state.tableData = dataCallback(res))
       state.pageable.total = parseInt(res.data?.count)
       // console.log('返回数据', res, state.tableData)

src/plugins/selectData.ts

@@ -22,14 +22,14 @@ export async function LotNumber() {
  */
 export async function specification(){
     const reslut:any =await specList({ page: 1, pageSize: 999 })
-    return reslut.data.list
+    return reslut.data?.list
 }
 /**
  * 品名（疫苗名称）
  */
 export async function gradeName(){
     const reslut:any =await productList({ page: 1, pageSize: 999 })
-    return reslut.data.list
+    return reslut.data?.list
 }
 
 /**
@@ -43,12 +43,12 @@ export function unitFun(){
  */
 export async function enterpriseFun(){
     const reslut:any =await enterpriseList({ page: 1, pageSize: 999 })
-    return reslut.data.list
+    return reslut.data?.list
 }
 /**
  * 收发货单位 2收货，3发货
  */
 export async function stockunitFun(type:any){
     const reslut:any =await stockunit({ type: type })
-    return reslut.data.list
+    return reslut.data?.list
 }

src/router/index.ts

@@ -1,12 +1,11 @@
 import { createRouter, createWebHistory, RouteRecordRaw } from 'vue-router'
-import { dynamicRoutes,errorRouter } from "./module/dynamicRoutes";
+import { dynamicRoutes, errorRouter } from "./module/dynamicRoutes";
 import { globalRoutes } from "./module/globalRoutes";
 import { useStore } from 'vuex'
-
-
-const routes: Array<RouteRecordRaw> = [
-	...dynamicRoutes,
-	...globalRoutes
+import { menuList } from "@/api";
+import { fork } from 'child_process';
+const routes: any = [
+	...globalRoutes,
 ]
 
 const router = createRouter({
@@ -14,39 +13,58 @@ const router = createRouter({
 	routes
 })
 
+function initDynamicRouter() {
+	return new Promise(resolve => {
+		menuList({}).then((res: any) => {
+			if (res.code == 200 && res.msg == '查询成功') {
+				resolve(res?.data || [])
+			}
+		})
+	})
+}
+
 /**
  * 设置标题
  */
 router.afterEach((to, from) => {
 	document.title = '宝智达科技 - ' + to.meta.title;
 })
-
-
-router.beforeEach((to, from, next) => {
+router.beforeEach(async (to, from, next) => {
 	const token = sessionStorage.getItem('token')
 	const store = useStore()
-	if(to.path=='/')store.commit('setCompany','')
-	if(to.path!='/'){
-		store.commit('addTab', {
-			title: to.meta.title,
-			path: to.path,
-			name: to.name
-		})
-	}
-	if (token) {//直接放行
-		next()
-	} else {
-		//如果是登录页面路径，就直接next()
-		if (to.path === '/') {
-			next();
+	if (store.state.setMenu.length == 0) {//当前动态导航为空,调取
+		if (to.path == '/') {//登录界面直接放行
+			next()
 		} else {
-			next('/');
+			const reslut: any = await initDynamicRouter()
+			const dynamicRouter = Fn(reslut)
+			routes[1].children = dynamicRouter
+			dynamicRouter.forEach((element:any) => {
+				router.addRoute(element)
+			});
+			store.commit('setMenuFun', reslut) //存储用户个人信息
+			return next({ ...to, replace: true })
 		}
-	}
-	if(to.name=='login'){//直接进入了登录,清除token
-		sessionStorage.setItem('token','')
-		store.commit('setIsUserInfo', null) //存储用户个人信息
+	} else {//当前存在动态导航
+		if (to.name == 'login') {//直接进入了登录,清除token
+			sessionStorage.setItem('token', '')
+			store.commit('setIsUserInfo', null) //存储用户个人信息
+			store.commit('setCompany', '')
+		}
+		next()
 	}
 })
 
+/**
+ * 递归导航
+ * @param arr 
+ * @returns 
+ */
+function Fn(arr: any) {
+	for (let j = 0; j < arr.length; j++) {
+		arr[j].component = () => import(`${arr[j].component}`)
+		if(arr[j].children && arr[j].children.length) Fn(arr[j].children)
+	}
+	return arr
+}
 export default router

src/router/module/dynamicRoutes.ts

@@ -3,132 +3,7 @@ export const dynamicRoutes = [{
     path: '/layout',
     name: 'layout',
     component: layout,
-    redirect: '/home',
-    children: [{
-        path: '/home',
-        name: 'home',
-        icon: "icon-shouye_zhuyehui",
-        component: () => import('@/views/home/index.vue'),
-        meta: {
-            roles: false,
-            title: '工作台',
-        },
-    }, {
-        path: '/essentialinfo',
-        name: 'essentialinfo',
-        icon: "icon-zhuye1",
-        component: () => import('@/views/essentialinfo/index.vue'),
-        meta: {
-            roles: false,
-            title: '基本信息',
-        },
-    }, {
-        path: '/usermanagement',
-        name: 'usermanagement',
-        icon: "icon-icon-",
-        component: () => import('@/views/usermanagement/index.vue'),
-        redirect: '/usermanagement/user',
-        meta: {
-            roles: false,
-            title: '用户管理',
-        },
-        children: [{
-            path: '/usermanagement/user',
-            name: 'user',
-            icon: "icon-icon-",
-            component: () => import('@/views/usermanagement/user/index.vue'),
-            meta: {
-                roles: false,
-                title: '用户管理',
-            },
-        }, {
-            path: '/usermanagement/company',
-            name: 'company',
-            icon: "icon-zhuye1",
-            component: () => import('@/views/usermanagement/company/index.vue'),
-            meta: {
-                roles: false,
-                title: '公司管理',
-            },
-        }]
-    }, {
-        path: '/stockcontrol',
-        name: 'stockcontrol',
-        icon: "icon-_kucun",
-        component: () => import('@/views/stockcontrol/index.vue'),
-        redirect: '/stockcontrol/storagePut',
-        meta: {
-            roles: false,
-            title: '库存管理',
-        },
-        children: [{
-            path: '/stockcontrol/storagePut',
-            name: 'storagePut',
-            icon: "icon-_kucun",
-            component: () => import('@/views/stockcontrol/storagePut/index.vue'),
-            meta: {
-                roles: false,
-                title: '入库管理',
-            },
-        },{
-            path: '/stockcontrol/storageFrom',
-            name: 'storageFrom',
-            icon: "icon-ruku",
-            component: () => import('@/views/stockcontrol/storageFrom/index.vue'),
-            meta: {
-                roles: false,
-                title: '出库管理',
-            },
-        }, {
-            path: '/stockcontrol/storageInquire',
-            name: 'storageInquire',
-            icon: "icon-fenxixiangmuku",
-            component: () => import('@/views/stockcontrol/storageInquire/index.vue'),
-            meta: {
-                roles: false,
-                title: '库存查询',
-            },
-        },  {
-                path: '/stockcontrol/transmitReceive',
-                name: 'transmitReceive',
-                icon: "icon-ruku",
-                component: () => import('@/views/stockcontrol/transmitReceive/index.vue'),
-                meta: {
-                    roles: false,
-                    title: '收发记录',
-                },
-            },
-        ]
-    }, {
-        path: '/salesmanagement',
-        name: 'salesmanagement',
-        icon: "icon-chukuliucheng",
-        component: () => import('@/views/salesmanagement/index.vue'),
-        redirect: '/salesmanagement/sellManage',
-        meta: {
-            roles: false,
-            title: '销售管理',
-        },
-        children: [{
-            path: '/salesmanagement/sellManage',
-            name: 'sellManage',
-            icon: "icon-chukuliucheng",
-            component: () => import('@/views/salesmanagement/sellManage/index.vue'),
-            meta: {
-                roles: false,
-                title: '销售管理',
-            },
-        }, {
-            path: '/salesmanagement/storageOrderGoods',
-            name: 'storageOrderGoods',
-            icon: "icon-dingdan",
-            component: () => import('@/views/salesmanagement/storageOrderGoods/index.vue'),
-            meta: {
-                roles: false,
-                title: '销售订单',
-            },
-        }]
-    }]
+    children: []
 }]
 
 export const errorRouter = [

src/router/module/globalRoutes.ts

@@ -1,10 +1,23 @@
 import login from '@/views/login/index.vue'
+import layout from "@/views/layout/index.vue";
 // 全局路由
 export const globalRoutes = [{
-	path: '/',
-	name: 'login',
-	component: login,
-	meta: {
-		title: '登录',
-	},
+    path: '/',
+    name: 'login',
+    component: login,
+    meta: {
+        title: '登录',
+    },
+}, {
+    path: '/layout',
+    name: 'layout',
+    component: layout,
+    children: []
+}, {
+    path: '/:pathMatch(.*)*',
+    name: '404',
+    component: () => import('@/components/404.vue'),
+    meta: {
+        title: '404页面'
+    }
 }]

src/store/index.ts

@@ -5,7 +5,7 @@ export default createStore({
   plugins: [
     createPersistedState({
       key: 'stort',
-      paths: ['routerTag','userInfo','isuserInfo','company','switchValue'] //, 'Tags'
+      paths: ['routerTag', 'userInfo', 'isuserInfo', 'company', 'switchValue'] //, 'Tags'
     })
   ],
   state: {
@@ -14,55 +14,63 @@ export default createStore({
       path: '/home',
       name: 'home'
     }],
-    userInfo:null,
-    isfirm:'',//当前公司
-    isuserInfo:null,//api获取的个人信息
-    company:'',
-    switchValue:null,
+    userInfo: {
+      form: { username: "", password: "" },
+      type: ["记住密码"]
+    },
+    isfirm: '',//当前公司
+    isuserInfo: null,//api获取的个人信息
+    company: '',
+    switchValue: null,
+    setMenu: []
   },
   getters: {
-    routerTag:state=>state.routerTag,
+    routerTag: state => state.routerTag,
   },
   mutations: {
+    //设置动态导航
+    setMenuFun: (state, data: any) => {
+      state.setMenu = data
+    },
     //设置扫行展开收缩
-    setswitchValue: (state, data:any) => {
-			state.switchValue = data
-		},
+    setswitchValue: (state, data: any) => {
+      state.switchValue = data
+    },
     //设置当前在哪个公司
-    setCompany: (state, data:any) => {
-			state.company = data
-		},
+    setCompany: (state, data: any) => {
+      state.company = data
+    },
     //api获取的个人信息
-    setIsUserInfo: (state, data:any) => {
-			state.isuserInfo = data
-		},
+    setIsUserInfo: (state, data: any) => {
+      state.isuserInfo = data
+    },
     //登录存储账号密码
-    setUserInfo: (state, data:any) => {
-			state.userInfo = data
-		},
-    addTab: (state, tab:any) => {
-			var tabrlue = state.routerTag.some(item => item.path === tab.path)
+    setUserInfo: (state, data: any) => {
+      state.userInfo = data
+    },
+    addTab: (state, tab: any) => {
+      var tabrlue = state.routerTag.some(item => item.path === tab.path)
       // console.log('tabrlue',tabrlue)
-			if(!tabrlue){
-				state.routerTag.push(tab)
-			}
-		},
+      if (!tabrlue) {
+        state.routerTag.push(tab)
+      }
+    },
     delTab: (state, tab) => {
-			state.routerTag.forEach(function(item,index) {
-				if(item.path === tab){
-					state.routerTag.splice(index,1)
+      state.routerTag.forEach(function (item, index) {
+        if (item.path === tab) {
+          state.routerTag.splice(index, 1)
           router.push('/home')
-				}
-			})
-		}
+        }
+      })
+    }
   },
   actions: {
-    addTab({commit},data){
-			commit('addTab',data)
-		},
-    delTab({commit},data){
-			commit('delTab',data)
-		},
+    addTab({ commit }, data) {
+      commit('addTab', data)
+    },
+    delTab({ commit }, data) {
+      commit('delTab', data)
+    },
   },
   modules: {
   }

src/utils/diffhost/hostData.ts

@@ -4,4 +4,4 @@
  * host2  8110端口
  * 文档host开头的地址需要加入
  */
-export const HostList = ['/login','/sys-user','/user/info','/dept','/dept/enter']
+export const HostList = ['/login','/sys-user','/user/info','/dept','/dept/enter','/refresh_token','/menu/list']

src/utils/index.ts

@@ -5,6 +5,7 @@ import { ElMessage, ElNotification } from 'element-plus'
 import { ResultEnum, ResultData, ContentType } from './interface/index'
 import { diffhost } from './diffhost/index'
 import { loadingFun, closeFun } from "@/plugins/loading";
+import { refToken } from "@/api";
 import router from '@/router/index'
 type LoadingType = {
 	close?: () => void
@@ -52,7 +53,6 @@ class RequestHttp {
 		 *  服务器换返回信息 -> [拦截统一处理] -> 客户端JS获取到信息
 		 */
 		this.service.interceptors.response.use((response: AxiosResponse) => {
-			console.log('请求',response)
 				const { data } = response
 				showStatus(data)
 				return response.data.type=='application/octet-stream'?response:data
@@ -70,12 +70,18 @@ class RequestHttp {
 			if(!params.code){setTimeout(() => {closeFun()}, 500);return;}
 			switch (params.code) {
 				case 200:
-					// ElMessage({
-					// 	showClose: true,
-					// 	message: params.msg,
-					// 	type: 'success',
-					// })
 					break;
+				case ResultEnum.TOKENLOSE:
+					refTokenFun()
+					break;	
+				case ResultEnum.GONFIRM:
+					// router.replace('/usermanagement/company')
+					break;	
+				case ResultEnum.LOGIN:
+					localStorage.clear()
+					router.replace('/')
+					break;
+					
 				case ResultEnum.OVERDUE:
 					ElNotification.error({
 						title: '登陆失效',
@@ -93,6 +99,11 @@ class RequestHttp {
 				closeFun()
 			}, 500);
 		}
+		//函数
+		const refTokenFun = async ()=>{
+			const result:any = await refToken({})
+			if(result.code==200 && result.token)sessionStorage.setItem('token', result.token)
+		}
 	}
 	// * 常用请求方法封装
 	get<T>(url: string, params?: object, _object = {}): Promise<ResultData<T>> {

src/utils/interface/index.ts

@@ -6,6 +6,9 @@ export enum ResultEnum {
   SUCCESS = 200,
   ERROR = 500,
   OVERDUE = 201,
+  LOGIN = 401,
+  GONFIRM = 600,
+  TOKENLOSE = 6401,
   ROLE = 202,
   TIMEOUT = 30000,
   TYPE = 'success'

src/views/home/index.vue

@@ -83,7 +83,7 @@ const TableRef = ref()
 //获取用户信息
 const getuserInfoApi = async () => {
   const result: any = await userInfo({})
-  if (result.code == 200) store.commit('setIsUserInfo', result.data) //存储用户个人信息
+  if (result.code == 200) store.commit('setIsUserInfo', result?.data) //存储用户个人信息
 }
 
 // 渲染表格
@@ -133,7 +133,7 @@ const changeFun = async ()=>{
 // 渲染表格
 onMounted(async () => {
   const result1: any = await productList({ age: 1, pageSize: 999 })//疫苗名称
-  list1.value = findMap(result1.data.list, 'obj')
+  list1.value = findMap(result1.data?.list || [], 'obj')
 
 })
 onMounted(() => {

src/views/layout/routerMenu.vue

@@ -51,7 +51,9 @@ watch(() => router, (toPath: any) => {
 
 const screenWidth = ref()
 const routerData: any = ref([])
-routerData.value = router.options.routes[0].children
+routerData.value = store.state.setMenu
+
+
 screenWidth.value = document.body.clientWidth
 window.onresize = () => (() => {
   screenWidth.value = document.body.clientWidth

src/views/login/index copy.vue

@@ -59,7 +59,7 @@ const submitForm = async () => {
         return
     }
     const froms = { ...data.form }
-    froms.bzd_password = md5(froms.)
+    // froms.bzd_password = md5(froms.)
     const result: any = await login(froms)
     console.log(result)
     if (result.Code == 200) {

src/views/login/loadingBtn.vue

@@ -61,7 +61,7 @@ const submitForm = async () => {
             message: 'ok，登录成功，欢迎进入宝智达出入库管理系统！',
             type: 'success',
         })
-        router.push('/home')
+        router.push('/layout')
     }
 }
 </script>

src/views/salesmanagement/sellManage/index.vue

@@ -63,7 +63,7 @@ const options = ref<ListItem[]>([])
 onMounted(async() => {
     prodListApi()
     const result:any = await stockunit({type:2,name:''})
-    let arr = result.data.list || []
+    let arr = result.data?.list || []
     list.value = arr.map((item:any) => {
         return { value: item, label: item}
     })
@@ -71,7 +71,7 @@ onMounted(async() => {
 //品名
 const prodListApi = async ()=>{
     const result:any = await prodList({"page": 1,"pageSize": 99999})
-    data.prodOptions = result.data.list
+    data.prodOptions = result.data?.list
 }
 const remoteMethod = async(query: string) => {
     if (query) {

src/views/salesmanagement/storageOrderGoods/down.vue

@@ -109,7 +109,7 @@ const printFun = async (formEl: FormInstance | undefined) => {
 
 onMounted(async() => {
     const result:any = await stockunit({type:2,name:''})
-    let arr = result.data.list || []
+    let arr = result.data?.list || []
     list.value = arr.map((item:any) => {
         return { value: item, label: item}
     })

src/views/salesmanagement/storageOrderGoods/index.vue

@@ -46,7 +46,7 @@ const options = ref<ListItem[]>([])
 const click2 = async ()=>{options.value = list.value }
 onMounted(async() => {
     const result:any = await stockunit({type:2,name:''})
-    let arr = result.data.list || []
+    let arr = result.data?.list || []
     list.value = arr.map((item:any) => {
         return { value: item, label: item}
     })

src/views/stockcontrol/storageFrom/Editinventory.vue

@@ -138,12 +138,12 @@ const stockouteditApi = async ()=>{
 //收发货单位Api
 const itemPirFun = async()=>{
     const reslut:any = await stockunit({ type: 3 })
-    data.itemPir = reslut.data.list
+    data.itemPir = reslut.data?.list
 }
 //经办人Api
 const operatorListApi = async()=>{
     const reslut:any = await operatorList({})
-    data.itemOpen = reslut.data.list
+    data.itemOpen = reslut.data?.list
 }
 
 //获取入库表单Api
@@ -151,11 +151,11 @@ const medicListStockFun = async ()=>{
     data.columns = []
     const reslut:any = await medicListStock({})
     if(reslut.code==200 && reslut.msg=='查询成功'){
-        data.showDiaData = reslut.data.list
+        data.showDiaData = reslut.data?.list
         data.rules1 = {}
         data.columns = []
         data.selectType = []
-        reslut.data.list.forEach((value:any) => { //value设置成key
+        reslut.data?.list.forEach((value:any) => { //value设置成key
             data.selectType.push({type:value.type,list:value.list})
             data.columns.push({ prop: value.field_name, label: value.name, list:value.list})
             initParam.medicineInfo[value.field_name] = ''; // 这里可以根据需要设置其他值作为键的内容

src/views/stockcontrol/storageFrom/index.vue

@@ -108,17 +108,20 @@ const click3 = async ()=>{options3.value = list3.value}
 // 渲染表格
 onMounted(async () => {
     let r:any = await medicineColumns({})
-     let obj = [...r.data.list]
+    if(r.code==200){
+        let obj = [...r.data?.list]
      TableRef.value.tableColumns = [...obj,...columnsTableOut]
+     }
+     
 
     const result1: any = await productList({ age: 1, pageSize: 999 })//疫苗名称
     const result2: any = await enterpriseList({ age: 1, pageSize: 999 })//生产企业
     const result3: any = await stockunit({ type: 2 })//收发货单位
 
 
-    list1.value = findMap(result1.data.list || [], 'obj')
-    list2.value = findMap(result2.data.list || [], 'obj')
-    list3.value = findMap(result3.data.list || [],'map')
+    list1.value = findMap(result1.data?.list || [], 'obj')
+    list2.value = findMap(result2.data?.list || [], 'obj')
+    list3.value = findMap(result3.data?.list || [],'map')
 
 })
 //函数

src/views/stockcontrol/storageFrom/scanCode.vue

@@ -193,12 +193,12 @@ const closeFun = async () => {
 //收发货单位
 const itemPirFun = async()=>{
     const reslut:any = await stockunit({ type: 3 })
-    data.itemPir = reslut.data.list
+    data.itemPir = reslut.data?.list
 }
 //经办人Api
 const operatorListApi = async()=>{
     const reslut:any = await operatorList({})
-    data.itemOpen = reslut.data.list
+    data.itemOpen = reslut.data?.list
 }
 
 
@@ -239,11 +239,11 @@ const medicListStockFun = async ()=>{
     data.columns = []
     const reslut:any = await medicListStockOut({})
     if(reslut.code==200 && reslut.msg=='查询成功'){
-        data.showDiaData = reslut.data.list
+        data.showDiaData = reslut.data?.list
         data.rules1 = {}
         data.columns = []
         data.selectType = []
-        reslut.data.list.forEach((value:any) => { //value设置成key
+        reslut.data?.list.forEach((value:any) => { //value设置成key
             data.selectType.push({type:value.type,list:value.list})
             data.columns.push({ prop: value.field_name, label: value.name, list:value.list})
             initParam.medicineInfo[value.field_name] = ''; // 这里可以根据需要设置其他值作为键的内容

src/views/stockcontrol/storageInquire/index.vue

@@ -118,8 +118,8 @@ onMounted(async () => {
     const result1: any = await productList({ age: 1, pageSize: 999 })//疫苗名称
     const result2: any = await enterpriseList({ age: 1, pageSize: 999 })//生产企业
 
-    list1.value = findMap(result1.data.list, 'obj')
-    list2.value = findMap(result2.data.list, 'obj')
+    list1.value = findMap(result1.data?.list || [], 'obj')
+    list2.value = findMap(result2.data?.list || [], 'obj')
 })
 //函数
 const changFun = async (e: any) => {

src/views/stockcontrol/storagePut/Editinventory.vue

@@ -138,12 +138,12 @@ const stockeditApi = async ()=>{
 //收发货单位Api
 const itemPirFun = async()=>{
     const reslut:any = await stockunit({ type: 3 })
-    data.itemPir = reslut.data.list
+    data.itemPir = reslut.data?.list
 }
 //经办人Api
 const operatorListApi = async()=>{
     const reslut:any = await operatorList({})
-    data.itemOpen = reslut.data.list
+    data.itemOpen = reslut.data?.list
 }
 
 //获取入库表单Api
@@ -151,11 +151,11 @@ const medicListStockFun = async ()=>{
     data.columns = []
     const reslut:any = await medicListStock({})
     if(reslut.code==200 && reslut.msg=='查询成功'){
-        data.showDiaData = reslut.data.list
+        data.showDiaData = reslut.data?.list
         data.rules1 = {}
         data.columns = []
         data.selectType = []
-        reslut.data.list.forEach((value:any) => { //value设置成key
+        reslut.data?.list.forEach((value:any) => { //value设置成key
             data.selectType.push({type:value.type,list:value.list})
             data.columns.push({ prop: value.field_name, label: value.name, list:value.list})
             initParam.medicineInfo[value.field_name] = ''; // 这里可以根据需要设置其他值作为键的内容

src/views/stockcontrol/storagePut/index.vue

@@ -109,18 +109,20 @@ const editinventFun = async ()=>{
 // 渲染表格
 onMounted(async () => {
      const r:any = await medicineColumns({})
-     
-     let obj = [...r.data.list]
-     TableRef.value.tableColumns = [...obj,...columnsTable]
+     console.log('r',r)
+     if(r.code==200){
+        let obj = [...r.data?.list]
+        TableRef.value.tableColumns = [...obj,...columnsTable]
+     }
 
     const result1: any = await productList({ age: 1, pageSize: 999 })//疫苗名称
     const result2: any = await enterpriseList({ age: 1, pageSize: 999 })//生产企业
     const result3: any = await stockunit({ type: 1 })//收发货单位
 
 
-    list1.value = findMap(result1.data.list || [], 'obj')
-    list2.value = findMap(result2.data.list || [], 'obj')
-    list3.value = findMap(result3.data.list || [],'map')
+    list1.value = findMap(result1.data?.list || [], 'obj')
+    list2.value = findMap(result2.data?.list || [], 'obj')
+    list3.value = findMap(result3.data?.list || [],'map')
 
 })
 //函数

src/views/stockcontrol/storagePut/scanCode.vue

@@ -192,12 +192,12 @@ const closeFun = async () => {
 //收发货单位
 const itemPirFun = async()=>{
     const reslut:any = await stockunit({ type: 3 })
-    data.itemPir = reslut.data.list
+    data.itemPir = reslut.data?.list
 }
 //经办人Api
 const operatorListApi = async()=>{
     const reslut:any = await operatorList({})
-    data.itemOpen = reslut.data.list
+    data.itemOpen = reslut.data?.list
 }
 
 
@@ -238,11 +238,11 @@ const medicListStockFun = async ()=>{
     data.columns = []
     const reslut:any = await medicListStock({})
     if(reslut.code==200 && reslut.msg=='查询成功'){
-        data.showDiaData = reslut.data.list
+        data.showDiaData = reslut.data?.list
         data.rules1 = {}
         data.columns = []
         data.selectType = []
-        reslut.data.list.forEach((value:any) => { //value设置成key
+        reslut.data?.list.forEach((value:any) => { //value设置成key
             data.selectType.push({type:value.type,list:value.list})
             data.columns.push({ prop: value.field_name, label: value.name, list:value.list})
             initParam.medicineInfo[value.field_name] = ''; // 这里可以根据需要设置其他值作为键的内容

src/views/stockcontrol/transmitReceive/index.vue

@@ -130,9 +130,8 @@ const columns: any = [
 ]
 const userListApi = async () => {
     const result: any = await inventoryList(initParam)
-    console.log('输入',result)
-    data.tableData = result.data.list || []
-    data.total = result.data.count
+    data.tableData = result.data?.list || []
+    data.total = result.data?.count || 0
 }
 userListApi()
 //函数
@@ -166,9 +165,9 @@ onMounted(async () => {
     const result2: any = await enterpriseList({ page: 1, pageSize: 999 })//生产企业
     const result3: any = await stockunit({ type: 3 })//收发货单位
 
-    list1.value = findMap(result1.data.list || [],'obj')
-    list2.value = findMap(result2.data.list || [],'obj')
-    list3.value = findMap(result3.data.list || [],'map')
+    list1.value = findMap(result1.data?.list || [],'obj')
+    list2.value = findMap(result2.data?.list || [],'obj')
+    list3.value = findMap(result3.data?.list || [],'map')
 })
 //函数
 const click1 = async ()=>{options1.value = list1.value  }

src/views/usermanagement/user/index.vue

@@ -2,7 +2,7 @@
   <div class="user">
     <searchAdd isButtom="查询" @event="eventFun">
       <template #searchConter>
-        <el-form-item label="用户名">
+        <el-form-item label="用户名称">
           <el-input v-model="data.initParam.username" placeholder="请输入用户名" />
         </el-form-item>
       </template>
@@ -94,7 +94,7 @@ const eventFun = async (data: any) => {
 const columns: any = [
   { type: 'index', label: '编号', width: 80, },
   { prop: 'nickName', label: '名称', width: 200 },
-  { prop: 'username', label: '用户名', width: 200 },
+  { prop: 'username', label: '用户名称', width: 200 },
   { prop: 'operation', label: '操作', fixed: 'right',align:'left', 'min-width': 200 }
 ]