From 820a66af0719317376c552431e4a4fbeaa30df81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E9=9B=AA?= <1617763071@qq.com>
Date: Thu, 26 Mar 2026 16:49:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E7=AE=A1=E7=90=86=E6=A3=80?=
 =?UTF-8?q?=E9=AA=8C=E9=A1=B9=E7=9B=AE=E7=BB=B4=E6=8A=A4=20=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=EF=BC=9A=E7=B1=BB=E5=9E=8B=E4=B8=8B=E6=8B=89=E6=A1=86?=
 =?UTF-8?q?=E5=8F=B3=E4=BE=A7=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E3=80=81=E7=BC=96=E8=BE=91=EF=BC=9A=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E3=80=81=E9=A2=9D=E5=AE=9A=E5=B7=A5=E6=97=B6=E9=9D=9E?=
 =?UTF-8?q?=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/basicData/calculationFormula.js       | 13 +++-
 .../calculationFormula/tankDosing.vue         | 45 +++++++++++-
 .../calculationFormula/theoreticalValue.vue   | 46 ++++++++++--
 src/views/exemption/index.vue                 |  4 +-
 .../components/trialItem.vue                  | 70 +++++++++++++------
 5 files changed, 146 insertions(+), 32 deletions(-)

diff --git a/src/api/basicData/calculationFormula.js b/src/api/basicData/calculationFormula.js
index 2897b21..851bcd4 100644
--- a/src/api/basicData/calculationFormula.js
+++ b/src/api/basicData/calculationFormula.js
@@ -39,4 +39,15 @@ export const getSelectFormula = (params) =>
     url: '/api/blade-desk/QA/LiquidTank/listForSelectDistinct',
     method: 'get',
     params
-  })
\ No newline at end of file
+  })
+export const userListpage = (current, size, params) => {
+  return request({
+    url: '/blade-system/user/userListByRaise',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    },
+  });
+};
\ No newline at end of file
diff --git a/src/views/basicData/calculationFormula/tankDosing.vue b/src/views/basicData/calculationFormula/tankDosing.vue
index 4f3f9fb..65cade3 100644
--- a/src/views/basicData/calculationFormula/tankDosing.vue
+++ b/src/views/basicData/calculationFormula/tankDosing.vue
@@ -46,7 +46,7 @@
 <script>
 import addEditDosing from "./components/addEditDosing.vue";
 import workCenterSet from "./components/workCenterSet.vue";
