更改用户显示姓名

src/components/CommonTable/configs/tableConfig.ts

@@ -123,6 +123,9 @@ export const tableConfig = {
       {
         label: "车间负责人",
         prop: "manager",
+        type: "select",
+        dicData: dicts.user_name_list,
+        props: {"label": "dictLabel","value":"dictValue"},
         rules: [
           {
             required: true,
@@ -130,13 +133,6 @@ export const tableConfig = {
             trigger: "blur",
           },
         ],
-        type: "select",
-        dicUrl: import.meta.env.VITE_APP_BASE_API + "/api/v1/sys/user/list",
-        dicMethod: "post",
-        props: {
-          label: "userName", // 下拉菜单显示的字段
-          value: "userName", // 下拉菜单值的字段
-        },
       },
       {
         label: "车间位置",
@@ -182,6 +178,9 @@ export const tableConfig = {
       {
         label: "产线负责人",
         prop: "manager",
+        type: "select",
+        dicData: dicts.user_name_list,
+        props: {"label": "dictLabel","value":"dictValue"},
         rules: [
           {
             required: true,
@@ -189,13 +188,6 @@ export const tableConfig = {
             trigger: "blur",
           },
         ],
-        type: "select",
-        dicUrl: import.meta.env.VITE_APP_BASE_API + "/api/v1/sys/user/list",
-        dicMethod: "post",
-        props: {
-          label: "userName", // 下拉菜单显示的字段
-          value: "userName", // 下拉菜单值的字段
-        },
       },
       {
         label: "产线位置",
@@ -298,12 +290,8 @@ export const tableConfig = {
           },
         ],
         type: "select",
-        dicUrl: import.meta.env.VITE_APP_BASE_API + "/api/v1/sys/user/list",
-        dicMethod: "post",
-        props: {
-          label: "userName", // 下拉菜单显示的字段
-          value: "userName", // 下拉菜单值的字段
-        },
+        dicData: dicts.user_name_list,
+        props: {"label": "dictLabel","value":"dictValue"},
       },
       {
         label: "所属产线",
@@ -842,6 +830,11 @@ export const tableConfig = {
         /*display:false,*/
       },
       {
+        label: "用户姓名",
+        prop: "nickName",
+        /*display:false,*/
+      },
+      {
         label: "用户名",
         prop: "userName",
         search: true,
@@ -913,6 +906,9 @@ export const tableConfig = {
       {
         label: "报故人",
         prop: "creator",
+        type: "select",
+        dicData: dicts.user_name_list,
+        props: {"label": "dictLabel","value":"dictValue"},
         width: 100,
       },
 

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

@@ -40,9 +40,9 @@
           :value="unReadMessageNum"
           :max="10"
         >
-          <span>{{ userStore.user.username }}</span>
+          <span>{{ userStore.user.nickName }}</span>
         </el-badge>
-        <span v-else>{{ userStore.user.username }}</span>
+        <span v-else>{{ userStore.user.nickName }}</span>
       </div>
       <template #dropdown>
         <el-dropdown-menu>

src/store/modules/dictionary.ts

@@ -32,12 +32,21 @@ export const useDictionaryStore = defineStore(
       "disposal_measures_type",
       "process_check_result",
       "excel_states",
+      "user_name_list"
     ];
     const dicts = ref<{ [key: string]: any[] }>({});
-
+    const getLabelByValue = (type: string, value: string) => {
+      const dict = dicts.value[type];
+      if (dict) {
+        const lable = dict.find((item: any) => item.dictValue === value);
+        return lable?.dictLabel;
+      }
+      return "";
+    }
     return {
       types,
       dicts,
+      getLabelByValue
     };
   },
   {

src/store/modules/user.ts

@@ -46,6 +46,7 @@ export const useUserStore = defineStore("user", () => {
           }
           user.value.userId = data.id;
           user.value.username = data.userName;
+          user.value.nickName = data.nickName
           user.value.roles = data.roles;
           user.value.deptId = data.deptId;
           user.value.avatar = data.avatar;

src/views/base/bom/components/version-drawing.vue

@@ -36,11 +36,9 @@
 <script setup>
   import { ref, getCurrentInstance } from "vue";
   import { useCrud } from "@/hooks/userCrud";
-  import ButtonPermKeys from "@/common/configs/buttonPermission";
-  import { useCommonStoreHook } from "@/store";
+  import { useCommonStoreHook ,useDictionaryStore} from "@/store";
 
   const { isShowTable, tableType } = toRefs(useCommonStoreHook());
-  import { useDictionaryStore } from "@/store";
   const test = () => {
     isShowTable.value = true;
     tableType.value = tableType.value == 1 ? 2 : 1;

src/views/base/bom/components/version-page.vue

@@ -44,10 +44,9 @@
   import { ref, getCurrentInstance } from "vue";
   import { useCrud } from "@/hooks/userCrud";
   import ButtonPermKeys from "@/common/configs/buttonPermission";
-  import { useCommonStoreHook } from "@/store";
+  import { useCommonStoreHook ,useDictionaryStore} from "@/store";
 
   const { isShowTable, tableType } = toRefs(useCommonStoreHook());
-  import { useDictionaryStore } from "@/store";
   const test = () => {
     isShowTable.value = true;
     tableType.value = tableType.value == 1 ? 2 : 1;

src/views/base/craftManagement/route/components/setExcel/index.vue

@@ -210,6 +210,9 @@ option.value = Object.assign(option.value, {
     {
       label: "操作人",
       prop: "updator",
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
       addDisabled: true,
       editDisabled: true,
     },

src/views/base/craftManagement/route/index.vue

@@ -524,6 +524,9 @@ option.value = Object.assign(option.value, {
     {
       label: "创建人",
       prop: "creator",
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
       addDisplay: false,
       editDisplay: false,
       overHidden: true,

src/views/base/materials/components/choice-item-page.vue

@@ -19,8 +19,7 @@
 <script setup>
 import {defineProps, ref} from "vue";
 import { useCrud } from "@/hooks/userCrud";
-import { useCommonStoreHook } from "@/store";
-import { useDictionaryStore } from "@/store";
+import { useCommonStoreHook ,useDictionaryStore} from "@/store";
 const { isShowTable, tableType } = toRefs(useCommonStoreHook());
 const { dicts } = useDictionaryStore();
 const test = () => {

src/views/base/materials/components/drawing-page.vue

@@ -72,11 +72,9 @@
 <script setup>
 import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
-import ButtonPermKeys from "@/common/configs/buttonPermission";
-import { useCommonStoreHook } from "@/store";
+import { useCommonStoreHook ,useDictionaryStore} from "@/store";
 
 const { isShowTable, tableType } = toRefs(useCommonStoreHook());
-import { useDictionaryStore } from "@/store";
 import { addDrawing, getDrawing } from "@/api/drawing";
 const { dicts } = useDictionaryStore();
 const filePath = import.meta.env.VITE_APP_UPLOAD_URL;

src/views/base/modeling/factory/index.vue

@@ -70,7 +70,7 @@
 <script setup lang="ts">
 import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
-import {useCommonStoreHook, useUserStoreHook} from "@/store";
+import {useCommonStoreHook, useDictionaryStore, useUserStoreHook} from "@/store";
 const { isShowTable, tableType } = toRefs(useCommonStoreHook());
 import { updateWorkShop } from "@/api/workShop";
 
@@ -81,6 +81,7 @@ const ctableRef = ref(null);
 const workShopRef = ref(null);
 const productionLineRef = ref(null);
 const factory = ref({});
+const { dicts } = useDictionaryStore();
 const binding = (row) => {
   factory.value = row;
   if (row.level === "first") {
@@ -197,6 +198,9 @@ option.value = Object.assign(option.value, {
       label: "负责人",
       prop: "manager",
       span: 24,
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
       labelWidth: 100,
       rules: [
         {

src/views/base/modeling/production-line/components/capacity-page.vue

@@ -45,12 +45,9 @@
 <script lang="ts" setup>
 import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
-import ButtonPermKeys from "@/common/configs/buttonPermission";
-import { useCommonStoreHook } from "@/store";
+import { useCommonStoreHook ,useDictionaryStore} from "@/store";
 
 const { isShowTable, tableType } = toRefs(useCommonStoreHook());
-import { useDictionaryStore } from "@/store";
-import { addStationDevice } from "@/api/station";
 
 const test = () => {
   isShowTable.value = true;

src/views/base/modeling/production-line/index.vue

@@ -55,10 +55,9 @@
 <script setup>
 import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
-import ButtonPermKeys from "@/common/configs/buttonPermission";
-import { useCommonStoreHook } from "@/store";
+import { useCommonStoreHook ,useDictionaryStore} from "@/store";
 const { isShowTable, tableType } = toRefs(useCommonStoreHook());
-
+const { dicts } = useDictionaryStore();
 const test = () => {
   isShowTable.value = true;
   tableType.value = tableType.value == 1 ? 2 : 1;
@@ -76,13 +75,6 @@ const { dataList, createRow, updateRow, deleteRow, searchChange, resetChange } =
   Methords; //增删改查
 const { selectionChange, multipleDelete } = Methords; //选中和批量删除事件
 const { checkBtnPerm, downloadTemplate, exportData } = Utils; //按钮权限等工具
-// checkBtnPerm(ButtonPermKeys.PLAN.BTNS.order_add) :permission="permission"
-// const permission = reactive({
-//   delBtn: checkPerm(buttonPermission.PLAN.BTNS.order_del),
-//   addBtn: checkPerm(buttonPermission.PLAN.BTNS.order_add),
-//   editBtn: checkPerm(buttonPermission.PLAN.BTNS.order_edit),
-//   menu: true,
-// });
 const ctableRef = ref(null);
 const crudRef = ref(null); //crudRef.value 获取avue-crud对象
 
@@ -135,6 +127,9 @@ option.value = Object.assign(option.value, {
     {
       label: "负责人",
       prop: "manager",
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
       span: 24,
       rules: [
         {

src/views/base/modeling/station/columns.ts

@@ -65,6 +65,9 @@ export const columns = [
   },
   {
     label: "负责人",
+    type: "select",
+    dicData: dicts.user_name_list,
+    props: {"label": "dictLabel","value":"dictValue"},
     prop: "manager",
     overHidden: true,
     width:100,
@@ -81,6 +84,9 @@ export const columns = [
     label: "负责人id",
     prop: "managerId",
     overHidden: true,
+    type: "select",
+    dicData: dicts.user_name_list,
+    props: {"label": "dictLabel","value":"dictValue"},
     width:80,
     hide:true,
     display:false,

src/views/base/modeling/station/components/station-page.vue

@@ -43,11 +43,9 @@
 <script lang="ts" setup>
 import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
-import ButtonPermKeys from "@/common/configs/buttonPermission";
-import { useCommonStoreHook } from "@/store";
-
+import { useCommonStoreHook ,useDictionaryStore} from "@/store";
 const { isShowTable, tableType } = toRefs(useCommonStoreHook());
-import { useDictionaryStore } from "@/store";
+
 import { columns } from "./columns";
 import { addStationDevice } from "@/api/station";
 

src/views/base/modeling/station/index.vue

@@ -88,10 +88,10 @@
 import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
 import {syncAps} from "@/api/aps";
-import { useCommonStoreHook } from "@/store";
+import { useCommonStoreHook ,useDictionaryStore} from "@/store";
 import { updateStation } from "@/api/station";
 const { isShowTable, tableType } = toRefs(useCommonStoreHook());
-import { useDictionaryStore } from "@/store";
+
 import {ElMessage, ElMessageBox} from "element-plus";
 const { dicts } = useDictionaryStore();
 const test = () => {
@@ -276,6 +276,9 @@ option.value = Object.assign(option.value, {
       prop: "manager",
       overHidden: true,
       width: 90,
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
       rules: [
         {
           required: true,
@@ -345,6 +348,9 @@ option.value = Object.assign(option.value, {
     {
       label: "创建人",
       prop: "creator",
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
       overHidden: true,
       display: false,
     },

src/views/base/modeling/work-shop/index.vue

@@ -40,10 +40,9 @@
 <script setup>
   import { ref, getCurrentInstance } from "vue";
   import { useCrud } from "@/hooks/userCrud";
-  import ButtonPermKeys from "@/common/configs/buttonPermission";
-  import { useCommonStoreHook } from "@/store";
+  import { useCommonStoreHook ,useDictionaryStore} from "@/store";
   const { isShowTable, tableType } = toRefs(useCommonStoreHook());
-
+  const { dicts } = useDictionaryStore();
   const test = () => {
     isShowTable.value = true;
     tableType.value = tableType.value == 1 ? 2 : 1;
@@ -58,18 +57,9 @@
     Methords; //增删改查
   const { selectionChange, multipleDelete } = Methords; //选中和批量删除事件
   const { checkBtnPerm, downloadTemplate, exportData } = Utils; //按钮权限等工具
-  // checkBtnPerm(ButtonPermKeys.PLAN.BTNS.order_add) :permission="permission"
-  // const permission = reactive({
-  //   delBtn: checkPerm(buttonPermission.PLAN.BTNS.order_del),
-  //   addBtn: checkPerm(buttonPermission.PLAN.BTNS.order_add),
-  //   editBtn: checkPerm(buttonPermission.PLAN.BTNS.order_edit),
-  //   menu: true,
-  // });
-
   const crudRef = ref(null); //crudRef.value 获取avue-crud对象
 
   onMounted(() => {
-    // console.log("crudRef", crudRef)
     dataList();
   });
   const ctableRef=ref(null);
@@ -111,6 +101,9 @@
         label: "负责人",
         prop: "manager",
         span:24,
+        type: "select",
+        dicData: dicts.user_name_list,
+        props: {"label": "dictLabel","value":"dictValue"},
         rules: [{
           required: true,
           message: "请选择厂区负责人",

src/views/base/skill/index.vue

@@ -196,6 +196,9 @@ option.value = Object.assign(option.value, {
       disabled: true,
     },
     {
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
       label: "员工姓名", prop: "userName", width: 140, overHidden: true, search: true, rules: [{
         required: true,
         search: true,

src/views/device/instance/index.vue

@@ -166,7 +166,7 @@ import { useCrud } from "@/hooks/userCrud";
 import buttonPermission from "@/common/configs/buttonPermission";
 import { configSave, configList, deviceUpdateCollect } from "@/api/device";
 import { syncAps } from "@/api/aps";
-import { useCommonStoreHook } from "@/store";
+import { useCommonStoreHook,useDictionaryStore } from "@/store";
 import ChoiceWorkshopPage from "../../plan/workOrder/components/choice-workshop-page.vue";
 import ChoiceStationPage from "./components/choice-station-page.vue";
 import dictDataUtil from "@/common/configs/dictDataUtil";
@@ -177,6 +177,7 @@ const test = () => {
   isShowTable.value = true;
   tableType.value = tableType.value == 1 ? 2 : 1;
 };
+const { dicts } = useDictionaryStore();
 const pageData = ref([]);
 const loading = ref(false); //  加载状态
 const addItem = () => {
@@ -401,6 +402,9 @@ option.value = Object.assign(option.value, {
       prop: "head",
       width: 120,
       overHidden: true,
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
       rules: [
         {
           required: true,

src/views/device/repair/index.vue

@@ -1,29 +1,29 @@
 <template>
   <div class="mainContentBox">
     <avue-crud
-      ref="crudRef"
-      v-model="form"
-      v-model:page="page"
-      v-model:search="search"
-      :data="data"
-      :option="option"
-      @row-save="createRow"
-      @row-update="updateRow"
-      @row-del="deleteRow"
-      @search-change="searchChange"
-      @search-reset="resetChange"
-      @size-change="dataList"
-      @current-change="dataList"
-      @selection-change="selectionChange"
+        ref="crudRef"
+        v-model="form"
+        v-model:page="page"
+        v-model:search="search"
+        :data="data"
+        :option="option"
+        @row-save="createRow"
+        @row-update="updateRow"
+        @row-del="deleteRow"
+        @search-change="searchChange"
+        @search-reset="resetChange"
+        @size-change="dataList"
+        @current-change="dataList"
+        @selection-change="selectionChange"
     >
       <template #menu-left="{ size }">
         <el-button
-          v-hasPerm="[ButtonPermKeys.DEVICE.BTNS.repair_del]"
-          :disabled="toDeleteIds.length < 1"
-          :size="size"
-          icon="el-icon-delete"
-          type="danger"
-          @click="multipleDelete"
+            v-hasPerm="[ButtonPermKeys.DEVICE.BTNS.repair_del]"
+            :disabled="toDeleteIds.length < 1"
+            :size="size"
+            icon="el-icon-delete"
+            type="danger"
+            @click="multipleDelete"
         >删除
         </el-button
         >
@@ -43,20 +43,20 @@
       </template>
     </avue-crud>
     <el-dialog
-      v-model="dialog.visible"
-      :title="dialog.title"
-      width="850px"
-      @close="dialog.visible = false"
+        v-model="dialog.visible"
+        :title="dialog.title"
+        width="850px"
+        @close="dialog.visible = false"
     >
       <device-page @deviceInfo="deviceInfo"/>
     </el-dialog>
 
     <el-dialog
-      v-model="dialog1.visible"
-      :title="dialog1.title"
-      height="80%"
-      width="750px"
-      @close="dialog1.visible = false"
+        v-model="dialog1.visible"
+        :title="dialog1.title"
+        height="80%"
+        width="750px"
+        @close="dialog1.visible = false"
     >
       <el-timeline style="max-width: 500px; margin-left: 100px">
         <el-timeline-item center placement="top" type="success">
@@ -64,70 +64,70 @@
             <h4>设备报故</h4>
             <p>设备编号： {{ maintenanceInfo.deviceNo }}</p>
             <p>设备名称： {{ maintenanceInfo.deviceName }}</p>
-            <p>报故人员： {{ maintenanceInfo.creator }}</p>
+            <p>报故人员： {{ getLabelByValue('user_name_list', maintenanceInfo.creator) }}</p>
             <p>故障描述： {{ maintenanceInfo.bugRemark }}</p>
             <p>报故时间： {{ maintenanceInfo.created }}</p>
           </el-card>
         </el-timeline-item>
         <el-timeline-item
-          :type="maintenanceInfo.state === 0 ? 'primary' : 'success'"
-          center
-          placement="top"
+            :type="maintenanceInfo.state === 0 ? 'primary' : 'success'"
+            center
+            placement="top"
         >
           <el-card v-if="viewPage">
             <h4>设备维修</h4>
-            <p>维修人员： {{ maintenanceInfo.handleUser }}</p>
+            <p>维修人员： {{ getLabelByValue('user_name_list', maintenanceInfo.handleUser) }}</p>
             <p>维修内容： {{ maintenanceInfo.handleContent }}</p>
             <p>
               处理结果：
               {{
                 maintenanceInfo.handleUser
-                  ? maintenanceInfo.handleResult === 0
-                    ? "可正常运行"
-                    : "报废"
-                  : ""
+                    ? maintenanceInfo.handleResult === 0
+                        ? "可正常运行"
+                        : "报废"
+                    : ""
               }}
             </p>
           </el-card>
           <el-card v-if="!viewPage">
             <h4>设备维修</h4>
             <el-form
-              ref="maintenanceInfoForm1"
-              :model="maintenanceInfo"
-              :rules="rules1"
-              label-width="auto"
-              style="max-width: 400px"
+                ref="maintenanceInfoForm1"
+                :model="maintenanceInfo"
+                :rules="rules1"
+                label-width="auto"
+                style="max-width: 400px"
             >
               <el-form-item label="维修人员" prop="handleUser">
                 <!--                <el-input :disabled="maintenanceInfo.state !== 0" v-model="maintenanceInfo.handleUser" />-->
                 <el-select
-                  v-model="maintenanceInfo.handleUser"
-                  :disabled="maintenanceInfo.state !== 0"
-                  filterable
-                  placeholder="维修人员"
-                  size="large"
+                    v-model="maintenanceInfo.handleUser"
+                    :disabled="maintenanceInfo.state !== 0"
+                    filterable
+                    placeholder="维修人员"
+                    size="large"
                 >
                   <el-option
-                    v-for="item in userList"
-                    :key="item.userName"
-                    :label="item.userName"
-                    :value="item.userName"
+                      v-for="item in userList"
+                      :key="item.userName"
+                      :label="item.nickName"
+                      :value="item.userName"
                   />
                 </el-select>
               </el-form-item>
               <el-form-item label="维修内容" prop="handleContent">
                 <el-input
-                  v-model="maintenanceInfo.handleContent"
-                  :disabled="maintenanceInfo.state !== 0"
-                  :rows="2"
-                  type="textarea"
+                    v-model="maintenanceInfo.handleContent"
+                    :disabled="maintenanceInfo.state !== 0"
+                    :rows="2"
+                    type="textarea"
                 />
               </el-form-item>
               <el-form-item label="处理结果">
                 <el-radio-group
-                  v-model="maintenanceInfo.handleResult"
-                  :disabled="maintenanceInfo.state !== 0"
-                  class="ml-4"
+                    v-model="maintenanceInfo.handleResult"
+                    :disabled="maintenanceInfo.state !== 0"
+                    class="ml-4"
                 >
                   <el-radio :value="0">可正常运行</el-radio>
                   <el-radio :value="1">报废</el-radio>
@@ -135,11 +135,11 @@
               </el-form-item>
               <el-form-item style="margin-left: 45%">
                 <el-button
-                  v-if="maintenanceInfo.state === 0"
-                  v-hasPerm="[ButtonPermKeys.DEVICE.BTNS.repair_repair]"
-                  :disabled="maintenanceInfo.state !== 0"
-                  type="primary"
-                  @click="maintenanceSubmit1"
+                    v-if="maintenanceInfo.state === 0"
+                    v-hasPerm="[ButtonPermKeys.DEVICE.BTNS.repair_repair]"
+                    :disabled="maintenanceInfo.state !== 0"
+                    type="primary"
+                    @click="maintenanceSubmit1"
                 >维修
                 </el-button
                 >
@@ -148,62 +148,62 @@
           </el-card>
         </el-timeline-item>
         <el-timeline-item
-          :type="
+            :type="
             maintenanceInfo.state === 1
               ? 'primary'
               : maintenanceInfo.state === 0
                 ? 'info'
                 : 'success'
           "
-          center
-          placement="top"
+            center
+            placement="top"
         >
           <el-card v-if="viewPage">
             <h4>设备审批</h4>
-            <p>审批人员： {{ maintenanceInfo.auditUser }}</p>
+            <p>审批人员： {{ getLabelByValue('user_name_list', maintenanceInfo.auditUser) }}</p>
             <p>
               审批结果：
               {{
                 maintenanceInfo.auditUser
-                  ? maintenanceInfo.auditResult === 0
-                    ? "通过"
-                    : "不通过"
-                  : ""
+                    ? maintenanceInfo.auditResult === 0
+                        ? "通过"
+                        : "不通过"
+                    : ""
               }}
             </p>
           </el-card>
           <el-card v-if="!viewPage">
             <h4>设备审批</h4>
             <el-form
-              v-if="maintenanceInfo.state >= 1"
-              ref="maintenanceInfoForm2"
-              :model="maintenanceInfo"
-              :rules="rules2"
-              label-width="auto"
-              style="max-width: 400px"
+                v-if="maintenanceInfo.state >= 1"
+                ref="maintenanceInfoForm2"
+                :model="maintenanceInfo"
+                :rules="rules2"
+                label-width="auto"
+                style="max-width: 400px"
             >
               <el-form-item label="审批人员" prop="auditUser">
                 <!--                <el-input :disabled="maintenanceInfo.state !== 1 && readonly"  v-model="maintenanceInfo.auditUser" />-->
                 <el-select
-                  v-model="maintenanceInfo.auditUser"
-                  :disabled="maintenanceInfo.state !== 1 && readonly"
-                  filterable
-                  placeholder="审批人员"
-                  size="large"
+                    v-model="maintenanceInfo.auditUser"
+                    :disabled="maintenanceInfo.state !== 1 && readonly"
+                    filterable
+                    placeholder="审批人员"
+                    size="large"
                 >
                   <el-option
-                    v-for="item in userList"
-                    :key="item.userName"
-                    :label="item.userName"
-                    :value="item.userName"
+                      v-for="item in userList"
+                      :key="item.userName"
+                      :label="item.nickName"
+                      :value="item.userName"
                   />
                 </el-select>
               </el-form-item>
               <el-form-item label="审批结果">
                 <el-radio-group
-                  v-model="maintenanceInfo.auditResult"
-                  :disabled="maintenanceInfo.state !== 1 && readonly"
-                  class="ml-4"
+                    v-model="maintenanceInfo.auditResult"
+                    :disabled="maintenanceInfo.state !== 1 && readonly"
+                    class="ml-4"
                 >
                   <el-radio :value="0">通过</el-radio>
                   <el-radio :value="1">不通过</el-radio>
@@ -211,11 +211,11 @@
               </el-form-item>
               <el-form-item style="margin-left: 45%">
                 <el-button
-                  v-if="maintenanceInfo.state === 1"
-                  v-hasPerm="[ButtonPermKeys.DEVICE.BTNS.repair_audit]"
-                  :disabled="maintenanceInfo.state !== 1"
-                  type="primary"
-                  @click="maintenanceSubmit2"
+                    v-if="maintenanceInfo.state === 1"
+                    v-hasPerm="[ButtonPermKeys.DEVICE.BTNS.repair_audit]"
+                    :disabled="maintenanceInfo.state !== 1"
+                    type="primary"
+                    @click="maintenanceSubmit2"
                 >审批
                 </el-button
                 >
@@ -228,15 +228,16 @@
   </div>
 </template>
 <script setup>
-import {ref, getCurrentInstance} from "vue";
+import {ref} from "vue";
 import {useCrud} from "@/hooks/userCrud";
 import ButtonPermKeys from "@/common/configs/buttonPermission";
 import {checkPerm} from "@/directive/permission";
 import {getUserList} from "@/api/system/user";
-import {repair, audit} from "@/api/device/index";
-import {useCommonStoreHook} from "@/store";
+import {audit, repair} from "@/api/device/index";
+import {useCommonStoreHook, useDictionaryStore} from "@/store";
 import dictDataUtil from "@/common/configs/dictDataUtil";
 
+const {dicts, getLabelByValue} = useDictionaryStore();
 const {isShowTable, tableType} = toRefs(useCommonStoreHook());
 const test = () => {
   isShowTable.value = true;
@@ -261,11 +262,11 @@ const dialog1 = reactive({
 const userList = ref([]);
 // 传入一个url，后面不带/
 const {form, data, option, search, page, toDeleteIds, Methords, Utils} =
-  useCrud({
-    src: "/api/v1/device/repair",
-  });
+    useCrud({
+      src: "/api/v1/device/repair",
+    });
 const {dataList, createRow, updateRow, deleteRow, searchChange, resetChange} =
-  Methords; //增删改查
+    Methords; //增删改查
 const {selectionChange, multipleDelete} = Methords; //选中和批量删除事件
 const {checkBtnPerm, downloadTemplate, exportData} = Utils; //按钮权限等工具
 const crudRef = ref(null); //crudRef.value 获取avue-crud对象
@@ -419,6 +420,9 @@ option.value = Object.assign(option.value, {
     {
       label: "报故人",
       prop: "creator",
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel", "value": "dictValue"},
       display: false,
     },
     {

src/views/login/userCenter.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog title="个人中心" v-model="visible" width="1200px">
+  <el-dialog title="计划编号" v-model="visible" width="1200px">
     <el-tabs v-model="activeName" class="demo-tabs">
       <el-tab-pane label="基本资料" name="first">
         <el-form label-position="right" label-width="60px" :model="userInfo">

src/views/plan/order/index.vue

@@ -250,6 +250,7 @@
 import { checkPerm } from "@/directive/permission";
 import type { UploadInstance } from "element-plus";
 import { genFileId } from "element-plus";
+import {useDictionaryStore} from "@/store";
 import dictDataUtil from "@/common/configs/dictDataUtil";
 import buttonPermission from "@/common/configs/buttonPermission";
 import {
@@ -270,7 +271,7 @@ import _ from "lodash-es";
 import ChoiceItemPage from "@/views/base/materials/components/choice-item-page.vue";
 import { zipOrder } from "../../../api/order";
 import { useCrud } from "../../../hooks/userCrud";
-
+const { dicts } = useDictionaryStore();
 const { Utils } = useCrud({
   src: "/api/v1/plan/order",
 });
@@ -646,6 +647,9 @@ option.value = {
     {
       label: "创建人",
       prop: "creator",
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
       display: false,
       width: 80,
       overHidden: true,

src/views/plan/prepare/index.vue

@@ -175,7 +175,7 @@
                 <el-option
                   v-for="item in userList"
                   :key="item.userName"
-                  :label="item.userName"
+                  :label="item.nickName"
                   :value="item.userName"
                 />
               </el-select>
@@ -256,7 +256,7 @@
                 <el-option
                   v-for="item in userList"
                   :key="item.userName"
-                  :label="item.userName"
+                  :label="item.nickName"
                   :value="item.userName"
                 />
               </el-select>
@@ -272,7 +272,7 @@
                 <el-option
                   v-for="item in userList"
                   :key="item.userName"
-                  :label="item.userName"
+                  :label="item.nickName"
                   :value="item.userName"
                 />
               </el-select>
@@ -327,7 +327,7 @@ import {
   refreshPrepareCheckInfo,
 } from "@/api/order";
 import { queryChildrenInfo } from "@/api/process";
-import { useCommonStoreHook, useUserStore } from "@/store";
+import { useCommonStoreHook,useDictionaryStore, useUserStore } from "@/store";
 import { queryDictDataByType } from "@/api/system/dict";
 import { getUserList } from "@/api/system/user";
 import { ElMessage } from "element-plus";
@@ -337,6 +337,7 @@ const test = () => {
   isShowTable.value = true;
   tableType.value = tableType.value == 1 ? 2 : 1;
 };
+const { dicts } = useDictionaryStore();
 const userStore = useUserStore();
 const dataTable = ref([]);
 const feedBack = (row, index) => {
@@ -744,6 +745,9 @@ onMounted(() => {
     option.value.column.push({
       label: "创建人",
       width: 200,
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
       prop: "creator",
       display: false,
     });

src/views/plan/prepareTemplate/index.vue

@@ -165,11 +165,11 @@
 <script setup>
 import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
-import { useCommonStoreHook } from "@/store";
+import { useCommonStoreHook,useDictionaryStore } from "@/store";
 import { queryDictDataByType } from "@/api/system/dict";
 const { isShowTable, tableType } = toRefs(useCommonStoreHook());
 const router = useRouter();
-
+const { dicts } = useDictionaryStore();
 // 传入一个url，后面不带/
 const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
   useCrud({
@@ -333,6 +333,9 @@ option.value = Object.assign(option.value, {
     {
       label: "创建人",
       width: 200,
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
       prop: "creator",
       display: false,
     },

src/views/plan/requisition/index.vue

@@ -203,17 +203,17 @@
             <el-row>
               <el-col :span="2"><el-text tag="p">领用人:</el-text></el-col>
               <el-col :span="4"
-                ><el-text tag="p">{{ form.applyUser }}</el-text></el-col
+                ><el-text tag="p">{{ getLabelByValue('user_name_list',form.applyUser) }}</el-text></el-col
               >
               <el-col :span="2"><el-text tag="p">审核: </el-text></el-col>
               <el-col :span="4"
-                ><el-text tag="p">{{ form.auditUser }} </el-text></el-col
+                ><el-text tag="p">{{ getLabelByValue('user_name_list',form.auditUser) }} </el-text></el-col
               >
               <!--            <el-col :span="2" ><el-text tag="p">会签:</el-text></el-col>
             <el-col :span="4" ><el-text tag="p" >{{form.countersignUser}}</el-text></el-col>-->
               <el-col :span="2"><el-text tag="p">出库人:</el-text></el-col>
               <el-col :span="4"
-                ><el-text tag="p">{{ form.approveUser }}</el-text></el-col
+                ><el-text tag="p">{{ getLabelByValue('user_name_list',form.approveUser) }}</el-text></el-col
               >
             </el-row>
           </div>
@@ -240,7 +240,7 @@
                       <el-text
                         tag="p"
                         v-if="dialogType === 1 || form.state > 0"
-                        >{{ form.applyUser }}</el-text
+                        >{{ getLabelByValue('user_name_list',form.applyUser) }}</el-text
                       >
                       <el-select
                         v-else
@@ -318,7 +318,7 @@
                     style="max-width: 400px"
                   >
                     <el-form-item label="审核人员" prop="auditUser">
-                      <el-text tag="p">{{ form.auditUser }}</el-text>
+                      <el-text tag="p">{{ getLabelByValue('user_name_list',form.auditUser) }}</el-text>
                     </el-form-item>
                     <el-form-item label="处理结果">
                       <el-text
@@ -442,7 +442,7 @@
                     style="max-width: 400px"
                   >
                     <el-form-item label="出库人" v-if="form.state > 5">
-                      <el-text tag="p">{{ form.approve.user }}</el-text>
+                      <el-text tag="p">{{ getLabelByValue('user_name_list',form.approve.user) }}</el-text>
                     </el-form-item>
                     <el-form-item label="出库结果">
                       <el-text
@@ -498,14 +498,14 @@ import {
   auditApplyInfoDetails,
 } from "@/api/order";
 import { getUserList } from "@/api/system/user";
-import { useCommonStoreHook } from "@/store";
+import { useCommonStoreHook,useDictionaryStore } from "@/store";
 import ExportInfo from "./exportInfo.vue";
 const { isShowTable, tableType } = toRefs(useCommonStoreHook());
 const test = () => {
   isShowTable.value = true;
   tableType.value = tableType.value == 1 ? 2 : 1;
 };
-
+const { dicts , getLabelByValue} = useDictionaryStore();
 // 1.定义ref
 const toPrintRef = ref(null);
 // 传入一个url，后面不带/
@@ -748,12 +748,18 @@ option.value = Object.assign(option.value, {
       label: "领用人员",
       prop: "applyUser",
       width: 150,
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
       overHidden: true,
       search: true,
     },
     {
       label: "审核人员",
       prop: "auditUser",
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
       width: 150,
       overHidden: true,
     },
@@ -766,6 +772,9 @@ option.value = Object.assign(option.value, {
     {
       label: "出库人员",
       width: 150,
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
       overHidden: true,
       prop: "approveUser",
     },

src/views/plan/schedule/index.vue

@@ -214,8 +214,8 @@ option.value = Object.assign(option.value, {
       width: 100,
       overHidden: true,
       type: "select",
-      dicData: userList,
-      props: { label: "userName", value: "userName" },
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
     },
     {
       label: "产线名称",

src/views/plan/shortage/index.vue

@@ -219,6 +219,9 @@ option.value = Object.assign(option.value, {
     {
       label: "处理人",
       prop: "handleUser",
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
       width: 120,
     },
     {

src/views/plan/workOrder/index.vue

@@ -297,7 +297,7 @@ import {
   zipWorkOrder,
 } from "@/api/order";
 import {syncAps} from "@/api/aps";
-import { useCommonStoreHook } from "@/store";
+import { useCommonStoreHook,useDictionaryStore } from "@/store";
 import dictDataUtil from "@/common/configs/dictDataUtil";
 import ChoiceRoutePage from "./components/choice-route-page.vue";
 import ChoiceWorkshopPage from "./components/choice-workshop-page.vue";
@@ -306,7 +306,7 @@ import { checkPerm } from "@/directive/permission";
 import { queryDictDataByType } from "@/api/system/dict";
 import {ElMessage, ElMessageBox} from "element-plus";
 const { isShowTable, tableType } = toRefs(useCommonStoreHook());
-
+const { dicts } = useDictionaryStore();
 const tableRowClassName = ({ row, rowIndex }) => {
   if(row.planStartEnd){
     const currentDate = new Date(); // 获取当前日期
@@ -824,6 +824,9 @@ option.value = Object.assign(option.value, {
     {
       label: "创建人",
       width: 90,
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
       display: false,
       prop: "creator",
     },

src/views/pro/traceability/components/brazeCom.vue

@@ -9,8 +9,10 @@
   </div>
 </template>
 <script setup>
+import { useDictionaryStore} from "@/store";
 import {processBrazePage} from '@/api/braze'
 const tableData = ref([])
+const { dicts } = useDictionaryStore();
 const option =  {
   addBtn: false,
   selection: false,
@@ -52,6 +54,9 @@ const option =  {
     {
       label: "操作人",
       prop: "updator",
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
     },
     {
       label: "操作时间",

src/views/pro/traceability/components/faultCom.vue

@@ -90,6 +90,9 @@ option.value = Object.assign(option.value, {
     {
       label: "报故人",
       prop: "creator",
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
       search: false,
     },
     {

src/views/pro/traceability/components/traceabilityCom.vue

@@ -97,6 +97,9 @@ option.value = Object.assign(option.value, {
     {
       label: "操作人",
       prop: "creator",
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
       search: false,
     },
     {

src/views/quality/faultHandle/components/fault-detail.vue

@@ -49,7 +49,7 @@
     <div class="fault-detail" v-if="faultDetails1.opinion!=''">线长意见 :&nbsp;&nbsp;{{faultDetails1.opinion}}</div>
 
     <div class="title-fault" style="margin-top: 10px">
-      报故人:&nbsp;&nbsp;{{faultDetails1.creator}}
+      报故人:&nbsp;&nbsp;{{getLabelByValue('user_name_list',faultDetails1.creator)}}
     </div>
     <div class="title-fault" style="margin-top: 10px">
       报故工位:&nbsp;&nbsp;{{faultDetails1.stationName}}
@@ -80,7 +80,7 @@
   import {getFault,getFaultDetails,getSeqNoList} from "@/api/fault"
   import dictDataUtil from "@/common/configs/dictDataUtil";
   // 数据字典相关
-  const { dicts } = useDictionaryStore();
+  const { dicts,getLabelByValue } = useDictionaryStore();
 
   const test = () => {
     isShowTable.value = true;

src/views/quality/faultHandle/components/fault-examine.vue

@@ -42,7 +42,7 @@
     <div class="fault-detail">故障描述:&nbsp;&nbsp;{{faultDetails1.remark}}</div>
 
     <div class="title-fault" style="margin-top: 10px">
-      报故人:&nbsp;&nbsp;{{faultDetails1.creator}}
+      报故人:&nbsp;&nbsp;{{getLabelByValue('user_name_list',faultDetails1.creator)}}
     </div>
     <div class="title-fault" style="margin-top: 10px">
       报故工位:&nbsp;&nbsp;{{faultDetails1.stationName}}
@@ -94,7 +94,7 @@
   import {getFault,getFaultDetails,updateFault} from "@/api/fault"
   import dictDataUtil from "@/common/configs/dictDataUtil";
   // 数据字典相关
-  const { dicts } = useDictionaryStore();
+  const { dicts,getLabelByValue } = useDictionaryStore();
 
   const test = () => {
     isShowTable.value = true;

src/views/quality/faultHandle/components/fault-handle.vue

@@ -42,7 +42,7 @@
     <div class="fault-detail">故障描述:&nbsp;&nbsp;{{faultDetails.remark}}</div>
 
     <div class="title-fault" style="margin-top: 10px">
-      报故人:&nbsp;&nbsp;{{faultDetails.creator}}
+      报故人:&nbsp;&nbsp;{{getLabelByValue('user_name_list',faultDetails.creator)}}
     </div>
     <div class="title-fault" style="margin-top: 10px">
       报故工位:&nbsp;&nbsp;{{faultDetails.stationName}}

src/views/quality/faultHandle/index.vue

@@ -286,6 +286,9 @@ option.value = Object.assign(option.value, {
     {
       label: "报故人",
       prop: "creator",
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
       overHidden: true,
       width: 100,
     },

src/views/quality/problemHandle/components/problem-detail.vue

@@ -14,7 +14,7 @@
     <div class="fault-detail" v-if="faultDetails1.opinion!=''">线长意见 :&nbsp;&nbsp;{{ faultDetails1.opinion }}</div>
 
     <div class="title-fault" style="margin-top: 10px">
-      反馈人:&nbsp;&nbsp;{{ faultDetails1.creator }}
+      反馈人:&nbsp;&nbsp;{{ getLabelByValue('user_name_list',faultDetails1.creator) }}
     </div>
     <div class="title-fault" style="margin-top: 10px">
       反馈工位:&nbsp;&nbsp;{{ faultDetails1.stationName }}
@@ -42,7 +42,7 @@ import dictDataUtil from "@/common/configs/dictDataUtil";
 
 const {isShowTable, tableType} = toRefs(useCommonStoreHook());
 // 数据字典相关
-const {dicts} = useDictionaryStore();
+const {dicts,getLabelByValue} = useDictionaryStore();
 
 const test = () => {
   isShowTable.value = true;

src/views/quality/problemHandle/components/problem-examine.vue

@@ -13,7 +13,7 @@
     <div class="fault-detail">反馈问题:&nbsp;&nbsp;{{ faultDetails1.remark }}</div>
 
     <div class="title-fault" style="margin-top: 10px">
-      反馈人:&nbsp;&nbsp;{{ faultDetails1.creator }}
+      反馈人:&nbsp;&nbsp;{{ getLabelByValue('user_name_list',faultDetails1.creator) }}
     </div>
     <div class="title-fault" style="margin-top: 10px">
       反馈工位:&nbsp;&nbsp;{{ faultDetails1.stationName }}
@@ -47,7 +47,7 @@ import {getFaultDetails, handleProblem} from "@/api/fault"
 
 const {isShowTable, tableType} = toRefs(useCommonStoreHook());
 // 数据字典相关
-const {dicts} = useDictionaryStore();
+const {dicts,getLabelByValue} = useDictionaryStore();
 
 const test = () => {
   isShowTable.value = true;

src/views/quality/problemHandle/index.vue

@@ -193,6 +193,9 @@ option.value = Object.assign(option.value, {
     {
       label: "反馈人",
       prop: "creator",
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
       overHidden: true,
       width: 100,
     },

src/views/quality/unqualified/columns.ts

@@ -47,6 +47,9 @@ export const columns = [
   {
     label: "报故人", prop: "creator",
     overHidden: true,
+    type: "select",
+    dicData: dicts.user_name_list,
+    props: {"label": "dictLabel","value":"dictValue"},
     width:100,
   },
 ];

src/views/report/statistics/bugPeople/index.vue

@@ -0,0 +1,170 @@
+<template>
+  <div class="mainContentBox">
+    <avue-crud ref="crudRef1" v-model:search="data1.search" :data="data1.data" :option="data1.option"
+      v-model:page="data1.page" @row-save="createRow" @row-update="updateRow" @row-del="deleteRow"
+      @search-change="searchChange" @search-reset="resetChange" @size-change="dataList" @current-change="dataList"
+      @selection-change="selectionChange" @cell-click="ckickCell">
+    </avue-crud>
+  </div>
+</template>
+<script setup>
+import { ref, getCurrentInstance } from "vue";
+import { useCrud } from "@/hooks/userCrud";
+import { useCommonStoreHook, useDictionaryStore } from "@/store";
+// 数据字典相关
+const { dicts } = useDictionaryStore();
+const key = ref(false);
+const data1 = ref(
+  useCrud({
+    src: "/api/v1/process/census/bugPeople",
+  })
+);
+const { dataList, createRow, updateRow, deleteRow, searchChange, resetChange } =
+  data1.value.Methords;
+
+const { selectionChange, multipleDelete } = data1.value.Methords;
+
+const ckickCell = (row) => {
+};
+// 设置表格列或者其他自定义的option
+data1.value.option = Object.assign(data1.value.option, {
+  selection: false,
+  menu: false,
+  menuWidth: 100,
+  addBtn: false,
+  filterBtn: false,
+  searchShowBtn: false,
+  columnBtn: false,
+  gridBtn: false,
+  editBtn: false,
+  viewBtn: false,
+  delBtn: false,
+  column: [
+    {
+      label: "日期范围",
+      prop: "searchTime",
+      search: true,
+      hide: true,
+      type: "date",
+      format: "YYYY-MM-DD",
+      valueFormat: "YYYY-MM-DD",
+      searchRange: true,
+      startPlaceholder: "开始日期",
+      endPlaceholder: "结束日期",
+    },
+    {
+      label: "订单编码",
+      prop: "orderCode",
+      overHidden: true,
+      search: true,
+      editDisabled: true,
+      hide: true,
+    },
+    {
+      label: "订单名称",
+      prop: "orderName",
+      overHidden: true,
+      search: true,
+      editDisabled: true,
+      hide: true,
+    },
+    {
+      label: "物料编码",
+      prop: "materialCode",
+      overHidden: true,
+      search: true,
+      editDisabled: true,
+      hide: true,
+    },
+    {
+      label: "工单编码",
+      prop: "workOrderCode	",
+      width: 140,
+      overHidden: true,
+      search: true,
+      editDisabled: true,
+      hide: true,
+    },
+    {
+      label: "订单名称",
+      prop: "orderName",
+      search: false,
+    },
+    {
+      label: "订单编码",
+      prop: "orderCode",
+      search: false,
+    },
+    {
+      label: "工单编码",
+      prop: "workOrderCode",
+      search: false,
+    },
+    {
+      label: "物料编码",
+      prop: "materialCode",
+      search: false,
+    },
+    {
+      label: "物料名称",
+      prop: "materialName",
+      search: false,
+    },
+    {
+      label: "物料规格",
+      prop: "materialModel",
+      search: false,
+    },
+    {
+      label: "责任人",
+      prop: "userName",
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
+      display: false
+    },
+    {
+      label: "报故数量",
+      prop: "count",
+      search: false,
+    },
+  ],
+});
+
+const getCurrentMonthStartAndEndDates = () => {
+  // 获取当前日期
+  let now = new Date();
+
+  // 获取当前月份的第一天
+  let startDate = new Date(now.getFullYear(), now.getMonth(), 1);
+
+  // 获取当前月份的最后一天
+  let endDate = new Date(now.getFullYear(), now.getMonth() + 1, 0);
+
+  // 格式化日期为'YYYY-MM-DD'格式
+  function formatDate(date) {
+    let year = date.getFullYear();
+    let month = String(date.getMonth() + 1).padStart(2, "0");
+    let day = String(date.getDate()).padStart(2, "0");
+    return `${year}-${month}-${day}`;
+  }
+
+  // 返回包含开始和结束日期的数组
+  return [formatDate(startDate), formatDate(endDate)];
+};
+
+//设置搜索条件中的时间范围为默认此月
+const setTime = () => {
+  data1.value.search.searchTime = getCurrentMonthStartAndEndDates();
+};
+
+onMounted(async () => {
+  setTime();
+  dataList();
+});
+</script>
+<style lang="scss" scoped>
+:deep(.avue-crud__left) {
+  width: 100%;
+}
+</style>

src/views/report/statistics/notGood/index.vue

@@ -0,0 +1,178 @@
+<template>
+  <div class="mainContentBox">
+    <avue-crud ref="crudRef1" v-model:search="data1.search" :data="data1.data" :option="data1.option"
+      v-model:page="data1.page" @row-save="createRow" @row-update="updateRow" @row-del="deleteRow"
+      @search-change="searchChange" @search-reset="resetChange" @size-change="dataList" @current-change="dataList"
+      @selection-change="selectionChange" @cell-click="ckickCell">
+    </avue-crud>
+  </div>
+</template>
+<script setup>
+import { ref, getCurrentInstance } from "vue";
+import { useCrud } from "@/hooks/userCrud";
+import { useCommonStoreHook, useDictionaryStore } from "@/store";
+import dictDataUtil from "@/common/configs/dictDataUtil";
+import editSkill from "@/views/base/skill/components/edit-skill.vue";
+import { getEchartData } from "@/api/report";
+import * as echarts from "echarts";
+// 数据字典相关
+const { dicts } = useDictionaryStore();
+const key = ref(false);
+const data1 = ref(
+  useCrud({
+    src: "/api/v1/process/census/notGood",
+  })
+);
+const { dataList, createRow, updateRow, deleteRow, searchChange, resetChange } =
+  data1.value.Methords;
+
+const { selectionChange, multipleDelete } = data1.value.Methords;
+
+const ckickCell = (row) => {
+
+};
+// 设置表格列或者其他自定义的option
+data1.value.option = Object.assign(data1.value.option, {
+  selection: false,
+  menu: false,
+  menuWidth: 100,
+  addBtn: false,
+  filterBtn: false,
+  searchShowBtn: false,
+  columnBtn: false,
+  gridBtn: false,
+  editBtn: false,
+  viewBtn: false,
+  delBtn: false,
+  column: [
+    {
+      label: "日期范围",
+      prop: "searchTime",
+      search: true,
+      hide: true,
+      type: "date",
+      format: "YYYY-MM-DD",
+      valueFormat: "YYYY-MM-DD",
+      searchRange: true,
+      startPlaceholder: "开始日期",
+      endPlaceholder: "结束日期",
+    },
+    {
+      label: "订单编码",
+      prop: "orderCode",
+      overHidden: true,
+      search: true,
+      editDisabled: true,
+      hide: true,
+    },
+    {
+      label: "订单名称",
+      prop: "orderName",
+      overHidden: true,
+      search: true,
+      editDisabled: true,
+      hide: true,
+    },
+    {
+      label: "物料编码",
+      prop: "materialCode",
+      overHidden: true,
+      search: true,
+      editDisabled: true,
+      hide: true,
+    },
+    {
+      label: "工单编码",
+      prop: "workOrderCode	",
+      width: 140,
+      overHidden: true,
+      search: true,
+      editDisabled: true,
+      hide: true,
+    },
+    {
+      label: "订单名称",
+      prop: "orderName",
+      search: false,
+    },
+    {
+      label: "订单编码",
+      prop: "orderCode",
+      search: false,
+    },
+    {
+      label: "工单编码",
+      prop: "workOrderCode",
+      search: false,
+    },
+    {
+      label: "工单数量",
+      prop: "planNum",
+      search: false,
+    },
+    {
+      label: "物料编码",
+      prop: "materialCode",
+      search: false,
+    },
+    {
+      label: "物料名称",
+      prop: "materialName",
+      search: false,
+    },
+    {
+      label: "物料规格",
+      prop: "materialModel",
+      search: false,
+    },
+    {
+      label: "报废数量",
+      prop: "count",
+      search: false,
+    },
+    {
+      label: "不合格率",
+      prop: "notGood",
+      search: false,
+    },
+  ],
+});
+
+
+const getCurrentMonthStartAndEndDates = () => {
+  // 获取当前日期
+  let now = new Date();
+
+  // 获取当前月份的第一天
+  let startDate = new Date(now.getFullYear(), now.getMonth(), 1);
+
+  // 获取当前月份的最后一天
+  let endDate = new Date(now.getFullYear(), now.getMonth() + 1, 0);
+
+  // 格式化日期为'YYYY-MM-DD'格式
+  function formatDate(date) {
+    let year = date.getFullYear();
+    let month = String(date.getMonth() + 1).padStart(2, "0");
+    let day = String(date.getDate()).padStart(2, "0");
+    return `${year}-${month}-${day}`;
+  }
+
+  // 返回包含开始和结束日期的数组
+  return [formatDate(startDate), formatDate(endDate)];
+};
+
+//设置搜索条件中的时间范围为默认此月
+const setTime = () => {
+  data1.value.search.searchTime = getCurrentMonthStartAndEndDates();
+};
+
+onMounted(async () => {
+  setTime();
+  dataList();
+});
+</script>
+<style lang="scss" scoped>
+:deep(.avue-crud__left) {
+  width: 100%;
+}
+</style>

src/views/report/statistics/orderError/index.vue

@@ -0,0 +1,118 @@
+<template>
+  <div class="mainContentBox">
+    <avue-crud ref="crudRef1" v-model:search="data1.search" :data="data1.data" :option="data1.option"
+      v-model:page="data1.page" @row-save="createRow" @row-update="updateRow" @row-del="deleteRow"
+      @search-change="searchChange" @search-reset="resetChange" @size-change="dataList" @current-change="dataList"
+      @selection-change="selectionChange" @cell-click="ckickCell">
+    </avue-crud>
+  </div>
+</template>
+<script setup>
+import { ref, getCurrentInstance } from "vue";
+import { useCrud } from "@/hooks/userCrud";
+import { useCommonStoreHook, useDictionaryStore } from "@/store";
+import dictDataUtil from "@/common/configs/dictDataUtil";
+import editSkill from "@/views/base/skill/components/edit-skill.vue";
+import { getEchartData } from "@/api/report";
+import * as echarts from "echarts";
+// 数据字典相关
+const { dicts } = useDictionaryStore();
+const key = ref(false);
+const data1 = ref(
+  useCrud({
+    src: "/api/v1/process/census/abnormalOrder",
+  })
+);
+const { dataList, createRow, updateRow, deleteRow, searchChange, resetChange } =
+  data1.value.Methords;
+
+const { selectionChange, multipleDelete } = data1.value.Methords;
+
+const ckickCell = (row) => {
+  data2.value.search.workOrderCode = row.workOrderCode;
+  data2.value.search.operationCode = row.operationCode
+  data2.value.search.searchTime = data1.value.search.searchTime;
+};
+// 设置表格列或者其他自定义的option
+data1.value.option = Object.assign(data1.value.option, {
+  selection: false,
+  menu: false,
+  menuWidth: 100,
+  addBtn: false,
+  filterBtn: false,
+  searchShowBtn: false,
+  columnBtn: false,
+  gridBtn: false,
+  editBtn: false,
+  viewBtn: false,
+  delBtn: false,
+  column: [
+    {
+      label: "订单编码",
+      prop: "orderCode",
+      overHidden: true,
+      search: true,
+      editDisabled: true,
+    },
+    {
+      label: "订单名称",
+      prop: "orderName",
+      overHidden: true,
+      editDisabled: true,
+    },
+    {
+      label: "物料编码",
+      prop: "materialCode",
+      overHidden: true,
+      search: true,
+      editDisabled: true,
+    },
+    {
+      label: "物料名称",
+      prop: "materialName",
+      search: true,
+    },
+    {
+      label: "物料规格",
+      prop: "materialModel",
+      search: false,
+    },
+    {
+      label: "异常分类",
+      prop: "errors",
+      search: false,
+    },
+  ],
+});
+
+const getCurrentMonthStartAndEndDates = () => {
+  // 获取当前日期
+  let now = new Date();
+
+  // 获取当前月份的第一天
+  let startDate = new Date(now.getFullYear(), now.getMonth(), 1);
+
+  // 获取当前月份的最后一天
+  let endDate = new Date(now.getFullYear(), now.getMonth() + 1, 0);
+
+  // 格式化日期为'YYYY-MM-DD'格式
+  function formatDate(date) {
+    let year = date.getFullYear();
+    let month = String(date.getMonth() + 1).padStart(2, "0");
+    let day = String(date.getDate()).padStart(2, "0");
+    return `${year}-${month}-${day}`;
+  }
+
+  // 返回包含开始和结束日期的数组
+  return [formatDate(startDate), formatDate(endDate)];
+};
+
+onMounted(async () => {
+  dataList();
+});
+</script>
+<style lang="scss" scoped>
+:deep(.avue-crud__left) {
+  width: 100%;
+}
+</style>

src/views/report/statistics/quality/index.vue

@@ -0,0 +1,292 @@
+<template>
+  <div class="mainContentBox">
+    <avue-crud ref="crudRef1" v-model:search="data1.search" :data="data1.data" :option="data1.option"
+      v-model:page="data1.page" @row-save="createRow" @row-update="updateRow" @row-del="deleteRow"
+      @search-change="searchChange" @search-reset="resetChange" @size-change="dataList" @current-change="dataList"
+      @selection-change="selectionChange" @cell-click="ckickCell">
+      <template #menu="{ row, index, type }">
+        <el-button @click="ckickCell(row)" icon="el-icon-view" text type="primary">查看</el-button>
+      </template>
+      <template #menu-right="{}">
+        <el-button class="ml-3" @click="
+          data1.Utils.exportData(
+            '/api/v1/process/census/abnormalQuality/export'
+          )
+          ">
+          <template #icon> <i-ep-download /> </template>导出
+        </el-button>
+      </template>
+    </avue-crud>
+    <el-dialog v-model="editDialog.visible" :title="editDialog.title" width="1200px"
+      @close="editDialog.visible = false">
+      <div class="mainContentBox">
+        <avue-crud ref="crudRef2" v-model:search="data2.search" :data="data2.data" :option="data2.option"
+          v-model:page="data2.page" @row-update="data2.Methords.updateRow" @row-del="data2.Methords.deleteRow"
+          @search-change="data2.Methords.dataList" @search-reset="data2.Methords.resetChange"
+          @size-change="data2.Methords.dataList" @current-change="data2.Methords.dataList"
+          @selection-change="data2.Methords.selectionChange">
+          <template #menu-right="{}">
+            <el-button class="ml-3" @click="
+              data2.Utils.exportData(
+                '/api/v1/process/census/abnormalQualityDetail/export'
+              )
+              ">
+              <template #icon> <i-ep-download /> </template>导出
+            </el-button>
+          </template></avue-crud>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script setup>
+import { ref, getCurrentInstance } from "vue";
+import { useCrud } from "@/hooks/userCrud";
+import { useCommonStoreHook, useDictionaryStore } from "@/store";
+import dictDataUtil from "@/common/configs/dictDataUtil";
+import editSkill from "@/views/base/skill/components/edit-skill.vue";
+import { getEchartData } from "@/api/report";
+import * as echarts from "echarts";
+// 数据字典相关
+const { dicts } = useDictionaryStore();
+const editDialog = ref({ visible: false, title: "质量异常明细" });
+const key = ref(false);
+const data1 = ref(
+  useCrud({
+    src: "/api/v1/process/census/abnormalQuality",
+  })
+);
+const data2 = ref(
+  useCrud({
+    src: "/api/v1/process/census/abnormalQualityDetail",
+  })
+);
+const { dataList, createRow, updateRow, deleteRow, searchChange, resetChange } =
+  data1.value.Methords;
+
+const { selectionChange, multipleDelete } = data1.value.Methords;
+
+const ckickCell = (row) => {
+  data2.value.search.workOrderCode = row.workOrderCode;
+  data2.value.search.operationCode = row.operationCode
+  data2.value.search.searchTime = data1.value.search.searchTime;
+  editDialog.value.visible = true;
+};
+// 设置表格列或者其他自定义的option
+data1.value.option = Object.assign(data1.value.option, {
+  selection: false,
+  menu: true,
+  menuWidth: 100,
+  addBtn: false,
+  filterBtn: false,
+  searchShowBtn: false,
+  columnBtn: false,
+  gridBtn: false,
+  editBtn: false,
+  viewBtn: false,
+  delBtn: false,
+  column: [
+    {
+      label: "日期范围",
+      prop: "searchTime",
+      search: true,
+      hide: true,
+      type: "date",
+      format: "YYYY-MM-DD",
+      valueFormat: "YYYY-MM-DD",
+      searchRange: true,
+      startPlaceholder: "开始日期",
+      endPlaceholder: "结束日期",
+    },
+    {
+      label: "订单编码",
+      prop: "orderCode",
+      overHidden: true,
+      search: true,
+      editDisabled: true,
+      hide: true,
+    },
+    {
+      label: "订单名称",
+      prop: "orderName",
+      overHidden: true,
+      search: true,
+      editDisabled: true,
+      hide: true,
+    },
+    {
+      label: "物料编码",
+      prop: "materialCode",
+      overHidden: true,
+      search: true,
+      editDisabled: true,
+      hide: true,
+    },
+    {
+      label: "工单编码",
+      prop: "workOrderCode	",
+      width: 140,
+      overHidden: true,
+      search: true,
+      editDisabled: true,
+      hide: true,
+    },
+    {
+      label: "订单名称",
+      prop: "orderName",
+      search: false,
+    },
+    {
+      label: "订单编码",
+      prop: "orderCode",
+      search: false,
+    },
+    {
+      label: "工单编码",
+      prop: "workOrderCode",
+      search: false,
+    },
+    {
+      label: "工单数量",
+      prop: "planNum",
+      search: false,
+    },
+    {
+      label: "物料编码",
+      prop: "materialCode",
+      search: false,
+    },
+    {
+      label: "物料名称",
+      prop: "materialName",
+      search: false,
+    },
+    {
+      label: "物料规格",
+      prop: "materialModel",
+      search: false,
+    },
+    {
+      label: "工序编码",
+      prop: "operationCode",
+      search: false,
+    },
+    {
+      label: "工序名称",
+      prop: "operationName",
+      search: false,
+    },
+    {
+      label: "报故数量",
+      prop: "count",
+      search: false,
+    },
+  ],
+});
+data2.value.option = Object.assign(data2.value.option, {
+  selection: false,
+  menu: false,
+  addBtn: false,
+  filterBtn: false,
+  searchShowBtn: false,
+  columnBtn: false,
+  gridBtn: false,
+  editBtn: false,
+  viewBtn: false,
+  delBtn: false,
+  column: [
+    {
+      label: "订单名称",
+      prop: "orderName",
+      search: false,
+    },
+    {
+      label: "订单编码",
+      prop: "orderCode",
+      search: false,
+    },
+    {
+      label: "工单编码",
+      prop: "workOrderCode",
+      search: false,
+    },
+    {
+      label: "物料编码",
+      prop: "materialCode",
+      search: false,
+    },
+    {
+      label: "物料名称",
+      prop: "materialName",
+      search: false,
+    },
+    {
+      label: "物料规格",
+      prop: "materialModel",
+      search: false,
+    },
+    {
+      label: "工序编码",
+      prop: "operationCode",
+      search: false,
+    },
+    {
+      label: "工序名称",
+      prop: "operationName",
+      search: false,
+    },
+
+    {
+      label: "报故内容",
+      prop: "bugNames",
+      search: false,
+    },
+  ],
+});
+
+const getCurrentMonthStartAndEndDates = () => {
+  // 获取当前日期
+  let now = new Date();
+
+  // 获取当前月份的第一天
+  let startDate = new Date(now.getFullYear(), now.getMonth(), 1);
+
+  // 获取当前月份的最后一天
+  let endDate = new Date(now.getFullYear(), now.getMonth() + 1, 0);
+
+  // 格式化日期为'YYYY-MM-DD'格式
+  function formatDate(date) {
+    let year = date.getFullYear();
+    let month = String(date.getMonth() + 1).padStart(2, "0");
+    let day = String(date.getDate()).padStart(2, "0");
+    return `${year}-${month}-${day}`;
+  }
+
+  // 返回包含开始和结束日期的数组
+  return [formatDate(startDate), formatDate(endDate)];
+};
+
+//设置搜索条件中的时间范围为默认此月
+const setTime = () => {
+  data1.value.search.searchTime = getCurrentMonthStartAndEndDates();
+};
+
+onMounted(async () => {
+  setTime();
+  dataList();
+});
+watch(
+  () => editDialog.value.visible,
+  () => {
+    if (editDialog.value.visible == true) {
+      data2.value.Methords.dataList();
+    } else {
+      key.value = !key.value;
+    }
+  }
+);
+</script>
+<style lang="scss" scoped>
+:deep(.avue-crud__left) {
+  width: 100%;
+}
+</style>

src/views/report/workhourinfo/sumhours/index.vue

@@ -158,10 +158,16 @@ data1.value.option = Object.assign(data1.value.option, {
       search: true,
       editDisabled: true,
       hide: true,
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
     },
     {
       label: "操作人员",
       prop: "userName",
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
       search: false,
     },
     {

src/views/storage/check/index.vue

@@ -226,7 +226,7 @@
                     style="max-width: 400px"
                   >
                     <el-form-item label="申请人员" prop="created">
-                      <el-text tag="p">{{ showObj.creator }}</el-text>
+                      <el-text tag="p">{{ getLabelByValue('user_name_list',showObj.creator) }}</el-text>
                     </el-form-item>
                     <el-form-item label="申请时间">
                       <el-text tag="p">{{ showObj.created }}</el-text>
@@ -247,7 +247,7 @@
                     style="max-width: 400px"
                   >
                     <el-form-item label="盘点人员" prop="auditUser">
-                      <el-text tag="p">{{ showObj.checkUser }}</el-text>
+                      <el-text tag="p">{{ getLabelByValue('user_name_list',showObj.checkUser) }}</el-text>
                     </el-form-item>
                     <el-form-item
                       label="审核人员"
@@ -315,7 +315,7 @@
                     style="max-width: 400px"
                   >
                     <el-form-item label="审核人">
-                      <el-text tag="p">{{ showObj.auditUser }}</el-text>
+                      <el-text tag="p">{{ getLabelByValue('user_name_list',showObj.auditUser) }}</el-text>
                     </el-form-item>
                     <el-form-item label="审核结果">
                       <el-text
@@ -365,7 +365,7 @@
   </el-tabs>
 </template>
 <script setup>
-import { useUserStoreHook } from "@/store/index";
+import { useUserStoreHook,useDictionaryStore } from "@/store/index";
 import {
   queryPlanPage,
   deleteCheckPlan,
@@ -379,6 +379,7 @@ import dictDataUtil from "@/common/configs/dictDataUtil";
 import { ref } from "vue";
 const { username } = useUserStoreHook().user;
 // 弹窗对象
+const { dicts,getLabelByValue } = useDictionaryStore();
 const dialog0 = reactive({
   title: "订单选择",
   visible: false,
@@ -582,6 +583,9 @@ option1.value = {
     {
       label: "盘点人员",
       prop: "checkUser",
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
       rules: [
         {
           required: true,
@@ -591,13 +595,6 @@ option1.value = {
       ],
       width: 150,
       overHidden: true,
-      type: "select",
-      dicUrl: import.meta.env.VITE_APP_BASE_API + "/api/v1/sys/user/list",
-      dicMethod: "post",
-      props: {
-        label: "userName", // 下拉菜单显示的字段
-        value: "userName", // 下拉菜单值的字段
-      },
     },
     {
       label: "盘点时间",

src/views/storage/checkResult/index.vue

@@ -18,15 +18,14 @@
 <script setup>
 import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
-import ButtonPermKeys from "@/common/configs/buttonPermission";
-import { useCommonStoreHook } from "@/store";
+import { useCommonStoreHook,useDictionaryStore } from "@/store";
 import dictDataUtil from "@/common/configs/dictDataUtil";
 const { isShowTable, tableType } = toRefs(useCommonStoreHook());
 const test = () => {
   isShowTable.value = true;
   tableType.value = tableType.value == 1 ? 2 : 1;
 };
-
+const { dicts } = useDictionaryStore();
 // 传入一个url，后面不带/
 const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
   useCrud({
@@ -117,6 +116,9 @@ option.value = Object.assign(option.value, {
     {
       label: "盘点人员",
       prop: "checkUser",
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
     },
     {
       label: "盘点时间",

src/views/storage/entry/index.vue

@@ -117,6 +117,9 @@ option.value = Object.assign(option.value, {
   column: [
     {
       label: "操作人",
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
       prop: "creator",
     },
     {

src/views/storage/warningInfo/index.vue

@@ -40,7 +40,7 @@
 <script setup>
 import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
-import { useCommonStoreHook,useUserStoreHook} from "@/store";
+import { useCommonStoreHook,useUserStoreHook,useDictionaryStore} from "@/store";
 const { isShowTable, tableType } = toRefs(useCommonStoreHook());
 const userStore = useUserStoreHook();
 const test = (row) => {
@@ -56,7 +56,7 @@ const test = (row) => {
     });
   });
 };
-
+const { dicts } = useDictionaryStore();
 // 传入一个url，后面不带/
 const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
   useCrud({
@@ -124,6 +124,9 @@ option.value = Object.assign(option.value, {
       label: "处理人",
       prop: "userName",
       search: true,
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
       display: false
     },
     {

src/views/storage/wmsOrder/index.vue

@@ -56,14 +56,14 @@
 <script setup>
 import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
-import { useCommonStoreHook } from "@/store";
+import { useCommonStoreHook,useDictionaryStore } from "@/store";
 import dictDataUtil from "@/common/configs/dictDataUtil";
 const { isShowTable, tableType } = toRefs(useCommonStoreHook());
 const test = () => {
   isShowTable.value = true;
   tableType.value = tableType.value == 1 ? 2 : 1;
 };
-
+const { dicts } = useDictionaryStore();
 // 传入一个url，后面不带/
 const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
   useCrud({
@@ -201,6 +201,9 @@ option.value = Object.assign(option.value, {
     {
       label: "操作人",
       prop: "creator",
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
       search: true,
       display: false
     },

src/views/system/dept/index.vue

@@ -63,7 +63,6 @@
           </template>
         </el-table-column>
         <el-table-column prop="created" align="center" label="创建时间" />
-        <el-table-column prop="creator" align="center" label="创建人员" />
         <el-table-column label="操作" fixed="right" align="left">
           <template #default="scope">
             <el-button

src/views/system/logs/index.vue

@@ -60,9 +60,8 @@
   </el-tabs>
 </template>
 <script setup lang="ts">
-import { checkPerm } from "@/directive/permission";
-import dictDataUtil from "@/common/configs/dictDataUtil";
-import buttonPermission from "@/common/configs/buttonPermission";
+import { useDictionaryStore } from "@/store/modules/dictionary";
+const { dicts } = useDictionaryStore();
 import {
   getLoginLogPage,
   getOperaLogPage,
@@ -71,7 +70,6 @@ import {
   deleteLoginLogs,
   deleteOperaLogs,
 } from "@/api/system/log";
-import { deleteOrders } from "@/api/order";
 
 // 弹窗对象
 const dialog = reactive({
@@ -167,6 +165,9 @@ option.value = {
     {
       label: "操作人员",
       prop: "creator",
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
       search: true,
     },
     {
@@ -223,6 +224,9 @@ optionLogin.value = {
     {
       label: "用户名称",
       prop: "creator",
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
       search: true,
     },
     {

src/views/system/message/index.vue

@@ -96,7 +96,7 @@
                 <el-option
                     v-for="item in userList"
                     :key="item.id"
-                    :label="item.userName"
+                    :label="item.nickName"
                     :value="item.id"
                 />
               </el-select>
@@ -123,7 +123,7 @@ import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
 import Editor from '@/views/system/message/editor/index.vue'
 import {addMessage, updateMessage} from '@/api/system/message'
-import { useCommonStoreHook } from "@/store";
+import { useCommonStoreHook,useDictionaryStore } from "@/store";
 import {getUserList} from "@/api/system/user"
 import {queryDictDataByType} from "@/api/system/dict"
 const { isShowTable, tableType } = toRefs(useCommonStoreHook());
@@ -134,6 +134,7 @@ const message = ref({
   type: "0",
   receiveUsers: []
 });
+const { dicts } = useDictionaryStore();
 const test = () => {
   isShowTable.value = true;
   tableType.value = tableType.value == 1 ? 2 : 1;
@@ -309,6 +310,9 @@ option.value = Object.assign(option.value, {
     {
       label: "创建人",
       prop: "creator",
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
       display: false,
     },
     {

src/views/system/params/index.vue

@@ -32,16 +32,14 @@
 <script setup>
 import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
-import ButtonPermKeys from "@/common/configs/buttonPermission";
 
-import { useCommonStoreHook } from "@/store";
-import dictDataUtil from "@/common/configs/dictDataUtil";
+import { useCommonStoreHook,useDictionaryStore } from "@/store";
 const { isShowTable, tableType } = toRefs(useCommonStoreHook());
 const test = () => {
   isShowTable.value = true;
   tableType.value = tableType.value == 1 ? 2 : 1;
 };
-
+const { dicts } = useDictionaryStore();
 // 传入一个url，后面不带/
 const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
   useCrud({
@@ -50,14 +48,6 @@ const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
 const { dataList, createRow, updateRow, deleteRow, searchChange, resetChange } = Methords; //增删改查
 const { selectionChange, multipleDelete } = Methords; //选中和批量删除事件
 const { checkBtnPerm, downloadTemplate, exportData } = Utils; //按钮权限等工具
-// checkBtnPerm(ButtonPermKeys.PLAN.BTNS.order_add) :permission="permission"
-// const permission = reactive({
-//   delBtn: checkPerm(buttonPermission.PLAN.BTNS.order_del),
-//   addBtn: checkPerm(buttonPermission.PLAN.BTNS.order_add),
-//   editBtn: checkPerm(buttonPermission.PLAN.BTNS.order_edit),
-//   menu: true,
-// });
-
 const crudRef = ref(null); //crudRef.value 获取avue-crud对象
 
 // 设置表格列或者其他自定义的option
@@ -109,6 +99,9 @@ option.value = Object.assign(option.value, {
     {
       label: "创建人",
       prop: "creator",
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
       display: false,
     },
     {

src/views/system/role/index.vue

@@ -278,7 +278,6 @@ onMounted?.(() => {
         </el-table-column>
 
         <el-table-column label="创建时间" align="center" prop="created" />
-        <el-table-column label="创建人" align="center" prop="creator" />
         <el-table-column fixed="right" label="操作" width="220">
           <template #default="scope">
             <el-button