采购申请修改

src/api/purchase/purchasingBusinessLeader.ts

@@ -0,0 +1,61 @@
+import request from '/@/utils/request';
+
+/**
+ * 分页查询
+ * @param params 查询参数
+ */
+export function fetchList(params?: any) {
+	return request({
+		url: '/purchase/purchasingBusinessLeader/page',
+		method: 'get',
+		params
+	});
+}
+
+/**
+ * 通过id查询
+ * @param id ID
+ */
+export function getObj(id: string | number) {
+	return request({
+		url: '/purchase/purchasingBusinessLeader/details',
+		method: 'get',
+		params: { id }
+	});
+}
+
+/**
+ * 新增业务分管校领导
+ * @param obj 对象数据
+ */
+export function addObj(obj: any) {
+	return request({
+		url: '/purchase/purchasingBusinessLeader',
+		method: 'post',
+		data: obj
+	});
+}
+
+/**
+ * 修改业务分管校领导
+ * @param obj 对象数据
+ */
+export function putObj(obj: any) {
+	return request({
+		url: '/purchase/purchasingBusinessLeader',
+		method: 'put',
+		data: obj
+	});
+}
+
+/**
+ * 删除业务分管校领导
+ * @param ids ID数组
+ */
+export function delObjs(ids: string[] | number[]) {
+	return request({
+		url: '/purchase/purchasingBusinessLeader',
+		method: 'delete',
+		data: ids
+	});
+}

src/views/finance/purchasingrequisition/add.vue

@@ -229,15 +229,24 @@
                     </el-form-item>
                   </el-col>
                   <el-col :span="8" class="mb12">
-                    <el-form-item label="分管校领导" prop="schoolLeaderUserId" :required="!isDeptPurchase">
+                    <el-form-item label="校党委" prop="schoolLeaderUserId" :required="!isDeptPurchase">
-                      <el-select v-model="dataForm.schoolLeaderUserId" placeholder="请选择分管校领导" clearable filterable @change="handleSchoolLeaderChange" style="width: 100%" :disabled="flowFieldDisabled('schoolLeaderUserId')">
+                      <el-select v-model="dataForm.schoolLeaderUserId" placeholder="请选择校党委" clearable filterable @change="handleSchoolLeaderChange" style="width: 100%" :disabled="flowFieldDisabled('schoolLeaderUserId')">
                         <el-option v-for="item in schoolLeaderList" :key="item.id" :label="item.name" :value="item.userId" />
                       </el-select>
                     </el-form-item>
                   </el-col>
-                  <el-col :span="8" class="mb12">
+                  <!-- 非特殊情况显示业务分管校领导 -->
+                  <el-col :span="8" class="mb12" v-if="!isSpecialCase">
+                    <el-form-item label="业务分管校领导" prop="schoolBusinessLeaderUserId" :required="!isDeptPurchase">
+                      <el-select v-model="dataForm.schoolBusinessLeaderUserId" placeholder="请选择业务分管校领导" clearable filterable @change="handleBusinessLeaderChange" style="width: 100%" :disabled="flowFieldDisabled('schoolBusinessLeaderUserId')">
+                        <el-option v-for="item in businessLeaderList" :key="item.id" :label="item.name" :value="item.userId" />
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                  <!-- 特殊情况显示采购分管校领导 -->
+                  <el-col :span="8" class="mb12" v-if="isSpecialCase">
                     <el-form-item label="采购分管校领导" prop="purchaseManagerUserId" :required="!isDeptPurchase">
-                      <el-select v-model="dataForm.purchaseManagerUserId" placeholder="请选择采购分管" clearable filterable @change="handlePurchaseManagerChange" style="width: 100%" :disabled="flowFieldDisabled('purchaseManagerUserId')">
+                      <el-select v-model="dataForm.purchaseManagerUserId" placeholder="请选择采购分管校领导" clearable filterable @change="handlePurchaseManagerChange" style="width: 100%" :disabled="flowFieldDisabled('purchaseManagerUserId')">
                         <el-option v-for="item in purchasingManagerList" :key="item.id" :label="item.name" :value="item.userId" />
                       </el-select>
                     </el-form-item>
@@ -490,6 +499,7 @@ import { Document, Download, QuestionFilled } from '@element-plus/icons-vue';
 import { fetchList as getBusinessDeptList } from '/@/api/purchase/purchasingBusinessDept';
 import { getPage as getSchoolLeaderPage } from '/@/api/finance/purchasingschoolleader';
 import { fetchList as getPurchasingManagerList} from '/@/api/purchase/purchasingPurchaseManager';