-import {getList,addFormula,deleteFormula} from "@/api/basicData/calculationFormula"
+import {getList,addFormula,deleteFormula,userListpage} from "@/api/basicData/calculationFormula"
 export default {
   components: {
     addEditDosing,
@@ -57,6 +57,8 @@ export default {
       selectionList: [],
       loading:false,
       query:{},
+      userListData: [],
+      userListLoaded: false,
       option: {
         height: "auto",
         calcHeight: 32,
@@ -123,12 +125,15 @@ export default {
           },
           {
             label: "操作人",
-            prop: "updateUserName",
+            prop: "updateUser",
             sortable: true,
             filter: true,
             span: 24,
             search: false,
             display: true,
+            formatter: (row) => {
+              return this.userMapObj[row.updateUser] || row.updateUser || '-';
+            },
           },
           {
             label: "更新时间",
@@ -152,7 +157,37 @@ export default {
       isWorkOpen: false,
     };
   },
+  computed: {
+    userMapObj() {
+      const map = {};
+      this.userListData.forEach(user => {
+        map[user.value] = user.label;
+        map[String(user.value)] = user.label;
+        map[Number(user.value)] = user.label;
+      });
+      return map;
+    },
+  },
   methods: {
+    
+    loadUserList() {
+      return new Promise((resolve) => {
+        userListpage(1, 99999).then(res => {     
+          if (res.data.code == 200) {
+            const users = res.data.data;
+            this.userListData = users.map(user => ({
+              label: user.realName || user.name,
+              value: String(user.id)
+            }));
+            this.userListLoaded = true;
+          }
+          resolve();
+        }).catch(error => {
+          console.error('获取用户列表失败', error);
+          resolve();
+        });
+      });
+    },
     addEdit() {
       this.checkRow = {};
       this.isOpen = true;
@@ -256,8 +291,12 @@ export default {
     selectionChange(list) {
       this.selectionList = list;
     },
-    onLoad() {
+    async onLoad() {
       this.loading = true;
+      // 确保用户列表先加载完成
+      if (!this.userListLoaded) {
+        await this.loadUserList();
+      }
       getList({
         current:this.page.currentPage,
         size:this.page.pageSize,
diff --git a/src/views/basicData/calculationFormula/theoreticalValue.vue b/src/views/basicData/calculationFormula/theoreticalValue.vue
index b78801f..9123917 100644
--- a/src/views/basicData/calculationFormula/theoreticalValue.vue
+++ b/src/views/basicData/calculationFormula/theoreticalValue.vue
@@ -33,7 +33,7 @@
 <script>
 import addEditDosing from './components/addEditDosing.vue'
 import workCenterSet from './components/workCenterSet.vue'
-import {getList,deleteFormula} from "@/api/basicData/calculationFormula"
+import {getList,deleteFormula,userListpage} from "@/api/basicData/calculationFormula"
 export default {
     components: {
         addEditDosing,
@@ -44,6 +44,8 @@ export default {
             selectionList: [],
             loading: false,
             query: {},
+            userListData: [],
+            userListLoaded: false,
             option: {
                 height: 'auto',
                 calcHeight: 32,
@@ -111,16 +113,19 @@ export default {
                     },
                     {
                         label: '操作人',
-                        prop: 'subName',
+                        prop: 'updateUser',
                         sortable: true,
                         filter: true,
                         span: 24,
                         search: false,
                         display: true,
+                        formatter: (row) => {
+                            return this.userMapObj[row.updateUser] || row.updateUser || '-';
+                        },
                     },
                     {
                         label: '更新时间',
-                        prop: 'subName',
+                        prop: 'updateTime',
                         sortable: true,
                         filter: true,
                         span: 24,
@@ -142,7 +147,36 @@ export default {
             checkRow:{}
         }
     },
+    computed: {
+        userMapObj() {
+            const map = {};
+            this.userListData.forEach(user => {
+                map[user.value] = user.label;
+                map[String(user.value)] = user.label;
+                map[Number(user.value)] = user.label;
+            });
+            return map;
+        },
+    },
     methods: {
+        loadUserList() {
+            return new Promise((resolve) => {
+                userListpage(1, 99999).then(res => {
+                    if (res.data.code == 200) {
+                        const users = res.data.data;
+                        this.userListData = users.map(user => ({
+                            label: user.realName || user.name,
+                            value: String(user.id)
+                        }));
+                        this.userListLoaded = true;
+                    }
+                    resolve();
+                }).catch(error => {
+                    console.error('获取用户列表失败', error);
+                    resolve();
+                });
+            });
+        },
         addEdit() {
             this.checkRow = {}
             this.isOpen = true
@@ -247,8 +281,12 @@ export default {
         selectionChange(list) {
             this.selectionList = list;
         },
-        onLoad() {
+        async onLoad() {
             this.loading = true
+            // 确保用户列表先加载完成
+            if (!this.userListLoaded) {
+                await this.loadUserList();
+            }
             getList({
                 current:this.page.currentPage,
                 size:this.page.pageSize,
diff --git a/src/views/exemption/index.vue b/src/views/exemption/index.vue
index 45495a8..1d626b9 100644
--- a/src/views/exemption/index.vue
+++ b/src/views/exemption/index.vue
@@ -267,9 +267,7 @@ export default {
   },
   methods: {
     loadUserList(page, params = {}) {
-      console.log(1213999999999999999999999999999999999999999);
-      userList(page.currentPage, page.pageSize).then(res => {
-        
+      userList(page.currentPage, page.pageSize).then(res => {     
         if (res.data.code == 200) {
           const users = res.data.data;
            
diff --git a/src/views/productionTesting/components/trialItem.vue b/src/views/productionTesting/components/trialItem.vue
index 70d6ef2..866c77a 100644
--- a/src/views/productionTesting/components/trialItem.vue
+++ b/src/views/productionTesting/components/trialItem.vue
@@ -1,7 +1,6 @@
 <template>
-  <div>
+  <div class="trial-item-container">
     <avue-crud
-      :height="460"
       :option="option"
       v-model:search="search"
       :table-loading="loading"
@@ -52,9 +51,9 @@
               <el-input v-model="scope.row.standardWorkMinute"></el-input>
             </template>
           </el-table-column>
-          <el-table-column label="类型" prop="itemType">
+          <el-table-column label="类型" prop="itemType" width="280">
             <template #default="scope">
-              <el-select v-model="scope.row.itemType" placeholder="请选择" style="width: 240px">
+              <el-select v-model="scope.row.itemType" placeholder="请选择" style="width: 100%" teleported>
                 <el-option
                   v-for="item in typeList"
                   :key="item.id"
@@ -107,7 +106,8 @@ export default {
         align: 'center',
         height: 'auto',
         searchLabelWidth: 120,
-        simplePage: true,
+        simplePage: false,
+        pagination: true,
         searchShow: true,
         searchMenuSpan: 6,
         searchIcon: true,
@@ -185,19 +185,15 @@ export default {
             type: 'select',
             dicUrl: '/blade-system/dict/dictionary?code=InspectionItem-ItemType',
             props: { label: 'dictValue', value: 'dictKey' },
-            // dicData:[
-            //     {
-            //         label:'性能检测',
-            //         value:1
-            //     },
-            //     {
-            //         label:'尺寸检测',
-            //         value:2
-            //     },
-            // ],
+            formatter: (row, value) => {
+              if (value === 0 || value === '0') {
+                return '';
+              }
+              return value;
+            },
             rules: [
               {
-                required: true,
+                required: false,
                 message: '请输入名称',
                 trigger: 'click',
               },
@@ -211,9 +207,15 @@ export default {
             span: 24,
             search: true,
             searchLabelWidth: 50,
+            formatter: (row, value) => {
+              if (value === -1 || value === '-1') {
+                return '';
+              }
+              return value;
+            },
             rules: [
               {
-                required: true,
+                required: false,
                 message: '请输入名称',
                 trigger: 'click',
               },
@@ -253,9 +255,11 @@ export default {
     },
     currentChange(currentPage) {
       this.page.currentPage = currentPage;
+      this.onLoad();
     },
     sizeChange(pageSize) {
       this.page.pageSize = pageSize;
+      this.onLoad();
     },
     refreshChange() {
       this.onLoad();
@@ -284,8 +288,18 @@ export default {
     },
     handleEdit(row, index) {
       getDetail({ id: row.id }).then(res => {
-        res.data.data.itemType = res.data.data.itemType + '';
-        this.$refs.crud.rowEdit(res.data.data, index);
+        const data = res.data.data;
+        // 类型为0时显示为空
+        if (data.itemType === 0 || data.itemType === '0') {
+          data.itemType = '';
+        } else if (data.itemType !== null && data.itemType !== undefined && data.itemType !== '') {
+          data.itemType = String(data.itemType);
+        }
+        // 额定工时为-1时显示为空
+        if (data.standardWorkMinute === -1 || data.standardWorkMinute === '-1') {
+          data.standardWorkMinute = '';
+        }
+        this.$refs.crud.rowEdit(data, index);
       });
     },
     rowUpdate(form, index, done, loading) {
@@ -301,7 +315,7 @@ export default {
       if (this.tidList.length == 0) {
         this.$message.error('请至少填写一条数据');
       } else {
-        let tmp = this.tidList.find(item => !item.code || !item.name || !item.itemType);
+        let tmp = this.tidList.find(item => !item.code || !item.name);
         if (tmp) {
           this.$message.error('数据请填写完整!');
         } else {
@@ -349,4 +363,18 @@ export default {
 };
 </script>
 
-<style></style>
+<style scoped>
+.trial-item-container {
+  height: calc(100vh - 200px);
+  overflow-y: auto;
+}
+.trial-item-container :deep(.avue-crud__pagination) {
+  position: relative;
+  margin-top: 10px;
+  padding-bottom: 10px;
+}
+.trial-item-container :deep(.el-table) {
+  /* max-height: none !important; */
+  height: 300px !important;
+}
+</style>