合并‘

tian

2025-09-23 7afa7c7ad7d7f1250a086a406453a7cbc8b5cbd5

合并‘

 package-lock.json

@@ -3626,6 +3626,17 @@
        "url": "https://github.com/sponsors/sindresorhus"
      }
    },
    "node_modules/bindings": {
      "version": "1.5.0",
      "resolved": "https://registry.npmmirror.com/bindings/-/bindings-1.5.0.tgz",
      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
      "dev": true,
      "license": "MIT",
      "optional": true,
      "dependencies": {
        "file-uri-to-path": "1.0.0"
      }
    },
    "node_modules/bluebird": {
      "version": "3.7.2",
      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
@@ -7457,6 +7468,14 @@
      "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.5.tgz",
      "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA=="
    },
    "node_modules/file-uri-to-path": {
      "version": "1.0.0",
      "resolved": "https://registry.npmmirror.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
      "dev": true,
      "license": "MIT",
      "optional": true
    },
    "node_modules/filesize": {
      "version": "3.6.1",
      "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz",
@@ -10503,6 +10522,14 @@
        "thenify-all": "^1.0.0"
      }
    },
    "node_modules/nan": {
      "version": "2.23.0",
      "resolved": "https://registry.npmmirror.com/nan/-/nan-2.23.0.tgz",
      "integrity": "sha512-1UxuyYGdoQHcGg87Lkqm3FzefucTa0NAiOcuRsDmysep3c1LVCRK2krrUDafMWtjSG04htvAmvg96+SDknOmgQ==",
      "dev": true,
      "license": "MIT",
      "optional": true
    },
    "node_modules/nanoid": {
      "version": "3.3.11",
      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",

 src/views/archiveCategory/index.vue

@@ -134,10 +134,10 @@
    <!-- 添加或修改【请填写功能名称】对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
        <el-form-item label="编号" prop="numb">
        <el-form-item label="编号" prop="numb" required>
          <el-input v-model="form.numb" placeholder="请输入编号" />
        </el-form-item>
        <el-form-item label="名称" prop="nname">
        <el-form-item label="名称" prop="nname" required>
          <el-input v-model="form.nname" placeholder="请输入名称" />
        </el-form-item>
      </el-form>
@@ -185,6 +185,12 @@
      form: {},
      // 表单校验
      rules: {
        numb: [
          { required: true, message: '请输入编号', trigger: 'blur' }
        ],
        nname: [
          { required: true, message: '请输入名称', trigger: 'blur' }
        ]
      }
    }
  },

 src/views/archiveExport/index.vue

@@ -258,7 +258,7 @@
</el-row>
        </el-form-item>
        <el-form-item label="发文号" prop="inquiryNumber">
          <el-input v-model="form.inquiryNumber" placeholder="请输入发问号" disabled/>
          <el-input v-model="form.inquiryNumber" placeholder="请输入发文号" disabled/>
        </el-form-item>
        <el-form-item label="建设项目名称" prop="projectName">
          <el-input v-model="form.projectName" placeholder="请输入建设项目名称" disabled/>
@@ -380,7 +380,7 @@
        </el-row>
        </el-form-item>
        <el-form-item label="发文号" prop="inquiryNumber">
          <el-input v-model="form.inquiryNumber" placeholder="请输入发问号"   :disabled="userId!=1"
          <el-input v-model="form.inquiryNumber" placeholder="请输入发文号"   :disabled="userId!=1"
          />
        </el-form-item>
        <el-form-item label="项目名称" prop="everyProjectName">