+import { fetchList as getBusinessLeaderList} from '/@/api/purchase/purchasingBusinessLeader';
 import { Session } from '/@/utils/storage';
 import * as orderVue from '/@/api/order/order-key-vue';
 
@@ -606,6 +616,9 @@ const dataForm = reactive({
   deptClassifyName: '',
   schoolLeaderUserId: '',
   schoolLeaderName: '',
+  // 业务分管校领导
+  schoolBusinessLeaderUserId: '',
+  schoolBusinessLeaderName: '',
   // 采购分管
   purchaseManagerUserId: '',
   purchaseManagerName: '',
@@ -631,6 +644,7 @@ const purchaseTypeUnionList = ref<any[]>([]);
 const businessDeptList = ref<any[]>([]);
 const schoolLeaderList = ref<any[]>([]);
 const purchasingManagerList = ref<any[]>([]);
+const businessLeaderList = ref<any[]>([]);
 const loading = ref(false);
 const helpDialogVisible = ref(false);
 
@@ -769,6 +783,11 @@ const schoolUnifiedPurchaseFormDisabled = computed(() => {
 // 特殊情况字典 value：0否 1紧急 2单一 3进口
 const isUrgentSpecial = computed(() => dataForm.isSpecial === '1');
 
+// 是否为特殊情况（非0即为特殊情况：紧急、单一、进口）
+const isSpecialCase = computed(() => {
+  return dataForm.isSpecial && dataForm.isSpecial !== '0';
+});
+
 // 第二步标题
 const stepTwoTitle = computed(() => {
   return isDeptPurchase.value ? '部门自行采购' : '学校统一采购';
@@ -1124,7 +1143,22 @@ const dataRules = reactive({
       validator: (_rule: any, value: string, callback: (e?: Error) => void) => {
         if (!isDeptPurchase.value) {
           if (!value || String(value).trim() === '') {
-            callback(new Error('请选择分管校领导'));
+            callback(new Error('请选择校党委'));
+            return;
+          }
+        }
+        callback();
+      },
+      trigger: 'change'
+    }
+  ],
+  schoolBusinessLeaderUserId: [
+    {
+      validator: (_rule: any, value: string, callback: (e?: Error) => void) => {
+        // 仅非特殊情况时校验
+        if (!isDeptPurchase.value && !isSpecialCase.value) {
+          if (!value || String(value).trim() === '') {
+            callback(new Error('请选择业务分管校领导'));
             return;
           }
         }
@@ -1136,9 +1170,10 @@ const dataRules = reactive({
   purchaseManagerUserId: [
     {
       validator: (_rule: any, value: string, callback: (e?: Error) => void) => {
-        if (!isDeptPurchase.value) {
+        // 仅特殊情况时校验
+        if (!isDeptPurchase.value && isSpecialCase.value) {
           if (!value || String(value).trim() === '') {
-            callback(new Error('请选择采购分管'));
+            callback(new Error('请选择采购分管校领导'));
             return;
           }
         }
@@ -1216,6 +1251,8 @@ async function loadDetail(applyId: string | number) {
         deptClassifyName: detail.deptClassifyName ?? '',
         schoolLeaderUserId: detail.schoolLeaderUserId ?? '',
         schoolLeaderName: detail.schoolLeaderName ?? '',
+        schoolBusinessLeaderUserId: detail.schoolBusinessLeaderUserId ?? '',
+        schoolBusinessLeaderName: detail.schoolBusinessLeaderName ?? '',
         purchaseManagerUserId: detail.purchaseManagerUserId ?? '',
         purchaseManagerName: detail.purchaseManagerName ?? '',
         otherMaterials: detail.otherMaterials ?? '',
@@ -1549,6 +1586,24 @@ const getPurchasingManagerListData = async () => {
   }
 };
 
+// 获取业务分管校领导列表
+const getBusinessLeaderListData = async () => {
+  try {
+    const res = await getBusinessLeaderList({ size: 1000 }); // 获取所有数据
+    if (res.data && res.data.records) {
+      businessLeaderList.value = res.data.records.map((item: any) => ({
+        id: item.id,
+        userId: item.userId,
+        name: item.name,
+        username: item.username
+      }));
+    }
+  } catch (err) {
+    console.error('获取业务分管校领导列表失败:', err);
+    businessLeaderList.value = [];
+  }
+};
+
 // 处理业务分管处室选择变化
 const handleBusinessDeptChange = (value: string) => {
   if (value) {
@@ -1591,6 +1646,20 @@ const handlePurchaseManagerChange = (value: string) => {
   }
 };
 
+// 处理业务分管校领导选择变化
+const handleBusinessLeaderChange = (value: string) => {
+  if (value) {
+    const selected = businessLeaderList.value.find(item => item.userId === value);
+    if (selected) {
+      dataForm.schoolBusinessLeaderUserId = selected.userId;
+      dataForm.schoolBusinessLeaderName = selected.name || '';
+    }
+  } else {
+    dataForm.schoolBusinessLeaderUserId = '';
+    dataForm.schoolBusinessLeaderName = '';
+  }
+};
+
 // 处理文件ID字符串或对象数组转ID数组
 // 支持：逗号分隔的字符串、字符串数组、{ id, name? }[]（编辑回填时的格式）
 const getFileIdsArray = (fileIds: string | string[] | { id?: string; name?: string }[]): string[] => {
@@ -1872,6 +1941,7 @@ onMounted(async () => {
     getBusinessDeptListData(),
     getSchoolLeaderListData(),
     getPurchasingManagerListData(),
+    getBusinessLeaderListData(),
   ]);
 
   // 编辑/查看：从 URL 或流程 currJob.orderId 加载详情

src/views/purchase/purchasingBusinessLeader/form.vue

@@ -0,0 +1,182 @@
+<template>
+  <el-dialog
+    :title="form.id ? '编辑' : '新增'"
+    v-model="visible"
+    width="600px"
+    :close-on-click-modal="false"
+    draggable>
+    <el-form
+      ref="dataFormRef"
+      :model="form"
+      :rules="dataRules"
+      label-width="120px"
+      v-loading="loading">
+      <el-form-item label="选取用户" prop="userId">
+        <org-selector
+          v-model:orgList="userList"
+          type="user"
+          :multiple="false"
+          @update:orgList="handleUserChange" />
+      </el-form-item>
+      <el-form-item label="姓名" prop="name">
+        <el-input
+          v-model="form.name"
+          placeholder="选择用户后自动填充"
+          readonly />
+      </el-form-item>
+      <el-form-item label="用户工号" prop="username">
+        <el-input
+          v-model="form.username"
+          placeholder="选择用户后自动填充"
+          readonly />
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input
+          v-model="form.remark"
+          type="textarea"
+          :rows="3"
+          placeholder="请输入备注"
+          clearable />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="visible = false">取 消</el-button>
+        <el-button type="primary" @click="onSubmit" :disabled="loading">确 定</el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup lang="ts" name="PurchasingBusinessLeaderForm">
+import { reactive, ref, nextTick } from 'vue'
+import { getObj, addObj, putObj } from '/@/api/purchase/purchasingBusinessLeader';
+import { useMessage } from '/@/hooks/message';
+import orgSelector from '/@/components/OrgSelector/index.vue';
+
+// 定义子组件向父组件传值/事件
+const emit = defineEmits(['refresh']);
+
+// 定义变量内容
+const dataFormRef = ref();
+const userList = ref<any[]>([]);
+const form = reactive({
+  id: '',
+  userId: '',
+  username: '',
+  name: '',
+  remark: '',
+});
+const visible = ref(false);
+const loading = ref(false);
+
+const dataRules = ref({
+  userId: [
+    { required: true, message: '请选取用户', trigger: 'change' }
+  ],
+  name: [
+    { required: true, message: '请先选取用户', trigger: 'blur' }
+  ],
+  username: [
+    { required: true, message: '请先选取用户', trigger: 'blur' }
+  ],
+});
+
+// 处理用户选择变化
+const handleUserChange = (list: any[]) => {
+  if (list && list.length > 0) {
+    const user = list[0];
+    form.userId = user.userId || user.id || '';
+    form.username = user.username || user.userName || '';
+    form.name = user.name || user.realName || '';
+  } else {
+    form.userId = '';
+    form.username = '';
+    form.name = '';
+  }
+};
+
+// 打开弹窗
+const openDialog = async (id?: string) => {
+  visible.value = true;
+  form.id = '';
+  form.userId = '';
+  form.username = '';
+  form.name = '';
+  form.remark = '';
+  userList.value = [];
+
+  nextTick(() => {
+    dataFormRef.value?.resetFields();
+    if (id) {
+      // 编辑时，先获取详情数据
+      loading.value = true;
+      getObj(id).then((res: any) => {
+        if (res.data && res.data.length > 0) {
+          const data = res.data[0];
+          Object.assign(form, {
+            id: data.id || '',
+            userId: data.userId || '',
+            username: data.username || '',
+            name: data.name || '',
+            remark: data.remark || '',
+          });
+          // 设置用户列表用于回显
+          if (data.userId) {
+            userList.value = [{
+              userId: data.userId,
+              username: data.username,
+              name: data.name,
+              id: data.userId,
+              userName: data.username,
+              realName: data.name,
+              type: 'user',
+            }];
+          }
+        }
+        loading.value = false;
+      }).catch((err: any) => {
+        useMessage().error(err.msg || '获取详情失败');
+        loading.value = false;
+      });
+    }
+  });
+};
+
+// 提交
+const onSubmit = async () => {
+  // 立即设置 loading，防止重复点击
+  if (loading.value) return;
+  loading.value = true;
+
+  try {
+    const valid = await dataFormRef.value.validate().catch(() => {});
+    if (!valid) {
+      loading.value = false;
+      return false;
+    }
+
+    if (form.id) {
+      await putObj(form);
+      useMessage().success('编辑成功');
+    } else {
+      await addObj(form);
+      useMessage().success('新增成功');
+    }
+    visible.value = false;
+    emit('refresh');
+  } catch (err: any) {
+    useMessage().error(err.msg || (form.id ? '编辑失败' : '新增失败'));
+  } finally {
+    loading.value = false;
+  }
+};
+
+// 暴露变量
+defineExpose({
+  openDialog,
+});
+</script>
+
+<style scoped>
+</style>

src/views/purchase/purchasingBusinessLeader/index.vue

@@ -0,0 +1,240 @@
+<template>
+  <div class="modern-page-container">
+    <div class="page-wrapper">
+      <!-- 搜索表单卡片 -->
+      <el-card v-show="showSearch" class="search-card" shadow="never">
+        <template #header>
+          <div class="card-header">
+            <span class="card-title">
+              <el-icon class="title-icon"><Search /></el-icon>
+              筛选条件
+            </span>
+          </div>
+        </template>
+        <el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList" class="search-form">
+          <el-form-item label="姓名" prop="name">
+            <el-input
+              v-model="state.queryForm.name"
+              placeholder="请输入姓名"
+              clearable
+              style="width: 200px" />
+          </el-form-item>
+          <el-form-item label="用户工号" prop="username">
+            <el-input
+              v-model="state.queryForm.username"
+              placeholder="请输入用户工号"
+              clearable
+              style="width: 200px" />
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="Search" @click="getDataList">查询</el-button>
+            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+      </el-card>
+
+      <!-- 内容卡片 -->
+      <el-card class="content-card" shadow="never">
+        <template #header>
+          <div class="card-header">
+            <span class="card-title">
+              <el-icon class="title-icon"><User /></el-icon>
+              业务分管校领导
+            </span>
+            <div class="header-actions">
+              <el-button
+                icon="FolderAdd"
+                type="primary"
+                @click="formDialogRef.openDialog()"
+                v-auth="'purchase_purchasingBusinessLeader_add'">
+                新增
+              </el-button>
+              <el-button
+                plain
+                :disabled="multiple"
+                icon="Delete"
+                type="primary"
+                class="ml10"
+                v-auth="'purchase_purchasingBusinessLeader_del'"
+                @click="handleDelete(selectObjs)">
+                删除
+              </el-button>
+              <right-toolbar
+                v-model:showSearch="showSearch"
+                :export="'purchase_purchasingBusinessLeader_export'"
+                @exportExcel="exportExcel"
+                class="ml10"
+                @queryTable="getDataList" />
+            </div>
+          </div>
+        </template>
+
+        <!-- 表格 -->
+        <el-table
+          ref="tableRef"
+          :data="state.dataList"
+          v-loading="state.loading"
+          stripe
+          :cell-style="tableStyle.cellStyle"
+          :header-cell-style="tableStyle.headerCellStyle"
+          @selection-change="selectionChangHandle"
+          @sort-change="sortChangeHandle"
+          class="modern-table">
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column type="index" label="序号" width="70" align="center">
+            <template #header>
+              <el-icon><List /></el-icon>
+            </template>
+          </el-table-column>
+          <el-table-column prop="name" label="姓名" min-width="120" show-overflow-tooltip>
+            <template #header>
+              <el-icon><User /></el-icon>
+              <span style="margin-left: 4px">姓名</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="username" label="用户工号" min-width="150" show-overflow-tooltip>
+            <template #header>
+              <el-icon><UserFilled /></el-icon>
+              <span style="margin-left: 4px">用户工号</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="remark" label="备注" min-width="300" show-overflow-tooltip>
+            <template #header>
+              <el-icon><EditPen /></el-icon>
+              <span style="margin-left: 4px">备注</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="createTime" label="创建时间" width="180" show-overflow-tooltip>
+            <template #header>
+              <el-icon><Clock /></el-icon>
+              <span style="margin-left: 4px">创建时间</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" fixed="right" width="150">
+            <template #default="scope">
+              <el-button
+                icon="Delete"
+                link
+                type="danger"
+                v-auth="'purchase_purchasingBusinessLeader_del'"
+                @click="handleDelete([scope.row.id])">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <!-- 分页 -->
+        <pagination
+          v-if="state.pagination"
+          v-show="state.pagination.total && state.pagination.total > 0"
+          :total="state.pagination.total"
+          :current="state.pagination.current"
+          :size="state.pagination.size"
+          @size-change="sizeChangeHandle"
+          @current-change="currentChangeHandle"
+        />
+      </el-card>
+    </div>
+
+    <!-- 编辑、新增表单对话框 -->
+    <form-dialog ref="formDialogRef" @refresh="getDataList" />
+  </div>
+</template>
+
+<script setup lang="ts" name="PurchasingBusinessLeader">
+import { ref, reactive, defineAsyncComponent } from 'vue'
+import { BasicTableProps, useTable } from "/@/hooks/table";
+import { fetchList, delObjs } from "/@/api/purchase/purchasingBusinessLeader";
+import { useMessage, useMessageBox } from "/@/hooks/message";
+import { List, User, UserFilled, EditPen, Clock, Search } from '@element-plus/icons-vue'
+
+// 引入组件
+const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+
+// 定义变量内容
+const tableRef = ref()
+const formDialogRef = ref()
+const queryRef = ref()
+const showSearch = ref(true)
+const selectObjs = ref([]) as any
+const multiple = ref(true)
+
+/**
+ * 定义响应式表格数据
+ */
+const state: BasicTableProps = reactive<BasicTableProps>({
+  pageList: fetchList,
+  queryForm: {
+    name: '',
+    username: '',
+  },
+  createdIsNeed: true
+});
+
+/**
+ * 使用 useTable 定义表格相关操作
+ */
+const {
+  getDataList,
+  currentChangeHandle,
+  sizeChangeHandle,
+  sortChangeHandle,
+  downBlobFile,
+  tableStyle
+} = useTable(state);
+
+/**
+ * 重置搜索表单
+ */
+const resetQuery = () => {
+  queryRef.value?.resetFields();
+  selectObjs.value = [];
+  multiple.value = true;
+  getDataList();
+};
+
+/**
+ * 导出Excel文件
+ */
+const exportExcel = () => {
+  downBlobFile(
+    '/purchase/purchasingBusinessLeader/export',
+    Object.assign(state.queryForm, { ids: selectObjs.value }),
+    'purchasingBusinessLeader.xlsx'
+  );
+};
+
+/**
+ * 表格多选事件处理
+ * @param objs 选中的数据行
+ */
+const selectionChangHandle = (objs: { id: string }[]) => {
+  selectObjs.value = objs.map(({ id }) => id);
+  multiple.value = !objs.length;
+};
+
+/**
+ * 删除当前行
+ * @param ids - 要删除的ID数组
+ */
+const handleDelete = async (ids: string[]) => {
+  try {
+    await useMessageBox().confirm('确定要删除该记录吗？');
+  } catch {
+    return;
+  }
+
+  try {
+    await delObjs(ids);
+    useMessage().success('删除成功');
+    getDataList();
+  } catch (err: any) {
+    useMessage().error(err.msg || '删除失败');
+  }
+};
+</script>
+
+<style scoped lang="scss">
+@import '/@/assets/styles/modern-page.scss';
+</style>