修改收货人字段

.env.dev

@@ -5,9 +5,9 @@ NODE_ENV = 'development'
 VUE_APP_TITLE = WMS开发环境
 
 # 芋道管理系统/开发环境
-# VUE_APP_BASE_API = 'http://192.168.1.94:48080'
+VUE_APP_BASE_API = 'http://192.168.1.94:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.26:48080'
-VUE_APP_BASE_API = 'http://113.105.183.190:48028'
+# VUE_APP_BASE_API = 'http://113.105.183.190:48028'
 # VUE_APP_BASE_API = 'http://61.155.26.34:36936'
 # VUE_APP_BASE_API = 'http://127.0.0.1:48080'
 # VUE_APP_BASE_API = 'http://2227el9013.iok.la'

src/api/system/user.js

@@ -3,145 +3,145 @@ import { praseStrEmpty } from "@/utils/ruoyi";
 
 // 查询用户列表
 export function listUser(query) {
-    return request({
-        url: "/system/user/page",
-        method: "get",
-        params: query,
-    });
+  return request({
+    url: "/system/user/page",
+    method: "get",
+    params: query,
+  });
 }
 
 // 获取用户精简信息列表
 export function listSimpleUsers(query) {
-    return request({
-        url: "/system/user/list-all-simple",
-        method: "get",
-        params: query,
-    });
+  return request({
+    url: "/system/user/getUserList",
+    method: "get",
+    params: query,
+  });
 }
 
 // 查询用户详细
 export function getUser(userId) {
-    return request({
-        url: "/system/user/get?id=" + praseStrEmpty(userId),
-        method: "get",
-    });
+  return request({
+    url: "/system/user/get?id=" + praseStrEmpty(userId),
+    method: "get",
+  });
 }
 
 // 新增用户
 export function addUser(data) {
-    return request({
-        url: "/system/user/create",
-        method: "post",
-        data: data,
-    });
+  return request({
+    url: "/system/user/create",
+    method: "post",
+    data: data,
+  });
 }
 
 // 修改用户
 export function updateUser(data) {
-    return request({
-        url: "/system/user/update",
-        method: "put",
-        data: data,
-    });
+  return request({
+    url: "/system/user/update",
+    method: "put",
+    data: data,
+  });
 }
 
 // 删除用户
 export function delUser(userId) {
-    return request({
-        url: "/system/user/delete?id=" + userId,
-        method: "delete",
-    });
+  return request({
+    url: "/system/user/delete?id=" + userId,
+    method: "delete",
+  });
 }
 
 // 导出用户
 export function exportUser(query) {
-    return request({
-        url: "/system/user/export",
-        method: "get",
-        params: query,
-        responseType: "blob",
-    });
+  return request({
+    url: "/system/user/export",
+    method: "get",
+    params: query,
+    responseType: "blob",
+  });
 }
 
 // 用户密码重置
 export function resetUserPwd(id, password) {
-    const data = {
-        id,
-        password,
-    };
-    return request({
-        url: "/system/user/update-password",
-        method: "put",
-        data: data,
-    });
+  const data = {
+    id,
+    password,
+  };
+  return request({
+    url: "/system/user/update-password",
+    method: "put",
+    data: data,
+  });
 }
 
 // 用户状态修改
 export function changeUserStatus(id, status) {
-    const data = {
-        id,
-        status,
-    };
-    return request({
-        url: "/system/user/update-status",
-        method: "put",
-        data: data,
-    });
+  const data = {
+    id,
+    status,
+  };
+  return request({
+    url: "/system/user/update-status",
+    method: "put",
+    data: data,
+  });
 }
 
 // 查询用户个人信息
 export function getUserProfile() {
-    return request({
-        url: "/system/user/profile/get",
-        method: "get",
-    });
+  return request({
+    url: "/system/user/profile/get",
+    method: "get",
+  });
 }
 
 // 修改用户个人信息
 export function updateUserProfile(data) {
-    return request({
-        url: "/system/user/profile/update",
-        method: "put",
-        data: data,
-    });
+  return request({
+    url: "/system/user/profile/update",
+    method: "put",
+    data: data,
+  });
 }
 
 // 用户密码重置
 export function updateUserPwd(oldPassword, newPassword) {
-    const data = {
-        oldPassword,
-        newPassword,
-    };
-    return request({
-        url: "/system/user/profile/update-password",
-        method: "put",
-        data: data,
-    });
+  const data = {
+    oldPassword,
+    newPassword,
+  };
+  return request({
+    url: "/system/user/profile/update-password",
+    method: "put",
+    data: data,
+  });
 }
 
 // 用户头像上传
 export function uploadAvatar(data) {
-    return request({
-        url: "/system/user/profile/update-avatar",
-        method: "put",
-        data: data,
-    });
+  return request({
+    url: "/system/user/profile/update-avatar",
+    method: "put",
+    data: data,
+  });
 }
 
 // 下载用户导入模板
 export function importTemplate() {
-    return request({
-        url: "/system/user/get-import-template",
-        method: "get",
-        responseType: "blob",
-    });
+  return request({
+    url: "/system/user/get-import-template",
+    method: "get",
+    responseType: "blob",
+  });
 }
 
 // 查询供应商列表
 export function getSupplierPage(query) {
-    return request({
-        url: "/rtkerp/supplier/page",
-        method: "get",
-        params: query,
-    });
-}
+  return request({
+    url: "/rtkerp/supplier/page",
+    method: "get",
+    params: query,
+  });
+}