@@ -595,7 +595,7 @@
          { required: true, message: "档案号不能为空", trigger: "blur" }
        ],
        inquiryNumber: [
          { required: true, message: "发问号不能为空", trigger: "blur" }
          { required: true, message: "发文号不能为空", trigger: "blur" }
        ],
        everyProjectName: [
          { required: true, message: "项目名称不能为空", trigger:  ['change', 'blur']}

 src/views/archiveManager/archiveMaterial/index.vue

@@ -24,9 +24,8 @@
              value-format="yyyy-MM-dd"
              placeholder="请选择日期">
            </el-date-picker> -->
  <el-col :span="8">
                        <el-input v-model="form.date" placeholder="请输入日期" />
  </el-col>
            <el-input v-model="form.date" placeholder="请输入日期 (格式：yyyy-mm-dd)" style="width: 450px;" />
            <!-- <div style="color: #999; font-size: 12px; margin-top: 4px;">请输入正确的日期格式：yyyy-mm-dd</div> -->
          </el-form-item>
      

@@ -52,10 +51,9 @@
          
        </el-form-item>
        <el-form-item 
  label="页号" 
  prop="pageNumber"
  v-if=" form.fileStyle !== '其他材料'"
>
          label="页号" 
          prop="pageNumber"
          v-if=" form.fileStyle !== '其他材料'">
      <el-col :span="8">
  <el-input 
    v-model="form.pageNumber" 
@@ -315,7 +313,7 @@
        <el-table-column label="宽度" align="center" prop="width" />
        <el-table-column label="高度" align="center" prop="height" />
        <el-table-column label="大小" align="center" prop="fileSize" />
        <el-table-column label="附件及历史发问号" align="center" prop="attachmentHistoryNumbers" />
        <el-table-column label="附件及历史发文号" align="center" prop="attachmentHistoryNumbers" />

        <el-table-column label="操作" align="center" width="160" class-name="small-padding ">
          <template slot-scope="scope">
@@ -356,7 +354,7 @@
        <el-form ref="forms" :model="forms" :rules="rules" label-width="100px">
           <el-row>
           <el-col :span="8">
               8<el-form-item label="责任者" prop="creator">
               <el-form-item label="责任者" prop="creator">
                   <el-input v-model="forms.creator" placeholder="请输入责任者" />
                 </el-form-item>
           </el-col>
@@ -367,15 +365,13 @@
           </el-col>
           </el-row>
                 <el-form-item label="日期" prop="date">
                  <el-input v-model="forms.date" placeholder="请输入日期 (格式：yyyy-mm-dd)" style="width: 200px;" />
                   <!-- <el-date-picker clearable
                     v-model="forms.date"
                type="date"
                     type="date"
                     value-format="yyyy-MM-dd"
                     placeholder="请选择日期">
                   </el-date-picker> -->

                   <el-input v-model="forms.date" placeholder="请输入日期" prop="date"/>
             
                 </el-form-item>
                 <!-- <el-form-item label="页次" prop="pageOrder">
                   <el-input v-model="forms.pageOrder" placeholder="请输入页次" />
@@ -530,12 +526,14 @@
        />
      </el-form-item>
      <el-form-item label="日期" prop="date">
        <el-date-picker clearable
        <el-input v-model="queryParams.date" placeholder="请输入日期 (格式：yyyy-mm-dd)" />
        <div style="color: #999; font-size: 12px; margin-top: 4px;">请输入正确的日期格式：yyyy-mm-dd</div>
        <!-- <el-date-picker clearable
          v-model="queryParams.date"
          type="date"
          value-format="yyyy-MM-dd"
          placeholder="请选择日期">
        </el-date-picker>
        </el-date-picker> -->
      </el-form-item>
      <el-form-item label="页号" prop="pageNumber">
        <el-input
@@ -809,7 +807,8 @@
            { required: true, message: "案卷题名不能为空", trigger: "blur" }
          ],
          date: [
            { required: true, message: "日期不能为空", trigger: "blur" }
            { required: true, message: "日期不能为空", trigger: "blur" },
            { pattern: /^\d{4}-\d{2}-\d{2}$/, message: "日期格式必须为yyyy-mm-dd", trigger: "blur" }
          ],
        }
      }

 src/views/archiveManager/index.vue

@@ -126,6 +126,21 @@
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <!-- 添加项目名称搜索框 -->
      <el-form-item label="项目名称" prop="everyProjectName">
        <el-select
          v-model="queryParams.everyProjectName"
          placeholder="请选择项目名称"
          clearable
        >
          <el-option
            v-for="item in projectOptions"
            :key="item.value"
            :label="item.label"
            :value="item.value"
          />
        </el-select>
      </el-form-item>
      <el-form-item label="项目编号" prop="projectNumber">
        <el-input
          v-model="queryParams.projectNumber"
@@ -360,7 +375,7 @@
</el-row>
        </el-form-item>
        <el-form-item label="发文号" prop="inquiryNumber">
          <el-input v-model="form.inquiryNumber" placeholder="请输入发问号" disabled/>
          <el-input v-model="form.inquiryNumber" placeholder="请输入发文号" disabled/>
        </el-form-item>
        <el-form-item label="建设项目名称" prop="projectName">
          <el-input v-model="form.projectName" placeholder="请输入建设项目名称" disabled/>
@@ -482,7 +497,7 @@
        </el-row>
        </el-form-item>
        <el-form-item label="发文号" prop="inquiryNumber">
          <el-input v-model="form.inquiryNumber" placeholder="请输入发问号"   :disabled="userId!=1"
          <el-input v-model="form.inquiryNumber" placeholder="请输入发文号"   :disabled="userId!=1"
          />
        </el-form-item>
        <el-form-item label="项目名称" prop="everyProjectName">
