解决用车申请bug

src/views/salesServiceManagement/components/processSubmitDialog/processSubmitDialog.vue

@@ -470,6 +470,7 @@ export default {
         const formValue = await this.generateFormValid();
         this.form.valueJson = formValue;
 
+        console.log(this.form.valueJson)
         const workOrderId = this.form.valueJson.manage_workorder.id;
         if (!workOrderId) {
           this.$message.warning('请先选择关联工单');

src/views/salesServiceManagement/demandList/components/dispatchDialog.vue

@@ -29,7 +29,7 @@
         <el-col :span="12">
           <el-form-item
             label="计划名称"
-            prop="name"
+            prop="planName"
             :rules="{
               required: true,
               message: '请输入计划名称',
@@ -37,7 +37,7 @@
             }"
           >
             <el-input
-              v-model="addForm.name"
+              v-model="addForm.planName"
               size="small"
               placeholder="请输入"
             ></el-input>
@@ -175,7 +175,7 @@ export default {
       addForm: {
         executeUserId: '',
         executeGroupId: '',
-        name: '',
+        planName: '',
         isSyncBill: 1,
         durationUnit: '1',
         remark: ''
@@ -275,6 +275,7 @@ export default {
           }
           let data = {
             ...submitData,
+            planName: this.addForm.planName, 
             submitSource: this.submitSource,
             workOrderExecuteUserId: this.addForm.executeUserId || '',
             workOrderExecuteUserName: this.addForm.executeUserName || '',

src/views/salesServiceManagement/vehiclerecord/index.vue

@@ -25,6 +25,8 @@
 import search from './components/search.vue';
 import { pageByDispatchRecord } from '@/api/salesServiceManagement/index';
 import dictMixins from '@/mixins/dictMixins';
+// 导入获取用户列表的接口（与第二个组件保持一致）
+import { getUserPage } from '@/api/system/organization';
 
 export default {
   mixins: [dictMixins],
@@ -37,21 +39,12 @@ export default {
       deptResList: [], // 部门
       deptIdToNameMap: {},
       statusList: [
-        {
-          value: 1,
-          label: '处理中'
-        },
-
-        {
-          value: 2,
-          label: '通过'
-        },
-
-        {
-          value: 3,
-          label: '不通过'
-        }
+        { value: 1, label: '处理中' },
+        { value: 2, label: '通过' },
+        { value: 3, label: '不通过' }
       ],
+      // 新增：用户列表（用于匹配用车人名称）
+      userList: [],
       // 加载状态
       loading: false
     };
@@ -151,12 +144,13 @@ export default {
           formatter: (row) => row.valueJson?.car_number || ''
         },
         {
-          prop: 'createUserName',
+          prop: 'vehicle_user',
           label: '用车人',
           align: 'center',
           showOverflowTooltip: true,
           minWidth: 200,
-          // formatter: (row) => row.valueJson?.vehicle_user || ''
+          // 关键修改：通过vehicle_user（用户ID）匹配用户名
+          formatter: (row) => this.getVehicleUserName(row.valueJson?.vehicle_user)
         },
         {
           prop: 'vehicle_mileage',
@@ -181,10 +175,10 @@ export default {
           showOverflowTooltip: true,
           minWidth: 200,
           formatter: (row) => {
-          const currentStatus = row.status;
-          const matchedItem = this.statusList.find(item => item.value === currentStatus);
-          return matchedItem ? matchedItem.label : '';
-        }
+            const currentStatus = row.status;
+            const matchedItem = this.statusList.find(item => item.value === currentStatus);
+            return matchedItem ? matchedItem.label : '';
+          }
         },
         {
           prop: 'createTime',
@@ -196,7 +190,33 @@ export default {
       ];
     }
   },
+  created() {
+    // 初始化时获取用户列表（用于匹配用车人名称）
+    this.getUserList();
+  },
   methods: {
+    // 新增：获取用户列表（与第二个组件逻辑一致）
+    async getUserList() {
+      try {
+        const res = await getUserPage({
+          pageNum: 1,
+          pageSize: -1 // 获取全部用户
+        });
+        this.userList = res?.list || [];
+      } catch (error) {
+        console.error('获取用户列表失败:', error);
+        this.$message.error('获取用户列表失败');
+      }
+    },
+
+    // 新增：通过vehicle_user（用户ID）获取用户名
+    getVehicleUserName(vehicleUserId) {
+      if (!vehicleUserId) return '';
+      // 在用户列表中匹配ID对应的用户名称
+      const matchedUser = this.userList.find(user => user.id === vehicleUserId);
+      return matchedUser ? matchedUser.name : vehicleUserId; // 未匹配到则显示原始ID
+    },
+
     getDeptNames(deptIdArr) {
       if (!deptIdArr || !Array.isArray(deptIdArr) || deptIdArr.length === 0) {
         return '-';
@@ -206,6 +226,7 @@ export default {
       );
       return deptNames.join('、');
     },
+
     getPieTypeLabel(value) {
       if (!value) return '';
       const target = this.pietypeList.find(
@@ -213,6 +234,7 @@ export default {
       );
       return target ? target.label : value;
     },
+
     handlePietypeList(list, deptRes) {
       this.pietypeList = list;
       this.deptResList = deptRes;
@@ -221,6 +243,7 @@ export default {
         return map;
       }, {});
     },
+
     datasource({ page, limit, where }) {
       const dataPromise = pageByDispatchRecord({
         pageNum: page,
@@ -232,9 +255,10 @@ export default {
         .catch((error) => console.error('获取数据失败：', error));
       return dataPromise;
     },
+
     /* 刷新表格 */
     reload(where) {
-      this.$refs.table.reload({ page: 1, where });
+      this.$refs.table.reload({ page: 1, ...where });
     }
   }
 };