src/views/rtkwms/inrequest/InRequestForm.vue

@@ -256,19 +256,21 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="收货人" prop="receivePerson">
+              <el-form-item label="原材仓仓管员" prop="receivePerson">
                 <el-select
                   v-model="formData.receivePerson"
                   filterable
                   :disabled="isFormDisabled || !formData.businessType"
-                  placeholder="请输入收货人"
+                  placeholder="请输入原材仓仓管员"
                   clearable
                   style="width: 100%"
                 >
                   <el-option
                     v-for="item in users"
                     :key="parseInt(item.id)"
-                    :label="item.nickname"
+                    :label="`${item.nickname}(${item.deptName || ''} ${
+                      item.postName || ''
+                    })`"
                     :value="parseInt(item.id)"
                   />
                 </el-select>
@@ -546,7 +548,7 @@ export default {
         receivePerson: [
           {
             required: true,
-            message: "收货人不能为空",
+            message: "原材仓仓管员不能为空",
             trigger: "blur",
           },
         ],
@@ -601,7 +603,7 @@ export default {
     },
     // 动态生成表单验证规则
     dynamicFormRules() {
-      // 从原始规则中只保留业务类型、优先级、预计出入库时间、收货人
+      // 从原始规则中只保留业务类型、优先级、预计出入库时间、原材仓仓管员
       const baseRules = {
         businessType: this.formRules.businessType,
         priority: this.formRules.priority,
@@ -917,7 +919,7 @@ export default {
       try {
         // /* 1. 深拷贝一份，避免污染页面数据 */
         // const data = JSON.parse(JSON.stringify(this.formData));
-        // /* 2. 把收货人转回字符串 */
+        // /* 2. 把原材仓仓管员转回字符串 */
         // data.receivePerson =
         //   data.receivePerson != null ? String(data.receivePerson) : "";
         const data = this.formData;
@@ -965,9 +967,9 @@ export default {
     },
     /** 提交按钮 */
     async commit() {
-      console.log("打印一下收货人信息", this.formData.receivePerson);
+      console.log("打印一下原材仓仓管员信息", this.formData.receivePerson);
       if (!this.formData.receivePerson) {
-        this.$modal.msgWarning("请先添加收货人");
+        this.$modal.msgWarning("请先添加原材仓仓管员");
         return;
       }
       const menuId = this.$route.meta.id;