From 71b9065f296e47191528ce7336e5cb21fcdef672 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Wed, 10 Jul 2024 16:56:28 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DetailComponent/SummaryDetail.vue |  2 +-
 src/views/plan/detail.vue                        |  2 +-
 src/views/project-demand/requirement/add.vue     |  4 ++++
 src/views/project-demand/summary/add.vue         | 16 ++++++++--------
 src/views/project-management/filing/index.vue    |  2 +-
 .../project-management/implementation/index.vue  |  2 +-
 .../project-management/initiation/index.vue      |  2 +-
 .../mobledetail/SummaryDetailMoblie.vue          |  2 +-
 8 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/components/DetailComponent/SummaryDetail.vue b/src/components/DetailComponent/SummaryDetail.vue
index 99ba5bc..a992ff0 100644
--- a/src/components/DetailComponent/SummaryDetail.vue
+++ b/src/components/DetailComponent/SummaryDetail.vue
@@ -109,7 +109,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="经济概算(元)" prop="economicEstimate">
+          <el-form-item label="经济预算(元)" prop="economicEstimate">
             <span>{{ toThousands(localFormData.economicEstimate) }}</span>
           </el-form-item>
         </el-col>
diff --git a/src/views/plan/detail.vue b/src/views/plan/detail.vue
index e7350d2..7596225 100644
--- a/src/views/plan/detail.vue
+++ b/src/views/plan/detail.vue
@@ -119,7 +119,7 @@
               <div v-else>--</div>
             </template>
           </el-table-column>
-          <el-table-column prop="intellectualProperty" label="经济概算(元)" align="center">
+          <el-table-column prop="intellectualProperty" label="经济预算(元)" align="center">
             <template #default="scope">
               <span>{{ toThousands(scope.row.economicEstimate) }}</span>
             </template>
diff --git a/src/views/project-demand/requirement/add.vue b/src/views/project-demand/requirement/add.vue
index 3e1cd64..7aae484 100644
--- a/src/views/project-demand/requirement/add.vue
+++ b/src/views/project-demand/requirement/add.vue
@@ -28,6 +28,7 @@
                   type="date"
                   placeholder="需求上报截止时间"
                   value-format="YYYY-MM-DD"
+                  :disabled-date="disabledDate"
               />
             </el-config-provider>
           </el-form-item>
@@ -217,6 +218,9 @@ const tableConfig = reactive({
     }
   ]
 })
