From 7eeefbfa2cceae05931bdcb3923d30317587ef7b Mon Sep 17 00:00:00 2001
From: TiaStars <L18864257234@163.com>
Date: Tue, 31 Dec 2024 13:15:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=BB=B4=E6=8A=A4=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                       |  2 +-
 src/views/infoMaintain/index.vue                   | 14 +++++++++++---
 .../enterpriseDirectory/index.vue                  |  5 +++--
 src/views/onlineDeclaration/records/index.vue      |  2 +-
 vue.config.js                                      |  2 +-
 5 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 5e4ec81..5be7514 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ruoyi",
-  "version": "1.0.202412131056",
+  "version": "1.0.202412311311",
   "description": "金鸡湖现代服务业品牌管理系统",
   "author": "若依",
   "license": "MIT",
diff --git a/src/views/infoMaintain/index.vue b/src/views/infoMaintain/index.vue
index 14fe547..3fb24f9 100644
--- a/src/views/infoMaintain/index.vue
+++ b/src/views/infoMaintain/index.vue
@@ -4,11 +4,17 @@
       <header id="L-header">
         <el-form :inline="true" :model="formInline" size="small" class="demo-form-inline" ref="queryFrom">
           <el-col :span="22">
-            <el-form-item label="企业名称：" prop="enterpriseName">
+            <!-- <el-form-item label="企业名称：" prop="enterpriseName">
               <el-input v-model.trim="formInline.enterpriseName" placeholder="请输入内容" class="xinxiweihu"></el-input>
             </el-form-item>
             <el-form-item label="统一社会信用代码：" prop="enterpriseCode">
               <el-input v-model.trim="formInline.enterpriseCode" placeholder="请输入内容"></el-input>
+            </el-form-item> -->
+            <el-form-item label="常用联络人姓名：" prop="contactName">
+              <el-input v-model.trim="formInline.contactName" placeholder="请输入内容" class="xinxiweihu"></el-input>
+            </el-form-item>
+            <el-form-item label="常用联络人手机号码：" prop="contactPhone">
+              <el-input v-model.trim="formInline.contactPhone" placeholder="请输入内容"></el-input>
             </el-form-item>
             <!-- <el-form-item label="政策等级：" prop="policyLevel">
               <el-select class="ignoreElement" v-model="formInline.policyLevel" placeholder="请选择">
@@ -140,8 +146,10 @@ export default {
       },
       loading:false,
       formInline: {
-        enterpriseName: '',
-        enterpriseCode:"",
+        // enterpriseName: '',
+        // enterpriseCode:"",
+        contactName:"",
+        contactPhone:"",
       },
       tableData:[],
       tabHeader: undefined,
diff --git a/src/views/onlineDeclaration/enterpriseDirectory/index.vue b/src/views/onlineDeclaration/enterpriseDirectory/index.vue
index 7eba604..45496e1 100644
--- a/src/views/onlineDeclaration/enterpriseDirectory/index.vue
+++ b/src/views/onlineDeclaration/enterpriseDirectory/index.vue
@@ -343,8 +343,9 @@ export default {
   dicts: ['bms_responsibility_unit', 'bms_declaration_channels', 'bms_level', 'jjh_project_type', "project_small_type"],
   data() {
     let validateTime = (rule, value, callback) => {
-      if (new Date(value[1]) < new Date()) {
-        callback(new Error('选择结束时间需大于当前时间'))
+      let now = new Date();
+      if (new Date(value[1]) < new Date(now.getFullYear(), now.getMonth(), now.getDate(), 8, 0, 0, 0)) {
+        callback(new Error('选择结束时间需大于或等于当前时间'))
       } else {
         callback()
       }
diff --git a/src/views/onlineDeclaration/records/index.vue b/src/views/onlineDeclaration/records/index.vue
index 9c05542..0a8d2ec 100644
--- a/src/views/onlineDeclaration/records/index.vue
+++ b/src/views/onlineDeclaration/records/index.vue
@@ -4,7 +4,7 @@
       <el-form-item label="申报任务标题" prop="enterpriseDirectory">
         <el-input
           v-model="queryParams.enterpriseDirectory"
-          placeholder="请输入模版名称"
+          placeholder="请输入申报任务标题"
           clearable
           @keyup.enter.native="handleQuery"
         />
diff --git a/vue.config.js b/vue.config.js
index 836786b..4765256 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -20,7 +20,7 @@ module.exports = {
   // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
   // 测试环境部署地址
   // publicPath: process.env.NODE_ENV === "production" ? "/demo/JinJiHu" : "/",
-  // 第三方测试脱敏部署地址
+  // 第三方测试脱敏部署地址（暂停用）
   // publicPath: process.env.NODE_ENV === "production" ? "/test/JinJiHuTest" : "/",
   // 正式环境部署地址
   publicPath: process.env.NODE_ENV === "production" ? "./" : "/",