Explorar o código

更改username显示

qinhb hai 1 día
pai
achega
a8487da881

+ 1 - 1
src/store/modules/dictionary.ts

@@ -18,9 +18,9 @@ export const useDictionaryStore = defineStore("dictionaryStore", () => {
     "station_task_state",
     "device_type",
     "out_time_reason",
+    "user_name_list"
   ];
   const dicts = ref<{ [key: string]: any[] }>({});
-
   // 所有的用户列表
   const allUsers = ref<any[]>([]);
 

+ 1 - 1
src/views/pro-operation/appoint-out/applyFor.vue

@@ -87,7 +87,7 @@
             <el-option
               v-for="item in dictStroe.allUsers"
               :key="item.id"
-              :label="item.userName"
+              :label="item.nickName"
               :value="item.userName"
             />
           </el-select>

+ 4 - 2
src/views/pro-operation/inspect/index.vue

@@ -18,7 +18,7 @@
     </div>
     <div v-else class="checkForm">
       <div v-if="!editStatus" class="headerName">
-        <div class="titleText">当前检验人:{{ checkName }}</div>
+        <div class="titleText">当前检验人:{{ showName }}</div>
         <div
           class="titleText"
           style="margin-right: 15%; display: flex; align-items: center"
@@ -116,7 +116,7 @@
         />
       </div>
       <div v-if="editStatus" class="headerName">
-        <div class="titleText">当前检验人:{{ checkName }}</div>
+        <div class="titleText">当前检验人:{{ showName }}</div>
         <div
           class="titleText"
           style="margin-right: 15%; display: flex; align-items: center"
@@ -164,6 +164,7 @@ const formRef = ref(null);
 const formData = ref({});
 provide("formData", formData);
 const checkName = ref(null);
+const showName = ref(null)
 const checkType = ref("first_check");
 const editStatus = ref(false);
 const editCheck = async (row) => {
@@ -344,6 +345,7 @@ const checkUserVal = async () => {
     ElMessage.success("记录成功!请开展检验操作");
     inspectStore.checkName = data.userName;
     checkName.value = data.userName;
+    showName.value = data.nickName
   } else {
     ElMessage.error(msg);
   }

+ 1 - 1
src/views/pro-operation/report-break/index.vue

@@ -151,7 +151,7 @@
                     <el-option
                       v-for="item in dictStroe.allUsers"
                       :key="item.id"
-                      :label="item.userName"
+                      :label="item.nickName"
                       :value="item.userName"
                     />
                   </el-select>

+ 1 - 1
src/views/pro-operation/report-work/index.vue

@@ -55,7 +55,7 @@
                     <el-option
                       v-for="item in dictStroe.allUsers"
                       :key="item.id"
-                      :label="item.userName"
+                      :label="item.nickName"
                       :value="item.userName"
                     />
                   </el-select>

+ 9 - 6
src/views/traceability/components/fault.vue

@@ -3,16 +3,20 @@
     <el-table :data="tableData" id="tableStyle" :height="tableHeight" border>
       <el-table-column prop="operationName" label="冻结状态">
         <template #default="scope">
-          {{ dictS.getLableByValue("escalation_fault_state", scope.row.state) }}
+          {{ getLableByValue("escalation_fault_state", scope.row.state) }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="creator" label="报故人">
+        <template #default="scope">
+          {{ getLableByValue('user_name_list',scope.row.creator) }}
         </template>
       </el-table-column>
-      <el-table-column prop="creator" label="报故人" />
       <el-table-column prop="stationName" label="报故工位" />
       <el-table-column prop="created" label="报故时间" />
       <el-table-column prop="disposalMeasures" label="处理结果">
         <template #default="scope">
           {{
-            dictS.getLableByValue(
+            getLableByValue(
               "disposal_measures_type",
               scope.row.disposalMeasures
             )
@@ -37,10 +41,9 @@
 </template>
 
 <script lang="ts" setup>
-import { useProcessStore } from "@/store";
+import { useProcessStore ,useDictionaryStore} from "@/store";
 import { escalationRecordInfo } from "@/api/process/traceability";
-import { useDictionaryStore } from "@/store";
-const dictS = useDictionaryStore();
+const {dictS , getLableByValue} = useDictionaryStore();
 const store = useProcessStore();
 const page = ref(1);
 const limit = ref(10);

+ 7 - 2
src/views/traceability/components/traceability.vue

@@ -6,7 +6,11 @@
       <el-table-column prop="currentState" label="状态" />
       <el-table-column prop="realStartWhen" label="开始时间" />
       <el-table-column prop="realEndWhen" label="结束时间" />
-      <el-table-column prop="creator" label="操作人" />
+      <el-table-column prop="creator" label="操作人">
+        <template #default="scope">
+          {{ getLableByValue('user_name_list',scope.row.creator) }}
+        </template>
+      </el-table-column>
       <el-table-column prop="standardWorktime" label="工时" />
       <el-table-column prop="operationSort" label="工步" />
       <template #empty>
@@ -26,9 +30,10 @@
 </template>
 
 <script lang="ts" setup>
-import { useProcessStore } from "@/store";
+import { useProcessStore,useDictionaryStore } from "@/store";
 import { getInfo } from "@/api/process/traceability";
 const store = useProcessStore();
+const{ getLableByValue } = useDictionaryStore();
 const page = ref(1);
 const limit = ref(10);
 const total = ref(10);