Merge remote-tracking branch 'origin/master' into master

src/api/pc/enterprise/orderTypes.ts

@@ -12,6 +12,7 @@ export interface OrderMain {
   customerId?: number;
   customerCode?: string;
   userId?: number;
+  createName?: string;
   shippingAddressId?: number;
   purchaseReason?: string;
   invoiceType?: string;

src/layout/components/header.vue

@@ -14,19 +14,19 @@
       </div>
 
       <div class="header-box flex-row-start">
-        <el-dropdown v-if="userInfo.nickName">
+        <el-dropdown v-if="userInfo.customerName">
           <div class="dropdow header-text hig">
-            {{ userInfo.nickName }}
+            {{ userInfo.customerName }}
             <el-icon><ArrowDown /></el-icon>
           </div>
           <template #dropdown>
             <el-dropdown-menu>
               <el-dropdown-item>
-                <span>姓名:{{ userInfo.nickName }}</span>
+                <span></span>
+                <span class="hig">{{ userInfo.customerName }}</span>
               </el-dropdown-item>
               <el-dropdown-item>
-                <span>公司:</span>
-                <span class="hig">{{ userInfo.companyName }}</span>
+                <span>姓名:{{ userInfo.nickName }}</span>
               </el-dropdown-item>
               <el-dropdown-item divided @click="onlogout">退出登录</el-dropdown-item>
             </el-dropdown-menu>
@@ -59,7 +59,7 @@ onMounted(() => {
     getInfo().then((res) => {
       if (res.code == 200) {
         userInfo.value = res.data.user;
-        userInfo.value.companyName = res.data.companyName || '';
+        userInfo.value.customerName = res.data.customerName || '';
       }
     });
   }

src/views/greg/index.vue

@@ -4,9 +4,10 @@
       <img class="head-img" src="@/assets/images/head.png" alt="" />
       <div class="register-login flex-row-between">
         <div></div>
-        <div @click="goLogin">
-          <span>已有账号？直接</span>
-          <span class="zhu">登录>></span>
+        <div>
+          <!-- <span>已有账号？直接</span> -->
+          <a href="http://119.97.180.88:8050/" @click.stop target="_blank"> 已有账号？直接 </a>
+          <a href="http://119.97.180.88:8050/" class="zhu" @click.stop target="_blank"> 登录&gt;&gt; </a>
         </div>
       </div>
       <div class="progress-bos">
@@ -223,7 +224,8 @@
         <div class="register-success flex-column-center">
           <img src="@/assets/images/breg.png" alt="" />
           <div class="success-text">您的账户还在审核中，如有疑问，请致电400-111-0027</div>
-          <el-button @click="goLogin" type="primary">返回登录</el-button>
+          <!-- <el-button  @click="goLogin" type="primary">返回登录</el-button> -->
+          <a href="http://119.97.180.88:8050/" class="zhu" @click.stop target="_blank"> 返回登录&gt;&gt; </a>
         </div>
       </template>
     </div>
@@ -421,7 +423,7 @@ const handleAvatarSuccess = (res: any) => {
       type: 'warning'
     });
   }
-  console.log(res);
+  // console.log(res);
 };
 
 import type { UploadProps } from 'element-plus';

src/views/login.vue

@@ -156,7 +156,6 @@ const handleLogin = () => {
         loading.value = false;
       } else {
         loading.value = false;
-        ElMessage.error('登录失败，请检查用户名和密码');
       }
     }
   });

src/views/order/orderManage/index.vue