@@ -505,7 +520,7 @@

        <div v-if="vis">
        <el-form-item label="案卷题名" prop="caseTitle">
          <el-input v-model="form.caseTitle" placeholder="请输入案卷题名" />
          <el-input v-model="form.caseTitle" placeholder="自动生成" :readonly="true" />
        </el-form-item>
        <el-form-item label="公开属性" prop="publicAttribute">

@@ -576,7 +591,8 @@
          <el-input v-model="form.constructionAddress" placeholder="请输入建设地址" />
        </el-form-item>
     <el-form-item label="建设项目名称" prop="projectName">
          <el-input v-model="form.projectName" placeholder="请输入建设项目名称" :disabled="userId!=1"/>
      <el-input v-model="form.projectName" placeholder="请输入建设项目名称" />
          <!-- <el-input v-model="form.projectName" placeholder="请输入建设项目名称" :disabled="userId!=1"/> -->
        </el-form-item>
        <el-form-item label="项目编号" prop="projectNumber">
          <el-input v-model="form.projectNumber" placeholder="请输入项目编号" />
@@ -695,11 +711,20 @@
          { required: true, message: "档案号不能为空", trigger: "blur" }
        ],
        inquiryNumber: [
          { required: true, message: "发问号不能为空", trigger: "blur" }
          { required: true, message: "发文号不能为空", trigger: "blur" }
        ],
        everyProjectName: [
          { required: true, message: "项目名称不能为空", trigger:  ['change', 'blur']}
        ],
        caseTitle: [
          { required: true, message: "案卷题名不能为空", trigger: "blur" }
        ],
        constructionUnit: [
          { required: true, message: "建设单位不能为空", trigger: "blur" }
        ],
        projectName: [
          { required: true, message: "建设项目名称不能为空", trigger: "blur" }
        ]
      }
    }
  },
@@ -714,6 +739,26 @@
    this.fetchProjectOptions()
this.getList()
  },
  watch: {
    'form.constructionUnit': {
      handler() {
        this.generateCaseTitle();
      },
      immediate: true
    },
    'form.constructionAddress': {
      handler() {
        this.generateCaseTitle();
      },
      immediate: true
    },
    'form.projectName': {
      handler() {
        this.generateCaseTitle();
      },
      immediate: true
    }
  },
  methods: {
    getId()
    {
@@ -727,6 +772,24 @@

          //      alert(this.maxId)
      })
    },
    // 生成案卷题名
    generateCaseTitle() {
      let titleParts = [];
      
      if (this.form.constructionUnit) {
        titleParts.push(this.form.constructionUnit);
      }
      
      if (this.form.constructionAddress) {
        titleParts.push(this.form.constructionAddress);
      }
      
      if (this.form.projectName) {
        titleParts.push(this.form.projectName);
      }
      
      this.form.caseTitle = titleParts.join('');
    },
    async getZoneOptions()
    {
@@ -988,3 +1051,27 @@
  }
}
</script>

<style scoped>
/* 加宽表格底部滚动条 */
::v-deep .el-table__body-wrapper::-webkit-scrollbar {
  height: 20px; /* 横向滚动条高度 */
}

/* 滚动条轨道 */
::v-deep .el-table__body-wrapper::-webkit-scrollbar-track {
  background: #f1f1f1;
  border-radius: 10px;
}

/* 滚动条滑块 */
::v-deep .el-table__body-wrapper::-webkit-scrollbar-thumb {
  background: #c1c1c1;
  border-radius: 10px;
}

/* 滚动条滑块悬停效果 */
::v-deep .el-table__body-wrapper::-webkit-scrollbar-thumb:hover {
  background: #2f91ec;
}
</style>

 src/views/archivePlaceName/index.vue

@@ -9,6 +9,14 @@
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="对应的区名称" prop="name">
        <el-input
          v-model="queryParams.name"
          placeholder="请输入对应的区名称"
          clearable
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -126,10 +134,10 @@
    <!-- 添加或修改【请填写功能名称】对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
        <el-form-item label="对应的区号" prop="nnumber">
        <el-form-item label="对应的区号" prop="nnumber" required>
          <el-input v-model="form.nnumber" placeholder="请输入对应的区号" />
        </el-form-item>
        <el-form-item label="对应的区名称" prop="name">
        <el-form-item label="对应的区名称" prop="name" required>
          <el-input v-model="form.name" placeholder="请输入内容" />
        </el-form-item>
      </el-form>
@@ -177,6 +185,12 @@
      form: {},
      // 表单校验
      rules: {
        nnumber: [
          { required: true, message: '请输入对应的区号', trigger: 'blur' }
        ],
        name: [
          { required: true, message: '请输入对应的区名称', trigger: 'blur' }
        ]
      }
    }
  },

 src/views/archiveProjectName/index.vue