+const disabledDate = (time) => {
+  return time.getTime() < Date.now() - 8.64e7//不能选择之后的数据
+}
 const handleExpend = () => {
   showMoreCompany.value = !showMoreCompany.value;
   showExpendClass(showMoreCompany.value)
diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index 0e29d7d..aeeefe2 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -185,32 +185,32 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="发明专利(项)" prop="inventionPatent" label-width="125">
-            <el-input-number v-model="formData.inventionPatent" placeholder="请输入发明专利" :controls="false"/>
+            <el-input-number v-model="formData.inventionPatent" placeholder="请输入发明专利数量" :controls="false"/>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="实用性新型专利(项)" prop="newPatent" label-width="145">
-            <el-input-number v-model="formData.newPatent" placeholder="请输入实用性新型专利" :controls="false"/>
+            <el-input-number v-model="formData.newPatent" placeholder="请输入实用性新型专利数量" :controls="false"/>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="软件著作权(项)" prop="softwareCopyright" label-width="135">
-            <el-input-number v-model="formData.softwareCopyright" placeholder="请输入软件著作权" :controls="false"/>
+            <el-input-number v-model="formData.softwareCopyright" placeholder="请输入软件著作权数量" :controls="false"/>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="著作权(项)" prop="copyright" label-width="125">
-            <el-input-number v-model="formData.copyright" placeholder="请输入著作权" :controls="false"/>
+            <el-input-number v-model="formData.copyright" placeholder="请输入著作权数量" :controls="false"/>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="其他(项)" prop="other" label-width="145">
-            <el-input-number v-model="formData.other" placeholder="请输入其他" :controls="false"/>
+            <el-input-number v-model="formData.other" placeholder="请输入其他数量" :controls="false"/>
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="经济概算(元)" prop="economicEstimate" label-width="135">
-            <el-input-number v-model="formData.economicEstimate" placeholder="请输入经济概算" :controls="false"/>
+          <el-form-item label="经济预算(元)" prop="economicEstimate" label-width="135">
+            <el-input-number v-model="formData.economicEstimate" placeholder="请输入经济预算数量" :controls="false"/>
           </el-form-item>
         </el-col>
         <el-col :span="16" v-if="formData.isSpecialFund">
@@ -312,7 +312,7 @@ const rules = reactive({
   softwareCopyright: [{required: true, message: '请输入软件著作权', trigger: 'blur'}],
   copyright: [{required: true, message: '请输入著作权', trigger: 'blur'}],
   other: [{required: true, message: '请输入其他', trigger: 'blur'}],
-  economicEstimate: [{required: true, message: '请输入经济概算', trigger: 'blur'}],
+  economicEstimate: [{required: true, message: '请输入经济预算', trigger: 'blur'}],
   specialFundAmount: [{required: true, message: '请输入专项资金', trigger: 'blur'}],
   serviceDescription: [{required: true, message: '请输入现有业务描述', trigger: 'blur'}],
   contentDescription: [{required: true, message: '请输入研发项目关键内容描述', trigger: 'blur'}]
diff --git a/src/views/project-management/filing/index.vue b/src/views/project-management/filing/index.vue
index fad0044..31ff380 100644
--- a/src/views/project-management/filing/index.vue
+++ b/src/views/project-management/filing/index.vue
@@ -193,7 +193,7 @@ const tableConfig = reactive({
     },
     {
       prop: 'economicEstimate',
-      label: '经济概算(元)',
+      label: '经济预算(元)',
       align: 'center',
       currentRender:({row})=>{
         return <span>{toThousands(row.economicEstimate)}</span>
diff --git a/src/views/project-management/implementation/index.vue b/src/views/project-management/implementation/index.vue
index 3798475..6cd8b94 100644
--- a/src/views/project-management/implementation/index.vue
+++ b/src/views/project-management/implementation/index.vue
@@ -209,7 +209,7 @@ const tableConfig = reactive({
     },
     {
       prop: 'economicEstimate',
-      label: '经济概算(元)',
+      label: '经济预算(元)',
       align: 'center',
       currentRender:({row})=>{
         return <span>{toThousands(row.economicEstimate)}</span>
diff --git a/src/views/project-management/initiation/index.vue b/src/views/project-management/initiation/index.vue
index d238277..74e4031 100644
--- a/src/views/project-management/initiation/index.vue
+++ b/src/views/project-management/initiation/index.vue
@@ -190,7 +190,7 @@ const tableConfig = reactive({
     },
     {
       prop: 'economicEstimate',
-      label: '经济概算(元)',
+      label: '经济预算(元)',
       align: 'center',
       currentRender:({row})=>{
         return <span>{toThousands(row.economicEstimate)}</span>
diff --git a/src/views/project-management/mobledetail/SummaryDetailMoblie.vue b/src/views/project-management/mobledetail/SummaryDetailMoblie.vue
index dda0c4e..4992e20 100644
--- a/src/views/project-management/mobledetail/SummaryDetailMoblie.vue
+++ b/src/views/project-management/mobledetail/SummaryDetailMoblie.vue
@@ -106,7 +106,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="经济概算(元)" prop="economicEstimate">
+          <el-form-item label="经济预算(元)" prop="economicEstimate">
             <span>{{ toThousands(localFormData.economicEstimate) }}</span>
           </el-form-item>
         </el-col>