@@ -457,7 +457,7 @@ const fetchOrderList = async () => {
         id: order.id,
         orderTime: order.createTime,
         orderNo: order.orderNo,
-        orderPerson: order.customerName, // 需要关联用户信息
+        orderPerson: order.createName, // 需要关联用户信息
         department: order.createDeptName, // 需要关联部门信息
         payAmount: order.payableAmount || 0,
         freight: order.shippingFee || 0,

src/views/organization/roleManage/index.vue

@@ -2,7 +2,7 @@
   <div class="page-container">
     <div class="page-header">
       <PageTitle title="角色管理" />
-      <el-button type="danger" @click="handleAdd">新增角色</el-button>
+      <!-- <el-button type="danger" @click="handleAdd">新增角色</el-button> -->
     </div>
 
     <el-table :data="paginatedRoleList" border>
@@ -19,8 +19,8 @@
       <el-table-column prop="remark" label="备注" min-width="150" align="center" show-overflow-tooltip />
       <el-table-column label="操作" width="150" align="center" fixed="right">
         <template #default="{ row }">
-          <el-button type="primary" link size="small" @click="handleEdit(row)">编辑</el-button>
-          <el-button type="danger" link size="small" @click="handleDelete(row)">删除</el-button>
+          <!-- <el-button type="primary" link size="small" @click="handleEdit(row)">编辑</el-button> -->
+          <el-button disabled type="danger" link size="small" @click="handleDelete(row)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -68,6 +68,7 @@ import { ref, reactive, computed, onMounted } from 'vue';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import { PageTitle } from '@/components';
 import { getRoleList, addRole, updateRole, deleteRole } from '@/api/pc/organization';
+import { create } from 'domain';
 
 const roleList = ref([]);
 const currentPage = ref(1);
@@ -100,10 +101,16 @@ const paginatedRoleList = computed(() => {
 
 const loadRoleList = async () => {
   try {
-    const res = await getRoleList();
-    if (res.code === 200 && res.data) {
-      roleList.value = res.data;
-    }
+    // const res = await getRoleList();
+    // if (res.code === 200 && res.data) {
+    //   roleList.value = res.data;
+    // }
+    roleList.value = [
+      { roleId: 1, roleName: '管理角色', roleSort: 1, status: '0', createTime: '2026-01-27 09:36:27' },
+      { roleId: 2, roleName: '采购角色', roleSort: 2, status: '0', createTime: '2026-01-27 09:36:38' },
+      { roleId: 3, roleName: '查询角色', roleSort: 3, status: '0', createTime: '2026-01-27 09:37:33' },
+      { roleId: 4, roleName: '审核角色', roleSort: 4, status: '0', createTime: '2026-01-27 09:37:50' }
+    ];
   } catch (error) {
     console.error('获取角色列表失败:', error);
     ElMessage.error('获取角色列表失败');

src/views/organization/staffManage/index.vue

@@ -83,7 +83,7 @@
         </el-form-item>
         <el-form-item label="角色" prop="roleId">
           <el-select v-model="formData.roleId" placeholder="请选择角色" style="width: 100%" @change="handRoleChange">
-            <el-option v-for="role in roleList" :key="role.roleId" :label="role.roleName" :value="role.roleId.toString()" />
+            <el-option v-for="role in roleList" :key="role.roleId" :label="role.roleName" :value="role.roleId" />
           </el-select>
         </el-form-item>
         <el-form-item label="状态">
@@ -126,7 +126,7 @@ const formData = reactive({
   phone: '',
   deptId: null as number | null,
   deptName: '',
-  roleId: '',
+  roleId: null,
   roleName: '',
   status: '0'
 });
@@ -166,10 +166,16 @@ const loadDeptTree = async () => {
 // 加载角色列表
 const loadRoleList = async () => {
   try {
-    const res = await getRoleList(queryParams);
-    if (res.code === 200 && res.data) {
-      roleList.value = res.data;
-    }
+    roleList.value = [
+      { roleId: 1, roleName: '管理角色' },
+      { roleId: 2, roleName: '采购角色' },
+      { roleId: 3, roleName: '查询角色' },
+      { roleId: 4, roleName: '审核角色' }
+    ];
+    // const res = await getRoleList(queryParams);
+    // if (res.code === 200 && res.data) {
+    //   roleList.value = res.data;
+    // }
   } catch (error) {
     console.error('获取角色列表失败:', error);
   }
@@ -202,7 +208,7 @@ const handleDeptChange = (value: any) => {
 };
 
 const handRoleChange = (value: number) => {
-  const selectedRole = roleList.value.find((item) => item.roleId === value);
+  const selectedRole = roleList.value.find((item) => item.roleId == value);
   if (selectedRole) {
     formData.roleName = selectedRole.roleName;
   }
@@ -251,7 +257,7 @@ const handleAdd = () => {
   formData.contactName = '';
   formData.phone = '';
   formData.deptId = currentDeptId.value;
-  formData.roleId = '';
+  formData.roleId = null;
   formData.status = '0';
   dialogVisible.value = true;
 };
@@ -262,6 +268,7 @@ const handleEdit = (row: any) => {
   formData.contactName = row.contactName;
   formData.phone = row.phone;
   formData.deptId = row.deptId;
+  formData.deptName = row.deptName;
   formData.roleId = row.roleId;
   formData.status = row.status;
   dialogVisible.value = true;