1.字典逻辑修改。

.env.development

@@ -12,7 +12,7 @@ VITE_APP_UPLOAD_URL = 'http://192.168.101.4:9000'
 # 开发接口地址
 # VITE_APP_API_URL = 'http://192.168.101.4:8078'
 #VITE_APP_API_URL = 'http://192.168.101.188:8078'
- VITE_APP_API_URL = 'http://192.168.101.188:8078'  #lup
+ VITE_APP_API_URL = 'http://192.168.101.4:8078'  #lup
 #VITE_APP_API_URL = 'http://192.168.101.64:8078'  #hetao
 
 # 是否启用 Mock 服务

src/layout/components/NavBar/components/NavbarRight.vue

@@ -130,7 +130,6 @@ const settingStore = useSettingsStore();
 const unReadMessageNum = ref(null);
 const getHeader = computed(() => {
   let url = import.meta.env.VITE_APP_UPLOAD_URL + userStore.user.avatar;
-  console.log("url", url);
   return import.meta.env.VITE_APP_UPLOAD_URL + userStore.user.avatar;
 });
 const route = useRoute();

src/plugins/permission.ts

@@ -20,7 +20,10 @@ export function setupPermission() {
         NProgress.done();
       } else {
         const dictStore = useDictionaryStore();
-        if (JSON.stringify(dictStore.dicts.value) === "{}") {
+        if (
+          !dictStore.dicts.value ||
+          JSON.stringify(dictStore.dicts.value) === "{}"
+        ) {
           const res = await getUserDicts(dictStore.types);
           if (res.data) {
             dictStore.dicts.value = res?.data ?? [];

src/views/base/materials/index.vue

@@ -80,11 +80,14 @@
 import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
 import ButtonPermKeys from "@/common/configs/buttonPermission";
-import { useCommonStoreHook, useDictionaryStoreHook } from "@/store";
+import {
+  useCommonStoreHook,
+  useDictionaryStore,
+  useDictionaryStoreHook,
+} from "@/store";
 const { isShowTable, tableType } = toRefs(useCommonStoreHook());
 import { columns } from "./columns";
-const { dicts } = useDictionaryStoreHook();
-
+const { dicts } = useDictionaryStore();
 
 const test = () => {
   isShowTable.value = true;
@@ -124,8 +127,7 @@ const binding = (row) => {
 onMounted(() => {
   // 设置表格列或者其他自定义的option
 
-    dataList();
-
+  dataList();
 });
 
 /**
@@ -142,53 +144,83 @@ const importExcelData = () => {
     uploadRef.value.show("/api/v1/base/material/import");
   }
 };
-
 option.value = Object.assign(option.value, {
   selection: true,
   column: [
-    { label: "物料编码", prop: "materialCode", width: 130,overHidden: true,search: true ,rules: [{
-        required: true,
-        editDisabled:false,
-        message: "请填写物料编码",
-        trigger: "blur"
-      }],},
-    { label: "物料名称", prop: "materialName", width: 140,overHidden: true,search: true ,rules: [{
-        required: true,
-        message: "请填写物料名称",
-        trigger: "blur"
-      }],},
+    {
+      label: "物料编码",
+      prop: "materialCode",
+      width: 130,
+      overHidden: true,
+      search: true,
+      rules: [
+        {
+          required: true,
+          editDisabled: false,
+          message: "请填写物料编码",
+          trigger: "blur",
+        },
+      ],
+    },
+    {
+      label: "物料名称",
+      prop: "materialName",
+      width: 140,
+      overHidden: true,
+      search: true,
+      rules: [
+        {
+          required: true,
+          message: "请填写物料名称",
+          trigger: "blur",
+        },
+      ],
+    },
     {
       label: "物料属性",
       prop: "attributeDictValue",
       search: true,
       filterable: true,
-      type: 'select',
-      width: 100,overHidden: true,
-      dicData:dicts.material_properties,
+      type: "select",
+      width: 100,
+      overHidden: true,
+      dicData: dicts.value.material_properties,
       props: { label: "dictLabel", value: "dictValue" },
-      rules: [{
-        required: true,
-        message: "请选择物料属性",
-        trigger: "blur"
-      }],
+      rules: [
+        {
+          required: true,
+          message: "请选择物料属性",
+          trigger: "blur",
+        },
+      ],
+    },
+    {
+      label: "物料规格",
+      prop: "spec",
+      width: 100,
+      overHidden: true,
+      rules: [
+        {
+          required: true,
+          message: "请填写物料规格",
+          trigger: "blur",
+        },
+      ],
     },
-    { label: "物料规格", prop: "spec", width: 100,overHidden: true,rules: [{
-        required: true,
-        message: "请填写物料规格",
-        trigger: "blur"
-      }], },
     {
       label: "单位",
       prop: "unitDictValue",
       filterable: true,
       type: "select",
-      dicData:dicts.danwei_type,
+      dicData: dicts.value.danwei_type,
       props: { label: "dictLabel", value: "dictValue" },
-      rules: [{
-        required: true,
-        message: "请选择单位",
-        trigger: "blur"
-      }],
+      rules: [
+        {
+          required: true,
+          message: "请选择单位",
+          trigger: "blur",
+        },
+      ],
     },
     {
       label: "物料级别",
@@ -196,28 +228,40 @@ option.value = Object.assign(option.value, {
       search: true,
       filterable: true,
       type: "select",
-      width: 100,overHidden: true,
-      dicData:dicts.material_level,
+      width: 100,
+      overHidden: true,
+      dicData: dicts.value.material_level,
       props: { label: "dictLabel", value: "dictValue" },
-      rules: [{
-        required: true,
-        message: "请选择物料级别",
-        trigger: "blur"
-      }],
+      rules: [
+        {
+          required: true,
+          message: "请选择物料级别",
+          trigger: "blur",
+        },
+      ],
+    },
+    {
+      label: "生产厂家",
+      prop: "manufacturer",
+      width: 100,
+      overHidden: true,
+      rules: [
+        {
+          required: true,
+          message: "请填写生产厂家",
+          trigger: "blur",
+        },
+      ],
     },
-    { label: "生产厂家", prop: "manufacturer",width: 100,overHidden: true ,rules: [{
-        required: true,
-        message: "请填写生产厂家",
-        trigger: "blur"
-      }],},
     {
       label: "质检方案",
       prop: "inspectDictValue",
       search: true,
       filterable: true,
       type: "select",
-      width: 100,overHidden: true,
-      dicData:dicts.quality_testing_plan,
+      width: 100,
+      overHidden: true,
+      dicData: dicts.value.quality_testing_plan,
       props: { label: "dictLabel", value: "dictValue" },
     },
     {
@@ -226,37 +270,45 @@ option.value = Object.assign(option.value, {
       search: true,
       filterable: true,
       type: "select",
-      width: 100,overHidden: true,
-      dicData:dicts.applicable_platforms,
+      width: 100,
+      overHidden: true,
+      dicData: dicts.value.applicable_platforms,
       props: { label: "dictLabel", value: "dictValue" },
-      rules: [{
-        required: true, message: "请选择适用平台",
-        trigger: "blur"
-      }],
+      rules: [
+        {
+          required: true,
+          message: "请选择适用平台",
+          trigger: "blur",
+        },
+      ],
     },
     {
       label: "质量等级",
       prop: "qualityLevelDictValue",
       search: true,
-      width: 100,overHidden: true,
+      width: 100,
+      overHidden: true,
       filterable: true,
       type: "select",
-      dicData:dicts.quality_grade,
+      dicData: dicts.value.quality_grade,
       props: { label: "dictLabel", value: "dictValue" },
-      rules: [{
-        required: true,
-        message: "请选择质量等级",
-        trigger: "blur"
-      }],
+      rules: [
+        {
+          required: true,
+          message: "请选择质量等级",
+          trigger: "blur",
+        },
+      ],
     },
     {
       label: "选用类型",
       prop: "selectionDictValue",
       search: true,
       filterable: true,
-      width: 100,overHidden: true,
+      width: 100,
+      overHidden: true,
       type: "select",
-      dicData:dicts.selection_type,
+      dicData: dicts.value.selection_type,
       props: { label: "dictLabel", value: "dictValue" },
     },
     {
@@ -264,21 +316,30 @@ option.value = Object.assign(option.value, {
       prop: "stageDictValue",
       search: true,
       filterable: true,
-      width: 100,overHidden: true,
+      width: 100,
+      overHidden: true,
       type: "select",
-      dicData:dicts.stage,
+      dicData: dicts.value.stage,
       props: { label: "dictLabel", value: "dictValue" },
     },
-    { label: "客户型号", prop: "customerModel",width: 100,overHidden: true,  },
-    { label: "保质期(天)", prop: "qualityGuaranteePeriod",width: 100,overHidden: true,type:"number" ,min:0 },
+    { label: "客户型号", prop: "customerModel", width: 100, overHidden: true },
+    {
+      label: "保质期(天)",
+      prop: "qualityGuaranteePeriod",
+      width: 100,
+      overHidden: true,
+      type: "number",
+      min: 0,
+    },
     {
       label: "封装方法",
       prop: "packageDictValue",
       search: true,
-      width: 100,overHidden: true,
+      width: 100,
+      overHidden: true,
       filterable: true,
       type: "select",
-      dicData:dicts.packaging_method,
+      dicData: dicts.value.packaging_method,
       props: { label: "dictLabel", value: "dictValue" },
     },
 
@@ -286,7 +347,8 @@ option.value = Object.assign(option.value, {
       label: "是否工装",
       prop: "frock",
       search: true,
-      width: 90,overHidden: true,
+      width: 90,
+      overHidden: true,
       filterable: true,
       type: "radio", //类型为单选框
       dicData: [
@@ -298,19 +360,33 @@ option.value = Object.assign(option.value, {
           label: "否",
           value: "0",
         },
-
       ],
       value: "1",
-      rules: [{
-        required: true,
-        message: "是否工装",
-        trigger: "blur"
-      }],
+      rules: [
+        {
+          required: true,
+          message: "是否工装",
+          trigger: "blur",
+        },
+      ],
+    },
+    {
+      label: "筛选规范",
+      prop: "selectionSpec",
+      width: 150,
+      overHidden: true,
+      type: "textarea",
+      span: 18,
     },
-    { label: "筛选规范", prop: "selectionSpec",width: 150,overHidden: true,  type: "textarea",span:18},
 
-    { label: "备注", prop: "remark", width: 150,overHidden: true,type: "textarea", span:18 },
+    {
+      label: "备注",
+      prop: "remark",
+      width: 150,
+      overHidden: true,
+      type: "textarea",
+      span: 18,
+    },
   ],
 });
-
 </script>

src/views/login/userCenter.vue

@@ -62,7 +62,6 @@ import { useUserStoreHook } from "@/store/modules/user";
 import SingleUpload from "@/components/Upload/SingleUpload.vue";
 
 const userStore = useUserStoreHook();
-console.log(userStore.user);
 const activeName = ref("first");
 const visible = ref(false);
 const userInfo = ref<any>({});