合并

2025-08-28 23:35:13 +08:00
parent ade1177294 b0a05519f0
commit bf23c8c18f
11 changed files with 140 additions and 129 deletions
--- a/src/views/materials/purchaseDoc/index.vue
+++ b/src/views/materials/purchaseDoc/index.vue
@ -133,8 +133,8 @@
          ></el-col>
          <el-col :span="12" :offset="0"
            ><el-form-item label="供应商" prop="supplier">
-              <el-select v-model="form.supplier" value-key="id" placeholder="请选择供应商" clearable filterable @change="">
-                <el-option v-for="item in supplierOptions" :key="item.id" :label="item.name" :value="item.name"> </el-option>
+              <el-select v-model="form.supplierId" value-key="id" placeholder="请选择供应商" clearable filterable @change="">
+                <el-option v-for="item in supplierOptions" :key="item.id" :label="item.supplierName" :value="item.id"> </el-option>
              </el-select> </el-form-item
          ></el-col>
          <el-col :span="12" :offset="0"
@ -268,6 +268,7 @@ import { useUserStoreHook } from '@/store/modules/user';
 import { getToken } from '@/utils/auth';
 import logisticsDetail from './comm/logisticsDetail.vue';
 import { FormRules } from 'element-plus';
+import { listSupplierInput } from '@/api/supplierInput/supplierInput';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const route = useRoute();
 const router = useRouter();
