更改username显示

src/components/CommonTable/configs/tableConfig.ts

@@ -121,24 +121,6 @@ export const tableConfig = {
         search: true,
       },
       {
-        label: "车间负责人",
-        prop: "manager",
-        rules: [
-          {
-            required: true,
-            message: "请选择厂区负责人",
-            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: "车间位置",
         prop: "position",
       },
@@ -152,11 +134,6 @@ export const tableConfig = {
         prop: "remark",
       },
       {
-        label: "创建人",
-        prop: "creator",
-        display: false,
-      },
-      {
         label: "创建时间",
         prop: "created",
         display: false,
@@ -180,24 +157,6 @@ export const tableConfig = {
         ],
       },
       {
-        label: "产线负责人",
-        prop: "manager",
-        rules: [
-          {
-            required: true,
-            message: "请选择产线负责人",
-            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: "产线位置",
         prop: "position",
       },
@@ -211,11 +170,6 @@ export const tableConfig = {
         prop: "remark",
       },
       {
-        label: "创建人",
-        prop: "creator",
-        display: false,
-      },
-      {
         label: "创建时间",
         prop: "created",
         display: false,
@@ -288,24 +242,6 @@ export const tableConfig = {
         },
       },
       {
-        label: "工位负责人",
-        prop: "manager",
-        rules: [
-          {
-            required: true,
-            message: "请选择工位负责人",
-            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: "所属产线",
         prop: "productionLineName",
         display: false,
@@ -339,11 +275,6 @@ export const tableConfig = {
         span: 24,
       },
       {
-        label: "创建人",
-        prop: "creator",
-        display: false,
-      },
-      {
         label: "创建时间",
         prop: "created",
         display: false,
@@ -390,10 +321,6 @@ export const tableConfig = {
         },
       },
       {
-        label: "负责人",
-        prop: "head",
-      },
-      {
         label: "设备位置",
         prop: "devicePosition",
       },
@@ -825,9 +752,13 @@ export const tableConfig = {
         search: true,
       },
       {
-        label: "用户id",
+        label: "id",
         prop: "id",
-        /*display:false,*/
+        hide : true,
+      },
+      {
+        label: "用户姓名",
+        prop: "nickName",
       },
       {
         label: "用户名",
@@ -899,12 +830,6 @@ export const tableConfig = {
         overHidden: true,
       },
       {
-        label: "报故人",
-        prop: "creator",
-        width: 100,
-      },
-
-      {
         label: "产品编码",
         prop: "materialCode",
         width: 120,

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 = ((item,type)=>{
+      const list = dicts.value[type]
+      if(list){
+        return list.find(option => option.dictValue === item).dictLabel;
+      }else{
+        return "";
+      }
+    });
     return {
       types,
       dicts,
+      getLabelByValue
     };
   },
   {

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

@@ -443,6 +443,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/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,getLabelByValue } = 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对象
 
@@ -136,6 +128,9 @@ option.value = Object.assign(option.value, {
       label: "负责人",
       prop: "manager",
       span: 24,
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
       rules: [
         {
           required: true,
@@ -169,6 +164,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/base/modeling/station/index.vue

@@ -75,16 +75,16 @@
 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 = () => {
   isShowTable.value = true;
   tableType.value = tableType.value == 1 ? 2 : 1;
 };
+const { dicts,getLabelByValue } = useDictionaryStore();
 
 // 传入一个url，后面不带/
 const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
@@ -95,13 +95,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,
-// });
 function rowSave(form, done, loading) {
   const parts = form.stationIp.split(".");
   if (parts.length !== 4) {
@@ -269,6 +262,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,
@@ -339,6 +335,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,getLabelByValue } = useDictionaryStore();
   const test = () => {
     isShowTable.value = true;
     tableType.value = tableType.value == 1 ? 2 : 1;
@@ -144,6 +143,9 @@
       {
         label: "创建人",
         prop: "creator",
+        type: "select",
+        dicData: dicts.user_name_list,
+        props: {"label": "dictLabel","value":"dictValue"},
         display:false
       },
       {

src/views/device/allocate/index.vue

@@ -81,7 +81,7 @@
             <p>设备编号： {{ maintenanceInfo.deviceNo }}</p>
             <p>设备名称： {{ maintenanceInfo.deviceName }}</p>
             <p>申请部门： {{ maintenanceInfo.creator }}</p>
-            <p>申请人员： {{ maintenanceInfo.creator }}</p>
+            <p>申请人员： {{ getLabelByValue(maintenanceInfo.creator,'user_name_list') }}</p>
             <p>调拨周期： {{ maintenanceInfo.allocateCycle }}天</p>
             <p>调拨目标位置： {{ maintenanceInfo.deviceToPosition }}</p>
             <p>申请时间： {{ maintenanceInfo.created }}</p>
@@ -101,7 +101,7 @@
         >
           <el-card v-if="viewPage">
             <h4>调拨审批</h4>
-            <p>审批人员： {{ maintenanceInfo.auditUser }}</p>
+            <p>审批人员： {{ getLabelByValue(maintenanceInfo.auditUser,'user_name_list') }}</p>
             <p>
               审批结果：
               {{
@@ -137,7 +137,7 @@
                   <el-option
                       v-for="item in userList"
                       :key="item.userName"
-                      :label="item.userName"
+                      :label="item.nickName"
                       :value="item.userName"
                   />
                 </el-select>
@@ -174,13 +174,14 @@ import ButtonPermKeys from "@/common/configs/buttonPermission";
 import { checkPerm } from "@/directive/permission";
 import { getUserList } from "@/api/system/user";
 import { allocateAudit, allocateExport } from "@/api/device/index";
-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,getLabelByValue } = useDictionaryStore();
 const permission = reactive({
   delBtn: checkPerm(ButtonPermKeys.DEVICE.BTNS.allocate_del),
   addBtn: checkPerm(ButtonPermKeys.DEVICE.BTNS.allocate_add),
@@ -441,6 +442,9 @@ option.value = Object.assign(option.value, {
       prop: "applyUser",
       width: 130,
       overHidden: true,
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
       display: false,
     },
     {

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,getLabelByValue } = 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/metering/index.vue

@@ -81,7 +81,7 @@
                   <el-option
                       v-for="item in userList"
                       :key="item.userName"
-                      :label="item.userName"
+                      :label="item.nickName"
                       :value="item.userName"
                   />
                 </el-select>
@@ -132,10 +132,9 @@
 <script setup>
 import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
-import ButtonPermKeys from "@/common/configs/buttonPermission";
 import {getUserList} from "@/api/system/user"
 import {maintenanceUpdate,meteringUpdate} from "@/api/device/index";
-import { useCommonStoreHook } from "@/store";
+import { useCommonStoreHook ,useDictionaryStore} from "@/store";
 import dictDataUtil from "@/common/configs/dictDataUtil";
 import RecordPage from "./components/metering-record.vue";
 const { isShowTable, tableType } = toRefs(useCommonStoreHook());
@@ -143,6 +142,7 @@ const test = () => {
   isShowTable.value = true;
   tableType.value = tableType.value == 1 ? 2 : 1;
 };
+const { dicts,getLabelByValue } = useDictionaryStore();
 const disabledDate = (time) =>{
   return time.getTime() < Date.now(); // 8.64e7 毫秒数代表一天
 }
@@ -301,6 +301,9 @@ option.value = Object.assign(option.value, {
     {
       label: "负责人",
       prop: "head",
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
       width: 160,
       overHidden: true,
     },

src/views/device/repair/index.vue

@@ -64,7 +64,7 @@
             <h4>设备报故</h4>
             <p>设备编号： {{ maintenanceInfo.deviceNo }}</p>
             <p>设备名称： {{ maintenanceInfo.deviceName }}</p>
-            <p>报故人员： {{ maintenanceInfo.creator }}</p>
+            <p>报故人员： {{ getLabelByValue(maintenanceInfo.creator,'user_name_list') }}</p>
             <p>故障描述： {{ maintenanceInfo.bugRemark }}</p>
             <p>报故时间： {{ maintenanceInfo.created }}</p>
           </el-card>
@@ -76,7 +76,7 @@
         >
           <el-card v-if="viewPage">
             <h4>设备维修</h4>
-            <p>维修人员： {{ maintenanceInfo.handleUser }}</p>
+            <p>维修人员： {{ getLabelByValue(maintenanceInfo.handleUser,'user_name_list') }}</p>
             <p>维修内容： {{ maintenanceInfo.handleContent }}</p>
             <p>
               处理结果：
@@ -110,7 +110,7 @@
                   <el-option
                     v-for="item in userList"
                     :key="item.userName"
-                    :label="item.userName"
+                    :label="item.nickName"
                     :value="item.userName"
                   />
                 </el-select>
@@ -160,7 +160,7 @@
         >
           <el-card v-if="viewPage">
             <h4>设备审批</h4>
-            <p>审批人员： {{ maintenanceInfo.auditUser }}</p>
+            <p>审批人员： {{ getLabelByValue(maintenanceInfo.auditUser,'user_name_list') }}</p>
             <p>
               审批结果：
               {{
@@ -194,7 +194,7 @@
                   <el-option
                     v-for="item in userList"
                     :key="item.userName"
-                    :label="item.userName"
+                    :label="item.nickName"
                     :value="item.userName"
                   />
                 </el-select>
@@ -234,9 +234,9 @@ 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 { useCommonStoreHook ,useDictionaryStore} from "@/store";
 import dictDataUtil from "@/common/configs/dictDataUtil";
-
+const { dicts,getLabelByValue } = useDictionaryStore();
 const {isShowTable, tableType} = toRefs(useCommonStoreHook());
 const test = () => {
   isShowTable.value = true;
@@ -419,6 +419,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/device/screwdriver/index.vue

@@ -112,6 +112,7 @@
 <script setup>
 import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
+import { useCommonStoreHook ,useDictionaryStore} from "@/store";
 import {
   addScrewdriverTask,
   updateScrewdriverTask,
@@ -124,6 +125,7 @@ const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
   useCrud({
     src: "/api/v1/screwdriverTask",
   });
+const { dicts,getLabelByValue } = useDictionaryStore();
 const { dataList, createRow, updateRow, deleteRow, searchChange, resetChange } =
   Methords; //增删改查
 const { selectionChange, multipleDelete } = Methords;
@@ -392,6 +394,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/plan/order/index.vue

@@ -271,13 +271,13 @@ import {
   scanImport,
   getScanCode,
   getTestCode,
+  zipOrder
 } from "@/api/order";
 import { ref } from "vue";
-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";
-
+import {useDictionaryStore} from "@/store";
+const { dicts } = useDictionaryStore();
 const { Utils } = useCrud({
   src: "/api/v1/plan/order",
 });
@@ -359,8 +359,6 @@ option.value = {
   searchIcon: true,
   editBtn: false,
   delBtn: false,
-  searchMenuSpan: 8,
-  labelWidth: 100,
   align: "center",
   menuAlign: "center",
   search: true,
@@ -691,6 +689,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

@@ -187,10 +187,10 @@
                 style="width: 240px"
               >
                 <el-option
-                  v-for="item in userList"
-                  :key="item.userName"
-                  :label="item.nickName"
-                  :value="item.userName"
+                    v-for="item in dicts.user_name_list"
+                    :key="item.dictValue"
+                    :label="item.dictLabel"
+                    :value="item.dictValue"
                 />
               </el-select>
             </el-form-item>
@@ -268,10 +268,10 @@
             <el-form-item label="负责人" prop="manager">
               <el-select v-model="form.manager" placeholder="负责人" filterable>
                 <el-option
-                  v-for="item in userList"
-                  :key="item.userName"
-                  :label="item.userName"
-                  :value="item.userName"
+                  v-for="item in dicts.user_name_list"
+                  :key="item.dictValue"
+                  :label="item.dictLabel"
+                  :value="item.dictValue"
                 />
               </el-select>
             </el-form-item>
@@ -284,10 +284,10 @@
                 filterable
               >
                 <el-option
-                  v-for="item in userList"
-                  :key="item.userName"
-                  :label="item.userName"
-                  :value="item.userName"
+                    v-for="item in dicts.user_name_list"
+                    :key="item.dictValue"
+                    :label="item.dictLabel"
+                    :value="item.dictValue"
                 />
               </el-select>
             </el-form-item>
@@ -342,12 +342,13 @@ import {
   batchAuditPrepare
 } from "@/api/order";
 import { queryChildrenInfo } from "@/api/process";
-import { useCommonStoreHook, useUserStore } from "@/store";
+import { useCommonStoreHook, useUserStore,useDictionaryStore } from "@/store";
 import { queryDictDataByType } from "@/api/system/dict";
 import { getUserList } from "@/api/system/user";
 import { ElMessage } from "element-plus";
 const { isShowTable, tableType } = toRefs(useCommonStoreHook());
 const router = useRouter();
+const { dicts } = useDictionaryStore();
 const test = () => {
   isShowTable.value = true;
   tableType.value = tableType.value == 1 ? 2 : 1;
@@ -718,9 +719,9 @@ option.value = Object.assign(option.value, {
   ],
 });
 const queryUserList = () => {
-  getUserList({}).then((data) => {
+  /*getUserList({}).then((data) => {
     userList.value = data.data;
-  });
+  });*/
 };
 const delRow = (index) => {
   dataTable.value.splice(index, 1);
@@ -773,6 +774,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

@@ -163,11 +163,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({
@@ -330,7 +330,10 @@ option.value = Object.assign(option.value, {
     },
     {
       label: "创建人",
-      width: 200,
+      width: 90,
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
       prop: "creator",
       display: false,
     },

src/views/plan/requisition/index.vue

@@ -212,17 +212,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(form.applyUser,'user_name_list') }}</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(form.auditUser,'user_name_list') }} </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(form.approveUser,'user_name_list') }}</el-text></el-col
               >
             </el-row>
           </div>
@@ -248,7 +248,7 @@
                       <el-text
                         tag="p"
                         v-if="dialogType === 1 || form.state > 0"
-                        >{{ form.applyUser }}</el-text
+                        >{{ getLabelByValue(form.applyUser,'user_name_list') }}</el-text
                       >
                       <el-select
                         v-else
@@ -326,7 +326,7 @@
                     style="max-width: 400px"
                   >
                     <el-form-item label="审核人员" prop="auditUser">
-                      <el-text tag="p">{{ form.auditUser }}</el-text>
+                      <el-text tag="p">{{ getLabelByValue(form.auditUser,'user_name_list') }}</el-text>
                     </el-form-item>
                     <el-form-item label="处理结果">
                       <el-text
@@ -450,7 +450,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(form.approve.user,'user_name_list') }}</el-text>
                     </el-form-item>
                     <el-form-item label="审批结果">
                       <el-text
@@ -499,10 +499,11 @@
 </template>
 
 <script setup>
-import { useUserStoreHook } from "@/store/index";
+import { useCommonStoreHook,useUserStoreHook,useDictionaryStore } from "@/store";
 import { ref, getCurrentInstance } from "vue";
 import { html2CanvasPrint } from "@/utils/common";
 import { useCrud } from "@/hooks/userCrud";
+const { dicts,getLabelByValue } = useDictionaryStore();
 import dictDataUtil from "@/common/configs/dictDataUtil";
 import {
   queryApplyInfoDetails,
@@ -511,7 +512,6 @@ import {
   auditApplyInfoDetails,
 } from "@/api/order";
 import { getUserList } from "@/api/system/user";
-import { useCommonStoreHook } from "@/store";
 import ExportInfo from "./exportInfo.vue";
 const { isShowTable, tableType } = toRefs(useCommonStoreHook());
 const test = () => {
@@ -761,12 +761,18 @@ option.value = Object.assign(option.value, {
       prop: "applyUser",
       width: 150,
       overHidden: true,
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
       search: true,
     },
     {
       label: "审核人员",
       prop: "auditUser",
       width: 150,
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
       overHidden: true,
     },
     /* {
@@ -779,6 +785,9 @@ option.value = Object.assign(option.value, {
       label: "审批人员",
       width: 150,
       overHidden: true,
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
       prop: "approveUser",
     },
     {

src/views/plan/returnMaterial/index.vue

@@ -114,8 +114,9 @@ import {
   del,
   sendWms,
 } from "@/api/returnMaterial";
-import { useCommonStoreHook } from "@/store";
+import { useCommonStoreHook ,useDictionaryStore} from "@/store";
 import { ElMessage } from "element-plus";
+const { dicts,getLabelByValue } = useDictionaryStore();
 const { isShowTable, tableType } = toRefs(useCommonStoreHook());
 const test = () => {
   isShowTable.value = true;
@@ -294,6 +295,9 @@ option.value = Object.assign(option.value, {
       label: "创建人",
       prop: "creator",
       display: false,
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
       overHidden: true,
     },
   ],

src/views/plan/shortage/index.vue

@@ -74,7 +74,6 @@
 <script setup>
 import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
-import ButtonPermKeys from "@/common/configs/buttonPermission";
 import {
   useCommonStoreHook,
   useDictionaryStore,
@@ -219,6 +218,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

@@ -296,7 +296,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";
@@ -305,6 +305,7 @@ import { checkPerm } from "@/directive/permission";
 import { queryDictDataByType } from "@/api/system/dict";
 import {ElMessage, ElMessageBox} from "element-plus";
 import request from "../../../utils/request.js";
+const { dicts } = useDictionaryStore();
 const { isShowTable, tableType } = toRefs(useCommonStoreHook());
 
 const tableRowClassName = ({ row, rowIndex }) => {
@@ -322,7 +323,6 @@ const test = () => {
   isShowTable.value = true;
   tableType.value = tableType.value == 1 ? 2 : 1;
 };
-const uploadUrl = import.meta.env.VITE_APP_BASE_API + "/api/v1/base/importSeqs"
 const processRouteType = ref("");
 const permission = reactive({
   delBtn: checkPerm(buttonPermission.PLAN.BTNS.work_order_del),
@@ -831,9 +831,13 @@ option.value = Object.assign(option.value, {
     },
     {
       label: "创建人",
-      width: 90,
-      display: false,
       prop: "creator",
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
+      display: false,
+      width: 80,
+      overHidden: true,
     },
     {
       label: "数据包地址",
@@ -846,6 +850,7 @@ option.value = Object.assign(option.value, {
       label: '导入流转卡号',
       type: 'upload', // 使用upload类型
       prop: "file",
+      hide: true,
       listType: "text",
       showFileList: true,
       editDisplay: false,

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

@@ -81,6 +81,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(faultDetails1.creator,'user_name_list') }}
     </div>
     <div class="title-fault" style="margin-top: 10px">
       报故工位:&nbsp;&nbsp;{{faultDetails1.stationName}}
@@ -74,13 +74,12 @@
 <script setup>
   import { ref, getCurrentInstance } from "vue";
   import { useCrud } from "@/hooks/userCrud";
-  import ButtonPermKeys from "@/common/configs/buttonPermission";
   import { useCommonStoreHook, useDictionaryStore } from "@/store";
   const { isShowTable, tableType } = toRefs(useCommonStoreHook());
   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/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/outsource/index.vue

@@ -160,7 +160,7 @@
         <el-row v-if="form.state !== '0'">
           <el-col :lg="8" :xs="24">
             <el-form-item label="审核人">
-              <el-text>{{ form.auditUser }}</el-text>
+              <el-text>{{ getLabelByValue(form.auditUser,'user_name_list') }}</el-text>
             </el-form-item>
           </el-col>
           <el-col :lg="8" :xs="24">
@@ -209,7 +209,6 @@
 import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
 import { checkPerm } from "@/directive/permission";
-import ButtonPermKeys from "@/common/configs/buttonPermission";
 const loading=ref(false);
 import {
   queryOutSourceDetails,
@@ -227,13 +226,14 @@ const testFiles = () => {
   tBom.value.id=rowId.value;
   console.log(tBom.value);
 };
-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,getLabelByValue } = useDictionaryStore();
 const radio = ref(0);
 // 传入一个url，后面不带/
 const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
@@ -382,6 +382,9 @@ option.value = Object.assign(option.value, {
     {
       label: "申请人",
       width: 120,
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
       overHidden: true,
       prop: "creator",
     },
@@ -394,6 +397,9 @@ option.value = Object.assign(option.value, {
     {
       label: "审核人",
       width: 120,
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
       overHidden: true,
       prop: "auditUser",
     },
@@ -413,6 +419,9 @@ option.value = Object.assign(option.value, {
     {
       label: "接收人",
       width: 120,
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
       overHidden: true,
       prop: "receiveUser",
     },

src/views/quality/tdm/index.vue

@@ -128,9 +128,8 @@ import Boms from "./boms.vue";
 import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
 import { checkPerm } from "@/directive/permission";
-import ButtonPermKeys from "@/common/configs/buttonPermission";
 import { queryOutSourceDetails, updateOutSourceApply } from "@/api/process";
-import { useCommonStoreHook } from "@/store";
+import { useCommonStoreHook ,useDictionaryStore} from "@/store";
 import dictDataUtil from "@/common/configs/dictDataUtil";
 const { isShowTable, tableType } = toRefs(useCommonStoreHook());
 const test = () => {
@@ -143,6 +142,7 @@ const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
   useCrud({
     src: "/api/v1/process/tdmOrder",
   });
+const { dicts,getLabelByValue } = useDictionaryStore();
 const { dataList, createRow, updateRow, deleteRow, searchChange, resetChange } =
   Methords; //增删改查
 const { selectionChange, multipleDelete } = Methords; //选中和批量删除事件
@@ -241,6 +241,9 @@ option.value = Object.assign(option.value, {
       label: "申请人",
       width: 120,
       overHidden: true,
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
       prop: "creator",
     },
     {
@@ -252,6 +255,9 @@ option.value = Object.assign(option.value, {
     {
       label: "审核人",
       width: 120,
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
       overHidden: true,
       prop: "auditUser",
     },
@@ -264,6 +270,9 @@ option.value = Object.assign(option.value, {
     {
       label: "接收人",
       width: 120,
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
       overHidden: true,
       prop: "receiveUser",
     },

src/views/quality/unqualified/columns.ts

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

src/views/quality/unqualified/index.vue

@@ -87,7 +87,6 @@
 <script setup>
   import { ref, getCurrentInstance } from "vue";
   import { useCrud } from "@/hooks/userCrud";
-  import ButtonPermKeys from "@/common/configs/buttonPermission";
   import { columns } from "./columns";
   import { useCommonStoreHook, useDictionaryStore } from "@/store";
   import FaultDetail from "@/views/quality/faultHandle/components/fault-detail.vue"
@@ -118,10 +117,6 @@
 
     dialog1.value.visible=true;
   }
-  const faultThaw=(row)=>{
-    faultEs.value.id=row.id;
-    dialog2.value.visible=true;
-  }
   function useScanCode() {
     const scanCodeArray = ref([]);
 
@@ -134,14 +129,6 @@
   }
 
   const { scanCodeArray, handleScanCode } = useScanCode();
-  const faultExamine =(row)=>{
-    faultExa.value.id=row.id;
-    dialog3.value.visible=true;
-  }
-  const closeFault=()=>{
-    dialog3.value.visible=false;
-    dataList();
-  }
   // 传入一个url，后面不带/
   const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
     useCrud({
@@ -151,13 +138,6 @@
     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对象
   const router = useRouter();
@@ -172,10 +152,6 @@
     dataList();
   });
 
-  const searchChangeState=()=>{
-    dataList();
-  }
-
 
 
   // 设置表格列或者其他自定义的option

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

@@ -92,10 +92,6 @@
 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: "订单详情" });
@@ -156,12 +152,18 @@ data1.value.option = Object.assign(data1.value.option, {
       prop: "userName",
       overHidden: true,
       search: true,
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
       editDisabled: true,
       hide: true,
     },
     {
       label: "操作人员",
       prop: "userName",
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
       search: false,
     },
     {
@@ -188,9 +190,6 @@ data1.value.option = Object.assign(data1.value.option, {
 });
 data2.value.option = Object.assign(data2.value.option, {
   selection: false,
-  addBtn: false,
-  filterBtn: false,
-  searchShowBtn: false,
   menu: false,
   addBtn: false,
   filterBtn: false,

src/views/storage/alarm/index.vue

@@ -40,15 +40,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,getLabelByValue } = useDictionaryStore();
 // 传入一个url，后面不带/
 const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
   useCrud({
@@ -216,6 +215,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/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(showObj.creator,'user_name_list') }}</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(showObj.checkUser,'user_name_list') }} </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(showObj.auditUser,'user_name_list') }}</el-text>
                     </el-form-item>
                     <el-form-item label="审核结果">
                       <el-text
@@ -377,6 +377,8 @@ import {
 import { getUserList } from "@/api/system/user";
 import dictDataUtil from "@/common/configs/dictDataUtil";
 import { ref } from "vue";
+import { useDictionaryStore} from "@/store";
+const { dicts,getLabelByValue } = useDictionaryStore();
 const { username } = useUserStoreHook().user;
 // 弹窗对象
 const dialog0 = reactive({
@@ -592,12 +594,8 @@ 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", // 下拉菜单值的字段
-      },
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
     },
     {
       label: "盘点时间",
@@ -611,6 +609,9 @@ option1.value = {
       width: 120,
       overHidden: true,
       prop: "creator",
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
       display: false,
     },
     {
@@ -719,12 +720,8 @@ option2.value = {
       ],
       overHidden: true,
       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: "盘点时间",
@@ -736,6 +733,9 @@ option2.value = {
       label: "创建人",
       overHidden: true,
       prop: "creator",
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
       display: false,
     },
     {
@@ -841,11 +841,8 @@ option3.value = {
       width: 150,
       overHidden: true,
       type: "select",
-      dicData: userList,
-      props: {
-        label: "userName", // 下拉菜单显示的字段
-        value: "userName", // 下拉菜单值的字段
-      },
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
     },
     {
       label: "盘点时间",
@@ -859,6 +856,9 @@ option3.value = {
       width: 150,
       overHidden: true,
       prop: "creator",
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
       display: false,
     },
     {

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,getLabelByValue } = 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/task/index.vue

@@ -60,10 +60,8 @@
 <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 openDialog = (type,taskId) => {
   if(type == 0){
@@ -73,6 +71,7 @@ const openDialog = (type,taskId) => {
     dialog2.visible = true;
   }
 };
+const { dicts,getLabelByValue } = useDictionaryStore();
 const clickTaskId = ref(null)
 const dialog1 = reactive({
   title: "出库选择",
@@ -127,6 +126,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/storage/vehicle/index.vue

@@ -69,13 +69,14 @@
 import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
 import { html2CanvasPrint } from "@/utils/common";
-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,getLabelByValue } = useDictionaryStore();
 const toPrintRef = ref(null);
 const dialog = reactive({
   title: "二维码打印",
@@ -210,6 +211,9 @@ option.value = Object.assign(option.value, {
     },
     {
       label: "创建人",
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
       prop: "creator",
       display: false
     },

src/views/storage/warningInfo/index.vue

@@ -40,8 +40,9 @@
 <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 { dicts,getLabelByValue } = useDictionaryStore();
 const userStore = useUserStoreHook();
 const test = (row) => {
   ElMessageBox.confirm("你确定要处理当前消息吗", "提示", {
@@ -124,6 +125,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/warningRole/index.vue

@@ -90,7 +90,7 @@ option.value = Object.assign(option.value, {
       multiple: true,
       dicData: userList,
       props: {
-        label: "userName",
+        label: "nickName",
         value: "userName",
       },
     },
@@ -110,6 +110,9 @@ const option1 = ref({
     {
       label: "用户名称",
       prop: "userName",
+      type: "select",
+      dicData: userList,
+      props: {"label": "nickName","value":"userName"},
       overHidden: true,
     },
   ],

src/views/storage/wmsOrder/index.vue

@@ -21,16 +21,15 @@
 <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,getLabelByValue } = useDictionaryStore();
 // 传入一个url，后面不带/
 const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
   useCrud({
@@ -157,6 +156,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/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,7 @@
   </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 { useCommonStoreHook ,useDictionaryStore} from "@/store";
 import {
   getLoginLogPage,
   getOperaLogPage,
@@ -71,8 +69,7 @@ import {
   deleteLoginLogs,
   deleteOperaLogs,
 } from "@/api/system/log";
-import { deleteOrders } from "@/api/order";
-
+const { dicts,getLabelByValue } = useDictionaryStore();
 // 弹窗对象
 const dialog = reactive({
   visible: false,
@@ -167,6 +164,9 @@ option.value = {
     {
       label: "操作人员",
       prop: "creator",
+      type: "select",
+      dicData: dicts.user_name_list,
+      props: {"label": "dictLabel","value":"dictValue"},
       search: true,
     },
     {
@@ -223,6 +223,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,getLabelByValue } = 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,getLabelByValue } = useDictionaryStore();
 // 传入一个url，后面不带/
 const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
   useCrud({
@@ -50,13 +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对象
 
@@ -109,6 +100,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

@@ -8,12 +8,12 @@ import {
   updateRoleMenus,
 } from "@/api/system/role";
 import { getMenuOptions } from "@/api/system/menu";
-
+import { useDictionaryStore} from "@/store";
 defineOptions({
   name: "Role",
   inheritAttrs: false,
 });
-
+const { dicts,getLabelByValue } = useDictionaryStore();
 const queryFormRef = ref(ElForm);
 const roleFormRef = ref(ElForm);
 const menuRef = ref(ElTree);
@@ -278,7 +278,11 @@ onMounted?.(() => {
         </el-table-column>
 
         <el-table-column label="创建时间" align="center" prop="created" />
-        <el-table-column label="创建人" align="center" prop="creator" />
+        <el-table-column label="创建人" align="center" prop="creator">
+          <template #default="scope">
+            {{ getLabelByValue(scope.row.creator,'user_name_list') }}
+          </template>
+        </el-table-column>
         <el-table-column fixed="right" label="操作" width="220">
           <template #default="scope">
             <el-button