合并

src/api/pc/enterprise/index.ts

@@ -24,6 +24,17 @@ export function updateEnterpriseInfo(data: EnterpriseInfo) {
   });
 }
 
+/**
+ * 修改密码
+ */
+export function changePwd(data: any) {
+  return request({
+    url: '/system/psSysUser/changePwd', // 密码修改
+    method: 'put',
+    data: data
+  });
+}
+
 // ==================== 收货地址管理 ====================
 
 /**

src/api/pc/enterprise/order.ts

@@ -143,6 +143,13 @@ export function addOrderEvaluation(data: any) {
   });
 }
 
+export function getOrderEvaluation(id: number) {
+  return request({
+    url: `/order/pcOrderEvaluation/${id}`,
+    method: 'get'
+  });
+}
+
 // ==================== 订单流程管理 ====================
 
 /**

src/router/index.ts

@@ -296,6 +296,12 @@ export const constantRoutes: RouteRecordRaw[] = [
         component: () => import('@/views/enterprise/purchaseHabit/index.vue'),
         meta: { title: '采购习惯', hidden: true, workbench: true }
       },
+      {
+        path: 'enterprise/changePerson',
+        name: 'PurchaseHabit',
+        component: () => import('@/views/enterprise/changePerson/index.vue'),
+        meta: { title: '更换负责人', hidden: true, workbench: true }
+      },
       {
         path: 'enterprise/messageNotice',
         name: 'MessageNotice',

src/views/enterprise/changePerson/index.vue

@@ -0,0 +1,368 @@
+<template>
+  <div class="change-person-container">
+    <div class="change-content">
+      <!-- 头部标题 -->
+      <div class="page-header">
+        <div class="page-title">变更采购负责人</div>
+      </div>
+
+      <!-- 步骤条 -->
+      <div class="steps-container">
+        <!-- 步骤1 -->
+        <div class="step-item" :class="{ active: currentStep >= 1 }">
+          <div class="step-circle">
+            <el-icon v-if="currentStep >= 1"><Check /></el-icon>
+            <span v-else>1</span>
+          </div>
+          <div class="step-label">验证身份</div>
+        </div>
+        <div class="step-line" :class="{ active: currentStep > 1 }"></div>
+
+        <!-- 步骤2 -->
+        <div class="step-item" :class="{ active: currentStep >= 2 }">
+          <div class="step-circle">
+            <el-icon v-if="currentStep > 2"><Check /></el-icon>
+            <span v-else>2</span>
+          </div>
+          <div class="step-label">选择人员</div>
+        </div>
+        <div class="step-line" :class="{ active: currentStep > 2 }"></div>
+
+        <!-- 步骤3 -->
+        <div class="step-item" :class="{ active: currentStep >= 3 }">
+          <div class="step-circle">
+            <span v-if="currentStep < 3">3</span>
+            <el-icon v-else><Check /></el-icon>
+          </div>
+          <div class="step-label">完成</div>
+        </div>
+      </div>
+
+      <!-- 步骤1：验证身份内容 -->
+      <div class="step-content" v-if="currentStep === 1">
+        <el-form ref="step1FormRef" :model="step1Form" label-width="120px" class="verify-form">
+          <el-form-item label="手机号码：">
+            <div class="form-item-wrapper">
+              <el-input v-model="step1Form.phone" placeholder="请输入手机号码" class="form-input" />
+              <span class="form-tip">若该手机号已无法使用请联系客服</span>
+            </div>
+          </el-form-item>
+
+          <el-form-item label="验证码：">
+            <div class="form-item-wrapper">
+              <el-input v-model="step1Form.code" placeholder="短信验证码" class="form-input code-input">
+                <template #suffix>
+                  <el-button link class="send-code-btn" :disabled="countdown > 0" @click="handleSendCode">
+                    {{ countdown > 0 ? `${countdown}s后发送` : '发送验证码' }}
+                  </el-button>
+                </template>
+              </el-input>
+            </div>
+          </el-form-item>
+
+          <el-form-item label=" ">
+            <div class="captcha-box">
+              <el-radio v-model="step1Form.verified" :label="true" class="captcha-radio">点击验证</el-radio>
+            </div>
+          </el-form-item>
+
+          <el-form-item label=" " class="action-item">
+            <el-button type="primary" class="next-btn" @click="handleNextStep">下一步</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+
+      <!-- 步骤2：选择人员内容 (模拟) -->
+      <div class="step-content" v-if="currentStep === 2">
+        <el-form label-width="120px" class="verify-form">
+          <el-form-item label="选择新负责人：">
+            <el-select v-model="step2Form.person" placeholder="请选择新采购负责人" class="form-input">
+              <el-option label="张三" value="zhangsan" />
+              <el-option label="李四" value="lisi" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label=" " class="action-item">
+            <el-button @click="currentStep = 1">上一步</el-button>
+            <el-button type="primary" class="next-btn" @click="currentStep = 3" style="width: auto; padding: 0 40px">提交</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+
+      <!-- 步骤3：完成内容 (模拟) -->
+      <div class="step-content" v-if="currentStep === 3">
+        <div class="success-content">
+          <el-icon class="success-icon" color="#e60012" :size="80"><CircleCheckFilled /></el-icon>
+          <div class="success-title">负责人变更成功！</div>
+          <el-button type="primary" class="next-btn" style="margin-top: 40px; width: 200px" @click="currentStep = 1">返回</el-button>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive } from 'vue';
+import { Check, CircleCheckFilled } from '@element-plus/icons-vue';
+import { ElMessage } from 'element-plus';
+
+const currentStep = ref(1);
+
+const step1Form = reactive({
+  phone: '',
+  code: '',
+  verified: false
+});
+
+const step2Form = reactive({
+  person: ''
+});
+
+const countdown = ref(0);
+
+// 发送验证码模拟方法
+const handleSendCode = () => {
+  if (!step1Form.phone) {
+    ElMessage.warning('请输入手机号码');
+    return;
+  }
+  countdown.value = 60;
+  const timer = setInterval(() => {
+    countdown.value--;
+    if (countdown.value <= 0) {
+      clearInterval(timer);
+    }
+  }, 1000);
+  ElMessage.success('验证码已发送');
+};
+
+const handleNextStep = () => {
+  if (!step1Form.phone || !step1Form.code) {
+    ElMessage.warning('请填写完整的手机号和验证码');
+    return;
+  }
+  if (!step1Form.verified) {
+    ElMessage.warning('请完成点击验证');
+    return;
+  }
+  currentStep.value = 2;
+};
+</script>
+
+<style scoped lang="scss">
+.change-person-container {
+  background: #f4f5f5;
+  min-height: 100vh;
+  padding: 20px;
+  width: 100%;
+}
+
+.change-content {
+  background: #fff;
+  border-radius: 4px;
+  min-height: calc(100vh - 40px);
+  margin: 0 auto;
+  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.05);
+
+  .page-header {
+    border-bottom: 1px solid #f0f0f0;
+    padding: 24px 30px;
+
+    .page-title {
+      font-size: 16px;
+      color: #333;
+      font-weight: 500;
+    }
+  }
+}
+
+.steps-container {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin: 60px auto 70px;
+  max-width: 650px;
+}
+
+.step-item {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  position: relative;
+  width: 80px;
+
+  .step-circle {
+    width: 48px;
+    height: 48px;
+    border-radius: 50%;
+    border: 2px solid #ddd;
+    background: #fff;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 20px;
+    color: #ccc;
+    margin-bottom: 12px;
+    font-weight: 500;
+    transition: all 0.3s;
+  }
+
+  .step-label {
+    font-size: 14px;
+    color: #999;
+    transition: all 0.3s;
+  }
+
+  &.active {
+    .step-circle {
+      border-color: #e60012;
+      color: #e60012;
+    }
+    .step-label {
+      color: #e60012;
+      font-weight: 500;
+    }
+  }
+}
+
+.step-line {
+  flex: 1;
+  height: 2px;
+  background: #ddd;
+  margin: 0 10px;
+  margin-bottom: 30px; /* 居中对齐横线与圆圈中心 */
+  transition: all 0.3s;
+
+  &.active {
+    background: #e60012;
+  }
+}
+
+.step-content {
+  display: flex;
+  justify-content: center;
+  padding-bottom: 100px;
+}
+
+.verify-form {
+  width: 550px;
+
+  :deep(.el-form-item__label) {
+    font-size: 14px;
+    color: #333;
+    font-weight: normal;
+  }
+
+  .form-item-wrapper {
+    display: flex;
+    align-items: center;
+    width: 100%;
+    gap: 15px;
+
+    .form-input {
+      width: 320px;
+
+      :deep(.el-input__wrapper) {
+        box-shadow: 0 0 0 1px #dcdfe6 inset;
+        border-radius: 2px;
+        background-color: #f7f9fb;
+        &.is-focus {
+          box-shadow: 0 0 0 1px #e60012 inset !important;
+        }
+      }
+
+      :deep(.el-input__inner) {
+        height: 38px;
+      }
+    }
+
+    .form-tip {
+      font-size: 12px;
+      color: #999;
+      white-space: nowrap;
+    }
+  }
+
+  .send-code-btn {
+    color: #e60012;
+    font-size: 14px;
+    font-weight: 500;
+
+    &:hover {
+      color: #159c81;
+    }
+    &.is-disabled {
+      color: #999;
+    }
+  }
+
+  .captcha-box {
+    width: 320px;
+    height: 42px;
+    background: #f4f6fb;
+    border: 1px solid #ccd6e8;
+    border-radius: 2px;
+    display: flex;
+    align-items: center;
+    padding-left: 20px;
+
+    .captcha-radio {
+      :deep(.el-radio__input.is-checked .el-radio__inner) {
+        border-color: #bbc7da;
+        background: #bbc7da;
+        &::after {
+          background-color: #6a82a7;
+          width: 6px;
+          height: 6px;
+        }
+      }
+      :deep(.el-radio__inner) {
+        width: 16px;
+        height: 16px;
+      }
+      :deep(.el-radio__label) {
+        color: #666;
+        font-size: 14px;
+      }
+    }
+  }
+
+  .action-item {
+    margin-top: 15px;
+  }
+
+  .next-btn {
+    width: 320px;
+    height: 40px;
+    background-color: #e60012;
+    border-color: #e60012;
+    border-radius: 2px;
+    font-size: 14px;
+  }
+}
+
+.success-content {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding-top: 50px;
+
+  .success-icon {
+    margin-bottom: 25px;
+  }
+
+  .success-title {
+    font-size: 18px;
+    color: #333;
+    font-weight: 500;
+  }
+
+  .next-btn {
+    background-color: #e60012;
+    border-color: #e60012;
+    &:hover {
+      background-color: #159c81;
+      border-color: #159c81;
+    }
+  }
+}
+</style>