@ -307,6 +308,8 @@ const initFormData: any = {
  docCode: undefined,
  supplier: undefined,
  reason: undefined,
+  supplierId: undefined,
+
  name: undefined,
  arrivalDate: undefined,
  designDirectorTel: undefined,
@ -479,6 +482,7 @@ const submitForm = () => {
      form.value.associationList = form.value.planId?.map((item: any) => ({
        planId: item
      }));
+      form.value.supplier = supplierOptions.value.find((item) => item.id == form.value.supplierId)?.supplierName;

      if (form.value.id) {
        await updatePurchaseDoc(form.value).finally(() => (buttonLoading.value = false));
@ -514,10 +518,10 @@ const getBatchList = async () => {
 };

 const getSupplierList = async () => {
-  const res = await listContractor({
+  const res = await listSupplierInput({
    projectId: currentProject.value?.id,
    pageNum: 1,
-    contractorType: 4,
+    state: 'finish',
    pageSize: 10000
  });
  supplierOptions.value = res.rows;
--- a/src/views/project/contractor/index.vue
+++ b/src/views/project/contractor/index.vue
@ -81,6 +81,11 @@
        <el-form-item label="公司名称" prop="name">
          <el-input v-model="form.name" placeholder="请输入公司名称" />
        </el-form-item>
+        <el-form-item label="供应商" prop="supplier">
+          <el-select v-model="form.supplierId" value-key="id" placeholder="请选择供应商" clearable filterable @change="">
+            <el-option v-for="item in supplierOptions" :key="item.id" :label="item.supplierName" :value="item.id"> </el-option>
+          </el-select>
+        </el-form-item>
        <el-form-item label="负责人" prop="principal">
          <el-input v-model="form.principal" placeholder="请输入负责人" />
        </el-form-item>
@ -121,6 +126,7 @@ import { ContractorForm, ContractorQuery, ContractorVO } from '@/api/project/con
 import ContractorFileDialog from '@/views/project/contractor/component/ContractorFileDialog.vue';
 import { useUserStoreHook } from '@/store/modules/user';
 import { getDicts, listData } from '@/api/system/dict/data';
+import { listSupplierInput } from '@/api/supplierInput/supplierInput';

 const { proxy } = getCurrentInstance() as ComponentInternalInstance;

@ -152,6 +158,8 @@ const initFormData: ContractorForm = {
  principalPhone: undefined,
  custodian: undefined,
  custodianPhone: undefined,
+  supplierId: undefined,
+  supplier: undefined,
  contractorType: undefined,
  fileMap: undefined,
  remark: undefined,
@ -257,6 +265,8 @@ const submitForm = () => {
    if (valid) {
      form.value.projectId = currentProject.value?.id;
      buttonLoading.value = true;
+      form.value.supplier = supplierOptions.value.find((item) => item.id == form.value.supplierId)?.supplierName;
+
      if (form.value.id) {
        await updateContractor(form.value).finally(() => (buttonLoading.value = false));
      } else {
@ -278,15 +288,16 @@ const handleDelete = async (row?: ContractorVO) => {
  await getList();
 };

-/** 导出按钮操作 */
-const handleExport = () => {
-  proxy?.download(
-    'project/contractor/export',
-    {
-      ...queryParams.value
-    },
-    `contractor_${new Date().getTime()}.xlsx`
-  );
+/** 获取供应商 */
+const supplierOptions = ref([]);
+const getSupplierList = async () => {
+  const res = await listSupplierInput({
+    projectId: currentProject.value?.id,
+    pageNum: 1,
+    state: 'finish',
+    pageSize: 10000
+  });
+  supplierOptions.value = res.rows;
 };

 /** 文件操作 **/
@ -304,6 +315,7 @@ const listeningProject = watch(
    queryParams.value.projectId = nid;
    form.value.projectId = nid;
    console.log('监听项目id', queryParams.value.projectId, form.value.projectId);
+    getSupplierList();
    getList();
  }
 );
@ -314,5 +326,6 @@ onUnmounted(() => {
 onMounted(() => {
  getDictList();
  getList();
+  getSupplierList();
 });
 </script>
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@ -1,7 +1,6 @@
 <template>
  <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
-      :leave-active-class="proxy?.animate.searchAnimate.leave">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
      <div v-show="showSearch" class="mb-[10px]">
        <el-card shadow="hover">
          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
@ -9,13 +8,11 @@
              <el-input v-model="queryParams.deptName" placeholder="请输入部门名称" clearable @keyup.enter="handleQuery" />
            </el-form-item>
            <el-form-item label="类别编码" prop="deptCategory">
-              <el-input v-model="queryParams.deptCategory" placeholder="请输入类别编码" clearable style="width: 240px"
-                @keyup.enter="handleQuery" />
+              <el-input v-model="queryParams.deptCategory" placeholder="请输入类别编码" clearable style="width: 240px" @keyup.enter="handleQuery" />
            </el-form-item>
            <el-form-item label="状态" prop="status">
              <el-select v-model="queryParams.status" placeholder="部门状态" clearable>
-                <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label"
-                  :value="dict.value" />
+                <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
              </el-select>
            </el-form-item>
            <el-form-item>
@ -31,8 +28,7 @@
      <template #header>
        <el-row :gutter="10">
          <el-col :span="1.5">
-            <el-button v-hasPermi="['system:dept:add']" type="primary" plain icon="Plus" @click="handleAdd()">新增
-            </el-button>
+            <el-button v-hasPermi="['system:dept:add']" type="primary" plain icon="Plus" @click="handleAdd()">新增 </el-button>
          </el-col>
          <el-col :span="1.5">
            <el-button type="info" plain icon="Sort" @click="handleToggleExpandAll">展开/折叠</el-button>
@ -41,8 +37,14 @@
        </el-row>
      </template>

-      <el-table ref="deptTableRef" v-loading="loading" :data="deptList" row-key="deptId"
-        :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" :default-expand-all="isExpandAll">
+      <el-table
+        ref="deptTableRef"
+        v-loading="loading"
+        :data="deptList"
+        row-key="deptId"
+        :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+        :default-expand-all="isExpandAll"
+      >
        <el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>
        <el-table-column prop="deptCategory" align="center" label="类别编码" width="200"></el-table-column>
        <el-table-column prop="deptType" align="center" label="部门类型" width="200">
@ -64,16 +66,13 @@
        <el-table-column fixed="right" align="center" label="操作">
          <template #default="scope">
            <el-tooltip content="修改" placement="top">
-              <el-button v-hasPermi="['system:dept:edit']" link type="primary" icon="Edit"
-                @click="handleUpdate(scope.row)" />
+              <el-button v-hasPermi="['system:dept:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)" />
            </el-tooltip>
-            <el-tooltip content="新增" placement="top" v-if="scope.row.deptType != '2' && scope.row.deptType != '5'">
-              <el-button v-hasPermi="['system:dept:add']" link type="primary" icon="Plus"
-                @click="handleAdd(scope.row)" />
+            <el-tooltip content="新增" placement="top">
+              <el-button v-hasPermi="['system:dept:add']" link type="primary" icon="Plus" @click="handleAdd(scope.row)" />
            </el-tooltip>
            <el-tooltip content="删除" placement="top">
-              <el-button v-hasPermi="['system:dept:remove']" link type="primary" icon="Delete"
-                @click="handleDelete(scope.row)" />
+              <el-button v-hasPermi="['system:dept:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)" />
            </el-tooltip>
          </template>
        </el-table-column>
@ -85,9 +84,14 @@
        <el-row>
          <el-col v-if="form.parentId !== 0" :span="24">
            <el-form-item label="上级部门" prop="parentId">
-              <el-tree-select v-model="form.parentId" :data="deptOptions"
-                :props="{ value: 'deptId', label: 'deptName', children: 'children' }" value-key="deptId"
-                placeholder="选择上级部门" check-strictly />
+              <el-tree-select
+                v-model="form.parentId"
+                :data="deptOptions"
+                :props="{ value: 'deptId', label: 'deptName', children: 'children' }"
+                value-key="deptId"
+                placeholder="选择上级部门"
+                check-strictly
+              />
            </el-form-item>
          </el-col>
          <el-col :span="12">
@ -108,8 +112,7 @@
          <el-col :span="12">
            <el-form-item label="负责人" prop="leader">
              <el-select v-model="form.leader" placeholder="请选择负责人">
-                <el-option v-for="item in deptUserList" :key="item.userId" :label="item.userName"
-                  :value="item.userId" />
+                <el-option v-for="item in deptUserList" :key="item.userId" :label="item.userName" :value="item.userId" />
              </el-select>
            </el-form-item>
          </el-col>
@ -126,32 +129,17 @@
          <el-col :span="12">
            <el-form-item label="部门状态">
              <el-radio-group v-model="form.status">
-                <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :value="dict.value">{{ dict.label
-                }}</el-radio>
+                <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
              </el-radio-group>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="部门类型">
-              <el-select v-model="form.deptType" placeholder="请选择部门类型" @change="changeProject">
+              <el-select v-model="form.deptType" placeholder="请选择部门类型">
                <el-option v-for="dict in sys_dept_type" :key="dict.value" :label="dict.label" :value="dict.value" />
              </el-select>
            </el-form-item>
          </el-col>
-          <el-col :span="12" v-if="form.deptType == '4'">
-            <el-form-item label="所属项目" prop="projectId">
-              <el-select v-model="form.projectId" placeholder="请选择所属项目">
-                <el-option v-for="item in projectList" :key="item.id" :label="item.projectName" :value="item.id" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12" v-if="form.deptType == '5'">
-            <el-form-item label="分包单位" prop="contractorId">
-              <el-select v-model="form.contractorId" placeholder="请选择分包单位">
-                <el-option v-for="item in contractorList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
-            </el-form-item>
-          </el-col>
        </el-row>
      </el-form>
      <template #footer>
@ -336,16 +324,6 @@ const handleUpdate = async (row: DeptVO) => {
  dialog.title = '修改部门';
 };

-const changeProject = async (val: any) => {
-  if (val == '4' && (!projectList.value || !projectList.value.length)) {
-    const res = await getDeptList();
-    projectList.value = res.data;
-  } else if (val == '5' && (!contractorList.value || !contractorList.value.length)) {
-    const res = await optionProjectSelect(form.value.rowProjectId);
-    contractorList.value = res;
-  }
-};
-
 /** 提交按钮 */
 const submitForm = () => {
  deptFormRef.value?.validate(async (valid: boolean) => {
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@ -324,6 +324,7 @@ import { globalHeaders } from '@/utils/request';
 import { to } from 'await-to-js';
 import { getProjectByDeptId, getRoleList, optionselect } from '@/api/system/post';
 import ShuttleFrame from '../../project/projectRelevancy/component/ShuttleFrame.vue';
+import { listProject } from '@/api/project/project';

 const router = useRouter();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@ -484,6 +485,8 @@ const getDeptTree = async () => {
  const res = await api.deptTreeSelect({ isShow: '1' });
  deptOptions.value = res.data;
  enabledDeptOptions.value = filterDisabledDept(res.data);
+  const projectList = await listProject();
+  projectOptions.value = projectList.rows;
 };

 /** 过滤禁用的部门 */
@ -672,8 +675,6 @@ const handleUpdate = async (row?: UserForm) => {
  form.value.projectRoles = data.projectRoles;
  form.value.password = '';
  const roleList = await getRoleList(form.value.deptId);
-  const projectList = await getProjectByDeptId(form.value.deptId);
-  projectOptions.value = projectList.data;

  roleOptions.value = roleList.data;
 };
@ -736,8 +737,6 @@ onMounted(() => {
 async function handleDeptChange(value: number | string) {
  const response = await optionselect(value);
  const roleList = await getRoleList(value);
-  const projectList = await getProjectByDeptId(value);
-  projectOptions.value = projectList.data;

  roleOptions.value = roleList.data;
  postOptions.value = response.data;
--- a/src/views/tender/supplierInput/index.vue
+++ b/src/views/tender/supplierInput/index.vue
@ -275,6 +275,7 @@
        <el-row class="mb-4">
          <el-col :span="24">
            <el-form-item label="入库资料" prop="inputFile">
+              <template #label> <span class="text-red">*</span> 入库资料 </template>
              <file-upload
                v-model="form.inputFile"
                :fileType="['doc', 'docx', 'pdf']"