@@ -1,6 +1,30 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
      <el-form-item label="项目名称" prop="name">
        <el-input
          v-model="queryParams.name"
          placeholder="请输入项目名称"
          clearable
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="公司名称" prop="companyName">
        <el-input
          v-model="queryParams.companyName"
          placeholder="请输入公司名称"
          clearable
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="项目负责人" prop="createPerson">
        <el-input
          v-model="queryParams.createPerson"
          placeholder="请输入项目负责人"
          clearable
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -120,8 +144,14 @@
    <!-- 添加或修改【请填写功能名称】对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
        <el-form-item label="项目名称" prop="name">
          <el-input v-model="form.name"  placeholder="请输入内容" />
        <el-form-item label="项目名称" prop="name" required>
          <el-input v-model="form.name" placeholder="请输入内容" />
        </el-form-item>
        <el-form-item label="公司名称" prop="companyName" required>
          <el-input v-model="form.companyName" placeholder="请输入公司名称" />
        </el-form-item>
        <el-form-item label="项目负责人" prop="createPerson" required>
          <el-input v-model="form.createPerson" placeholder="请输入项目负责人" />
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
@@ -161,12 +191,23 @@
      queryParams: {
        pageNum: 1,
        pageSize: 10,
        name: null
        name: null,
        companyName: null,
        createPerson: null
      },
      // 表单参数
      form: {},
      // 表单校验
      rules: {
        name: [
          { required: true, message: '请输入项目名称', trigger: 'blur' }
        ],
        companyName: [
          { required: true, message: '请输入公司名称', trigger: 'blur' }
        ],
        createPerson: [
          { required: true, message: '请输入项目负责人', trigger: 'blur' }
        ]
      }
    }
  },
@@ -193,7 +234,9 @@
    reset() {
      this.form = {
        id: null,
        name: null
        name: null,
        companyName: null,
        createPerson: null
      }
      this.resetForm("form")
    },
@@ -228,7 +271,7 @@
        this.form = response.data
        console.log(response)
        this.open = true
        this.title = "修改项目名称"
        this.title = "修改项目内容"
      })
    },
    /** 提交按钮 */

 src/views/archiveStatics/index.vue

@@ -117,7 +117,7 @@
        </el-row>
        </el-form-item>
        <el-form-item label="发文号" prop="inquiryNumber">
          <el-input v-model="form.inquiryNumber" placeholder="请输入发问号" />
          <el-input v-model="form.inquiryNumber" placeholder="请输入发文号" />
        </el-form-item>
        <el-form-item label="建设项目名称" prop="projectName">
          <el-input v-model="form.projectName" placeholder="请输入建设项目名称" />
@@ -275,7 +275,7 @@
          { required: true, message: "档案号不能为空", trigger: "blur" }
        ],
        inquiryNumber: [
          { required: true, message: "发问号不能为空", trigger: "blur" }
          { required: true, message: "发文号不能为空", trigger: "blur" }
        ],
        projectName: [
          { required: true, message: "项目名称不能为空", trigger: "blur" }

 src/views/archiveToUserStatistic/index.vue

@@ -124,7 +124,7 @@
          { required: true, message: "档案号不能为空", trigger: "blur" }
        ],
        inquiryNumber: [
          { required: true, message: "发问号不能为空", trigger: "blur" }
          { required: true, message: "发文号不能为空", trigger: "blur" }
        ],
        projectName: [
          { required: true, message: "项目名称不能为空", trigger: "blur" }

 src/views/login.vue

@@ -68,13 +68,14 @@

export default {
  name: "Login",
  // 修改 data 部分，将默认的用户名和密码清空
  data() {
    return {
      title: process.env.VUE_APP_TITLE,
      codeUrl: "",
      loginForm: {
        username: "admin",
        password: "admin123",
        username: "",  // 改为空字符串
        password: "",  // 改为空字符串
        rememberMe: false,
        code: "",
        uuid: ""
@@ -118,13 +119,14 @@
        }
      })
    },
    // 修改 getCookie 方法，确保不使用默认值
    getCookie() {
      const username = Cookies.get("username")
      const password = Cookies.get("password")
      const rememberMe = Cookies.get('rememberMe')
      this.loginForm = {
        username: username === undefined ? this.loginForm.username : username,
        password: password === undefined ? this.loginForm.password : decrypt(password),
        username: username === undefined ? "" : username,  // 改为空字符串
        password: password === undefined ? "" : decrypt(password),  // 改为空字符串
        rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
      }
    },