src/views/enterprise/companyInfo/index.vue

@@ -249,6 +249,7 @@ const handleTabClick = (tabKey: string) => {
   else if (tabKey === 'purchaseHabit') router.push('/enterprise/purchaseHabit');
   else if (tabKey === 'invoice') router.push('/enterprise/invoiceManage');
   else if (tabKey === 'creditApply') router.push('/cost/quotaControl/apply');
+  else if (tabKey === 'changePerson') router.push('/enterprise/changePerson');
 };
 </script>
 

src/views/order/orderAudit/index.vue

@@ -25,7 +25,6 @@
           style="width: 240px"
         />
       </div>
-
       <el-tree-select
         v-model="queryParams.department"
         style="width: 240px"
@@ -38,6 +37,10 @@
         clearable
       >
       </el-tree-select>
+      <div>
+        <el-button type="primary" @click="handleQuery">搜索</el-button>
+        <el-button @click="handleReset">重置</el-button>
+      </div>
     </div>
 
     <!-- 订单列表 -->
@@ -219,7 +222,23 @@ const checkOrderData = reactive({
 
 const auditForm = reactive({ opinion: '' });
 const auditRules = { opinion: [{ required: true, message: '请输入审批意见', trigger: 'blur' }] };
-
+const handleQuery = () => {
+  loadOrderList();
+};
+const handleReset = () => {
+  queryParams.keyword = '';
+  queryParams.dateRange = null;
+  queryParams.department = '';
+  loadOrderList();
+};
+const formatDate = (date: Date | string | number): string => {
+  if (!date) return '';
+  const d = new Date(date);
+  const year = d.getFullYear();
+  const month = String(d.getMonth() + 1).padStart(2, '0');
+  const day = String(d.getDate()).padStart(2, '0');
+  return `${year}-${month}-${day}`;
+};
 // 加载订单列表数据
 const loadOrderList = async () => {
   try {
@@ -240,6 +259,16 @@ const loadOrderList = async () => {
       params.checkStatus = '2';
     }
 
+    // 添加筛选条件
+    if (queryParams.keyword) params.orderNo = queryParams.keyword;
+    if (queryParams.department) params.createDept = queryParams.department;
+    if (queryParams.dateRange && queryParams.dateRange.length == 2) {
+      params.params = {
+        beginTime: formatDate(queryParams.dateRange[0]),
+        endTime: formatDate(queryParams.dateRange[1])
+      };
+    }
+
     const res = await getOrderList(params);
     if (res.code === 200 && res.rows) {
       allOrders.value = res.rows.map((item: any) => ({

src/views/order/orderEvaluation/index.vue

@@ -3,7 +3,7 @@
     <PageTitle title="订单评价" />
     <StatusTabs v-model="activeMainTab" :tabs="mainTabs" type="line" />
 
-    <div class="search-bar">
+    <!-- <div class="search-bar">
       <el-input v-model="queryParams.keyword" placeholder="搜索" style="width: 260px" clearable>
         <template #prefix
           ><el-icon><Search /></el-icon
@@ -19,10 +19,9 @@
           style="width: 260px"
         />
       </div>
-    </div>
+    </div> 
 
     <div class="filter-bar">
-      <!-- <span class="filter-label">下单部门</span> -->
       <el-tree-select
         v-model="queryParams.department"
         style="width: 160px"
@@ -35,15 +34,13 @@
         clearable
       >
       </el-tree-select>
-      <!-- <span class="filter-label">状态</span> -->
       <el-select v-model="queryParams.status" placeholder="状态" style="width: 160px" clearable>
         <el-option v-for="dict in order_status" :key="dict.value" :label="dict.label" :value="dict.value" />
       </el-select>
-      <!-- <span class="filter-label">支付方式</span> -->
       <el-select v-model="queryParams.payType" placeholder="支付方式" style="width: 160px" clearable>
         <el-option v-for="dict in pay_method" :key="dict.value" :label="dict.label" :value="dict.value" />
       </el-select>
-    </div>
+    </div>-->
 
     <div class="order-list">
       <div v-for="(order, orderIndex) in orderList" :key="orderIndex" class="order-card">
@@ -154,7 +151,7 @@ import { useRouter } from 'vue-router';
 import { Search, Edit, ChatDotRound, Document, ArrowRight, Picture, Plus } from '@element-plus/icons-vue';
 import { ElMessage } from 'element-plus';
 import { PageTitle, StatusTabs } from '@/components';
-import { getOrderList, getOrderProducts, cancelOrder, deleteOrder, getEvalutionList, addOrderEvaluation } from '@/api/pc/enterprise/order';
+import { getOrderList, getOrderProducts, getEvalutionList, addOrderEvaluation, getOrderEvaluation } from '@/api/pc/enterprise/order';
 import type { OrderMain, OrderStatusStats } from '@/api/pc/enterprise/orderTypes';
 import { getDeptTree } from '@/api/pc/organization';
 import { DeptInfo } from '@/api/pc/organization/types';
@@ -247,8 +244,10 @@ const getorders = async () => {
 
     if (queryParams.keyword) params.orderNo = queryParams.keyword;
     if (queryParams.dateRange && queryParams.dateRange.length === 2) {
-      params.beginTime = queryParams.dateRange[0];
-      params.endTime = queryParams.dateRange[1];
+      params.params = {
+        beginTime: queryParams.dateRange[0],
+        endTime: queryParams.dateRange[1]
+      };
     }
     if (queryParams.department) params.department = queryParams.department;
     if (queryParams.status) params.orderStatus = queryParams.status;
@@ -330,17 +329,32 @@ const handleEvaluate = (order: any) => {
   evaluateForm.evaluationType = 1;
   evaluateDialogVisible.value = true;
 };
-const handleFollowUpEvaluate = (order: any) => {
-  currentOrder.value = order;
-  currentProduct.value = order.products[0];
-  evaluateDialogTitle.value = '追加评价';
-  evaluateForm.deliverGoods = undefined;
-  evaluateForm.content = '';
-  evaluateForm.evaluationType = 2;
-  evaluateDialogVisible.value = true;
+const handleFollowUpEvaluate = async (order: any) => {
+  const res = await getOrderEvaluation(order.orderId);
+  if (res.code === 200 && res.data) {
+    currentOrder.value = order;
+    currentProduct.value = order.products[0];
+    evaluateDialogTitle.value = '追加评价';
+    evaluateForm.deliverGoods = res.data.deliverGoods;
+    evaluateForm.content = res.data.content;
+    evaluateForm.evaluationType = 2;
+    evaluateDialogVisible.value = true;
+  } else {
+    ElMessage.error('获取评价失败');
+  }
 };
-const handleViewEvaluation = (order: any) => {
-  ElMessage.info('查看评价详情');
+const handleViewEvaluation = async (order: any) => {
+  const res = await getOrderEvaluation(order.orderId);
+  if (res.code === 200 && res.data) {
+    currentOrder.value = order;
+    currentProduct.value = order.products[0];
+    evaluateDialogTitle.value = '查看评价';
+    evaluateForm.deliverGoods = res.data.deliverGoods;
+    evaluateForm.content = res.data.content;
+    evaluateDialogVisible.value = true;
+  } else {
+    ElMessage.error('获取评价失败');
+  }
 };
 const handleSubmitEvaluate = async () => {
   const valid = await evaluateFormRef.value?.validate();

src/views/order/orderManage/index.vue

@@ -115,7 +115,7 @@
                 <div class="product-name ellipsis">{{ item.name }}</div>
                 <div class="product-spec">{{ item.spec1 }} | {{ item.spec2 }}</div>
                 <div class="product-price">¥{{ item.price }}</div>
-                <el-button size="small">加入购物车</el-button>
+                <el-button size="small" @click="handleAddCart(item)">加入购物车</el-button>
               </div>
               <div class="product-quantity">x{{ item.quantity }}</div>
             </div>
@@ -345,7 +345,16 @@ const loadDeptTree = async () => {
 };
 
 /** 单个加入购物车 */
-const handleAddCart = async (order: any) => {
+const handleAddCart = async (item: any) => {
+  addProductShoppingCart({ productId: item.id, productNum: 1 }).then((res: any) => {
+    if (res.code == 200) {
+      ElMessage.success('已加入购物车');
+    }
+  });
+};
+
+/** 单个加入购物车 */
+const handleAddCartBatch = async (order: any) => {
   const res = await getOrderProducts([order.id]);
   if (res.code === 200 && res.rows) {
     const products = res.rows.map((p: any) => ({
@@ -358,12 +367,6 @@ const handleAddCart = async (order: any) => {
       ElMessage.success(`已将${products.length}件商品加入购物车`);
     });
   }
-
-  // addProductShoppingCart({ productId: item.id, productNum: 1 }).then((res: any) => {
-  //   if (res.code == 200) {
-  //     ElMessage.success('已加入购物车');
-  //   }
-  // });
 };
 const formatDate = (date: Date | string | number): string => {
   if (!date) return '';
@@ -384,7 +387,7 @@ const fetchOrderList = async () => {
 
     // 添加筛选条件
     if (queryParams.keyword) params.orderNo = queryParams.keyword;
-    if (queryParams.department) params.department = queryParams.department;
+    if (queryParams.department) params.createDept = queryParams.department;
     if (queryParams.status) params.orderStatuses = queryParams.status; // 使用orderStatuses支持多状态查询
     if (queryParams.payType) params.payType = queryParams.payType;
     if (queryParams.dateRange && queryParams.dateRange.length == 2) {
@@ -392,7 +395,6 @@ const fetchOrderList = async () => {
       // params.endTime = queryParams.dateRange[1];
       params.params = {
         beginTime: formatDate(queryParams.dateRange[0]), // 将日期转换为字符串格式
-
         endTime: formatDate(queryParams.dateRange[1]) // 将日期转换为字符串格式
       };
     }
@@ -607,7 +609,7 @@ const handleAction = (action: string, order: any) => {
       handleEvaluate(order);
       break;
     case '再次购买':
-      handleAddCart(order);
+      handleAddCartBatch(order);
       break;
     case '申请售后':
       handleApplyAfter(order);